Forgot to update the QPL diff

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
@@ -3,8 +3,8 @@ Features:
  - Qt-only
  - works with Qt/E on QPE/OPIE
  
-        --- -Mon Jun 24 19:05:49 2002
-        +++ liquid.hFri Jun 21 14:48:21 2002
+        --- -Sun Jun 30 22:38:02 2002
+        +++ liquid.hMon Jun 24 19:07:45 2002
 @@ -2,7 +2,7 @@
  #define LIQUID_STYLE_H
  
@@ -102,9 +102,9 @@ 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,
-        --- -Mon Jun 24 19:05:49 2002
-        +++ liquid.cppFri Jun 21 22:02:55 2002
-@@ -10,12 +10,9 @@
+        --- -Sun Jun 30 22:38:02 2002
+        +++ liquid.cppSun Jun 30 22:37:56 2002
+@@ -10,12 +10,10 @@
  
  #include <qmenudata.h>
  #include "liquid.h"
@@ -114,13 +114,14 @@ Features:
 -#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>
@@ -160,7 +161,7 @@ Features:
      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);
@@ -189,11 +190,20 @@ Features:
 +    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();
@@ -202,7 +212,7 @@ Features:
              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());
                  }
@@ -211,26 +221,40 @@ Features:
                                             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)
 -{
@@ -252,9 +276,16 @@ Features:
 -                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();
@@ -276,7 +307,8 @@ Features:
 -            ++it;
 -            if(w->inherits("QPushButton")){
 -                ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w);
--            }
+        +                               wid-> setBackgroundMode( QWidget::PaletteBackground );
+             }
 -        }
 -        ((LiquidStyle*)parent())->loadCustomButtons();
 -        it.toFirst();
@@ -284,12 +316,15 @@ Features:
 -            ++it;
 -            if(w->inherits("QPushButton")){
 -                ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w);
--            }
--        }
+        +                       delete ol;
+             }
+         }
 -
--    }
--}
+     }
++    return(false);
+ }
  
++
  LiquidStyle::LiquidStyle()
 -    :KStyle()
 +    :QWindowsStyle()
@@ -299,7 +334,7 @@ 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();
@@ -325,7 +360,7 @@ Features:
          // 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
@@ -342,7 +377,7 @@ Features:
      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);
@@ -357,7 +392,7 @@ Features:
      QPixmap basePix;
      basePix.resize(32, 32);
      basePix.fill(c.rgb());
-@@ -857,51 +785,27 @@
+@@ -857,51 +818,31 @@
          }
      }
  
@@ -375,6 +410,9 @@ 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()){
 -        if(!w->inherits("QPopupMenu") &&
@@ -402,6 +440,7 @@ Features:
 -       w->inherits("KPanelExtension")){ // FIXME - doesn't work
 -        w->setPalette(kapp->palette());
 -    }
++   
 +    
 +    w-> setBackgroundOrigin ( QWidget::ParentOrigin );
  
@@ -414,7 +453,7 @@ Features:
          w->installEventFilter(this);
      }
      if(w->inherits("QLineEdit")){
-@@ -913,6 +817,9 @@
+@@ -913,6 +854,9 @@
          applyCustomAttributes((QPushButton *)w);
          w->installEventFilter(this);
      }
@@ -424,7 +463,7 @@ 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);
      }
@@ -439,7 +478,7 @@ 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;
      }
      if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
@@ -461,7 +500,17 @@ 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);
      }
@@ -480,7 +529,7 @@ Features:
          w->removeEventFilter(this);
      }
      if(w->inherits("QButton") || w->inherits("QComboBox")){
-@@ -1014,9 +925,9 @@
+@@ -1014,9 +965,9 @@
              w->setAutoMask(false);
          }
      }
@@ -492,7 +541,7 @@ Features:
          return;
      }
      if(w->inherits("QHeader")){
-@@ -1028,20 +939,24 @@
+@@ -1028,20 +979,28 @@
  void LiquidStyle::polish(QApplication *app)
  {
  
@@ -506,6 +555,8 @@ Features:
          app->setEffectEnabled(UI_FadeMenu, false);
         +
 +    qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
++    
++    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
  }
  
  void LiquidStyle::unPolish(QApplication *app)
@@ -516,10 +567,12 @@ Features:
      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)
  {
@@ -528,7 +581,7 @@ Features:
          if(ev->type() == QEvent::Resize){
              const QObjectList *tbChildList = obj->children();
              QObjectListIt it(*tbChildList);
-@@ -1076,35 +991,7 @@
+@@ -1076,35 +1035,7 @@
  
          }
      }
@@ -565,7 +618,7 @@ Features:
          QWidget *btn = (QWidget *)obj;
          if(ev->type() == QEvent::Enter){
              if(btn->isEnabled()){
-@@ -1119,20 +1006,7 @@
+@@ -1119,20 +1050,7 @@
              }
          }
      }
@@ -587,7 +640,7 @@ Features:
          QToolButton *btn = (QToolButton *)btn;
          if(!btn->autoRaise()){
              if(btn->isEnabled()){
-@@ -1340,11 +1214,6 @@
+@@ -1340,11 +1258,6 @@
      QColorGroup g = btn->colorGroup();
  
  
@@ -599,7 +652,7 @@ 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);
  }
  
@@ -660,9 +713,9 @@ Features:
 -        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,
@@ -693,8 +746,7 @@ 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());
@@ -793,7 +845,8 @@ Features:
 -                        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,
@@ -813,7 +866,7 @@ Features:
                  g.background().dark(130);
          }
          else
-@@ -2336,8 +2026,6 @@
+@@ -2336,8 +2070,6 @@
  
      maxpmw = QMAX( maxpmw, 20 );
  
@@ -822,7 +875,7 @@ 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);
          }
          else{
@@ -831,7 +884,7 @@ Features:
              if(pix)
                  p->drawPixmap(x, y, *pix, x, y, w, h);
          }
-@@ -2508,25 +2196,6 @@
+@@ -2508,25 +2240,6 @@
      return h;
  }
  
@@ -857,7 +910,7 @@ 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{
@@ -887,7 +940,7 @@ Features:
          return;
      }
      QPixmap tilePix;
-@@ -2671,7 +2340,7 @@
+@@ -2671,7 +2384,7 @@
          vFrame = 8; // was 10
      }
      else
@@ -896,7 +949,7 @@ Features:
  }
  
  
-@@ -2699,7 +2368,7 @@
+@@ -2699,7 +2412,7 @@
          p->drawLine(x+1, y+1, x+1, y2-1);
      }
      else if(lineWidth != 2 || !sunken)
@@ -905,7 +958,7 @@ Features:
      else{
          QPen oldPen = p->pen();
          int x2 = x+w-1;
-@@ -2726,105 +2395,6 @@
+@@ -2726,105 +2439,6 @@
      }
  }
  
@@ -1011,7 +1064,7 @@ Features:
  
  void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
  {
-@@ -2998,22 +2568,22 @@
+@@ -2998,22 +2612,22 @@
      customBtnIconList.clear();
      customBtnLabelList.clear();
  
@@ -1041,7 +1094,7 @@ Features:
      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 =
@@ -1050,7 +1103,7 @@ Features:
              if(pixmap->isNull()){
                  delete pixmap;
                  customBtnIconList.append(NULL);
-@@ -3037,7 +2607,6 @@
+@@ -3037,7 +2651,6 @@
          colorStr = colorList.next();
          iconStr = iconList.next();
      }
@@ -1058,7 +1111,7 @@ Features:
  }
  
  void LiquidStyle::applyCustomAttributes(QPushButton *btn)
-@@ -3087,7 +2656,7 @@
+@@ -3087,7 +2700,7 @@
      }
  }
  
@@ -1067,8 +1120,8 @@ Features:
  
  
  
-        --- -Mon Jun 24 19:05:49 2002
-        +++ plugin.cppThu Jun 20 20:01:37 2002
+        --- -Sun Jun 30 22:38:02 2002
+        +++ plugin.cppFri Jun 28 13:25:25 2002
 @@ -1,29 +1,29 @@
  #include "liquid.h"
 -#include <klocale.h>
@@ -1110,5 +1163,5 @@ Features:
 +const char *description ( )
  {
 -    return(i18n("High performance liquid plugin").utf8());
-+    return "High performance liquid plugin";
++    return "High Performance Liquid";
  }