Refactor color button

Author: JanisV

src/ImageEditor.py

@@ -77,15 +77,15 @@
     from OpenNumismat import HOME_PATH, IMAGE_PATH
     from OpenNumismat.Tools import TemporaryDir
     from OpenNumismat.Tools.DialogDecorators import storeDlgSizeDecorator, storeDlgPositionDecorator
-    from OpenNumismat.Tools.Gui import getSaveFileName, Splitter
+    from OpenNumismat.Tools.Gui import getSaveFileName, Splitter, ColorButton
     from OpenNumismat.Tools.misc import readImageFilters, saveImageFilters
     from OpenNumismat import version
 
     PORTABLE = version.Portable
 except ModuleNotFoundError:
     from Tools import TemporaryDir
     from Tools.DialogDecorators import storeDlgSizeDecorator, storeDlgPositionDecorator
-    from Tools.Gui import getSaveFileName, Splitter
+    from Tools.Gui import getSaveFileName, Splitter, ColorButton
     from Tools.misc import readImageFilters, saveImageFilters
 
     HOME_PATH = '.'
@@ -1110,12 +1110,8 @@ def __init__(self, parent=None):
                                          QSizePolicy.Fixed)
         self.main_layout.addRow(self.tr("Backround remover AI model"), self.modelSelector)
 
-        self.window_color = settings.value('image_viewer/window_color', QColor(Qt.white), type=QColor)
-        self.windowColorButton = QPushButton(self)
-        self.windowColorButton.setSizePolicy(QSizePolicy.Fixed,
-                                             QSizePolicy.Fixed)
-        self.updateWindowColorButton(self.window_color)
-        self.windowColorButton.clicked.connect(self.windowColorButtonClicked)
+        color = settings.value('image_viewer/window_color', QColor(Qt.white), type=QColor)
+        self.windowColorButton = ColorButton(color, self)
         self.main_layout.addRow(self.tr("Window backgroud color"), self.windowColorButton)
 
         buttonBox = QDialogButtonBox(Qt.Horizontal)
@@ -1130,23 +1126,11 @@ def __init__(self, parent=None):
 
         self.setLayout(layout)
 
-    def windowColorButtonClicked(self):
-        dlg = QColorDialog(self.window_color, self)
-        if dlg.exec() == QDialog.Accepted:
-            self.window_color = dlg.currentColor()
-            self.updateWindowColorButton(self.window_color)
-
-    def updateWindowColorButton(self, color):
-        pixmap = QPixmap(16, 16)
-        pixmap.fill(color)
-        icon = QIcon(pixmap)
-        self.windowColorButton.setIcon(icon)
-
     def save(self):
         settings = QSettings()
 
         settings.setValue('image_viewer/ai_model', self.modelSelector.currentText())
-        settings.setValue('image_viewer/window_color', self.window_color)
+        settings.setValue('image_viewer/window_color', self.windowColorButton.color())
 
         self.accept()
 
@@ -1405,7 +1389,7 @@ def showScrollPanel(self, status):
     def settings(self):
         dlg = SettingsDialog(self)
         if dlg.exec() == QDialog.Accepted:
-            color = dlg.window_color
+            color = dlg.windowColorButton.color()
             self.viewer.setBackgroundBrush(QBrush(color))
 
     def hasImage(self):

src/ImageEditorWindow.py

@@ -1,11 +1,11 @@
 from PySide6.QtCore import QSettings, QFileInfo, Qt, QStandardPaths, QDir
-from PySide6.QtGui import QIcon, QAction, QBrush, QColor, QImage, QPixmap
-from PySide6.QtWidgets import QApplication, QStyle, QMessageBox, QColorDialog, QDialog, QFileDialog, QPushButton, QSizePolicy, QHBoxLayout, QGroupBox, QRadioButton
+from PySide6.QtGui import QIcon, QAction, QBrush, QColor, QImage
+from PySide6.QtWidgets import QApplication, QStyle, QMessageBox, QDialog, QFileDialog, QHBoxLayout, QGroupBox, QRadioButton
 
 from ImageEditor import ImageEditorDialog, SettingsDialog
 from ImageProxy import ImageProxy
 from ImageScrollLabel import ImageScrollLabel
-from Tools.Gui import getSaveFileName
+from Tools.Gui import getSaveFileName, ColorButton
 from Tools.misc import saveImageFilters
 
 IMAGE_PATH = QStandardPaths.standardLocations(QStandardPaths.PicturesLocation)[0]
@@ -18,12 +18,8 @@ def __init__(self, parent=None):
 
         settings = QSettings()
 
-        self.transparentColorButton = QPushButton(self)
-        self.transparentColorButton.setSizePolicy(QSizePolicy.Fixed,
-                                                  QSizePolicy.Fixed)
-        self.transparent_color = settings.value('mainwindow/transparent_color', QColor(Qt.white), type=QColor)
-        self.updateTransparentColorButton(self.transparent_color)
-        self.transparentColorButton.clicked.connect(self.transparentColorButtonClicked)
+        color = settings.value('mainwindow/transparent_color', QColor(Qt.white), type=QColor)
+        self.transparentColorButton = ColorButton(color, self)
 
         self.transparentRadio = QRadioButton(self.tr("Transparent"))
         self.transparentRadio.toggled.connect(self.transparentRadioToggled)
@@ -50,23 +46,11 @@ def __init__(self, parent=None):
     def transparentRadioToggled(self, checked):
         self.transparentColorButton.setDisabled(checked)
 
-    def transparentColorButtonClicked(self):
-        dlg = QColorDialog(self.transparent_color, self)
-        if dlg.exec() == QDialog.Accepted:
-            self.transparent_color = dlg.currentColor()
-            self.updateTransparentColorButton(self.transparent_color)
-
-    def updateTransparentColorButton(self, color):
-        pixmap = QPixmap(16, 16)
-        pixmap.fill(color)
-        icon = QIcon(pixmap)
-        self.transparentColorButton.setIcon(icon)
-
     def save(self):
         settings = QSettings()
 
         settings.setValue('mainwindow/transparent_store', self.transparentRadio.isChecked())
-        settings.setValue('mainwindow/transparent_color', self.transparent_color)
+        settings.setValue('mainwindow/transparent_color', self.transparentColorButton.color())
 
         super().save()
 
@@ -201,7 +185,7 @@ def saveAs(self):
     def settings(self):
         dlg = WindowSettingsDialog(self)
         if dlg.exec() == QDialog.Accepted:
-            color = dlg.window_color
+            color = dlg.windowColorButton.color()
             self.viewer.setBackgroundBrush(QBrush(color))
 
     def _updateEditActions(self):

src/Tools/Gui.py

@@ -1,7 +1,16 @@
 import os
 
 from PySide6.QtCore import Qt, QSettings
-from PySide6.QtWidgets import QFileDialog, QApplication, QSplitter
+from PySide6.QtGui import QIcon, QPixmap
+from PySide6.QtWidgets import (
+    QApplication,
+    QColorDialog,
+    QDialog,
+    QFileDialog,
+    QPushButton,
+    QSizePolicy,
+    QSplitter,
+)
 
 
 class Splitter(QSplitter):
@@ -28,6 +37,33 @@ def showEvent(self, _e):
             self.splitterMoved.connect(self.splitterPosChanged)
 
 
+class ColorButton(QPushButton):
+
+    def __init__(self, color, parent=None):
+        super().__init__(parent)
+
+        self._color = color
+
+        self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.updateColorButton(self._color)
+        self.clicked.connect(self.colorButtonClicked)
+
+    def color(self):
+        return self._color
+
+    def colorButtonClicked(self):
+        dlg = QColorDialog(self._color, self)
+        if dlg.exec() == QDialog.Accepted:
+            self._color = dlg.currentColor()
+            self.updateColorButton(self._color)
+
+    def updateColorButton(self, color):
+        pixmap = QPixmap(16, 16)
+        pixmap.fill(color)
+        icon = QIcon(pixmap)
+        self.setIcon(icon)
+
+
 def getSaveFileName(parent, name, filename, dir_, filters):
     settings = QSettings()