summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.pro2
-rw-r--r--noncore/styles/liquid/liquidset.cpp44
-rw-r--r--noncore/styles/liquid/liquidset.h10
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
@@ -12,7 +12,7 @@ HEADERS = liquid.h \
12 liquidset.h \ 12 liquidset.h \
13 plugin.h 13 plugin.h
14 14
15LIBS += -lqpe 15LIBS += -lqpe -lopie
16INCLUDEPATH += $(OPIEDIR)/include 16INCLUDEPATH += $(OPIEDIR)/include
17DESTDIR = $(OPIEDIR)/plugins/styles 17DESTDIR = $(OPIEDIR)/plugins/styles
18TARGET = liquid 18TARGET = liquid
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
@@ -27,17 +27,15 @@
27#include <qpe/global.h> 27#include <qpe/global.h>
28 28
29#include <qslider.h> 29#include <qslider.h>
30#include <qtoolbutton.h>
31#include <qcombobox.h> 30#include <qcombobox.h>
32#include <qradiobutton.h> 31#include <qradiobutton.h>
33#include <qcheckbox.h> 32#include <qcheckbox.h>
34#include <qlabel.h> 33#include <qlabel.h>
35#include <qlayout.h> 34#include <qlayout.h>
36#include <qpalette.h>
37 35
38#include <qpe/config.h> 36#include <qpe/config.h>
39 37
40#include <opie/colorpopupmenu.h> 38#include <opie/ocolorbutton.h>
41 39
42 40
43static void changeButtonColor ( QWidget *btn, const QColor &col ) 41static void changeButtonColor ( QWidget *btn, const QColor &col )
@@ -66,8 +64,8 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
66 config. setGroup ( "Liquid-Style" ); 64 config. setGroup ( "Liquid-Style" );
67 65
68 m_type = config. readNumEntry ( "Type", TransStippleBg ); 66 m_type = config. readNumEntry ( "Type", TransStippleBg );
69 m_menucol = QColor ( config. readEntry ( "Color", QApplication::palette ( ). active ( ). button ( ). name ( ))); 67 QColor mcol = QColor ( config. readEntry ( "Color", QApplication::palette ( ). active ( ). button ( ). name ( )));
70 m_textcol = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( ))); 68 QColor tcol = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
71 int opacity = config. readNumEntry ( "Opacity", 10 ); 69 int opacity = config. readNumEntry ( "Opacity", 10 );
72 m_shadow = config. readBoolEntry ( "ShadowText", true ); 70 m_shadow = config. readBoolEntry ( "ShadowText", true );
73 m_deco = config. readBoolEntry ( "WinDecoration", true ); 71 m_deco = config. readBoolEntry ( "WinDecoration", true );
@@ -98,26 +96,14 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
98 grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 ); 96 grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
99 grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 ); 97 grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
100 98
101 m_menubtn = new QToolButton ( this ); 99 m_menubtn = new OColorButton ( this );
100 m_menubtn-> setColor ( mcol );
102 grid-> addWidget ( m_menubtn, 0, 2 ); 101 grid-> addWidget ( m_menubtn, 0, 2 );
103 102
104 QPopupMenu *popup; 103 m_textbtn = new OColorButton ( this );
105 104 m_textbtn-> setColor ( tcol );
106 popup = new ColorPopupMenu ( m_menucol, 0 );
107 m_menubtn-> setPopup ( popup );
108 m_menubtn-> setPopupDelay ( 0 );
109 connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeMenuColor ( const QColor & )));
110 changeMenuColor ( m_menucol );
111
112 m_textbtn = new QToolButton ( this );
113 grid-> addWidget ( m_textbtn, 0, 5 ); 105 grid-> addWidget ( m_textbtn, 0, 5 );
114 106
115 popup = new ColorPopupMenu ( m_textcol, 0 );
116 m_textbtn-> setPopup ( popup );
117 m_textbtn-> setPopupDelay ( 0 );
118 connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeTextColor ( const QColor & )));
119 changeTextColor ( m_textcol );
120
121 m_opacsld = new QSlider ( Horizontal, this ); 107 m_opacsld = new QSlider ( Horizontal, this );
122 m_opacsld-> setRange ( -20, 20 ); 108 m_opacsld-> setRange ( -20, 20 );
123 m_opacsld-> setValue ( opacity ); 109 m_opacsld-> setValue ( opacity );
@@ -178,18 +164,6 @@ void LiquidSettings::changeType ( int t )
178 m_type = t; 164 m_type = t;
179} 165}
180 166
181void LiquidSettings::changeMenuColor ( const QColor &col )
182{
183 changeButtonColor ( m_menubtn, col );
184 m_menucol = col;
185}
186
187void LiquidSettings::changeTextColor ( const QColor &col )
188{
189 changeButtonColor ( m_textbtn, col );
190 m_textcol = col;
191}
192
193void LiquidSettings::changeShadow ( bool b ) 167void LiquidSettings::changeShadow ( bool b )
194{ 168{
195 m_shadow = b; 169 m_shadow = b;
@@ -212,8 +186,8 @@ bool LiquidSettings::writeConfig ( )
212 config. setGroup ( "Liquid-Style" ); 186 config. setGroup ( "Liquid-Style" );
213 187
214 config. writeEntry ( "Type", m_type ); 188 config. writeEntry ( "Type", m_type );
215 config. writeEntry ( "Color", m_menucol. name ( )); 189 config. writeEntry ( "Color", m_menubtn-> color ( ). name ( ));
216 config. writeEntry ( "TextColor", m_textcol. name ( )); 190 config. writeEntry ( "TextColor", m_textbtn-> color ( ). name ( ));
217 config. writeEntry ( "Opacity", m_opacsld-> value ( )); 191 config. writeEntry ( "Opacity", m_opacsld-> value ( ));
218 config. writeEntry ( "ShadowText", m_shadow ); 192 config. writeEntry ( "ShadowText", m_shadow );
219 config. writeEntry ( "WinDecoration", m_deco ); 193 config. writeEntry ( "WinDecoration", m_deco );
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
@@ -5,7 +5,7 @@
5#include <qcolor.h> 5#include <qcolor.h>
6 6
7class QLabel; 7class QLabel;
8class QToolButton; 8class OColorButton;
9class QSlider; 9class QSlider;
10 10
11class LiquidSettings : public QWidget { 11class LiquidSettings : public QWidget {
@@ -16,8 +16,6 @@ public:
16 16
17public slots: 17public slots:
18 void changeType ( int t ); 18 void changeType ( int t );
19 void changeMenuColor ( const QColor &col );
20 void changeTextColor ( const QColor &col );
21 void changeShadow ( bool b ); 19 void changeShadow ( bool b );
22 void changeDeco ( bool b ); 20 void changeDeco ( bool b );
23 void changeFlat ( bool b ); 21 void changeFlat ( bool b );
@@ -25,8 +23,6 @@ public slots:
25 virtual bool writeConfig ( ); 23 virtual bool writeConfig ( );
26 24
27private: 25private:
28 QColor m_menucol;
29 QColor m_textcol;
30 int m_type; 26 int m_type;
31 bool m_shadow; 27 bool m_shadow;
32 bool m_deco; 28 bool m_deco;
@@ -37,7 +33,7 @@ private:
37 QLabel * m_menulbl; 33 QLabel * m_menulbl;
38 QLabel * m_textlbl; 34 QLabel * m_textlbl;
39 QLabel * m_opaclbl; 35 QLabel * m_opaclbl;
40 QToolButton *m_menubtn; 36 OColorButton *m_menubtn;
41 QToolButton *m_textbtn; 37 OColorButton *m_textbtn;
42}; 38};
43#endif 39#endif