Diffstat (limited to 'noncore/styles/liquid/opie-liquid.diff') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 100 |
1 files changed, 83 insertions, 17 deletions
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index ef7300d..bcbdc8d 100644 --- a/noncore/styles/liquid/opie-liquid.diff +++ b/noncore/styles/liquid/opie-liquid.diff @@ -3,7 +3,7 @@ Features: - Qt-only - works with Qt/E on QPE/OPIE ---- - Sun Jun 30 22:38:02 2002 +--- - Mon Jul 1 11:38:05 2002 +++ liquid.h Mon Jun 24 19:07:45 2002 @@ -2,7 +2,7 @@ #define LIQUID_STYLE_H @@ -102,8 +102,8 @@ Features: // 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, ---- - Sun Jun 30 22:38:02 2002 -+++ liquid.cpp Sun Jun 30 22:37:56 2002 +--- - Mon Jul 1 11:38:05 2002 ++++ liquid.cpp Mon Jul 1 03:45:28 2002 @@ -10,12 +10,10 @@ #include <qmenudata.h> @@ -652,7 +652,62 @@ Features: //int dw = buttonDefaultIndicatorWidth(); if(btn->hasFocus() || btn->isDefault()){ QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); -@@ -2065,203 +1978,24 @@ +@@ -1914,8 +1827,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 +1870,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 +1909,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 +1918,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 +1977,24 @@ p->drawLineSegments(a); } @@ -719,7 +774,7 @@ Features: -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 ) ++ QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) { - //p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); -} @@ -866,7 +921,18 @@ Features: g.background().dark(130); } else -@@ -2336,8 +2070,6 @@ +@@ -2300,8 +2033,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 +2069,6 @@ maxpmw = QMAX( maxpmw, 20 ); @@ -875,7 +941,7 @@ Features: bool dis = !enabled; QColorGroup itemg = dis ? pal.disabled() : pal.active(); -@@ -2363,7 +2095,7 @@ +@@ -2363,7 +2094,7 @@ p->fillRect(x, y, w, h, menuBrush); } else{ @@ -884,7 +950,7 @@ Features: if(pix) p->drawPixmap(x, y, *pix, x, y, w, h); } -@@ -2508,25 +2240,6 @@ +@@ -2508,25 +2239,6 @@ return h; } @@ -910,7 +976,7 @@ Features: void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, const QColor *c, -@@ -2540,25 +2253,25 @@ +@@ -2540,25 +2252,25 @@ return; } else{ @@ -940,7 +1006,7 @@ Features: return; } QPixmap tilePix; -@@ -2671,7 +2384,7 @@ +@@ -2671,7 +2383,7 @@ vFrame = 8; // was 10 } else @@ -949,7 +1015,7 @@ Features: } -@@ -2699,7 +2412,7 @@ +@@ -2699,7 +2411,7 @@ p->drawLine(x+1, y+1, x+1, y2-1); } else if(lineWidth != 2 || !sunken) @@ -958,7 +1024,7 @@ Features: else{ QPen oldPen = p->pen(); int x2 = x+w-1; -@@ -2726,105 +2439,6 @@ +@@ -2726,105 +2438,6 @@ } } @@ -1064,7 +1130,7 @@ Features: void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) { -@@ -2998,22 +2612,22 @@ +@@ -2998,22 +2611,22 @@ customBtnIconList.clear(); customBtnLabelList.clear(); @@ -1094,7 +1160,7 @@ Features: while(labelStr != NULL){ QColor *c = new QColor; c->setNamedColor(QString(colorStr)); -@@ -3022,7 +2636,7 @@ +@@ -3022,7 +2635,7 @@ QString tmpStr(iconStr); if(!tmpStr.isEmpty()){ QPixmap *pixmap = @@ -1103,7 +1169,7 @@ Features: if(pixmap->isNull()){ delete pixmap; customBtnIconList.append(NULL); -@@ -3037,7 +2651,6 @@ +@@ -3037,7 +2650,6 @@ colorStr = colorList.next(); iconStr = iconList.next(); } @@ -1111,7 +1177,7 @@ Features: } void LiquidStyle::applyCustomAttributes(QPushButton *btn) -@@ -3087,7 +2700,7 @@ +@@ -3087,7 +2699,7 @@ } } @@ -1120,7 +1186,7 @@ Features: ---- - Sun Jun 30 22:38:02 2002 +--- - Mon Jul 1 11:38:05 2002 +++ plugin.cpp Fri Jun 28 13:25:25 2002 @@ -1,29 +1,29 @@ #include "liquid.h" |