Animated titles: Use ColorPicker

Author: ferdnyc

src/windows/views/blender_listview.py

@@ -44,7 +44,7 @@
     Qt, QObject, pyqtSlot, pyqtSignal, QThread, QTimer, QSize,
 )
 from PyQt5.QtWidgets import (
-    QApplication, QListView, QMessageBox, QColorDialog,
+    QApplication, QListView, QMessageBox,
     QComboBox, QDoubleSpinBox, QLabel, QPushButton, QLineEdit, QPlainTextEdit,
 )
 from PyQt5.QtGui import QColor, QImage, QPixmap
@@ -54,7 +54,9 @@
 from classes import settings
 from classes.query import File
 from classes.app import get_app
+
 from windows.models.blender_model import BlenderModel
+from windows.color_picker import ColorPicker
 
 
 class BlenderListView(QListView):
@@ -228,24 +230,13 @@ def color_button_clicked(self, widget, param, index):
             currentColor.setRgbF(color_value[0], color_value[1], color_value[2])
         # Store our arguments for the callback to pick up again
         self._color_scratchpad = (widget, param)
-
-        # Set up non-modal color dialog (to avoid blocking the eyedropper)
-        self.newColorDialog = QColorDialog(currentColor, self.win)
-        self.newColorDialog.setWindowTitle(_("Select a Color"))
-        self.newColorDialog.setWindowFlags(Qt.Tool)
-        self.newColorDialog.setOptions(QColorDialog.DontUseNativeDialog)
-        # Avoid signal loops
-        self.newColorDialog.blockSignals(True)
-        self.newColorDialog.colorSelected.connect(self.color_selected)
-        self.newColorDialog.finished.connect(self.newColorDialog.deleteLater)
-        self.newColorDialog.blockSignals(False)
-        self.newColorDialog.open()
+        ColorPicker(currentColor, callback=self.color_selected, parent=self.win)
 
     @pyqtSlot(QColor)
     def color_selected(self, newColor):
-        """QColorDialog callback when the user chooses a color"""
+        """Callback when the user chooses a color in the dialog"""
         if not self._color_scratchpad:
-            log.warning("QColorDialog callback called without parameter to set")
+            log.warning("ColorPicker callback called without parameter to set")
             return
         (widget, param) = self._color_scratchpad
         if not newColor or not newColor.isValid():
@@ -673,7 +664,6 @@ def __init__(self, parent, *args):
         self.selected = None
         self.deselected = None
         self._color_scratchpad = None
-        self.newColorDialog = None
         self.selected_template = ""
         self.final_render = False