From 082d26a6a99779beb53fbae0d919b207f6cf2d91 Mon Sep 17 00:00:00 2001 From: samy Date: Thu, 1 Dec 2022 02:41:59 +0100 Subject: [PATCH 1/4] fix theme --- angrmanagement/ui/dialogs/preferences.py | 20 +++++++++++++------- setup.cfg | 1 + 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/angrmanagement/ui/dialogs/preferences.py b/angrmanagement/ui/dialogs/preferences.py index 6096b5c0f..afa4bc02d 100644 --- a/angrmanagement/ui/dialogs/preferences.py +++ b/angrmanagement/ui/dialogs/preferences.py @@ -1,8 +1,8 @@ -from PySide6.QtGui import QColor -from PySide6.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QListWidget, QListView, QStackedWidget, QWidget, \ +from PySide2.QtGui import QColor +from PySide2.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QListWidget, QListView, QStackedWidget, QWidget, \ QGroupBox, QLabel, QCheckBox, QPushButton, QLineEdit, QListWidgetItem, QScrollArea, QFrame, QComboBox, \ QSizePolicy, QDialogButtonBox -from PySide6.QtCore import QSize +from PySide2.QtCore import QSize from ..widgets.qcolor_option import QColorOption from ...config.config_manager import ENTRIES @@ -11,6 +11,8 @@ from ...logic.url_scheme import AngrUrlScheme from ..css import refresh_theme +from darkdetect import isDark + class Page(QWidget): """ @@ -143,9 +145,13 @@ def _init_widgets(self): self.setLayout(page_layout) def _load_color_scheme(self, name): - for prop, value in COLOR_SCHEMES[name].items(): - row = self._to_save[prop][1] - row.set_color(value) + if name in COLOR_SCHEMES: + for prop, value in COLOR_SCHEMES[name].items(): + row = self._to_save[prop][1] + row.set_color(value) + else: + name = "Dark" if isDark() else "Light" + self._load_color_scheme(name) def _on_load_scheme_clicked(self): self._load_color_scheme(self._schemes_combo.currentText()) @@ -221,4 +227,4 @@ def _on_ok_clicked(self): for page in self._pages: page.save_config() save_config() - self.close() + self.close() \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index a52c11ee0..123e6afd7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,6 +28,7 @@ install_requires = getmac QtAwesome pyobjc-framework-Cocoa; platform_system == "Darwin" + darkdetect python_requires = >= 3.8 include_package_data = True From c760e0c5c2a2d99a6e0b806a4d48c6deb1464d9f Mon Sep 17 00:00:00 2001 From: samy Date: Thu, 1 Dec 2022 03:20:50 +0100 Subject: [PATCH 2/4] works with refactor PySide6 --- angrmanagement/ui/dialogs/preferences.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/angrmanagement/ui/dialogs/preferences.py b/angrmanagement/ui/dialogs/preferences.py index afa4bc02d..98e35c619 100644 --- a/angrmanagement/ui/dialogs/preferences.py +++ b/angrmanagement/ui/dialogs/preferences.py @@ -1,9 +1,9 @@ -from PySide2.QtGui import QColor -from PySide2.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QListWidget, QListView, QStackedWidget, QWidget, \ +from PySide6.QtGui import QColor +from PySide6.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QListWidget, QListView, QStackedWidget, QWidget, \ QGroupBox, QLabel, QCheckBox, QPushButton, QLineEdit, QListWidgetItem, QScrollArea, QFrame, QComboBox, \ QSizePolicy, QDialogButtonBox -from PySide2.QtCore import QSize - + +from PySide6.QtCore import QSize from ..widgets.qcolor_option import QColorOption from ...config.config_manager import ENTRIES from ...config.color_schemes import COLOR_SCHEMES From c76668f48b15db91bbd6df74ffcd08dc5b5163b2 Mon Sep 17 00:00:00 2001 From: samy Date: Thu, 1 Dec 2022 03:31:37 +0100 Subject: [PATCH 3/4] works with refactor PySide6 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 123e6afd7..b1e25aec0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,9 +26,9 @@ install_requires = pyqodeng >= 0.0.6 qtterm getmac + darkdetect QtAwesome pyobjc-framework-Cocoa; platform_system == "Darwin" - darkdetect python_requires = >= 3.8 include_package_data = True From be013023aca7b5590506a4751ca56fdee429baf7 Mon Sep 17 00:00:00 2001 From: samy Date: Thu, 1 Dec 2022 11:12:18 +0100 Subject: [PATCH 4/4] fix lint ? --- angrmanagement/ui/dialogs/preferences.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/angrmanagement/ui/dialogs/preferences.py b/angrmanagement/ui/dialogs/preferences.py index 98e35c619..e60aba63d 100644 --- a/angrmanagement/ui/dialogs/preferences.py +++ b/angrmanagement/ui/dialogs/preferences.py @@ -2,8 +2,9 @@ from PySide6.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QListWidget, QListView, QStackedWidget, QWidget, \ QGroupBox, QLabel, QCheckBox, QPushButton, QLineEdit, QListWidgetItem, QScrollArea, QFrame, QComboBox, \ QSizePolicy, QDialogButtonBox - + from PySide6.QtCore import QSize +from darkdetect import isDark from ..widgets.qcolor_option import QColorOption from ...config.config_manager import ENTRIES from ...config.color_schemes import COLOR_SCHEMES @@ -11,8 +12,6 @@ from ...logic.url_scheme import AngrUrlScheme from ..css import refresh_theme -from darkdetect import isDark - class Page(QWidget): """ @@ -227,4 +226,4 @@ def _on_ok_clicked(self): for page in self._pages: page.save_config() save_config() - self.close() \ No newline at end of file + self.close()