summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp7
-rw-r--r--noncore/styles/liquid/opie-liquid.diff137
2 files changed, 61 insertions, 83 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index daac22c..e6d8310 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1104,16 +1104,12 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
1104 if(btn->isEnabled()){ 1104 if(btn->isEnabled()){
1105 highlightWidget = btn; 1105 highlightWidget = btn;
1106 btn->repaint(false); 1106 btn->repaint(false);
1107
1108 qDebug ( "TB FOCUS IN [%p]", btn );
1109 } 1107 }
1110 } 1108 }
1111 else if(ev->type() == QEvent::FocusOut ){ 1109 else if(ev->type() == QEvent::FocusOut ){
1112 if(btn == highlightWidget){ 1110 if(btn == highlightWidget){
1113 highlightWidget = NULL; 1111 highlightWidget = NULL;
1114 btn->repaint(false); 1112 btn->repaint(false);
1115
1116 qDebug ( "TB FOCUS OUT [%p]", btn );
1117 } 1113 }
1118 } 1114 }
1119 else if(ev->type() == QEvent::Paint) { 1115 else if(ev->type() == QEvent::Paint) {
@@ -1247,11 +1243,8 @@ void LiquidStyle::drawToolButton(QPainter *p, int x, int y, int w, int h,
1247 } 1243 }
1248 1244
1249 p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix); 1245 p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
1250 qDebug ( "DRAW TOOLBUTTON IN PIXMAP" );
1251 } 1246 }
1252 else{ 1247 else{
1253 qDebug ( "DRAW TOOLBUTTON sunken=%d/high=%p/device=%p", sunken, highlightWidget,p->device() );
1254
1255 drawClearBevel(p, x, y, w, h, sunken ? g.button() : 1248 drawClearBevel(p, x, y, w, h, sunken ? g.button() :
1256 highlightWidget == p->device() ? g.button().light(110) : 1249 highlightWidget == p->device() ? g.button().light(110) :
1257 g.background(), g.background()); 1250 g.background(), g.background());
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index d90433c..9ae24cc 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -3,7 +3,7 @@ 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 --- -2002-11-21 20:45:47.000000000 +0100 6 --- -2002-11-29 12:30:34.000000000 +0100
7 +++ liquid.h2002-11-18 03:32:40.000000000 +0100 7 +++ liquid.h2002-11-18 03:32:40.000000000 +0100
8@@ -2,7 +2,7 @@ 8@@ -2,7 +2,7 @@
9 #define LIQUID_STYLE_H 9 #define LIQUID_STYLE_H
@@ -141,8 +141,8 @@ Features:
141 QPixmap *vsbSliderFillPix; 141 QPixmap *vsbSliderFillPix;
142 TransMenuHandler *menuHandler; 142 TransMenuHandler *menuHandler;
143 QPixmap *pixmaps[BITMAP_ITEMS]; 143 QPixmap *pixmaps[BITMAP_ITEMS];
144 --- -2002-11-21 20:45:47.000000000 +0100 144 --- -2002-11-29 12:30:34.000000000 +0100
145 +++ liquid.cpp2002-11-21 20:27:48.000000000 +0100 145 +++ liquid.cpp2002-11-29 12:30:24.000000000 +0100
146@@ -2,6 +2,9 @@ 146@@ -2,6 +2,9 @@
147 * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved. 147 * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
148 */ 148 */
@@ -271,7 +271,7 @@ Features:
271 r.width(), r.height()); 271 r.width(), r.height());
272 } 272 }
273 else{ // tear off menu 273 else{ // tear off menu
274@@ -121,82 +126,61 @@ 274@@ -121,82 +126,62 @@
275 stripePixmap(*pix, p->colorGroup().button()); 275 stripePixmap(*pix, p->colorGroup().button());
276 } 276 }
277 else{ 277 else{
@@ -341,10 +341,9 @@ Features:
341- ++it; 341- ++it;
342- if(w->inherits("QMenuBar")){ 342- if(w->inherits("QMenuBar")){
343- w->repaint(); 343- w->repaint();
344- }
345- }
344 + wid-> setBackgroundMode( QWidget::PaletteBackground ); 346 + wid-> setBackgroundMode( QWidget::PaletteBackground );
345 }
346 + delete ol;
347 }
348 } 347 }
349- } 348- }
350- else if(id == MOSFET_BUTTON_CHANGE){ 349- else if(id == MOSFET_BUTTON_CHANGE){
@@ -365,8 +364,9 @@ Features:
365- ++it; 364- ++it;
366- if(w->inherits("QPushButton")){ 365- if(w->inherits("QPushButton")){
367- ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w); 366- ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w);
368- } 367 + delete ol;
369- } 368 }
369 }
370+ return(false); 370+ return(false);
371+} 371+}
372 372
@@ -387,11 +387,12 @@ Features:
387+ 387+
388 +oldqte = ( qt_version ( ) < 234 ); 388 +oldqte = ( qt_version ( ) < 234 );
389 +flatTBButtons = false; 389 +flatTBButtons = false;
390 +currentHeader = 0;
390+ 391+
391 btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); 392 btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
392 btnMaskBmp.setMask(btnMaskBmp); 393 btnMaskBmp.setMask(btnMaskBmp);
393 htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); 394 htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
394@@ -207,12 +191,8 @@ 395@@ -207,12 +192,8 @@
395 btnDict.setAutoDelete(true); 396 btnDict.setAutoDelete(true);
396 bevelFillDict.setAutoDelete(true); 397 bevelFillDict.setAutoDelete(true);
397 smallBevelFillDict.setAutoDelete(true); 398 smallBevelFillDict.setAutoDelete(true);
@@ -404,7 +405,7 @@ Features:
404 btnBorderPix = new QPixmap; 405 btnBorderPix = new QPixmap;
405 btnBorderPix->convertFromImage(qembed_findImage("buttonfill")); 406 btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
406 btnBlendPix = new QPixmap; 407 btnBlendPix = new QPixmap;
407@@ -572,131 +552,119 @@ 408@@ -572,131 +553,119 @@
408 case HTMLBtnBorderDown: 409 case HTMLBtnBorderDown:
409 pixmaps[HTMLBtnBorderDown] = processEmbedded("htmlbtnborder", btnHoverH, btnHoverS, btnHoverV); 410 pixmaps[HTMLBtnBorderDown] = processEmbedded("htmlbtnborder", btnHoverH, btnHoverS, btnHoverV);
410 break; 411 break;
@@ -494,10 +495,10 @@ Features:
494- pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true); 495- pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
495+ case CBDown: 496+ case CBDown:
496+ pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/); 497+ pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/);
497+ break; 498 break;
498+ case CBDownHover: 499+ case CBDownHover:
499+ pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/); 500+ pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/);
500 break; 501+ break;
501+ 502+
502 case VSlider: 503 case VSlider:
503- pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true); 504- pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
@@ -599,7 +600,7 @@ Features:
599 *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix); 600 *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
600 break; 601 break;
601 case HSBSliderMidBg: 602 case HSBSliderMidBg:
602@@ -711,7 +679,6 @@ 603@@ -711,7 +680,6 @@
603 604
604 void LiquidStyle::polish(QPalette &appPal) 605 void LiquidStyle::polish(QPalette &appPal)
605 { 606 {
@@ -607,7 +608,7 @@ Features:
607 int i; 608 int i;
608 for(i=0; i < BITMAP_ITEMS; ++i){ 609 for(i=0; i < BITMAP_ITEMS; ++i){
609 if(pixmaps[i]){ 610 if(pixmaps[i]){
610@@ -719,31 +686,28 @@ 611@@ -719,31 +687,28 @@
611 pixmaps[i] = NULL; 612 pixmaps[i] = NULL;
612 } 613 }
613 } 614 }
@@ -654,7 +655,7 @@ Features:
654 // force button color to be different from background 655 // force button color to be different from background
655 QBrush btnBrush(QColor(200, 202, 228)); 656 QBrush btnBrush(QColor(200, 202, 228));
656 appPal.setBrush(QColorGroup::Button, btnBrush); 657 appPal.setBrush(QColorGroup::Button, btnBrush);
657@@ -778,8 +742,8 @@ 658@@ -778,8 +743,8 @@
658 adjustHSV(*pix, h, s, v); 659 adjustHSV(*pix, h, s, v);
659 smallBevelFillDict.insert(c.rgb(), pix); 660 smallBevelFillDict.insert(c.rgb(), pix);
660 } 661 }
@@ -665,7 +666,7 @@ Features:
665 666
666 c = c.dark(120); 667 c = c.dark(120);
667 pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-) 668 pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
668@@ -790,19 +754,13 @@ 669@@ -790,19 +755,13 @@
669 adjustHSV(*pix, h, s, v); 670 adjustHSV(*pix, h, s, v);
670 smallBevelFillDict.insert(c.rgb(), pix); 671 smallBevelFillDict.insert(c.rgb(), pix);
671 } 672 }
@@ -690,7 +691,7 @@ Features:
690 c.hsv(&bH, &bS, &bV); 691 c.hsv(&bH, &bS, &bV);
691 c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); 692 c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
692 693
693@@ -817,101 +775,50 @@ 694@@ -817,101 +776,50 @@
694 wallPaper.fill(c.rgb()); 695 wallPaper.fill(c.rgb());
695 painter.begin(&wallPaper); 696 painter.begin(&wallPaper);
696 for(i=0; i < 32; i+=4){ 697 for(i=0; i < 32; i+=4){
@@ -813,7 +814,7 @@ Features:
813 } 814 }
814 815
815 bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || 816 bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
816@@ -942,11 +849,20 @@ 817@@ -942,11 +850,20 @@
817 w->setMouseTracking(true); 818 w->setMouseTracking(true);
818 w->installEventFilter(this); 819 w->installEventFilter(this);
819 } 820 }
@@ -836,7 +837,7 @@ Features:
836 837
837 if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> 838 if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
838 palette().active().brush(QColorGroup::Background).pixmap()){ 839 palette().active().brush(QColorGroup::Background).pixmap()){
839@@ -954,16 +870,21 @@ 840@@ -954,16 +871,21 @@
840 return; 841 return;
841 } 842 }
842 if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && 843 if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
@@ -864,7 +865,7 @@ Features:
864 } 865 }
865 } 866 }
866 867
867@@ -977,6 +898,11 @@ 868@@ -977,6 +899,11 @@
868 869
869 if(w->inherits("QPopupMenu")) 870 if(w->inherits("QPopupMenu"))
870 w->setBackgroundMode(QWidget::PaletteButton); 871 w->setBackgroundMode(QWidget::PaletteButton);
@@ -876,7 +877,7 @@ Features:
876 877
877 if(w->isTopLevel()) 878 if(w->isTopLevel())
878 return; 879 return;
879@@ -986,7 +912,7 @@ 880@@ -986,7 +913,7 @@
880 ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) || 881 ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
881 (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0)); 882 (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
882 883
@@ -885,7 +886,7 @@ Features:
885 if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){ 886 if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
886 if(w->inherits("QPushButton")) 887 if(w->inherits("QPushButton"))
887 w->setBackgroundMode(QWidget::PaletteButton); 888 w->setBackgroundMode(QWidget::PaletteButton);
888@@ -997,16 +923,12 @@ 889@@ -997,16 +924,12 @@
889 if(isViewportChild) 890 if(isViewportChild)
890 w->setAutoMask(false); 891 w->setAutoMask(false);
891 892
@@ -907,7 +908,7 @@ Features:
907 w->removeEventFilter(this); 908 w->removeEventFilter(this);
908 } 909 }
909 if(w->inherits("QButton") || w->inherits("QComboBox")){ 910 if(w->inherits("QButton") || w->inherits("QComboBox")){
910@@ -1014,9 +936,12 @@ 911@@ -1014,9 +937,12 @@
911 w->setAutoMask(false); 912 w->setAutoMask(false);
912 } 913 }
913 } 914 }
@@ -922,7 +923,7 @@ Features:
922 return; 923 return;
923 } 924 }
924 if(w->inherits("QHeader")){ 925 if(w->inherits("QHeader")){
925@@ -1028,22 +953,118 @@ 926@@ -1028,22 +954,118 @@
926 void LiquidStyle::polish(QApplication *app) 927 void LiquidStyle::polish(QApplication *app)
927 { 928 {
928 929
@@ -1043,7 +1044,7 @@ Features:
1043 /* 1044 /*
1044 * This is a fun method ;-) Here's an overview. KToolBar grabs resize to 1045 * This is a fun method ;-) Here's an overview. KToolBar grabs resize to
1045 * force everything to erase and repaint on resize. This is going away, I'm 1046 * force everything to erase and repaint on resize. This is going away, I'm
1046@@ -1063,7 +1084,7 @@ 1047@@ -1063,7 +1085,7 @@
1047 */ 1048 */
1048 bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) 1049 bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
1049 { 1050 {
@@ -1052,7 +1053,7 @@ Features:
1052 if(ev->type() == QEvent::Resize){ 1053 if(ev->type() == QEvent::Resize){
1053 const QObjectList *tbChildList = obj->children(); 1054 const QObjectList *tbChildList = obj->children();
1054 QObjectListIt it(*tbChildList); 1055 QObjectListIt it(*tbChildList);
1055@@ -1076,116 +1097,27 @@ 1056@@ -1076,116 +1098,23 @@
1056 1057
1057 } 1058 }
1058 } 1059 }
@@ -1121,8 +1122,6 @@ Features:
1121 if(btn->isEnabled()){ 1122 if(btn->isEnabled()){
1122 highlightWidget = btn; 1123 highlightWidget = btn;
1123 btn->repaint(false); 1124 btn->repaint(false);
1124+
1125 + qDebug ( "TB FOCUS IN [%p]", btn );
1126 } 1125 }
1127 } 1126 }
1128- else if(ev->type() == QEvent::Leave){ 1127- else if(ev->type() == QEvent::Leave){
@@ -1131,8 +1130,6 @@ Features:
1131 if(btn == highlightWidget){ 1130 if(btn == highlightWidget){
1132 highlightWidget = NULL; 1131 highlightWidget = NULL;
1133 btn->repaint(false); 1132 btn->repaint(false);
1134+
1135+ qDebug ( "TB FOCUS OUT [%p]", btn );
1136 } 1133 }
1137 } 1134 }
1138- else 1135- else
@@ -1180,7 +1177,7 @@ Features:
1180 } 1177 }
1181 } 1178 }
1182 else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){ 1179 else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){
1183@@ -1201,6 +1133,7 @@ 1180@@ -1201,6 +1130,7 @@
1184 QSize sz = isRadio ? exclusiveIndicatorSize() 1181 QSize sz = isRadio ? exclusiveIndicatorSize()
1185 : indicatorSize(); 1182 : indicatorSize();
1186 1183
@@ -1188,7 +1185,7 @@ Features:
1188 if(btn->hasFocus()){ 1185 if(btn->hasFocus()){
1189 QRect r = QRect(0, 0, btn->width(), btn->height()); 1186 QRect r = QRect(0, 0, btn->width(), btn->height());
1190 p.setPen(btn->colorGroup().button().dark(140)); 1187 p.setPen(btn->colorGroup().button().dark(140));
1191@@ -1209,6 +1142,7 @@ 1188@@ -1209,6 +1139,7 @@
1192 p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1); 1189 p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
1193 p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom()); 1190 p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
1194 } 1191 }
@@ -1196,7 +1193,7 @@ Features:
1196 int x = 0; 1193 int x = 0;
1197 int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2; 1194 int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
1198 if(isRadio) 1195 if(isRadio)
1199@@ -1228,36 +1162,6 @@ 1196@@ -1228,36 +1159,6 @@
1200 p.end(); 1197 p.end();
1201 return(true); 1198 return(true);
1202 } 1199 }
@@ -1233,7 +1230,7 @@ Features:
1233 } 1230 }
1234 else if(obj->inherits("QHeader")){ 1231 else if(obj->inherits("QHeader")){
1235 QHeader *hw = (QHeader *)obj; 1232 QHeader *hw = (QHeader *)obj;
1236@@ -1290,7 +1194,24 @@ 1233@@ -1290,7 +1191,24 @@
1237 } 1234 }
1238 } 1235 }
1239 } 1236 }
@@ -1259,19 +1256,7 @@ Features:
1259 } 1256 }
1260 1257
1261 void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h, 1258 void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h,
1262@@ -1325,8 +1246,11 @@ 1259@@ -1340,11 +1258,6 @@
1263 }
1264
1265 p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
1266+ qDebug ( "DRAW TOOLBUTTON IN PIXMAP" );
1267 }
1268 else{
1269 + qDebug ( "DRAW TOOLBUTTON sunken=%d/high=%p/device=%p", sunken, highlightWidget,p->device() );
1270+
1271 drawClearBevel(p, x, y, w, h, sunken ? g.button() :
1272 highlightWidget == p->device() ? g.button().light(110) :
1273 g.background(), g.background());
1274@@ -1340,11 +1264,6 @@
1275 QColorGroup g = btn->colorGroup(); 1260 QColorGroup g = btn->colorGroup();
1276 1261
1277 1262
@@ -1283,7 +1268,7 @@ Features:
1283 //int dw = buttonDefaultIndicatorWidth(); 1268 //int dw = buttonDefaultIndicatorWidth();
1284 if(btn->hasFocus() || btn->isDefault()){ 1269 if(btn->hasFocus() || btn->isDefault()){
1285 QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); 1270 QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
1286@@ -1488,7 +1407,20 @@ 1271@@ -1488,7 +1401,20 @@
1287 const QColorGroup &g, bool sunken, 1272 const QColorGroup &g, bool sunken,
1288 bool edit, bool, const QBrush *) 1273 bool edit, bool, const QBrush *)
1289 { 1274 {
@@ -1305,7 +1290,7 @@ Features:
1305 bool isMasked = false; 1290 bool isMasked = false;
1306 if(painter->device()->devType() == QInternal::Widget) 1291 if(painter->device()->devType() == QInternal::Widget)
1307 isMasked = ((QWidget*)painter->device())->autoMask(); 1292 isMasked = ((QWidget*)painter->device())->autoMask();
1308@@ -1498,7 +1430,7 @@ 1293@@ -1498,7 +1424,7 @@
1309 1294
1310 drawRoundButton(&p, g.button(), g.background(), 0, 0, w, h, false, 1295 drawRoundButton(&p, g.button(), g.background(), 0, 0, w, h, false,
1311 sunken, false, isMasked); 1296 sunken, false, isMasked);
@@ -1314,7 +1299,7 @@ Features:
1314 p.setClipRect(0, 0, w-17, h); 1299 p.setClipRect(0, 0, w-17, h);
1315 drawRoundButton(&p, g.background(), g.background(), 0, 0, w, h, false, 1300 drawRoundButton(&p, g.background(), g.background(), 0, 0, w, h, false,
1316 sunken, false, isMasked); 1301 sunken, false, isMasked);
1317@@ -1550,16 +1482,17 @@ 1302@@ -1550,16 +1476,17 @@
1318 return(QRect(x+9, y+3, w - (h / 3) - 20, h-6)); 1303 return(QRect(x+9, y+3, w - (h / 3) - 20, h-6));
1319 } 1304 }
1320 1305
@@ -1335,7 +1320,7 @@ Features:
1335 int sliderMin, sliderMax, sliderLength, buttonDim; 1320 int sliderMin, sliderMax, sliderLength, buttonDim;
1336 scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim ); 1321 scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
1337 1322
1338@@ -1596,7 +1529,7 @@ 1323@@ -1596,7 +1523,7 @@
1339 if(sbBuffer.size() != sb->size()) 1324 if(sbBuffer.size() != sb->size())
1340 sbBuffer.resize(sb->size()); 1325 sbBuffer.resize(sb->size());
1341 } 1326 }
@@ -1344,7 +1329,7 @@ Features:
1344 addB.setRect( addX,addY,buttonDim,buttonDim ); 1329 addB.setRect( addX,addY,buttonDim,buttonDim );
1345 if(horiz) 1330 if(horiz)
1346 subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); 1331 subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
1347@@ -1624,7 +1557,7 @@ 1332@@ -1624,7 +1551,7 @@
1348 QPainter painter; 1333 QPainter painter;
1349 if(!horiz){ 1334 if(!horiz){
1350 painter.begin(&sbBuffer); 1335 painter.begin(&sbBuffer);
@@ -1353,7 +1338,7 @@ Features:
1353 if(sliderR.height() >= 8){ 1338 if(sliderR.height() >= 8){
1354 painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0, 1339 painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
1355 13, 8); 1340 13, 8);
1356@@ -1648,25 +1581,15 @@ 1341@@ -1648,25 +1575,15 @@
1357 } 1342 }
1358 if(controls & Slider){ 1343 if(controls & Slider){
1359 if(sliderR.height() >= 16){ 1344 if(sliderR.height() >= 16){
@@ -1384,7 +1369,7 @@ Features:
1384 } 1369 }
1385 else{ 1370 else{
1386 painter.setPen(g.button().dark(210)); 1371 painter.setPen(g.button().dark(210));
1387@@ -1674,7 +1597,6 @@ 1372@@ -1674,7 +1591,6 @@
1388 13, sliderR.height()); 1373 13, sliderR.height());
1389 painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1, 1374 painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1,
1390 11, sliderR.height()-2, 1375 11, sliderR.height()-2,
@@ -1392,7 +1377,7 @@ Features:
1392 *getPixmap(VSBSliderMid), 1, 0); 1377 *getPixmap(VSBSliderMid), 1, 0);
1393 } 1378 }
1394 } 1379 }
1395@@ -1690,7 +1612,7 @@ 1380@@ -1690,7 +1606,7 @@
1396 } 1381 }
1397 else{ 1382 else{
1398 painter.begin(&sbBuffer); 1383 painter.begin(&sbBuffer);
@@ -1401,7 +1386,7 @@ Features:
1401 if(sliderR.width() >= 8){ 1386 if(sliderR.width() >= 8){
1402 painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0, 1387 painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0,
1403 8, 13); 1388 8, 13);
1404@@ -1715,22 +1637,17 @@ 1389@@ -1715,22 +1631,17 @@
1405 if(controls & Slider){ 1390 if(controls & Slider){
1406 if(sliderR.width() >= 16){ 1391 if(sliderR.width() >= 16){
1407 painter.drawPixmap(sliderR.x(), sliderR.y()+1, 1392 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
@@ -1427,7 +1412,7 @@ Features:
1427 *getPixmap(HSBSliderBtm), 8-m, 0, m, 13); 1412 *getPixmap(HSBSliderBtm), 8-m, 0, m, 13);
1428 } 1413 }
1429 else{ 1414 else{
1430@@ -1738,8 +1655,7 @@ 1415@@ -1738,8 +1649,7 @@
1431 drawRoundRect(&painter, sliderR.x(), sliderR.y()+1, 1416 drawRoundRect(&painter, sliderR.x(), sliderR.y()+1,
1432 sliderR.width(), 13); 1417 sliderR.width(), 13);
1433 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2, 1418 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2,
@@ -1437,7 +1422,7 @@ Features:
1437 *getPixmap(HSBSliderMid), 0, 1); 1422 *getPixmap(HSBSliderMid), 0, 1);
1438 } 1423 }
1439 } 1424 }
1440@@ -1761,10 +1677,10 @@ 1425@@ -1761,10 +1671,10 @@
1441 addB.width()-8, addB.height()-8, g, !maxed); 1426 addB.width()-8, addB.height()-8, g, !maxed);
1442 } 1427 }
1443 if ( controls & SubLine ) { 1428 if ( controls & SubLine ) {
@@ -1452,7 +1437,7 @@ Features:
1452 drawSBButton(p, subHC, g, activeControl == SubLine); 1437 drawSBButton(p, subHC, g, activeControl == SubLine);
1453 drawArrow( p, horiz ? LeftArrow : UpArrow, 1438 drawArrow( p, horiz ? LeftArrow : UpArrow,
1454 false, subHC.x()+4, subHC.y()+4, 1439 false, subHC.x()+4, subHC.y()+4,
1455@@ -1865,8 +1781,8 @@ 1440@@ -1865,8 +1775,8 @@
1456 else 1441 else
1457 buttonDim = ( length - b*2 )/2 - 1; 1442 buttonDim = ( length - b*2 )/2 - 1;
1458 1443
@@ -1463,7 +1448,7 @@ Features:
1463 1448
1464 if ( sb->maxValue() == sb->minValue() ) { 1449 if ( sb->maxValue() == sb->minValue() ) {
1465 sliderLength = maxLength; 1450 sliderLength = maxLength;
1466@@ -1914,31 +1830,31 @@ 1451@@ -1914,31 +1824,31 @@
1467 return(QSize(16, 16)); 1452 return(QSize(16, 16));
1468 } 1453 }
1469 1454
@@ -1502,7 +1487,7 @@ Features:
1502 *getPixmap(RadioOff)); 1487 *getPixmap(RadioOff));
1503 } 1488 }
1504 } 1489 }
1505@@ -1957,25 +1873,25 @@ 1490@@ -1957,25 +1867,25 @@
1506 return(QSize(20, 22)); 1491 return(QSize(20, 22));
1507 } 1492 }
1508 1493
@@ -1534,7 +1519,7 @@ Features:
1534 *getPixmap(CBDown)); 1519 *getPixmap(CBDown));
1535 /* Todo - tristate 1520 /* Todo - tristate
1536 if(state == QButton::On){ 1521 if(state == QButton::On){
1537@@ -1992,12 +1908,12 @@ 1522@@ -1992,12 +1902,12 @@
1538 }*/ 1523 }*/
1539 } 1524 }
1540 else 1525 else
@@ -1550,7 +1535,7 @@ Features:
1550 { 1535 {
1551 // needed for some reason by KHtml, even tho it's all filled ;P 1536 // needed for some reason by KHtml, even tho it's all filled ;P
1552 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); 1537 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
1553@@ -2005,18 +1921,17 @@ 1538@@ -2005,18 +1915,17 @@
1554 } 1539 }
1555 1540
1556 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, 1541 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
@@ -1572,7 +1557,7 @@ Features:
1572 Orientation orient, bool, bool) 1557 Orientation orient, bool, bool)
1573 { 1558 {
1574 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : 1559 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
1575@@ -2065,243 +1980,76 @@ 1560@@ -2065,243 +1974,76 @@
1576 p->drawLineSegments(a); 1561 p->drawLineSegments(a);
1577 } 1562 }
1578 1563
@@ -1633,9 +1618,9 @@ Features:
1633- qDrawShadePanel(p, x, y, w, h, g, false, 1, 1618- qDrawShadePanel(p, x, y, w, h, g, false, 1,
1634- &g.brush(QColorGroup::Background)); 1619- &g.brush(QColorGroup::Background));
1635- } 1620- }
1636
1637-}
1638- 1621-
1622-}
1623
1639-void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h, 1624-void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h,
1640- const QColorGroup &g, KToolBarPos, QBrush *) 1625- const QColorGroup &g, KToolBarPos, QBrush *)
1641+void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, 1626+void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
@@ -1845,7 +1830,7 @@ Features:
1845 { 1830 {
1846 QColor c; 1831 QColor c;
1847 switch(menuHandler->transType()){ 1832 switch(menuHandler->transType()){
1848@@ -2336,8 +2084,6 @@ 1833@@ -2336,8 +2078,6 @@
1849 1834
1850 maxpmw = QMAX( maxpmw, 20 ); 1835 maxpmw = QMAX( maxpmw, 20 );
1851 1836
@@ -1854,7 +1839,7 @@ Features:
1854 1839
1855 bool dis = !enabled; 1840 bool dis = !enabled;
1856 QColorGroup itemg = dis ? pal.disabled() : pal.active(); 1841 QColorGroup itemg = dis ? pal.disabled() : pal.active();
1857@@ -2363,7 +2109,7 @@ 1842@@ -2363,7 +2103,7 @@
1858 p->fillRect(x, y, w, h, menuBrush); 1843 p->fillRect(x, y, w, h, menuBrush);
1859 } 1844 }
1860 else{ 1845 else{
@@ -1863,7 +1848,7 @@ Features:
1863 if(pix) 1848 if(pix)
1864 p->drawPixmap(x, y, *pix, x, y, w, h); 1849 p->drawPixmap(x, y, *pix, x, y, w, h);
1865 } 1850 }
1866@@ -2508,25 +2254,6 @@ 1851@@ -2508,25 +2248,6 @@
1867 return h; 1852 return h;
1868 } 1853 }
1869 1854
@@ -1889,7 +1874,7 @@ Features:
1889 1874
1890 void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, 1875 void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
1891 const QColorGroup &g, const QColor *c, 1876 const QColorGroup &g, const QColor *c,
1892@@ -2536,29 +2263,29 @@ 1877@@ -2536,29 +2257,29 @@
1893 if(p->device()->devType() == QInternal::Widget){ 1878 if(p->device()->devType() == QInternal::Widget){
1894 // if so does it use a special focus rectangle? 1879 // if so does it use a special focus rectangle?
1895 QWidget *w = (QWidget *)p->device(); 1880 QWidget *w = (QWidget *)p->device();
@@ -1924,7 +1909,7 @@ Features:
1924 return; 1909 return;
1925 } 1910 }
1926 QPixmap tilePix; 1911 QPixmap tilePix;
1927@@ -2671,7 +2398,7 @@ 1912@@ -2671,7 +2392,7 @@
1928 vFrame = 8; // was 10 1913 vFrame = 8; // was 10
1929 } 1914 }
1930 else 1915 else
@@ -1933,7 +1918,7 @@ Features:
1933 } 1918 }
1934 1919
1935 1920
1936@@ -2699,7 +2426,7 @@ 1921@@ -2699,7 +2420,7 @@
1937 p->drawLine(x+1, y+1, x+1, y2-1); 1922 p->drawLine(x+1, y+1, x+1, y2-1);
1938 } 1923 }
1939 else if(lineWidth != 2 || !sunken) 1924 else if(lineWidth != 2 || !sunken)
@@ -1942,7 +1927,7 @@ Features:
1942 else{ 1927 else{
1943 QPen oldPen = p->pen(); 1928 QPen oldPen = p->pen();
1944 int x2 = x+w-1; 1929 int x2 = x+w-1;
1945@@ -2726,105 +2453,6 @@ 1930@@ -2726,105 +2447,6 @@
1946 } 1931 }
1947 } 1932 }
1948 1933
@@ -2048,7 +2033,7 @@ Features:
2048 2033
2049 void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) 2034 void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
2050 { 2035 {
2051@@ -2988,110 +2616,5 @@ 2036@@ -2988,110 +2610,5 @@
2052 } 2037 }
2053 } 2038 }
2054 2039
@@ -2159,7 +2144,7 @@ Features:
2159- 2144-
2160 2145
2161 /* vim: set noet sw=8 ts=8: */ 2146 /* vim: set noet sw=8 ts=8: */
2162 --- -2002-11-21 20:45:47.000000000 +0100 2147 --- -2002-11-29 12:30:35.000000000 +0100
2163 +++ plugin.cpp2002-11-18 18:11:41.000000000 +0100 2148 +++ plugin.cpp2002-11-18 18:11:41.000000000 +0100
2164@@ -1,29 +1,84 @@ 2149@@ -1,29 +1,84 @@
2165+#include <qapplication.h> 2150+#include <qapplication.h>