| -rw-r--r-- | noncore/styles/liquid/opie-liquid.diff | 167 |
1 files changed, 110 insertions, 57 deletions
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff index f902cb8..ef7300d 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 Jun 24 19:05:49 2002 -+++ liquid.h Fri Jun 21 14:48:21 2002 +--- - Sun Jun 30 22:38:02 2002 ++++ liquid.h Mon Jun 24 19:07:45 2002 @@ -2,7 +2,7 @@ #define LIQUID_STYLE_H @@ -103,7 +103,7 @@ Features: bool eventFilter(QObject *obj, QEvent *ev); void drawSliderGroove(QPainter * p, int x, int y, int w, int h, ---- - Mon Jun 24 19:05:49 2002 -+++ liquid.cpp Fri Jun 21 22:02:55 2002 -@@ -10,12 +10,9 @@ +--- - Sun Jun 30 22:38:02 2002 ++++ liquid.cpp Sun Jun 30 22:37:56 2002 +@@ -10,12 +10,10 @@ #include <qmenudata.h> @@ -115,4 +115,5 @@ Features: -#include <kglobalsettings.h> -#include <kpixmapeffect.h> ++#include "liquiddeco.h" +#include <qapplication.h> +#include <qpe/config.h> @@ -121,5 +122,5 @@ Features: #include <qbitmap.h> #include <qtabbar.h> -@@ -25,28 +22,29 @@ +@@ -25,28 +23,29 @@ #include <qtimer.h> #include <qpixmapcache.h> @@ -161,5 +162,5 @@ Features: int r, g, b; for(y=0; y < img.height(); y+=3){ -@@ -71,24 +69,21 @@ +@@ -71,35 +70,37 @@ : QObject(parent) { @@ -190,9 +191,18 @@ Features: + fgColor = QColor ( config. readEntry("TextColor", QApplication::palette().active().text().name())); + opacity = config. readNumEntry("Opacity", 10); ++ if ( opacity < -20 ) ++ opacity = 20; ++ else if ( opacity > 20 ) ++ opacity = 20; ++ + shadowText = config. readBoolEntry("ShadowText", true); } bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) -@@ -99,7 +94,7 @@ + { +- QPopupMenu *p = (QPopupMenu *)obj; ++ QWidget *p = (QWidget *)obj; + + if(ev->type() == QEvent::Show){ if(type == TransStippleBg || type == TransStippleBtn || type == Custom){ @@ -203,5 +213,5 @@ Features: QRect r(p->x(), p->y(), p->width(), p->height()); QRect deskR = QApplication::desktop()->rect(); -@@ -107,7 +102,7 @@ +@@ -107,7 +108,7 @@ r.setBottom(deskR.bottom()); r.setRight(deskR.right()); @@ -212,5 +222,5 @@ Features: } else{ // tear off menu -@@ -121,7 +116,7 @@ +@@ -121,82 +122,54 @@ stripePixmap(*pix, p->colorGroup().button()); } @@ -219,17 +229,31 @@ Features: + QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color); } ++ ++ if (p->inherits("QPopupMenu")) pixDict.insert(p->winId(), pix); ++ else { ++ p->setBackgroundPixmap(*pix); ++ ++ 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; ++ } } -@@ -129,74 +124,19 @@ + } 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()); +- } +- } +- return(false); +-} +// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width()); - pixDict.remove(p->winId()); - } - } - return(false); - } -void TransMenuHandler::slotKIPCMessage(int id, int) @@ -253,7 +277,14 @@ Features: - } - } -- ++ if (p->inherits("QPopupMenu")) ++ pixDict.remove(p->winId()); ++ else { ++ p->setBackgroundMode(QWidget::PaletteBackground); + - reloadSettings(); -- ++ 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){ @@ -277,5 +308,6 @@ Features: - if(w->inherits("QPushButton")){ - ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w); -- } ++ wid-> setBackgroundMode( QWidget::PaletteBackground ); + } - } - ((LiquidStyle*)parent())->loadCustomButtons(); @@ -285,10 +317,13 @@ Features: - if(w->inherits("QPushButton")){ - ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w); -- } -- } ++ delete ol; + } + } - -- } --} + } ++ return(false); + } ++ LiquidStyle::LiquidStyle() - :KStyle() @@ -300,5 +335,5 @@ Features: btnMaskBmp.setMask(btnMaskBmp); htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); -@@ -730,20 +670,19 @@ +@@ -730,20 +703,19 @@ } @@ -326,5 +361,5 @@ Features: QBrush btnBrush(QColor(200, 202, 228)); appPal.setBrush(QColorGroup::Button, btnBrush); -@@ -794,15 +733,7 @@ +@@ -794,15 +766,7 @@ pagerBrush.setPixmap(*pix); @@ -343,5 +378,5 @@ Features: c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); -@@ -825,13 +756,10 @@ +@@ -825,13 +789,10 @@ painter.end(); bgBrush.setColor(c); @@ -358,5 +393,5 @@ Features: basePix.resize(32, 32); basePix.fill(c.rgb()); -@@ -857,51 +785,27 @@ +@@ -857,51 +818,31 @@ } } @@ -376,4 +411,7 @@ Features: if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::NoBackground); ++ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { ++ w->installEventFilter(menuHandler); ++ } if(w->isTopLevel()){ @@ -403,4 +441,5 @@ Features: - w->setPalette(kapp->palette()); - } ++ + + w-> setBackgroundOrigin ( QWidget::ParentOrigin ); @@ -415,5 +454,5 @@ Features: } if(w->inherits("QLineEdit")){ -@@ -913,6 +817,9 @@ +@@ -913,6 +854,9 @@ applyCustomAttributes((QPushButton *)w); w->installEventFilter(this); @@ -425,5 +464,5 @@ Features: bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || qstrcmp(w->name(), "qt_clipped_viewport") == 0; -@@ -942,11 +849,12 @@ +@@ -942,11 +886,12 @@ w->setMouseTracking(true); w->installEventFilter(this); @@ -440,5 +479,5 @@ Features: if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> palette().active().brush(QColorGroup::Background).pixmap()){ -@@ -954,17 +862,18 @@ +@@ -954,17 +899,18 @@ return; } @@ -462,5 +501,15 @@ Features: void LiquidStyle::unPolish(QWidget *w) -@@ -1001,12 +910,14 @@ +@@ -977,6 +923,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 +950,14 @@ unapplyCustomAttributes((QPushButton *)w); w->removeEventFilter(this); @@ -481,5 +530,5 @@ Features: } if(w->inherits("QButton") || w->inherits("QComboBox")){ -@@ -1014,9 +925,9 @@ +@@ -1014,9 +965,9 @@ w->setAutoMask(false); } @@ -493,5 +542,5 @@ Features: } if(w->inherits("QHeader")){ -@@ -1028,20 +939,24 @@ +@@ -1028,20 +979,28 @@ void LiquidStyle::polish(QApplication *app) { @@ -507,4 +556,6 @@ Features: + + qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); ++ ++ QApplication::qwsSetDecoration ( new LiquidDecoration ( )); } @@ -517,8 +568,10 @@ Features: + + qt_set_draw_menu_bar_impl ( 0 ); ++ ++ QApplication::qwsSetDecoration ( new QPEDecoration ( )); } /* -@@ -1063,7 +978,7 @@ +@@ -1063,7 +1022,7 @@ */ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) @@ -529,5 +582,5 @@ Features: const QObjectList *tbChildList = obj->children(); QObjectListIt it(*tbChildList); -@@ -1076,35 +991,7 @@ +@@ -1076,35 +1035,7 @@ } @@ -566,5 +619,5 @@ Features: if(ev->type() == QEvent::Enter){ if(btn->isEnabled()){ -@@ -1119,20 +1006,7 @@ +@@ -1119,20 +1050,7 @@ } } @@ -588,5 +641,5 @@ Features: if(!btn->autoRaise()){ if(btn->isEnabled()){ -@@ -1340,11 +1214,6 @@ +@@ -1340,11 +1258,6 @@ QColorGroup g = btn->colorGroup(); @@ -600,5 +653,5 @@ Features: if(btn->hasFocus() || btn->isDefault()){ QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); -@@ -2065,203 +1934,24 @@ +@@ -2065,203 +1978,24 @@ p->drawLineSegments(a); } @@ -661,7 +714,7 @@ Features: - &g.brush(QColorGroup::Background)); - } - --} - +-} + -void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, KToolBarPos, QBrush *) @@ -694,6 +747,5 @@ Features: - if(sunken) - ++x, ++y; -+ p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); - +- - QColor btnColor(sunken ? g.button() : raised ? g.button().light(110) : - g.background()); @@ -794,5 +846,6 @@ Features: - } -} -- ++ p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); + - -void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, @@ -814,5 +867,5 @@ Features: } else -@@ -2336,8 +2026,6 @@ +@@ -2336,8 +2070,6 @@ maxpmw = QMAX( maxpmw, 20 ); @@ -823,5 +876,5 @@ Features: bool dis = !enabled; QColorGroup itemg = dis ? pal.disabled() : pal.active(); -@@ -2363,7 +2051,7 @@ +@@ -2363,7 +2095,7 @@ p->fillRect(x, y, w, h, menuBrush); } @@ -832,5 +885,5 @@ Features: p->drawPixmap(x, y, *pix, x, y, w, h); } -@@ -2508,25 +2196,6 @@ +@@ -2508,25 +2240,6 @@ return h; } @@ -858,5 +911,5 @@ Features: void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, const QColor *c, -@@ -2540,25 +2209,25 @@ +@@ -2540,25 +2253,25 @@ return; } @@ -888,5 +941,5 @@ Features: } QPixmap tilePix; -@@ -2671,7 +2340,7 @@ +@@ -2671,7 +2384,7 @@ vFrame = 8; // was 10 } @@ -897,5 +950,5 @@ Features: -@@ -2699,7 +2368,7 @@ +@@ -2699,7 +2412,7 @@ p->drawLine(x+1, y+1, x+1, y2-1); } @@ -906,5 +959,5 @@ Features: QPen oldPen = p->pen(); int x2 = x+w-1; -@@ -2726,105 +2395,6 @@ +@@ -2726,105 +2439,6 @@ } } @@ -1012,5 +1065,5 @@ Features: void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) { -@@ -2998,22 +2568,22 @@ +@@ -2998,22 +2612,22 @@ customBtnIconList.clear(); customBtnLabelList.clear(); @@ -1042,5 +1095,5 @@ Features: QColor *c = new QColor; c->setNamedColor(QString(colorStr)); -@@ -3022,7 +2592,7 @@ +@@ -3022,7 +2636,7 @@ QString tmpStr(iconStr); if(!tmpStr.isEmpty()){ @@ -1051,5 +1104,5 @@ Features: delete pixmap; customBtnIconList.append(NULL); -@@ -3037,7 +2607,6 @@ +@@ -3037,7 +2651,6 @@ colorStr = colorList.next(); iconStr = iconList.next(); @@ -1059,5 +1112,5 @@ Features: void LiquidStyle::applyCustomAttributes(QPushButton *btn) -@@ -3087,7 +2656,7 @@ +@@ -3087,7 +2700,7 @@ } } @@ -1068,6 +1121,6 @@ Features: ---- - Mon Jun 24 19:05:49 2002 -+++ plugin.cpp Thu Jun 20 20:01:37 2002 +--- - Sun Jun 30 22:38:02 2002 ++++ plugin.cpp Fri Jun 28 13:25:25 2002 @@ -1,29 +1,29 @@ #include "liquid.h" @@ -1111,4 +1164,4 @@ Features: { - return(i18n("High performance liquid plugin").utf8()); -+ return "High performance liquid plugin"; ++ return "High Performance Liquid"; } |