Updates to UI (#32)

* updates

* bump version 0.1.8

* bump version 0.1.8

* bump version 0.1.8

* updated ci/cd

Author: alexpdev

.github/workflows/ubuntu.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', ]
 
     steps:
       - uses: actions/checkout@v3
@@ -24,4 +24,10 @@ jobs:
           sudo apt-get install libglx0 libglx-mesa0 libegl-mesa0 libegl1 -y
       - name: Run Tests
         run: |
-          tox
+          tox -e pylint
+          tox -e pycodestyle
+          tox -e security
+          tox -e format
+          tox -e pyroma
+          tox -e twinecheck
+          tox -e flake8

CHANGELOG.md

@@ -1,5 +1,10 @@
 # QStyler CHANGELOG
 
+## Version 0.1.8
+
+-   Added new tool button that allows the user to extend screen so they can watch the effects of edits while editing.
+-   Added unittests for the new expansion.
+
 ## Version 0.1.7
 
 -   Major update to UI

QStyler/icons/extend-left.png

@@ -179,12 +179,14 @@ class ToolBar(QToolBar):
     """Tool bar widget for themes."""
 
     imported = Signal(str)
+    extend = Signal(bool)
     themes_dir = Path(__file__).parent / "themes"
 
     def __init__(self):
         """Construct tool bar."""
         super().__init__()
         self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon)
+        self.extended_state = False
         self.live_action = QAction(get_icon("live"), "live view", self)
         self.preview_action = QAction(get_icon("preview"), "preview", self)
         self.load_action = QAction(get_icon("confirm"), "load", self)
@@ -194,6 +196,7 @@ def __init__(self):
         self.live_action.setChecked(True)
         self.preview_action.setCheckable(True)
         self.preview_action.setChecked(False)
+        self.preview_action.setEnabled(False)
         self.addActions(
             [
                 self.live_action,
@@ -230,12 +233,27 @@ def __init__(self):
         )
         self.addSeparator()
         self.addAction(self.github_action)
+        self.addSeparator()
+        self.extend_action = QAction(get_icon("extend-right"), "extend", self)
+        self.addAction(self.extend_action)
         self.github_action.triggered.connect(open_github_browser)
         self.live_action.triggered.connect(self.activate_load)
         self.rename_action.triggered.connect(self.rename_theme)
         self.new_action.triggered.connect(self.new_dialog)
         self.delete_action.triggered.connect(self.delete_theme)
         self.import_action.triggered.connect(self.import_theme)
+        self.extend_action.triggered.connect(self.on_extended)
+
+    def on_extended(self):
+        """Triggers extending the screen to view widgets while styling them."""
+        if not self.extended_state:
+            self.extend_action.setIcon(get_icon("extend-left"))
+            self.extended_state = True
+            self.extend.emit(True)
+        else:
+            self.extend_action.setIcon(get_icon("extend-right"))
+            self.extended_state = False
+            self.extend.emit(False)
 
     def delete_theme(self):
         """Delete the current theme in combo box."""
@@ -248,8 +266,10 @@ def activate_load(self, state):
         """Activate or deactivate load button."""
         if state:
             self.load_action.setDisabled(True)
+            self.preview_action.setDisabled(True)
         else:
             self.load_action.setDisabled(False)
+            self.preview_action.setDisabled(False)
 
     def set_theme_name(self, new, old):
         """Set the new name for current theme."""
@@ -303,6 +323,8 @@ def import_theme(self):  # pragma: nocover
 class StylerTab(QWidget):
     """Styler Widget."""
 
+    extend = Signal(bool)
+
     def __init__(self, parent=None):
         """Construct styler widget."""
         super().__init__(parent)
@@ -367,6 +389,7 @@ def __init__(self, parent=None):
         self.toolbar.themes_combo.currentTextChanged.connect(
             self.set_current_theme
         )
+        self.toolbar.extend.connect(self.extend.emit)
 
     def save_sheet(self):
         """Save the current content of the editor to theme doc."""
@@ -492,3 +515,15 @@ def parse_changes(self):
         except ParsingError as err:  # pragma: nocover
             a = str(err)
             self.window().statusBar().showMessage(f"Error near line {a}", 2000)
+
+    def export_theme(self):  # pragma: nocover
+        """Export current editor contents to qss file."""
+        current_theme = self.editor.text()
+        path = QFileDialog.getSaveFileName(self, caption="Save Path")
+        if path and not os.path.exists(path):
+            if not path.lower().endswith(".qss"):
+                path += ".qss"
+            with open(path, "wt", encoding="utf8") as fd:
+                fd.write(current_theme)
+        else:
+            self.window().statusBar().showMessage(f"Error saving to {path}")

QStyler/icons/extend-right.png

@@ -18,4 +18,4 @@
 ##############################################################################
 """Version File."""
 
-__version__ = "0.1.7"
+__version__ = "0.1.8"

QStyler/styler.py

@@ -21,8 +21,8 @@
 import sys
 from typing import Optional
 
-from PySide6.QtWidgets import (QApplication, QMainWindow, QTabWidget,
-                               QTextBrowser, QVBoxLayout, QWidget)
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QMainWindow,
+                               QTabWidget, QVBoxLayout, QWidget)
 
 from QStyler.collectionsTab import CollectionsTab
 from QStyler.editorTab import EditorsTab
@@ -48,13 +48,19 @@ def __init__(self, parent: Optional[QWidget] = None) -> None:
         """Initialize main window."""
         super().__init__(parent=parent)
         self.setWindowTitle("QStyler")
+        self.widget = QWidget()
+        self.layout = QHBoxLayout(self.widget)
+        self.leftWidget = QWidget()
+        self.leftLayout = QVBoxLayout(self.leftWidget)
         self.tabWidget = QTabWidget()
-        self.setCentralWidget(self.tabWidget)
+        self.leftWidget.setHidden(True)
+        self.setCentralWidget(self.widget)
+        self.layout.addWidget(self.leftWidget)
+        self.layout.addWidget(self.tabWidget)
         self.setObjectName("MainWindow")
         self.resize(900, 700)
         self.setWindowIcon(get_icon("QStylerIcon.png"))
         self.menubar = MenuBar(self)
-        self.menubar.displayStyles.connect(self.showStyles)
         self.statusbar = self.statusBar()
         self.setMenuBar(self.menubar)
         self.add_widgets()
@@ -69,18 +75,24 @@ def add_widgets(self):
         self.tabWidget.addTab(self.widgets, "Widgets")
         self.tabWidget.addTab(self.editors, "Editors")
         self.tabWidget.addTab(self.collections, "Collections")
-
-    def showStyles(self):  # pragma: nocover
-        """Show the current stylesheet in a separate widget."""
-        sheet = QApplication.instance().styleSheet()
-        self.dialog = QWidget()
-        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()
+        self.styler.extend.connect(self.on_extend)
+
+    def on_extend(self, state):
+        """Extend the window."""
+        if state:
+            self.tabWidget.removeTab(0)
+            self.leftLayout.addWidget(self.styler)
+            self.styler.show()
+            self.leftWidget.setHidden(False)
+            self.resize(self.width() + 450, self.height())
+        else:
+            self.leftWidget.hide()
+            self.leftLayout.takeAt(0)
+            self.tabWidget.insertTab(0, self.styler, "Style")
+            self.styler.show()
+            self.tabWidget.setCurrentWidget(self.styler)
+            self.tabWidget.show()
+            self.resize(self.width() - 450, self.height())
 
 
 class Application(QApplication):