Not making at least qDebug outputs on every QToolButton redraw may speed

things up a bit ;)

2 files changed, 61 insertions, 83 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index daac22c..e6d8310 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1095,34 +1095,30 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
                 if(child->isWidgetType())
                     ((QWidget *)child)->repaint(true);
             }
 
         }
     }
     else if(obj->inherits("QToolButton")){
         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::FocusOut ){
             if(btn == highlightWidget){
                 highlightWidget = NULL;
                 btn->repaint(false);
-                
-                qDebug ( "TB FOCUS OUT [%p]", btn );
             }
         }
         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())
@@ -1238,29 +1234,26 @@ 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();
 
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index d90433c..9ae24cc 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -1,18 +1,18 @@
 This is a patch to mosfet's liquid 0.7.
 Features:
  - Qt-only
  - works with Qt/E on QPE/OPIE
  
---- -	2002-11-21 20:45:47.000000000 +0100
+--- -	2002-11-29 12:30:34.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.
@@ -132,26 +132,26 @@ Features:
  
      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-21 20:45:47.000000000 +0100
-+++ liquid.cpp	2002-11-21 20:27:48.000000000 +0100
+--- -	2002-11-29 12:30:34.000000000 +0100
++++ liquid.cpp	2002-11-29 12:30:24.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 @@
  
@@ -262,25 +262,25 @@ Features:
              if(p->testWFlags(Qt::WType_Popup)){
                  QRect r(p->x(), p->y(), p->width(), p->height());
                  QRect deskR = QApplication::desktop()->rect();
 @@ -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 +126,61 @@
+@@ -121,82 +126,62 @@
                  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);
 +            	
@@ -332,88 +332,89 @@ Features:
 -        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;
++	currentHeader = 0;
 +
      btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
      btnMaskBmp.setMask(btnMaskBmp);
      htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
-@@ -207,12 +191,8 @@
+@@ -207,12 +192,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 @@
+@@ -572,131 +553,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);
@@ -485,28 +486,28 @@ Features:
 +
 +	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;
+         break;
 +    case CBDownHover:
 +        pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/);
-         break;
++        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;
@@ -590,33 +591,33 @@ Features:
          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 @@
+@@ -711,7 +680,6 @@
  
  void LiquidStyle::polish(QPalette &appPal)
  {
 -
      int i;
      for(i=0; i < BITMAP_ITEMS; ++i){
          if(pixmaps[i]){
-@@ -719,31 +686,28 @@
+@@ -719,31 +687,28 @@
              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);
 -        }
 -    }
@@ -645,61 +646,61 @@ Features:
      // 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 = 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);
-@@ -778,8 +742,8 @@
+@@ -778,8 +743,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 @@
+@@ -790,19 +755,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 = 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,101 +775,50 @@
+@@ -817,101 +776,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);
@@ -804,48 +805,48 @@ Features:
 -        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 ||
-@@ -942,11 +849,20 @@
+@@ -942,11 +850,20 @@
          w->setMouseTracking(true);
          w->installEventFilter(this);
      }
 +    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 +870,21 @@
+@@ -954,16 +871,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);
          }
@@ -855,83 +856,83 @@ Features:
 -        //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 +898,11 @@
+@@ -977,6 +899,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 +912,7 @@
+@@ -986,7 +913,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);
-@@ -997,16 +923,12 @@
+@@ -997,16 +924,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") ||
 -       w->inherits("QCheckBox") || w->inherits("QScrollBar") ||
 -       w->isA("AppletHandle") || w->inherits("KMiniPagerButton") ||
 -       w->inherits("TaskContainer")){
 +*/
 +    if( w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
          w->removeEventFilter(this);
      }
      if(w->inherits("QButton") || w->inherits("QComboBox")){
-@@ -1014,9 +936,12 @@
+@@ -1014,9 +937,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 +953,118 @@
+@@ -1028,22 +954,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);
 +	
@@ -1034,34 +1035,34 @@ Features:
 +	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 +1084,7 @@
+@@ -1063,7 +1085,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,116 +1097,27 @@
+@@ -1076,116 +1098,23 @@
  
          }
      }
 -    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);
 -            }
@@ -1112,36 +1113,32 @@ Features:
 -            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 *)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);
 -            }
@@ -1171,41 +1168,41 @@ Features:
 -            }
 -            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 @@
+@@ -1201,6 +1130,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 @@
+@@ -1209,6 +1139,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 @@
+@@ -1228,36 +1159,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 
@@ -1224,25 +1221,25 @@ Features:
 -                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 @@
+@@ -1290,7 +1191,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;
@@ -1250,119 +1247,107 @@ Features:
 +				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,
-@@ -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 @@
+@@ -1340,11 +1258,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();
-@@ -1488,7 +1407,20 @@
+@@ -1488,7 +1401,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 @@
+@@ -1498,7 +1424,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 @@
+@@ -1550,16 +1476,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 @@
+@@ -1596,7 +1523,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 +1557,7 @@
+@@ -1624,7 +1551,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);
-@@ -1648,25 +1581,15 @@
+@@ -1648,25 +1575,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,
@@ -1375,42 +1360,42 @@ Features:
                  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 @@
+@@ -1674,7 +1591,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 @@
+@@ -1690,7 +1606,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);
-@@ -1715,22 +1637,17 @@
+@@ -1715,22 +1631,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, 
@@ -1418,61 +1403,61 @@ Features:
              }
              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 @@
+@@ -1738,8 +1649,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 @@
+@@ -1761,10 +1671,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 +1781,8 @@
+@@ -1865,8 +1775,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,31 +1830,31 @@
+@@ -1914,31 +1824,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();
 +    bool isActive = ( p->device()->devType() == QInternal::Widget ) && ( qApp-> focusWidget ( ) == p-> device ( ));
      bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
@@ -1493,25 +1478,25 @@ Features:
      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 @@
+@@ -1957,25 +1867,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 isActive = ( p->device()->devType() == QInternal::Widget ) && ( qApp-> focusWidget ( ) == p-> device ( ));
      bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
          && ((QWidget*)p->device())->autoMask();
@@ -1525,63 +1510,63 @@ Features:
 -            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 @@
+@@ -1992,12 +1902,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 +1921,17 @@
+@@ -2005,18 +1915,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,243 +1980,76 @@
+@@ -2065,243 +1974,76 @@
      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);
@@ -1624,27 +1609,27 @@ Features:
 -        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,
@@ -1836,43 +1821,43 @@ Features:
                                         -1, &g.text());
      }
  }
  
  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 +2084,6 @@
+@@ -2336,8 +2078,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 +2109,7 @@
+@@ -2363,7 +2103,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 +2254,6 @@
+@@ -2508,25 +2248,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());
@@ -1880,25 +1865,25 @@ Features:
 -            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,
-@@ -2536,29 +2263,29 @@
+@@ -2536,29 +2257,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);
          }
      }
@@ -1915,43 +1900,43 @@ Features:
 +    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 +2398,7 @@
+@@ -2671,7 +2392,7 @@
          vFrame = 8; // was 10
      }
      else
 -        KStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
 +        QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
  }
  
  
-@@ -2699,7 +2426,7 @@
+@@ -2699,7 +2420,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 +2453,6 @@
+@@ -2726,105 +2447,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;
@@ -2039,25 +2024,25 @@ Features:
 -        }
 -
 -        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)
  {
-@@ -2988,110 +2616,5 @@
+@@ -2988,110 +2610,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();
@@ -2150,25 +2135,25 @@ Features:
 -        }
 -    }
 -}
 -
 -#include "liquid.moc"
 -
 -
 -
 -
 -
  
  /* vim: set noet sw=8 ts=8: */
---- -	2002-11-21 20:45:47.000000000 +0100
+--- -	2002-11-29 12:30:35.000000000 +0100
 +++ plugin.cpp	2002-11-18 18:11:41.000000000 +0100
 @@ -1,29 +1,84 @@
 +#include <qapplication.h>
 +
  #include "liquid.h"
 -#include <klocale.h>
 +#include "liquidset.h"
 +#include "plugin.h"
 +
 +
 +
 +LiquidInterface::LiquidInterface ( ) :  ref ( 0 )