Develop (#22)

* adding toolbar

* updates to git toolbar

* updates to tool bar

* finished adding toolbar

* Bump Version 0.1.4

* Format code with yapf and autopep8

* Format code with yapf and autopep8

* update and bum version

* Format code with yapf and autopep8

* update and bum version

* many improvements

* added new styles and updated theme loading functionality and fixed bugs and others

* adding theme files

* updated gif

* Format code with yapf and autopep8

* changed github repo function to function

* fixed unittest

* Format code with yapf and autopep8

* made method a static method

* reformated and bug fixes for menubar and actions modules

* updated unit tests and fixed bugs with box combo groups

* updates to ci workflow and fixed testing workflow

* Format code with yapf and autopep8

* Bump version 0.1.5

* updated changelog for version 0.1.5

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>

Author: alexpdev

.github/workflows/coverage.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Python
         uses: actions/[email protected]
       - name: Display Python Version

.github/workflows/mac.yml

@@ -1,26 +1,26 @@
-name: MacCI
-
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version  }}
-      - name: Display Python Version
-        run: python --version
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip tox
-          pip install -r requirements.txt
-
-      - name: Run Tests
-        run: |
-          tox
+name: MacCI
+
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ matrix.python-version  }}
+      - name: Display Python Version
+        run: python --version
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip tox
+          pip install -r requirements.txt
+
+      - name: Run Tests
+        run: |
+          tox

.github/workflows/ubuntu.yml

@@ -0,0 +1,26 @@
+name: UbuntuCI
+
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/[email protected]
+        with:
+          python-version: ${{ matrix.python-version  }}
+      - name: Display Python Version
+        run: python --version
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip tox
+          pip install -r requirements.txt
+
+      - name: Run Tests
+        run: |
+          tox

.github/workflows/windows.yml

@@ -1,25 +1,25 @@
-name: WindowsCI
-
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version  }}
-      - name: Display Python Version
-        run: python --version
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip tox torrentfile
-          pip install -r requirements.txt
-      - name: Run Tests
-        run: |
-          tox
+name: WindowsCI
+
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ matrix.python-version  }}
+      - name: Display Python Version
+        run: python --version
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip tox torrentfile
+          pip install -r requirements.txt
+      - name: Run Tests
+        run: |
+          tox

CHANGELOG.md

@@ -1,5 +1,27 @@
 # QStyler CHANGELOG
 
+## Version 0.1.4
+
+-   Switched gifs in readme
+-   Bug Fixes
+-   Passing all unittests
+-   Fixed linting checkers
+
+* * *
+
+## Version 0.1.4
+
+-   Improved toolbar widget
+-   Added new icons for toolbar actions
+-   Improved and added to Unit testing framework
+-   Updated and expanded CI integration
+-   Fixed issue with menubar actions
+-   Improved coverage data and quality
+-   Bug Fixes
+-   Added 2 new themes
+
+* * *
+
 ## Version 0.1.3
 
 -   Added toolbar to styler menu

Manifest.in

@@ -1,12 +1,13 @@
-include requirements.txt
-include Makefile
-include tox.ini
-include CHANGELOG.md
-
-recursive-include .github *
-
-recursive-include QStyler/icons *
-
-recursive-include assets *
-
-recursive-include QStyler/style *
+include requirements.txt
+include Makefile
+include tox.ini
+include CHANGELOG.md
+
+recursive-include assets *
+recursive-include .github *
+
+recursive-include QStyler/icons *
+recursive-include QStyler/themes *
+recursive-include QStyler/data *
+
+recursive-exclude .tox *

QStyler/actions.py

@@ -55,11 +55,16 @@ def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.layout = QVBoxLayout()
         self.setLayout(self.layout)
-        self.label = QLabel("Theme Title", self)
-        self.setWindowTitle("Load Theme")
+        self.resize(300, 100)
+        self.label = QLabel("Theme Name", self)
+        self.label2 = QLabel("File Location", self)
+        self.setWindowTitle("Load Qss Theme")
         self.lineEdit = QLineEdit(self)
+        self.lineEdit2 = QLineEdit(self)
         self.layout.addWidget(self.label)
         self.layout.addWidget(self.lineEdit)
+        self.layout.addWidget(self.label2)
+        self.layout.addWidget(self.lineEdit2)
         self.btn1 = QPushButton("Select File", self)
         self.btn2 = QPushButton("OK", self)
         self.hlayout = QHBoxLayout()
@@ -69,24 +74,25 @@ def __init__(self, parent=None):
         self.label.setAlignment(Qt.AlignLeft)
         self.btn1.clicked.connect(self.loadTheme)
         self.btn2.clicked.connect(self.closeDialog)
-        self.path = None
 
     def loadTheme(self):
         """Load new theme into database."""
         result = QFileDialog.getOpenFileName(self, "Select .qss File",
                                              str(Path().home()),
                                              "QSS(*.qss), Any(*)")
-        if result[1]:
-            self.path = result[0]
+        if result and result[1]:
+            path = result[0]
+            self.lineEdit2.setText(path)
             name, _ = os.path.splitext(os.path.basename(self.path))
             self.lineEdit.setText(name)
 
     def closeDialog(self):
         """Close dialog and return file path if selected."""
         text = self.lineEdit.text()
-        path = self.path if self.path else ""
+        path = self.lineEdit2.text()
         self.closing.emit(text, path)
         self.close()
+        self.deleteLater()
 
 
 class LoadAction(QAction):
@@ -105,7 +111,7 @@ def loadTheme(self):  # pragma: nocover
         self.dialog.closing.connect(self.getThemeFile)
         self.dialog.open()
 
-    def getThemeFile(self, title, path):
+    def getThemeFile(self, title: str, path: str):
         """Open and save data in file path as title theme."""
         if path and title:
             parser = QssParser(path)
@@ -121,11 +127,10 @@ def edit_current_sheet(self):  # pragma: nocover
         sheet = QApplication.instance().styleSheet()
         self.manager = get_manager()
         self.dialog = QWidget()
-        self.dialog.resize(400, 280)
-        layout = QVBoxLayout()
-        self.dialog.setLayout(layout)
+        self.dialog.resize(300, 450)
+        layout = QVBoxLayout(self.dialog)
         textEdit = QPlainTextEdit(self.dialog)
-        self.dialog.setWindowTitle("StyleSheet Editor")
+        self.dialog.setWindowTitle("Edit Current StyleSheet")
         layout.addWidget(textEdit)
         savebtn = QPushButton("Apply", parent=self.dialog)
         cancelbtn = QPushButton("Cancel", parent=self.dialog)
@@ -148,10 +153,9 @@ def applyStyleSheet(self):  # pragma: nocover
         text = self.dialog.textEdit.toPlainText()
         converter = QssParser(text)
         self.manager.reset()
-        self.manager.sheets = converter.result
+        self.manager.sheets = converter.collection
         self.manager.set_sheet()
-        self.dialog.close()
-        self.dialog.deleteLater()
+        self.closeDialog()
 
 
 class ShowAction(QAction):
@@ -161,17 +165,13 @@ def showStyles(self):  # pragma: nocover
         """Show the current stylesheet in a separate widget."""
         sheet = QApplication.instance().styleSheet()
         self.dialog = QWidget()
-        self.dialog.resize(300, 200)
-        layout = QVBoxLayout()
-        self.dialog.setLayout(layout)
-        self.dialog.setWindowTitle("Current Style Sheet")
+        self.dialog.resize(300, 400)
+        layout = QVBoxLayout(self.dialog)
+        self.dialog.setWindowTitle("Current Style Sheet Theme")
         textEdit = QTextBrowser(parent=self.dialog)
         textEdit.setPlainText(sheet)
         layout.addWidget(textEdit)
         self.dialog.show()
-        button = QPushButton("Save", self.dialog)
-        layout.addWidget(button)
-        button.clicked.connect(saveQss)
 
 
 def saveQss():  # pragma: nocover

QStyler/menubar.py

@@ -52,9 +52,9 @@ def __init__(self, parent) -> None:
         self.window = parent
         self.manager = get_manager()
         self.loadAction = LoadAction()
-        self.loadAction.setText("Load Theme File")
+        self.loadAction.setText("Import Theme")
         self.fileMenu = FileMenu("File", parent=self)
-        self.optionsMenu = ThemeMenu("Theme", parent=self)
+        self.optionsMenu = ThemeMenu("Themes", parent=self)
         self.helpMenu = HelpMenu("Help", parent=self)
         self.addMenu(self.fileMenu)
         self.addMenu(self.optionsMenu)
@@ -88,9 +88,15 @@ def __init__(self, text: str, parent=None) -> None:
         self.aboutqt = QAction("About Qt")
         self.addAction(self.aboutqt)
         self.aboutqt.triggered.connect(QApplication.instance().aboutQt)
-        self.repolink = QAction("Github Repo")
+        self.repolink = QAction("Open Github Repo")
         self.addAction(self.repolink)
         self.repolink.triggered.connect(opengithub)
+        self.aboutQstyler = QAction("About QStyler")
+        self.addAction(self.aboutQstyler)
+        self.aboutQstyler.triggered.connect(self.open_about)
+
+    def open_about(self):
+        """Open the about QStyler Dialog."""
 
 
 class ThemeMenu(QMenu):
@@ -120,7 +126,7 @@ def __init__(self, text: str, parent=None) -> None:
         self.manager = get_manager()
         self.titles = self.manager.titles
         self.resetAction = QAction("Reset Theme")
-        self.saveCurrent = QAction("Save Current Theme")
+        self.saveCurrent = QAction("Save Theme As")
         self.resetAction.triggered.connect(self.manager.reset)
         toolbar = parent.window.styler.toolbar
         toolbar.loadAction = self.parent().loadAction
@@ -129,8 +135,8 @@ def __init__(self, text: str, parent=None) -> None:
         self.saveCurrent.triggered.connect(self.createTheme)
         self.addAction(self.parent().loadAction)
         self.addAction(self.saveCurrent)
-        self.addMenu(self.themeMenu)
         self.addAction(self.resetAction)
+        self.addMenu(self.themeMenu)
         self.themeactions = []
         for title in self.titles:
             action = QAction(title)

QStyler/styler.py

@@ -135,7 +135,7 @@ def updateProp(self, row, column):
         prop = cbox.currentText()
         sheet = self.currentSheet()
         if prop in sheet:
-            self.item(row, 1).setText(sheet[prop])
+            self.item(row, 1).setText(sheet[prop])  # pragma: nocover
         else:
             self.item(row, 1).setText("")
 
@@ -368,11 +368,13 @@ def add_widget_combo(self):
     def minus_widget_combo(self):
         """Remove a widget combo box group."""
         if len(self.boxgroups) > 0:
-            box = self.boxgroups[-1]
-            del self.boxgroups[-1]
-            box.deleteLater()
-            box.destroy()
-            self.layout.removeWidget(box)
+            groupbox = self.boxgroups[-1]
+            groupbox.delete_widgets()
+            index = self.layout.indexOf(groupbox)
+            self.layout.takeAt(index)
+            self.boxgroups = self.boxgroups[:-1]
+            groupbox.deleteLater()
+            groupbox.destroy()
         else:
             self.window.statusbar.showMessage("Nothing to remove.", 4000)
 
@@ -484,3 +486,13 @@ def __init__(self, parent=None):
         self.control_combo.currentIndexChanged.connect(
             parent.statusChanged.emit)
         self.combo.widgetChanged.connect(parent.statusChanged.emit)
+
+    def delete_widgets(self):
+        """Delete all widgets in the GroupBox."""
+        for combo in [self.combo, self.control_combo, self.state_combo]:
+            index = self.layout.indexOf(combo)
+            item = self.layout.takeAt(index)
+            combo.destroy()
+            combo.deleteLater()
+            item.widget().destroy()
+            item.widget().deleteLater()

QStyler/version.py

@@ -18,4 +18,4 @@
 ##############################################################################
 """Version File."""
 
-__version__ = "0.1.4"
+__version__ = "0.1.5"