| -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 @@ -2,10 +2,10 @@ This is a patch to mosfet's liquid 0.7. Features: - Qt-only - 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 @@ -101,11 +101,11 @@ Features: - QPixmap *icon, QBrush *fill); // 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, ---- - 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> #include "liquid.h" -#include <kapp.h> @@ -113,15 +113,16 @@ Features: -#include <kconfig.h> -#include <kdrawutil.h> -#include <kglobalsettings.h> -#include <kpixmapeffect.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 +22,29 @@ +@@ -25,28 +23,29 @@ #include <qtimer.h> #include <qpixmapcache.h> #include <qradiobutton.h> -#include <kimageeffect.h> @@ -159,9 +160,9 @@ Features: + QImageEffect::fade(img, 0.9, color); int x, y; int r, g, b; for(y=0; y < img.height(); y+=3){ -@@ -71,24 +69,21 @@ +@@ -71,35 +70,37 @@ : QObject(parent) { pixDict.setAutoDelete(true); - connect(kapp, SIGNAL(kipcMessage(int, int)), this, @@ -188,50 +189,73 @@ Features: + type = config. readNumEntry("Type", TransStippleBg); + color = QColor ( config. readEntry("Color", QApplication::palette().active().button().name())); + 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){ QApplication::syncX(); - KPixmap *pix = new KPixmap; + QPixmap *pix = new QPixmap; if(p->testWFlags(Qt::WType_Popup)){ 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()); } - *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,7 +116,7 @@ +@@ -121,82 +122,54 @@ stripePixmap(*pix, p->colorGroup().button()); } else{ - KPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color); + 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) -{ - if(id == LIQUID_MENU_CHANGE){ @@ -251,11 +275,18 @@ Features: - if(w->inherits("QPopupMenu")){ - w->close(); - } - } -- ++ 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){ - it.toFirst(); - while ((w=it.current()) != 0 ){ @@ -275,22 +306,26 @@ Features: - while ((w=it.current()) != 0 ){ - ++it; - if(w->inherits("QPushButton")){ - ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w); -- } ++ wid-> setBackgroundMode( QWidget::PaletteBackground ); + } - } - ((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() { @@ -298,9 +333,9 @@ Features: + btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); btnMaskBmp.setMask(btnMaskBmp); htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); -@@ -730,20 +670,19 @@ +@@ -730,20 +703,19 @@ } loadCustomButtons(); - lowLightVal = 100 + (2*KGlobalSettings::contrast()+4)*10; @@ -324,9 +359,9 @@ Features: + if ( c == 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 +733,7 @@ +@@ -794,15 +766,7 @@ pagerBrush.setPixmap(*pix); // background color stuff - c = config->readColorEntry("background", &Qt::lightGray); @@ -341,9 +376,9 @@ Features: + c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))); c.hsv(&bH, &bS, &bV); c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); -@@ -825,13 +756,10 @@ +@@ -825,13 +789,10 @@ painter.end(); bgBrush.setColor(c); bgBrush.setPixmap(wallPaper); - if(qstrcmp(kapp->argv()[0], "kicker") != 0 && @@ -356,9 +391,9 @@ Features: + c = QColor ( config. readEntry("Base", ( Qt::white). name ( ))); QPixmap basePix; basePix.resize(32, 32); basePix.fill(c.rgb()); -@@ -857,51 +785,27 @@ +@@ -857,51 +818,31 @@ } } - config->setGroup(oldGrp); @@ -374,8 +409,11 @@ Features: return; } if(w->inherits("QPopupMenu")) w->setBackgroundMode(QWidget::NoBackground); ++ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { ++ w->installEventFilter(menuHandler); ++ } if(w->isTopLevel()){ - if(!w->inherits("QPopupMenu") && - qstrcmp(kapp->argv()[0], "kicker") == 0){ @@ -402,8 +440,9 @@ Features: - w->inherits("KPanelExtension")){ // FIXME - doesn't work - w->setPalette(kapp->palette()); - } + ++ + w-> setBackgroundOrigin ( QWidget::ParentOrigin ); if(w->inherits("QComboBox") || w->inherits("QLineEdit") || w->inherits("QRadioButton") || @@ -413,9 +452,9 @@ Features: + w->inherits("QCheckBox") || w->inherits("QScrollBar")) { w->installEventFilter(this); } if(w->inherits("QLineEdit")){ -@@ -913,6 +817,9 @@ +@@ -913,6 +854,9 @@ applyCustomAttributes((QPushButton *)w); w->installEventFilter(this); } + if(w->inherits("QButton") || w-> inherits("QComboBox")){ @@ -423,9 +462,9 @@ 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); } + if(w-> inherits("QToolButton")) { @@ -438,9 +477,9 @@ Features: - return; if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> palette().active().brush(QColorGroup::Background).pixmap()){ -@@ -954,17 +862,18 @@ +@@ -954,17 +899,18 @@ return; } if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && - !w->inherits("KDesktop") && !w->inherits("PasswordDlg")){ @@ -460,9 +499,19 @@ 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); } - @@ -479,9 +528,9 @@ Features: + w->inherits("QCheckBox") || w->inherits("QScrollBar")) { w->removeEventFilter(this); } if(w->inherits("QButton") || w->inherits("QComboBox")){ -@@ -1014,9 +925,9 @@ +@@ -1014,9 +965,9 @@ w->setAutoMask(false); } } - if(w->inherits("KToolBar")){ @@ -491,9 +540,9 @@ Features: + w->setBackgroundMode(QWidget::PaletteBackground); return; } if(w->inherits("QHeader")){ -@@ -1028,20 +939,24 @@ +@@ -1028,20 +979,28 @@ void LiquidStyle::polish(QApplication *app) { - KStyle::polish(app); @@ -505,8 +554,10 @@ Features: if(menuFade) app->setEffectEnabled(UI_FadeMenu, false); + + qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); ++ ++ QApplication::qwsSetDecoration ( new LiquidDecoration ( )); } void LiquidStyle::unPolish(QApplication *app) { @@ -515,21 +566,23 @@ Features: app->setEffectEnabled(UI_AnimateMenu, menuAni); app->setEffectEnabled(UI_FadeMenu, menuFade); + + 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) { - if(obj->inherits("KToolBar")){ + if(obj->inherits("QToolBar")){ if(ev->type() == QEvent::Resize){ const QObjectList *tbChildList = obj->children(); QObjectListIt it(*tbChildList); -@@ -1076,35 +991,7 @@ +@@ -1076,35 +1035,7 @@ } } - else if(obj->inherits("KMiniPagerButton")){ @@ -564,9 +617,9 @@ Features: + else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){ QWidget *btn = (QWidget *)obj; if(ev->type() == QEvent::Enter){ if(btn->isEnabled()){ -@@ -1119,20 +1006,7 @@ +@@ -1119,20 +1050,7 @@ } } } - else if(obj->inherits("TaskContainer")){ @@ -586,9 +639,9 @@ Features: + else if(obj->inherits("QToolButton")){ QToolButton *btn = (QToolButton *)btn; if(!btn->autoRaise()){ if(btn->isEnabled()){ -@@ -1340,11 +1214,6 @@ +@@ -1340,11 +1258,6 @@ QColorGroup g = btn->colorGroup(); - QColor testColor; @@ -598,9 +651,9 @@ Features: - //int dw = buttonDefaultIndicatorWidth(); 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); } -void LiquidStyle::drawKBarHandle(QPainter *p, int x, int y, int w, int h, @@ -659,11 +712,11 @@ Features: - 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 ) @@ -692,10 +745,9 @@ Features: - - --w, --h; - 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()); - drawClearBevel(p, x, y, w, h, btnColor, g.background()); - @@ -792,9 +844,10 @@ Features: - qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, - 0, 0, g, false); - } -} -- ++ p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); + - -void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, bool active, QMenuItem *mi, - QBrush *) @@ -812,27 +865,27 @@ Features: + shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : g.background().dark(130); } else -@@ -2336,8 +2026,6 @@ +@@ -2336,8 +2070,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 +2051,7 @@ +@@ -2363,7 +2095,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 +2196,6 @@ +@@ -2508,25 +2240,6 @@ return h; } -void LiquidStyle::drawKProgressBlock(QPainter *p, int x, int y, int w, int h, @@ -856,9 +909,9 @@ Features: -} void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, const QColor *c, -@@ -2540,25 +2209,25 @@ +@@ -2540,25 +2253,25 @@ return; } else{ - KStyle::drawFocusRect(p, r, g, c, atBorder); @@ -886,27 +939,27 @@ Features: + QWindowsStyle::drawTab(p, tabBar, tab, selected); return; } QPixmap tilePix; -@@ -2671,7 +2340,7 @@ +@@ -2671,7 +2384,7 @@ vFrame = 8; // was 10 } else - KStyle::tabbarMetrics(t, hFrame, vFrame, overlap); + QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap); } -@@ -2699,7 +2368,7 @@ +@@ -2699,7 +2412,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 +2395,6 @@ +@@ -2726,105 +2439,6 @@ } } -void LiquidStyle::drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h, @@ -1010,9 +1063,9 @@ Features: -} void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) { -@@ -2998,22 +2568,22 @@ +@@ -2998,22 +2612,22 @@ customBtnIconList.clear(); customBtnLabelList.clear(); - KConfig *config = KGlobal::config(); @@ -1040,36 +1093,36 @@ Features: +// KIconLoader *ldr = KGlobal::iconLoader(); while(labelStr != NULL){ QColor *c = new QColor; c->setNamedColor(QString(colorStr)); -@@ -3022,7 +2592,7 @@ +@@ -3022,7 +2636,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 +2607,6 @@ +@@ -3037,7 +2651,6 @@ colorStr = colorList.next(); iconStr = iconList.next(); } - config->setGroup(oldGrp); } void LiquidStyle::applyCustomAttributes(QPushButton *btn) -@@ -3087,7 +2656,7 @@ +@@ -3087,7 +2700,7 @@ } } -#include "liquid.moc" +// #include "liquid.moc" ---- - 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" -#include <klocale.h> + @@ -1109,6 +1162,6 @@ Features: -const char *description() +const char *description ( ) { - return(i18n("High performance liquid plugin").utf8()); -+ return "High performance liquid plugin"; ++ return "High Performance Liquid"; } |