Use the new OColorButton

1 files changed, 9 insertions, 35 deletions

diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index 1b9526f..4fffe12 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -18,35 +18,33 @@
 **
 **********************************************************************/
 
 
 
 #include "liquidset.h"
 #include "liquid.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 
 #include <qslider.h>
-#include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpalette.h>
 
 #include <qpe/config.h>
 
-#include <opie/colorpopupmenu.h>
+#include <opie/ocolorbutton.h>
 
 
 static void changeButtonColor ( QWidget *btn, const QColor &col )
 {
         QPalette pal = btn-> palette ( );
 
         pal. setColor ( QPalette::Normal, QColorGroup::Button, col );
         pal. setColor ( QPalette::Active, QColorGroup::Button, col );
         pal. setColor ( QPalette::Disabled, QColorGroup::Button, col );
         pal. setColor ( QPalette::Inactive, QColorGroup::Button, col );
         pal. setColor ( QPalette::Normal, QColorGroup::Background, col );
         pal. setColor ( QPalette::Active, QColorGroup::Background, col );
@@ -57,26 +55,26 @@ static void changeButtonColor ( QWidget *btn, const QColor &col )
 }
 
 
 LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
                 : QWidget ( parent, name, fl )
 {
         setCaption ( tr( "Liquid Style" ) );
         
         Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
         m_type       = config. readNumEntry ( "Type", TransStippleBg );
-        m_menucol    = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
-        m_textcol    = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
+        QColor mcol  = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
+        QColor tcol  = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
         int opacity  = config. readNumEntry ( "Opacity", 10 );
         m_shadow     = config. readBoolEntry ( "ShadowText", true );
         m_deco       = config. readBoolEntry ( "WinDecoration", true );
         int contrast = config. readNumEntry ( "StippleContrast", 5 );
         m_flat       = config. readBoolEntry ( "FlatToolButtons", false );
 
         QVBoxLayout *vbox = new QVBoxLayout ( this );
         vbox-> setSpacing ( 3 );
         vbox-> setMargin ( 4 );
 
         QComboBox *cb = new QComboBox ( this );
         cb-> insertItem ( tr( "No translucency" ), None );
@@ -89,44 +87,32 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
         cb-> setCurrentItem ( m_type );
         vbox-> addWidget ( cb );
         
         
         QGridLayout *grid = new QGridLayout ( vbox );
         grid-> addColSpacing ( 0, 16 );
         grid-> addColSpacing ( 3, 8 );
         
         grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
         grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
         grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
 
-        m_menubtn = new QToolButton ( this );
+        m_menubtn = new OColorButton ( this );
+        m_menubtn-> setColor ( mcol );
         grid-> addWidget ( m_menubtn, 0, 2 );
 
-        QPopupMenu *popup;
-
-        popup = new ColorPopupMenu ( m_menucol, 0 );
-        m_menubtn-> setPopup ( popup );
-        m_menubtn-> setPopupDelay ( 0 );
-        connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeMenuColor ( const QColor & )));
-        changeMenuColor ( m_menucol );
-
-        m_textbtn = new QToolButton ( this );
+        m_textbtn = new OColorButton ( this );
+        m_textbtn-> setColor ( tcol );
         grid-> addWidget ( m_textbtn, 0, 5 );
 
-        popup = new ColorPopupMenu ( m_textcol, 0 );
-        m_textbtn-> setPopup ( popup );
-        m_textbtn-> setPopupDelay ( 0 );
-        connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeTextColor ( const QColor & )));
-        changeTextColor ( m_textcol );
-
         m_opacsld = new QSlider ( Horizontal, this );
         m_opacsld-> setRange ( -20, 20 );
         m_opacsld-> setValue ( opacity );
         m_opacsld-> setTickmarks ( QSlider::Below );
         grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
         
         vbox-> addSpacing ( 4 );
         
         QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this );
         shadow-> setChecked ( m_shadow );
         vbox-> addWidget ( shadow );
         
@@ -169,58 +155,46 @@ void LiquidSettings::changeType ( int t )
         bool custom = ( t == Custom );
         
                 m_menulbl-> setEnabled ( custom );
                 m_textlbl-> setEnabled ( custom );
                 m_opaclbl-> setEnabled ( custom );
                 m_menubtn-> setEnabled ( custom );
                 m_textbtn-> setEnabled ( custom );
                 m_opacsld-> setEnabled ( custom );
         
         m_type = t;
 }
 
-void LiquidSettings::changeMenuColor ( const QColor &col )
-{
-        changeButtonColor ( m_menubtn, col );
-        m_menucol = col;
-}
-
-void LiquidSettings::changeTextColor ( const QColor &col )
-{
-        changeButtonColor ( m_textbtn, col );
-        m_textcol = col;
-}
-
 void LiquidSettings::changeShadow ( bool b )
 {
         m_shadow = b;
 }
 
 void LiquidSettings::changeDeco ( bool b )
 {
         m_deco = b;
 }
 
 void LiquidSettings::changeFlat ( bool b )
 {
         m_flat = b;
 }
 
 
 bool LiquidSettings::writeConfig ( )
 {
         Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
         config. writeEntry ( "Type", m_type  );
-        config. writeEntry ( "Color",  m_menucol. name ( ));
-        config. writeEntry ( "TextColor", m_textcol. name ( ));
+        config. writeEntry ( "Color",  m_menubtn-> color ( ). name ( ));
+        config. writeEntry ( "TextColor", m_textbtn-> color ( ). name ( ));
         config. writeEntry ( "Opacity", m_opacsld-> value ( ));
                 config. writeEntry ( "ShadowText", m_shadow );
         config. writeEntry ( "WinDecoration", m_deco );
         config. writeEntry ( "StippleContrast", m_contsld-> value ( ));
         config. writeEntry ( "FlatToolButtons", m_flat );
         config. write ( );
 
         return true;
 }