Merge pull request #124 from dynobo/dev

Switch to icon for settings
dynobo · Jul 15, 2021 · 167031f · 167031f
2 parents 88047ad + 4563cc6
commit 167031f
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 21 deletions.
diff --git a/assets/icons/settings.svg b/assets/icons/settings.svg
diff --git a/src/normcap/gui/settings_menu.py b/src/normcap/gui/settings_menu.py
@@ -181,33 +181,18 @@ def create_button(window: QtWidgets.QMainWindow) -> QtWidgets.QToolButton:
 
     button = QtWidgets.QToolButton(window.ui.top_right_frame)
     button.setFixedSize(38, 38)
-    button.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
-    button.setStyleSheet(
-        """
-        QToolButton::menu-indicator {
-            image: none;
-        }
-        QToolButton {
-            text-align: center;
-            color: red;
-            padding-top: 2px;
-        }
-        """
-    )
+    button.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
 
     # Move Button down on macOS as workaround for not being
     # visible behind the menu bar
     if window.system_info.platform == Platform.MACOS:
         button.move(0, 20)
 
-    font = QtGui.QFont()
-    font.setPixelSize(32)
-    font.setBold(True)
-    button.setFont(font)
-    button.setText("⚙")
-
+    button.setIcon(window.get_icon("settings.png"))
+    button.setIconSize(QtCore.QSize(24, 24))
     button.setPopupMode(QtWidgets.QToolButton.InstantPopup)
     button.setCursor(QtCore.Qt.ArrowCursor)
+
     return button
 
 

diff --git a/src/normcap/resources/base_window.ui b/src/normcap/resources/base_window.ui
@@ -104,7 +104,7 @@
          <property name="minimumSize">
           <size>
            <width>38</width>
-           <height>68</height>
+           <height>72</height>
           </size>
          </property>
          <property name="styleSheet">

diff --git a/src/normcap/resources/settings.png b/src/normcap/resources/settings.png
diff --git a/src/normcap/window_base_ui.py b/src/normcap/window_base_ui.py
@@ -58,7 +58,7 @@ def setupUi(self, BaseWindow):
 
         self.top_right_frame = QFrame(self.frame)
         self.top_right_frame.setObjectName(u"top_right_frame")
-        self.top_right_frame.setMinimumSize(QSize(38, 68))
+        self.top_right_frame.setMinimumSize(QSize(38, 72))
         self.top_right_frame.setStyleSheet(u"border:none;")
         self.top_right_frame.setFrameShape(QFrame.StyledPanel)
         self.top_right_frame.setFrameShadow(QFrame.Raised)