Properties: Use ColorPicker

Author: ferdnyc

src/windows/views/properties_tableview.py

@@ -26,24 +26,27 @@
  """
 
 import os
-from functools import partial
+import functools
 from operator import itemgetter
-from PyQt5.QtCore import Qt, QRectF, QLocale, pyqtSignal, QTimer
+
+from PyQt5.QtCore import Qt, QRectF, QLocale, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import (
     QIcon, QColor, QBrush, QPen, QPalette, QPixmap,
     QPainter, QPainterPath, QLinearGradient, QFont, QFontInfo,
 )
 from PyQt5.QtWidgets import (
     QTableView, QAbstractItemView, QMenu, QSizePolicy,
-    QHeaderView, QColorDialog, QItemDelegate, QStyle, QLabel,
+    QHeaderView, QItemDelegate, QStyle, QLabel,
     QPushButton, QHBoxLayout, QFrame, QFontDialog
 )
 
 from classes.logger import log
 from classes.app import get_app
 from classes import info
 from classes.query import Clip, Effect, Transition
+
 from windows.models.properties_model import PropertiesModel
+from windows.color_picker import ColorPicker
 
 import openshot
 
@@ -297,6 +300,13 @@ def mouseReleaseEvent(self, event):
         self.lock_selection = False
         self.previous_x = -1
 
+    @pyqtSlot(QColor)
+    def color_callback(self, newColor: QColor):
+        # Set the new color keyframe
+        if newColor.isValid():
+            self.clip_properties_model.color_update(
+                self.selected_item, newColor)
+
     def doubleClickedCB(self, model_index):
         """Double click handler for the property table"""
 
@@ -322,12 +332,11 @@ def doubleClickedCB(self, model_index):
 
                 # Show color dialog
                 currentColor = QColor(red, green, blue)
-                newColor = QColorDialog.getColor(currentColor, self, _("Select a Color"),
-                                                 QColorDialog.DontUseNativeDialog)
-
-                # Set the new color keyframe
-                if newColor.isValid():
-                    self.clip_properties_model.color_update(self.selected_item, newColor)
+                log.debug("Launching ColorPicker for %s", currentColor.name())
+                ColorPicker(
+                    currentColor, parent=self, title=_("Select a Color"),
+                    callback=self.color_callback)
+                return
 
             elif property_type == "font":
                 # Get font from user
@@ -381,7 +390,7 @@ def filter_changed(self, value=None):
         self.clip_properties_model.update_model(value)
 
     def contextMenuEvent(self, event):
-        """ Display context menu, or release lock when menu displays """
+        """ Display context menu """
         # Get property being acted on
         index = self.indexAt(event.pos())
         if not index.isValid():
@@ -469,6 +478,7 @@ def contextMenuEvent(self, event):
                     track_name = track.get("label") or _("Track %s") % display_count
                     self.choices.append({"name": track_name, "value": track.get("number"), "selected": False, "icon": None})
                     display_count -= 1
+                return
 
             elif self.property_type == "font":
                 # Get font from user
@@ -480,7 +490,6 @@ def contextMenuEvent(self, event):
                 if ok and font:
                     fontinfo = QFontInfo(font)
                     self.clip_properties_model.value_updated(self.selected_item, value=fontinfo.family())
-                return self.contextMenuEvent(event, release=True)
 
             elif self.property_type == "color":
                 # Get current value of color
@@ -490,13 +499,11 @@ def contextMenuEvent(self, event):
 
                 # Show color dialog
                 currentColor = QColor(red, green, blue)
-                newColor = QColorDialog.getColor(currentColor, self, _("Select a Color"),
-                                                 QColorDialog.DontUseNativeDialog)
-
-                # Set the new color keyframe
-                if newColor.isValid():
-                    self.clip_properties_model.color_update(self.selected_item, newColor)
-                return self.contextMenuEvent(event, release=True)
+                log.debug("Launching ColorPicker for %s", currentColor.name())
+                ColorPicker(
+                    currentColor, parent=self, title=_("Select a Color"),
+                    callback=self.color_callback)
+                return
 
             # Define bezier presets
             bezier_presets = [
@@ -540,7 +547,8 @@ def contextMenuEvent(self, event):
                 Bezier_Menu = menu.AddMenu(self.bezier_icon, _("Bezier"))
                 for bezier_preset in bezier_presets:
                     preset_action = Bezier_Menu.addAction(bezier_preset[4])
-                    preset_action.triggered.connect(partial(self.Bezier_Action_Triggered, bezier_preset))
+                    preset_action.triggered.connect(functools.partial(
+                        self.Bezier_Action_Triggered, bezier_preset))
                 Linear_Action = menu.addAction(self.linear_icon, _("Linear"))
                 Linear_Action.triggered.connect(self.Linear_Action_Triggered)
                 Constant_Action = menu.addAction(self.constant_icon, _("Constant"))