Title editor: Use ColorPicker

Author: ferdnyc

src/windows/title_editor.py

@@ -34,7 +34,7 @@
 import tempfile
 from xml.dom import minidom
 
-from PyQt5.QtCore import Qt, QTimer
+from PyQt5.QtCore import Qt, pyqtSlot, QTimer
 from PyQt5 import QtGui
 from PyQt5.QtWidgets import (
     QGraphicsScene, QMessageBox, QDialog, QColorDialog, QFontDialog,
@@ -47,7 +47,9 @@
 from classes.logger import log
 from classes.app import get_app
 from classes.metrics import track_metric_screen
+
 from windows.views.titles_listview import TitlesListView
+from windows.color_picker import ColorPicker
 
 import json
 
@@ -369,43 +371,51 @@ def writeToFile(self, xmldoc):
         except IOError as inst:
             log.error("Error writing SVG title: {}".format(inst))
 
+    def save_and_reload(self):
+        """Something changed, so update temp SVG and redisplay"""
+        self.writeToFile(self.xmldoc)
+        self.display_svg()
+
+    @pyqtSlot(QtGui.QColor)
+    def color_callback(self, save_fn, refresh_fn, color):
+        """Update SVG color after user selection"""
+        if not color or not color.isValid():
+            return
+        save_fn(color.name(), color.alphaF())
+        refresh_fn()
+        self.save_and_reload()
+
     def btnFontColor_clicked(self):
         app = get_app()
         _ = app._tr
 
+        callback_func = functools.partial(
+            self.color_callback,
+            self.set_font_color_elements,
+            self.update_font_color_button)
         # Get color from user
-        col = QColorDialog.getColor(self.font_color_code, self, _("Select a Color"),
-                                    QColorDialog.DontUseNativeDialog | QColorDialog.ShowAlphaChannel)
-
-        # Update SVG colors
-        if col.isValid():
-            self.set_font_color_elements(col.name(), col.alphaF())
-            self.update_font_color_button()
-
-            # Something changed, so update temp SVG
-            self.writeToFile(self.xmldoc)
-
-            # Display SVG again
-            self.display_svg()
+        log.debug("Launching color picker for %s", self.font_color_code.name())
+        ColorPicker(
+            self.font_color_code, parent=self,
+            title=_("Select a Color"),
+            extra_options=QColorDialog.ShowAlphaChannel,
+            callback=callback_func)
 
     def btnBackgroundColor_clicked(self):
         app = get_app()
         _ = app._tr
 
+        callback_func = functools.partial(
+            self.color_callback,
+            self.set_bg_style,
+            self.update_background_color_button)
         # Get color from user
-        col = QColorDialog.getColor(self.bg_color_code, self, _("Select a Color"),
-                                    QColorDialog.DontUseNativeDialog | QColorDialog.ShowAlphaChannel)
-
-        # Update SVG colors
-        if col.isValid():
-            self.set_bg_style(col.name(), col.alphaF())
-            self.update_background_color_button()
-
-            # Something changed, so update temp SVG
-            self.writeToFile(self.xmldoc)
-
-            # Display SVG again
-            self.display_svg()
+        log.debug("Launching color picker for %s", self.bg_color_code.name())
+        ColorPicker(
+            self.bg_color_code, parent=self,
+            title=_("Select a Color"),
+            extra_options=QColorDialog.ShowAlphaChannel,
+            callback=callback_func)
 
     def btnFont_clicked(self):
         app = get_app()