author | sandman <sandman> | 2002-09-24 23:41:42 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-24 23:41:42 (UTC) |
commit | c280cda4ece4a4aa60f4ef2c632d7a37ac08b258 (patch) (unidiff) | |
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 | |||
@@ -11,9 +11,9 @@ HEADERS = liquid.h \ | |||
11 | effects.h \ | 11 | effects.h \ |
12 | liquidset.h \ | 12 | liquidset.h \ |
13 | plugin.h | 13 | plugin.h |
14 | 14 | ||
15 | LIBS += -lqpe | 15 | LIBS += -lqpe -lopie |
16 | INCLUDEPATH += $(OPIEDIR)/include | 16 | INCLUDEPATH += $(OPIEDIR)/include |
17 | DESTDIR = $(OPIEDIR)/plugins/styles | 17 | DESTDIR = $(OPIEDIR)/plugins/styles |
18 | TARGET = liquid | 18 | TARGET = liquid |
19 | VERSION = 1.0.0 | 19 | VERSION = 1.0.0 |
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 | |||
@@ -26,19 +26,17 @@ | |||
26 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
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 | ||
43 | static void changeButtonColor ( QWidget *btn, const QColor &col ) | 41 | static void changeButtonColor ( QWidget *btn, const QColor &col ) |
44 | { | 42 | { |
@@ -65,10 +63,10 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
65 | Config config ( "qpe" ); | 63 | Config config ( "qpe" ); |
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 ); |
74 | int contrast = config. readNumEntry ( "StippleContrast", 5 ); | 72 | int contrast = config. readNumEntry ( "StippleContrast", 5 ); |
@@ -97,28 +95,16 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
97 | grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 ); | 95 | grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 ); |
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 ); |
124 | m_opacsld-> setTickmarks ( QSlider::Below ); | 110 | m_opacsld-> setTickmarks ( QSlider::Below ); |
@@ -177,20 +163,8 @@ void LiquidSettings::changeType ( int t ) | |||
177 | 163 | ||
178 | m_type = t; | 164 | m_type = t; |
179 | } | 165 | } |
180 | 166 | ||
181 | void LiquidSettings::changeMenuColor ( const QColor &col ) | ||
182 | { | ||
183 | changeButtonColor ( m_menubtn, col ); | ||
184 | m_menucol = col; | ||
185 | } | ||
186 | |||
187 | void LiquidSettings::changeTextColor ( const QColor &col ) | ||
188 | { | ||
189 | changeButtonColor ( m_textbtn, col ); | ||
190 | m_textcol = col; | ||
191 | } | ||
192 | |||
193 | void LiquidSettings::changeShadow ( bool b ) | 167 | void LiquidSettings::changeShadow ( bool b ) |
194 | { | 168 | { |
195 | m_shadow = b; | 169 | m_shadow = b; |
196 | } | 170 | } |
@@ -211,10 +185,10 @@ bool LiquidSettings::writeConfig ( ) | |||
211 | Config config ( "qpe" ); | 185 | Config config ( "qpe" ); |
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 ); |
220 | config. writeEntry ( "StippleContrast", m_contsld-> value ( )); | 194 | config. writeEntry ( "StippleContrast", m_contsld-> 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 | |||
@@ -4,9 +4,9 @@ | |||
4 | #include <qdialog.h> | 4 | #include <qdialog.h> |
5 | #include <qcolor.h> | 5 | #include <qcolor.h> |
6 | 6 | ||
7 | class QLabel; | 7 | class QLabel; |
8 | class QToolButton; | 8 | class OColorButton; |
9 | class QSlider; | 9 | class QSlider; |
10 | 10 | ||
11 | class LiquidSettings : public QWidget { | 11 | class LiquidSettings : public QWidget { |
12 | Q_OBJECT | 12 | Q_OBJECT |
@@ -15,29 +15,25 @@ public: | |||
15 | LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); | 15 | LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); |
16 | 16 | ||
17 | public slots: | 17 | public 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 ); |
24 | 22 | ||
25 | virtual bool writeConfig ( ); | 23 | virtual bool writeConfig ( ); |
26 | 24 | ||
27 | private: | 25 | private: |
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; |
33 | bool m_flat; | 29 | bool m_flat; |
34 | 30 | ||
35 | QSlider * m_opacsld; | 31 | QSlider * m_opacsld; |
36 | QSlider * m_contsld; | 32 | QSlider * m_contsld; |
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 |