summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp23
-rw-r--r--noncore/styles/liquid/opie-liquid.diff128
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
@@ -686,5 +686,4 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item)
void LiquidStyle::polish(QPalette &appPal)
{
-
int i;
for(i=0; i < BITMAP_ITEMS; ++i){
@@ -719,10 +718,13 @@ void LiquidStyle::polish(QPalette &appPal)
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));
@@ -775,5 +777,5 @@ void LiquidStyle::polish(QPalette &appPal)
// 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);
@@ -801,5 +803,5 @@ void LiquidStyle::polish(QPalette &appPal)
// 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);
@@ -826,5 +828,4 @@ void LiquidStyle::polish(QPalette &appPal)
}
}
-
}
@@ -949,5 +950,5 @@ void LiquidStyle::unPolish(QWidget *w)
(qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
- w->setPalette(QApplication::palette());
+ w->unsetPalette();
if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
if(w->inherits("QPushButton"))
@@ -1006,6 +1007,6 @@ void LiquidStyle::polish(QApplication *app)
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 );
@@ -1020,5 +1021,5 @@ void LiquidStyle::unPolish(QApplication *app)
qt_set_draw_menu_bar_impl ( 0 );
- QApplication::qwsSetDecoration ( new QPEDecoration ( ));
+// QApplication::qwsSetDecoration ( new QPEDecoration ( ));
}
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
@@ -4,6 +4,6 @@ Features:
- 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
@@ -111,6 +111,6 @@ Features:
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 @@
@@ -344,5 +344,13 @@ Features:
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 @@
}
@@ -357,4 +365,5 @@ Features:
- KConfig *config = KGlobal::config();
- QString oldGrp = config->group();
+- QPalette pal = QApplication::palette();
+ Config config ( "qpe" );
+ config. setGroup ( "Liquid-Style" );
@@ -365,5 +374,5 @@ Features:
+ contrast = 10;
+
- QPalette pal = QApplication::palette();
++// QPalette pal = QApplication::palette();
// button color stuff
@@ -372,10 +381,13 @@ Features:
- 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);
@@ -390,9 +402,9 @@ Features:
- 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);
@@ -415,12 +427,13 @@ Features:
// 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);
}
@@ -488,5 +501,5 @@ Features:
}
if(w->inherits("QLineEdit")){
-@@ -913,6 +870,9 @@
+@@ -913,6 +871,9 @@
applyCustomAttributes((QPushButton *)w);
w->installEventFilter(this);
@@ -498,5 +511,5 @@ Features:
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);
@@ -515,5 +528,5 @@ Features:
if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
palette().active().brush(QColorGroup::Background).pixmap()){
-@@ -954,17 +917,13 @@
+@@ -954,17 +918,13 @@
return;
}
@@ -535,5 +548,5 @@ Features:
void LiquidStyle::unPolish(QWidget *w)
-@@ -977,6 +936,9 @@
+@@ -977,6 +937,9 @@
if(w->inherits("QPopupMenu"))
@@ -545,5 +558,14 @@ Features:
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);
@@ -564,5 +586,5 @@ Features:
}
if(w->inherits("QButton") || w->inherits("QComboBox")){
-@@ -1014,9 +978,9 @@
+@@ -1014,9 +979,9 @@
w->setAutoMask(false);
}
@@ -576,5 +598,5 @@ Features:
}
if(w->inherits("QHeader")){
-@@ -1028,20 +992,34 @@
+@@ -1028,20 +993,34 @@
void LiquidStyle::polish(QApplication *app)
{
@@ -594,6 +616,6 @@ Features:
+ 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 );
@@ -609,9 +631,9 @@ Features:
+ 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)
@@ -622,5 +644,5 @@ Features:
const QObjectList *tbChildList = obj->children();
QObjectListIt it(*tbChildList);
-@@ -1076,35 +1054,7 @@
+@@ -1076,35 +1055,7 @@
}
@@ -659,5 +681,5 @@ Features:
if(ev->type() == QEvent::Enter){
if(btn->isEnabled()){
-@@ -1119,20 +1069,7 @@
+@@ -1119,20 +1070,7 @@
}
}
@@ -681,5 +703,5 @@ Features:
if(!btn->autoRaise()){
if(btn->isEnabled()){
-@@ -1340,11 +1277,6 @@
+@@ -1340,11 +1278,6 @@
QColorGroup g = btn->colorGroup();
@@ -693,5 +715,5 @@ Features:
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());
@@ -702,5 +724,5 @@ Features:
if(horiz)
subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
-@@ -1624,7 +1556,7 @@
+@@ -1624,7 +1557,7 @@
QPainter painter;
if(!horiz){
@@ -711,5 +733,5 @@ Features:
painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
13, 8);
-@@ -1690,7 +1622,7 @@
+@@ -1690,7 +1623,7 @@
}
else{
@@ -720,5 +742,5 @@ Features:
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);
}
@@ -735,5 +757,5 @@ Features:
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;
@@ -746,5 +768,5 @@ Features:
if ( sb->maxValue() == sb->minValue() ) {
sliderLength = maxLength;
-@@ -1914,8 +1846,8 @@
+@@ -1914,8 +1847,8 @@
return(QSize(16, 16));
}
@@ -757,5 +779,5 @@ Features:
{
bool isHover = highlightWidget == p->device();
-@@ -1957,8 +1889,8 @@
+@@ -1957,8 +1890,8 @@
return(QSize(20, 22));
}
@@ -768,5 +790,5 @@ Features:
bool isHover = highlightWidget == p->device();
bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
-@@ -1996,8 +1928,8 @@
+@@ -1996,8 +1929,8 @@
}
}
@@ -779,5 +801,5 @@ Features:
// 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 @@
}
@@ -801,5 +823,5 @@ Features:
{
p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
-@@ -2065,203 +1996,26 @@
+@@ -2065,203 +1997,26 @@
p->drawLineSegments(a);
}
@@ -995,6 +1017,6 @@ Features:
}
-}
--
+-
-void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h,
- const QColorGroup &g, bool active, QMenuItem *mi,
@@ -1017,5 +1039,5 @@ Features:
}
else
-@@ -2300,8 +2054,8 @@
+@@ -2300,8 +2055,8 @@
}
@@ -1028,5 +1050,5 @@ Features:
QColor c;
switch(menuHandler->transType()){
-@@ -2336,8 +2090,6 @@
+@@ -2336,8 +2091,6 @@
maxpmw = QMAX( maxpmw, 20 );
@@ -1037,5 +1059,5 @@ Features:
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);
}
@@ -1046,5 +1068,5 @@ Features:
p->drawPixmap(x, y, *pix, x, y, w, h);
}
-@@ -2508,25 +2260,6 @@
+@@ -2508,25 +2261,6 @@
return h;
}
@@ -1072,5 +1094,5 @@ Features:
void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
const QColorGroup &g, const QColor *c,
-@@ -2540,25 +2273,25 @@
+@@ -2540,25 +2274,25 @@
return;
}
@@ -1102,5 +1124,5 @@ Features:
}
QPixmap tilePix;
-@@ -2671,7 +2404,7 @@
+@@ -2671,7 +2405,7 @@
vFrame = 8; // was 10
}
@@ -1111,5 +1133,5 @@ Features:
-@@ -2699,7 +2432,7 @@
+@@ -2699,7 +2433,7 @@
p->drawLine(x+1, y+1, x+1, y2-1);
}
@@ -1120,5 +1142,5 @@ Features:
QPen oldPen = p->pen();
int x2 = x+w-1;
-@@ -2726,105 +2459,6 @@
+@@ -2726,105 +2460,6 @@
}
}
@@ -1226,5 +1248,5 @@ Features:
void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
{
-@@ -2998,22 +2632,22 @@
+@@ -2998,22 +2633,22 @@
customBtnIconList.clear();
customBtnLabelList.clear();
@@ -1256,5 +1278,5 @@ Features:
QColor *c = new QColor;
c->setNamedColor(QString(colorStr));
-@@ -3022,7 +2656,7 @@
+@@ -3022,7 +2657,7 @@
QString tmpStr(iconStr);
if(!tmpStr.isEmpty()){
@@ -1265,5 +1287,5 @@ Features:
delete pixmap;
customBtnIconList.append(NULL);
-@@ -3037,7 +2671,6 @@
+@@ -3037,7 +2672,6 @@
colorStr = colorList.next();
iconStr = iconList.next();
@@ -1273,5 +1295,5 @@ Features:
void LiquidStyle::applyCustomAttributes(QPushButton *btn)
-@@ -3087,7 +2720,7 @@
+@@ -3087,7 +2721,7 @@
}
}
@@ -1282,6 +1304,6 @@ Features:
---- - 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"