author | sandman <sandman> | 2002-09-24 23:41:42 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-24 23:41:42 (UTC) |
commit | c280cda4ece4a4aa60f4ef2c632d7a37ac08b258 (patch) (side-by-side diff) | |
tree | 4ffb3ad85dcc38db907ee589a5811e9c7af591c8 /noncore | |
parent | 3e0fcd45ea0e177deccd5463b2a754d442c03061 (diff) | |
download | opie-c280cda4ece4a4aa60f4ef2c632d7a37ac08b258.zip opie-c280cda4ece4a4aa60f4ef2c632d7a37ac08b258.tar.gz opie-c280cda4ece4a4aa60f4ef2c632d7a37ac08b258.tar.bz2 |
Use the new OColorButton
-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 @@ -7,17 +7,17 @@ SOURCES = liquid.cpp \ plugin.cpp HEADERS = liquid.h \ liquiddeco.h \ effects.h \ liquidset.h \ plugin.h -LIBS += -lqpe +LIBS += -lqpe -lopie INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/plugins/styles TARGET = liquid VERSION = 1.0.0 TRANSLATIONS = ../../../i18n/de/libliquid.ts \ ../../../i18n/en/libliquid.ts \ ../../../i18n/es/libliquid.ts \ 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 @@ -22,27 +22,25 @@ #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 ); @@ -61,18 +59,18 @@ 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 ); @@ -93,36 +91,24 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) 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 ); @@ -173,28 +159,16 @@ void LiquidSettings::changeType ( int t ) 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; @@ -207,18 +181,18 @@ void LiquidSettings::changeFlat ( bool 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; 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 @@ -1,43 +1,39 @@ #ifndef __OPIE_LIQUID_SET_H__ #define __OPIE_LIQUID_SET_H__ #include <qdialog.h> #include <qcolor.h> class QLabel; -class QToolButton; +class OColorButton; class QSlider; class LiquidSettings : public QWidget { Q_OBJECT public: LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); public slots: void changeType ( int t ); - void changeMenuColor ( const QColor &col ); - void changeTextColor ( const QColor &col ); void changeShadow ( bool b ); void changeDeco ( bool b ); void changeFlat ( bool b ); virtual bool writeConfig ( ); private: - QColor m_menucol; - QColor m_textcol; int m_type; bool m_shadow; bool m_deco; 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 |