Merge pull request OpenShot#2425 from ferdnyc/qt-color-picker

Color picker: Never use native dialog
JUNE06512156 · Dec 13, 2018 · 7a15ffc · 7a15ffc
2 parents 2a6ec68 + ee3eab7
commit 7a15ffc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/windows/views/blender_listview.py b/src/windows/views/blender_listview.py
@@ -219,6 +219,9 @@ def dropdown_index_changed(self, widget, param, index):
         log.info('New value of param: %s' % value)
 
     def color_button_clicked(self, widget, param, index):
+        # Get translation object
+        _ = get_app()._tr
+
         # Show color dialog
         log.info('Animation param being changed: %s' % param["name"])
         color_value = self.params[param["name"]]
@@ -227,7 +230,8 @@ def color_button_clicked(self, widget, param, index):
         if len(color_value) == 3:
             #currentColor = QColor(color_value[0], color_value[1], color_value[2])
             currentColor.setRgbF(color_value[0], color_value[1], color_value[2])
-        newColor = QColorDialog.getColor(currentColor)
+        newColor = QColorDialog.getColor(currentColor, self, _("Select a Color"),
+                                         QColorDialog.DontUseNativeDialog)
         if newColor.isValid():
             widget.setStyleSheet("background-color: {}".format(newColor.name()))
             self.params[param["name"]] = [newColor.redF(), newColor.greenF(), newColor.blueF()]

diff --git a/src/windows/views/properties_tableview.py b/src/windows/views/properties_tableview.py
@@ -272,6 +272,10 @@ def mouseReleaseEvent(self, event):
 
     def doubleClickedCB(self, model_index):
         """Double click handler for the property table"""
+
+        # Get translation object
+        _ = get_app()._tr
+
         # Get data model and selection
         model = self.clip_properties_model.model
 
@@ -291,7 +295,8 @@ def doubleClickedCB(self, model_index):
 
                 # Show color dialog
                 currentColor = QColor(red, green, blue)
-                newColor = QColorDialog.getColor(currentColor)
+                newColor = QColorDialog.getColor(currentColor, self, _("Select a Color"),
+                                                 QColorDialog.DontUseNativeDialog)
 
                 # Set the new color keyframe
                 self.clip_properties_model.color_update(self.selected_item, newColor)
@@ -737,4 +742,4 @@ def __init__(self, *args):
         self.setLayout(hbox)
 
         # Connect signals
-        get_app().window.propertyTableView.loadProperties.connect(self.select_item)
+        get_app().window.propertyTableView.loadProperties.connect(self.select_item)