Fix style bug and example

rascal2/dialogs/settings_dialog.py

@@ -3,11 +3,12 @@
 import sys
 from contextlib import suppress
 
-from PyQt6 import QtCore, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 from rascal2.config import LOGGER, SETTINGS, MatlabHelper
 from rascal2.paths import MATLAB_ARCH_FILE
 from rascal2.settings import SettingsGroups, change_ui_style
+from rascal2.theme import IconEngine
 from rascal2.widgets.inputs import get_validated_input
 
 
@@ -152,7 +153,7 @@ def __init__(self):
         self.matlab_path.setPlaceholderText("Select MATLAB directory")
         self.matlab_path.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
 
-        browse_button = QtWidgets.QPushButton("Browse", objectName="BrowseButton")
+        browse_button = QtWidgets.QPushButton(QtGui.QIcon(IconEngine("browse-light.png")), "Browse")
         browse_button.clicked.connect(self.open_folder_selector)
         form_layout.addWidget(self.matlab_path, 0, 0, 1, 4)
         form_layout.addWidget(browse_button, 0, 4, 1, 1)

rascal2/dialogs/startup_dialog.py

@@ -2,12 +2,13 @@
 import traceback
 from pathlib import Path
 
-from PyQt6 import QtCore, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 from rascal2.config import LOGGER
 from rascal2.core.worker import Worker
 from rascal2.paths import EXAMPLES_PATH
 from rascal2.settings import update_recent_projects
+from rascal2.theme import IconEngine
 
 # global variable for required project files
 PROJECT_FILES = ["controls.json", "project.json"]
@@ -84,7 +85,7 @@ def create_buttons(self) -> list[QtWidgets.QWidget]:
         list[QtWidgets.QWidget]
             A list of the widgets to be added to the bottom of the dialog, from left to right.
         """
-        self.cancel_button = QtWidgets.QPushButton("Cancel", objectName="CancelButton")
+        self.cancel_button = QtWidgets.QPushButton(QtGui.QIcon(IconEngine("cancel-light.png")), "Cancel")
         self.cancel_button.clicked.connect(self.reject)
 
         return [self.cancel_button]
@@ -107,7 +108,7 @@ def create_form(self, form_layout):
         self.project_folder.setPlaceholderText("Select project folder")
         self.project_folder.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
 
-        browse_button = QtWidgets.QPushButton("Browse", objectName="BrowseButton")
+        browse_button = QtWidgets.QPushButton(QtGui.QIcon(IconEngine("browse-light.png")), "Browse")
         browse_button.clicked.connect(self.open_folder_selector)
 
         self.project_folder_error = QtWidgets.QLabel("", objectName="ErrorLabel")
@@ -237,7 +238,7 @@ def create_form(self, form_layout):
         super().create_form(form_layout)
 
     def create_buttons(self) -> list[QtWidgets.QWidget]:
-        create_button = QtWidgets.QPushButton("Create", objectName="CreateButton")
+        create_button = QtWidgets.QPushButton(QtGui.QIcon(IconEngine("create-light.png")), "Create")
         create_button.clicked.connect(self.create_project)
 
         return [create_button] + super().create_buttons()
@@ -381,7 +382,7 @@ def create_recent_tab(self):
             item.setSizeHint(item_widget.sizeHint())
 
     def create_buttons(self) -> list[QtWidgets.QWidget]:
-        load_button = QtWidgets.QPushButton("Load", objectName="LoadButton")
+        load_button = QtWidgets.QPushButton(QtGui.QIcon(IconEngine("load-light.png")), "Load")
         load_button.clicked.connect(self.load_project)
 
         return [load_button] + super().create_buttons()
@@ -450,7 +451,7 @@ def create_form(self, form_layout):
         self.project_folder.setPlaceholderText("Select RasCAL-1 file")
 
     def create_buttons(self):
-        load_button = QtWidgets.QPushButton("Load", objectName="LoadButton")
+        load_button = QtWidgets.QPushButton(QtGui.QIcon(IconEngine("load-light.png")), "Load")
         load_button.clicked.connect(self.load_project)
 
         return [load_button] + super().create_buttons()

rascal2/static/style.css

@@ -147,22 +147,6 @@ StartUpWidget QToolButton#ImportR1Button{
     StartUpDialog Styles
 *****************************/
 
-StartupDialog #CancelButton {
-    icon: url(@Path/cancel-dark.png);
-}
-
-StartupDialog #BrowseButton {
-    icon: url(@Path/browse-light.png);
-}
-
-StartupDialog #CreateButton {
-    icon: url(@Path/create-light.png);
-}
-
-StartupDialog #LoadButton {
-    icon: url(@Path/load-light.png);
-}
-
 StartupDialog > QLabel {
     font-weight: bold;
 }
@@ -171,8 +155,6 @@ StartupDialog QLineEdit[error="true"] {
     border: 1px solid #E34234;
 }
 
-StartupDialog QListWidget::item{color:green;}
-
 StartupDialog QListWidget::item:hover {
     background-color: @Highlight;
 }
@@ -414,6 +396,10 @@ QMenuBar::item:pressed {
   color: black;
 }
 
+QMenu::item:selected {
+  color: @HighlightedText;
+}
+
 /*****************************
    ProjectListWidget Styles
 *****************************/
@@ -433,7 +419,7 @@ AbstractProjectListWidget QTableView {
 
 AbstractProjectListWidget QTableView::item:selected:!active{
     background-color: @Highlight;
-    color: @HighlightText;
+    color: @HighlightedText;
 }
 
 #CountHeader::section {

rascal2/widgets/plot.py

@@ -79,7 +79,6 @@ def __init__(self, parent):
         self.resize_timer = 0
 
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose)
-        self.setWindowFlag(QtCore.Qt.WindowType.WindowMaximizeButtonHint, True)
 
         layout = QtWidgets.QVBoxLayout()
         self.plot_tabs = QtWidgets.QTabWidget()