1 files changed, 28 insertions, 25 deletions

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
@@ -38,11 +38,11 @@ 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
  * to derive a "hack" class from QProgressBar and do the painting
  * in there.
- * 
+ *
  * - sandman
  */
@@ -51,5 +51,5 @@ class HackProgressBar : public QProgressBar {
 public:
         HackProgressBar ( );
-        
+
         void paint ( QPaintEvent *event, OThemeStyle *style )
         {
@@ -76,7 +76,7 @@ public:
                         int perc = prog * 100 / total;
 
-                                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;
                                 pstr. sprintf ( "%d%%", 100 * progress()/totalSteps ());
@@ -110,5 +110,5 @@ void OThemeStyle::polish( QPalette &p )
 {
         oldPalette = p;
-        
+
         QColor bg = oldPalette. color ( QPalette::Normal, QColorGroup::Background );
 
@@ -116,5 +116,5 @@ void OThemeStyle::polish( QPalette &p )
                 bg = bgcolor;
 
-        if ( isColor ( Background )) 
+        if ( isColor ( Background ))
                 bg = colorGroup ( oldPalette. active ( ), Background )-> background ( );
 
@@ -125,16 +125,16 @@ void OThemeStyle::polish( QPalette &p )
 
         if ( fgcolor. isValid ( )) {
-                        p. setColor ( QColorGroup::Foreground, fgcolor );
+                p. setColor ( QColorGroup::Foreground, fgcolor );
                 p. setColor ( QColorGroup::ButtonText, fgcolor );
         }
         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 );
+
 }
 
@@ -1184,5 +1184,5 @@ void OThemeStyle::drawPushButtonLabel( QPushButton *btn, QPainter *p )
                 if ( mode == QIconSet::Normal && btn->hasFocus() )
                         mode = QIconSet::Active;
-                QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Small, mode );
+                QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Automatic, mode );
                 int pixw = pixmap.width();
                 int pixh = pixmap.height();
@@ -1247,6 +1247,5 @@ 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;
         }
@@ -1326,5 +1325,9 @@ void OThemeStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
                 if ( act && !dis )
                         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();
                 int pixh = pixmap.height();
@@ -1435,9 +1438,9 @@ 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 )
 {
     if(active){
-        x -= 2; // Bug in Qt/E 
+        x -= 2; // Bug in Qt/E
         y -= 2;
         w += 2;
@@ -1465,9 +1468,9 @@ void OThemeStyle::drawProgressBar ( QPainter *p, int x, int y, int w, int h, con
         if ( isPixmap( ProgressBg ) )
                 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 );
 }