-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 | |||
@@ -14,3 +14,3 @@ HEADERS = liquid.h \ | |||
14 | 14 | ||
15 | LIBS += -lqpe | 15 | LIBS += -lqpe -lopie |
16 | INCLUDEPATH += $(OPIEDIR)/include | 16 | 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 @@ | |||
29 | #include <qslider.h> | 29 | #include <qslider.h> |
30 | #include <qtoolbutton.h> | ||
31 | #include <qcombobox.h> | 30 | #include <qcombobox.h> |
@@ -35,3 +34,2 @@ | |||
35 | #include <qlayout.h> | 34 | #include <qlayout.h> |
36 | #include <qpalette.h> | ||
37 | 35 | ||
@@ -39,3 +37,3 @@ | |||
39 | 37 | ||
40 | #include <opie/colorpopupmenu.h> | 38 | #include <opie/ocolorbutton.h> |
41 | 39 | ||
@@ -68,4 +66,4 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
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 ); |
@@ -100,22 +98,10 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
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 ); |
@@ -180,14 +166,2 @@ void LiquidSettings::changeType ( int t ) | |||
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 ) |
@@ -214,4 +188,4 @@ bool LiquidSettings::writeConfig ( ) | |||
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 ( )); |
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 @@ | |||
7 | class QLabel; | 7 | class QLabel; |
8 | class QToolButton; | 8 | class OColorButton; |
9 | class QSlider; | 9 | class QSlider; |
@@ -18,4 +18,2 @@ 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 ); |
@@ -27,4 +25,2 @@ public slots: | |||
27 | private: | 25 | private: |
28 | QColor m_menucol; | ||
29 | QColor m_textcol; | ||
30 | int m_type; | 26 | int m_type; |
@@ -34,9 +30,9 @@ private: | |||
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 | }; |