| -rw-r--r-- | noncore/styles/liquid/liquid.pro | 2 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 44 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquidset.h | 20 |
3 files changed, 18 insertions, 48 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 @@ -13,5 +13,5 @@ HEADERS = liquid.h \ plugin.h -LIBS += -lqpe +LIBS += -lqpe -lopie INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/plugins/styles 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 @@ -28,5 +28,4 @@ #include <qslider.h> -#include <qtoolbutton.h> #include <qcombobox.h> #include <qradiobutton.h> @@ -34,9 +33,8 @@ #include <qlabel.h> #include <qlayout.h> -#include <qpalette.h> #include <qpe/config.h> -#include <opie/colorpopupmenu.h> +#include <opie/ocolorbutton.h> @@ -67,6 +65,6 @@ 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 ); m_shadow = config. readBoolEntry ( "ShadowText", true ); @@ -99,24 +97,12 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) 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 ); @@ -179,16 +165,4 @@ 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 ) { @@ -213,6 +187,6 @@ 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 ( )); config. writeEntry ( "ShadowText", m_shadow ); 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 @@ -6,5 +6,5 @@ class QLabel; -class QToolButton; +class OColorButton; class QSlider; @@ -17,6 +17,4 @@ public: public slots: void changeType ( int t ); - void changeMenuColor ( const QColor &col ); - void changeTextColor ( const QColor &col ); void changeShadow ( bool b ); void changeDeco ( bool b ); @@ -26,6 +24,4 @@ public slots: private: - QColor m_menucol; - QColor m_textcol; int m_type; bool m_shadow; @@ -33,11 +29,11 @@ private: bool m_flat; - QSlider * m_opacsld; - QSlider * m_contsld; - QLabel * m_menulbl; - QLabel * m_textlbl; - QLabel * m_opaclbl; - QToolButton *m_menubtn; - QToolButton *m_textbtn; + QSlider * m_opacsld; + QSlider * m_contsld; + QLabel * m_menulbl; + QLabel * m_textlbl; + QLabel * m_opaclbl; + OColorButton *m_menubtn; + OColorButton *m_textbtn; }; #endif |