1 files changed, 167 insertions, 378 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,16 +1,19 @@
 /*-
  * 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"
@@ -22,24 +25,25 @@
 #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)
@@ -153,47 +157,51 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
                         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);
@@ -535,142 +543,130 @@ 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);
@@ -681,58 +677,46 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item)
     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);
     }
@@ -749,91 +733,66 @@ void LiquidStyle::polish(QPalette &appPal)
     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);
@@ -844,38 +803,28 @@ void LiquidStyle::polish(QWidget *w)
     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){
@@ -891,29 +840,32 @@ void LiquidStyle::polish(QWidget *w)
                         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;
     }
@@ -962,43 +914,40 @@ void LiquidStyle::unPolish(QWidget *w)
 
     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)
@@ -1086,24 +1035,44 @@ public:
                         
                                 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
@@ -1119,165 +1088,89 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
         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());
@@ -1344,26 +1237,29 @@ void LiquidStyle::drawToolButton(QPainter *p, int x, int y, int w, int h,
 
         // 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();
 
@@ -1502,35 +1398,48 @@ void LiquidStyle::drawBevelButton(QPainter *p, int x, int y, int w, int h,
                       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);
@@ -1564,34 +1473,35 @@ void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h,
 
 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();
@@ -1662,51 +1572,40 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
             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();
@@ -1729,49 +1628,43 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
                                     *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();
@@ -1932,99 +1825,99 @@ QStyle::ScrollControl LiquidStyle::scrollBarPointOver(const QScrollBar *sb,
 #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,
@@ -2351,25 +2244,25 @@ int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
     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)
@@ -2704,118 +2597,14 @@ void LiquidStyle::drawSliderGrooveMask (QPainter * p, int x, int y, int w,
         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: */