- disable liquid win decoration - this has to be made a separate plugin

- liquid now uses the polished palette for color values (liquid did parse
  qpe.conf before -- the new Qt/e patch is needed for this to work)
- updated QPL diff

1 files changed, 12 insertions, 11 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 22bf8af..0d9d259 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -682,13 +682,12 @@ 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;
         }
@@ -715,18 +714,21 @@ void LiquidStyle::polish(QPalette &appPal)
 	int contrast = config. readNumEntry ( "StippleContrast", 5 );
 	if ( contrast < 0 )
 		contrast = 0;
 	else if ( contrast > 10 )
 		contrast = 10;
 
-    QPalette pal = QApplication::palette();
+//    QPalette pal = QApplication::palette();
 
     // button color stuff
     config. setGroup ( "Appearance" );
-    QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( )));	
-    if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) {
+    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 ( ))) 
+             ) {
         // 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);
@@ -771,13 +773,13 @@ void LiquidStyle::polish(QPalette &appPal)
         smallBevelFillDict.insert(c.rgb(), pix);
     }
     pagerBrush.setColor(c);
     pagerBrush.setPixmap(*pix);
 
     // background color stuff
-    c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));
+    c = /*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;
@@ -797,13 +799,13 @@ void LiquidStyle::polish(QPalette &appPal)
     painter.end();
     bgBrush.setColor(c);
     bgBrush.setPixmap(wallPaper);
     appPal.setBrush(QColorGroup::Background, bgBrush);
 
     // lineedits
-    c = QColor ( config. readEntry("Base", ( Qt::white). name ( )));
+    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){
@@ -822,13 +824,12 @@ void LiquidStyle::polish(QPalette &appPal)
             w->setPalette(pal);
         }
         else if(w->inherits("QPushButton")){
             applyCustomAttributes((QPushButton *)w);
         }
     }
-
 }
 
 void LiquidStyle::polish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         //((QFrame*)w)->setLineWidth(0);
@@ -945,13 +946,13 @@ void LiquidStyle::unPolish(QWidget *w)
 
     // for viewport children, don't just check for NoBackground....
     bool isViewportChild = w->parent() &&
         ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
          (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
 
-    w->setPalette(QApplication::palette());
+    w->unsetPalette();
     if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
         if(w->inherits("QPushButton"))
             w->setBackgroundMode(QWidget::PaletteButton);
         else
             w->setBackgroundMode(QWidget::PaletteBackground);
     }
@@ -1002,27 +1003,27 @@ void LiquidStyle::polish(QApplication *app)
 	
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
     
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
     
-    if ( config. readBoolEntry ( "WinDecoration", true ))	
-	    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
+//    if ( config. readBoolEntry ( "WinDecoration", true ))	
+//	    QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
 	    
 	flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
 }
 
 void LiquidStyle::unPolish(QApplication *app)
 {
     QWindowsStyle::unPolish(app);
     app->setEffectEnabled(UI_AnimateMenu, menuAni);
     app->setEffectEnabled(UI_FadeMenu, menuFade);
 
     qt_set_draw_menu_bar_impl ( 0 );
     
-    QApplication::qwsSetDecoration ( new QPEDecoration ( ));
+//    QApplication::qwsSetDecoration ( new QPEDecoration ( ));
 }
 
 /*
  * 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,