Optimized Liquid for handhelds:

 - removed some dead code from the original liquid
 - removed all code related to mouse-hover
 - rewrote QToolButton drawing, so navigating toolbars with Menu/Direction
   keys looks nicer
 - changed the way focus indicators are drawn on many widgets
 - support for libqte's with version < 2.3.4

4 files changed, 1076 insertions, 603 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 6812d16..ba732aa 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1,65 +1,69 @@
 /*-
  * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
  */
 
+//
+// (c) 2002 Robert 'sandman' Griebl 
+//
 
 
 #ifndef INCLUDE_MENUITEM_DEF
 #define INCLUDE_MENUITEM_DEF
 #endif
 
 #include <qmenudata.h>
 #include "liquid.h"
 //#include "liquiddeco.h"
 #include <qapplication.h>
 #include <qpe/config.h>
 #include "effects.h"
 #include <qpalette.h>
 #include <qbitmap.h>
 #include <qtabbar.h>
 #include <qpopupmenu.h>
 #include <qobjectlist.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include <qpixmapcache.h>
 #include <qradiobutton.h>
 #include <qcombobox.h>
 #include <qdrawutil.h>
 #include <qwidgetlist.h>
 #include <qtoolbutton.h>
 #include <qheader.h>
 #include <unistd.h>
 #include <qmenubar.h>
 #include <qprogressbar.h>
+#include <qlineedit.h>
 
 #include <stdio.h>
 
 #include "htmlmasks.h"
 #include "embeddata.h"
 
 typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
                           QColorGroup &, bool, bool);
 
 QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
 
 void TransMenuHandler::stripePixmap(QPixmap &pix, const QColor &color)
 {
     QImage img(pix.convertToImage());
     QImageEffect::fade(img, 0.9, color);
     int x, y;
     int r, g, b;
     for(y=0; y < img.height(); y+=3){
         unsigned int *data = (unsigned int  *) img.scanLine(y);
         for(x=0; x < img.width(); ++x){
             r = qRed(data[x]);
             g = qGreen(data[x]);
             b = qBlue(data[x]);
             if(r-10)
                 r-=10;
             if(g-10)
                 g-=10;
             if(b-10)
                 b-=10;
             data[x] = qRgb(r, g, b);
         }
     }
@@ -133,87 +137,91 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
             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;
         }
     }
     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());
             if ( !p->inherits("QPopupMenu")) 
                 p->setBackgroundMode(QWidget::PaletteBackground);
 
           	QObjectList *ol = p-> queryList("QWidget");
 			for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
 				QWidget *wid = (QWidget *) it.current ( );
 				
 				wid-> setBackgroundMode( QWidget::PaletteBackground );
             }
 			delete ol;
         }
     }
     return(false);
 }
 
 
+static int qt_version ( )
+{
+	const char *qver = qVersion ( );
+	return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
+}
+        
+
 LiquidStyle::LiquidStyle()
     :QWindowsStyle()
 {
     setName ( "LiquidStyle" );
 
+	oldqte = ( qt_version ( ) < 234 );
 	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);
     bevelFillDict.setAutoDelete(true);
     smallBevelFillDict.setAutoDelete(true);
-    customBtnColorList.setAutoDelete(true);
-    customBtnIconList.setAutoDelete(true);
-    customBtnLabelList.setAutoDelete(true);
 
     rMatrix.rotate(270.0);
-    highcolor = QPixmap::defaultDepth() > 8;
     btnBorderPix = new QPixmap;
     btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
     btnBlendPix = new QPixmap;
     btnBlendPix->convertFromImage(qembed_findImage("buttonborder"));
     bevelFillPix = new QPixmap;
     bevelFillPix->convertFromImage(qembed_findImage("clear_fill_large"));
     smallBevelFillPix = new QPixmap;
     smallBevelFillPix->convertFromImage(qembed_findImage("clear_fill_small"));
     // new stuff
     vsbSliderFillPix = menuPix = NULL;
     menuHandler = new TransMenuHandler(this);
     setScrollBarExtent(15, 15);
     int i;
     for(i=0; i < BITMAP_ITEMS; ++i){
         pixmaps[i] = NULL;
     }
     oldSliderThickness = sliderThickness();
     setSliderThickness(11);
 }
 
 LiquidStyle::~LiquidStyle()
 {
     if(btnBorderPix)
         delete btnBorderPix;
     if(btnBlendPix)
         delete btnBlendPix;
     if(bevelFillPix)
         delete bevelFillPix;
     if(smallBevelFillPix)
         delete smallBevelFillPix;
     if(vsbSliderFillPix)
         delete vsbSliderFillPix;
@@ -515,425 +523,369 @@ QPixmap* LiquidStyle::processEmbedded(const char *label, int h, int s, int v,
         if(blend && alpha != 255 && alpha != 0){
             float srcPercent = ((float)alpha)/255.0;
             float destPercent = 1.0-srcPercent;
             oldH = (int)((srcPercent*h) + (destPercent*bH));
             oldS = (int)((srcPercent*s) + (destPercent*bS));
             oldV = (int)((srcPercent*oldV) + (destPercent*bV));
             c.setHsv(oldH, oldS, oldV);
             alpha = 255;
         }
         data[current] = qRgba(c.red(), c.green(), c.blue(), alpha);
     }
     QPixmap *pix = new QPixmap;
     pix->convertFromImage(img);
     return(pix);
 }
 
 
 
 
 QPixmap* LiquidStyle::getPixmap(BitmapData item)
 {
 
     if(pixmaps[item])
         return(pixmaps[item]);
 
     switch(item){
     case HTMLBtnBorder:
         pixmaps[HTMLBtnBorder] = processEmbedded("htmlbtnborder", btnH, btnS, btnV);
         break;
     case HTMLBtnBorderDown:
         pixmaps[HTMLBtnBorderDown] = processEmbedded("htmlbtnborder", btnHoverH, btnHoverS, btnHoverV);
         break;
+
     case HTMLCB:
         pixmaps[HTMLCB] = processEmbedded("htmlcheckbox", bH, bS, bV);
         break;
+    case HTMLCBHover:
+        pixmaps[HTMLCBHover] = processEmbedded("htmlcheckbox", btnHoverH, btnHoverS, btnHoverV);
+        break;
     case HTMLCBDown:
         pixmaps[HTMLCBDown] = processEmbedded("htmlcheckboxdown", btnH, btnS, btnV);
         break;
-    case HTMLCBHover:
-        pixmaps[HTMLCBHover] = processEmbedded("htmlcheckbox", btnH, btnS, btnV);
-        break;
     case HTMLCBDownHover:
-        pixmaps[HTMLCBDownHover] = processEmbedded("htmlcheckboxdown",
-                                                   btnHoverH, btnHoverS,
-                                                   btnHoverV);
+        pixmaps[HTMLCBDownHover] = processEmbedded("htmlcheckboxdown", btnHoverH, btnHoverS, btnHoverV);
         break;
+
     case HTMLRadio:
         pixmaps[HTMLRadio] = processEmbedded("htmlradio", bH, bS, bV);
+		break;
+    case HTMLRadioHover:
+        pixmaps[HTMLRadioHover] = processEmbedded("htmlradio", btnHoverH, btnHoverS, btnHoverV);
+		break;
     case HTMLRadioDown:
         pixmaps[HTMLRadioDown] = processEmbedded("htmlradiodown", btnH, btnS, btnV);
-    case HTMLRadioHover:
-        pixmaps[HTMLRadioHover] = processEmbedded("htmlradio", btnH, btnS, btnV);
+		break;
     case HTMLRadioDownHover:
-        pixmaps[HTMLRadioDownHover] = processEmbedded("htmlradiodown", 
-                                                      btnHoverH, btnHoverS,
-                                                      btnHoverV);
+        pixmaps[HTMLRadioDownHover] = processEmbedded("htmlradiodown", btnHoverH, btnHoverS, btnHoverV);
+		break;
+
+    case RadioOff:
+        pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV /*, true*/);
+        break;
+    case RadioOffHover:
+        pixmaps[RadioOffHover] = processEmbedded("radio", btnHoverH, btnHoverS, btnHoverV /*, true*/);
+        break;
     case RadioOn:
-        pixmaps[RadioOn] = processEmbedded("radio_down", btnH, btnS, btnV, true);
+        pixmaps[RadioOn] = processEmbedded("radio_down", btnH, btnS, btnV /*, true*/);
         break;
     case RadioOnHover:
-        pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS,
-                                                btnHoverV, true);
+        pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
-    case RadioOffHover:
-        pixmaps[RadioOffHover] = processEmbedded("radio", btnH, btnS, btnV, true);
+
+    case Tab:
+        pixmaps[Tab] = processEmbedded("tab", bH, bS, bV /*, true*/);
         break;
     case TabDown:
-        pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV, true);
+        pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV /*, true*/);
         break;
     case TabFocus:
-        pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS,
-                                            btnHoverS, true);
+        pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
-    case CBDown:
-        pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV, true);
-        break;
-    case CBDownHover:
-        pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH,
-                                               btnHoverS, btnHoverV, true);
+
+	case CB:
+        pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV /*, true*/);
         break;
     case CBHover:
-        pixmaps[CBHover] = processEmbedded("checkbox", btnH, btnS, btnV, true);
+        pixmaps[CBHover] = processEmbedded("checkbox", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
-    case HSlider:
-        pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
+    case CBDown:
+        pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/);
         break;
+    case CBDownHover:
+        pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/);
+        break;
+
     case VSlider:
         pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
         *pixmaps[VSlider] = pixmaps[VSlider]->xForm(rMatrix);
         break;
-    case RadioOff:
-        pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV, true);
-        break;
-    case Tab:
-        pixmaps[Tab] = processEmbedded("tab", bH, bS, bV, true);
-        break;
-    case CB:
-        pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV, true);
-        break;
     case VSBSliderTop:
-        pixmaps[VSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
+    case VSBSliderTopHover:
+        pixmaps[item] = processEmbedded("sbslider_top", btnH, btnS, btnV /*, true*/);
         break;
     case VSBSliderBtm:
-        pixmaps[VSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
+    case VSBSliderBtmHover:
+        pixmaps[item] = processEmbedded("sbslider_btm", btnH, btnS, btnV /*, true*/);
         break;
     case VSBSliderMid:
-        pixmaps[VSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
+    case VSBSliderMidHover:
+        pixmaps[item] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
         break;
-    case VSBSliderTopHover:
-        pixmaps[VSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
+	case VSBSliderTopBg:
+        pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV /*, true*/);
         break;
-    case VSBSliderBtmHover:
-        pixmaps[VSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
+    case VSBSliderBtmBg:
+        pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV /*, true*/);
         break;
-    case VSBSliderMidHover:
-        pixmaps[VSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
+    case VSBSliderMidBg:
+        pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
         break;
 
-    case HSBSliderTop:
-        pixmaps[HSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
-        *pixmaps[HSBSliderTop] = pixmaps[HSBSliderTop]->xForm(rMatrix);
-        break;
-    case HSBSliderBtm:
-        pixmaps[HSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
-        *pixmaps[HSBSliderBtm] = pixmaps[HSBSliderBtm]->xForm(rMatrix);
-        break;
-    case HSBSliderMid:
-        pixmaps[HSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
-        *pixmaps[HSBSliderMid] = pixmaps[HSBSliderMid]->xForm(rMatrix);
+	case HSlider:
+        pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV /*, true*/);
         break;
+    case HSBSliderTop:
     case HSBSliderTopHover:
-        pixmaps[HSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
-        *pixmaps[HSBSliderTopHover] = pixmaps[HSBSliderTopHover]->xForm(rMatrix);
+        pixmaps[item] = processEmbedded("sbslider_top", btnH, btnS, btnV, true );
+        *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
         break;
+    case HSBSliderBtm:
     case HSBSliderBtmHover:
-        pixmaps[HSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
-        *pixmaps[HSBSliderBtmHover] = pixmaps[HSBSliderBtmHover]->xForm(rMatrix);
+        pixmaps[item] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true );
+        *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
         break;
+    case HSBSliderMid:
     case HSBSliderMidHover:
-        pixmaps[HSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
-        *pixmaps[HSBSliderMidHover] = pixmaps[HSBSliderMidHover]->xForm(rMatrix);
-        break;
-    case VSBSliderTopBg:
-        pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
-        break;
-    case VSBSliderBtmBg:
-        pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
-        break;
-    case VSBSliderMidBg:
-        pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
+        pixmaps[item] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
+        *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
         break;
     case HSBSliderTopBg:
         pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
         *pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix);
         break;
     case HSBSliderBtmBg:
         pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
         *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
         break;
     case HSBSliderMidBg:
         pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
         *pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix);
         break;
     default:
         break;
     }
     return(pixmaps[item]);
 }
 
 void LiquidStyle::polish(QPalette &appPal)
 {
     int i;
     for(i=0; i < BITMAP_ITEMS; ++i){
         if(pixmaps[i]){
             delete pixmaps[i];
             pixmaps[i] = NULL;
         }
     }
-    QWidgetList *list = QApplication::allWidgets();
-    QWidgetListIt it( *list );
-    QWidget *w;
-    while ((w=it.current()) != 0 ){
-        ++it;
-        if(w->inherits("QPushButton")){
-            unapplyCustomAttributes((QPushButton *)w);
-        }
-    }
-
-    loadCustomButtons();
     lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
     btnDict.clear();
     btnBorderDict.clear();
     bevelFillDict.clear();
     smallBevelFillDict.clear();
 
     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 ( "Appearance" );
-    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 ( ))) 
-             ) {
+    QColor c = oldqte ? QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))) 
+                      : appPal. color ( QPalette::Active, QColorGroup::Button );
+    if ( c == ( oldqte ?  QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))
+                       : appPal. color ( QPalette::Active, QColorGroup::Background ))) {
         // force button color to be different from background
         QBrush btnBrush(QColor(200, 202, 228));
         appPal.setBrush(QColorGroup::Button, btnBrush);
     }
     c.hsv(&btnH, &btnS, &btnV);
     c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV);
 
     // menu pixmap
     if(!menuPix){
         menuPix = new QPixmap;
         menuPix->resize(64, 64);
     }
     QPainter painter;
     menuPix->fill(c.rgb());
     painter.begin(menuPix);
     painter.setPen(c.dark(105));
     for(i=0; i < 63; i+=4){
         painter.drawLine(0, i, 63, i);
         painter.drawLine(0, i+1, 63, i+1);
     };
     painter.end();
     menuBrush.setColor(c);
     menuBrush.setPixmap(*menuPix);
 
     // pager brush
     c = c.dark(120);
     QPixmap *pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
     if(!pix){
         int h, s, v;
         c.hsv(&h, &s, &v);
         pix = new QPixmap(*smallBevelFillPix);
         adjustHSV(*pix, h, s, v);
         smallBevelFillDict.insert(c.rgb(), pix);
     }
-    pagerHoverBrush.setColor(c);
-    pagerHoverBrush.setPixmap(*pix);
+//    pagerHoverBrush.setColor(c);
+//    pagerHoverBrush.setPixmap(*pix);
 
     c = c.dark(120);
     pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
     if(!pix){
         int h, s, v;
         c.hsv(&h, &s, &v);
         pix = new QPixmap(*smallBevelFillPix);
         adjustHSV(*pix, h, s, v);
         smallBevelFillDict.insert(c.rgb(), pix);
     }
-    pagerBrush.setColor(c);
-    pagerBrush.setPixmap(*pix);
+//    pagerBrush.setColor(c);
+//    pagerBrush.setPixmap(*pix);
 
     // background color stuff
-    c = /*QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background );
+    c = oldqte ? 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);
 
     // FIXME?
     if(vsbSliderFillPix)
         delete vsbSliderFillPix;
     vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix));
     adjustHSV(*vsbSliderFillPix, bH, bS, bV);
 
     // background brush
     QPixmap wallPaper(32, 32);
     wallPaper.fill(c.rgb());
     painter.begin(&wallPaper);
     for(i=0; i < 32; i+=4){
         painter.setPen(c.dark(100 + contrast));
         painter.drawLine(0, i, 32, i);
         painter.setPen(c.dark(100 + 3 * contrast / 5 ) );
         painter.drawLine(0, i+1, 32, i+1);
     };
     painter.end();
     bgBrush.setColor(c);
     bgBrush.setPixmap(wallPaper);
     appPal.setBrush(QColorGroup::Background, bgBrush);
-
-    // lineedits
-    c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base );
-    QPixmap basePix;
-    basePix.resize(32, 32);
-    basePix.fill(c.rgb());
-    painter.begin(&basePix);
-    painter.setPen(c.dark(105));
-    for(i=0; i < 32; i+=4){
-        painter.drawLine(0, i, 32, i);
-        painter.drawLine(0, i+1, 32, i+1);
-    };
-    painter.end();
-    baseBrush.setColor(c);
-    baseBrush.setPixmap(basePix);
-    it.toFirst();
-    while ((w=it.current()) != 0 ){
-        ++it;
-        if(w->inherits("QLineEdit")){
-            QPalette pal = w->palette();
-            pal.setBrush(QColorGroup::Base, baseBrush);
-            w->setPalette(pal);
-        }
-        else if(w->inherits("QPushButton")){
-            applyCustomAttributes((QPushButton *)w);
-        }
-    }
 }
 
 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") && 
             ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) {
     	w->installEventFilter(menuHandler);
     }
     
     if(w->isTopLevel()){
         return;
     }
    
-    if(w->inherits("QComboBox") || w->inherits("QProgressBar") ||
-       w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
-       w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
-        w->installEventFilter(this);
-    }
-    if(w->inherits("QLineEdit")){
-        QPalette pal = w->palette();
-        pal.setBrush(QColorGroup::Base, baseBrush);
-        w->setPalette(pal);
-    }
-    if(w->inherits("QPushButton")){
-        applyCustomAttributes((QPushButton *)w);
+    if(w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
         w->installEventFilter(this);
     }
+
     if(w->inherits("QButton") || w-> inherits("QComboBox")){
     	w-> setBackgroundMode ( QWidget::PaletteBackground );
     	w->setBackgroundOrigin ( QWidget::ParentOrigin);
     }
 
     bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
         qstrcmp(w->name(), "qt_clipped_viewport") == 0;
     bool isViewportChild = w->parent() &&
         ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
          (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
 
     if(isViewport && w->parent() && qstrcmp(w->parent()->name(), "proxyview") == 0){
         w->setBackgroundMode(QWidget::X11ParentRelative);
         return;
     }
     if(isViewportChild){
         if(w->inherits("QButton") || w->inherits("QComboBox")){
             if(w->parent()){ // heh, only way to test for KHTML children ;-)
                 if(w->parent()->parent()){
                     if(w->parent()->parent()->parent() &&
                        w->parent()->parent()->parent()->inherits("KHTMLView")){
                         w->setAutoMask(true);
                         w->setBackgroundMode(QWidget::NoBackground);
                     }
                 }
             }
             return;
         }
     }
     if(w->inherits("QHeader")){
         w->setMouseTracking(true);
         w->installEventFilter(this);
     }
-    if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) {
+    if(w-> inherits("QToolButton")) {
+        if (w->parent()->inherits("QToolBar")) {
     	((QToolButton*)w)->setAutoRaise (flatTBButtons);
     	if ( flatTBButtons )
     		w->setBackgroundOrigin(QWidget::ParentOrigin);
     }
+    	w-> installEventFilter ( this );
+    }
     if(w-> inherits("QToolBarSeparator")&&w->parent()->inherits("QToolBar")) {
     	((QFrame *) w)-> setFrameShape ( QFrame::NoFrame );
     }
     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());
         return;
     }
     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(w->parentWidget()->backgroundMode( )/*QWidget::X11ParentRelative*/);
             w->setBackgroundOrigin(QWidget::ParentOrigin);
 //			w->setBackgroundMode(QWidget::NoBackground);
         }
     }
     if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
 	    w-> setBackgroundOrigin ( QWidget::ParentOrigin );	    
 	else if ( w-> inherits("QFrame") )
 	    w->setBackgroundOrigin ( QWidget::WidgetOrigin );
 
 	if ( w->parentWidget()->inherits ( "QWidgetStack" )) {
 	    w->setBackgroundOrigin ( QWidget::WidgetOrigin );
 	}
 }
 
 void LiquidStyle::unPolish(QWidget *w)
@@ -942,83 +894,80 @@ void LiquidStyle::unPolish(QWidget *w)
         ((QFrame *)w)->setLineWidth(1);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
 
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::PaletteButton);
     else if(w-> testWFlags(Qt::WType_Popup) && 
             !w->inherits("QListBox") &&
             ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) {
     	w->removeEventFilter(menuHandler);
     }
 
     if(w->isTopLevel())
         return;
 
     // for viewport children, don't just check for NoBackground....
     bool isViewportChild = w->parent() &&
         ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
          (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
 
     w->unsetPalette();
     if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
         if(w->inherits("QPushButton"))
             w->setBackgroundMode(QWidget::PaletteButton);
         else
             w->setBackgroundMode(QWidget::PaletteBackground);
     }
 
     if(isViewportChild)
         w->setAutoMask(false);
 
-    if(w->inherits("QPushButton")){
-        unapplyCustomAttributes((QPushButton *)w);
-        w->removeEventFilter(this);
-    }
 /*
     if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
     	w-> setBackgroundMode ( PaletteBackground );
     }
 */
-    if(w->inherits("QComboBox") ||
-       w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
-       w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
+    if( w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
         w->removeEventFilter(this);
     }
     if(w->inherits("QButton") || w->inherits("QComboBox")){
         if(w->parent() && w->parent()->inherits("KHTMLPart")){
             w->setAutoMask(false);
         }
     }
+    if(w-> inherits("QToolButton")) {
+    	w-> removeEventFilter ( this );
+    }
     if(w->inherits("QToolBar")){
         w->removeEventFilter(this);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
     if(w->inherits("QHeader")){
         w->setMouseTracking(false);
         w->removeEventFilter(this);
     }
 }
 
 void LiquidStyle::polish(QApplication *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);
     
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
     
 //    if ( config. readBoolEntry ( "WinDecoration", true ))	
 //	    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
 	    
 	flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
 }
@@ -1066,238 +1015,182 @@ public:
 			int x, y, w, h;
 			contentsRect ( ). rect ( &x, &y, &w, &h );
 
 			int prog = progress ( );
 			int total = totalSteps ( );
 			if ( prog < 0 )
 				prog = 0;
 			if ( total <= 0 )
 				total = 1;
 			int bw = w * prog / total;
 			if ( bw > w )
 				bw = w;
 
 			p.setPen(g.button().dark(130));
 			p.drawRect(x, y, bw, h);
 			p.setPen(g.button().light(120));
 			p.drawRect(x+1, y+1, bw-2, h-2);
 
 			if(bw >= 4 && h >= 4 && pix)
 				p.drawTiledPixmap(x+2, y+2, bw-4, h-4, *pix);
 			
 			if ( progress ( )>= 0 && totalSteps ( ) > 0 ) {			
 				QString pstr;
 				pstr. sprintf ( "%d%%", 100 * progress()/totalSteps ());
 				p. setPen ( g.text());//g.highlightedText ( ));
 				p. drawText (x,y,w-1,h-1,AlignCenter,pstr);
 			}
 		}
 	}
 };
 
 
+/*
+ * The same for QToolButton:
+ * TT hardcoded the drawing of the focus rect ...
+ *
+ * - sandman
+ */
+
+
+class HackToolButton : public QToolButton {
+public:
+	HackToolButton ( );
+	
+	void paint ( QPaintEvent *ev )
+	{
+		erase ( ev-> region ( ));
+		QPainter p ( this );
+		style ( ). drawToolButton ( this, &p );
+		drawButtonLabel ( &p );
+	}
+};
 
 /*
  * This is a fun method ;-) Here's an overview. KToolBar grabs resize to
  * force everything to erase and repaint on resize. This is going away, I'm
  * trying to get shaped widgets to work right without masking. QPushButton,
  * QComboBox, and Panel applet handles capture mouse enter and leaves in order
  * to set the highlightwidget and repaint for mouse hovers. CheckBoxes and
  * RadioButtons need to do this differently. Qt buffers these in pixmaps and
  * caches them in QPixmapCache, which is bad for doing things like hover
  * because the style methods aren't called in paintEvents if everything
  * is cached. We use our own Paint event handler instead. Taskbuttons and
  * pager buttons draw into a pixmap buffer, so we handle those with palette
  * modifications. For QHeader, different header items are actually one widget
  * that draws multiple items, so we need to check which ID is hightlighted
  * and draw it. Finally, we also check enter and leave events for QLineEdit,
  * since if it's inside a combobox we want to highlight the combobox during
  * hovering in the edit.
  */
 bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
 {
     if(obj->inherits("QToolBar")){
         if(ev->type() == QEvent::Resize){
             const QObjectList *tbChildList = obj->children();
             QObjectListIt it(*tbChildList);
             QObject *child;
             while((child = it.current()) != NULL){
                 ++it;
                 if(child->isWidgetType())
                     ((QWidget *)child)->repaint(true);
             }
 
         }
     }
-    else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
-        QWidget *btn = (QWidget *)obj;
-        if(ev->type() == QEvent::Enter){
-            if(btn->isEnabled()){
-                highlightWidget = btn;
-                btn->repaint(false);
-            }
-        }
-        else if(ev->type() == QEvent::Leave){
-            if(btn == highlightWidget){
-                highlightWidget = NULL;
-                btn->repaint(false);
-            }
-        }
-    }
     else if(obj->inherits("QToolButton")){
-        QToolButton *btn = (QToolButton *)btn;
-        if(!btn->autoRaise()){
+        QToolButton *btn = (QToolButton *)obj;
+        if(ev->type() == QEvent::FocusIn ){ // && !btn-> autoRaise () 
             if(btn->isEnabled()){
                 highlightWidget = btn;
                 btn->repaint(false);
+                
+	        	qDebug ( "TB FOCUS IN [%p]", btn );
             }
         }
-        else if(ev->type() == QEvent::Leave){
-            QWidget *btn = (QWidget *)obj;
+        else if(ev->type() == QEvent::FocusOut ){
             if(btn == highlightWidget){
                 highlightWidget = NULL;
                 btn->repaint(false);
+                
+                qDebug ( "TB FOCUS OUT [%p]", btn );
             }
         }
-        else
-            highlightWidget = NULL;
-    }
-    else if(obj->inherits("QScrollBar")){
-        QScrollBar *sb = (QScrollBar *)obj;
-        if(ev->type() == QEvent::Enter){
-            if(sb->isEnabled()){
-                highlightWidget = sb;
-                sb->repaint(false);
-            }
-        }
-        else if(ev->type() == QEvent::Leave){
-            if(sb == highlightWidget && !sb->draggingSlider()){
-                highlightWidget = NULL;
-                sb->repaint(false);
-            }
-        }
-        else if(ev->type() == QEvent::MouseButtonRelease){
-            QMouseEvent *me = (QMouseEvent *)ev;
-            if(sb == highlightWidget && !sb->rect().contains(me->pos())){
-                highlightWidget = NULL;
-                sb->repaint(false);
-            }
-        }
-    }
-    else if(obj->inherits("QLineEdit")){
-        if(obj->parent() && obj->parent()->inherits("QComboBox")){
-            QWidget *btn = (QComboBox *)obj->parent();
-            if(ev->type() == QEvent::Enter){
-                if (btn->isEnabled()){
-                    highlightWidget = btn;
-                    btn->repaint(false);
-                }
-            }
-            else if(ev->type() == QEvent::Leave){
-                if (btn == highlightWidget)
-                    highlightWidget = NULL;
-                btn->repaint(false);
-            }
+        else if(ev->type() == QEvent::Paint) {
+        	(( HackToolButton *) btn )-> paint ((QPaintEvent *) ev );
+        	return true;
         }
     }
     else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){
         QButton *btn = (QButton *)obj;
         bool isRadio = obj->inherits("QRadioButton");
         if(ev->type() == QEvent::Paint){
             //if(btn->autoMask())
             btn->erase();
             QPainter p;
             p.begin(btn);
             QFontMetrics fm = btn->fontMetrics();
             QSize lsz = fm.size(ShowPrefix, btn->text());
             QSize sz = isRadio ? exclusiveIndicatorSize()
                 : indicatorSize();
 
+/*
             if(btn->hasFocus()){
                 QRect r = QRect(0, 0, btn->width(), btn->height());
                 p.setPen(btn->colorGroup().button().dark(140));
                 p.drawLine(r.x()+1, r.y(), r.right()-1, r.y());
                 p.drawLine(r.x(), r.y()+1, r.x(), r.bottom()-1);
                 p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
                 p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
             }
+*/
             int x = 0;
             int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
             if(isRadio)
                 drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
                                        btn->colorGroup(), btn->isOn(),
                                        btn->isDown(), btn->isEnabled());
             else
                 drawIndicator(&p, x, y, sz.width(), sz.height(),
                               btn->colorGroup(), btn->state(), btn->isDown(),
                               btn->isEnabled());
             x = sz.width() + 6;
             y = 0;
             drawItem(&p, sz.width()+6+1, 0, btn->width()-(sz.width()+6+1),
                      btn->height(), AlignLeft|AlignVCenter|ShowPrefix,
                      btn->colorGroup(), btn->isEnabled(),
                      btn->pixmap(), btn->text());
             p.end();
             return(true);
         }
-        // for hover, just redraw the indicator (not the text)
-        else if((ev->type() == QEvent::Enter && btn->isEnabled()) ||
-                (ev->type() == QEvent::Leave && btn == highlightWidget)){
-            QButton *btn = (QButton *)obj;
-            bool isRadio = obj->inherits("QRadioButton");
-
-            if(ev->type() == QEvent::Enter)
-                highlightWidget = btn;
-            else 
-                highlightWidget = NULL;
-            QFontMetrics fm = btn->fontMetrics();
-            QSize lsz = fm.size(ShowPrefix, btn->text());
-            QSize sz = isRadio ? exclusiveIndicatorSize()
-                : indicatorSize();
-            int x = 0;
-            int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
-            //if(btn->autoMask())
-            //    btn->erase(x+1, y+1, sz.width()-2, sz.height()-2);
-            QPainter p;
-            p.begin(btn);
-            if(isRadio)
-                drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
-                                       btn->colorGroup(), btn->isOn(),
-                                       btn->isDown(), btn->isEnabled());
-            else
-                drawIndicator(&p, x, y, sz.width(), sz.height(),
-                              btn->colorGroup(), btn->state(), btn->isDown(),
-                              btn->isEnabled());
-            p.end();
-        }
     }
     else if(obj->inherits("QHeader")){
         QHeader *hw = (QHeader *)obj;
         if(ev->type() == QEvent::Enter){
             currentHeader = hw;
             headerHoverID = -1;
         }
         else if(ev->type() == QEvent::Leave){
             currentHeader = NULL;
             if(headerHoverID != -1){
                 hw->repaint(hw->sectionPos(headerHoverID), 0,
                             hw->sectionSize(headerHoverID), hw->height());
             }
             headerHoverID = -1;
         }
         else if(ev->type() == QEvent::MouseMove){
             QMouseEvent *me = (QMouseEvent *)ev;
             int oldHeader = headerHoverID;
             headerHoverID = hw->sectionAt(me->x());
             if(oldHeader != headerHoverID){
                 // reset old header
                 if(oldHeader != -1){
                     hw->repaint(hw->sectionPos(oldHeader), 0,
                                 hw->sectionSize(oldHeader), hw->height());
                 }
                 if(headerHoverID != -1){
                     hw->repaint(hw->sectionPos(headerHoverID), 0,
                                 hw->sectionSize(headerHoverID), hw->height());
                 }
             }
         }
     }
@@ -1324,66 +1217,69 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
 void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h,
                          const QColorGroup &g, bool sunken,
                          const QBrush *)
 {
     drawRoundButton(p, sunken ? g.background() : g.button(), g.background(),
                     x, y, w, h);
 }
 
 void LiquidStyle::drawToolButton(QPainter *p, int x, int y, int w, int h,
                                  const QColorGroup &g, bool sunken,
                                  const QBrush *)
 {
     if(p->device()->devType() != QInternal::Widget){
         // drawing into a temp pixmap, don't use mask
         QColor c = sunken ? g.button() : g.background();
         p->setPen(c.dark(130));
         p->drawRect(x, y, w, h);
         p->setPen(c.light(105));
         p->drawRect(x+1, y+1, w-2, h-2);
 
 
         // fill
         QPixmap *pix = bevelFillDict.find(c.rgb());
         if(!pix){
             int h, s, v;
             c.hsv(&h, &s, &v);
             pix = new QPixmap(*bevelFillPix);
             adjustHSV(*pix, h, s, v);
             bevelFillDict.insert(c.rgb(), pix);
         }
 
         p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
+        qDebug ( "DRAW TOOLBUTTON IN PIXMAP" );
     }
     else{
+    	qDebug ( "DRAW TOOLBUTTON sunken=%d/high=%p/device=%p", sunken, highlightWidget,p->device() );
+    
         drawClearBevel(p, x, y, w, h, sunken ? g.button() :
                        highlightWidget == p->device() ? g.button().light(110) :
                        g.background(), g.background());
     }
 }
 
 void LiquidStyle::drawPushButton(QPushButton *btn, QPainter *p)
 {
     QRect r = btn->rect();
     bool sunken = btn->isOn() || btn->isDown();
     QColorGroup g = btn->colorGroup();
 
 
     //int dw = buttonDefaultIndicatorWidth();
     if(btn->hasFocus() || btn->isDefault()){
         QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
         QPixmap *pix = bevelFillDict.find(c.rgb());
         if(!pix){
             int h, s, v;
             c.hsv(&h, &s, &v);
             pix = new QPixmap(*bevelFillPix);
             adjustHSV(*pix, h, s, v);
             bevelFillDict.insert(c.rgb(), pix);
         }
         p->setPen(c.dark(150));
         p->drawLine(r.x()+1, r.y(), r.right()-1, r.y());
         p->drawLine(r.x(), r.y()+1, r.x(), r.bottom()-1);
         p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
         p->drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
         p->drawTiledPixmap(r.x()+1, r.y()+1, r.width()-2, r.height()-2, *pix);
     }
 
@@ -1482,136 +1378,150 @@ void LiquidStyle::drawButtonMask(QPainter *p, int x, int y, int w, int h)
         // fills
         p->fillRect(10, 0, w-20, 10, Qt::color1); // top
         p->fillRect(10, y2-9, w-20, 10, Qt::color1); // bottom
         p->fillRect(0, 10, w, h-20, Qt::color1); // middle
     }
 }
 
 void LiquidStyle::drawBevelButton(QPainter *p, int x, int y, int w, int h,
                               const QColorGroup &g, bool sunken,
                               const QBrush */*fill*/)
 {
     if(currentHeader && p->device() == currentHeader){
         int id = currentHeader->sectionAt(x);
         bool isHeaderHover = id != -1 && id == headerHoverID;
         drawClearBevel(p, x, y, w, h, sunken ?
                        g.button() : isHeaderHover ? g.button().light(110) :
                        g.background(), g.background());
     }
     else
         drawClearBevel(p, x, y, w, h, sunken ? g.button() : g.background(),
                       g.background());
 }
 
 QRect LiquidStyle::buttonRect(int x, int y, int w, int h)
 {
     return(QRect(x+5, y+5, w-10, h-10));
 }
 
 void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h,
                                  const QColorGroup &g, bool sunken,
                                  bool edit, bool, const QBrush *)
 {
-    bool isHover = highlightWidget == painter->device();
+    bool isActive = false;
+    if (( painter->device()->devType() == QInternal::Widget ) &&
+        (
+         ( qApp-> focusWidget ( ) == painter-> device ( )) ||
+         (
+          edit &&
+          ((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) && 
+          ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( ))
+         )
+        )
+      ) {
+    	isActive = true;
+    }
+    	
     bool isMasked = false;
     if(painter->device()->devType() == QInternal::Widget)
         isMasked = ((QWidget*)painter->device())->autoMask();
     // TODO: Do custom code, don't just call drawRoundButton into a pixmap    
     QPixmap tmpPix(w, h);
     QPainter p(&tmpPix);
 
     drawRoundButton(&p, g.button(), g.background(), 0, 0, w, h, false,
                     sunken, false, isMasked);
-    if(!isHover){
+    if(!isActive){
         p.setClipRect(0, 0, w-17, h);
         drawRoundButton(&p, g.background(), g.background(), 0, 0, w, h, false,
                         sunken, false, isMasked);
     }
     p.end();
     int x2 = x+w-1;
     int y2 = y+h-1;
     int bx2 = btnMaskBmp.width()-1;
     int by2 = btnMaskBmp.height()-1;
     QBitmap btnMask(w, h);
     QBitmap *mask = isMasked ? &htmlBtnMaskBmp : &btnMaskBmp;
     p.begin(&btnMask);
     p.fillRect(0, 0, w, h, Qt::color0);
     p.drawPixmap(0, 0, *mask, 0, 0, 10, 10); // tl
     p.drawPixmap(x2-9, 0, *mask, bx2-9, 0, 10, 10); // tr
     p.drawPixmap(0, y2-9, *mask, 0, by2-9, 10, 10); // bl
     p.drawPixmap(x2-9, y2-9, *mask, bx2-9, by2-9, 10, 10); // br
     // fills
     p.fillRect(10, 0, w-20, 10, Qt::color1); // top
     p.fillRect(10, y2-9, w-20, 10, Qt::color1); // bottom
     p.fillRect(0, 10, w, h-20, Qt::color1); // middle
     p.end();
     tmpPix.setMask(btnMask);
 
     painter->drawPixmap(x, y, tmpPix);
 
     painter->setPen(g.button().dark(120));
     painter->drawLine(x2-16, y+1, x2-16, y2-1);
 
     if(edit){
         painter->setPen(g.mid());
         painter->drawRect(x+8, y+2, w-25, h-4);
     }
     int arrow_h = h / 3;
     int arrow_w = arrow_h;
     int arrow_x = w - arrow_w - 6;
     int arrow_y = (h - arrow_h) / 2;
     drawArrow(painter, DownArrow, false, arrow_x, arrow_y, arrow_w, arrow_h, g, true);
 }
 
 void LiquidStyle::drawComboButtonMask(QPainter *p, int x, int y, int w, int h)
 {
     drawButtonMask(p, x, y, w, h);
 }
 
 QRect LiquidStyle::comboButtonRect(int x, int y, int w, int h)
 {
     //return(QRect(x+3, y+3, w - (h / 3) - 13, h-6));
     return(QRect(x+9, y+3, w - (h / 3) - 20, h-6));
 }
 
-QRect LiquidStyle::comboButtonFocusRect(int x, int y, int w, int h)
+QRect LiquidStyle::comboButtonFocusRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/)
 {
-    return(QRect(x+5, y+3, w-(h/3)-13, h-5));
+	return QRect ( );
+	
+//    return(QRect(x+5, y+3, w-(h/3)-13, h-5));
 }
 
 void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
                                        int sliderStart, uint controls,
                                        uint activeControl)
 {
-    bool isHover = highlightWidget == p->device();
     int sliderMin, sliderMax, sliderLength, buttonDim;
     scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
 
     if (sliderStart > sliderMax)
         sliderStart = sliderMax;
 
     bool horiz = sb->orientation() == QScrollBar::Horizontal;
     QColorGroup g = sb->colorGroup();
     QRect addB, subHC, subB;
     QRect addPageR, subPageR, sliderR;
     int addX, addY, subX, subY;
     int len = horiz ? sb->width() : sb->height();
     int extent = horiz ? sb->height() : sb->width();
 
     // a few apps (ie: KSpread), are broken and use a hardcoded scrollbar
     // extent of 16. Luckily, most apps (ie: Kate), seem fixed by now.
     bool brokenApp;
     if(extent == 16)
         brokenApp = true;
     else
         brokenApp = false;
 
     if (horiz) {
         subY = addY = ( extent - buttonDim ) / 2;
         subX = 0;
         addX = len - buttonDim;
         if(sbBuffer.size() != sb->size())
             sbBuffer.resize(sb->size());
     }
     else {
         subX = addX = ( extent - buttonDim ) / 2;
         subY = 0;
@@ -1642,156 +1552,139 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
         sliderR .setRect( 0, sliderStart, sliderW, sliderLength );
     }
 
     bool maxed = sb->maxValue() == sb->minValue();
 
     QPainter painter;
     if(!horiz){
         painter.begin(&sbBuffer);
         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);
             painter.drawPixmap(bgR.x()+1, bgR.y(), *getPixmap(VSBSliderTopBg));
             painter.drawTiledPixmap(bgR.x()+1, bgR.y()+8, 13,
                                     bgR.height()-16, *getPixmap(VSBSliderMidBg));
             painter.drawPixmap(bgR.x()+1, bgR.bottom()-8, *vsbSliderFillPix,
                           0, 0, 13, 8);
             painter.drawPixmap(bgR.x()+1, bgR.bottom()-8, *getPixmap(VSBSliderBtmBg));
         }
         else{
             painter.drawTiledPixmap(bgR.x()+1, bgR.y(), 13, bgR.height(),
                                     *getPixmap(VSBSliderMidBg));
             painter.setPen(g.background().dark(210));
             painter.drawRect(bgR.x()+1, bgR.y(), 13, bgR.height()-1);
             painter.setPen(g.mid());
             painter.drawPoint(bgR.x()+1, bgR.y());
             painter.drawPoint(bgR.x()+13, bgR.y());
             painter.drawPoint(bgR.x()+1, bgR.bottom()-1);
             painter.drawPoint(bgR.x()+13, bgR.bottom()-1);
         }
         if(controls & Slider){
             if(sliderR.height() >= 16){
-                painter.drawPixmap(sliderR.x()+1, sliderR.y(),
-                                   isHover ? *getPixmap(VSBSliderTopHover):
-                                   *getPixmap(VSBSliderTop));
+                painter.drawPixmap(sliderR.x()+1, sliderR.y(), *getPixmap(VSBSliderTop));
                 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+8, 13,
-                                        sliderR.height()-16, isHover ?
-                                        *getPixmap(VSBSliderMidHover) :
-                                        *getPixmap(VSBSliderMid));
-                painter.drawPixmap(sliderR.x()+1, sliderR.bottom()-8,
-                                   isHover ? *getPixmap(VSBSliderBtmHover) :
-                                   *getPixmap(VSBSliderBtm));
+                                        sliderR.height()-16, *getPixmap(VSBSliderMid));
+                painter.drawPixmap(sliderR.x()+1, sliderR.bottom()-8, *getPixmap(VSBSliderBtm));
             }
             else if(sliderR.height() >= 8){
                 int m = sliderR.height()/2;
-                painter.drawPixmap(sliderR.x()+1, sliderR.y(),
-                                   isHover ? *getPixmap(VSBSliderTopHover):
-                                   *getPixmap(VSBSliderTop), 0, 0, 13, m);
-                painter.drawPixmap(sliderR.x()+1, sliderR.y()+m,
-                                   isHover ? *getPixmap(VSBSliderBtmHover):
-                                   *getPixmap(VSBSliderBtm), 0, 8-m, 13, m);
+                painter.drawPixmap(sliderR.x()+1, sliderR.y(), *getPixmap(VSBSliderTop), 0, 0, 13, m);
+                painter.drawPixmap(sliderR.x()+1, sliderR.y()+m, *getPixmap(VSBSliderBtm), 0, 8-m, 13, m);
             }
             else{
                 painter.setPen(g.button().dark(210));
                 drawRoundRect(&painter, sliderR.x()+1, sliderR.y(),
                               13, sliderR.height());
                 painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1,
                                         11, sliderR.height()-2,
-                                        isHover ? *getPixmap(VSBSliderMidHover) :
                                         *getPixmap(VSBSliderMid), 1, 0);
             }
         }
         painter.setPen(g.mid());
         painter.drawLine(bgR.x(), bgR.y(), bgR.x(), bgR.bottom());
         painter.drawLine(bgR.right(), bgR.y(), bgR.right(), bgR.bottom());
         if(brokenApp && (controls & Slider)){
             painter.setPen(g.background());
             painter.drawLine(bgR.right()-1, bgR.y(), bgR.right()-1,
                              bgR.bottom());
         }
         painter.end();
     }
     else{
         painter.begin(&sbBuffer);
         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);
             painter.drawPixmap(bgR.x(), bgR.y()+1, *getPixmap(HSBSliderTopBg));
             painter.drawTiledPixmap(bgR.x()+8, bgR.y()+1, bgR.width()-16,
                                     13, *getPixmap(HSBSliderMidBg));
             painter.drawPixmap(bgR.right()-8, bgR.y()+1, *vsbSliderFillPix,
                                0, 0, 8, 13);
             painter.drawPixmap(bgR.right()-8, bgR.y()+1, *getPixmap(HSBSliderBtmBg));
         }
         else{
             painter.drawTiledPixmap(bgR.x(), bgR.y()+1, bgR.width(), 13,
                                     *getPixmap(HSBSliderMidBg));
             painter.setPen(g.background().dark(210));
             painter.drawRect(bgR.x(), bgR.y()+1, bgR.width()-1, 13);
             painter.setPen(g.mid());
             painter.drawPoint(bgR.x(), bgR.y()+1);
             painter.drawPoint(bgR.x(), bgR.bottom()-1);
             painter.drawPoint(bgR.right()-1, bgR.y()+1);
             painter.drawPoint(bgR.right()-1, bgR.bottom()-1);
         }
         if(controls & Slider){
             if(sliderR.width() >= 16){
                 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
-                                   isHover ? *getPixmap(HSBSliderTopHover) :
                                    *getPixmap(HSBSliderTop));
                 painter.drawTiledPixmap(sliderR.x()+8, sliderR.y()+1, sliderR.width()-16,
-                                        13, isHover ? *getPixmap(HSBSliderMidHover) :
-                                        *getPixmap(HSBSliderMid));
-                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ?
-                                   *getPixmap(HSBSliderBtmHover) :
+                                        13, *getPixmap(HSBSliderMid));
+                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, 
                                    *getPixmap(HSBSliderBtm));
             }
             else if(sliderR.width() >= 8){
                 int m = sliderR.width()/2;
                 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
-                                   isHover ? *getPixmap(HSBSliderTopHover) :
                                    *getPixmap(HSBSliderTop), 0, 0, m, 13);
-                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ?
-                                   *getPixmap(HSBSliderBtmHover) :
+                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, 
                                    *getPixmap(HSBSliderBtm), 8-m, 0, m, 13);
             }
             else{
                 painter.setPen(g.button().dark(210));
                 drawRoundRect(&painter, sliderR.x(), sliderR.y()+1,
                               sliderR.width(), 13);
                 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2,
-                                        sliderR.width()-2, 11, isHover ?
-                                        *getPixmap(HSBSliderMidHover) :
+                                        sliderR.width()-2, 11, 
                                         *getPixmap(HSBSliderMid), 0, 1);
             }
         }
         painter.setPen(g.mid());
         painter.drawLine(bgR.x(), bgR.y(), bgR.right(), bgR.y());
         painter.drawLine(bgR.x(), bgR.bottom(), bgR.right(), bgR.bottom());
         if(brokenApp && (controls & Slider)){
             painter.setPen(g.background());
             painter.drawLine(bgR.x(), bgR.bottom()-1, bgR.right(),
                              bgR.bottom()-1);
         }
         painter.end();
     }
 
     if ( controls & AddLine ) {
         drawSBButton(p, addB, g, activeControl == AddLine);
         drawArrow( p, horiz ? RightArrow : DownArrow,
                    false, addB.x()+4, addB.y()+4,
                    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, subHC, g, activeControl == SubLine);
         drawArrow( p, horiz ? LeftArrow : UpArrow,
                    false, subHC.x()+4, subHC.y()+4,
                    subHC.width()-8, subHC.height()-8, g, !maxed);
     }
 
     if(controls & AddPage){
@@ -1912,139 +1805,139 @@ QStyle::ScrollControl LiquidStyle::scrollBarPointOver(const QScrollBar *sb,
 {
     if ( !sb->rect().contains( p ) )
         return NoScroll;
     int sliderMin, sliderMax, sliderLength, buttonDim, pos;
     scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
     pos = (sb->orientation() == QScrollBar::Horizontal)? p.x() : p.y();
     if ( pos < sliderMin )
 	return SubLine;
     if ( pos < sliderStart )
 	return SubPage;
     if ( pos < sliderStart + sliderLength )
         return Slider;
     if ( pos < sliderMax + sliderLength)
         return AddPage;
     if(pos > sliderMax + sliderLength + 16)
         return AddLine;
 
     return SubLine;
 }
 
 #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
 
 
 QSize LiquidStyle::exclusiveIndicatorSize() const
 {
     return(QSize(16, 16));
 }
 
 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();
+    bool isActive = ( p->device()->devType() == QInternal::Widget ) && ( qApp-> focusWidget ( ) == p-> device ( ));
     bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
         && ((QWidget*)p->device())->autoMask();
 
     if(isMasked){
         if(on || down){
-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioDownHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLRadioDownHover) :
                           *getPixmap(HTMLRadioDown));
         }
         else
-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLRadioHover) :
                           *getPixmap(HTMLRadio));
 
     }
     else{
         if(on || down){
-            p->drawPixmap(x, y, isHover ? *getPixmap(RadioOnHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(RadioOnHover) :
                           *getPixmap(RadioOn));
         }
         else
-            p->drawPixmap(x, y, isHover ? *getPixmap(RadioOffHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(RadioOffHover) :
                           *getPixmap(RadioOff));
     }
 }
 
 void LiquidStyle::drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w,
                                             int h, bool)
 {
     p->fillRect(x, y, w, h, Qt::color0);
     p->setPen(Qt::color1);
     p->drawPixmap(x, y, *getPixmap(RadioOn)->mask());
 }
 
 
 QSize LiquidStyle::indicatorSize() const
 {
     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)
 {
-    bool isHover = highlightWidget == p->device();
+    bool isActive = ( p->device()->devType() == QInternal::Widget ) && ( qApp-> focusWidget ( ) == p-> device ( ));
     bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
         && ((QWidget*)p->device())->autoMask();
     if(isMasked){
         if(state != QButton::Off){
-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBDownHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLCBDownHover) :
                           *getPixmap(HTMLCBDown));
         }
         else
-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLCBHover) :
                           *getPixmap(HTMLCB));
 
     }
     else{
         if(state != QButton::Off){
-            p->drawPixmap(x, y, isHover ? *getPixmap(CBDownHover) :
+            p->drawPixmap(x, y, isActive ? *getPixmap(CBDownHover) :
                           *getPixmap(CBDown));
             /*  Todo - tristate
              if(state == QButton::On){
              p->setPen(Qt::black);
              p->drawPixmap(3, 3, xBmp);
              }
              else{
              p->setPen(g.dark());
              p->drawRect(x+2, y+2, w-4, h-4);
              p->setPen(Qt::black);
              p->drawLine(x+3, (y+h)/2-2, x+w-4, (y+h)/2-2);
              p->drawLine(x+3, (y+h)/2, x+w-4, (y+h)/2);
              p->drawLine(x+3, (y+h)/2+2, x+w-4, (y+h)/2+2);
              }*/
         }
         else
-            p->drawPixmap(x, y, isHover ? *getPixmap(CBHover) : *getPixmap(CB));
+            p->drawPixmap(x, y, isActive ? *getPixmap(CBHover) : *getPixmap(CB));
     }
 }
 
 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());
 
 }
 
 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
                          const QColorGroup &/*g*/, Orientation orient,
                          bool, bool)
 {
     QWidget *parent = (QWidget *)p->device();
     p->setBrushOrigin(parent->pos());
     parent->erase(x, y, w, h);
     p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
                   *getPixmap(VSlider));
 }
 
 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() :
                   *getPixmap(VSlider)->mask());
 }
 
 int LiquidStyle::sliderLength() const
 {
     return(10);
@@ -2331,65 +2224,65 @@ static const int windowsRightBorder     = 12;
 
 int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
                                  const QFontMetrics &fm)
 {
     if (mi->isSeparator())
         return 2;
 
     int h = 0;
     if (mi->pixmap())
         h = mi->pixmap()->height();
 
     if (mi->iconSet())
         h = QMAX(mi->iconSet()->
                  pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
 
     h = QMAX(fm.height() + 4, h);
 
     // we want a minimum size of 18
     h = QMAX(h, 18);
 
     return h;
 }
 
 
 void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
                             const QColorGroup &g, const QColor *c,
                             bool atBorder)
 {
     // are we painting a widget?
     if(p->device()->devType() == QInternal::Widget){
         // if so does it use a special focus rectangle?
         QWidget *w = (QWidget *)p->device();
-        if(w->inherits("QPushButton") || w->inherits("QSlider")){
+        if(w->inherits("QPushButton") || w->inherits("QSlider") || w->inherits("QComboBox") || w->inherits("QToolButton" )){
             return;
         }
         else{
             QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
         }
     }
     else
         QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
 
 }
 
 void LiquidStyle::polishPopupMenu(QPopupMenu *mnu)
 {
     mnu->installEventFilter(menuHandler);
     QWindowsStyle::polishPopupMenu(mnu);
 }
 
 void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab,
                       bool selected)
 {
     if(tabBar->shape() != QTabBar::RoundedAbove){
         QWindowsStyle::drawTab(p, tabBar, tab, selected);
         return;
     }
     QPixmap tilePix;
     QRect r = tab->rect();
     //QPixmap *pix = selected ? tabBar->hasFocus() ? pixmaps[TabFocus] :
     //    pixmaps[TabDown] : pixmaps[Tab];
 
     QPixmap *pix = selected ? getPixmap(TabDown) : getPixmap(Tab);
     p->drawPixmap(r.x(), r.y(), *pix, 0, 0, 9, r.height());
     p->drawPixmap(r.right()-9, r.y(), *pix, pix->width()-9, 0, 9, r.height());
@@ -2684,138 +2577,34 @@ void LiquidStyle::drawSliderGroove (QPainter * p, int x, int y, int w,  int h,
         p->setPen(c.dark(130));
         p->drawLine(x+3, y, x+3, y2);
         p->setPen(c.dark(120));
         p->drawLine(x+4, y, x+4, y2);
         p->setPen(c.light(110));
         p->drawLine(x+5, y+1, x+5, y2-1);
     }
     //QWindowsStyle::drawSliderGroove(p, x, y, w, h, g, c, orient);
 
 }
 
 void LiquidStyle::drawSliderGrooveMask (QPainter * p, int x, int y, int w,
                                         int h, QCOORD, Orientation orient)
 {
     p->fillRect(x, y, w, h, Qt::color0);
     p->setPen(Qt::color1);
     if(orient == Qt::Horizontal){
         int x2 = x+w-1;
         y+=2;
         p->drawLine(x+1, y, x2-1, y);
         p->fillRect(x, y+1, w, 4, Qt::color1);
         p->drawLine(x+1, y+5, x2-1, y+5);
     }
     else{
         int y2 = y+h-1;
         x+=2;
         p->drawLine(x, y+1, x, y2-1);
         p->fillRect(x+1, y, 4, h, Qt::color1);
         p->drawLine(x+5, y+1, x+5, y2-1);
     }
 }
 
-// I'm debating if to use QValueList or QList here. I like QValueList better,
-// but QList handles pointers which is good for a lot of empty icons...
-
-void LiquidStyle::loadCustomButtons()
-{
-    return; // TODO
-    customBtnColorList.clear();
-    customBtnIconList.clear();
-    customBtnLabelList.clear();
-
-//    KConfig *config = KGlobal::config();
-//    QString oldGrp = config->group();
-//    config->setGroup("MosfetButtons");
-
-    QStrList iconList, colorList; //temp, we store QPixmaps and QColors
-    iconList.setAutoDelete(true);
-    colorList.setAutoDelete(true);
-//    config->readListEntry("Labels", customBtnLabelList);
-//    config->readListEntry("Icons", iconList);
-//    config->readListEntry("Colors", colorList);
-
-    const char *labelStr = customBtnLabelList.first();
-    const char *colorStr = colorList.first();
-    const char *iconStr = iconList.first();
-
-//    KIconLoader *ldr = KGlobal::iconLoader();
-    while(labelStr != NULL){
-        QColor *c = new QColor;
-        c->setNamedColor(QString(colorStr));
-        customBtnColorList.append(c);
-
-        QString tmpStr(iconStr);
-        if(!tmpStr.isEmpty()){
-            QPixmap *pixmap = 
-                new QPixmap();//ldr->loadIcon(tmpStr, KIcon::Small));
-            if(pixmap->isNull()){
-                delete pixmap;
-                customBtnIconList.append(NULL);
-            }
-            else
-                customBtnIconList.append(pixmap);
-        }
-        else
-            customBtnIconList.append(NULL);
-
-        labelStr = customBtnLabelList.next();
-        colorStr = colorList.next();
-        iconStr = iconList.next();
-    }
-}
-
-void LiquidStyle::applyCustomAttributes(QPushButton *btn)
-{
-    return; // TODO
-    QString str = btn->text();
-    if(str.isEmpty())
-        return;
-    while(str.contains('&') != 0)
-        str = str.remove(str.find('&'), 1);
-
-    const char *s;
-    int idx = 0;
-    for(s = customBtnLabelList.first(); s != NULL;
-        ++idx, s = customBtnLabelList.next()){
-        if(qstricmp(s, str.latin1()) == 0){
-            QPalette pal = btn->palette();
-            pal.setColor(QColorGroup::Button,
-                         *customBtnColorList.at(idx));
-            btn->setPalette(pal);
-            /*
-            if(customBtnIconList.at(idx) != NULL){
-                QPixmap *pix = customBtnIconList.at(idx);
-                btn->setIconSet(QIconSet(*pix));
-            }*/
-            break;
-        }
-    }
-}
-
-void LiquidStyle::unapplyCustomAttributes(QPushButton *btn)
-{
-    return; // TODO
-    QString str = btn->text();
-    if(str.isEmpty())
-        return;
-    while(str.contains('&') != 0)
-        str = str.remove(str.find('&'), 1);
-
-    const char *s;
-    for(s = customBtnLabelList.first(); s != NULL; s = customBtnLabelList.next()){
-        if(qstricmp(s, str.latin1()) == 0){
-            btn->setPalette(QApplication::palette());
-            btn->setIconSet(QIconSet());
-            break;
-        }
-    }
-}
-
-// #include "liquid.moc"
-
-
-
-
-
 
 /* vim: set noet sw=8 ts=8: */
diff --git a/noncore/styles/liquid/liquid.h b/noncore/styles/liquid/liquid.h
index 00cfb35..0582c9a 100644
--- a/noncore/styles/liquid/liquid.h
+++ b/noncore/styles/liquid/liquid.h
@@ -142,78 +142,64 @@ public:
     int splitterWidth() const {return(6);}
     void drawPanel(QPainter *p, int x, int y, int w, int h,
                    const QColorGroup &g, bool sunken, int lineWidth,
                    const QBrush *fill);
     void drawToolButton(QPainter *p, int x, int y, int w,
                         int h, const QColorGroup &g,
                         bool sunken, const 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,
                           const QColorGroup &g, QCOORD c, Orientation);
     void drawSliderGrooveMask(QPainter * p, int x, int y, int w, int h,
                               QCOORD c, Orientation);
     int buttonDefaultIndicatorWidth() const {return(2);}
     void drawPopupPanel(QPainter *p, int x, int y, int w, int h,
                         const QColorGroup &g, int lineWidth,
                         const QBrush * fill);
 protected:
     void adjustHSV(QPixmap &pix, int h, int s, int v);
     void intensity(QPixmap &pix, float percent);
 
     void drawRoundButton(QPainter *p, const QColor &c, const QColor &bg, int x,
                          int y, int w, int h, bool  supportPushDown = false,
                          bool pushedDown = false, bool autoDefault = false,
                          bool isMasked = false);
     void drawClearBevel(QPainter *p, int x, int y, int w, int h,
                         const QColor &c, const QColor &bg);
     void drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g,
                    bool horiz);
     void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g,
                       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 oldqte;
 	bool flatTBButtons;
-    bool highcolor;
-    QColorGroup radioOnGrp;
     QWidget *highlightWidget;
-    QBrush wallpaper;
-    QBitmap lightBmp;
-    QBitmap grayBmp;
-    QBitmap dgrayBmp;
-    QBitmap maskBmp;
-    QBitmap xBmp;
     QBitmap btnMaskBmp, htmlBtnMaskBmp;
     QPixmap *btnBorderPix, *btnBlendPix, *bevelFillPix, *smallBevelFillPix, *menuPix;
-    QBitmap paper1, paper2, paper3;
-    QBrush baseBrush, menuBrush, pagerBrush, pagerHoverBrush, bgBrush;
+    QBrush bgBrush, menuBrush;
     bool menuAni, menuFade;
 
     QIntDict<QPixmap>btnDict;
     QIntDict<QPixmap>btnBorderDict;
     QIntDict<QPixmap>bevelFillDict;
     QIntDict<QPixmap>smallBevelFillDict;
 
-    QList<QColor>customBtnColorList;
-    QList<QPixmap>customBtnIconList;
-    QStrList customBtnLabelList;
     QPixmap *vsbSliderFillPix;
     TransMenuHandler *menuHandler;
     QPixmap *pixmaps[BITMAP_ITEMS];
     QPixmap sbBuffer;
     int oldSliderThickness;
     int lowLightVal;
     QHeader *currentHeader;
     int headerHoverID;
     QWMatrix rMatrix;
     int bH, bS, bV;
     int bHoverH, bHoverS, bHoverV;
     int btnH, btnS, btnV;
     int btnHoverH, btnHoverS, btnHoverV;
 };
 
 #endif
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index f3531e5..29ae6f3 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -1,39 +1,39 @@
 This is a patch to mosfet's liquid 0.7.
 Features:
  - Qt-only
  - works with Qt/E on QPE/OPIE
  
---- -	2002-10-24 03:19:30.000000000 +0200
-+++ liquid.h	2002-07-15 02:52:50.000000000 +0200
+--- -	2002-11-18 04:47:41.000000000 +0100
++++ liquid.h	2002-11-18 03:32:40.000000000 +0100
 @@ -2,7 +2,7 @@
  #define LIQUID_STYLE_H
  
  
 -#include <kstyle.h>
 +#include <qwindowsstyle.h>
  #include <qpainter.h>
  #include <qdrawutil.h>
  #include <qpalette.h>
 @@ -20,7 +20,7 @@
   * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
   */
  
 -class KPixmap;
 +class QPixmap;
  
  #define BITMAP_ITEMS 41
  #define LIQUID_MENU_CHANGE 667
 @@ -50,24 +50,22 @@
      ~TransMenuHandler(){;}
      void reloadSettings();
      int transType(){return(type);}
 -    KPixmap *pixmap(WId id){return(pixDict.find(id));}
 +    QPixmap *pixmap(WId id){return(pixDict.find(id));}
      const QColor& textColor(){return(fgColor);}
      const QColor& bgColor(){return(color);}
      bool useShadowText(){return(shadowText);}
 -protected slots:
 -    void slotKIPCMessage(int id, int arg);
  protected:
      bool eventFilter(QObject *obj, QEvent *ev);
 -    void stripePixmap(KPixmap &pix, const QColor &color);
@@ -73,572 +73,885 @@ Features:
 -                            const QString& btext=QString::null,
 -                            const QPixmap *icon=NULL,
 -                            QFont *font=NULL, QWidget *btn=NULL);
 -    void drawKMenuItem(QPainter *p, int x, int y, int w, int h,
 -                       const QColorGroup &g, bool active,
 -                       QMenuItem *item, QBrush *fill=NULL);
 +	void drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
 +                            QMenuItem *mi, QColorGroup &g, bool enabled, bool active );
 +
      void drawPopupMenuItem(QPainter *p, bool checkable, int maxpmw,
                             int tab, QMenuItem *mi, const QPalette &pal,
                             bool act, bool enabled, int x, int y, int w,
                             int h);
      int popupMenuItemHeight(bool c, QMenuItem *mi, const QFontMetrics &fm);
 -    void drawKProgressBlock(QPainter *p, int x, int y, int w, int h,
 -                            const QColorGroup &g, QBrush *fill);
      void drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g,
                         const QColor *pen, bool atBorder);
      int defaultFrameWidth() const {return(2);}
 @@ -167,12 +146,6 @@
      void drawToolButton(QPainter *p, int x, int y, int w,
                          int h, const QColorGroup &g,
                          bool sunken, const QBrush *fill);
 -    void drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h,
 -                                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,
-@@ -204,6 +177,7 @@
+@@ -198,25 +171,15 @@
+     void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g,
+                       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 highcolor;
+-    QColorGroup radioOnGrp;
++	bool oldqte;
 +	bool flatTBButtons;
-     bool highcolor;
-     QColorGroup radioOnGrp;
      QWidget *highlightWidget;
---- -	2002-10-24 03:19:31.000000000 +0200
-+++ liquid.cpp	2002-10-24 03:18:15.000000000 +0200
-@@ -10,12 +10,10 @@
+-    QBrush wallpaper;
+-    QBitmap lightBmp;
+-    QBitmap grayBmp;
+-    QBitmap dgrayBmp;
+-    QBitmap maskBmp;
+-    QBitmap xBmp;
+     QBitmap btnMaskBmp, htmlBtnMaskBmp;
+     QPixmap *btnBorderPix, *btnBlendPix, *bevelFillPix, *smallBevelFillPix, *menuPix;
+-    QBitmap paper1, paper2, paper3;
+-    QBrush baseBrush, menuBrush, pagerBrush, pagerHoverBrush, bgBrush;
++    QBrush bgBrush, menuBrush;
+     bool menuAni, menuFade;
+ 
+     QIntDict<QPixmap>btnDict;
+@@ -224,9 +187,6 @@
+     QIntDict<QPixmap>bevelFillDict;
+     QIntDict<QPixmap>smallBevelFillDict;
+ 
+-    QList<QColor>customBtnColorList;
+-    QList<QPixmap>customBtnIconList;
+-    QStrList customBtnLabelList;
+     QPixmap *vsbSliderFillPix;
+     TransMenuHandler *menuHandler;
+     QPixmap *pixmaps[BITMAP_ITEMS];
+--- -	2002-11-18 04:47:41.000000000 +0100
++++ liquid.cpp	2002-11-18 04:46:13.000000000 +0100
+@@ -2,6 +2,9 @@
+  * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
+  */
+ 
++//
++// (c) 2002 Robert 'sandman' Griebl 
++//
+ 
+ 
+ #ifndef INCLUDE_MENUITEM_DEF
+@@ -10,12 +13,10 @@
  
  #include <qmenudata.h>
  #include "liquid.h"
 -#include <kapp.h>
 -#include <kglobal.h>
 -#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 +23,29 @@
+@@ -25,28 +26,30 @@
  #include <qtimer.h>
  #include <qpixmapcache.h>
  #include <qradiobutton.h>
 -#include <kimageeffect.h>
 -#include <ktoolbar.h>
 +#include <qcombobox.h>
  #include <qdrawutil.h>
  #include <qwidgetlist.h>
  #include <qtoolbutton.h>
  #include <qheader.h>
  #include <unistd.h>
 -#include <klocale.h>
 -#include <kiconloader.h>
 -#include <kmenubar.h>
 -#include <kipc.h>
 +#include <qmenubar.h>
 +#include <qprogressbar.h>
++#include <qlineedit.h>
  
 -#include <X11/X.h>
 -#include <X11/Xlib.h>
 +#include <stdio.h>
  
  #include "htmlmasks.h"
  #include "embeddata.h"
  
 -void TransMenuHandler::stripePixmap(KPixmap &pix, const QColor &color)
 +typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
 +                          QColorGroup &, bool, bool);
 +
 +QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
 +
 +void TransMenuHandler::stripePixmap(QPixmap &pix, const QColor &color)
  {
      QImage img(pix.convertToImage());
 -    KImageEffect::fade(img, 0.9, color);
 +    QImageEffect::fade(img, 0.9, color);
      int x, y;
      int r, g, b;
      for(y=0; y < img.height(); y+=3){
-@@ -71,35 +70,37 @@
+@@ -71,35 +74,37 @@
      : QObject(parent)
  {
      pixDict.setAutoDelete(true);
 -    connect(kapp, SIGNAL(kipcMessage(int, int)), this,
 -            SLOT(slotKIPCMessage(int, int)));
      reloadSettings();
  }
  
  void TransMenuHandler::reloadSettings()
  {
      pixDict.clear();
 -    KConfig *config = KGlobal::config();
 -    config->setGroup("MosfetMenus");
  
 -    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 ( "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 )
 +    	opacity = 20;
 +    
 +    shadowText = config. readBoolEntry("ShadowText", true);
  }
  
  bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
  {
 -    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 +108,7 @@
+@@ -107,7 +112,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,82 +122,53 @@
+@@ -121,82 +126,61 @@
                  stripePixmap(*pix, p->colorGroup().button());
              }
              else{
 -                KPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color);
 +                QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color);
              }
 +
              pixDict.insert(p->winId(), pix);
 +            
 +            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);					
 +            }
 +			delete ol;
          }
      }
      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);
 -}
 -
 -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
--
++//            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
+ 
 -        // 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();
 -            }
 -        }
 +            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 );
                  }
-+			delete ol;
-             }
-         }
 -    }
 -    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);
 -            }
 -        }
 -        ((LiquidStyle*)parent())->loadCustomButtons();
 -        it.toFirst();
 -        while ((w=it.current()) != 0 ){
 -            ++it;
 -            if(w->inherits("QPushButton")){
 -                ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w);
--            }
--        }
--
--    }
++			delete ol;
+             }
+         }
 +    return(false);
++}
+ 
+-    }
++
++static int qt_version ( )
++{
++	const char *qver = qVersion ( );
++	return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
  }
  
 +
  LiquidStyle::LiquidStyle()
 -    :KStyle()
 +    :QWindowsStyle()
  {
 +    setName ( "LiquidStyle" );
 +
++	oldqte = ( qt_version ( ) < 234 );
 +	flatTBButtons = false;
 +
      btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
      btnMaskBmp.setMask(btnMaskBmp);
      htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
-@@ -711,7 +683,6 @@
+@@ -207,12 +191,8 @@
+     btnDict.setAutoDelete(true);
+     bevelFillDict.setAutoDelete(true);
+     smallBevelFillDict.setAutoDelete(true);
+-    customBtnColorList.setAutoDelete(true);
+-    customBtnIconList.setAutoDelete(true);
+-    customBtnLabelList.setAutoDelete(true);
+ 
+     rMatrix.rotate(270.0);
+-    highcolor = QPixmap::defaultDepth() > 8;
+     btnBorderPix = new QPixmap;
+     btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
+     btnBlendPix = new QPixmap;
+@@ -572,131 +552,119 @@
+     case HTMLBtnBorderDown:
+         pixmaps[HTMLBtnBorderDown] = processEmbedded("htmlbtnborder", btnHoverH, btnHoverS, btnHoverV);
+         break;
++
+     case HTMLCB:
+         pixmaps[HTMLCB] = processEmbedded("htmlcheckbox", bH, bS, bV);
+         break;
++    case HTMLCBHover:
++        pixmaps[HTMLCBHover] = processEmbedded("htmlcheckbox", btnHoverH, btnHoverS, btnHoverV);
++        break;
+     case HTMLCBDown:
+         pixmaps[HTMLCBDown] = processEmbedded("htmlcheckboxdown", btnH, btnS, btnV);
+         break;
+-    case HTMLCBHover:
+-        pixmaps[HTMLCBHover] = processEmbedded("htmlcheckbox", btnH, btnS, btnV);
+-        break;
+     case HTMLCBDownHover:
+-        pixmaps[HTMLCBDownHover] = processEmbedded("htmlcheckboxdown",
+-                                                   btnHoverH, btnHoverS,
+-                                                   btnHoverV);
++        pixmaps[HTMLCBDownHover] = processEmbedded("htmlcheckboxdown", btnHoverH, btnHoverS, btnHoverV);
+         break;
++
+     case HTMLRadio:
+         pixmaps[HTMLRadio] = processEmbedded("htmlradio", bH, bS, bV);
++		break;
++    case HTMLRadioHover:
++        pixmaps[HTMLRadioHover] = processEmbedded("htmlradio", btnHoverH, btnHoverS, btnHoverV);
++		break;
+     case HTMLRadioDown:
+         pixmaps[HTMLRadioDown] = processEmbedded("htmlradiodown", btnH, btnS, btnV);
+-    case HTMLRadioHover:
+-        pixmaps[HTMLRadioHover] = processEmbedded("htmlradio", btnH, btnS, btnV);
++		break;
+     case HTMLRadioDownHover:
+-        pixmaps[HTMLRadioDownHover] = processEmbedded("htmlradiodown", 
+-                                                      btnHoverH, btnHoverS,
+-                                                      btnHoverV);
++        pixmaps[HTMLRadioDownHover] = processEmbedded("htmlradiodown", btnHoverH, btnHoverS, btnHoverV);
++		break;
++
++    case RadioOff:
++        pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV /*, true*/);
++        break;
++    case RadioOffHover:
++        pixmaps[RadioOffHover] = processEmbedded("radio", btnHoverH, btnHoverS, btnHoverV /*, true*/);
++        break;
+     case RadioOn:
+-        pixmaps[RadioOn] = processEmbedded("radio_down", btnH, btnS, btnV, true);
++        pixmaps[RadioOn] = processEmbedded("radio_down", btnH, btnS, btnV /*, true*/);
+         break;
+     case RadioOnHover:
+-        pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS,
+-                                                btnHoverV, true);
++        pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS, btnHoverV /*, true*/);
+         break;
+-    case RadioOffHover:
+-        pixmaps[RadioOffHover] = processEmbedded("radio", btnH, btnS, btnV, true);
++
++    case Tab:
++        pixmaps[Tab] = processEmbedded("tab", bH, bS, bV /*, true*/);
+         break;
+     case TabDown:
+-        pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV, true);
++        pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV /*, true*/);
+         break;
+     case TabFocus:
+-        pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS,
+-                                            btnHoverS, true);
+-        break;
+-    case CBDown:
+-        pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV, true);
++        pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS, btnHoverV /*, true*/);
+         break;
+-    case CBDownHover:
+-        pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH,
+-                                               btnHoverS, btnHoverV, true);
++
++	case CB:
++        pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV /*, true*/);
+         break;
+     case CBHover:
+-        pixmaps[CBHover] = processEmbedded("checkbox", btnH, btnS, btnV, true);
++        pixmaps[CBHover] = processEmbedded("checkbox", btnHoverH, btnHoverS, btnHoverV /*, true*/);
+         break;
+-    case HSlider:
+-        pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
++    case CBDown:
++        pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/);
+         break;
++    case CBDownHover:
++        pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/);
++        break;
++
+     case VSlider:
+-        pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
++        pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true );
+         *pixmaps[VSlider] = pixmaps[VSlider]->xForm(rMatrix);
+         break;
+-    case RadioOff:
+-        pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV, true);
+-        break;
+-    case Tab:
+-        pixmaps[Tab] = processEmbedded("tab", bH, bS, bV, true);
+-        break;
+-    case CB:
+-        pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV, true);
+-        break;
+     case VSBSliderTop:
+-        pixmaps[VSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
++    case VSBSliderTopHover:
++        pixmaps[item] = processEmbedded("sbslider_top", btnH, btnS, btnV /*, true*/);
+         break;
+     case VSBSliderBtm:
+-        pixmaps[VSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
++    case VSBSliderBtmHover:
++        pixmaps[item] = processEmbedded("sbslider_btm", btnH, btnS, btnV /*, true*/);
+         break;
+     case VSBSliderMid:
+-        pixmaps[VSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
++    case VSBSliderMidHover:
++        pixmaps[item] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
+         break;
+-    case VSBSliderTopHover:
+-        pixmaps[VSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
++	case VSBSliderTopBg:
++        pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV /*, true*/);
+         break;
+-    case VSBSliderBtmHover:
+-        pixmaps[VSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
++    case VSBSliderBtmBg:
++        pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV /*, true*/);
+         break;
+-    case VSBSliderMidHover:
+-        pixmaps[VSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
++    case VSBSliderMidBg:
++        pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
+         break;
+ 
+-    case HSBSliderTop:
+-        pixmaps[HSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
+-        *pixmaps[HSBSliderTop] = pixmaps[HSBSliderTop]->xForm(rMatrix);
+-        break;
+-    case HSBSliderBtm:
+-        pixmaps[HSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
+-        *pixmaps[HSBSliderBtm] = pixmaps[HSBSliderBtm]->xForm(rMatrix);
+-        break;
+-    case HSBSliderMid:
+-        pixmaps[HSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
+-        *pixmaps[HSBSliderMid] = pixmaps[HSBSliderMid]->xForm(rMatrix);
++	case HSlider:
++        pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV /*, true*/);
+         break;
++    case HSBSliderTop:
+     case HSBSliderTopHover:
+-        pixmaps[HSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
+-        *pixmaps[HSBSliderTopHover] = pixmaps[HSBSliderTopHover]->xForm(rMatrix);
++        pixmaps[item] = processEmbedded("sbslider_top", btnH, btnS, btnV, true );
++        *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
+         break;
++    case HSBSliderBtm:
+     case HSBSliderBtmHover:
+-        pixmaps[HSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
+-        *pixmaps[HSBSliderBtmHover] = pixmaps[HSBSliderBtmHover]->xForm(rMatrix);
++        pixmaps[item] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true );
++        *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
+         break;
++    case HSBSliderMid:
+     case HSBSliderMidHover:
+-        pixmaps[HSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
+-        *pixmaps[HSBSliderMidHover] = pixmaps[HSBSliderMidHover]->xForm(rMatrix);
+-        break;
+-    case VSBSliderTopBg:
+-        pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
+-        break;
+-    case VSBSliderBtmBg:
+-        pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
+-        break;
+-    case VSBSliderMidBg:
+-        pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
++        pixmaps[item] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
++        *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
+         break;
+     case HSBSliderTopBg:
+-        pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
++        pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true );
+         *pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix);
+         break;
+     case HSBSliderBtmBg:
+-        pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
++        pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true );
+         *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
+         break;
+     case HSBSliderMidBg:
+@@ -711,7 +679,6 @@
  
  void LiquidStyle::polish(QPalette &appPal)
  {
 -
      int i;
      for(i=0; i < BITMAP_ITEMS; ++i){
          if(pixmaps[i]){
-@@ -730,20 +701,29 @@
+@@ -719,31 +686,28 @@
+             pixmaps[i] = NULL;
      }
- 
-     loadCustomButtons();
+     }
+-    QWidgetList *list = QApplication::allWidgets();
+-    QWidgetListIt it( *list );
+-    QWidget *w;
+-    while ((w=it.current()) != 0 ){
+-        ++it;
+-        if(w->inherits("QPushButton")){
+-            unapplyCustomAttributes((QPushButton *)w);
+-        }
+-    }
+-
+-    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();
 -    QPalette pal = QApplication::palette();
 +    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 ( )));
-+               appPal. color ( QPalette::Active, QColorGroup::Button );
-+    if ( c == appPal. color ( QPalette::Active, QColorGroup::Background )
-+              //QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( ))) 
-+             ) {
++    QColor c = oldqte ? QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))) 
++                      : appPal. color ( QPalette::Active, QColorGroup::Button );
++    if ( c == ( oldqte ?  QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))
++                       : appPal. color ( QPalette::Active, QColorGroup::Background ))) {
          // force button color to be different from background
          QBrush btnBrush(QColor(200, 202, 228));
          appPal.setBrush(QColorGroup::Button, btnBrush);
-@@ -794,15 +774,7 @@
-     pagerBrush.setPixmap(*pix);
+@@ -778,8 +742,8 @@
+         adjustHSV(*pix, h, s, v);
+         smallBevelFillDict.insert(c.rgb(), pix);
+     }
+-    pagerHoverBrush.setColor(c);
+-    pagerHoverBrush.setPixmap(*pix);
++//    pagerHoverBrush.setColor(c);
++//    pagerHoverBrush.setPixmap(*pix);
+ 
+     c = c.dark(120);
+     pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
+@@ -790,19 +754,13 @@
+         adjustHSV(*pix, h, s, v);
+         smallBevelFillDict.insert(c.rgb(), pix);
+     }
+-    pagerBrush.setColor(c);
+-    pagerBrush.setPixmap(*pix);
++//    pagerBrush.setColor(c);
++//    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 ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background );
++    c = oldqte ? 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,101 +775,50 @@
      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
+-
+-    // lineedits
 -    c = config->readColorEntry("windowBackground", &Qt::white);
-+    c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base );
-     QPixmap basePix;
-     basePix.resize(32, 32);
-     basePix.fill(c.rgb());
-@@ -856,52 +825,37 @@
-             applyCustomAttributes((QPushButton *)w);
-         }
-     }
+-    QPixmap basePix;
+-    basePix.resize(32, 32);
+-    basePix.fill(c.rgb());
+-    painter.begin(&basePix);
+-    painter.setPen(c.dark(105));
+-    for(i=0; i < 32; i+=4){
+-        painter.drawLine(0, i, 32, i);
+-        painter.drawLine(0, i+1, 32, i+1);
+-    };
+-    painter.end();
+-    baseBrush.setColor(c);
+-    baseBrush.setPixmap(basePix);
+-    it.toFirst();
+-    while ((w=it.current()) != 0 ){
+-        ++it;
+-        if(w->inherits("QLineEdit")){
+-            QPalette pal = w->palette();
+-            pal.setBrush(QColorGroup::Base, baseBrush);
+-            w->setPalette(pal);
+-        }
+-        else if(w->inherits("QPushButton")){
+-            applyCustomAttributes((QPushButton *)w);
+-        }
+-    }
 -
 -    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") && 
 +            ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) {
 +    	w->installEventFilter(menuHandler);
 +    }
  
      if(w->isTopLevel()){
 -        if(!w->inherits("QPopupMenu") &&
 -           qstrcmp(kapp->argv()[0], "kicker") == 0){
 -            qWarning("Got panel toplevel %s", w->className());
 -            // force extensions and child panels to use proper palette.
 -            if(w->inherits("Panel")){
 -                qWarning("Setting panel palette");
 -                w->setPalette(kapp->palette());
 -            }
 -            else{
 -                // reset palette for everything else
 -                QPalette pal = kapp->palette();
 -                pal.setBrush(QColorGroup::Background, bgBrush);
 -                pal.setColor(QColorGroup::Mid, bgBrush.color().dark(130));
 -                pal.setColor(QColorGroup::Dark, bgBrush.color().dark(150));
 -                pal.setColor(QColorGroup::Midlight, bgBrush.color().light(110));
 -                pal.setColor(QColorGroup::Light, bgBrush.color().light(120));
 -                w->setPalette(pal);
 -            }
 -        }
          return;
      }
 -    if(qstrcmp(kapp->argv()[0], "kicker") == 0 &&
 -       w->inherits("KPanelExtension")){ // FIXME - doesn't work
 -        w->setPalette(kapp->palette());
 -    }
  
 -    if(w->inherits("QComboBox") ||
-+    if(w->inherits("QComboBox") || w->inherits("QProgressBar") ||
-        w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
+-       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 +867,10 @@
-         applyCustomAttributes((QPushButton *)w);
++    if(w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
          w->installEventFilter(this);
      }
+-    if(w->inherits("QLineEdit")){
+-        QPalette pal = w->palette();
+-        pal.setBrush(QColorGroup::Base, baseBrush);
+-        w->setPalette(pal);
+-    }
+-    if(w->inherits("QPushButton")){
+-        applyCustomAttributes((QPushButton *)w);
+-        w->installEventFilter(this);
++
 +    if(w->inherits("QButton") || w-> inherits("QComboBox")){
 +    	w-> setBackgroundMode ( QWidget::PaletteBackground );
 +    	w->setBackgroundOrigin ( QWidget::ParentOrigin);
-+    }
+     }
  
      bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
-         qstrcmp(w->name(), "qt_clipped_viewport") == 0;
-@@ -942,11 +900,17 @@
+@@ -942,11 +849,20 @@
          w->setMouseTracking(true);
          w->installEventFilter(this);
      }
-+    if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) {
++    if(w-> inherits("QToolButton")) {
++        if (w->parent()->inherits("QToolBar")) {
 +    	((QToolButton*)w)->setAutoRaise (flatTBButtons);
 +    	if ( flatTBButtons )
 +    		w->setBackgroundOrigin(QWidget::ParentOrigin);
 +    }
++    	w-> installEventFilter ( this );
++    }
 +    if(w-> inherits("QToolBarSeparator")&&w->parent()->inherits("QToolBar")) {
 +    	((QFrame *) w)-> setFrameShape ( QFrame::NoFrame );
 +    }
      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,16 +918,21 @@
+@@ -954,16 +870,21 @@
          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);
 +            w->setBackgroundMode(w->parentWidget()->backgroundMode( )/*QWidget::X11ParentRelative*/);
 +            w->setBackgroundOrigin(QWidget::ParentOrigin);
 +//			w->setBackgroundMode(QWidget::NoBackground);
          }
      }
 -    if(w->inherits("KToolBar")){
 -        w->installEventFilter(this);
 -        //w->setBackgroundMode(QWidget::NoBackground);
 -        return;
 +    if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
 +	    w-> setBackgroundOrigin ( QWidget::ParentOrigin );	    
 +	else if ( w-> inherits("QFrame") )
 +	    w->setBackgroundOrigin ( QWidget::WidgetOrigin );
 +
 +	if ( w->parentWidget()->inherits ( "QWidgetStack" )) {
 +	    w->setBackgroundOrigin ( QWidget::WidgetOrigin );
      }
  }
  
-@@ -977,6 +946,11 @@
+@@ -977,6 +898,11 @@
  
      if(w->inherits("QPopupMenu"))
          w->setBackgroundMode(QWidget::PaletteButton);
 +    else if(w-> testWFlags(Qt::WType_Popup) && 
 +            !w->inherits("QListBox") &&
 +            ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) {
 +    	w->removeEventFilter(menuHandler);
 +    }
  
      if(w->isTopLevel())
          return;
-@@ -986,7 +960,7 @@
+@@ -986,7 +912,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 +975,14 @@
-         unapplyCustomAttributes((QPushButton *)w);
-         w->removeEventFilter(this);
-     }
--
+@@ -997,16 +923,12 @@
+     if(isViewportChild)
+         w->setAutoMask(false);
+ 
+-    if(w->inherits("QPushButton")){
+-        unapplyCustomAttributes((QPushButton *)w);
+-        w->removeEventFilter(this);
 +/*
 +    if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
 +    	w-> setBackgroundMode ( PaletteBackground );
-+    }
-+*/
-     if(w->inherits("QComboBox") ||
-        w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
+     }
+-
+-    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")) {
++*/
++    if( w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
          w->removeEventFilter(this);
      }
      if(w->inherits("QButton") || w->inherits("QComboBox")){
-@@ -1014,9 +990,9 @@
+@@ -1014,9 +936,12 @@
              w->setAutoMask(false);
          }
      }
 -    if(w->inherits("KToolBar")){
++    if(w-> inherits("QToolButton")) {
++    	w-> removeEventFilter ( this );
++    }
 +    if(w->inherits("QToolBar")){
          w->removeEventFilter(this);
 -        //w->setBackgroundMode(QWidget::PaletteBackground);
 +        w->setBackgroundMode(QWidget::PaletteBackground);
          return;
      }
      if(w->inherits("QHeader")){
-@@ -1028,22 +1004,98 @@
+@@ -1028,22 +953,118 @@
  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);
 +    
 +    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 );
 +    
@@ -677,351 +990,686 @@ Features:
 +			int x, y, w, h;
 +			contentsRect ( ). rect ( &x, &y, &w, &h );
 +
 +			int prog = progress ( );
 +			int total = totalSteps ( );
 +			if ( prog < 0 )
 +				prog = 0;
 +			if ( total <= 0 )
 +				total = 1;
 +			int bw = w * prog / total;
 +			if ( bw > w )
 +				bw = w;
 +
 +			p.setPen(g.button().dark(130));
 +			p.drawRect(x, y, bw, h);
 +			p.setPen(g.button().light(120));
 +			p.drawRect(x+1, y+1, bw-2, h-2);
 +
 +			if(bw >= 4 && h >= 4 && pix)
 +				p.drawTiledPixmap(x+2, y+2, bw-4, h-4, *pix);
 +			
 +			if ( progress ( )>= 0 && totalSteps ( ) > 0 ) {			
 +				QString pstr;
 +				pstr. sprintf ( "%d%%", 100 * progress()/totalSteps ());
 +				p. setPen ( g.text());//g.highlightedText ( ));
 +				p. drawText (x,y,w-1,h-1,AlignCenter,pstr);
 +			}
 +		}
 +	}
 +};
 +
 +
++/*
++ * The same for QToolButton:
++ * TT hardcoded the drawing of the focus rect ...
++ *
++ * - sandman
++ */
++
++
++class HackToolButton : public QToolButton {
++public:
++	HackToolButton ( );
++	
++	void paint ( QPaintEvent *ev )
++	{
++		erase ( ev-> region ( ));
++		QPainter p ( this );
++		style ( ). drawToolButton ( this, &p );
++		drawButtonLabel ( &p );
++	}
++};
 +
  /*
   * This is a fun method ;-) Here's an overview. KToolBar grabs resize to
   * force everything to erase and repaint on resize. This is going away, I'm
-@@ -1063,7 +1115,7 @@
+@@ -1063,7 +1084,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 +1128,7 @@
+@@ -1076,116 +1097,27 @@
  
          }
      }
 -    else if(obj->inherits("KMiniPagerButton")){
 -        QButton *btn = (QButton *)obj;
 -        if(ev->type() == QEvent::Paint){
 -            if(!(btn->isOn() || btn->isDown())){
 -                QPalette pal = btn->palette();
 -                pal.setBrush(QColorGroup::Dark, btn == highlightWidget ?
 -                             pagerHoverBrush : pagerBrush);
 -                btn->setPalette(pal);
 -            }
 -            else{
 -                QPalette pal = btn->palette();
 -                pal.setBrush(QColorGroup::Dark,
 -                             QApplication::palette().active().brush(QColorGroup::Dark));
 -                btn->setPalette(pal);
 -
 -            }
 -        }
 -        else if(ev->type() == QEvent::Enter){
 -            highlightWidget = btn;
 -            btn->repaint(false);
 -        }
 -        else if(ev->type() == QEvent::Leave){
 -            highlightWidget = NULL;
 -            btn->repaint(false);
 -        }
 -
 -    }
 -    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 +1143,7 @@
-             }
-         }
-     }
+-        QWidget *btn = (QWidget *)obj;
+-        if(ev->type() == QEvent::Enter){
+-            if(btn->isEnabled()){
+-                highlightWidget = btn;
+-                btn->repaint(false);
+-            }
+-        }
+-        else if(ev->type() == QEvent::Leave){
+-            if(btn == highlightWidget){
+-                highlightWidget = NULL;
+-                btn->repaint(false);
+-            }
+-        }
+-    }
 -    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));
 -            btn->setPalette(pal);
 -        }
 -        else if(ev->type() == QEvent::Leave){
 -            pal.setColor(QColorGroup::Background,
 -                         QApplication::palette().active().background());
 -            btn->setPalette(pal);
 -        }
 -    }
 -    else if(obj->inherits("QToolButton") && !obj->inherits("KToolBarButton")){
+-        QToolButton *btn = (QToolButton *)btn;
+-        if(!btn->autoRaise()){
 +    else if(obj->inherits("QToolButton")){
-         QToolButton *btn = (QToolButton *)btn;
-         if(!btn->autoRaise()){
++        QToolButton *btn = (QToolButton *)obj;
++        if(ev->type() == QEvent::FocusIn ){ // && !btn-> autoRaise () 
              if(btn->isEnabled()){
-@@ -1290,7 +1301,24 @@
+                 highlightWidget = btn;
+                 btn->repaint(false);
++                
++	        	qDebug ( "TB FOCUS IN [%p]", btn );
+             }
+         }
+-        else if(ev->type() == QEvent::Leave){
+-            QWidget *btn = (QWidget *)obj;
++        else if(ev->type() == QEvent::FocusOut ){
+             if(btn == highlightWidget){
+                 highlightWidget = NULL;
+                 btn->repaint(false);
++                
++                qDebug ( "TB FOCUS OUT [%p]", btn );
+             }
+         }
+-        else
+-            highlightWidget = NULL;
+-    }
+-    else if(obj->inherits("QScrollBar")){
+-        QScrollBar *sb = (QScrollBar *)obj;
+-        if(ev->type() == QEvent::Enter){
+-            if(sb->isEnabled()){
+-                highlightWidget = sb;
+-                sb->repaint(false);
+-            }
+-        }
+-        else if(ev->type() == QEvent::Leave){
+-            if(sb == highlightWidget && !sb->draggingSlider()){
+-                highlightWidget = NULL;
+-                sb->repaint(false);
+-            }
+-        }
+-        else if(ev->type() == QEvent::MouseButtonRelease){
+-            QMouseEvent *me = (QMouseEvent *)ev;
+-            if(sb == highlightWidget && !sb->rect().contains(me->pos())){
+-                highlightWidget = NULL;
+-                sb->repaint(false);
+-            }
+-        }
+-    }
+-    else if(obj->inherits("QLineEdit")){
+-        if(obj->parent() && obj->parent()->inherits("QComboBox")){
+-            QWidget *btn = (QComboBox *)obj->parent();
+-            if(ev->type() == QEvent::Enter){
+-                if (btn->isEnabled()){
+-                    highlightWidget = btn;
+-                    btn->repaint(false);
+-                }
+-            }
+-            else if(ev->type() == QEvent::Leave){
+-                if (btn == highlightWidget)
+-                    highlightWidget = NULL;
+-                btn->repaint(false);
+-            }
++        else if(ev->type() == QEvent::Paint) {
++        	(( HackToolButton *) btn )-> paint ((QPaintEvent *) ev );
++        	return true;
+         }
+     }
+     else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){
+@@ -1201,6 +1133,7 @@
+             QSize sz = isRadio ? exclusiveIndicatorSize()
+                 : indicatorSize();
+ 
++/*
+             if(btn->hasFocus()){
+                 QRect r = QRect(0, 0, btn->width(), btn->height());
+                 p.setPen(btn->colorGroup().button().dark(140));
+@@ -1209,6 +1142,7 @@
+                 p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
+                 p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
+             }
++*/
+             int x = 0;
+             int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
+             if(isRadio)
+@@ -1228,36 +1162,6 @@
+             p.end();
+             return(true);
+         }
+-        // for hover, just redraw the indicator (not the text)
+-        else if((ev->type() == QEvent::Enter && btn->isEnabled()) ||
+-                (ev->type() == QEvent::Leave && btn == highlightWidget)){
+-            QButton *btn = (QButton *)obj;
+-            bool isRadio = obj->inherits("QRadioButton");
+-
+-            if(ev->type() == QEvent::Enter)
+-                highlightWidget = btn;
+-            else 
+-                highlightWidget = NULL;
+-            QFontMetrics fm = btn->fontMetrics();
+-            QSize lsz = fm.size(ShowPrefix, btn->text());
+-            QSize sz = isRadio ? exclusiveIndicatorSize()
+-                : indicatorSize();
+-            int x = 0;
+-            int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
+-            //if(btn->autoMask())
+-            //    btn->erase(x+1, y+1, sz.width()-2, sz.height()-2);
+-            QPainter p;
+-            p.begin(btn);
+-            if(isRadio)
+-                drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
+-                                       btn->colorGroup(), btn->isOn(),
+-                                       btn->isDown(), btn->isEnabled());
+-            else
+-                drawIndicator(&p, x, y, sz.width(), sz.height(),
+-                              btn->colorGroup(), btn->state(), btn->isDown(),
+-                              btn->isEnabled());
+-            p.end();
+-        }
+     }
+     else if(obj->inherits("QHeader")){
+         QHeader *hw = (QHeader *)obj;
+@@ -1290,7 +1194,24 @@
              }
          }
      }
 -    return(false);
 +    else if (obj-> inherits( "QProgressBar" )) {
 +    	if ( ev->type() == QEvent::Paint ) {
 +    		HackProgressBar *p = (HackProgressBar *) obj;
 +    		const QColorGroup &g = p-> colorGroup ( );
 +    		
 +			QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb());
 +			if(!pix){
 +				int h, s, v;
 +				g.button().dark(120).hsv(&h, &s, &v);
 +				pix = new QPixmap(*bevelFillPix);
 +				adjustHSV(*pix, h, s, v);
 +				bevelFillDict.insert(g.button().dark(120).rgb(), pix);
 +			}
 +    		p-> paint ((QPaintEvent *) ev, g, pix );
 +    		return true;    		
 +    	}
 +	}    		
 +	return false ;
  }
  
  void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h,
-@@ -1340,11 +1368,6 @@
+@@ -1325,8 +1246,11 @@
+         }
+ 
+         p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
++        qDebug ( "DRAW TOOLBUTTON IN PIXMAP" );
+     }
+     else{
++    	qDebug ( "DRAW TOOLBUTTON sunken=%d/high=%p/device=%p", sunken, highlightWidget,p->device() );
++    
+         drawClearBevel(p, x, y, w, h, sunken ? g.button() :
+                        highlightWidget == p->device() ? g.button().light(110) :
+                        g.background(), g.background());
+@@ -1340,11 +1264,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();
-@@ -1596,7 +1619,7 @@
+@@ -1488,7 +1407,20 @@
+                                  const QColorGroup &g, bool sunken,
+                                  bool edit, bool, const QBrush *)
+ {
+-    bool isHover = highlightWidget == painter->device();
++    bool isActive = false;
++    if (( painter->device()->devType() == QInternal::Widget ) &&
++        (
++         ( qApp-> focusWidget ( ) == painter-> device ( )) ||
++         (
++          edit &&
++          ((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) && 
++          ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( ))
++         )
++        )
++      ) {
++    	isActive = true;
++    }
++    	
+     bool isMasked = false;
+     if(painter->device()->devType() == QInternal::Widget)
+         isMasked = ((QWidget*)painter->device())->autoMask();
+@@ -1498,7 +1430,7 @@
+ 
+     drawRoundButton(&p, g.button(), g.background(), 0, 0, w, h, false,
+                     sunken, false, isMasked);
+-    if(!isHover){
++    if(!isActive){
+         p.setClipRect(0, 0, w-17, h);
+         drawRoundButton(&p, g.background(), g.background(), 0, 0, w, h, false,
+                         sunken, false, isMasked);
+@@ -1550,16 +1482,17 @@
+     return(QRect(x+9, y+3, w - (h / 3) - 20, h-6));
+ }
+ 
+-QRect LiquidStyle::comboButtonFocusRect(int x, int y, int w, int h)
++QRect LiquidStyle::comboButtonFocusRect(int /*x*/, int /*y*/, int /*w*/, int /*h*/)
+ {
+-    return(QRect(x+5, y+3, w-(h/3)-13, h-5));
++	return QRect ( );
++	
++//    return(QRect(x+5, y+3, w-(h/3)-13, h-5));
+ }
+ 
+ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
+                                        int sliderStart, uint controls,
+                                        uint activeControl)
+ {
+-    bool isHover = highlightWidget == p->device();
+     int sliderMin, sliderMax, sliderLength, buttonDim;
+     scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
+ 
+@@ -1596,7 +1529,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 +1647,7 @@
+@@ -1624,7 +1557,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 +1713,7 @@
+@@ -1648,25 +1581,15 @@
+         }
+         if(controls & Slider){
+             if(sliderR.height() >= 16){
+-                painter.drawPixmap(sliderR.x()+1, sliderR.y(),
+-                                   isHover ? *getPixmap(VSBSliderTopHover):
+-                                   *getPixmap(VSBSliderTop));
++                painter.drawPixmap(sliderR.x()+1, sliderR.y(), *getPixmap(VSBSliderTop));
+                 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+8, 13,
+-                                        sliderR.height()-16, isHover ?
+-                                        *getPixmap(VSBSliderMidHover) :
+-                                        *getPixmap(VSBSliderMid));
+-                painter.drawPixmap(sliderR.x()+1, sliderR.bottom()-8,
+-                                   isHover ? *getPixmap(VSBSliderBtmHover) :
+-                                   *getPixmap(VSBSliderBtm));
++                                        sliderR.height()-16, *getPixmap(VSBSliderMid));
++                painter.drawPixmap(sliderR.x()+1, sliderR.bottom()-8, *getPixmap(VSBSliderBtm));
+             }
+             else if(sliderR.height() >= 8){
+                 int m = sliderR.height()/2;
+-                painter.drawPixmap(sliderR.x()+1, sliderR.y(),
+-                                   isHover ? *getPixmap(VSBSliderTopHover):
+-                                   *getPixmap(VSBSliderTop), 0, 0, 13, m);
+-                painter.drawPixmap(sliderR.x()+1, sliderR.y()+m,
+-                                   isHover ? *getPixmap(VSBSliderBtmHover):
+-                                   *getPixmap(VSBSliderBtm), 0, 8-m, 13, m);
++                painter.drawPixmap(sliderR.x()+1, sliderR.y(), *getPixmap(VSBSliderTop), 0, 0, 13, m);
++                painter.drawPixmap(sliderR.x()+1, sliderR.y()+m, *getPixmap(VSBSliderBtm), 0, 8-m, 13, m);
+             }
+             else{
+                 painter.setPen(g.button().dark(210));
+@@ -1674,7 +1597,6 @@
+                               13, sliderR.height());
+                 painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1,
+                                         11, sliderR.height()-2,
+-                                        isHover ? *getPixmap(VSBSliderMidHover) :
+                                         *getPixmap(VSBSliderMid), 1, 0);
+             }
+         }
+@@ -1690,7 +1612,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 +1784,10 @@
+@@ -1715,22 +1637,17 @@
+         if(controls & Slider){
+             if(sliderR.width() >= 16){
+                 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
+-                                   isHover ? *getPixmap(HSBSliderTopHover) :
+                                    *getPixmap(HSBSliderTop));
+                 painter.drawTiledPixmap(sliderR.x()+8, sliderR.y()+1, sliderR.width()-16,
+-                                        13, isHover ? *getPixmap(HSBSliderMidHover) :
+-                                        *getPixmap(HSBSliderMid));
+-                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ?
+-                                   *getPixmap(HSBSliderBtmHover) :
++                                        13, *getPixmap(HSBSliderMid));
++                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, 
+                                    *getPixmap(HSBSliderBtm));
+             }
+             else if(sliderR.width() >= 8){
+                 int m = sliderR.width()/2;
+                 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
+-                                   isHover ? *getPixmap(HSBSliderTopHover) :
+                                    *getPixmap(HSBSliderTop), 0, 0, m, 13);
+-                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ?
+-                                   *getPixmap(HSBSliderBtmHover) :
++                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, 
+                                    *getPixmap(HSBSliderBtm), 8-m, 0, m, 13);
+             }
+             else{
+@@ -1738,8 +1655,7 @@
+                 drawRoundRect(&painter, sliderR.x(), sliderR.y()+1,
+                               sliderR.width(), 13);
+                 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2,
+-                                        sliderR.width()-2, 11, isHover ?
+-                                        *getPixmap(HSBSliderMidHover) :
++                                        sliderR.width()-2, 11, 
+                                         *getPixmap(HSBSliderMid), 0, 1);
+             }
+         }
+@@ -1761,10 +1677,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 +1888,8 @@
+@@ -1865,8 +1781,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 +1937,8 @@
+@@ -1914,31 +1830,31 @@
      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 +1980,8 @@
+-    bool isHover = highlightWidget == p->device();
++    bool isActive = ( p->device()->devType() == QInternal::Widget ) && ( qApp-> focusWidget ( ) == p-> device ( ));
+     bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
+         && ((QWidget*)p->device())->autoMask();
+ 
+     if(isMasked){
+         if(on || down){
+-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioDownHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLRadioDownHover) :
+                           *getPixmap(HTMLRadioDown));
+         }
+         else
+-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLRadioHover) :
+                           *getPixmap(HTMLRadio));
+ 
+     }
+     else{
+         if(on || down){
+-            p->drawPixmap(x, y, isHover ? *getPixmap(RadioOnHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(RadioOnHover) :
+                           *getPixmap(RadioOn));
+         }
+         else
+-            p->drawPixmap(x, y, isHover ? *getPixmap(RadioOffHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(RadioOffHover) :
+                           *getPixmap(RadioOff));
+     }
+ }
+@@ -1957,25 +1873,25 @@
      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 isHover = highlightWidget == p->device();
++    bool isActive = ( p->device()->devType() == QInternal::Widget ) && ( qApp-> focusWidget ( ) == p-> device ( ));
      bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
-@@ -1996,8 +2019,8 @@
+         && ((QWidget*)p->device())->autoMask();
+     if(isMasked){
+         if(state != QButton::Off){
+-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBDownHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLCBDownHover) :
+                           *getPixmap(HTMLCBDown));
+         }
+         else
+-            p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(HTMLCBHover) :
+                           *getPixmap(HTMLCB));
+ 
+     }
+     else{
+         if(state != QButton::Off){
+-            p->drawPixmap(x, y, isHover ? *getPixmap(CBDownHover) :
++            p->drawPixmap(x, y, isActive ? *getPixmap(CBDownHover) :
+                           *getPixmap(CBDown));
+             /*  Todo - tristate
+              if(state == QButton::On){
+@@ -1992,12 +1908,12 @@
+              }*/
+         }
+         else
+-            p->drawPixmap(x, y, isHover ? *getPixmap(CBHover) : *getPixmap(CB));
++            p->drawPixmap(x, y, isActive ? *getPixmap(CBHover) : *getPixmap(CB));
      }
  }
  
 -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 +2028,17 @@
+@@ -2005,18 +1921,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();
      p->setBrushOrigin(parent->pos());
 -    p->fillRect(x, y, w, h,
 -                QApplication::palette().active().brush(QColorGroup::Background));
 +    parent->erase(x, y, w, h);
      p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
                    *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 +2087,26 @@
+@@ -2065,203 +1980,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));
 -    int x2 = x+w-1;
 -    int y2 = y+h-1;
 -    p->drawLine(x+1, y, x2-1, y);
 -    p->drawLine(x+1, y2, x2-1, y2);
 -    p->drawLine(x, y+1, x, y2-1);
 -    p->drawLine(x2, y+1, x2, y2-1);
 -
 -    p->setPen(g.background());
 -    p->drawPoint(x, y);
 -    p->drawPoint(x2, y);
 -    p->drawPoint(x, y2);
 -    p->drawPoint(x2, y2);
 -
- 
+-
 -
 -   // p->drawRect(x, y, w, h);
 -    QPixmap *pix = bevelFillDict.find(g.button().rgb());
 -    if(!pix){
 -        int h, s, v;
 -        g.button().hsv(&h, &s, &v);
 -        pix = new QPixmap(*bevelFillPix);
 -        adjustHSV(*pix, h, s, v);
 -        bevelFillDict.insert(g.button().rgb(), pix);
 -    }
 -
 -    p->drawTiledPixmap(x+1, y+1, w-2, h-2, *pix);
 -}
 -
 -void LiquidStyle::drawKMenuBar(QPainter *p, int x, int y, int w, int h,
 -                           const QColorGroup &g, bool mac, QBrush *)
-+void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
-+                            QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
- {
+-{
 -    if(p->device() && p->device()->devType() == QInternal::Widget &&
 -       ((KMenuBar *)p->device())->isTopLevelMenu()){
 -        p->setPen(Qt::black);
 -        p->drawRect(x, y, w, h);
 -        p->drawTiledPixmap(x+1, y+1, w-2, h-2, *menuPix);
 -        // left
 -        p->drawLine(x+1, y+1, x+1, y+5);
 -        p->drawLine(x+2, y+1, x+2, y+3);
 -        p->drawLine(x+3, y+1, x+3, y+2);
 -        p->drawLine(x+4, y+1, x+6, y+1);
 -        // right
 -        int x2 = x+w-1;
 -        p->drawLine(x2-1, y+1, x2-1, y+5);
 -        p->drawLine(x2-2, y+1, x2-2, y+3);
 -        p->drawLine(x2-3, y+1, x2-3, y+2);
 -        p->drawLine(x2-4, y+1, x2-6, y+1);
 -    }
 -    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 )
+ {
 -    //p->fillRect(x, y, w, h, g.brush(QColorGroup::Background));
 -}
 -
 -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;
 -
 -    QFontMetrics fm(*font);
 -
 -    QToolBar* toolbar = 0;
 -    if(btn->parent() && btn->parent()->isWidgetType() && btn->parent()->inherits("QToolBar"))
 -        toolbar = static_cast<QToolBar*>(btn->parent());
 -
 -    --w, --h;
 -    if(sunken)
 -        ++x, ++y;
 -
 -    QColor btnColor(sunken ?  g.button() : raised ? g.button().light(110) :
 -                    g.background());
 -    drawClearBevel(p, x, y, w, h, btnColor, g.background());
 -
 -    p->setPen(g.text());
 -
 -    if (icontext == Icon){ // icon only
 -        if (pixmap){
 -            dx = ( w - pixmap->width() ) / 2;
 -            dy = ( h - pixmap->height() ) / 2;
@@ -1089,190 +1737,195 @@ Features:
 -            }
 -            p->drawPixmap( x+dx, y+dy, *pixmap );
 -        }
 -        if (!btext.isNull()){
 -            int tf = AlignBottom|AlignHCenter;
 -            dy= pixmap->height();
 -            dx = 2;
 -            if ( sunken ){
 -                ++dx;
 -                ++dy;
 -            }
 -            if (font)
 -                p->setFont(*font);
 -            if(raised)
 -                p->setPen(KGlobalSettings::toolBarHighlightColor());
 -            p->drawText(x, y, w, h-3, tf, btext);
 -        }
 -    }
 -    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;
      }
 -}
- 
 -
+ 
 -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() );
 +    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 +2145,8 @@
+@@ -2300,8 +2038,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 +2181,6 @@
+@@ -2336,8 +2074,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 +2206,7 @@
+@@ -2363,7 +2099,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 +2351,6 @@
+@@ -2508,25 +2244,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);
 -    p->setPen(g.button().light(120));
 -    p->drawRect(x+1, y+1, w-2, h-2);
 -    if(w >= 4 && h >= 4){
 -        QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb());
 -        if(!pix){
 -            int h, s, v;
 -            g.button().dark(120).hsv(&h, &s, &v);
 -            pix = new QPixmap(*bevelFillPix);
 -            adjustHSV(*pix, h, s, v);
 -            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 +2364,25 @@
+@@ -2536,29 +2253,29 @@
+     if(p->device()->devType() == QInternal::Widget){
+         // if so does it use a special focus rectangle?
+         QWidget *w = (QWidget *)p->device();
+-        if(w->inherits("QPushButton") || w->inherits("QSlider")){
++        if(w->inherits("QPushButton") || w->inherits("QSlider") || w->inherits("QComboBox") || w->inherits("QToolButton" )){
              return;
          }
          else{
 -            KStyle::drawFocusRect(p, r, g, c, atBorder);
 +            QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
          }
      }
      else
 -        KStyle::drawFocusRect(p, r, g, c, atBorder);
 +        QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
  
  }
  
  void LiquidStyle::polishPopupMenu(QPopupMenu *mnu)
  {
      mnu->installEventFilter(menuHandler);
 -    KStyle::polishPopupMenu(mnu);
 +    QWindowsStyle::polishPopupMenu(mnu);
  }
  
  void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab,
                        bool selected)
  {
      if(tabBar->shape() != QTabBar::RoundedAbove){
 -        KStyle::drawTab(p, tabBar, tab, selected);
 +        QWindowsStyle::drawTab(p, tabBar, tab, selected);
          return;
      }
      QPixmap tilePix;
-@@ -2671,7 +2495,7 @@
+@@ -2671,7 +2388,7 @@
          vFrame = 8; // was 10
      }
      else
 -        KStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
 +        QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
  }
  
  
-@@ -2699,7 +2523,7 @@
+@@ -2699,7 +2416,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 +2550,6 @@
+@@ -2726,105 +2443,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() ?
 -                   g.button().light(120) : g.button(), g.button());
 -    /*
 -    if(h > w){
 -        int y2 = y+h-1;
 -
 -        p->setPen(g.light());
 -
 -        p->drawLine(x+1, y+2, x+1, y2-2);
 -        p->drawLine(x+4, y+2, x+4, y2-2);
 -
 -        p->setPen(g.dark());
 -        p->drawLine(x+2, y+2, x+2, y2-2);
 -        p->drawLine(x+5, y+2, x+5, y2-2);
 -
 -    }
 -    else{
 -        int x2 = x+w-1;
 -
 -        p->setPen(g.light());
 -
 -        p->drawLine(x+2, y+1, x2-2, y+1);
 -        p->drawLine(x+2, y+4, x2-2, y+4);
 -
 -        p->setPen(g.dark());
@@ -1320,189 +1973,239 @@ Features:
 -
 -      QPixmap modPixmap = SmallIcon("modified");
 -
 -      int dx = (pxWidth   - modPixmap.width())  / 2;
 -      int dy = (h  - modPixmap.height()) / 2;
 -
 -      p->drawPixmap(br.x() + textPos + dx, dy, modPixmap);
 -
 -      textPos += pxWidth;
 -    }
 -
 -    if (!s.isEmpty()){
 -        if (p->fontMetrics().width(s) > br.width() - textPos) {
 -
 -            int maxLen = br.width() - textPos - p->fontMetrics().width("...");
 -
 -            while ((!s.isEmpty()) && (p->fontMetrics().width(s) > maxLen))
 -                s.truncate(s.length() - 1);
 -
 -            s.append("...");
 -        }
 -
 -        p->setPen(g.buttonText());
 -
 -        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 +2723,22 @@
-     customBtnIconList.clear();
-     customBtnLabelList.clear();
+@@ -2988,110 +2606,5 @@
+     }
+ }
  
+-// I'm debating if to use QValueList or QList here. I like QValueList better,
+-// but QList handles pointers which is good for a lot of empty icons...
+-
+-void LiquidStyle::loadCustomButtons()
+-{
+-    return; // TODO
+-    customBtnColorList.clear();
+-    customBtnIconList.clear();
+-    customBtnLabelList.clear();
+-
 -    KConfig *config = KGlobal::config();
 -    QString oldGrp = config->group();
 -    config->setGroup("MosfetButtons");
-+//    KConfig *config = KGlobal::config();
-+//    QString oldGrp = config->group();
-+//    config->setGroup("MosfetButtons");
- 
-     QStrList iconList, colorList; //temp, we store QPixmaps and QColors
-     iconList.setAutoDelete(true);
-     colorList.setAutoDelete(true);
+-
+-    QStrList iconList, colorList; //temp, we store QPixmaps and QColors
+-    iconList.setAutoDelete(true);
+-    colorList.setAutoDelete(true);
 -    config->readListEntry("Labels", customBtnLabelList);
 -    config->readListEntry("Icons", iconList);
 -    config->readListEntry("Colors", colorList);
-+//    config->readListEntry("Labels", customBtnLabelList);
-+//    config->readListEntry("Icons", iconList);
-+//    config->readListEntry("Colors", colorList);
- 
-     const char *labelStr = customBtnLabelList.first();
-     const char *colorStr = colorList.first();
-     const char *iconStr = iconList.first();
- 
+-
+-    const char *labelStr = customBtnLabelList.first();
+-    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 +2747,7 @@
-         QString tmpStr(iconStr);
-         if(!tmpStr.isEmpty()){
-             QPixmap *pixmap =
+-    while(labelStr != NULL){
+-        QColor *c = new QColor;
+-        c->setNamedColor(QString(colorStr));
+-        customBtnColorList.append(c);
+-
+-        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 +2762,6 @@
-         colorStr = colorList.next();
-         iconStr = iconList.next();
-     }
+-            if(pixmap->isNull()){
+-                delete pixmap;
+-                customBtnIconList.append(NULL);
+-            }
+-            else
+-                customBtnIconList.append(pixmap);
+-        }
+-        else
+-            customBtnIconList.append(NULL);
+-
+-        labelStr = customBtnLabelList.next();
+-        colorStr = colorList.next();
+-        iconStr = iconList.next();
+-    }
 -    config->setGroup(oldGrp);
- }
- 
- void LiquidStyle::applyCustomAttributes(QPushButton *btn)
-@@ -3087,7 +2811,7 @@
-     }
- }
- 
+-}
+-
+-void LiquidStyle::applyCustomAttributes(QPushButton *btn)
+-{
+-    return; // TODO
+-    QString str = btn->text();
+-    if(str.isEmpty())
+-        return;
+-    while(str.contains('&') != 0)
+-        str = str.remove(str.find('&'), 1);
+-
+-    const char *s;
+-    int idx = 0;
+-    for(s = customBtnLabelList.first(); s != NULL;
+-        ++idx, s = customBtnLabelList.next()){
+-        if(qstricmp(s, str.latin1()) == 0){
+-            QPalette pal = btn->palette();
+-            pal.setColor(QColorGroup::Button,
+-                         *customBtnColorList.at(idx));
+-            btn->setPalette(pal);
+-            /*
+-            if(customBtnIconList.at(idx) != NULL){
+-                QPixmap *pix = customBtnIconList.at(idx);
+-                btn->setIconSet(QIconSet(*pix));
+-            }*/
+-            break;
+-        }
+-    }
+-}
+-
+-void LiquidStyle::unapplyCustomAttributes(QPushButton *btn)
+-{
+-    return; // TODO
+-    QString str = btn->text();
+-    if(str.isEmpty())
+-        return;
+-    while(str.contains('&') != 0)
+-        str = str.remove(str.find('&'), 1);
+-
+-    const char *s;
+-    for(s = customBtnLabelList.first(); s != NULL; s = customBtnLabelList.next()){
+-        if(qstricmp(s, str.latin1()) == 0){
+-            btn->setPalette(QApplication::palette());
+-            btn->setIconSet(QIconSet());
+-            break;
+-        }
+-    }
+-}
+-
 -#include "liquid.moc"
-+// #include "liquid.moc"
- 
- 
+-
+-
+-
+-
+-
  
---- -	2002-10-24 03:19:31.000000000 +0200
-+++ plugin.cpp	2002-10-04 03:37:38.000000000 +0200
-@@ -1,29 +1,84 @@
+ /* vim: set noet sw=8 ts=8: */
+--- -	2002-11-18 04:47:41.000000000 +0100
++++ plugin.cpp	2002-11-18 03:54:56.000000000 +0100
+@@ -1,29 +1,79 @@
 +#include <qapplication.h>
 +
  #include "liquid.h"
 -#include <klocale.h>
 +#include "liquidset.h"
 +#include "plugin.h"
 +
 +
 +
 +LiquidInterface::LiquidInterface ( ) :  ref ( 0 )
 +{
 +	m_widget = 0;
 +}
-+    
+ 
+-extern "C" {
+-    KStyle* allocate();
+-    int minor_version();
+-    int major_version();
+-    const char *description();
 +LiquidInterface::~LiquidInterface ( )
 +{
-+}
-+        
+ }
+ 
+-KStyle* allocate()
 +QStyle *LiquidInterface::style ( )
-+{
+ {
+-    return(new LiquidStyle);
 +	return new LiquidStyle ( );
-+}
-+
+ }
+ 
+-int minor_version()
 +QString LiquidInterface::name ( ) const
-+{
+ {
+-    return(0);
 +	return qApp-> translate ( "Styles", "Liquid" );
-+}
-+
+ }
+ 
+-int major_version()
 +QString LiquidInterface::description ( ) const
-+{
+ {
+-    return(1);
 +	return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" );
-+}
-+
+ }
+ 
+-const char *description()
 +bool LiquidInterface::hasSettings ( ) const
-+{
+ {
+-    return(i18n("High performance liquid plugin").utf8());
 +	return true;
 +}
 +
 +QWidget *LiquidInterface::create ( QWidget *parent, const char *name )
 +{
 +	m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" );
- 
--extern "C" {
--    KStyle* allocate();
--    int minor_version();
--    int major_version();
--    const char *description();
++		
 +	return m_widget;
- }
- 
--KStyle* allocate()
++}
++
 +bool LiquidInterface::accept ( )
- {
--    return(new LiquidStyle);
++{
 +	if ( !m_widget )
 +		return false;
 +
 +	return m_widget-> writeConfig ( );
  }
- 
--int minor_version()
++
 +void LiquidInterface::reject ( )
- {
--    return(0);
- }
- 
--int major_version()
++{
++}
++
 +
 +QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
- {
--    return(1);
++{
 +	*iface = 0;
 +	
 +	if ( uuid == IID_QUnknown )
 +		*iface = this;
 +	else if ( uuid == IID_Style )
 +		*iface = this;
 +	else if ( uuid == IID_StyleExtended ) 
 +		*iface = this;
 +	
 +	if ( *iface )
 +		(*iface)-> addRef ( );
 +		
 +	return QS_OK;
- }
- 
--const char *description()
++}
++
 +Q_EXPORT_INTERFACE()
- {
--    return(i18n("High performance liquid plugin").utf8());
++{
 +	Q_CREATE_INSTANCE( LiquidInterface )
- }
-+
-+
-+        
++}
 +
-+// Hack for Retail Z experiments
-+extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } }
diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp
index 0740420..6813fc5 100644
--- a/noncore/styles/liquid/plugin.cpp
+++ b/noncore/styles/liquid/plugin.cpp
@@ -48,37 +48,32 @@ bool LiquidInterface::accept ( )
 		return false;
 
 	return m_widget-> writeConfig ( );
 }
 
 void LiquidInterface::reject ( )
 {
 }
 
 
 QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_Style )
 		*iface = this;
 	else if ( uuid == IID_StyleExtended ) 
 		*iface = this;
 	
 	if ( *iface )
 		(*iface)-> addRef ( );
 		
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
 	Q_CREATE_INSTANCE( LiquidInterface )
 }
 
-
-        
-
-// Hack for Retail Z experiments
-extern "C" { QStyle *allocate ( ) { return new LiquidStyle ( ); } }