| -rw-r--r-- | noncore/styles/liquid/liquid.cpp | 23 | ||||
| -rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 128 |
2 files changed, 87 insertions, 64 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 22bf8af..0d9d259 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -676,25 +676,24 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item) case HSBSliderMidBg: pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV); *pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix); break; default: break; } return(pixmaps[item]); } void LiquidStyle::polish(QPalette &appPal) { - int i; for(i=0; i < BITMAP_ITEMS; ++i){ if(pixmaps[i]){ delete pixmaps[i]; pixmaps[i] = NULL; } } QWidgetList *list = QApplication::allWidgets(); QWidgetListIt it( *list ); QWidget *w; while ((w=it.current()) != 0 ){ ++it; @@ -709,30 +708,33 @@ void LiquidStyle::polish(QPalette &appPal) btnBorderDict.clear(); bevelFillDict.clear(); smallBevelFillDict.clear(); Config config ( "qpe" ); config. setGroup ( "Liquid-Style" ); int contrast = config. readNumEntry ( "StippleContrast", 5 ); if ( contrast < 0 ) contrast = 0; else if ( contrast > 10 ) contrast = 10; - QPalette pal = QApplication::palette(); +// QPalette pal = QApplication::palette(); // button color stuff config. setGroup ( "Appearance" ); - QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); - if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) { + QColor c = // QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); + appPal. color ( QPalette::Active, QColorGroup::Button ); + if ( c == appPal. color ( QPalette::Active, QColorGroup::Background ) + //QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( ))) + ) { // force button color to be different from background QBrush btnBrush(QColor(200, 202, 228)); appPal.setBrush(QColorGroup::Button, btnBrush); } c.hsv(&btnH, &btnS, &btnV); c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV); // menu pixmap if(!menuPix){ menuPix = new QPixmap; menuPix->resize(64, 64); } @@ -765,25 +767,25 @@ void LiquidStyle::polish(QPalette &appPal) pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-) if(!pix){ int h, s, v; c.hsv(&h, &s, &v); pix = new QPixmap(*smallBevelFillPix); adjustHSV(*pix, h, s, v); smallBevelFillDict.insert(c.rgb(), pix); } pagerBrush.setColor(c); pagerBrush.setPixmap(*pix); // background color stuff - c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))); + c = /*QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background ); c.hsv(&bH, &bS, &bV); c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); // FIXME? if(vsbSliderFillPix) delete vsbSliderFillPix; vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix)); adjustHSV(*vsbSliderFillPix, bH, bS, bV); // background brush QPixmap wallPaper(32, 32); wallPaper.fill(c.rgb()); @@ -791,50 +793,49 @@ void LiquidStyle::polish(QPalette &appPal) for(i=0; i < 32; i+=4){ painter.setPen(c.dark(100 + contrast)); painter.drawLine(0, i, 32, i); painter.setPen(c.dark(100 + 3 * contrast / 5 ) ); painter.drawLine(0, i+1, 32, i+1); }; painter.end(); bgBrush.setColor(c); bgBrush.setPixmap(wallPaper); appPal.setBrush(QColorGroup::Background, bgBrush); // lineedits - c = QColor ( config. readEntry("Base", ( Qt::white). name ( ))); + c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base ); QPixmap basePix; basePix.resize(32, 32); basePix.fill(c.rgb()); painter.begin(&basePix); painter.setPen(c.dark(105)); for(i=0; i < 32; i+=4){ painter.drawLine(0, i, 32, i); painter.drawLine(0, i+1, 32, i+1); }; painter.end(); baseBrush.setColor(c); baseBrush.setPixmap(basePix); it.toFirst(); while ((w=it.current()) != 0 ){ ++it; if(w->inherits("QLineEdit")){ QPalette pal = w->palette(); pal.setBrush(QColorGroup::Base, baseBrush); w->setPalette(pal); } else if(w->inherits("QPushButton")){ applyCustomAttributes((QPushButton *)w); } } - } void LiquidStyle::polish(QWidget *w) { if(w->inherits("QMenuBar")){ //((QFrame*)w)->setLineWidth(0); w->setBackgroundMode(QWidget::PaletteBackground); w->setBackgroundOrigin(QWidget::ParentOrigin); return; } if(w->inherits("QToolBar")){ w->installEventFilter(this); @@ -939,25 +940,25 @@ void LiquidStyle::unPolish(QWidget *w) else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { w->removeEventFilter(menuHandler); } if(w->isTopLevel()) return; // for viewport children, don't just check for NoBackground.... bool isViewportChild = w->parent() && ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) || (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0)); - w->setPalette(QApplication::palette()); + w->unsetPalette(); if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){ if(w->inherits("QPushButton")) w->setBackgroundMode(QWidget::PaletteButton); else w->setBackgroundMode(QWidget::PaletteBackground); } if(isViewportChild) w->setAutoMask(false); if(w->inherits("QPushButton")){ unapplyCustomAttributes((QPushButton *)w); @@ -996,39 +997,39 @@ void LiquidStyle::polish(QApplication *app) menuAni = app->isEffectEnabled(UI_AnimateMenu); menuFade = app->isEffectEnabled(UI_FadeMenu); if(menuAni) app->setEffectEnabled(UI_AnimateMenu, false); if(menuFade) app->setEffectEnabled(UI_FadeMenu, false); qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); Config config ( "qpe" ); config. setGroup ( "Liquid-Style" ); - if ( config. readBoolEntry ( "WinDecoration", true )) - QApplication::qwsSetDecoration ( new LiquidDecoration ( )); +// if ( config. readBoolEntry ( "WinDecoration", true )) +// QApplication::qwsSetDecoration ( new LiquidDecoration ( )); flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); } void LiquidStyle::unPolish(QApplication *app) { QWindowsStyle::unPolish(app); app->setEffectEnabled(UI_AnimateMenu, menuAni); app->setEffectEnabled(UI_FadeMenu, menuFade); qt_set_draw_menu_bar_impl ( 0 ); - QApplication::qwsSetDecoration ( new QPEDecoration ( )); +// QApplication::qwsSetDecoration ( new QPEDecoration ( )); } /* * This is a fun method ;-) Here's an overview. KToolBar grabs resize to * force everything to erase and repaint on resize. This is going away, I'm * trying to get shaped widgets to work right without masking. QPushButton, * QComboBox, and Panel applet handles capture mouse enter and leaves in order * to set the highlightwidget and repaint for mouse hovers. CheckBoxes and * RadioButtons need to do this differently. Qt buffers these in pixmaps and * caches them in QPixmapCache, which is bad for doing things like hover * because the style methods aren't called in paintEvents if everything * is cached. We use our own Paint event handler instead. Taskbuttons and diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index 7dfd868..90ece90 100644 --- a/noncore/styles/liquid/opie-liquid.diff +++ b/noncore/styles/liquid/opie-liquid.diff @@ -1,19 +1,19 @@ This is a patch to mosfet's liquid 0.7. Features: - Qt-only - works with Qt/E on QPE/OPIE ---- - Mon Jul 15 02:34:13 2002 -+++ liquid.h Mon Jul 15 01:51:12 2002 +--- - Sat Sep 21 05:31:47 2002 ++++ liquid.h Mon Jul 15 02:52:50 2002 @@ -2,7 +2,7 @@ #define LIQUID_STYLE_H -#include <kstyle.h> +#include <qwindowsstyle.h> #include <qpainter.h> #include <qdrawutil.h> #include <qpalette.h> @@ -20,7 +20,7 @@ * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved. */ @@ -101,26 +101,26 @@ Features: - QPixmap *icon, QBrush *fill); // for repainting toolbuttons when the toolbar is resized bool eventFilter(QObject *obj, QEvent *ev); void drawSliderGroove(QPainter * p, int x, int y, int w, int h, @@ -204,6 +177,7 @@ QPixmap* getPixmap(BitmapData item); QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); private: + bool flatTBButtons; bool highcolor; QColorGroup radioOnGrp; QWidget *highlightWidget; ---- - Mon Jul 15 02:34:13 2002 -+++ liquid.cpp Mon Jul 15 02:31:59 2002 +--- - Sat Sep 21 05:31:48 2002 ++++ liquid.cpp Sat Sep 21 05:18:54 2002 @@ -10,12 +10,10 @@ #include <qmenudata.h> #include "liquid.h" -#include <kapp.h> -#include <kglobal.h> -#include <kconfig.h> -#include <kdrawutil.h> -#include <kglobalsettings.h> -#include <kpixmapeffect.h> +#include "liquiddeco.h" +#include <qapplication.h> @@ -334,103 +334,116 @@ Features: + LiquidStyle::LiquidStyle() - :KStyle() + :QWindowsStyle() { + setName ( "LiquidStyle" ); + + flatTBButtons = false; + btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); btnMaskBmp.setMask(btnMaskBmp); htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); -@@ -730,20 +704,26 @@ +@@ -711,7 +685,6 @@ + + void LiquidStyle::polish(QPalette &appPal) + { +- + int i; + for(i=0; i < BITMAP_ITEMS; ++i){ + if(pixmaps[i]){ +@@ -730,20 +703,29 @@ } loadCustomButtons(); - lowLightVal = 100 + (2*KGlobalSettings::contrast()+4)*10; + lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10; btnDict.clear(); btnBorderDict.clear(); bevelFillDict.clear(); smallBevelFillDict.clear(); - KConfig *config = KGlobal::config(); - QString oldGrp = config->group(); +- QPalette pal = QApplication::palette(); + Config config ( "qpe" ); + config. setGroup ( "Liquid-Style" ); + int contrast = config. readNumEntry ( "StippleContrast", 5 ); + if ( contrast < 0 ) + contrast = 0; + else if ( contrast > 10 ) + contrast = 10; + - QPalette pal = QApplication::palette(); ++// QPalette pal = QApplication::palette(); // button color stuff - config->setGroup("General"); - QColor c = config->readColorEntry("buttonBackground", &Qt::lightGray); - if(c == config->readColorEntry("background", &Qt::lightGray)){ + config. setGroup ( "Appearance" ); -+ QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); -+ if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) { ++ QColor c = // QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); ++ appPal. color ( QPalette::Active, QColorGroup::Button ); ++ if ( c == appPal. color ( QPalette::Active, QColorGroup::Background ) ++ //QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( ))) ++ ) { // force button color to be different from background QBrush btnBrush(QColor(200, 202, 228)); appPal.setBrush(QColorGroup::Button, btnBrush); -@@ -794,15 +774,7 @@ +@@ -794,15 +776,7 @@ pagerBrush.setPixmap(*pix); // background color stuff - c = config->readColorEntry("background", &Qt::lightGray); - if(qstrcmp(kapp->argv()[0], "kicker") == 0){ - appPal.setColor(QColorGroup::Mid, menuBrush.color().dark(110)); - appPal.setColor(QColorGroup::Dark, menuBrush.color().dark(130)); - appPal.setColor(QColorGroup::Midlight, menuBrush.color().light(110)); - appPal.setColor(QColorGroup::Light, menuBrush.color().light(115)); - menuBrush.setColor(c); // hack - used for kicker applets - appPal.setBrush(QColorGroup::Background, menuBrush); - } -+ c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))); ++ c = /*QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background ); c.hsv(&bH, &bS, &bV); c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); -@@ -817,21 +789,18 @@ +@@ -817,21 +791,18 @@ wallPaper.fill(c.rgb()); painter.begin(&wallPaper); for(i=0; i < 32; i+=4){ - painter.setPen(c.dark(105)); + painter.setPen(c.dark(100 + contrast)); painter.drawLine(0, i, 32, i); - painter.setPen(c.dark(103)); + painter.setPen(c.dark(100 + 3 * contrast / 5 ) ); painter.drawLine(0, i+1, 32, i+1); }; painter.end(); bgBrush.setColor(c); bgBrush.setPixmap(wallPaper); - if(qstrcmp(kapp->argv()[0], "kicker") != 0 && - qstrcmp(kapp->argv()[0], "ksplash") != 0){ appPal.setBrush(QColorGroup::Background, bgBrush); - } // lineedits - c = config->readColorEntry("windowBackground", &Qt::white); -+ c = QColor ( config. readEntry("Base", ( Qt::white). name ( ))); ++ c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base ); QPixmap basePix; basePix.resize(32, 32); basePix.fill(c.rgb()); -@@ -857,51 +826,39 @@ +@@ -856,52 +827,39 @@ + applyCustomAttributes((QPushButton *)w); } } - +- - config->setGroup(oldGrp); } void LiquidStyle::polish(QWidget *w) { if(w->inherits("QMenuBar")){ - ((QFrame*)w)->setLineWidth(0); - w->setBackgroundMode(QWidget::NoBackground); + //((QFrame*)w)->setLineWidth(0); + w->setBackgroundMode(QWidget::PaletteBackground); + w->setBackgroundOrigin(QWidget::ParentOrigin); + return; @@ -478,159 +491,168 @@ Features: + if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) + w-> setBackgroundOrigin ( QWidget::ParentOrigin ); if(w->inherits("QComboBox") || w->inherits("QLineEdit") || w->inherits("QRadioButton") || - w->inherits("QCheckBox") || w->inherits("QScrollBar") || - w->isA("AppletHandle") || w->inherits("KMiniPagerButton") || - w->inherits("TaskContainer")){ + w->inherits("QCheckBox") || w->inherits("QScrollBar")) { w->installEventFilter(this); } if(w->inherits("QLineEdit")){ -@@ -913,6 +870,9 @@ +@@ -913,6 +871,9 @@ applyCustomAttributes((QPushButton *)w); w->installEventFilter(this); } + if(w->inherits("QButton") || w-> inherits("QComboBox")){ + w-> setBackgroundMode ( QWidget::PaletteBackground ); + } bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || qstrcmp(w->name(), "qt_clipped_viewport") == 0; -@@ -942,11 +902,14 @@ +@@ -942,11 +903,14 @@ w->setMouseTracking(true); w->installEventFilter(this); } + if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { + ((QToolButton*)w)->setAutoRaise (flatTBButtons); + if ( flatTBButtons ) + w->setBackgroundOrigin(QWidget::ParentOrigin); + } if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ return; } - if(w->inherits("PanelButtonBase")) - return; if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> palette().active().brush(QColorGroup::Background).pixmap()){ -@@ -954,17 +917,13 @@ +@@ -954,17 +918,13 @@ return; } if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && - !w->inherits("KDesktop") && !w->inherits("PasswordDlg")){ + !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) { if(w->backgroundMode() == QWidget::PaletteBackground || w->backgroundMode() == QWidget::PaletteButton){ w->setBackgroundMode(QWidget::X11ParentRelative); } } - if(w->inherits("KToolBar")){ - w->installEventFilter(this); - //w->setBackgroundMode(QWidget::NoBackground); - return; - } + } void LiquidStyle::unPolish(QWidget *w) -@@ -977,6 +936,9 @@ +@@ -977,6 +937,9 @@ if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::PaletteButton); + else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { + w->removeEventFilter(menuHandler); + } if(w->isTopLevel()) return; -@@ -1001,12 +963,14 @@ +@@ -986,7 +949,7 @@ + ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) || + (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0)); + +- w->setPalette(QApplication::palette()); ++ w->unsetPalette(); + if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){ + if(w->inherits("QPushButton")) + w->setBackgroundMode(QWidget::PaletteButton); +@@ -1001,12 +964,14 @@ unapplyCustomAttributes((QPushButton *)w); w->removeEventFilter(this); } - +/* + if(w->inherits("QPushButton") || w-> inherits("QComboBox")){ + w-> setBackgroundMode ( PaletteBackground ); + } +*/ if(w->inherits("QComboBox") || w->inherits("QLineEdit") || w->inherits("QRadioButton") || - w->inherits("QCheckBox") || w->inherits("QScrollBar") || - w->isA("AppletHandle") || w->inherits("KMiniPagerButton") || - w->inherits("TaskContainer")){ + w->inherits("QCheckBox") || w->inherits("QScrollBar")) { w->removeEventFilter(this); } if(w->inherits("QButton") || w->inherits("QComboBox")){ -@@ -1014,9 +978,9 @@ +@@ -1014,9 +979,9 @@ w->setAutoMask(false); } } - if(w->inherits("KToolBar")){ + if(w->inherits("QToolBar")){ w->removeEventFilter(this); - //w->setBackgroundMode(QWidget::PaletteBackground); + w->setBackgroundMode(QWidget::PaletteBackground); return; } if(w->inherits("QHeader")){ -@@ -1028,20 +992,34 @@ +@@ -1028,20 +993,34 @@ void LiquidStyle::polish(QApplication *app) { - KStyle::polish(app); + QWindowsStyle::polish(app); menuAni = app->isEffectEnabled(UI_AnimateMenu); menuFade = app->isEffectEnabled(UI_FadeMenu); if(menuAni) app->setEffectEnabled(UI_AnimateMenu, false); if(menuFade) app->setEffectEnabled(UI_FadeMenu, false); + + qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); + + Config config ( "qpe" ); + config. setGroup ( "Liquid-Style" ); + -+ if ( config. readBoolEntry ( "WinDecoration", true )) -+ QApplication::qwsSetDecoration ( new LiquidDecoration ( )); ++// if ( config. readBoolEntry ( "WinDecoration", true )) ++// QApplication::qwsSetDecoration ( new LiquidDecoration ( )); + + flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); } void LiquidStyle::unPolish(QApplication *app) { - KStyle::unPolish(app); + QWindowsStyle::unPolish(app); app->setEffectEnabled(UI_AnimateMenu, menuAni); app->setEffectEnabled(UI_FadeMenu, menuFade); + + qt_set_draw_menu_bar_impl ( 0 ); + -+ QApplication::qwsSetDecoration ( new QPEDecoration ( )); ++// QApplication::qwsSetDecoration ( new QPEDecoration ( )); } /* -@@ -1063,7 +1041,7 @@ +@@ -1063,7 +1042,7 @@ */ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) { - if(obj->inherits("KToolBar")){ + if(obj->inherits("QToolBar")){ if(ev->type() == QEvent::Resize){ const QObjectList *tbChildList = obj->children(); QObjectListIt it(*tbChildList); -@@ -1076,35 +1054,7 @@ +@@ -1076,35 +1055,7 @@ } } - else if(obj->inherits("KMiniPagerButton")){ - QButton *btn = (QButton *)obj; - if(ev->type() == QEvent::Paint){ - if(!(btn->isOn() || btn->isDown())){ - QPalette pal = btn->palette(); - pal.setBrush(QColorGroup::Dark, btn == highlightWidget ? - pagerHoverBrush : pagerBrush); - btn->setPalette(pal); - } @@ -649,167 +671,167 @@ Features: - else if(ev->type() == QEvent::Leave){ - highlightWidget = NULL; - btn->repaint(false); - } - - } - else if(obj->inherits("QPushButton") || obj->inherits("QComboBox") || - obj->isA("AppletHandle")){ + else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){ QWidget *btn = (QWidget *)obj; if(ev->type() == QEvent::Enter){ if(btn->isEnabled()){ -@@ -1119,20 +1069,7 @@ +@@ -1119,20 +1070,7 @@ } } } - else if(obj->inherits("TaskContainer")){ - QButton *btn = (QButton *)obj; - QPalette pal = btn->palette(); - if(ev->type() == QEvent::Enter){ - pal.setColor(QColorGroup::Background, pal.active().button().light(110)); - btn->setPalette(pal); - } - else if(ev->type() == QEvent::Leave){ - pal.setColor(QColorGroup::Background, - QApplication::palette().active().background()); - btn->setPalette(pal); - } - } - else if(obj->inherits("QToolButton") && !obj->inherits("KToolBarButton")){ + else if(obj->inherits("QToolButton")){ QToolButton *btn = (QToolButton *)btn; if(!btn->autoRaise()){ if(btn->isEnabled()){ -@@ -1340,11 +1277,6 @@ +@@ -1340,11 +1278,6 @@ QColorGroup g = btn->colorGroup(); - QColor testColor; - if(btn->parent() && btn->parent()->isWidgetType()){ - testColor = p->backgroundColor(); // remove me - } - //int dw = buttonDefaultIndicatorWidth(); if(btn->hasFocus() || btn->isDefault()){ QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); -@@ -1596,7 +1528,7 @@ +@@ -1596,7 +1529,7 @@ if(sbBuffer.size() != sb->size()) sbBuffer.resize(sb->size()); } - subB.setRect( subX,subY,buttonDim,buttonDim ); + subB.setRect( subX,subY,0,0); // buttonDim,buttonDim ); addB.setRect( addX,addY,buttonDim,buttonDim ); if(horiz) subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); -@@ -1624,7 +1556,7 @@ +@@ -1624,7 +1557,7 @@ QPainter painter; if(!horiz){ painter.begin(&sbBuffer); - QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1); + QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1); if(sliderR.height() >= 8){ painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0, 13, 8); -@@ -1690,7 +1622,7 @@ +@@ -1690,7 +1623,7 @@ } else{ painter.begin(&sbBuffer); - QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height()); + QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height()); if(sliderR.width() >= 8){ painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0, 8, 13); -@@ -1761,10 +1693,10 @@ +@@ -1761,10 +1694,10 @@ addB.width()-8, addB.height()-8, g, !maxed); } if ( controls & SubLine ) { - drawSBButton(p, subB, g, activeControl == SubLine); - drawArrow( p, horiz ? LeftArrow : UpArrow, - false, subB.x()+4, subB.y()+4, - subB.width()-8, subB.height()-8, g, !maxed); + // drawSBButton(p, subB, g, activeControl == SubLine); + // drawArrow( p, horiz ? LeftArrow : UpArrow, + // false, subB.x()+4, subB.y()+4, + // subB.width()-8, subB.height()-8, g, !maxed); drawSBButton(p, subHC, g, activeControl == SubLine); drawArrow( p, horiz ? LeftArrow : UpArrow, false, subHC.x()+4, subHC.y()+4, -@@ -1865,8 +1797,8 @@ +@@ -1865,8 +1798,8 @@ else buttonDim = ( length - b*2 )/2 - 1; - sliderMin = b + buttonDim; - maxLength = length - b*2 - buttonDim*3; + sliderMin = b + 0; // buttonDim; + maxLength = length - b*2 - buttonDim*2; // 3; if ( sb->maxValue() == sb->minValue() ) { sliderLength = maxLength; -@@ -1914,8 +1846,8 @@ +@@ -1914,8 +1847,8 @@ return(QSize(16, 16)); } -void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w, - int h, const QColorGroup &g, bool on, +void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/, + int /*h*/, const QColorGroup &/*g*/, bool on, bool down, bool) { bool isHover = highlightWidget == p->device(); -@@ -1957,8 +1889,8 @@ +@@ -1957,8 +1890,8 @@ return(QSize(20, 22)); } -void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, int state, bool down, bool) +void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/, + const QColorGroup &/*g*/, int state, bool /*down*/, bool) { bool isHover = highlightWidget == p->device(); bool isMasked = p->device() && p->device()->devType() == QInternal::Widget -@@ -1996,8 +1928,8 @@ +@@ -1996,8 +1929,8 @@ } } -void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, - int state) +void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, + int /*state*/) { // needed for some reason by KHtml, even tho it's all filled ;P p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); -@@ -2005,18 +1937,17 @@ +@@ -2005,18 +1938,17 @@ } void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, Orientation orient, + const QColorGroup &/*g*/, Orientation orient, bool, bool) { QWidget *parent = (QWidget *)p->device(); p->setBrushOrigin(parent->pos()); - p->fillRect(x, y, w, h, - QApplication::palette().active().brush(QColorGroup::Background)); + parent->erase(x, y, w, h); p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : *getPixmap(VSlider)); } -void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h, +void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, Orientation orient, bool, bool) { p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : -@@ -2065,203 +1996,26 @@ +@@ -2065,203 +1997,26 @@ p->drawLineSegments(a); } -void LiquidStyle::drawKBarHandle(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, KToolBarPos, - QBrush *) -{ - p->setPen(g.button().dark(120)); - int x2 = x+w-1; - int y2 = y+h-1; - p->drawLine(x+1, y, x2-1, y); - p->drawLine(x+1, y2, x2-1, y2); @@ -985,76 +1007,76 @@ Features: - qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, 0, 0, - g, true); - else - qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, - 0, 0, g, false); + if(active){ + x -= 2; // Bug in Qt/E + y -= 2; + w += 2; + h += 2; } -} -- +- -void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, bool active, QMenuItem *mi, - QBrush *) -{ - if ( p->font() == KGlobalSettings::generalFont() ) - p->setFont( KGlobalSettings::menuFont() ); + QWidget *parent = (QWidget *)p->device(); + p->setBrushOrigin(parent->pos()); + parent->erase(x, y, w, h); if(menuHandler->useShadowText()){ QColor shadow; if(p->device() && p->device()->devType() == QInternal::Widget && - ((QWidget *)p->device())->inherits("KMenuBar")){ - shadow = ((KMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : + ((QWidget *)p->device())->inherits("QMenuBar")){ + shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : g.background().dark(130); } else -@@ -2300,8 +2054,8 @@ +@@ -2300,8 +2055,8 @@ } void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, int lineWidth, - const QBrush * fill) + const QColorGroup &g, int /*lineWidth*/, + const QBrush * /*fill*/) { QColor c; switch(menuHandler->transType()){ -@@ -2336,8 +2090,6 @@ +@@ -2336,8 +2091,6 @@ maxpmw = QMAX( maxpmw, 20 ); - if ( p->font() == KGlobalSettings::generalFont() ) - p->setFont( KGlobalSettings::menuFont() ); bool dis = !enabled; QColorGroup itemg = dis ? pal.disabled() : pal.active(); -@@ -2363,7 +2115,7 @@ +@@ -2363,7 +2116,7 @@ p->fillRect(x, y, w, h, menuBrush); } else{ - KPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId()); + QPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId()); if(pix) p->drawPixmap(x, y, *pix, x, y, w, h); } -@@ -2508,25 +2260,6 @@ +@@ -2508,25 +2261,6 @@ return h; } -void LiquidStyle::drawKProgressBlock(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, QBrush *fill) -{ - p->setPen(g.button().dark(130)); - p->drawRect(x, y, w, h); - p->setPen(g.button().light(120)); - p->drawRect(x+1, y+1, w-2, h-2); - if(w >= 4 && h >= 4){ - QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb()); @@ -1062,25 +1084,25 @@ Features: - int h, s, v; - g.button().dark(120).hsv(&h, &s, &v); - pix = new QPixmap(*bevelFillPix); - adjustHSV(*pix, h, s, v); - bevelFillDict.insert(g.button().dark(120).rgb(), pix); - } - p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix); - } -} void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, const QColor *c, -@@ -2540,25 +2273,25 @@ +@@ -2540,25 +2274,25 @@ return; } else{ - KStyle::drawFocusRect(p, r, g, c, atBorder); + QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); } } else - KStyle::drawFocusRect(p, r, g, c, atBorder); + QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); } @@ -1092,43 +1114,43 @@ Features: + QWindowsStyle::polishPopupMenu(mnu); } void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab, bool selected) { if(tabBar->shape() != QTabBar::RoundedAbove){ - KStyle::drawTab(p, tabBar, tab, selected); + QWindowsStyle::drawTab(p, tabBar, tab, selected); return; } QPixmap tilePix; -@@ -2671,7 +2404,7 @@ +@@ -2671,7 +2405,7 @@ vFrame = 8; // was 10 } else - KStyle::tabbarMetrics(t, hFrame, vFrame, overlap); + QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap); } -@@ -2699,7 +2432,7 @@ +@@ -2699,7 +2433,7 @@ p->drawLine(x+1, y+1, x+1, y2-1); } else if(lineWidth != 2 || !sunken) - KStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill); + QWindowsStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill); else{ QPen oldPen = p->pen(); int x2 = x+w-1; -@@ -2726,105 +2459,6 @@ +@@ -2726,105 +2460,6 @@ } } -void LiquidStyle::drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, QBrush *) -{ - p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); - drawClearBevel(p, x, y, w, h, highlightWidget == p->device() ? - g.button().light(120) : g.button(), g.button()); - /* - if(h > w){ - int y2 = y+h-1; @@ -1216,25 +1238,25 @@ Features: - } - - p->setPen(g.buttonText()); - - p->drawText(br.x()+ textPos, -1, w-textPos, h, - AlignLeft|AlignVCenter, s); - } - -} void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) { -@@ -2998,22 +2632,22 @@ +@@ -2998,22 +2633,22 @@ customBtnIconList.clear(); customBtnLabelList.clear(); - KConfig *config = KGlobal::config(); - QString oldGrp = config->group(); - config->setGroup("MosfetButtons"); +// KConfig *config = KGlobal::config(); +// QString oldGrp = config->group(); +// config->setGroup("MosfetButtons"); QStrList iconList, colorList; //temp, we store QPixmaps and QColors iconList.setAutoDelete(true); @@ -1246,52 +1268,52 @@ Features: +// config->readListEntry("Icons", iconList); +// config->readListEntry("Colors", colorList); const char *labelStr = customBtnLabelList.first(); const char *colorStr = colorList.first(); const char *iconStr = iconList.first(); - KIconLoader *ldr = KGlobal::iconLoader(); +// KIconLoader *ldr = KGlobal::iconLoader(); while(labelStr != NULL){ QColor *c = new QColor; c->setNamedColor(QString(colorStr)); -@@ -3022,7 +2656,7 @@ +@@ -3022,7 +2657,7 @@ QString tmpStr(iconStr); if(!tmpStr.isEmpty()){ QPixmap *pixmap = - new QPixmap(ldr->loadIcon(tmpStr, KIcon::Small)); + new QPixmap();//ldr->loadIcon(tmpStr, KIcon::Small)); if(pixmap->isNull()){ delete pixmap; customBtnIconList.append(NULL); -@@ -3037,7 +2671,6 @@ +@@ -3037,7 +2672,6 @@ colorStr = colorList.next(); iconStr = iconList.next(); } - config->setGroup(oldGrp); } void LiquidStyle::applyCustomAttributes(QPushButton *btn) -@@ -3087,7 +2720,7 @@ +@@ -3087,7 +2721,7 @@ } } -#include "liquid.moc" +// #include "liquid.moc" ---- - Mon Jul 15 02:34:13 2002 -+++ plugin.cpp Fri Jul 12 00:41:40 2002 +--- - Sat Sep 21 05:31:48 2002 ++++ plugin.cpp Mon Jul 8 02:42:56 2002 @@ -1,29 +1,113 @@ #include "liquid.h" -#include <klocale.h> +#include "liquidset.h" +#include "plugin.h" -extern "C" { - KStyle* allocate(); - int minor_version(); - int major_version(); - const char *description(); + |