| -rw-r--r-- | noncore/styles/liquid/liquid.cpp | 8 | ||||
| -rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 389 |
2 files changed, 237 insertions, 160 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index eb1ec6e..6812d16 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -838,17 +838,19 @@ void LiquidStyle::polish(QWidget *w) if(w->inherits("QToolBar")){ w->installEventFilter(this); w->setBackgroundMode(QWidget::PaletteBackground); w->setBackgroundOrigin(QWidget::WidgetOrigin); return; } if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::NoBackground); - else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { + else if(w-> testWFlags(Qt::WType_Popup) && + !w->inherits("QListBox") && + ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) { w->installEventFilter(menuHandler); } if(w->isTopLevel()){ return; } if(w->inherits("QComboBox") || w->inherits("QProgressBar") || @@ -939,17 +941,19 @@ void LiquidStyle::unPolish(QWidget *w) if(w->inherits("QMenuBar")){ ((QFrame *)w)->setLineWidth(1); w->setBackgroundMode(QWidget::PaletteBackground); return; } if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::PaletteButton); - else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { + else if(w-> testWFlags(Qt::WType_Popup) && + !w->inherits("QListBox") && + ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) { w->removeEventFilter(menuHandler); } if(w->isTopLevel()) return; // for viewport children, don't just check for NoBackground.... bool isViewportChild = w->parent() && diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index 90ece90..f3531e5 100644 --- a/noncore/styles/liquid/opie-liquid.diff +++ b/noncore/styles/liquid/opie-liquid.diff @@ -1,15 +1,15 @@ This is a patch to mosfet's liquid 0.7. Features: - Qt-only - works with Qt/E on QPE/OPIE ---- - Sat Sep 21 05:31:47 2002 -+++ liquid.h Mon Jul 15 02:52:50 2002 +--- - 2002-10-24 03:19:30.000000000 +0200 ++++ liquid.h 2002-07-15 02:52:50.000000000 +0200 @@ -2,7 +2,7 @@ #define LIQUID_STYLE_H -#include <kstyle.h> +#include <qwindowsstyle.h> #include <qpainter.h> #include <qdrawutil.h> @@ -105,29 +105,29 @@ Features: @@ -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; ---- - Sat Sep 21 05:31:48 2002 -+++ liquid.cpp Sat Sep 21 05:18:54 2002 +--- - 2002-10-24 03:19:31.000000000 +0200 ++++ liquid.cpp 2002-10-24 03:18:15.000000000 +0200 @@ -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 "liquiddeco.h" +#include <qapplication.h> +#include <qpe/config.h> +#include "effects.h" #include <qpalette.h> #include <qbitmap.h> #include <qtabbar.h> @@ -25,28 +23,29 @@ #include <qtimer.h> @@ -141,20 +141,20 @@ Features: #include <qtoolbutton.h> #include <qheader.h> #include <unistd.h> -#include <klocale.h> -#include <kiconloader.h> -#include <kmenubar.h> -#include <kipc.h> +#include <qmenubar.h> ++#include <qprogressbar.h> -#include <X11/X.h> -#include <X11/Xlib.h> -+ +#include <stdio.h> #include "htmlmasks.h" #include "embeddata.h" -void TransMenuHandler::stripePixmap(KPixmap &pix, const QColor &color) +typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, + QColorGroup &, bool, bool); @@ -224,38 +224,37 @@ Features: r.setBottom(deskR.bottom()); r.setRight(deskR.right()); } - *pix = QPixmap::grabWindow(qt_xrootwin(), r.x(), r.y(), + *pix = QPixmap::grabWindow(QApplication::desktop()-> winId(), r.x(), r.y(), r.width(), r.height()); } else{ // tear off menu -@@ -121,82 +122,55 @@ +@@ -121,82 +122,53 @@ stripePixmap(*pix, p->colorGroup().button()); } else{ - KPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color); + QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color); } + pixDict.insert(p->winId(), pix); + -+ if (!p->inherits("QPopupMenu")) { ++ if ( !p->inherits("QPopupMenu")) + p->setBackgroundPixmap(*pix); + -+ QObjectList *ol = p-> queryList("QWidget"); -+ for ( QObjectListIt it( *ol ); it. current ( ); ++it ) { -+ QWidget *wid = (QWidget *) it.current ( ); ++ QObjectList *ol = p-> queryList("QWidget"); ++ for ( QObjectListIt it( *ol ); it. current ( ); ++it ) { ++ QWidget *wid = (QWidget *) it.current ( ); + -+ wid-> setBackgroundPixmap(*pix); -+ wid-> setBackgroundOrigin(QWidget::ParentOrigin); -+ } -+ delete ol; -+ } ++ wid-> setBackgroundPixmap(*pix); ++ wid-> setBackgroundOrigin(QWidget::ParentOrigin); ++ } ++ delete ol; } } else if(ev->type() == QEvent::Hide){ if(type == TransStippleBg || type == TransStippleBtn || type == Custom){ - qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); - pixDict.remove(p->winId()); - } @@ -280,34 +279,35 @@ Features: - QWidget *w; - while ((w=it.current()) != 0 ){ - ++it; - if(w->inherits("QPopupMenu")){ - w->close(); - } - } + pixDict.remove(p->winId()); -+ if (!p->inherits("QPopupMenu")) { ++ if ( !p->inherits("QPopupMenu")) + p->setBackgroundMode(QWidget::PaletteBackground); - reloadSettings(); -+ QObjectList *ol = p-> queryList("QWidget"); -+ for ( QObjectListIt it( *ol ); it. current ( ); ++it ) { -+ QWidget *wid = (QWidget *) it.current ( ); ++ QObjectList *ol = p-> queryList("QWidget"); ++ for ( QObjectListIt it( *ol ); it. current ( ); ++it ) { ++ QWidget *wid = (QWidget *) it.current ( ); - // Now repaint menubar if needed - if(shadowText != oldShadow){ - it.toFirst(); - while ((w=it.current()) != 0 ){ - ++it; - if(w->inherits("QMenuBar")){ - w->repaint(); -- } -- } -+ wid-> setBackgroundMode( QWidget::PaletteBackground ); ++ wid-> setBackgroundMode( QWidget::PaletteBackground ); + } ++ delete ol; + } } - } - else if(id == MOSFET_BUTTON_CHANGE){ - qWarning("In mosfet button change"); - // really, this should be in LiquidStyle, but what the hell? ;-) - QWidgetList *list = QApplication::allWidgets(); - QWidgetListIt it( *list ); - QWidget *w; @@ -318,45 +318,44 @@ Features: - } - } - ((LiquidStyle*)parent())->loadCustomButtons(); - it.toFirst(); - while ((w=it.current()) != 0 ){ - ++it; - if(w->inherits("QPushButton")){ - ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w); -+ delete ol; - } - } +- } +- } - - } +- } + return(false); } + 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); -@@ -711,7 +685,6 @@ +@@ -711,7 +683,6 @@ void LiquidStyle::polish(QPalette &appPal) { - int i; for(i=0; i < BITMAP_ITEMS; ++i){ if(pixmaps[i]){ -@@ -730,20 +703,29 @@ +@@ -730,20 +701,29 @@ } loadCustomButtons(); - lowLightVal = 100 + (2*KGlobalSettings::contrast()+4)*10; + lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10; btnDict.clear(); btnBorderDict.clear(); bevelFillDict.clear(); @@ -383,34 +382,34 @@ Features: + 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 +776,7 @@ +@@ -794,15 +774,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 ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background ); c.hsv(&bH, &bS, &bV); c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); -@@ -817,21 +791,18 @@ +@@ -817,21 +789,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 ) ); @@ -425,17 +424,17 @@ Features: - } // lineedits - c = config->readColorEntry("windowBackground", &Qt::white); + c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base ); QPixmap basePix; basePix.resize(32, 32); basePix.fill(c.rgb()); -@@ -856,52 +827,39 @@ +@@ -856,52 +825,37 @@ applyCustomAttributes((QPushButton *)w); } } - - config->setGroup(oldGrp); } void LiquidStyle::polish(QWidget *w) @@ -451,17 +450,19 @@ Features: + if(w->inherits("QToolBar")){ + w->installEventFilter(this); + w->setBackgroundMode(QWidget::PaletteBackground); + w->setBackgroundOrigin(QWidget::WidgetOrigin); return; } if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::NoBackground); -+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { ++ else if(w-> testWFlags(Qt::WType_Popup) && ++ !w->inherits("QListBox") && ++ ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) { + w->installEventFilter(menuHandler); + } if(w->isTopLevel()){ - if(!w->inherits("QPopupMenu") && - qstrcmp(kapp->argv()[0], "kicker") == 0){ - qWarning("Got panel toplevel %s", w->className()); - // force extensions and child panels to use proper palette. @@ -481,97 +482,108 @@ Features: - } - } return; } - if(qstrcmp(kapp->argv()[0], "kicker") == 0 && - w->inherits("KPanelExtension")){ // FIXME - doesn't work - w->setPalette(kapp->palette()); - } -+ -+ -+ if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) -+ w-> setBackgroundOrigin ( QWidget::ParentOrigin ); - if(w->inherits("QComboBox") || +- if(w->inherits("QComboBox") || ++ if(w->inherits("QComboBox") || w->inherits("QProgressBar") || 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 +871,9 @@ +@@ -913,6 +867,10 @@ applyCustomAttributes((QPushButton *)w); w->installEventFilter(this); } + if(w->inherits("QButton") || w-> inherits("QComboBox")){ + w-> setBackgroundMode ( QWidget::PaletteBackground ); ++ w->setBackgroundOrigin ( QWidget::ParentOrigin); + } bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || qstrcmp(w->name(), "qt_clipped_viewport") == 0; -@@ -942,11 +903,14 @@ +@@ -942,11 +900,17 @@ 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-> inherits("QToolBarSeparator")&&w->parent()->inherits("QToolBar")) { ++ ((QFrame *) w)-> setFrameShape ( QFrame::NoFrame ); ++ } 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 +918,13 @@ +@@ -954,16 +918,21 @@ 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); +- w->setBackgroundMode(QWidget::X11ParentRelative); ++ w->setBackgroundMode(w->parentWidget()->backgroundMode( )/*QWidget::X11ParentRelative*/); ++ w->setBackgroundOrigin(QWidget::ParentOrigin); ++// w->setBackgroundMode(QWidget::NoBackground); } } - if(w->inherits("KToolBar")){ - w->installEventFilter(this); - //w->setBackgroundMode(QWidget::NoBackground); - return; -- } ++ if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) ++ w-> setBackgroundOrigin ( QWidget::ParentOrigin ); ++ else if ( w-> inherits("QFrame") ) ++ w->setBackgroundOrigin ( QWidget::WidgetOrigin ); + ++ if ( w->parentWidget()->inherits ( "QWidgetStack" )) { ++ w->setBackgroundOrigin ( QWidget::WidgetOrigin ); + } } - void LiquidStyle::unPolish(QWidget *w) -@@ -977,6 +937,9 @@ +@@ -977,6 +946,11 @@ if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::PaletteButton); -+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { ++ else if(w-> testWFlags(Qt::WType_Popup) && ++ !w->inherits("QListBox") && ++ ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) { + w->removeEventFilter(menuHandler); + } if(w->isTopLevel()) return; -@@ -986,7 +949,7 @@ +@@ -986,7 +960,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 @@ +@@ -1001,12 +975,14 @@ unapplyCustomAttributes((QPushButton *)w); w->removeEventFilter(this); } - +/* + if(w->inherits("QPushButton") || w-> inherits("QComboBox")){ + w-> setBackgroundMode ( PaletteBackground ); + } @@ -580,29 +592,29 @@ Features: 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 +979,9 @@ +@@ -1014,9 +990,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 +993,34 @@ +@@ -1028,22 +1004,98 @@ void LiquidStyle::polish(QApplication *app) { - KStyle::polish(app); + QWindowsStyle::polish(app); menuAni = app->isEffectEnabled(UI_AnimateMenu); menuFade = app->isEffectEnabled(UI_FadeMenu); if(menuAni) @@ -628,27 +640,91 @@ Features: app->setEffectEnabled(UI_AnimateMenu, menuAni); app->setEffectEnabled(UI_FadeMenu, menuFade); + + qt_set_draw_menu_bar_impl ( 0 ); + +// QApplication::qwsSetDecoration ( new QPEDecoration ( )); } ++ ++/* !! HACK !! Beware ++ * ++ * TT forgot to make the QProgressBar widget styleable in Qt 2.x ++ * So the only way to customize the drawing, is to intercept the ++ * paint event - since we have to use protected functions, we need ++ * to derive a "hack" class from QProgressBar and do the painting ++ * in there. ++ * ++ * - sandman ++ */ ++ ++class HackProgressBar : public QProgressBar { ++public: ++ HackProgressBar ( ); ++ ++ void paint ( QPaintEvent *event, const QColorGroup &g, QPixmap *pix ) ++ { ++ QPainter p( this ); ++ ++ if ( !contentsRect().contains( event->rect() ) ) { ++ p.save(); ++ p.setClipRegion( event->region().intersect(frameRect()) ); ++ drawFrame( &p); ++ p.restore(); ++ } ++ if ( event->rect().intersects( contentsRect() )) { ++ p.setClipRegion( event->region().intersect( contentsRect() ) ); ++ ++ int x, y, w, h; ++ contentsRect ( ). rect ( &x, &y, &w, &h ); ++ ++ int prog = progress ( ); ++ int total = totalSteps ( ); ++ if ( prog < 0 ) ++ prog = 0; ++ if ( total <= 0 ) ++ total = 1; ++ int bw = w * prog / total; ++ if ( bw > w ) ++ bw = w; ++ ++ p.setPen(g.button().dark(130)); ++ p.drawRect(x, y, bw, h); ++ p.setPen(g.button().light(120)); ++ p.drawRect(x+1, y+1, bw-2, h-2); ++ ++ if(bw >= 4 && h >= 4 && pix) ++ p.drawTiledPixmap(x+2, y+2, bw-4, h-4, *pix); ++ ++ if ( progress ( )>= 0 && totalSteps ( ) > 0 ) { ++ QString pstr; ++ pstr. sprintf ( "%d%%", 100 * progress()/totalSteps ()); ++ p. setPen ( g.text());//g.highlightedText ( )); ++ p. drawText (x,y,w-1,h-1,AlignCenter,pstr); ++ } ++ } ++ } ++}; ++ ++ ++ /* -@@ -1063,7 +1042,7 @@ + * 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 +@@ -1063,7 +1115,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 +1055,7 @@ +@@ -1076,35 +1128,7 @@ } } - else if(obj->inherits("KMiniPagerButton")){ - QButton *btn = (QButton *)obj; - if(ev->type() == QEvent::Paint){ - if(!(btn->isOn() || btn->isDown())){ - QPalette pal = btn->palette(); @@ -675,17 +751,17 @@ Features: - - } - 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 +1070,7 @@ +@@ -1119,20 +1143,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)); @@ -697,115 +773,141 @@ Features: - 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 +1278,6 @@ +@@ -1290,7 +1301,24 @@ + } + } + } +- return(false); ++ else if (obj-> inherits( "QProgressBar" )) { ++ if ( ev->type() == QEvent::Paint ) { ++ HackProgressBar *p = (HackProgressBar *) obj; ++ const QColorGroup &g = p-> colorGroup ( ); ++ ++ QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb()); ++ if(!pix){ ++ 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-> paint ((QPaintEvent *) ev, g, pix ); ++ return true; ++ } ++ } ++ return false ; + } + + void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h, +@@ -1340,11 +1368,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 +1529,7 @@ +@@ -1596,7 +1619,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 +1557,7 @@ +@@ -1624,7 +1647,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 +1623,7 @@ +@@ -1690,7 +1713,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 +1694,10 @@ +@@ -1761,10 +1784,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 +1798,8 @@ +@@ -1865,8 +1888,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 +1847,8 @@ +@@ -1914,8 +1937,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 +1890,8 @@ +@@ -1957,8 +1980,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 +1929,8 @@ +@@ -1996,8 +2019,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 +1938,17 @@ +@@ -2005,18 +2028,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(); @@ -817,17 +919,17 @@ Features: *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 +1997,26 @@ +@@ -2065,203 +2087,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)); @@ -839,34 +941,36 @@ Features: - p->drawLine(x2, y+1, x2, y2-1); - - p->setPen(g.background()); - p->drawPoint(x, y); - p->drawPoint(x2, y); - p->drawPoint(x, y2); - p->drawPoint(x2, y2); - -- + - - // p->drawRect(x, y, w, h); - QPixmap *pix = bevelFillDict.find(g.button().rgb()); - if(!pix){ - int h, s, v; - g.button().hsv(&h, &s, &v); - pix = new QPixmap(*bevelFillPix); - adjustHSV(*pix, h, s, v); - bevelFillDict.insert(g.button().rgb(), pix); - } - - p->drawTiledPixmap(x+1, y+1, w-2, h-2, *pix); -} - -void LiquidStyle::drawKMenuBar(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, bool mac, QBrush *) --{ ++void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, ++ QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) + { - if(p->device() && p->device()->devType() == QInternal::Widget && - ((KMenuBar *)p->device())->isTopLevelMenu()){ - p->setPen(Qt::black); - p->drawRect(x, y, w, h); - p->drawTiledPixmap(x+1, y+1, w-2, h-2, *menuPix); - // left - p->drawLine(x+1, y+1, x+1, y+5); - p->drawLine(x+2, y+1, x+2, y+3); @@ -880,22 +984,20 @@ Features: - p->drawLine(x2-4, y+1, x2-6, y+1); - } - else{ - qDrawShadePanel(p, x, y, w, h, g, false, 1, - &g.brush(QColorGroup::Background)); - } - -} - +- -void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, KToolBarPos, QBrush *) -+void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, -+ QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) - { +-{ - //p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); -} - -void LiquidStyle::drawKToolBarButton(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, bool sunken, - bool raised, bool enabled, bool popup, - KToolButtonType icontext, - const QString& btext, const QPixmap *pixmap, @@ -1033,46 +1135,46 @@ Features: 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 +2055,8 @@ +@@ -2300,8 +2145,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 +2091,6 @@ +@@ -2336,8 +2181,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 +2116,7 @@ +@@ -2363,7 +2206,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 +2261,6 @@ +@@ -2508,25 +2351,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); @@ -1088,17 +1190,17 @@ Features: - 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 +2274,25 @@ +@@ -2540,25 +2364,25 @@ return; } else{ - KStyle::drawFocusRect(p, r, g, c, atBorder); + QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); } } else @@ -1118,35 +1220,35 @@ Features: bool selected) { if(tabBar->shape() != QTabBar::RoundedAbove){ - KStyle::drawTab(p, tabBar, tab, selected); + QWindowsStyle::drawTab(p, tabBar, tab, selected); return; } QPixmap tilePix; -@@ -2671,7 +2405,7 @@ +@@ -2671,7 +2495,7 @@ vFrame = 8; // was 10 } else - KStyle::tabbarMetrics(t, hFrame, vFrame, overlap); + QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap); } -@@ -2699,7 +2433,7 @@ +@@ -2699,7 +2523,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 +2460,6 @@ +@@ -2726,105 +2550,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() ? @@ -1242,17 +1344,17 @@ Features: - 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 +2633,22 @@ +@@ -2998,22 +2723,22 @@ customBtnIconList.clear(); customBtnLabelList.clear(); - KConfig *config = KGlobal::config(); - QString oldGrp = config->group(); - config->setGroup("MosfetButtons"); +// KConfig *config = KGlobal::config(); +// QString oldGrp = config->group(); @@ -1272,164 +1374,135 @@ Features: 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 +2657,7 @@ +@@ -3022,7 +2747,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 +2672,6 @@ +@@ -3037,7 +2762,6 @@ colorStr = colorList.next(); iconStr = iconList.next(); } - config->setGroup(oldGrp); } void LiquidStyle::applyCustomAttributes(QPushButton *btn) -@@ -3087,7 +2721,7 @@ +@@ -3087,7 +2811,7 @@ } } -#include "liquid.moc" +// #include "liquid.moc" ---- - Sat Sep 21 05:31:48 2002 -+++ plugin.cpp Mon Jul 8 02:42:56 2002 -@@ -1,29 +1,113 @@ +--- - 2002-10-24 03:19:31.000000000 +0200 ++++ plugin.cpp 2002-10-04 03:37:38.000000000 +0200 +@@ -1,29 +1,84 @@ ++#include <qapplication.h> ++ #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(); ++ + + +LiquidInterface::LiquidInterface ( ) : ref ( 0 ) +{ ++ m_widget = 0; +} + +LiquidInterface::~LiquidInterface ( ) +{ +} + -+QStyle *LiquidInterface::create ( ) ++QStyle *LiquidInterface::style ( ) +{ + return new LiquidStyle ( ); +} + -+QString LiquidInterface::name ( ) ++QString LiquidInterface::name ( ) const ++{ ++ return qApp-> translate ( "Styles", "Liquid" ); ++} ++ ++QString LiquidInterface::description ( ) const ++{ ++ return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" ); ++} ++ ++bool LiquidInterface::hasSettings ( ) const ++{ ++ return true; ++} ++ ++QWidget *LiquidInterface::create ( QWidget *parent, const char *name ) +{ -+ return QObject::tr( "Liquid", "name" ); ++ m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); + +-extern "C" { +- KStyle* allocate(); +- int minor_version(); +- int major_version(); +- const char *description(); ++ return m_widget; } -KStyle* allocate() -+QString LiquidInterface::description ( ) ++bool LiquidInterface::accept ( ) { - return(new LiquidStyle); -+ return QObject::tr( "High Performance Liquid style by Mosfet", "description" ); ++ if ( !m_widget ) ++ return false; ++ ++ return m_widget-> writeConfig ( ); } -int minor_version() -+QCString LiquidInterface::key ( ) ++void LiquidInterface::reject ( ) { - return(0); -+ return QCString ( "liquid" ); } -int major_version() -+unsigned int LiquidInterface::version ( ) ++ ++QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) { - return(1); -+ return 100; // 1.0.0 (\d+.\d.\d) - } - --const char *description() -+QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) -+{ -+ static LiquidSettingsInterface *setiface = 0; -+ + *iface = 0; + + if ( uuid == IID_QUnknown ) + *iface = this; + else if ( uuid == IID_Style ) + *iface = this; -+ else if ( uuid == IID_StyleSettings ) { -+ if ( !setiface ) -+ setiface = new LiquidSettingsInterface ( ); -+ *iface = setiface; -+ } ++ else if ( uuid == IID_StyleExtended ) ++ *iface = this; + + if ( *iface ) + (*iface)-> addRef ( ); + + return QS_OK; -+} -+ + } + +-const char *description() +Q_EXPORT_INTERFACE() -+{ -+ Q_CREATE_INSTANCE( LiquidInterface ) -+} -+ -+ -+LiquidSettingsInterface::LiquidSettingsInterface ( ) : ref ( 0 ) { - return(i18n("High performance liquid plugin").utf8()); -+ m_widget = 0; ++ Q_CREATE_INSTANCE( LiquidInterface ) } -+ -+LiquidSettingsInterface::~LiquidSettingsInterface ( ) -+{ -+} -+ -+QWidget *LiquidSettingsInterface::create ( QWidget *parent, const char *name ) -+{ -+ m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); -+ -+ return m_widget; -+} -+ -+bool LiquidSettingsInterface::accept ( ) -+{ -+ if ( !m_widget ) -+ return false; + -+ return m_widget-> writeConfig ( ); -+} + -+void LiquidSettingsInterface::reject ( ) -+{ -+} -+ -+QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) -+{ -+ *iface = 0; -+ -+ -+ if ( uuid == IID_QUnknown ) -+ *iface = this; -+ else if ( uuid == IID_StyleSettings ) -+ *iface = this; -+ -+ if ( *iface ) -+ (*iface)-> addRef ( ); -+ -+ return QS_OK; -+} ++ + +// Hack for Retail Z experiments +extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } } |