- only pick color with left mouse button

- cleanup

svn path=/trunk/kdenlive/; revision=4663

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24fe467e1fe1b89fd583d62fedd118af1dacaf9a..a86d549543d2eacb9c3af7604437902162b0d583 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,7 +59,6 @@ kde4_add_ui_files(kdenlive_UI
   widgets/listval_ui.ui
   widgets/wipeval_ui.ui
   widgets/boolval_ui.ui
-  widgets/colorval_ui.ui
   widgets/titlewidget_ui.ui
   widgets/unicodedialog_ui.ui
   widgets/timelinebuttons_ui.ui

diff --git a/src/colorpickerwidget.cpp b/src/colorpickerwidget.cpp
index 66f828d8acae49bf9ab37a807c87164cc5a3c19b..a2a54e87edfb42e6cccfad84491aaad0c8ed2812 100644 (file)
--- a/src/colorpickerwidget.cpp
+++ b/src/colorpickerwidget.cpp
@@ -22,18 +22,15 @@
 
 #include <QMouseEvent>
 #include <QPushButton>
-#include <QDesktopWidget>
 
 #include <KApplication>
 #include <KColorDialog>
 #include <KIcon>
 #include <KLocalizedString>
+#include <KDebug>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <QX11Info>
-#include <fixx11h.h>
 
 class KCDPickerFilter: public QWidget
 {
@@ -75,21 +72,34 @@ ColorPickerWidget::~ColorPickerWidget()
 #endif
 }
 
-void ColorPickerWidget::mouseReleaseEvent(QMouseEvent* event)
+void ColorPickerWidget::mousePressEvent(QMouseEvent* event)
+{
+    if (event->button() != Qt::LeftButton) {
+        closeEventFilter();
+        event->accept();
+        return;
+    }
+    QWidget::mousePressEvent(event);
+}
+
+void ColorPickerWidget::mouseReleaseEvent(QMouseEvent *event)
 {
     if (m_filterActive) {
         closeEventFilter();
+        // does not work this way
+        //if (event->button() == Qt::LeftButton)
         emit colorPicked(KColorDialog::grabColor(event->globalPos()));
         return;
     }
     QWidget::mouseReleaseEvent(event);
 }
 
-void ColorPickerWidget::keyPressEvent(QKeyEvent* event)
+void ColorPickerWidget::keyPressEvent(QKeyEvent *event)
 {
     if (m_filterActive) {
-        if (event->key() == Qt::Key_Escape)
-            closeEventFilter();
+        // "special keys" (non letter, numeral) do not work, so close for every key
+        //if (event->key() == Qt::Key_Escape)
+        closeEventFilter();
         event->accept();
         return;
     }

diff --git a/src/colorpickerwidget.h b/src/colorpickerwidget.h
index f85e0f49b0476db2992fd9dbc40a8511b528731a..ffdda863dbe98e33e8ce3e48bdde49d0c7f694c9 100644 (file)
--- a/src/colorpickerwidget.h
+++ b/src/colorpickerwidget.h
@@ -47,6 +47,7 @@ public:
     virtual ~ColorPickerWidget();
 
 protected:
+    virtual void mousePressEvent(QMouseEvent *event);
     virtual void mouseReleaseEvent(QMouseEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
 

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index e7c38fb072746d9b366a351e943c9ab7cc328869..c99f45da810bd82f21ba5a84847f8e14f10663fa 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -19,7 +19,6 @@
 #include "ui_constval_ui.h"
 #include "ui_listval_ui.h"
 #include "ui_boolval_ui.h"
-#include "ui_colorval_ui.h"
 #include "ui_wipeval_ui.h"
 #include "ui_urlval_ui.h"
 #include "complexparameter.h"
@@ -49,10 +48,6 @@ class Boolval: public QWidget, public Ui::Boolval_UI
 {
 };
 
-class Colorval: public QWidget, public Ui::Colorval_UI
-{
-};
-
 class Constval: public QWidget, public Ui::Constval_UI
 {
 };

diff --git a/src/widgets/colorval_ui.ui b/src/widgets/colorval_ui.ui
deleted file mode 100644 (file)
index 3472928..0000000
--- a/src/widgets/colorval_ui.ui
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Colorval_UI</class>
- <widget class="QWidget" name="Colorval_UI">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>129</width>
-    <height>32</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="KColorButton" name="kcolorbutton"/>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KColorButton</class>
-   <extends>QPushButton</extends>
-   <header>kcolorbutton.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>