12 files changed, 338 insertions, 187 deletions

diff --git a/core/launcher/launchertab.cpp b/core/launcher/launchertab.cpp
index 710f259..72ebf59 100644
--- a/core/launcher/launchertab.cpp
+++ b/core/launcher/launchertab.cpp
@@ -99,6 +99,6 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 )
-                available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+                available -= t->iconSet()->pixmap().width();
         }
         if ( t->iconSet() != 0 )
-            iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+            iw += t->iconSet()->pixmap().width();
         required += iw;
@@ -118,4 +118,4 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 ) {
-                w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+                w += t->iconSet()->pixmap().width();
+                ih = t->iconSet()->pixmap().height();
             }
@@ -136,4 +136,4 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 ) {
-                w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+                w += t->iconSet()->pixmap().width();
+                ih = t->iconSet()->pixmap().height();
             }
@@ -151,3 +151,3 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 ) {
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+                ih = t->iconSet()->pixmap().height();
             }
@@ -222,4 +222,4 @@ void LauncherTabBar::paint( QPainter * p, QTab * t, bool selected ) const
     if ( t->iconSet() != 0 ) {
-        iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
-        ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+        iw = t->iconSet()->pixmap().width() + 2;
+        ih = t->iconSet()->pixmap().height();
     }
@@ -253,3 +253,7 @@ void LauncherTabBar::paintLabel( QPainter* p, const QRect&,
             mode = QIconSet::Active;
-        QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = t->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = t->iconSet()->pixmap();
         int pixw = pixmap.width();
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 55bf358..29ce841 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -1,24 +1,24 @@
 /*
-                             This file is part of the OPIE Project
+                     This file is part of the OPIE Project
                =.            Copyright (c)  2002 Trolltech AS <info@trolltech.com>
-             .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+      .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
+.="- .-=="i,   .._         License as published by the Free Software
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
+  ._= =}    :          or (at your option) any later version.
+  .%`+i>    _;_.
+  .i_,=:_.   -<s.       This file is distributed in the hope that
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
+  : ..  .:,   . . .    without even the implied warranty of
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
@@ -107,3 +107,3 @@ void MenuSettings::init ( )
                         name = iface-> name ( );
-                        icon = iface-> icon ( ). pixmap ( QIconSet::Small, QIconSet::Normal );
+                        icon = iface-> icon ( ). pixmap ();
                         iface-> release ( );
diff --git a/libopie2/opieui/otabbar.cpp b/libopie2/opieui/otabbar.cpp
index a62e18b..dc5df42 100644
--- a/libopie2/opieui/otabbar.cpp
+++ b/libopie2/opieui/otabbar.cpp
@@ -1,26 +1,26 @@
 /*
-                            This file is part of the Opie Project
- 
-                             Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
+                    This file is part of the Opie Project
+
+                      Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+     .>+-=
+_;:,   .>  :=|.         This program is free software; you can
+.> <`_,  > .  <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+.="- .-=="i,   .._         License as published by the Free Software
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
+  ._= =}    :          or (at your option) any later version.
+  .%`+i>    _;_.
+  .i_,=:_.   -<s.       This program is distributed in the hope that
+  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+  : ..  .:,   . . .    without even the implied warranty of
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=    =    ;      Library General Public License for more
+++=  -.   .`   .:       details.
+:   = ...= . :.=-
+-.  .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .  )=. =           Library General Public License along with
+  --    :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
@@ -33,2 +33,6 @@
 
+#include <qpe/applnk.h>
+
+#include <stdio.h>
+
 using namespace Opie::Ui;
@@ -50,3 +54,3 @@ void OTabBar::paintLabel( QPainter* p, const QRect& br, QTab* t, bool has_focus
         }
-        QPixmap pixmap = t->iconset->pixmap( QIconSet::Small, mode );
+        QPixmap pixmap = t->iconset->pixmap();
         int pixw = pixmap.width();
diff --git a/libopie2/opieui/otabbar.h b/libopie2/opieui/otabbar.h
index 925ae96..1044bdd 100644
--- a/libopie2/opieui/otabbar.h
+++ b/libopie2/opieui/otabbar.h
@@ -1,26 +1,26 @@
 /*
-                            This file is part of the Opie Project
- 
-                             Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
+                    This file is part of the Opie Project
+
+                      Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+     .>+-=
+_;:,   .>  :=|.         This program is free software; you can
+.> <`_,  > .  <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+.="- .-=="i,   .._         License as published by the Free Software
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
+  ._= =}    :          or (at your option) any later version.
+  .%`+i>    _;_.
+  .i_,=:_.   -<s.       This program is distributed in the hope that
+  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+  : ..  .:,   . . .    without even the implied warranty of
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=    =    ;      Library General Public License for more
+++=  -.   .`   .:       details.
+:   = ...= . :.=-
+-.  .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .  )=. =           Library General Public License along with
+  --    :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
@@ -28,3 +28,3 @@
                              Boston, MA 02111-1307, USA.
- 
+
 */
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp
index 7333f5e..d617a9c 100644
--- a/libopie2/opieui/otabwidget.cpp
+++ b/libopie2/opieui/otabwidget.cpp
@@ -36,3 +36,2 @@
 
-#include <qpe/applnk.h>
 #include <qpe/config.h>
diff --git a/noncore/styles/flat/flat.cpp b/noncore/styles/flat/flat.cpp
index f3bacf9..c164ecc 100644
--- a/noncore/styles/flat/flat.cpp
+++ b/noncore/styles/flat/flat.cpp
@@ -375,3 +375,3 @@ void FlatStyle::drawPushButtonLabel( QPushButton *btn, QPainter *p )
             mode = QIconSet::Active;
-        QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
+        QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Automatic, mode );
         int pixw = pixmap.width();
@@ -393,4 +393,4 @@ QRect FlatStyle::comboButtonRect( int x, int y, int w, int h)
 }
-      
-       
+
+
 QRect FlatStyle::comboButtonFocusRect( int x, int y, int w, int h)
@@ -894,3 +894,3 @@ int FlatStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFo
 {
-#ifndef QT_NO_MENUDATA    
+#ifndef QT_NO_MENUDATA
     int h = 0;
@@ -904,3 +904,3 @@ int FlatStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFo
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
-        h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+        h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
     }
@@ -916,3 +916,3 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 {
-#ifndef QT_NO_MENUDATA    
+#ifndef QT_NO_MENUDATA
     const QColorGroup & g = pal.active();
@@ -956,3 +956,7 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
             mode = QIconSet::Active;
-        QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = mi->iconSet()->pixmap();
         int pixw = pixmap.width();
diff --git a/noncore/styles/fresh/fresh.cpp b/noncore/styles/fresh/fresh.cpp
index 831b620..856f68b 100644
--- a/noncore/styles/fresh/fresh.cpp
+++ b/noncore/styles/fresh/fresh.cpp
@@ -149,4 +149,4 @@ QRect FreshStyle::comboButtonRect( int x, int y, int w, int h)
 }
-      
-       
+
+
 QRect FreshStyle::comboButtonFocusRect( int x, int y, int w, int h)
@@ -530,3 +530,3 @@ void FreshStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected
             //do shading; will not work for pixmap brushes
-            QColor bg = tb->colorGroup().button(); 
+            QColor bg = tb->colorGroup().button();
                     //    int h,s,v;
@@ -640,3 +640,3 @@ int FreshStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
 {
-#ifndef QT_NO_MENUDATA    
+#ifndef QT_NO_MENUDATA
     int h = 0;
@@ -650,3 +650,3 @@ int FreshStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
-        h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+        h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
     }
@@ -662,3 +662,3 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 {
-#ifndef QT_NO_MENUDATA    
+#ifndef QT_NO_MENUDATA
     const QColorGroup & g = pal.active();
@@ -704,3 +704,7 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
             mode = QIconSet::Active;
-        QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = mi->iconSet()->pixmap();
         int pixw = pixmap.width();
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 51814e7..77cf198 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -5,3 +5,3 @@
 //
-// (c) 2002 Robert 'sandman' Griebl 
+// (c) 2002 Robert 'sandman' Griebl
 //
@@ -14,3 +14,3 @@
 #include "liquid.h"
-#include "effects.h" 
+#include "effects.h"
 #include "htmlmasks.h"
@@ -101,3 +101,3 @@ void TransMenuHandler::reloadSettings()
             opacity = 20;
-    
+
     shadowText = config. readBoolEntry("ShadowText", true);
@@ -139,6 +139,6 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
             pixDict.insert(p->winId(), pix);
-            
-            if ( !p->inherits("QPopupMenu")) 
+
+            if ( !p->inherits("QPopupMenu"))
                     p->setBackgroundPixmap(*pix);
-                    
+
             QObjectList *ol = p-> queryList("QWidget");
@@ -146,5 +146,5 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
                                 QWidget *wid = (QWidget *) it.current ( );
-                                        
+
                                 wid-> setBackgroundPixmap(*pix);
-                                        wid-> setBackgroundOrigin(QWidget::ParentOrigin);                               
+                                   wid-> setBackgroundOrigin(QWidget::ParentOrigin);
             }
@@ -156,6 +156,6 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
            type == Custom){
-//            owarn << "Deleting menu pixmap, width " << pixDict.find(p->winId())->width() << "" << oendl; 
+//            owarn << "Deleting menu pixmap, width " << pixDict.find(p->winId())->width() << "" << oendl;
 
             pixDict.remove(p->winId());
-            if ( !p->inherits("QPopupMenu")) 
+            if ( !p->inherits("QPopupMenu"))
                 p->setBackgroundMode(QWidget::PaletteBackground);
@@ -165,3 +165,3 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
                                 QWidget *wid = (QWidget *) it.current ( );
-                                
+
                                 wid-> setBackgroundMode( QWidget::PaletteBackground );
@@ -175,3 +175,3 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 
-        
+
 
@@ -501,3 +501,3 @@ QPixmap* LiquidStyle::processEmbedded(const char *label, int h, int s, int v,
     if(img.isNull()){ // shouldn't happen, been tested
-        owarn << "Invalid embedded label " << label << "" << oendl; 
+        owarn << "Invalid embedded label " << label << "" << oendl;
         return(NULL);
@@ -601,6 +601,6 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item)
         pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV /*, true*/);
-        break;    
+        break;
     case TabFocus:
         pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS, btnHoverV /*, true*/);
-        break;    
+        break;
 
@@ -803,4 +803,4 @@ void LiquidStyle::polish(QWidget *w)
         w->setBackgroundMode(QWidget::NoBackground);
-    else if(w-> testWFlags(Qt::WType_Popup) && 
-            !w->inherits("QListBox") && 
+    else if(w-> testWFlags(Qt::WType_Popup) &&
+            !w->inherits("QListBox") &&
             ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) {
@@ -808,3 +808,3 @@ void LiquidStyle::polish(QWidget *w)
     }
-    
+
     if(w->isTopLevel()){
@@ -812,3 +812,3 @@ void LiquidStyle::polish(QWidget *w)
     }
-   
+
     if(w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
@@ -867,3 +867,3 @@ void LiquidStyle::polish(QWidget *w)
        palette().active().brush(QColorGroup::Background).pixmap()){
-        owarn << "No parent pixmap for child widget " << w->className() << "" << oendl; 
+        owarn << "No parent pixmap for child widget " << w->className() << "" << oendl;
         return;
@@ -880,3 +880,3 @@ void LiquidStyle::polish(QWidget *w)
     if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
-                    w-> setBackgroundOrigin ( QWidget::ParentOrigin );    
+            w-> setBackgroundOrigin ( QWidget::ParentOrigin );
         else if ( w-> inherits("QFrame") )
@@ -899,3 +899,3 @@ void LiquidStyle::unPolish(QWidget *w)
         w->setBackgroundMode(QWidget::PaletteButton);
-    else if(w-> testWFlags(Qt::WType_Popup) && 
+    else if(w-> testWFlags(Qt::WType_Popup) &&
             !w->inherits("QListBox") &&
@@ -961,11 +961,11 @@ void LiquidStyle::polish(QApplication *app)
         app->setEffectEnabled(UI_FadeMenu, false);
-        
+
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
-    
+
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
-    
-        //    if ( config. readBoolEntry ( "WinDecoration", true ))
+
+//    if ( config. readBoolEntry ( "WinDecoration", true ))
         //    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
-            
+
         flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
@@ -980,3 +980,3 @@ void LiquidStyle::unPolish(QApplication *app)
     qt_set_draw_menu_bar_impl ( 0 );
-    
+
 //    QApplication::qwsSetDecoration ( new QPEDecoration ( ));
@@ -986,5 +986,5 @@ void LiquidStyle::unPolish(QApplication *app)
 /* !! HACK !! Beware
- * 
+ *
  * TT forgot to make the QProgressBar widget styleable in Qt 2.x
- * So the only way to customize the drawing, is to intercept the 
+ * So the only way to customize the drawing, is to intercept the
  * paint event - since we have to use protected functions, we need
@@ -992,3 +992,3 @@ void LiquidStyle::unPolish(QApplication *app)
  * in there.
- * 
+ *
  * - sandman
@@ -999,3 +999,3 @@ public:
         HackProgressBar ( );
-        
+
         void paint ( QPaintEvent *event, const QColorGroup &g, QPixmap *pix )
@@ -1033,4 +1033,4 @@ public:
                                 p.drawTiledPixmap(x+2, y+2, bw-4, h-4, *pix);
-                        
-                                if ( progress ( )>= 0 && totalSteps ( ) > 0 ) {                 
+
+                        if ( progress ( )>= 0 && totalSteps ( ) > 0 ) {
                                 QString pstr;
@@ -1056,3 +1056,3 @@ public:
         HackToolButton ( );
-        
+
         void paint ( QPaintEvent *ev )
@@ -1100,3 +1100,3 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
         QToolButton *btn = (QToolButton *)obj;
-        if(ev->type() == QEvent::FocusIn ){ // && !btn-> autoRaise () 
+        if(ev->type() == QEvent::FocusIn ){ // && !btn-> autoRaise ()
             if(btn->isEnabled()){
@@ -1140,3 +1140,3 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
 */
-            int x = 0;            
+            int x = 0;
             int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
@@ -1195,3 +1195,3 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
                 const QColorGroup &g = p-> colorGroup ( );
-                
+
                         QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb());
@@ -1205,5 +1205,5 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
                 p-> paint ((QPaintEvent *) ev, g, pix );
-                        return true;            
+                return true;
             }
-                }       
+        }
         return false ;
@@ -1305,3 +1305,7 @@ void LiquidStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p)
             mode = QIconSet::Active;
-        QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = btn->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = btn->iconSet()->pixmap();
         int pixw = pixmap.width();
@@ -1313,3 +1317,3 @@ void LiquidStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p)
     }
-    
+
     if(act){
@@ -1407,3 +1411,3 @@ void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h,
           edit &&
-          ((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) && 
+          ((QWidget *) painter-> device ( ))-> inherits ( "QComboBox" ) &&
           ( qApp-> focusWidget ( ) == ((QComboBox *) painter->device())->lineEdit ( ) ||
@@ -1415,3 +1419,3 @@ void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h,
     }
-            
+
     bool isMasked = false;
@@ -1419,3 +1423,3 @@ void LiquidStyle::drawComboButton(QPainter *painter, int x, int y, int w, int h,
         isMasked = ((QWidget*)painter->device())->autoMask();
-    // TODO: Do custom code, don't just call drawRoundButton into a pixmap    
+    // TODO: Do custom code, don't just call drawRoundButton into a pixmap
     QPixmap tmpPix(w, h);
@@ -1480,3 +1484,3 @@ QRect LiquidStyle::comboButtonFocusRect(int /*x*/, int /*y*/, int /*w*/, int /*h
         return QRect ( );
-        
+
 //    return(QRect(x+5, y+3, w-(h/3)-13, h-5));
@@ -1635,3 +1639,3 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
                                         13, *getPixmap(HSBSliderMid));
-                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, 
+                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1,
                                    *getPixmap(HSBSliderBtm));
@@ -1642,3 +1646,3 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
                                    *getPixmap(HSBSliderTop), 0, 0, m, 13);
-                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, 
+                painter.drawPixmap(sliderR.right()-8, sliderR.y()+1,
                                    *getPixmap(HSBSliderBtm), 8-m, 0, m, 13);
@@ -1650,3 +1654,3 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
                 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2,
-                                        sliderR.width()-2, 11, 
+                                        sliderR.width()-2, 11,
                                         *getPixmap(HSBSliderMid), 0, 1);
@@ -1978,5 +1982,5 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
                             QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
-        {
+{
     if(active){
-        x -= 2; // Bug in Qt/E 
+        x -= 2; // Bug in Qt/E
         y -= 2;
@@ -1985,3 +1989,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
     }
-    
+
     QWidget *parent = (QWidget *)p->device();
@@ -1989,3 +1993,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
     parent->erase(x, y, w, h);
-   
+
     if(menuHandler->useShadowText()){
@@ -2001,3 +2005,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
                 QPixmap *dummy = 0;
-                
+
                 if ( mi-> pixmap ( ) && !mi-> pixmap ( )-> isNull ( )) {
@@ -2157,3 +2161,7 @@ static const int windowsRightBorder     = 12;
             mode = QIconSet::Active;
-        QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode);
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
         int pixw = pixmap.width();
@@ -2238,4 +2246,3 @@ int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
     if (mi->iconSet())
-        h = QMAX(mi->iconSet()->
-                 pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
+        h = QMAX(mi->iconSet()->pixmap().height(), h);
 
@@ -2432,3 +2439,3 @@ void LiquidStyle::drawPanel(QPainter *p, int x, int y, int w, int h,
         p->drawLine(x, y, x, y2);
- 
+
         p->setPen(g.midlight());
@@ -2490,3 +2497,3 @@ void LiquidStyle::intensity(QPixmap &pix, float percent)
         (unsigned int *)image.colorTable();
- 
+
     bool brighten = (percent >= 0);
@@ -2494,3 +2501,3 @@ void LiquidStyle::intensity(QPixmap &pix, float percent)
         percent = -percent;
- 
+
     if(brighten){ // keep overflow check out of loops
@@ -2511,3 +2518,3 @@ void LiquidStyle::intensity(QPixmap &pix, float percent)
     }
- 
+
     if(brighten){ // same here
diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp
index 746354e..c2b9de8 100644
--- a/noncore/styles/phase/phasestyle.cpp
+++ b/noncore/styles/phase/phasestyle.cpp
@@ -392,3 +392,6 @@ void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) {
 
-        pixmap = button->iconSet()->pixmap(QIconSet::Small, mode);
+        if ( mode == QIconSet::Disabled )
+            pixmap = button->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = button->iconSet()->pixmap();
         if (button->text().isEmpty() && !button->pixmap()) {
@@ -571,4 +574,3 @@ int PhaseStyle::popupMenuItemHeight ( bool ,
         if ( mi->iconSet() )
-            h = QMAX(h, mi->iconSet()->
-                     pixmap(QIconSet::Small, QIconSet::Normal ).height()
+            h = QMAX(h, mi->iconSet()->pixmap().height()
                      + ITEMFRAME*2 );
@@ -663,3 +665,7 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable,
             mode = enabled ? QIconSet::Normal : QIconSet::Disabled;
-        QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode );
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
         QRect pmrect(0, 0, pixmap.width(), pixmap.height() );
diff --git a/noncore/styles/theme/othemestyle.cpp b/noncore/styles/theme/othemestyle.cpp
index 98e7253..106d206 100644
--- a/noncore/styles/theme/othemestyle.cpp
+++ b/noncore/styles/theme/othemestyle.cpp
@@ -39,5 +39,5 @@ QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
 /* !! HACK !! Beware
- * 
+ *
  * TT forgot to make the QProgressBar widget styleable in Qt 2.x
- * So the only way to customize the drawing, is to intercept the 
+ * So the only way to customize the drawing, is to intercept the
  * paint event - since we have to use protected functions, we need
@@ -45,3 +45,3 @@ QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
  * in there.
- * 
+ *
  * - sandman
@@ -52,3 +52,3 @@ public:
         HackProgressBar ( );
-        
+
         void paint ( QPaintEvent *event, OThemeStyle *style )
@@ -77,5 +77,5 @@ public:
 
-                                style-> drawProgressBar ( &p, x, y, w, h, colorGroup ( ), perc );
+                        style-> drawProgressBar ( &p, x, y, w, h, colorGroup ( ), perc );
 
-                                if ( progress ( ) >= 0 && totalSteps ( ) > 0 ) {                
+                        if ( progress ( ) >= 0 && totalSteps ( ) > 0 ) {
                                 QString pstr;
@@ -111,3 +111,3 @@ void OThemeStyle::polish( QPalette &p )
         oldPalette = p;
-        
+
         QColor bg = oldPalette. color ( QPalette::Normal, QColorGroup::Background );
@@ -117,3 +117,3 @@ void OThemeStyle::polish( QPalette &p )
 
-        if ( isColor ( Background )) 
+        if ( isColor ( Background ))
                 bg = colorGroup ( oldPalette. active ( ), Background )-> background ( );
@@ -126,3 +126,3 @@ void OThemeStyle::polish( QPalette &p )
         if ( fgcolor. isValid ( )) {
-                        p. setColor ( QColorGroup::Foreground, fgcolor );
+                p. setColor ( QColorGroup::Foreground, fgcolor );
                 p. setColor ( QColorGroup::ButtonText, fgcolor );
@@ -130,10 +130,10 @@ void OThemeStyle::polish( QPalette &p )
         if ( selfgcolor. isValid ( ))
-                        p. setColor ( QColorGroup::HighlightedText, selfgcolor );
+                p. setColor ( QColorGroup::HighlightedText, selfgcolor );
         if ( selbgcolor. isValid ( ))
-                        p. setColor ( QColorGroup::Highlight, selbgcolor );
-        if ( winfgcolor. isValid ( )) 
-                        p. setColor ( QColorGroup::Text, winfgcolor );
+                p. setColor ( QColorGroup::Highlight, selbgcolor );
+        if ( winfgcolor. isValid ( ))
+                p. setColor ( QColorGroup::Text, winfgcolor );
         if ( winbgcolor. isValid ( ))
-                        p. setColor ( QColorGroup::Base, winbgcolor );
-        
+                p. setColor ( QColorGroup::Base, winbgcolor );
+
 }
@@ -1185,3 +1185,3 @@ void OThemeStyle::drawPushButtonLabel( QPushButton *btn, QPainter *p )
                         mode = QIconSet::Active;
-                QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Small, mode );
+                QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Automatic, mode );
                 int pixw = pixmap.width();
@@ -1248,4 +1248,3 @@ int OThemeStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem *mi,
         if ( mi->iconSet() ) {
-                h2 = mi->iconSet() ->
-                     pixmap( QIconSet::Small, QIconSet::Normal ).height() + offset;
+                h2 = mi->iconSet() ->pixmap().height() + offset;
                 h = h2 > h ? h2 : h;
@@ -1327,3 +1326,7 @@ void OThemeStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
                         mode = QIconSet::Active;
-                QPixmap pixmap = mi->iconSet() ->pixmap( QIconSet::Small, mode );
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
                 int pixw = pixmap.width();
@@ -1436,3 +1439,3 @@ void OThemeStyle::drawKMenuBar( QPainter *p, int x, int y, int w, int h,
 void OThemeStyle::drawMenuBarItem( QPainter *p, int x, int y, int w, int h,
-                                 QMenuItem *mi, const QColorGroup &g, 
+                                 QMenuItem *mi, const QColorGroup &g,
                                  bool /*enabled*/, bool active )
@@ -1440,3 +1443,3 @@ void OThemeStyle::drawMenuBarItem( QPainter *p, int x, int y, int w, int h,
     if(active){
-        x -= 2; // Bug in Qt/E 
+        x -= 2; // Bug in Qt/E
         y -= 2;
@@ -1466,7 +1469,7 @@ void OThemeStyle::drawProgressBar ( QPainter *p, int x, int y, int w, int h, con
                 bg.setPixmap( *uncached( ProgressBg ) );
-        
+
         int pw = w * percent / 100;
-                
-                p-> fillRect ( x + pw, y, w - pw, h, bg ); // ### TODO
-        
+
+        p-> fillRect ( x + pw, y, w - pw, h, bg ); // ### TODO
+
         drawBaseButton( p, x, y, pw, h, *cg, false, false, ProgressBar );
diff --git a/noncore/styles/web/webstyle.cpp b/noncore/styles/web/webstyle.cpp
index cd3cf08..7b58d89 100644
--- a/noncore/styles/web/webstyle.cpp
+++ b/noncore/styles/web/webstyle.cpp
@@ -45,2 +45,11 @@ static ulong      _savedFrameStyle;
 
+static const int ITEMFRAME       = 1; // menu stuff
+static const int ITEMHMARGIN     = 3;
+static const int ITEMVMARGIN     = 0;
+
+static const int ARROWMARGIN     = 6;
+static const int RIGHTBORDER     = 10;
+static const int MINICONSIZE     = 12;
+
+
 static QColor contrastingForeground(const QColor & fg, const QColor & bg)
@@ -971,3 +980,3 @@ WebStyle::drawPopupMenuItem
  int maxpmw,
- int tab,
+ int tabwidth,
  QMenuItem * mi,
@@ -983,3 +992,114 @@ WebStyle::drawPopupMenuItem
   // TODO
-  QWindowsStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
+  //QWindowsStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
+    if ( !mi )
+        return;
+
+    QRect rect(x, y, w, h );
+    int x2, y2;
+    x2 = rect.right();
+    y2 = rect.bottom();
+    const QColorGroup& g = pal.active();
+    QColorGroup itemg    = !enabled ? pal.disabled() : pal.active();
+
+    if ( checkable || maxpmw ) maxpmw = QMAX(maxpmw, 20);
+
+    if (act && enabled )
+        p->fillRect(x, y, w, h, g.highlight() );
+    else
+        p->fillRect(x, y, w, h, g.background() );
+
+    // draw seperator
+    if (mi->isSeparator() ) {
+    p->setPen( g.dark() );
+    p->drawLine( x+8, y+1, x+w-8, y+1 );
+
+        p->setPen( g.mid() );
+        p->drawLine( x+8,   y, x+w-8, y );
+        p->drawPoint(x+w,y+1);
+
+    p->setPen( g.midlight() );
+    p->drawLine( x+8, y-1, x+w-8, y-1 );
+        p->drawPoint(x+8, y );
+        return;
+    }
+
+    // draw icon
+    QIconSet::Mode mode;
+    if ( mi->iconSet() && !mi->isChecked() ) {
+        if ( act )
+            mode = enabled ? QIconSet::Active : QIconSet::Disabled;
+        else
+            mode = enabled ? QIconSet::Normal : QIconSet::Disabled;
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
+        QRect pmrect(0, 0, pixmap.width(), pixmap.height() );
+        QRect cr(x, y, maxpmw, h );
+        pmrect.moveCenter( cr.center() );
+        p->drawPixmap(pmrect.topLeft(), pixmap);
+    }
+
+    // draw check
+    if(mi->isChecked() ) {
+        drawCheckMark(p, x, y, maxpmw, h, itemg, act, !enabled );
+    }
+
+
+    // draw text
+    int xm = maxpmw + 2;
+    int xp = x + xm;
+    int tw = w -xm - 2;
+
+    p->setPen( enabled ? ( act ? g.highlightedText() : g.buttonText() ) :
+                         g.mid() );
+
+
+    if ( mi->custom() ) {
+        p->save();
+        mi->custom()->paint(p, g, act, enabled,
+                              xp, y+1, tw, h-2 );
+        p->restore();
+    }else { // draw label
+        QString text = mi->text();
+        if (!text.isNull() ) {
+            int t = text.find('\t');
+            const int tflags = AlignVCenter | DontClip |
+                               ShowPrefix |  SingleLine |
+                               AlignLeft;
+
+            if (t >= 0) {
+                int tabx = x + w - tabwidth - RIGHTBORDER -
+                           ITEMHMARGIN - ITEMFRAME;
+                p->drawText(tabx, y+ITEMVMARGIN, tabwidth,
+                            h-2*ITEMVMARGIN, tflags,
+                            text.mid(t+1) );
+                text = text.left(t );
+            }
+
+            // draw left label
+             p->drawText(xp, y+ITEMVMARGIN,
+                         tw, h-2*ITEMVMARGIN,
+                         tflags, text, t);
+        }else if ( mi->pixmap() ) { // pixmap as label
+            QPixmap pixmap = *mi->pixmap();
+            if ( pixmap.depth() == 1 )
+                p->setBackgroundMode( OpaqueMode );
+
+            int dx = ((w-pixmap.width() )  /2 ) +
+                 ((w - pixmap.width()) %2 );
+            p->drawPixmap(x+dx, y+ITEMFRAME, pixmap );
+
+            if ( pixmap.depth() == 1 )
+                p->setBackgroundMode( TransparentMode );
+        }
+    }
+
+    if ( mi->popup() ) { // draw submenu arrow
+        int dim = (h-2*ITEMFRAME) / 2;
+        drawArrow( p, RightArrow, false,
+                   x+w-ARROWMARGIN-ITEMFRAME-dim,
+                   y+h/2-dim/2, dim, dim, g, enabled );
+    }
 }
@@ -1170,3 +1290,3 @@ WebStyle::popupMenuItemHeight(bool, QMenuItem * i, const QFontMetrics & fm)
       (
-       i->iconSet()->pixmap(QIconSet::Small, QIconSet::Normal).height(),
+       i->iconSet()->pixmap().height(),
        h
diff --git a/noncore/styles/web/webstyle.h b/noncore/styles/web/webstyle.h
index 83ab784..d6f153b 100644
--- a/noncore/styles/web/webstyle.h
+++ b/noncore/styles/web/webstyle.h
@@ -217,3 +217,3 @@ class WebStyle : public QWindowsStyle {
        int maxpmw,
-       int tab,
+       int tabwidth,
        QMenuItem *,