More cosmetics for plastique

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.cpp b/modules/gui/qt4/dialogs/prefs_dialog.cpp
index 4f07d5525922bab6d820ee47b648888c6232b8dc..6c31548dd458c27d441d30ecde0730537e82a037 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.cpp
+++ b/modules/gui/qt4/dialogs/prefs_dialog.cpp
@@ -42,11 +42,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      setWindowTitle( _("Preferences" ) );
      resize( 800, 450 );
 
-     QPalette plt( palette() );
-     plt.setColor( QPalette::Active, QPalette::Highlight, Qt::gray );
-     setPalette( plt );
-
-     advanced_tree = NULL;
+          advanced_tree = NULL;
      simple_tree = NULL;
      simple_panel = NULL;
      advanced_panel = NULL;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8619f5fad66841008f235b506a232d0e23d0768c..afd8c838208d78cbc4c601600b2cec44a198bed8 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -28,8 +28,7 @@
 #include <assert.h>
 #include <QPushButton>
 
-MainInterface::MainInterface( intf_thread_t *_p_intf ) :
-                            QWidget( NULL ), p_intf( _p_intf)
+MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
     /* Init UI */
     slider = new InputSlider( Qt::Horizontal, this );

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 579e14ccf8e63d02403587c14284791c0dd41b8a..82c84a8fb2c599870906f1c06eefdce71e51a70b 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -24,13 +24,13 @@
 #define _MAIN_INTERFACE_H_
 
 #include <vlc/intf.h>
-#include <QWidget>
+#include "util/qvlcframe.hpp"
 
 class InputManager;
 class QCloseEvent;
 class InputSlider;
 
-class MainInterface : public QWidget
+class MainInterface : public QVLCFrame
 {
     Q_OBJECT;
 public:
@@ -42,7 +42,6 @@ protected:
 private:
     InputManager *main_input_manager;
     InputSlider *slider;
-    intf_thread_t *p_intf;
     /// Main input associated to the playlist
     input_thread_t *p_input;
 private slots:

diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 71c4d02e040104ee442d76d9cbb3eef36ee591d7..9db2ec5040c763849623d07cd970d41ee05b195a 100644 (file)
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -24,13 +24,30 @@
 #define _QVLCFRAME_H_
 
 #include <QWidget>
+#include <QApplication>
+#include <QPlastiqueStyle>
 #include <vlc/vlc.h>
 
 class QVLCFrame : public QWidget
 {
 public:
     QVLCFrame( intf_thread_t *_p_intf ) : QWidget( NULL ), p_intf( _p_intf )
-    {};
+    {
+        QStyle *style = qApp->style();
+        // Plastique is too dark.
+        /// theming ? getting KDE data ? ?
+        if( qobject_cast<QPlastiqueStyle *>(style) )
+        {
+            QPalette plt( palette() );
+            plt.setColor( QPalette::Active, QPalette::Highlight, Qt::gray );
+            QColor vlg = (Qt::lightGray);
+            vlg = vlg.toHsv();
+            vlg.setHsv( vlg.hue(), vlg.saturation(), 235  );
+            plt.setColor( QPalette::Active, QPalette::Window, vlg );
+            plt.setColor( QPalette::Inactive, QPalette::Window, vlg );
+            setPalette( plt );
+        }
+    };
     virtual ~QVLCFrame()   {};
 
     void toggleVisible()