author | sandman <sandman> | 2002-07-15 00:52:50 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-15 00:52:50 (UTC) |
commit | ecf2a873be3274bb30be0c659b7db6ef8a43be84 (patch) (unidiff) | |
tree | 5c80fb0863966fffd245f6ed44c6bf524c11842b | |
parent | 4feeec8b5b41cfd3d13274411f515524f687da09 (diff) | |
download | opie-ecf2a873be3274bb30be0c659b7db6ef8a43be84.zip opie-ecf2a873be3274bb30be0c659b7db6ef8a43be84.tar.gz opie-ecf2a873be3274bb30be0c659b7db6ef8a43be84.tar.bz2 |
Added an option to make toolbar buttons flat
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 26 | ||||
-rw-r--r-- | noncore/styles/liquid/liquid.h | 1 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 58 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.h | 2 | ||||
-rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 342 |
5 files changed, 308 insertions, 121 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 87b5488..22bf8af 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -169,6 +169,8 @@ LiquidStyle::LiquidStyle() | |||
169 | { | 169 | { |
170 | setName ( "LiquidStyle" ); | 170 | setName ( "LiquidStyle" ); |
171 | 171 | ||
172 | flatTBButtons = false; | ||
173 | |||
172 | btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); | 174 | btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); |
173 | btnMaskBmp.setMask(btnMaskBmp); | 175 | btnMaskBmp.setMask(btnMaskBmp); |
174 | htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); | 176 | htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); |
@@ -831,6 +833,13 @@ void LiquidStyle::polish(QWidget *w) | |||
831 | if(w->inherits("QMenuBar")){ | 833 | if(w->inherits("QMenuBar")){ |
832 | //((QFrame*)w)->setLineWidth(0); | 834 | //((QFrame*)w)->setLineWidth(0); |
833 | w->setBackgroundMode(QWidget::PaletteBackground); | 835 | w->setBackgroundMode(QWidget::PaletteBackground); |
836 | w->setBackgroundOrigin(QWidget::ParentOrigin); | ||
837 | return; | ||
838 | } | ||
839 | if(w->inherits("QToolBar")){ | ||
840 | w->installEventFilter(this); | ||
841 | w->setBackgroundMode(QWidget::PaletteBackground); | ||
842 | w->setBackgroundOrigin(QWidget::WidgetOrigin); | ||
834 | return; | 843 | return; |
835 | } | 844 | } |
836 | if(w->inherits("QPopupMenu")) | 845 | if(w->inherits("QPopupMenu")) |
@@ -893,8 +902,10 @@ void LiquidStyle::polish(QWidget *w) | |||
893 | w->setMouseTracking(true); | 902 | w->setMouseTracking(true); |
894 | w->installEventFilter(this); | 903 | w->installEventFilter(this); |
895 | } | 904 | } |
896 | if(w-> inherits("QToolButton")) { | 905 | if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { |
897 | ((QToolButton*)w)->setAutoRaise (false); | 906 | ((QToolButton*)w)->setAutoRaise (flatTBButtons); |
907 | if ( flatTBButtons ) | ||
908 | w->setBackgroundOrigin(QWidget::ParentOrigin); | ||
898 | } | 909 | } |
899 | if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ | 910 | if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ |
900 | return; | 911 | return; |
@@ -912,11 +923,6 @@ void LiquidStyle::polish(QWidget *w) | |||
912 | w->setBackgroundMode(QWidget::X11ParentRelative); | 923 | w->setBackgroundMode(QWidget::X11ParentRelative); |
913 | } | 924 | } |
914 | } | 925 | } |
915 | if(w->inherits("QToolBar")){ | ||
916 | w->installEventFilter(this); | ||
917 | w->setBackgroundMode(QWidget::PaletteBackground); | ||
918 | return; | ||
919 | } | ||
920 | 926 | ||
921 | } | 927 | } |
922 | 928 | ||
@@ -1001,6 +1007,8 @@ void LiquidStyle::polish(QApplication *app) | |||
1001 | 1007 | ||
1002 | if ( config. readBoolEntry ( "WinDecoration", true )) | 1008 | if ( config. readBoolEntry ( "WinDecoration", true )) |
1003 | QApplication::qwsSetDecoration ( new LiquidDecoration ( )); | 1009 | QApplication::qwsSetDecoration ( new LiquidDecoration ( )); |
1010 | |||
1011 | flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); | ||
1004 | } | 1012 | } |
1005 | 1013 | ||
1006 | void LiquidStyle::unPolish(QApplication *app) | 1014 | void LiquidStyle::unPolish(QApplication *app) |
@@ -1999,7 +2007,9 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
1999 | h += 2; | 2007 | h += 2; |
2000 | } | 2008 | } |
2001 | 2009 | ||
2002 | p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); | 2010 | QWidget *parent = (QWidget *)p->device(); |
2011 | p->setBrushOrigin(parent->pos()); | ||
2012 | parent->erase(x, y, w, h); | ||
2003 | 2013 | ||
2004 | if(menuHandler->useShadowText()){ | 2014 | if(menuHandler->useShadowText()){ |
2005 | QColor shadow; | 2015 | QColor shadow; |
diff --git a/noncore/styles/liquid/liquid.h b/noncore/styles/liquid/liquid.h index fb691ea..00cfb35 100644 --- a/noncore/styles/liquid/liquid.h +++ b/noncore/styles/liquid/liquid.h | |||
@@ -177,6 +177,7 @@ protected: | |||
177 | QPixmap* getPixmap(BitmapData item); | 177 | QPixmap* getPixmap(BitmapData item); |
178 | QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); | 178 | QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); |
179 | private: | 179 | private: |
180 | bool flatTBButtons; | ||
180 | bool highcolor; | 181 | bool highcolor; |
181 | QColorGroup radioOnGrp; | 182 | QColorGroup radioOnGrp; |
182 | QWidget *highlightWidget; | 183 | QWidget *highlightWidget; |
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp index 5ae19ba..1b9526f 100644 --- a/noncore/styles/liquid/liquidset.cpp +++ b/noncore/styles/liquid/liquidset.cpp | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include <qslider.h> | 29 | #include <qslider.h> |
30 | #include <qtoolbutton.h> | 30 | #include <qtoolbutton.h> |
31 | #include <qbuttongroup.h> | 31 | #include <qcombobox.h> |
32 | #include <qradiobutton.h> | 32 | #include <qradiobutton.h> |
33 | #include <qcheckbox.h> | 33 | #include <qcheckbox.h> |
34 | #include <qlabel.h> | 34 | #include <qlabel.h> |
@@ -72,42 +72,23 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
72 | m_shadow = config. readBoolEntry ( "ShadowText", true ); | 72 | m_shadow = config. readBoolEntry ( "ShadowText", true ); |
73 | m_deco = config. readBoolEntry ( "WinDecoration", true ); | 73 | m_deco = config. readBoolEntry ( "WinDecoration", true ); |
74 | int contrast = config. readNumEntry ( "StippleContrast", 5 ); | 74 | int contrast = config. readNumEntry ( "StippleContrast", 5 ); |
75 | m_flat = config. readBoolEntry ( "FlatToolButtons", false ); | ||
75 | 76 | ||
76 | QVBoxLayout *vbox = new QVBoxLayout ( this ); | 77 | QVBoxLayout *vbox = new QVBoxLayout ( this ); |
77 | vbox-> setSpacing ( 3 ); | 78 | vbox-> setSpacing ( 3 ); |
78 | vbox-> setMargin ( 6 ); | 79 | vbox-> setMargin ( 4 ); |
79 | 80 | ||
80 | QButtonGroup *btngrp = new QButtonGroup ( this ); | 81 | QComboBox *cb = new QComboBox ( this ); |
81 | btngrp-> hide ( ); | 82 | cb-> insertItem ( tr( "No translucency" ), None ); |
83 | cb-> insertItem ( tr( "Stippled, background color" ), StippledBg ); | ||
84 | cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn ); | ||
85 | cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg ); | ||
86 | cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn ); | ||
87 | cb-> insertItem ( tr( "Custom translucency" ), Custom ); | ||
82 | 88 | ||
83 | QRadioButton *rad; | 89 | cb-> setCurrentItem ( m_type ); |
90 | vbox-> addWidget ( cb ); | ||
84 | 91 | ||
85 | rad = new QRadioButton ( tr( "No translucency" ), this ); | ||
86 | btngrp-> insert ( rad, None ); | ||
87 | vbox-> addWidget ( rad ); | ||
88 | |||
89 | rad = new QRadioButton ( tr( "Stippled, background color" ), this ); | ||
90 | btngrp-> insert ( rad, StippledBg ); | ||
91 | vbox-> addWidget ( rad ); | ||
92 | |||
93 | rad = new QRadioButton ( tr( "Stippled, button color" ), this ); | ||
94 | btngrp-> insert ( rad, StippledBtn ); | ||
95 | vbox-> addWidget ( rad ); | ||
96 | |||
97 | rad = new QRadioButton ( tr( "Translucent stippled, background color" ), this ); | ||
98 | btngrp-> insert ( rad, TransStippleBg ); | ||
99 | vbox-> addWidget ( rad ); | ||
100 | |||
101 | rad = new QRadioButton ( tr( "Translucent stippled, button color" ), this ); | ||
102 | btngrp-> insert ( rad, TransStippleBtn ); | ||
103 | vbox-> addWidget ( rad ); | ||
104 | |||
105 | rad = new QRadioButton ( tr( "Custom translucency" ), this ); | ||
106 | btngrp-> insert ( rad, Custom ); | ||
107 | vbox-> addWidget ( rad ); | ||
108 | |||
109 | btngrp-> setExclusive ( true ); | ||
110 | btngrp-> setButton ( m_type ); | ||
111 | 92 | ||
112 | QGridLayout *grid = new QGridLayout ( vbox ); | 93 | QGridLayout *grid = new QGridLayout ( vbox ); |
113 | grid-> addColSpacing ( 0, 16 ); | 94 | grid-> addColSpacing ( 0, 16 ); |
@@ -157,6 +138,12 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
157 | 138 | ||
158 | vbox-> addSpacing ( 4 ); | 139 | vbox-> addSpacing ( 4 ); |
159 | 140 | ||
141 | QCheckBox *flattb = new QCheckBox ( tr( "Make toolbar buttons appear flat" ), this ); | ||
142 | flattb-> setChecked ( m_flat ); | ||
143 | vbox-> addWidget ( flattb ); | ||
144 | |||
145 | vbox-> addSpacing ( 4 ); | ||
146 | |||
160 | QHBoxLayout *hbox = new QHBoxLayout ( vbox ); | 147 | QHBoxLayout *hbox = new QHBoxLayout ( vbox ); |
161 | 148 | ||
162 | hbox-> addWidget ( new QLabel ( tr( "Stipple contrast" ), this )); | 149 | hbox-> addWidget ( new QLabel ( tr( "Stipple contrast" ), this )); |
@@ -171,9 +158,10 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) | |||
171 | 158 | ||
172 | changeType ( m_type ); | 159 | changeType ( m_type ); |
173 | 160 | ||
174 | connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( changeType ( int ) ) ); | 161 | connect ( cb, SIGNAL( highlighted ( int ) ), this, SLOT( changeType ( int ) ) ); |
175 | connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) ); | 162 | connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) ); |
176 | connect ( windeco, SIGNAL( toggled ( bool ) ), this, SLOT( changeDeco ( bool ) ) ); | 163 | connect ( windeco, SIGNAL( toggled ( bool ) ), this, SLOT( changeDeco ( bool ) ) ); |
164 | connect ( flattb, SIGNAL( toggled ( bool ) ), this, SLOT( changeFlat ( bool ) ) ); | ||
177 | } | 165 | } |
178 | 166 | ||
179 | void LiquidSettings::changeType ( int t ) | 167 | void LiquidSettings::changeType ( int t ) |
@@ -212,6 +200,11 @@ void LiquidSettings::changeDeco ( bool b ) | |||
212 | m_deco = b; | 200 | m_deco = b; |
213 | } | 201 | } |
214 | 202 | ||
203 | void LiquidSettings::changeFlat ( bool b ) | ||
204 | { | ||
205 | m_flat = b; | ||
206 | } | ||
207 | |||
215 | 208 | ||
216 | bool LiquidSettings::writeConfig ( ) | 209 | bool LiquidSettings::writeConfig ( ) |
217 | { | 210 | { |
@@ -225,6 +218,7 @@ bool LiquidSettings::writeConfig ( ) | |||
225 | config. writeEntry ( "ShadowText", m_shadow ); | 218 | config. writeEntry ( "ShadowText", m_shadow ); |
226 | config. writeEntry ( "WinDecoration", m_deco ); | 219 | config. writeEntry ( "WinDecoration", m_deco ); |
227 | config. writeEntry ( "StippleContrast", m_contsld-> value ( )); | 220 | config. writeEntry ( "StippleContrast", m_contsld-> value ( )); |
221 | config. writeEntry ( "FlatToolButtons", m_flat ); | ||
228 | config. write ( ); | 222 | config. write ( ); |
229 | 223 | ||
230 | return true; | 224 | return true; |
diff --git a/noncore/styles/liquid/liquidset.h b/noncore/styles/liquid/liquidset.h index 7843513..bb1846c 100644 --- a/noncore/styles/liquid/liquidset.h +++ b/noncore/styles/liquid/liquidset.h | |||
@@ -20,6 +20,7 @@ public slots: | |||
20 | void changeTextColor ( const QColor &col ); | 20 | void changeTextColor ( const QColor &col ); |
21 | void changeShadow ( bool b ); | 21 | void changeShadow ( bool b ); |
22 | void changeDeco ( bool b ); | 22 | void changeDeco ( bool b ); |
23 | void changeFlat ( bool b ); | ||
23 | 24 | ||
24 | virtual bool writeConfig ( ); | 25 | virtual bool writeConfig ( ); |
25 | 26 | ||
@@ -29,6 +30,7 @@ private: | |||
29 | int m_type; | 30 | int m_type; |
30 | bool m_shadow; | 31 | bool m_shadow; |
31 | bool m_deco; | 32 | bool m_deco; |
33 | bool m_flat; | ||
32 | 34 | ||
33 | QSlider * m_opacsld; | 35 | QSlider * m_opacsld; |
34 | QSlider * m_contsld; | 36 | QSlider * m_contsld; |
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index bcbdc8d..7dfd868 100644 --- a/noncore/styles/liquid/opie-liquid.diff +++ b/noncore/styles/liquid/opie-liquid.diff | |||
@@ -3,8 +3,8 @@ Features: | |||
3 | - Qt-only | 3 | - Qt-only |
4 | - works with Qt/E on QPE/OPIE | 4 | - works with Qt/E on QPE/OPIE |
5 | 5 | ||
6 | --- -Mon Jul 1 11:38:05 2002 | 6 | --- -Mon Jul 15 02:34:13 2002 |
7 | +++ liquid.hMon Jun 24 19:07:45 2002 | 7 | +++ liquid.hMon Jul 15 01:51:12 2002 |
8 | @@ -2,7 +2,7 @@ | 8 | @@ -2,7 +2,7 @@ |
9 | #define LIQUID_STYLE_H | 9 | #define LIQUID_STYLE_H |
10 | 10 | ||
@@ -102,8 +102,16 @@ Features: | |||
102 | // for repainting toolbuttons when the toolbar is resized | 102 | // for repainting toolbuttons when the toolbar is resized |
103 | bool eventFilter(QObject *obj, QEvent *ev); | 103 | bool eventFilter(QObject *obj, QEvent *ev); |
104 | void drawSliderGroove(QPainter * p, int x, int y, int w, int h, | 104 | void drawSliderGroove(QPainter * p, int x, int y, int w, int h, |
105 | --- -Mon Jul 1 11:38:05 2002 | 105 | @@ -204,6 +177,7 @@ |
106 | +++ liquid.cppMon Jul 1 03:45:28 2002 | 106 | QPixmap* getPixmap(BitmapData item); |
107 | QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); | ||
108 | private: | ||
109 | +bool flatTBButtons; | ||
110 | bool highcolor; | ||
111 | QColorGroup radioOnGrp; | ||
112 | QWidget *highlightWidget; | ||
113 | --- -Mon Jul 15 02:34:13 2002 | ||
114 | +++ liquid.cppMon Jul 15 02:31:59 2002 | ||
107 | @@ -10,12 +10,10 @@ | 115 | @@ -10,12 +10,10 @@ |
108 | 116 | ||
109 | #include <qmenudata.h> | 117 | #include <qmenudata.h> |
@@ -184,7 +192,7 @@ Features: | |||
184 | - opacity = config->readNumEntry("Opacity", 10); | 192 | - opacity = config->readNumEntry("Opacity", 10); |
185 | - shadowText = config->readBoolEntry("ShadowText", true); | 193 | - shadowText = config->readBoolEntry("ShadowText", true); |
186 | + Config config ( "qpe" ); | 194 | + Config config ( "qpe" ); |
187 | + config. setGroup ( "MosfetMenus" ); | 195 | + config. setGroup ( "Liquid-Style" ); |
188 | + | 196 | + |
189 | + type = config. readNumEntry("Type", TransStippleBg); | 197 | + type = config. readNumEntry("Type", TransStippleBg); |
190 | + color = QColor ( config. readEntry("Color", QApplication::palette().active().button().name())); | 198 | + color = QColor ( config. readEntry("Color", QApplication::palette().active().button().name())); |
@@ -221,7 +229,7 @@ Features: | |||
221 | r.width(), r.height()); | 229 | r.width(), r.height()); |
222 | } | 230 | } |
223 | else{ // tear off menu | 231 | else{ // tear off menu |
224 | @@ -121,82 +122,54 @@ | 232 | @@ -121,82 +122,55 @@ |
225 | stripePixmap(*pix, p->colorGroup().button()); | 233 | stripePixmap(*pix, p->colorGroup().button()); |
226 | } | 234 | } |
227 | else{ | 235 | else{ |
@@ -229,9 +237,9 @@ Features: | |||
229 | + QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color); | 237 | + QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color); |
230 | } | 238 | } |
231 | + | 239 | + |
232 | + if (p->inherits("QPopupMenu")) | ||
233 | pixDict.insert(p->winId(), pix); | 240 | pixDict.insert(p->winId(), pix); |
234 | + else { | 241 | + |
242 | + if (!p->inherits("QPopupMenu")) { | ||
235 | + p->setBackgroundPixmap(*pix); | 243 | + p->setBackgroundPixmap(*pix); |
236 | + | 244 | + |
237 | + QObjectList *ol = p-> queryList("QWidget"); | 245 | + QObjectList *ol = p-> queryList("QWidget"); |
@@ -254,13 +262,13 @@ Features: | |||
254 | - } | 262 | - } |
255 | - return(false); | 263 | - return(false); |
256 | -} | 264 | -} |
257 | +// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); | 265 | - |
258 | |||
259 | -void TransMenuHandler::slotKIPCMessage(int id, int) | 266 | -void TransMenuHandler::slotKIPCMessage(int id, int) |
260 | -{ | 267 | -{ |
261 | - if(id == LIQUID_MENU_CHANGE){ | 268 | - if(id == LIQUID_MENU_CHANGE){ |
262 | - bool oldShadow = shadowText; | 269 | - bool oldShadow = shadowText; |
263 | - | 270 | +// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); |
271 | |||
264 | - KConfig *config = KGlobal::config(); | 272 | - KConfig *config = KGlobal::config(); |
265 | - config->reparseConfiguration(); // in case KControl changed values | 273 | - config->reparseConfiguration(); // in case KControl changed values |
266 | - | 274 | - |
@@ -276,9 +284,8 @@ Features: | |||
276 | - w->close(); | 284 | - w->close(); |
277 | - } | 285 | - } |
278 | - } | 286 | - } |
279 | + if (p->inherits("QPopupMenu")) | ||
280 | + pixDict.remove(p->winId()); | 287 | + pixDict.remove(p->winId()); |
281 | + else { | 288 | + if (!p->inherits("QPopupMenu")) { |
282 | + p->setBackgroundMode(QWidget::PaletteBackground); | 289 | + p->setBackgroundMode(QWidget::PaletteBackground); |
283 | 290 | ||
284 | - reloadSettings(); | 291 | - reloadSettings(); |
@@ -295,7 +302,8 @@ Features: | |||
295 | - w->repaint(); | 302 | - w->repaint(); |
296 | - } | 303 | - } |
297 | - } | 304 | - } |
298 | - } | 305 | + wid-> setBackgroundMode( QWidget::PaletteBackground ); |
306 | } | ||
299 | - } | 307 | - } |
300 | - else if(id == MOSFET_BUTTON_CHANGE){ | 308 | - else if(id == MOSFET_BUTTON_CHANGE){ |
301 | - qWarning("In mosfet button change"); | 309 | - qWarning("In mosfet button change"); |
@@ -307,8 +315,7 @@ Features: | |||
307 | - ++it; | 315 | - ++it; |
308 | - if(w->inherits("QPushButton")){ | 316 | - if(w->inherits("QPushButton")){ |
309 | - ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w); | 317 | - ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w); |
310 | + wid-> setBackgroundMode( QWidget::PaletteBackground ); | 318 | - } |
311 | } | ||
312 | - } | 319 | - } |
313 | - ((LiquidStyle*)parent())->loadCustomButtons(); | 320 | - ((LiquidStyle*)parent())->loadCustomButtons(); |
314 | - it.toFirst(); | 321 | - it.toFirst(); |
@@ -331,10 +338,12 @@ Features: | |||
331 | { | 338 | { |
332 | + setName ( "LiquidStyle" ); | 339 | + setName ( "LiquidStyle" ); |
333 | + | 340 | + |
341 | +flatTBButtons = false; | ||
342 | + | ||
334 | btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); | 343 | btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); |
335 | btnMaskBmp.setMask(btnMaskBmp); | 344 | btnMaskBmp.setMask(btnMaskBmp); |
336 | htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); | 345 | htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); |
337 | @@ -730,20 +703,19 @@ | 346 | @@ -730,20 +704,26 @@ |
338 | } | 347 | } |
339 | 348 | ||
340 | loadCustomButtons(); | 349 | loadCustomButtons(); |
@@ -348,6 +357,13 @@ Features: | |||
348 | - KConfig *config = KGlobal::config(); | 357 | - KConfig *config = KGlobal::config(); |
349 | - QString oldGrp = config->group(); | 358 | - QString oldGrp = config->group(); |
350 | + Config config ( "qpe" ); | 359 | + Config config ( "qpe" ); |
360 | + config. setGroup ( "Liquid-Style" ); | ||
361 | +int contrast = config. readNumEntry ( "StippleContrast", 5 ); | ||
362 | +if ( contrast < 0 ) | ||
363 | + contrast = 0; | ||
364 | +else if ( contrast > 10 ) | ||
365 | + contrast = 10; | ||
366 | + | ||
351 | QPalette pal = QApplication::palette(); | 367 | QPalette pal = QApplication::palette(); |
352 | 368 | ||
353 | // button color stuff | 369 | // button color stuff |
@@ -360,7 +376,7 @@ Features: | |||
360 | // force button color to be different from background | 376 | // force button color to be different from background |
361 | QBrush btnBrush(QColor(200, 202, 228)); | 377 | QBrush btnBrush(QColor(200, 202, 228)); |
362 | appPal.setBrush(QColorGroup::Button, btnBrush); | 378 | appPal.setBrush(QColorGroup::Button, btnBrush); |
363 | @@ -794,15 +766,7 @@ | 379 | @@ -794,15 +774,7 @@ |
364 | pagerBrush.setPixmap(*pix); | 380 | pagerBrush.setPixmap(*pix); |
365 | 381 | ||
366 | // background color stuff | 382 | // background color stuff |
@@ -377,7 +393,17 @@ Features: | |||
377 | c.hsv(&bH, &bS, &bV); | 393 | c.hsv(&bH, &bS, &bV); |
378 | c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); | 394 | c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); |
379 | 395 | ||
380 | @@ -825,13 +789,10 @@ | 396 | @@ -817,21 +789,18 @@ |
397 | wallPaper.fill(c.rgb()); | ||
398 | painter.begin(&wallPaper); | ||
399 | for(i=0; i < 32; i+=4){ | ||
400 | - painter.setPen(c.dark(105)); | ||
401 | + painter.setPen(c.dark(100 + contrast)); | ||
402 | painter.drawLine(0, i, 32, i); | ||
403 | - painter.setPen(c.dark(103)); | ||
404 | + painter.setPen(c.dark(100 + 3 * contrast / 5 ) ); | ||
405 | painter.drawLine(0, i+1, 32, i+1); | ||
406 | }; | ||
381 | painter.end(); | 407 | painter.end(); |
382 | bgBrush.setColor(c); | 408 | bgBrush.setColor(c); |
383 | bgBrush.setPixmap(wallPaper); | 409 | bgBrush.setPixmap(wallPaper); |
@@ -392,7 +418,7 @@ Features: | |||
392 | QPixmap basePix; | 418 | QPixmap basePix; |
393 | basePix.resize(32, 32); | 419 | basePix.resize(32, 32); |
394 | basePix.fill(c.rgb()); | 420 | basePix.fill(c.rgb()); |
395 | @@ -857,51 +818,31 @@ | 421 | @@ -857,51 +826,39 @@ |
396 | } | 422 | } |
397 | } | 423 | } |
398 | 424 | ||
@@ -406,6 +432,13 @@ Features: | |||
406 | - w->setBackgroundMode(QWidget::NoBackground); | 432 | - w->setBackgroundMode(QWidget::NoBackground); |
407 | + //((QFrame*)w)->setLineWidth(0); | 433 | + //((QFrame*)w)->setLineWidth(0); |
408 | + w->setBackgroundMode(QWidget::PaletteBackground); | 434 | + w->setBackgroundMode(QWidget::PaletteBackground); |
435 | + w->setBackgroundOrigin(QWidget::ParentOrigin); | ||
436 | + return; | ||
437 | + } | ||
438 | + if(w->inherits("QToolBar")){ | ||
439 | + w->installEventFilter(this); | ||
440 | + w->setBackgroundMode(QWidget::PaletteBackground); | ||
441 | + w->setBackgroundOrigin(QWidget::WidgetOrigin); | ||
409 | return; | 442 | return; |
410 | } | 443 | } |
411 | if(w->inherits("QPopupMenu")) | 444 | if(w->inherits("QPopupMenu")) |
@@ -442,6 +475,7 @@ Features: | |||
442 | - } | 475 | - } |
443 | + | 476 | + |
444 | + | 477 | + |
478 | + if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) | ||
445 | + w-> setBackgroundOrigin ( QWidget::ParentOrigin ); | 479 | + w-> setBackgroundOrigin ( QWidget::ParentOrigin ); |
446 | 480 | ||
447 | if(w->inherits("QComboBox") || | 481 | if(w->inherits("QComboBox") || |
@@ -453,7 +487,7 @@ Features: | |||
453 | w->installEventFilter(this); | 487 | w->installEventFilter(this); |
454 | } | 488 | } |
455 | if(w->inherits("QLineEdit")){ | 489 | if(w->inherits("QLineEdit")){ |
456 | @@ -913,6 +854,9 @@ | 490 | @@ -913,6 +870,9 @@ |
457 | applyCustomAttributes((QPushButton *)w); | 491 | applyCustomAttributes((QPushButton *)w); |
458 | w->installEventFilter(this); | 492 | w->installEventFilter(this); |
459 | } | 493 | } |
@@ -463,12 +497,14 @@ Features: | |||
463 | 497 | ||
464 | bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || | 498 | bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || |
465 | qstrcmp(w->name(), "qt_clipped_viewport") == 0; | 499 | qstrcmp(w->name(), "qt_clipped_viewport") == 0; |
466 | @@ -942,11 +886,12 @@ | 500 | @@ -942,11 +902,14 @@ |
467 | w->setMouseTracking(true); | 501 | w->setMouseTracking(true); |
468 | w->installEventFilter(this); | 502 | w->installEventFilter(this); |
469 | } | 503 | } |
470 | + if(w-> inherits("QToolButton")) { | 504 | + if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { |
471 | + ((QToolButton*)w)->setAutoRaise (false); | 505 | + ((QToolButton*)w)->setAutoRaise (flatTBButtons); |
506 | + if ( flatTBButtons ) | ||
507 | + w->setBackgroundOrigin(QWidget::ParentOrigin); | ||
472 | + } | 508 | + } |
473 | if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ | 509 | if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ |
474 | return; | 510 | return; |
@@ -478,7 +514,7 @@ Features: | |||
478 | 514 | ||
479 | if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> | 515 | if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> |
480 | palette().active().brush(QColorGroup::Background).pixmap()){ | 516 | palette().active().brush(QColorGroup::Background).pixmap()){ |
481 | @@ -954,17 +899,18 @@ | 517 | @@ -954,17 +917,13 @@ |
482 | return; | 518 | return; |
483 | } | 519 | } |
484 | if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && | 520 | if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && |
@@ -490,17 +526,15 @@ Features: | |||
490 | } | 526 | } |
491 | } | 527 | } |
492 | - if(w->inherits("KToolBar")){ | 528 | - if(w->inherits("KToolBar")){ |
493 | + if(w->inherits("QToolBar")){ | 529 | - w->installEventFilter(this); |
494 | w->installEventFilter(this); | ||
495 | - //w->setBackgroundMode(QWidget::NoBackground); | 530 | - //w->setBackgroundMode(QWidget::NoBackground); |
496 | + w->setBackgroundMode(QWidget::PaletteBackground); | 531 | - return; |
497 | return; | 532 | - } |
498 | } | ||
499 | + | 533 | + |
500 | } | 534 | } |
501 | 535 | ||
502 | void LiquidStyle::unPolish(QWidget *w) | 536 | void LiquidStyle::unPolish(QWidget *w) |
503 | @@ -977,6 +923,9 @@ | 537 | @@ -977,6 +936,9 @@ |
504 | 538 | ||
505 | if(w->inherits("QPopupMenu")) | 539 | if(w->inherits("QPopupMenu")) |
506 | w->setBackgroundMode(QWidget::PaletteButton); | 540 | w->setBackgroundMode(QWidget::PaletteButton); |
@@ -510,7 +544,7 @@ Features: | |||
510 | 544 | ||
511 | if(w->isTopLevel()) | 545 | if(w->isTopLevel()) |
512 | return; | 546 | return; |
513 | @@ -1001,12 +950,14 @@ | 547 | @@ -1001,12 +963,14 @@ |
514 | unapplyCustomAttributes((QPushButton *)w); | 548 | unapplyCustomAttributes((QPushButton *)w); |
515 | w->removeEventFilter(this); | 549 | w->removeEventFilter(this); |
516 | } | 550 | } |
@@ -529,7 +563,7 @@ Features: | |||
529 | w->removeEventFilter(this); | 563 | w->removeEventFilter(this); |
530 | } | 564 | } |
531 | if(w->inherits("QButton") || w->inherits("QComboBox")){ | 565 | if(w->inherits("QButton") || w->inherits("QComboBox")){ |
532 | @@ -1014,9 +965,9 @@ | 566 | @@ -1014,9 +978,9 @@ |
533 | w->setAutoMask(false); | 567 | w->setAutoMask(false); |
534 | } | 568 | } |
535 | } | 569 | } |
@@ -541,7 +575,7 @@ Features: | |||
541 | return; | 575 | return; |
542 | } | 576 | } |
543 | if(w->inherits("QHeader")){ | 577 | if(w->inherits("QHeader")){ |
544 | @@ -1028,20 +979,28 @@ | 578 | @@ -1028,20 +992,34 @@ |
545 | void LiquidStyle::polish(QApplication *app) | 579 | void LiquidStyle::polish(QApplication *app) |
546 | { | 580 | { |
547 | 581 | ||
@@ -556,7 +590,13 @@ Features: | |||
556 | + | 590 | + |
557 | + qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); | 591 | + qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); |
558 | + | 592 | + |
593 | + Config config ( "qpe" ); | ||
594 | + config. setGroup ( "Liquid-Style" ); | ||
595 | + | ||
596 | + if ( config. readBoolEntry ( "WinDecoration", true )) | ||
559 | + QApplication::qwsSetDecoration ( new LiquidDecoration ( )); | 597 | + QApplication::qwsSetDecoration ( new LiquidDecoration ( )); |
598 | + | ||
599 | +flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); | ||
560 | } | 600 | } |
561 | 601 | ||
562 | void LiquidStyle::unPolish(QApplication *app) | 602 | void LiquidStyle::unPolish(QApplication *app) |
@@ -572,7 +612,7 @@ Features: | |||
572 | } | 612 | } |
573 | 613 | ||
574 | /* | 614 | /* |
575 | @@ -1063,7 +1022,7 @@ | 615 | @@ -1063,7 +1041,7 @@ |
576 | */ | 616 | */ |
577 | bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) | 617 | bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) |
578 | { | 618 | { |
@@ -581,7 +621,7 @@ Features: | |||
581 | if(ev->type() == QEvent::Resize){ | 621 | if(ev->type() == QEvent::Resize){ |
582 | const QObjectList *tbChildList = obj->children(); | 622 | const QObjectList *tbChildList = obj->children(); |
583 | QObjectListIt it(*tbChildList); | 623 | QObjectListIt it(*tbChildList); |
584 | @@ -1076,35 +1035,7 @@ | 624 | @@ -1076,35 +1054,7 @@ |
585 | 625 | ||
586 | } | 626 | } |
587 | } | 627 | } |
@@ -618,7 +658,7 @@ Features: | |||
618 | QWidget *btn = (QWidget *)obj; | 658 | QWidget *btn = (QWidget *)obj; |
619 | if(ev->type() == QEvent::Enter){ | 659 | if(ev->type() == QEvent::Enter){ |
620 | if(btn->isEnabled()){ | 660 | if(btn->isEnabled()){ |
621 | @@ -1119,20 +1050,7 @@ | 661 | @@ -1119,20 +1069,7 @@ |
622 | } | 662 | } |
623 | } | 663 | } |
624 | } | 664 | } |
@@ -640,7 +680,7 @@ Features: | |||
640 | QToolButton *btn = (QToolButton *)btn; | 680 | QToolButton *btn = (QToolButton *)btn; |
641 | if(!btn->autoRaise()){ | 681 | if(!btn->autoRaise()){ |
642 | if(btn->isEnabled()){ | 682 | if(btn->isEnabled()){ |
643 | @@ -1340,11 +1258,6 @@ | 683 | @@ -1340,11 +1277,6 @@ |
644 | QColorGroup g = btn->colorGroup(); | 684 | QColorGroup g = btn->colorGroup(); |
645 | 685 | ||
646 | 686 | ||
@@ -652,7 +692,60 @@ Features: | |||
652 | //int dw = buttonDefaultIndicatorWidth(); | 692 | //int dw = buttonDefaultIndicatorWidth(); |
653 | if(btn->hasFocus() || btn->isDefault()){ | 693 | if(btn->hasFocus() || btn->isDefault()){ |
654 | QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); | 694 | QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); |
655 | @@ -1914,8 +1827,8 @@ | 695 | @@ -1596,7 +1528,7 @@ |
696 | if(sbBuffer.size() != sb->size()) | ||
697 | sbBuffer.resize(sb->size()); | ||
698 | } | ||
699 | - subB.setRect( subX,subY,buttonDim,buttonDim ); | ||
700 | + subB.setRect( subX,subY,0,0); // buttonDim,buttonDim ); | ||
701 | addB.setRect( addX,addY,buttonDim,buttonDim ); | ||
702 | if(horiz) | ||
703 | subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); | ||
704 | @@ -1624,7 +1556,7 @@ | ||
705 | QPainter painter; | ||
706 | if(!horiz){ | ||
707 | painter.begin(&sbBuffer); | ||
708 | - QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1); | ||
709 | + QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1); | ||
710 | if(sliderR.height() >= 8){ | ||
711 | painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0, | ||
712 | 13, 8); | ||
713 | @@ -1690,7 +1622,7 @@ | ||
714 | } | ||
715 | else{ | ||
716 | painter.begin(&sbBuffer); | ||
717 | - QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height()); | ||
718 | + QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height()); | ||
719 | if(sliderR.width() >= 8){ | ||
720 | painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0, | ||
721 | 8, 13); | ||
722 | @@ -1761,10 +1693,10 @@ | ||
723 | addB.width()-8, addB.height()-8, g, !maxed); | ||
724 | } | ||
725 | if ( controls & SubLine ) { | ||
726 | - drawSBButton(p, subB, g, activeControl == SubLine); | ||
727 | - drawArrow( p, horiz ? LeftArrow : UpArrow, | ||
728 | - false, subB.x()+4, subB.y()+4, | ||
729 | - subB.width()-8, subB.height()-8, g, !maxed); | ||
730 | + // drawSBButton(p, subB, g, activeControl == SubLine); | ||
731 | + // drawArrow( p, horiz ? LeftArrow : UpArrow, | ||
732 | + // false, subB.x()+4, subB.y()+4, | ||
733 | + // subB.width()-8, subB.height()-8, g, !maxed); | ||
734 | drawSBButton(p, subHC, g, activeControl == SubLine); | ||
735 | drawArrow( p, horiz ? LeftArrow : UpArrow, | ||
736 | false, subHC.x()+4, subHC.y()+4, | ||
737 | @@ -1865,8 +1797,8 @@ | ||
738 | else | ||
739 | buttonDim = ( length - b*2 )/2 - 1; | ||
740 | |||
741 | - sliderMin = b + buttonDim; | ||
742 | - maxLength = length - b*2 - buttonDim*3; | ||
743 | + sliderMin = b + 0; // buttonDim; | ||
744 | + maxLength = length - b*2 - buttonDim*2; // 3; | ||
745 | |||
746 | if ( sb->maxValue() == sb->minValue() ) { | ||
747 | sliderLength = maxLength; | ||
748 | @@ -1914,8 +1846,8 @@ | ||
656 | return(QSize(16, 16)); | 749 | return(QSize(16, 16)); |
657 | } | 750 | } |
658 | 751 | ||
@@ -663,7 +756,7 @@ Features: | |||
663 | bool down, bool) | 756 | bool down, bool) |
664 | { | 757 | { |
665 | bool isHover = highlightWidget == p->device(); | 758 | bool isHover = highlightWidget == p->device(); |
666 | @@ -1957,8 +1870,8 @@ | 759 | @@ -1957,8 +1889,8 @@ |
667 | return(QSize(20, 22)); | 760 | return(QSize(20, 22)); |
668 | } | 761 | } |
669 | 762 | ||
@@ -674,7 +767,7 @@ Features: | |||
674 | { | 767 | { |
675 | bool isHover = highlightWidget == p->device(); | 768 | bool isHover = highlightWidget == p->device(); |
676 | bool isMasked = p->device() && p->device()->devType() == QInternal::Widget | 769 | bool isMasked = p->device() && p->device()->devType() == QInternal::Widget |
677 | @@ -1996,8 +1909,8 @@ | 770 | @@ -1996,8 +1928,8 @@ |
678 | } | 771 | } |
679 | } | 772 | } |
680 | 773 | ||
@@ -685,7 +778,7 @@ Features: | |||
685 | { | 778 | { |
686 | // needed for some reason by KHtml, even tho it's all filled ;P | 779 | // needed for some reason by KHtml, even tho it's all filled ;P |
687 | p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); | 780 | p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); |
688 | @@ -2005,18 +1918,17 @@ | 781 | @@ -2005,18 +1937,17 @@ |
689 | } | 782 | } |
690 | 783 | ||
691 | void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, | 784 | void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, |
@@ -707,7 +800,7 @@ Features: | |||
707 | Orientation orient, bool, bool) | 800 | Orientation orient, bool, bool) |
708 | { | 801 | { |
709 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : | 802 | p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : |
710 | @@ -2065,203 +1977,24 @@ | 803 | @@ -2065,203 +1996,26 @@ |
711 | p->drawLineSegments(a); | 804 | p->drawLineSegments(a); |
712 | } | 805 | } |
713 | 806 | ||
@@ -778,11 +871,7 @@ Features: | |||
778 | { | 871 | { |
779 | - //p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); | 872 | - //p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); |
780 | -} | 873 | -} |
781 | + x -= 2; // Bug in Qt/E | 874 | - |
782 | + y -= 2; | ||
783 | + w += 2; | ||
784 | + h += 2; | ||
785 | |||
786 | -void LiquidStyle::drawKToolBarButton(QPainter *p, int x, int y, int w, int h, | 875 | -void LiquidStyle::drawKToolBarButton(QPainter *p, int x, int y, int w, int h, |
787 | - const QColorGroup &g, bool sunken, | 876 | - const QColorGroup &g, bool sunken, |
788 | - bool raised, bool enabled, bool popup, | 877 | - bool raised, bool enabled, bool popup, |
@@ -898,18 +987,24 @@ Features: | |||
898 | - else | 987 | - else |
899 | - qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, | 988 | - qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, |
900 | - 0, 0, g, false); | 989 | - 0, 0, g, false); |
990 | + if(active){ | ||
991 | + x -= 2; // Bug in Qt/E | ||
992 | + y -= 2; | ||
993 | + w += 2; | ||
994 | + h += 2; | ||
995 | } | ||
901 | - } | 996 | - } |
902 | -} | ||
903 | + p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); | ||
904 | |||
905 | - | 997 | - |
998 | |||
906 | -void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, | 999 | -void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, |
907 | - const QColorGroup &g, bool active, QMenuItem *mi, | 1000 | - const QColorGroup &g, bool active, QMenuItem *mi, |
908 | - QBrush *) | 1001 | - QBrush *) |
909 | -{ | 1002 | -{ |
910 | - if ( p->font() == KGlobalSettings::generalFont() ) | 1003 | - if ( p->font() == KGlobalSettings::generalFont() ) |
911 | - p->setFont( KGlobalSettings::menuFont() ); | 1004 | - p->setFont( KGlobalSettings::menuFont() ); |
912 | + w -= 2; | 1005 | + QWidget *parent = (QWidget *)p->device(); |
1006 | + p->setBrushOrigin(parent->pos()); | ||
1007 | + parent->erase(x, y, w, h); | ||
913 | 1008 | ||
914 | if(menuHandler->useShadowText()){ | 1009 | if(menuHandler->useShadowText()){ |
915 | QColor shadow; | 1010 | QColor shadow; |
@@ -921,7 +1016,7 @@ Features: | |||
921 | g.background().dark(130); | 1016 | g.background().dark(130); |
922 | } | 1017 | } |
923 | else | 1018 | else |
924 | @@ -2300,8 +2033,8 @@ | 1019 | @@ -2300,8 +2054,8 @@ |
925 | } | 1020 | } |
926 | 1021 | ||
927 | void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, | 1022 | void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, |
@@ -932,7 +1027,7 @@ Features: | |||
932 | { | 1027 | { |
933 | QColor c; | 1028 | QColor c; |
934 | switch(menuHandler->transType()){ | 1029 | switch(menuHandler->transType()){ |
935 | @@ -2336,8 +2069,6 @@ | 1030 | @@ -2336,8 +2090,6 @@ |
936 | 1031 | ||
937 | maxpmw = QMAX( maxpmw, 20 ); | 1032 | maxpmw = QMAX( maxpmw, 20 ); |
938 | 1033 | ||
@@ -941,7 +1036,7 @@ Features: | |||
941 | 1036 | ||
942 | bool dis = !enabled; | 1037 | bool dis = !enabled; |
943 | QColorGroup itemg = dis ? pal.disabled() : pal.active(); | 1038 | QColorGroup itemg = dis ? pal.disabled() : pal.active(); |
944 | @@ -2363,7 +2094,7 @@ | 1039 | @@ -2363,7 +2115,7 @@ |
945 | p->fillRect(x, y, w, h, menuBrush); | 1040 | p->fillRect(x, y, w, h, menuBrush); |
946 | } | 1041 | } |
947 | else{ | 1042 | else{ |
@@ -950,7 +1045,7 @@ Features: | |||
950 | if(pix) | 1045 | if(pix) |
951 | p->drawPixmap(x, y, *pix, x, y, w, h); | 1046 | p->drawPixmap(x, y, *pix, x, y, w, h); |
952 | } | 1047 | } |
953 | @@ -2508,25 +2239,6 @@ | 1048 | @@ -2508,25 +2260,6 @@ |
954 | return h; | 1049 | return h; |
955 | } | 1050 | } |
956 | 1051 | ||
@@ -976,7 +1071,7 @@ Features: | |||
976 | 1071 | ||
977 | void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, | 1072 | void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, |
978 | const QColorGroup &g, const QColor *c, | 1073 | const QColorGroup &g, const QColor *c, |
979 | @@ -2540,25 +2252,25 @@ | 1074 | @@ -2540,25 +2273,25 @@ |
980 | return; | 1075 | return; |
981 | } | 1076 | } |
982 | else{ | 1077 | else{ |
@@ -1006,7 +1101,7 @@ Features: | |||
1006 | return; | 1101 | return; |
1007 | } | 1102 | } |
1008 | QPixmap tilePix; | 1103 | QPixmap tilePix; |
1009 | @@ -2671,7 +2383,7 @@ | 1104 | @@ -2671,7 +2404,7 @@ |
1010 | vFrame = 8; // was 10 | 1105 | vFrame = 8; // was 10 |
1011 | } | 1106 | } |
1012 | else | 1107 | else |
@@ -1015,7 +1110,7 @@ Features: | |||
1015 | } | 1110 | } |
1016 | 1111 | ||
1017 | 1112 | ||
1018 | @@ -2699,7 +2411,7 @@ | 1113 | @@ -2699,7 +2432,7 @@ |
1019 | p->drawLine(x+1, y+1, x+1, y2-1); | 1114 | p->drawLine(x+1, y+1, x+1, y2-1); |
1020 | } | 1115 | } |
1021 | else if(lineWidth != 2 || !sunken) | 1116 | else if(lineWidth != 2 || !sunken) |
@@ -1024,7 +1119,7 @@ Features: | |||
1024 | else{ | 1119 | else{ |
1025 | QPen oldPen = p->pen(); | 1120 | QPen oldPen = p->pen(); |
1026 | int x2 = x+w-1; | 1121 | int x2 = x+w-1; |
1027 | @@ -2726,105 +2438,6 @@ | 1122 | @@ -2726,105 +2459,6 @@ |
1028 | } | 1123 | } |
1029 | } | 1124 | } |
1030 | 1125 | ||
@@ -1130,7 +1225,7 @@ Features: | |||
1130 | 1225 | ||
1131 | void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) | 1226 | void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) |
1132 | { | 1227 | { |
1133 | @@ -2998,22 +2611,22 @@ | 1228 | @@ -2998,22 +2632,22 @@ |
1134 | customBtnIconList.clear(); | 1229 | customBtnIconList.clear(); |
1135 | customBtnLabelList.clear(); | 1230 | customBtnLabelList.clear(); |
1136 | 1231 | ||
@@ -1160,7 +1255,7 @@ Features: | |||
1160 | while(labelStr != NULL){ | 1255 | while(labelStr != NULL){ |
1161 | QColor *c = new QColor; | 1256 | QColor *c = new QColor; |
1162 | c->setNamedColor(QString(colorStr)); | 1257 | c->setNamedColor(QString(colorStr)); |
1163 | @@ -3022,7 +2635,7 @@ | 1258 | @@ -3022,7 +2656,7 @@ |
1164 | QString tmpStr(iconStr); | 1259 | QString tmpStr(iconStr); |
1165 | if(!tmpStr.isEmpty()){ | 1260 | if(!tmpStr.isEmpty()){ |
1166 | QPixmap *pixmap = | 1261 | QPixmap *pixmap = |
@@ -1169,7 +1264,7 @@ Features: | |||
1169 | if(pixmap->isNull()){ | 1264 | if(pixmap->isNull()){ |
1170 | delete pixmap; | 1265 | delete pixmap; |
1171 | customBtnIconList.append(NULL); | 1266 | customBtnIconList.append(NULL); |
1172 | @@ -3037,7 +2650,6 @@ | 1267 | @@ -3037,7 +2671,6 @@ |
1173 | colorStr = colorList.next(); | 1268 | colorStr = colorList.next(); |
1174 | iconStr = iconList.next(); | 1269 | iconStr = iconList.next(); |
1175 | } | 1270 | } |
@@ -1177,7 +1272,7 @@ Features: | |||
1177 | } | 1272 | } |
1178 | 1273 | ||
1179 | void LiquidStyle::applyCustomAttributes(QPushButton *btn) | 1274 | void LiquidStyle::applyCustomAttributes(QPushButton *btn) |
1180 | @@ -3087,7 +2699,7 @@ | 1275 | @@ -3087,7 +2720,7 @@ |
1181 | } | 1276 | } |
1182 | } | 1277 | } |
1183 | 1278 | ||
@@ -1186,48 +1281,133 @@ Features: | |||
1186 | 1281 | ||
1187 | 1282 | ||
1188 | 1283 | ||
1189 | --- -Mon Jul 1 11:38:05 2002 | 1284 | --- -Mon Jul 15 02:34:13 2002 |
1190 | +++ plugin.cppFri Jun 28 13:25:25 2002 | 1285 | +++ plugin.cppFri Jul 12 00:41:40 2002 |
1191 | @@ -1,29 +1,29 @@ | 1286 | @@ -1,29 +1,113 @@ |
1192 | #include "liquid.h" | 1287 | #include "liquid.h" |
1193 | -#include <klocale.h> | 1288 | -#include <klocale.h> |
1194 | + | 1289 | +#include "liquidset.h" |
1290 | +#include "plugin.h" | ||
1195 | 1291 | ||
1196 | extern "C" { | 1292 | -extern "C" { |
1197 | - KStyle* allocate(); | 1293 | - KStyle* allocate(); |
1198 | - int minor_version(); | 1294 | - int minor_version(); |
1199 | - int major_version(); | 1295 | - int major_version(); |
1200 | - const char *description(); | 1296 | - const char *description(); |
1201 | + QStyle* allocate ( ); | 1297 | + |
1202 | + int minor_version ( ); | 1298 | + |
1203 | + int major_version ( ); | 1299 | +LiquidInterface::LiquidInterface ( ) : ref ( 0 ) |
1204 | + const char *description ( ); | 1300 | +{ |
1301 | +} | ||
1302 | + | ||
1303 | +LiquidInterface::~LiquidInterface ( ) | ||
1304 | +{ | ||
1305 | +} | ||
1306 | + | ||
1307 | +QStyle *LiquidInterface::create ( ) | ||
1308 | +{ | ||
1309 | +return new LiquidStyle ( ); | ||
1310 | +} | ||
1311 | + | ||
1312 | +QString LiquidInterface::name ( ) | ||
1313 | +{ | ||
1314 | +return QObject::tr( "Liquid", "name" ); | ||
1205 | } | 1315 | } |
1206 | 1316 | ||
1207 | -KStyle* allocate() | 1317 | -KStyle* allocate() |
1208 | +QStyle* allocate ( ) | 1318 | +QString LiquidInterface::description ( ) |
1209 | { | 1319 | { |
1210 | - return(new LiquidStyle); | 1320 | - return(new LiquidStyle); |
1211 | + return new LiquidStyle ( ); | 1321 | +return QObject::tr( "High Performance Liquid style by Mosfet", "description" ); |
1212 | } | 1322 | } |
1213 | 1323 | ||
1214 | -int minor_version() | 1324 | -int minor_version() |
1215 | +int minor_version ( ) | 1325 | +QCString LiquidInterface::key ( ) |
1216 | { | 1326 | { |
1217 | - return(0); | 1327 | - return(0); |
1218 | + return 0; | 1328 | +return QCString ( "liquid" ); |
1219 | } | 1329 | } |
1220 | 1330 | ||
1221 | -int major_version() | 1331 | -int major_version() |
1222 | +int major_version ( ) | 1332 | +unsigned int LiquidInterface::version ( ) |
1223 | { | 1333 | { |
1224 | - return(1); | 1334 | - return(1); |
1225 | + return 1; | 1335 | +return 100; // 1.0.0 (\d+.\d.\d) |
1226 | } | 1336 | } |
1227 | 1337 | ||
1228 | -const char *description() | 1338 | -const char *description() |
1229 | +const char *description ( ) | 1339 | +QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
1340 | +{ | ||
1341 | +static LiquidSettingsInterface *setiface = 0; | ||
1342 | + | ||
1343 | +*iface = 0; | ||
1344 | + | ||
1345 | +if ( uuid == IID_QUnknown ) | ||
1346 | + *iface = this; | ||
1347 | +else if ( uuid == IID_Style ) | ||
1348 | + *iface = this; | ||
1349 | +else if ( uuid == IID_StyleSettings ) { | ||
1350 | + if ( !setiface ) | ||
1351 | + setiface = new LiquidSettingsInterface ( ); | ||
1352 | + *iface = setiface; | ||
1353 | +} | ||
1354 | + | ||
1355 | +if ( *iface ) | ||
1356 | + (*iface)-> addRef ( ); | ||
1357 | + | ||
1358 | +return QS_OK; | ||
1359 | +} | ||
1360 | + | ||
1361 | +Q_EXPORT_INTERFACE() | ||
1362 | +{ | ||
1363 | +Q_CREATE_INSTANCE( LiquidInterface ) | ||
1364 | +} | ||
1365 | + | ||
1366 | + | ||
1367 | +LiquidSettingsInterface::LiquidSettingsInterface ( ) : ref ( 0 ) | ||
1230 | { | 1368 | { |
1231 | - return(i18n("High performance liquid plugin").utf8()); | 1369 | - return(i18n("High performance liquid plugin").utf8()); |
1232 | + return "High Performance Liquid"; | 1370 | +m_widget = 0; |
1233 | } | 1371 | } |
1372 | + | ||
1373 | +LiquidSettingsInterface::~LiquidSettingsInterface ( ) | ||
1374 | +{ | ||
1375 | +} | ||
1376 | + | ||
1377 | +QWidget *LiquidSettingsInterface::create ( QWidget *parent, const char *name ) | ||
1378 | +{ | ||
1379 | +m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); | ||
1380 | + | ||
1381 | +return m_widget; | ||
1382 | +} | ||
1383 | + | ||
1384 | +bool LiquidSettingsInterface::accept ( ) | ||
1385 | +{ | ||
1386 | +if ( !m_widget ) | ||
1387 | + return false; | ||
1388 | + | ||
1389 | +return m_widget-> writeConfig ( ); | ||
1390 | +} | ||
1391 | + | ||
1392 | +void LiquidSettingsInterface::reject ( ) | ||
1393 | +{ | ||
1394 | +} | ||
1395 | + | ||
1396 | +QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | ||
1397 | +{ | ||
1398 | +*iface = 0; | ||
1399 | + | ||
1400 | + | ||
1401 | +if ( uuid == IID_QUnknown ) | ||
1402 | + *iface = this; | ||
1403 | +else if ( uuid == IID_StyleSettings ) | ||
1404 | + *iface = this; | ||
1405 | + | ||
1406 | +if ( *iface ) | ||
1407 | + (*iface)-> addRef ( ); | ||
1408 | + | ||
1409 | +return QS_OK; | ||
1410 | +} | ||
1411 | + | ||
1412 | +// Hack for Retail Z experiments | ||
1413 | +extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } } | ||