5 files changed, 313 insertions, 126 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 87b5488..22bf8af 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -164,16 +164,18 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 }
 
 
 LiquidStyle::LiquidStyle()
     :QWindowsStyle()
 {
     setName ( "LiquidStyle" );
 
+        flatTBButtons = false;
+
     btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
     btnMaskBmp.setMask(btnMaskBmp);
     htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
     htmlBtnMaskBmp.setMask(htmlBtnMaskBmp);
     headerHoverID = -1;
     highlightWidget = NULL;
     setButtonDefaultIndicatorWidth(0);
     btnDict.setAutoDelete(true);
@@ -826,16 +828,23 @@ void LiquidStyle::polish(QPalette &appPal)
 
 }
 
 void LiquidStyle::polish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         //((QFrame*)w)->setLineWidth(0);
         w->setBackgroundMode(QWidget::PaletteBackground);
+        w->setBackgroundOrigin(QWidget::ParentOrigin);
+        return;
+    }
+    if(w->inherits("QToolBar")){
+        w->installEventFilter(this);
+        w->setBackgroundMode(QWidget::PaletteBackground);
+        w->setBackgroundOrigin(QWidget::WidgetOrigin);
         return;
     }
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::NoBackground);
     else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
             w->installEventFilter(menuHandler);
     }
     
@@ -888,18 +897,20 @@ void LiquidStyle::polish(QWidget *w)
             }
             return;
         }
     }
     if(w->inherits("QHeader")){
         w->setMouseTracking(true);
         w->installEventFilter(this);
     }
-    if(w-> inherits("QToolButton")) {
-            ((QToolButton*)w)->setAutoRaise (false);
+    if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) {
+            ((QToolButton*)w)->setAutoRaise (flatTBButtons);
+            if ( flatTBButtons )
+                w->setBackgroundOrigin(QWidget::ParentOrigin);
     }
     if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
         return;
     }
 
     if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
        palette().active().brush(QColorGroup::Background).pixmap()){
         qWarning("No parent pixmap for child widget %s", w->className());
@@ -907,21 +918,16 @@ void LiquidStyle::polish(QWidget *w)
     }
     if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
            !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
         if(w->backgroundMode() == QWidget::PaletteBackground ||
            w->backgroundMode() == QWidget::PaletteButton){
             w->setBackgroundMode(QWidget::X11ParentRelative);
         }
     }
-    if(w->inherits("QToolBar")){
-        w->installEventFilter(this);
-        w->setBackgroundMode(QWidget::PaletteBackground);
-        return;
-    }
 
 }
 
 void LiquidStyle::unPolish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         ((QFrame *)w)->setLineWidth(1);
         w->setBackgroundMode(QWidget::PaletteBackground);
@@ -996,16 +1002,18 @@ void LiquidStyle::polish(QApplication *app)
         
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
     
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
     
             if ( config. readBoolEntry ( "WinDecoration", true ))
             QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
+            
+        flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
 }
 
 void LiquidStyle::unPolish(QApplication *app)
 {
     QWindowsStyle::unPolish(app);
     app->setEffectEnabled(UI_AnimateMenu, menuAni);
     app->setEffectEnabled(UI_FadeMenu, menuFade);
 
@@ -1993,18 +2001,20 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
                             QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
         {
     if(active){
         x -= 2; // Bug in Qt/E 
         y -= 2;
         w += 2;
         h += 2;
     }
-
-    p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background));
+    
+    QWidget *parent = (QWidget *)p->device();
+    p->setBrushOrigin(parent->pos());
+    parent->erase(x, y, w, h);
    
     if(menuHandler->useShadowText()){
         QColor shadow;
         if(p->device() && p->device()->devType() == QInternal::Widget &&
            ((QWidget *)p->device())->inherits("QMenuBar")){
             shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) :
                 g.background().dark(130);
         }
diff --git a/noncore/styles/liquid/liquid.h b/noncore/styles/liquid/liquid.h
index fb691ea..00cfb35 100644
--- a/noncore/styles/liquid/liquid.h
+++ b/noncore/styles/liquid/liquid.h
@@ -172,16 +172,17 @@ protected:
                       bool down=false, bool fast = true);
     void drawRoundRect(QPainter *p, int x, int y, int w, int h);
     void loadCustomButtons();
     void applyCustomAttributes(QPushButton *btn);
     void unapplyCustomAttributes(QPushButton *btn);
     QPixmap* getPixmap(BitmapData item);
     QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false);
 private:
+        bool flatTBButtons;
     bool highcolor;
     QColorGroup radioOnGrp;
     QWidget *highlightWidget;
     QBrush wallpaper;
     QBitmap lightBmp;
     QBitmap grayBmp;
     QBitmap dgrayBmp;
     QBitmap maskBmp;
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index 5ae19ba..1b9526f 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -23,17 +23,17 @@
 #include "liquidset.h"
 #include "liquid.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 
 #include <qslider.h>
 #include <qtoolbutton.h>
-#include <qbuttongroup.h>
+#include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpalette.h>
 
 #include <qpe/config.h>
 
@@ -67,52 +67,33 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 
         m_type       = config. readNumEntry ( "Type", TransStippleBg );
         m_menucol    = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
         m_textcol    = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
         int opacity  = config. readNumEntry ( "Opacity", 10 );
         m_shadow     = config. readBoolEntry ( "ShadowText", true );
         m_deco       = config. readBoolEntry ( "WinDecoration", true );
         int contrast = config. readNumEntry ( "StippleContrast", 5 );
+        m_flat       = config. readBoolEntry ( "FlatToolButtons", false );
 
         QVBoxLayout *vbox = new QVBoxLayout ( this );
         vbox-> setSpacing ( 3 );
-        vbox-> setMargin ( 6 );
+        vbox-> setMargin ( 4 );
 
-        QButtonGroup *btngrp = new QButtonGroup ( this );
-        btngrp-> hide ( );
-
-        QRadioButton *rad;
-        
-        rad = new QRadioButton ( tr( "No translucency" ), this );
-        btngrp-> insert ( rad, None );
-        vbox-> addWidget ( rad );
-        
-        rad = new QRadioButton ( tr( "Stippled, background color" ), this );
-        btngrp-> insert ( rad, StippledBg );
-        vbox-> addWidget ( rad );
-        
-        rad = new QRadioButton ( tr( "Stippled, button color" ), this );
-        btngrp-> insert ( rad, StippledBtn );
-        vbox-> addWidget ( rad );
-        
-        rad = new QRadioButton ( tr( "Translucent stippled, background color" ), this );
-        btngrp-> insert ( rad, TransStippleBg );
-        vbox-> addWidget ( rad );
-        
-        rad = new QRadioButton ( tr( "Translucent stippled, button color" ), this );
-        btngrp-> insert ( rad, TransStippleBtn );
-        vbox-> addWidget ( rad );
+        QComboBox *cb = new QComboBox ( this );
+        cb-> insertItem ( tr( "No translucency" ), None );
+        cb-> insertItem ( tr( "Stippled, background color" ), StippledBg );
+        cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn );
+        cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg );
+        cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn );
+        cb-> insertItem ( tr( "Custom translucency" ), Custom );
         
-        rad = new QRadioButton ( tr( "Custom translucency" ), this );
-        btngrp-> insert ( rad, Custom );
-        vbox-> addWidget ( rad );
+        cb-> setCurrentItem ( m_type );
+        vbox-> addWidget ( cb );
         
-        btngrp-> setExclusive ( true );
-        btngrp-> setButton ( m_type );
         
         QGridLayout *grid = new QGridLayout ( vbox );
         grid-> addColSpacing ( 0, 16 );
         grid-> addColSpacing ( 3, 8 );
         
         grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
         grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
         grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
@@ -152,33 +133,40 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
         vbox-> addSpacing ( 4 );
         
         QCheckBox *windeco = new QCheckBox ( tr( "Draw liquid window title bars" ), this );
         windeco-> setChecked ( m_deco );
         vbox-> addWidget ( windeco );
 
         vbox-> addSpacing ( 4 );
         
+        QCheckBox *flattb = new QCheckBox ( tr( "Make toolbar buttons appear flat" ), this );
+        flattb-> setChecked ( m_flat );
+        vbox-> addWidget ( flattb );
+
+        vbox-> addSpacing ( 4 );
+        
         QHBoxLayout *hbox = new QHBoxLayout ( vbox );
         
         hbox-> addWidget ( new QLabel ( tr( "Stipple contrast" ), this )); 
         
         m_contsld = new QSlider ( Horizontal, this );
         m_contsld-> setRange ( 0, 10 );
         m_contsld-> setValue ( contrast );
         m_contsld-> setTickmarks ( QSlider::Below );
         hbox-> addWidget ( m_contsld, 10 );
         
         vbox-> addStretch ( 10 );
 
         changeType ( m_type );
         
-        connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( changeType ( int ) ) );
+        connect ( cb, SIGNAL( highlighted ( int ) ), this, SLOT( changeType ( int ) ) );
         connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) );
         connect ( windeco, SIGNAL( toggled ( bool ) ), this, SLOT( changeDeco ( bool ) ) );
+        connect ( flattb, SIGNAL( toggled ( bool ) ), this, SLOT( changeFlat ( bool ) ) );
 }
 
 void LiquidSettings::changeType ( int t )
 {
         bool custom = ( t == Custom );
         
                 m_menulbl-> setEnabled ( custom );
                 m_textlbl-> setEnabled ( custom );
@@ -207,26 +195,32 @@ void LiquidSettings::changeShadow ( bool b )
         m_shadow = b;
 }
 
 void LiquidSettings::changeDeco ( bool b )
 {
         m_deco = b;
 }
 
+void LiquidSettings::changeFlat ( bool b )
+{
+        m_flat = b;
+}
+
 
 bool LiquidSettings::writeConfig ( )
 {
         Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
         config. writeEntry ( "Type", m_type  );
         config. writeEntry ( "Color",  m_menucol. name ( ));
         config. writeEntry ( "TextColor", m_textcol. name ( ));
         config. writeEntry ( "Opacity", m_opacsld-> value ( ));
                 config. writeEntry ( "ShadowText", m_shadow );
         config. writeEntry ( "WinDecoration", m_deco );
         config. writeEntry ( "StippleContrast", m_contsld-> value ( ));
+        config. writeEntry ( "FlatToolButtons", m_flat );
         config. write ( );
 
         return true;
 }
 
diff --git a/noncore/styles/liquid/liquidset.h b/noncore/styles/liquid/liquidset.h
index 7843513..bb1846c 100644
--- a/noncore/styles/liquid/liquidset.h
+++ b/noncore/styles/liquid/liquidset.h
@@ -15,25 +15,27 @@ public:
         LiquidSettings ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 
 public slots:
         void changeType ( int t );
         void changeMenuColor ( const QColor &col );
         void changeTextColor ( const QColor &col );
         void changeShadow ( bool b );
         void changeDeco ( bool b );
+        void changeFlat ( bool b );
 
         virtual bool writeConfig ( );
         
 private:
         QColor m_menucol;
         QColor m_textcol;
         int    m_type;
         bool   m_shadow;
         bool   m_deco;
+        bool   m_flat;
         
         QSlider *    m_opacsld;
         QSlider *    m_contsld;
         QLabel *     m_menulbl;
         QLabel *     m_textlbl;
         QLabel *     m_opaclbl;
         QToolButton *m_menubtn;
         QToolButton *m_textbtn;
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index bcbdc8d..7dfd868 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -1,15 +1,15 @@
 This is a patch to mosfet's liquid 0.7.
 Features:
  - Qt-only
  - works with Qt/E on QPE/OPIE
  
-        --- -Mon Jul  1 11:38:05 2002
-        +++ liquid.hMon Jun 24 19:07:45 2002
+        --- -Mon Jul 15 02:34:13 2002
+        +++ liquid.hMon Jul 15 01:51:12 2002
 @@ -2,7 +2,7 @@
  #define LIQUID_STYLE_H
  
  
 -#include <kstyle.h>
 +#include <qwindowsstyle.h>
  #include <qpainter.h>
  #include <qdrawutil.h>
@@ -97,18 +97,26 @@ Features:
 -                                const QColorGroup &g, QBrush *);
 -    void drawKickerTaskButton(QPainter *p, int x, int y, int w, int h,
 -                              const QColorGroup &g,
 -                              const QString &title, bool active,
 -                              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 Jul  1 11:38:05 2002
-        +++ liquid.cppMon Jul  1 03:45:28 2002
+@@ -204,6 +177,7 @@
+     QPixmap* getPixmap(BitmapData item);
+     QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false);
+ private:
+        +bool flatTBButtons;
+     bool highcolor;
+     QColorGroup radioOnGrp;
+     QWidget *highlightWidget;
+        --- -Mon Jul 15 02:34:13 2002
+        +++ liquid.cppMon Jul 15 02:31:59 2002
 @@ -10,12 +10,10 @@
  
  #include <qmenudata.h>
  #include "liquid.h"
 -#include <kapp.h>
 -#include <kglobal.h>
 -#include <kconfig.h>
 -#include <kdrawutil.h>
@@ -179,17 +187,17 @@ Features:
 -    type = config->readNumEntry("Type", TransStippleBg);
 -    color = config->readColorEntry("Color",
 -                                   &QApplication::palette().active().button());
 -    fgColor = config->readColorEntry("TextColor",
 -                                     &QApplication::palette().active().text());
 -    opacity = config->readNumEntry("Opacity", 10);
 -    shadowText = config->readBoolEntry("ShadowText", true);
 +    Config config ( "qpe" );
-+    config. setGroup ( "MosfetMenus" );
++    config. setGroup ( "Liquid-Style" );
 +
 +    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 )
@@ -216,27 +224,27 @@ Features:
                      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,82 +122,54 @@
+@@ -121,82 +122,55 @@
                  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 {
++            
++            if (!p->inherits("QPopupMenu")) {
         +            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);                               
@@ -249,71 +257,70 @@ Features:
          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());
- 
+-
 -void TransMenuHandler::slotKIPCMessage(int id, int)
 -{
 -    if(id == LIQUID_MENU_CHANGE){
 -        bool oldShadow = shadowText;
--
++//            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
+ 
 -        KConfig *config = KGlobal::config();
 -        config->reparseConfiguration(); // in case KControl changed values
 -
 -        // Make sure no popupmenus are shown. There shouldn't be any because
 -        // the user just clicked "Apply", but there can be tear offs ;-)
 -        // We just close them so the pixmaps are deleted and regenerated.
 -        QWidgetList *list = QApplication::topLevelWidgets();
 -        QWidgetListIt it( *list );
 -        QWidget *w;
 -        while ((w=it.current()) != 0 ){
 -            ++it;
 -            if(w->inherits("QPopupMenu")){
 -                w->close();
 -            }
 -        }
-+            if (p->inherits("QPopupMenu"))
-+                pixDict.remove(p->winId());
-+            else {
-        +            p->setBackgroundMode(QWidget::PaletteBackground);
++            pixDict.remove(p->winId());
++            if (!p->inherits("QPopupMenu")) {
++                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 ){
 -                ++it;
 -                if(w->inherits("QMenuBar")){
 -                    w->repaint();
 -                }
 -            }
--        }
+        +                               wid-> setBackgroundMode( QWidget::PaletteBackground );
+         }
 -    }
 -    else if(id == MOSFET_BUTTON_CHANGE){
 -        qWarning("In mosfet button change");
 -        // really, this should be in LiquidStyle, but what the hell? ;-)
 -        QWidgetList *list = QApplication::allWidgets();
 -        QWidgetListIt it( *list );
 -        QWidget *w;
 -        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;
@@ -326,91 +333,117 @@ Features:
  
 +
  LiquidStyle::LiquidStyle()
 -    :KStyle()
 +    :QWindowsStyle()
  {
 +    setName ( "LiquidStyle" );
 +
+        +flatTBButtons = false;
++
      btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
      btnMaskBmp.setMask(btnMaskBmp);
      htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
-@@ -730,20 +703,19 @@
+@@ -730,20 +704,26 @@
      }
  
      loadCustomButtons();
 -    lowLightVal = 100 + (2*KGlobalSettings::contrast()+4)*10;
 +    lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
      btnDict.clear();
      btnBorderDict.clear();
      bevelFillDict.clear();
      smallBevelFillDict.clear();
  
 -    KConfig *config = KGlobal::config();
 -    QString oldGrp = config->group();
 +    Config config ( "qpe" );
++    config. setGroup ( "Liquid-Style" );
+        +int contrast = config. readNumEntry ( "StippleContrast", 5 );
+        +if ( contrast < 0 )
+        +       contrast = 0;
+        +else if ( contrast > 10 )
+        +       contrast = 10;
++
      QPalette pal = QApplication::palette();
  
      // button color stuff
 -    config->setGroup("General");
 -    QColor c = config->readColorEntry("buttonBackground", &Qt::lightGray);
 -    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 ( )))) {
          // force button color to be different from background
          QBrush btnBrush(QColor(200, 202, 228));
          appPal.setBrush(QColorGroup::Button, btnBrush);
-@@ -794,15 +766,7 @@
+@@ -794,15 +774,7 @@
      pagerBrush.setPixmap(*pix);
  
      // background color stuff
 -    c = config->readColorEntry("background", &Qt::lightGray);
 -    if(qstrcmp(kapp->argv()[0], "kicker") == 0){
 -        appPal.setColor(QColorGroup::Mid, menuBrush.color().dark(110));
 -        appPal.setColor(QColorGroup::Dark, menuBrush.color().dark(130));
 -        appPal.setColor(QColorGroup::Midlight, menuBrush.color().light(110));
 -        appPal.setColor(QColorGroup::Light, menuBrush.color().light(115));
 -        menuBrush.setColor(c); // hack - used for kicker applets
 -        appPal.setBrush(QColorGroup::Background, menuBrush);
 -    }
 +    c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));
      c.hsv(&bH, &bS, &bV);
      c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
  
-@@ -825,13 +789,10 @@
+@@ -817,21 +789,18 @@
+     wallPaper.fill(c.rgb());
+     painter.begin(&wallPaper);
+     for(i=0; i < 32; i+=4){
+-        painter.setPen(c.dark(105));
++        painter.setPen(c.dark(100 + contrast));
+         painter.drawLine(0, i, 32, i);
+-        painter.setPen(c.dark(103));
++        painter.setPen(c.dark(100 + 3 * contrast / 5 ) );
+         painter.drawLine(0, i+1, 32, i+1);
+     };
      painter.end();
      bgBrush.setColor(c);
      bgBrush.setPixmap(wallPaper);
 -    if(qstrcmp(kapp->argv()[0], "kicker") != 0 &&
 -       qstrcmp(kapp->argv()[0], "ksplash") != 0){
          appPal.setBrush(QColorGroup::Background, bgBrush);
 -    }
  
      // lineedits
 -    c = config->readColorEntry("windowBackground", &Qt::white);
 +    c = QColor ( config. readEntry("Base", ( Qt::white). name ( )));
      QPixmap basePix;
      basePix.resize(32, 32);
      basePix.fill(c.rgb());
-@@ -857,51 +818,31 @@
+@@ -857,51 +826,39 @@
          }
      }
  
 -    config->setGroup(oldGrp);
  }
  
  void LiquidStyle::polish(QWidget *w)
  {
      if(w->inherits("QMenuBar")){
 -        ((QFrame*)w)->setLineWidth(0);
 -        w->setBackgroundMode(QWidget::NoBackground);
 +        //((QFrame*)w)->setLineWidth(0);
 +        w->setBackgroundMode(QWidget::PaletteBackground);
++        w->setBackgroundOrigin(QWidget::ParentOrigin);
++        return;
++    }
++    if(w->inherits("QToolBar")){
++        w->installEventFilter(this);
++        w->setBackgroundMode(QWidget::PaletteBackground);
++        w->setBackgroundOrigin(QWidget::WidgetOrigin);
          return;
      }
      if(w->inherits("QPopupMenu"))
          w->setBackgroundMode(QWidget::NoBackground);
 +    else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
         +    w->installEventFilter(menuHandler);
 +    }
  
@@ -437,85 +470,86 @@ Features:
          return;
      }
 -    if(qstrcmp(kapp->argv()[0], "kicker") == 0 &&
 -       w->inherits("KPanelExtension")){ // FIXME - doesn't work
 -        w->setPalette(kapp->palette());
 -    }
 +   
 +    
-+    w-> setBackgroundOrigin ( QWidget::ParentOrigin );
++    if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
+        +    w-> setBackgroundOrigin ( QWidget::ParentOrigin );
  
      if(w->inherits("QComboBox") ||
         w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
 -       w->inherits("QCheckBox") || w->inherits("QScrollBar") ||
 -       w->isA("AppletHandle") || w->inherits("KMiniPagerButton") ||
 -       w->inherits("TaskContainer")){
 +       w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
          w->installEventFilter(this);
      }
      if(w->inherits("QLineEdit")){
-@@ -913,6 +854,9 @@
+@@ -913,6 +870,9 @@
          applyCustomAttributes((QPushButton *)w);
          w->installEventFilter(this);
      }
 +    if(w->inherits("QButton") || w-> inherits("QComboBox")){
         +    w-> setBackgroundMode ( QWidget::PaletteBackground );
 +    }
  
      bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
          qstrcmp(w->name(), "qt_clipped_viewport") == 0;
-@@ -942,11 +886,12 @@
+@@ -942,11 +902,14 @@
          w->setMouseTracking(true);
          w->installEventFilter(this);
      }
-+    if(w-> inherits("QToolButton")) {
-        +    ((QToolButton*)w)->setAutoRaise (false);
++    if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) {
+        +    ((QToolButton*)w)->setAutoRaise (flatTBButtons);
+        +    if ( flatTBButtons )
+        +       w->setBackgroundOrigin(QWidget::ParentOrigin);
 +    }
      if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
          return;
      }
 -    if(w->inherits("PanelButtonBase"))
 -        return;
  
      if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
         palette().active().brush(QColorGroup::Background).pixmap()){
-@@ -954,17 +899,18 @@
+@@ -954,17 +917,13 @@
          return;
      }
      if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
 -       !w->inherits("KDesktop") && !w->inherits("PasswordDlg")){
         +   !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
          if(w->backgroundMode() == QWidget::PaletteBackground ||
             w->backgroundMode() == QWidget::PaletteButton){
              w->setBackgroundMode(QWidget::X11ParentRelative);
          }
      }
 -    if(w->inherits("KToolBar")){
-+    if(w->inherits("QToolBar")){
-         w->installEventFilter(this);
+-        w->installEventFilter(this);
 -        //w->setBackgroundMode(QWidget::NoBackground);
-+        w->setBackgroundMode(QWidget::PaletteBackground);
-         return;
-     }
+-        return;
+-    }
 +
  }
  
  void LiquidStyle::unPolish(QWidget *w)
-@@ -977,6 +923,9 @@
+@@ -977,6 +936,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 @@
+@@ -1001,12 +963,14 @@
          unapplyCustomAttributes((QPushButton *)w);
          w->removeEventFilter(this);
      }
 -
 +/*
 +    if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
         +    w-> setBackgroundMode ( PaletteBackground );
 +    }
@@ -524,69 +558,75 @@ Features:
         w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
 -       w->inherits("QCheckBox") || w->inherits("QScrollBar") ||
 -       w->isA("AppletHandle") || w->inherits("KMiniPagerButton") ||
 -       w->inherits("TaskContainer")){
 +       w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
          w->removeEventFilter(this);
      }
      if(w->inherits("QButton") || w->inherits("QComboBox")){
-@@ -1014,9 +965,9 @@
+@@ -1014,9 +978,9 @@
              w->setAutoMask(false);
          }
      }
 -    if(w->inherits("KToolBar")){
 +    if(w->inherits("QToolBar")){
          w->removeEventFilter(this);
 -        //w->setBackgroundMode(QWidget::PaletteBackground);
 +        w->setBackgroundMode(QWidget::PaletteBackground);
          return;
      }
      if(w->inherits("QHeader")){
-@@ -1028,20 +979,28 @@
+@@ -1028,20 +992,34 @@
  void LiquidStyle::polish(QApplication *app)
  {
  
 -    KStyle::polish(app);
 +    QWindowsStyle::polish(app);
      menuAni = app->isEffectEnabled(UI_AnimateMenu);
      menuFade = app->isEffectEnabled(UI_FadeMenu);
      if(menuAni)
          app->setEffectEnabled(UI_AnimateMenu, false);
      if(menuFade)
          app->setEffectEnabled(UI_FadeMenu, false);
         +
 +    qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
 +    
-+    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
++    Config config ( "qpe" );
++    config. setGroup ( "Liquid-Style" );
++    
+        +    if ( config. readBoolEntry ( "WinDecoration", true ))
+        +    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
+        +    
+        +flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
  }
  
  void LiquidStyle::unPolish(QApplication *app)
  {
 -    KStyle::unPolish(app);
 +    QWindowsStyle::unPolish(app);
      app->setEffectEnabled(UI_AnimateMenu, menuAni);
      app->setEffectEnabled(UI_FadeMenu, menuFade);
 +
 +    qt_set_draw_menu_bar_impl ( 0 );
 +    
 +    QApplication::qwsSetDecoration ( new QPEDecoration ( ));
  }
  
  /*
-@@ -1063,7 +1022,7 @@
+@@ -1063,7 +1041,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 +1035,7 @@
+@@ -1076,35 +1054,7 @@
  
          }
      }
 -    else if(obj->inherits("KMiniPagerButton")){
 -        QButton *btn = (QButton *)obj;
 -        if(ev->type() == QEvent::Paint){
 -            if(!(btn->isOn() || btn->isDown())){
 -                QPalette pal = btn->palette();
@@ -613,17 +653,17 @@ Features:
 -
 -    }
 -    else if(obj->inherits("QPushButton") || obj->inherits("QComboBox") ||
 -            obj->isA("AppletHandle")){
 +    else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
          QWidget *btn = (QWidget *)obj;
          if(ev->type() == QEvent::Enter){
              if(btn->isEnabled()){
-@@ -1119,20 +1050,7 @@
+@@ -1119,20 +1069,7 @@
              }
          }
      }
 -    else if(obj->inherits("TaskContainer")){
 -        QButton *btn = (QButton *)obj;
 -        QPalette pal = btn->palette();
 -        if(ev->type() == QEvent::Enter){
 -            pal.setColor(QColorGroup::Background, pal.active().button().light(110));
@@ -635,62 +675,115 @@ Features:
 -            btn->setPalette(pal);
 -        }
 -    }
 -    else if(obj->inherits("QToolButton") && !obj->inherits("KToolBarButton")){
 +    else if(obj->inherits("QToolButton")){
          QToolButton *btn = (QToolButton *)btn;
          if(!btn->autoRaise()){
              if(btn->isEnabled()){
-@@ -1340,11 +1258,6 @@
+@@ -1340,11 +1277,6 @@
      QColorGroup g = btn->colorGroup();
  
  
 -    QColor testColor;
 -    if(btn->parent() && btn->parent()->isWidgetType()){
 -        testColor = p->backgroundColor(); // remove me
 -    }
 -
      //int dw = buttonDefaultIndicatorWidth();
      if(btn->hasFocus() || btn->isDefault()){
          QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
-@@ -1914,8 +1827,8 @@
+@@ -1596,7 +1528,7 @@
+         if(sbBuffer.size() != sb->size())
+             sbBuffer.resize(sb->size());
+     }
+-    subB.setRect( subX,subY,buttonDim,buttonDim );
++    subB.setRect( subX,subY,0,0); // buttonDim,buttonDim );
+     addB.setRect( addX,addY,buttonDim,buttonDim );
+     if(horiz)
+         subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
+@@ -1624,7 +1556,7 @@
+     QPainter painter;
+     if(!horiz){
+         painter.begin(&sbBuffer);
+-        QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1);
++        QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1);
+         if(sliderR.height() >= 8){
+             painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
+                           13, 8);
+@@ -1690,7 +1622,7 @@
+     }
+     else{
+         painter.begin(&sbBuffer);
+-        QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height());
++        QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height());
+         if(sliderR.width() >= 8){
+             painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0,
+                                8, 13);
+@@ -1761,10 +1693,10 @@
+                    addB.width()-8, addB.height()-8, g, !maxed);
+     }
+     if ( controls & SubLine ) {
+-        drawSBButton(p, subB, g, activeControl == SubLine);
+-        drawArrow( p, horiz ? LeftArrow : UpArrow,
+-                   false, subB.x()+4, subB.y()+4,
+-                   subB.width()-8, subB.height()-8, g, !maxed);
++     //   drawSBButton(p, subB, g, activeControl == SubLine);
++     //   drawArrow( p, horiz ? LeftArrow : UpArrow,
++     //              false, subB.x()+4, subB.y()+4,
++     //              subB.width()-8, subB.height()-8, g, !maxed);
+         drawSBButton(p, subHC, g, activeControl == SubLine);
+         drawArrow( p, horiz ? LeftArrow : UpArrow,
+                    false, subHC.x()+4, subHC.y()+4,
+@@ -1865,8 +1797,8 @@
+     else
+         buttonDim = ( length - b*2 )/2 - 1;
+ 
+-    sliderMin = b + buttonDim;
+-    maxLength  = length - b*2 - buttonDim*3;
++    sliderMin = b + 0; // buttonDim;
++    maxLength  = length - b*2 - buttonDim*2; // 3;
+ 
+     if ( sb->maxValue() == sb->minValue() ) {
+         sliderLength = maxLength;
+@@ -1914,8 +1846,8 @@
      return(QSize(16, 16));
  }
  
 -void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w,
 -                                        int h, const QColorGroup &g, bool on,
 +void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
 +                                        int /*h*/, const QColorGroup &/*g*/, bool on,
                                          bool down, bool)
  {
      bool isHover = highlightWidget == p->device();
-@@ -1957,8 +1870,8 @@
+@@ -1957,8 +1889,8 @@
      return(QSize(20, 22));
  }
  
 -void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
 -                            const QColorGroup &g, int state, bool down, bool)
 +void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
 +                            const QColorGroup &/*g*/, int state, bool /*down*/, bool)
  {
      bool isHover = highlightWidget == p->device();
      bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
-@@ -1996,8 +1909,8 @@
+@@ -1996,8 +1928,8 @@
      }
  }
  
 -void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
 -                                   int state)
 +void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
 +                                   int /*state*/)
  {
      // needed for some reason by KHtml, even tho it's all filled ;P
      p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
-@@ -2005,18 +1918,17 @@
+@@ -2005,18 +1937,17 @@
  }
  
  void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
 -                         const QColorGroup &g, Orientation orient,
 +                         const QColorGroup &/*g*/, Orientation orient,
                           bool, bool)
  {
      QWidget *parent = (QWidget *)p->device();
@@ -702,17 +795,17 @@ Features:
                    *getPixmap(VSlider));
  }
  
 -void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h,
 +void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
                               Orientation orient, bool, bool)
  {
      p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
-@@ -2065,203 +1977,24 @@
+@@ -2065,203 +1996,26 @@
      p->drawLineSegments(a);
  }
  
 -void LiquidStyle::drawKBarHandle(QPainter *p, int x, int y, int w, int h,
 -                             const QColorGroup &g, KToolBarPos,
 -                             QBrush *)
 -{
 -    p->setPen(g.button().dark(120));
@@ -773,21 +866,17 @@ Features:
  
 -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 )
  {
 -    //p->fillRect(x, y, w, h, g.brush(QColorGroup::Background));
 -}
-+    x -= 2; // Bug in Qt/E 
-+    y -= 2;
-+    w += 2;
-+    h += 2;
- 
+-
 -void LiquidStyle::drawKToolBarButton(QPainter *p, int x, int y, int w, int h,
 -                                    const QColorGroup &g, bool sunken,
 -                                    bool raised, bool enabled, bool popup,
 -                                    KToolButtonType icontext,
 -                                    const QString& btext, const QPixmap *pixmap,
 -                                    QFont *font, QWidget *btn)
 -{
 -    int dx, dy;
@@ -893,69 +982,75 @@ Features:
 -    }
 -    if (popup){
 -        if (enabled)
 -            qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, 0, 0,
 -                        g, true);
 -        else
 -            qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5,
 -                        0, 0, g, false);
--    }
++    if(active){
++        x -= 2; // Bug in Qt/E 
++        y -= 2;
++        w += 2;
++        h += 2;
+     }
 -}
-+    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 *)
 -{
 -    if ( p->font() == KGlobalSettings::generalFont() )
 -        p->setFont( KGlobalSettings::menuFont() );
-+   w -= 2;
++    QWidget *parent = (QWidget *)p->device();
++    p->setBrushOrigin(parent->pos());
++    parent->erase(x, y, w, h);
  
      if(menuHandler->useShadowText()){
          QColor shadow;
          if(p->device() && p->device()->devType() == QInternal::Widget &&
 -           ((QWidget *)p->device())->inherits("KMenuBar")){
 -            shadow = ((KMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) :
 +           ((QWidget *)p->device())->inherits("QMenuBar")){
 +            shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) :
                  g.background().dark(130);
          }
          else
-@@ -2300,8 +2033,8 @@
+@@ -2300,8 +2054,8 @@
  }
  
  void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
 -                                 const QColorGroup &g, int lineWidth,
 -                                 const QBrush * fill)
 +                                 const QColorGroup &g, int /*lineWidth*/,
 +                                 const QBrush * /*fill*/)
  {
      QColor c;
      switch(menuHandler->transType()){
-@@ -2336,8 +2069,6 @@
+@@ -2336,8 +2090,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 +2094,7 @@
+@@ -2363,7 +2115,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 +2239,6 @@
+@@ -2508,25 +2260,6 @@
      return h;
  }
  
 -void LiquidStyle::drawKProgressBlock(QPainter *p, int x, int y, int w, int h,
 -                                    const QColorGroup &g, QBrush *fill)
 -{
 -    p->setPen(g.button().dark(130));
 -    p->drawRect(x, y, w, h);
@@ -971,17 +1066,17 @@ Features:
 -            bevelFillDict.insert(g.button().dark(120).rgb(), pix);
 -        }
 -        p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
 -    }
 -}
  
  void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
                              const QColorGroup &g, const QColor *c,
-@@ -2540,25 +2252,25 @@
+@@ -2540,25 +2273,25 @@
              return;
          }
          else{
 -            KStyle::drawFocusRect(p, r, g, c, atBorder);
 +            QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
          }
      }
      else
@@ -1001,35 +1096,35 @@ Features:
                        bool selected)
  {
      if(tabBar->shape() != QTabBar::RoundedAbove){
 -        KStyle::drawTab(p, tabBar, tab, selected);
 +        QWindowsStyle::drawTab(p, tabBar, tab, selected);
          return;
      }
      QPixmap tilePix;
-@@ -2671,7 +2383,7 @@
+@@ -2671,7 +2404,7 @@
          vFrame = 8; // was 10
      }
      else
 -        KStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
 +        QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
  }
  
  
-@@ -2699,7 +2411,7 @@
+@@ -2699,7 +2432,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 +2438,6 @@
+@@ -2726,105 +2459,6 @@
      }
  }
  
 -void LiquidStyle::drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h,
 -                                      const QColorGroup &g, QBrush *)
 -{
 -    p->fillRect(x, y, w, h, g.brush(QColorGroup::Background));
 -    drawClearBevel(p, x, y, w, h, highlightWidget == p->device() ?
@@ -1125,17 +1220,17 @@ Features:
 -        p->drawText(br.x()+ textPos, -1, w-textPos, h,
 -                    AlignLeft|AlignVCenter, s);
 -    }
 -
 -}
  
  void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
  {
-@@ -2998,22 +2611,22 @@
+@@ -2998,22 +2632,22 @@
      customBtnIconList.clear();
      customBtnLabelList.clear();
  
 -    KConfig *config = KGlobal::config();
 -    QString oldGrp = config->group();
 -    config->setGroup("MosfetButtons");
 +//    KConfig *config = KGlobal::config();
 +//    QString oldGrp = config->group();
@@ -1155,79 +1250,164 @@ Features:
      const char *colorStr = colorList.first();
      const char *iconStr = iconList.first();
  
 -    KIconLoader *ldr = KGlobal::iconLoader();
 +//    KIconLoader *ldr = KGlobal::iconLoader();
      while(labelStr != NULL){
          QColor *c = new QColor;
          c->setNamedColor(QString(colorStr));
-@@ -3022,7 +2635,7 @@
+@@ -3022,7 +2656,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 +2650,6 @@
+@@ -3037,7 +2671,6 @@
          colorStr = colorList.next();
          iconStr = iconList.next();
      }
 -    config->setGroup(oldGrp);
  }
  
  void LiquidStyle::applyCustomAttributes(QPushButton *btn)
-@@ -3087,7 +2699,7 @@
+@@ -3087,7 +2720,7 @@
      }
  }
  
 -#include "liquid.moc"
 +// #include "liquid.moc"
  
  
  
-        --- -Mon Jul  1 11:38:05 2002
-        +++ plugin.cppFri Jun 28 13:25:25 2002
-@@ -1,29 +1,29 @@
+        --- -Mon Jul 15 02:34:13 2002
+        +++ plugin.cppFri Jul 12 00:41:40 2002
+@@ -1,29 +1,113 @@
  #include "liquid.h"
 -#include <klocale.h>
-+
++#include "liquidset.h"
++#include "plugin.h"
  
- extern "C" {
+-extern "C" {
 -    KStyle* allocate();
 -    int minor_version();
 -    int major_version();
 -    const char *description();
-+    QStyle* allocate ( );
-+    int minor_version ( );
-+    int major_version ( );
-+    const char *description ( );
++
++
++LiquidInterface::LiquidInterface ( ) :  ref ( 0 )
++{
++}
++    
++LiquidInterface::~LiquidInterface ( )
++{
++}
++        
++QStyle *LiquidInterface::create ( )
++{
+        +return new LiquidStyle ( );
++}
++
++QString LiquidInterface::name ( )
++{
+        +return QObject::tr( "Liquid", "name" );
  }
  
 -KStyle* allocate()
-+QStyle* allocate ( )
++QString LiquidInterface::description ( )
  {
 -    return(new LiquidStyle);
-+    return new LiquidStyle ( );
+        +return QObject::tr( "High Performance Liquid style by Mosfet", "description" );
  }
  
 -int minor_version()
-+int minor_version ( )
++QCString LiquidInterface::key ( )
  {
 -    return(0);
-+    return 0;
+        +return QCString ( "liquid" );
  }
  
 -int major_version()
-+int major_version ( )
++unsigned int LiquidInterface::version ( )
  {
 -    return(1);
-+    return 1;
+        +return 100; // 1.0.0 (\d+.\d.\d)
  }
  
 -const char *description()
-+const char *description ( )
++QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
++{
+        +static LiquidSettingsInterface *setiface = 0;
++
+        +*iface = 0;
+        +
+        +if ( uuid == IID_QUnknown )
+        +       *iface = this;
+        +else if ( uuid == IID_Style )
+        +       *iface = this;
+        +else if ( uuid == IID_StyleSettings ) {
+        +       if ( !setiface )
+        +               setiface = new LiquidSettingsInterface ( );
+        +       *iface = setiface;
+        +}
+        +
+        +if ( *iface )
+        +       (*iface)-> addRef ( );
+        +       
+        +return QS_OK;
++}
++
++Q_EXPORT_INTERFACE()
++{
+        +Q_CREATE_INSTANCE( LiquidInterface )
++}
++
++
++LiquidSettingsInterface::LiquidSettingsInterface ( ) :  ref ( 0 )
  {
 -    return(i18n("High performance liquid plugin").utf8());
-+    return "High Performance Liquid";
+        +m_widget = 0;
  }
++    
++LiquidSettingsInterface::~LiquidSettingsInterface ( )
++{
++}
++        
++QWidget *LiquidSettingsInterface::create ( QWidget *parent, const char *name )
++{
+        +m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" );
+        +       
+        +return m_widget;
++}
++
++bool LiquidSettingsInterface::accept ( )
++{
+        +if ( !m_widget )
+        +       return false;
++
+        +return m_widget-> writeConfig ( );
++}
++
++void LiquidSettingsInterface::reject ( )
++{
++}
++
++QRESULT LiquidSettingsInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
++{
+        +*iface = 0;
+        +
+        +
+        +if ( uuid == IID_QUnknown )
+        +       *iface = this;
+        +else if ( uuid == IID_StyleSettings )
+        +       *iface = this;
+        +
+        +if ( *iface )
+        +       (*iface)-> addRef ( );
+        +       
+        +return QS_OK;
++}
++
++// Hack for Retail Z experiments
++extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } }