summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp25
-rw-r--r--noncore/styles/liquid/opie-liquid.diff100
2 files changed, 95 insertions, 30 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 9a7d2dd..313d52c 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1829,4 +1829,4 @@ QSize LiquidStyle::exclusiveIndicatorSize() const
1829 1829
1830void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w, 1830void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
1831 int h, const QColorGroup &g, bool on, 1831 int /*h*/, const QColorGroup &/*g*/, bool on,
1832 bool down, bool) 1832 bool down, bool)
@@ -1872,4 +1872,4 @@ QSize LiquidStyle::indicatorSize() const
1872 1872
1873void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, 1873void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
1874 const QColorGroup &g, int state, bool down, bool) 1874 const QColorGroup &/*g*/, int state, bool /*down*/, bool)
1875{ 1875{
@@ -1911,4 +1911,4 @@ void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
1911 1911
1912void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, 1912void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
1913 int state) 1913 int /*state*/)
1914{ 1914{
@@ -1920,3 +1920,3 @@ void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
1920void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, 1920void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
1921 const QColorGroup &g, Orientation orient, 1921 const QColorGroup &/*g*/, Orientation orient,
1922 bool, bool) 1922 bool, bool)
@@ -1925,4 +1925,3 @@ void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
1925 p->setBrushOrigin(parent->pos()); 1925 p->setBrushOrigin(parent->pos());
1926 p->fillRect(x, y, w, h, 1926 parent->erase(x, y, w, h);
1927 QApplication::palette().active().brush(QColorGroup::Background));
1928 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : 1927 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
@@ -1931,3 +1930,3 @@ void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
1931 1930
1932void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h, 1931void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
1933 Orientation orient, bool, bool) 1932 Orientation orient, bool, bool)
@@ -1982,3 +1981,3 @@ void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x,
1982void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, 1981void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
1983 QMenuItem *mi, QColorGroup &g, bool enabled, bool active ) 1982 QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
1984 { 1983 {
@@ -2036,4 +2035,4 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
2036void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, 2035void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
2037 const QColorGroup &g, int lineWidth, 2036 const QColorGroup &g, int /*lineWidth*/,
2038 const QBrush * fill) 2037 const QBrush * /*fill*/)
2039{ 2038{
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
@@ -5,3 +5,3 @@ Features:
5 5
6 --- -Sun Jun 30 22:38:02 2002 6 --- -Mon Jul 1 11:38:05 2002
7 +++ liquid.hMon Jun 24 19:07:45 2002 7 +++ liquid.hMon Jun 24 19:07:45 2002
@@ -104,4 +104,4 @@ Features:
104 void drawSliderGroove(QPainter * p, int x, int y, int w, int h, 104 void drawSliderGroove(QPainter * p, int x, int y, int w, int h,
105 --- -Sun Jun 30 22:38:02 2002 105 --- -Mon Jul 1 11:38:05 2002
106 +++ liquid.cppSun Jun 30 22:37:56 2002 106 +++ liquid.cppMon Jul 1 03:45:28 2002
107@@ -10,12 +10,10 @@ 107@@ -10,12 +10,10 @@
@@ -654,3 +654,58 @@ Features:
654 QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); 654 QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
655@@ -2065,203 +1978,24 @@ 655@@ -1914,8 +1827,8 @@
656 return(QSize(16, 16));
657 }
658
659-void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w,
660- int h, const QColorGroup &g, bool on,
661+void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
662+ int /*h*/, const QColorGroup &/*g*/, bool on,
663 bool down, bool)
664 {
665 bool isHover = highlightWidget == p->device();
666@@ -1957,8 +1870,8 @@
667 return(QSize(20, 22));
668 }
669
670-void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
671- const QColorGroup &g, int state, bool down, bool)
672+void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
673+ const QColorGroup &/*g*/, int state, bool /*down*/, bool)
674 {
675 bool isHover = highlightWidget == p->device();
676 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
677@@ -1996,8 +1909,8 @@
678 }
679 }
680
681-void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
682- int state)
683+void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
684+ int /*state*/)
685 {
686 // needed for some reason by KHtml, even tho it's all filled ;P
687 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
688@@ -2005,18 +1918,17 @@
689 }
690
691 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
692- const QColorGroup &g, Orientation orient,
693+ const QColorGroup &/*g*/, Orientation orient,
694 bool, bool)
695 {
696 QWidget *parent = (QWidget *)p->device();
697 p->setBrushOrigin(parent->pos());
698- p->fillRect(x, y, w, h,
699- QApplication::palette().active().brush(QColorGroup::Background));
700+ parent->erase(x, y, w, h);
701 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
702 *getPixmap(VSlider));
703 }
704
705-void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h,
706+void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
707 Orientation orient, bool, bool)
708 {
709 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
710@@ -2065,203 +1977,24 @@
656 p->drawLineSegments(a); 711 p->drawLineSegments(a);
@@ -721,3 +776,3 @@ Features:
721+void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, 776+void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
722+ QMenuItem *mi, QColorGroup &g, bool enabled, bool active ) 777+ QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
723 { 778 {
@@ -868,3 +923,14 @@ Features:
868 else 923 else
869@@ -2336,8 +2070,6 @@ 924@@ -2300,8 +2033,8 @@
925 }
926
927 void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
928- const QColorGroup &g, int lineWidth,
929- const QBrush * fill)
930+ const QColorGroup &g, int /*lineWidth*/,
931+ const QBrush * /*fill*/)
932 {
933 QColor c;
934 switch(menuHandler->transType()){
935@@ -2336,8 +2069,6 @@
870 936
@@ -877,3 +943,3 @@ Features:
877 QColorGroup itemg = dis ? pal.disabled() : pal.active(); 943 QColorGroup itemg = dis ? pal.disabled() : pal.active();
878@@ -2363,7 +2095,7 @@ 944@@ -2363,7 +2094,7 @@
879 p->fillRect(x, y, w, h, menuBrush); 945 p->fillRect(x, y, w, h, menuBrush);
@@ -886,3 +952,3 @@ Features:
886 } 952 }
887@@ -2508,25 +2240,6 @@ 953@@ -2508,25 +2239,6 @@
888 return h; 954 return h;
@@ -912,3 +978,3 @@ Features:
912 const QColorGroup &g, const QColor *c, 978 const QColorGroup &g, const QColor *c,
913@@ -2540,25 +2253,25 @@ 979@@ -2540,25 +2252,25 @@
914 return; 980 return;
@@ -942,3 +1008,3 @@ Features:
942 QPixmap tilePix; 1008 QPixmap tilePix;
943@@ -2671,7 +2384,7 @@ 1009@@ -2671,7 +2383,7 @@
944 vFrame = 8; // was 10 1010 vFrame = 8; // was 10
@@ -951,3 +1017,3 @@ Features:
951 1017
952@@ -2699,7 +2412,7 @@ 1018@@ -2699,7 +2411,7 @@
953 p->drawLine(x+1, y+1, x+1, y2-1); 1019 p->drawLine(x+1, y+1, x+1, y2-1);
@@ -960,3 +1026,3 @@ Features:
960 int x2 = x+w-1; 1026 int x2 = x+w-1;
961@@ -2726,105 +2439,6 @@ 1027@@ -2726,105 +2438,6 @@
962 } 1028 }
@@ -1066,3 +1132,3 @@ Features:
1066 { 1132 {
1067@@ -2998,22 +2612,22 @@ 1133@@ -2998,22 +2611,22 @@
1068 customBtnIconList.clear(); 1134 customBtnIconList.clear();
@@ -1096,3 +1162,3 @@ Features:
1096 c->setNamedColor(QString(colorStr)); 1162 c->setNamedColor(QString(colorStr));
1097@@ -3022,7 +2636,7 @@ 1163@@ -3022,7 +2635,7 @@
1098 QString tmpStr(iconStr); 1164 QString tmpStr(iconStr);
@@ -1105,3 +1171,3 @@ Features:
1105 customBtnIconList.append(NULL); 1171 customBtnIconList.append(NULL);
1106@@ -3037,7 +2651,6 @@ 1172@@ -3037,7 +2650,6 @@
1107 colorStr = colorList.next(); 1173 colorStr = colorList.next();
@@ -1113,3 +1179,3 @@ Features:
1113 void LiquidStyle::applyCustomAttributes(QPushButton *btn) 1179 void LiquidStyle::applyCustomAttributes(QPushButton *btn)
1114@@ -3087,7 +2700,7 @@ 1180@@ -3087,7 +2699,7 @@
1115 } 1181 }
@@ -1122,3 +1188,3 @@ Features:
1122 1188
1123 --- -Sun Jun 30 22:38:02 2002 1189 --- -Mon Jul 1 11:38:05 2002
1124 +++ plugin.cppFri Jun 28 13:25:25 2002 1190 +++ plugin.cppFri Jun 28 13:25:25 2002