Use the new OColorButton

3 files changed, 13 insertions, 43 deletions

diff --git a/noncore/styles/liquid/liquid.pro b/noncore/styles/liquid/liquid.pro
index a07eaf2..ed1c2f1 100644
--- a/noncore/styles/liquid/liquid.pro
+++ b/noncore/styles/liquid/liquid.pro
@@ -14,3 +14,3 @@ HEADERS     =  liquid.h \
                
-LIBS       += -lqpe
+LIBS       += -lqpe -lopie
 INCLUDEPATH += $(OPIEDIR)/include
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
@@ -29,3 +29,2 @@
 #include <qslider.h>
-#include <qtoolbutton.h>
 #include <qcombobox.h>
@@ -35,3 +34,2 @@
 #include <qlayout.h>
-#include <qpalette.h>
 
@@ -39,3 +37,3 @@
 
-#include <opie/colorpopupmenu.h>
+#include <opie/ocolorbutton.h>
 
@@ -68,4 +66,4 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 	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 );
@@ -100,22 +98,10 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 
-	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 );
@@ -180,14 +166,2 @@ void LiquidSettings::changeType ( int 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 )
@@ -214,4 +188,4 @@ bool LiquidSettings::writeConfig ( )
 	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 ( ));
diff --git a/noncore/styles/liquid/liquidset.h b/noncore/styles/liquid/liquidset.h
index bb1846c..8a03447 100644
--- a/noncore/styles/liquid/liquidset.h
+++ b/noncore/styles/liquid/liquidset.h
@@ -7,3 +7,3 @@
 class QLabel;
-class QToolButton;
+class OColorButton;
 class QSlider;
@@ -18,4 +18,2 @@ public slots:
 	void changeType ( int t );
-	void changeMenuColor ( const QColor &col );
-	void changeTextColor ( const QColor &col );
 	void changeShadow ( bool b );
@@ -27,4 +25,2 @@ public slots:
 private:
-	QColor m_menucol;
-	QColor m_textcol;
 	int    m_type;
@@ -39,4 +35,4 @@ private:
 	QLabel *     m_opaclbl;
-	QToolButton *m_menubtn;
-	QToolButton *m_textbtn;
+	OColorButton *m_menubtn;
+	OColorButton *m_textbtn;
 };