1 files changed, 3 insertions, 12 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 4a65952..bac882c 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -43,269 +43,263 @@
 #include "embeddata.h"
 
 
 typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
                           QColorGroup &, bool, bool);
 
 QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
 
 void TransMenuHandler::stripePixmap(QPixmap &pix, const QColor &color)
 {
     QImage img(pix.convertToImage());
     QImageEffect::fade(img, 0.9, color);
     int x, y;
     int r, g, b;
     for(y=0; y < img.height(); y+=3){
         unsigned int *data = (unsigned int  *) img.scanLine(y);
         for(x=0; x < img.width(); ++x){
             r = qRed(data[x]);
             g = qGreen(data[x]);
             b = qBlue(data[x]);
             if(r-10)
                 r-=10;
             if(g-10)
                 g-=10;
             if(b-10)
                 b-=10;
             data[x] = qRgb(r, g, b);
         }
     }
     pix.convertFromImage(img);
 }
 
 TransMenuHandler::TransMenuHandler(QObject *parent)
     : QObject(parent)
 {
     pixDict.setAutoDelete(true);
     reloadSettings();
 }
 
 void TransMenuHandler::reloadSettings()
 {
     pixDict.clear();
 
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
     type = config. readNumEntry("Type", TransStippleBg);
     color = QColor ( config. readEntry("Color",  QApplication::palette().active().button().name()));
     fgColor = QColor ( config. readEntry("TextColor", QApplication::palette().active().text().name()));
     opacity = config. readNumEntry("Opacity", 10);
     if ( opacity < -20 )
             opacity = 20;
     else if ( opacity > 20 )
             opacity = 20;
     
     shadowText = config. readBoolEntry("ShadowText", true);
 }
 
 bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
 {
     QWidget *p = (QWidget *)obj;
 
     if(ev->type() == QEvent::Show){
         if(type == TransStippleBg || type == TransStippleBtn ||
            type == Custom){
             QApplication::syncX();
             QPixmap *pix = new QPixmap;
             if(p->testWFlags(Qt::WType_Popup)){
                 QRect r(p->x(), p->y(), p->width(), p->height());
                 QRect deskR = QApplication::desktop()->rect();
                 if(r.right() > deskR.right() || r.bottom() > deskR.bottom()){
                     r.setBottom(deskR.bottom());
                     r.setRight(deskR.right());
                 }
                 *pix = QPixmap::grabWindow(QApplication::desktop()-> winId(), r.x(), r.y(),
                                            r.width(), r.height());
             }
             else{ // tear off menu
                 pix->resize(p->width(), p->height());
                 pix->fill(Qt::black.rgb());
             }
             if(type == TransStippleBg){
                 stripePixmap(*pix, p->colorGroup().background());
             }
             else if(type == TransStippleBtn){
                 stripePixmap(*pix, p->colorGroup().button());
             }
             else{
                 QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color);
             }
 
             pixDict.insert(p->winId(), pix);
             
             if ( !p->inherits("QPopupMenu")) 
                     p->setBackgroundPixmap(*pix);
                     
             QObjectList *ol = p-> queryList("QWidget");
                         for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
                                 QWidget *wid = (QWidget *) it.current ( );
                                         
                                 wid-> setBackgroundPixmap(*pix);
                                         wid-> setBackgroundOrigin(QWidget::ParentOrigin);                               
             }
                         delete ol;
         }
     }
     else if(ev->type() == QEvent::Hide){
         if(type == TransStippleBg || type == TransStippleBtn ||
            type == Custom){
 //            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
 
             pixDict.remove(p->winId());
             if ( !p->inherits("QPopupMenu")) 
                 p->setBackgroundMode(QWidget::PaletteBackground);
 
                   QObjectList *ol = p-> queryList("QWidget");
                         for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
                                 QWidget *wid = (QWidget *) it.current ( );
                                 
                                 wid-> setBackgroundMode( QWidget::PaletteBackground );
             }
                         delete ol;
         }
     }
     return(false);
 }
 
 
-static int qt_version ( )
-{
-        const char *qver = qVersion ( );
-        return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
-}
         
 
 LiquidStyle::LiquidStyle()
     :QWindowsStyle()
 {
     setName ( "LiquidStyle" );
 
-        oldqte = ( qt_version ( ) < 234 );
         flatTBButtons = false;
         currentHeader = 0;
 
     btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
     btnMaskBmp.setMask(btnMaskBmp);
     htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
     htmlBtnMaskBmp.setMask(htmlBtnMaskBmp);
     headerHoverID = -1;
     highlightWidget = NULL;
     setButtonDefaultIndicatorWidth(0);
     btnDict.setAutoDelete(true);
     bevelFillDict.setAutoDelete(true);
     smallBevelFillDict.setAutoDelete(true);
 
     rMatrix.rotate(270.0);
     btnBorderPix = new QPixmap;
     btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
     btnBlendPix = new QPixmap;
     btnBlendPix->convertFromImage(qembed_findImage("buttonborder"));
     bevelFillPix = new QPixmap;
     bevelFillPix->convertFromImage(qembed_findImage("clear_fill_large"));
     smallBevelFillPix = new QPixmap;
     smallBevelFillPix->convertFromImage(qembed_findImage("clear_fill_small"));
     // new stuff
     vsbSliderFillPix = menuPix = NULL;
     menuHandler = new TransMenuHandler(this);
     setScrollBarExtent(15, 15);
     int i;
     for(i=0; i < BITMAP_ITEMS; ++i){
         pixmaps[i] = NULL;
     }
     oldSliderThickness = sliderThickness();
     setSliderThickness(11);
 }
 
 LiquidStyle::~LiquidStyle()
 {
     if(btnBorderPix)
         delete btnBorderPix;
     if(btnBlendPix)
         delete btnBlendPix;
     if(bevelFillPix)
         delete bevelFillPix;
     if(smallBevelFillPix)
         delete smallBevelFillPix;
     if(vsbSliderFillPix)
         delete vsbSliderFillPix;
     if(menuPix)
         delete menuPix;
 
     setScrollBarExtent(16, 16);
     setSliderThickness(oldSliderThickness);
     int i;
     for(i=0; i < BITMAP_ITEMS; ++i){
         if(pixmaps[i])
             delete pixmaps[i];
     }
 }
 
 void LiquidStyle::drawClearBevel(QPainter *p, int x, int y, int w, int h,
                                 const QColor &c, const QColor &bg)
 {
 
     QPen oldPen = p->pen(); // headers need this
     int x2 = x+w-1;
     int y2 = y+h-1;
     // outer dark rect
     p->setPen(c.dark(130));
     p->drawLine(x, y+2, x, y2-2); // l
     p->drawLine(x2, y+2, x2, y2-2); // r
     p->drawLine(x+2, y, x2-2, y); // t
     p->drawLine(x+2, y2, x2-2, y2); // b
     p->drawPoint(x+1, y+1); // tl
     p->drawPoint(x2-1, y+1); // tr
     p->drawPoint(x+1, y2-1); // bl
     p->drawPoint(x2-1, y2-1); // br
 
     // inner top light lines
     p->setPen(c.light(105));
     p->drawLine(x+2, y+1, x2-2, y+1);
     p->drawLine(x+1, y+2, x2-1, y+2);
     p->drawLine(x+1, y+3, x+2, y+3);
     p->drawLine(x2-2, y+3, x2-1, y+3);
     p->drawPoint(x+1, y+4);
     p->drawPoint(x2-1, y+4);
 
     // inner bottom light lines
     p->setPen(c.light(110));
     p->drawLine(x+2, y2-1, x2-2, y2-1);
     p->drawLine(x+1, y2-2, x2-1, y2-2);
     p->drawLine(x+1, y2-3, x+2, y2-3);
     p->drawLine(x2-2, y2-3, x2-1, y2-3);
     p->drawPoint(x+1, y2-4);
     p->drawPoint(x2-1, y2-4);
 
     // inner left mid lines
     //p->setPen(c.light(105));
     p->setPen(c);
     p->drawLine(x+1, y+5, x+1, y2-5);
     p->drawLine(x+2, y+4, x+2, y2-4);
 
     // inner right mid lines
     p->drawLine(x2-1, y+5, x2-1, y2-5);
     p->drawLine(x2-2, y+4, x2-2, y2-4);
 
     // fill
     QPixmap *pix;
     if(h >= 32){
         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);
         }
     }
     else{
         pix = smallBevelFillDict.find(c.rgb());
         if(!pix){
             int h, s, v;
             c.hsv(&h, &s, &v);
             pix = new QPixmap(*smallBevelFillPix);
             adjustHSV(*pix, h, s, v);
             smallBevelFillDict.insert(c.rgb(), pix);
         }
     }
     p->drawTiledPixmap(x+3, y+3, w-6, h-6, *pix);
@@ -582,312 +576,309 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item)
         pixmaps[HTMLRadioDownHover] = processEmbedded("htmlradiodown", btnHoverH, btnHoverS, btnHoverV);
                 break;
 
     case RadioOff:
         pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV /*, true*/);
         break;
     case RadioOffHover:
         pixmaps[RadioOffHover] = processEmbedded("radio", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
         case RadioOn:
         pixmaps[RadioOn] = processEmbedded("radio_down", btnH, btnS, btnV /*, true*/);
         break;
     case RadioOnHover:
         pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
 
     case Tab:
         pixmaps[Tab] = processEmbedded("tab", bH, bS, bV /*, true*/);
         break;
     case TabDown:
         pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV /*, true*/);
         break;    
     case TabFocus:
         pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;    
 
         case CB:
         pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV /*, true*/);
         break;
     case CBHover:
         pixmaps[CBHover] = processEmbedded("checkbox", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
     case CBDown:
         pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/);
         break;
     case CBDownHover:
         pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/);
         break;
 
         case VSlider:
         pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true );
         *pixmaps[VSlider] = pixmaps[VSlider]->xForm(rMatrix);
         break;
     case VSBSliderTop:
     case VSBSliderTopHover:
         pixmaps[item] = processEmbedded("sbslider_top", btnH, btnS, btnV /*, true*/);
         break;
     case VSBSliderBtm:
     case VSBSliderBtmHover:
         pixmaps[item] = processEmbedded("sbslider_btm", btnH, btnS, btnV /*, true*/);
         break;
     case VSBSliderMid:
     case VSBSliderMidHover:
         pixmaps[item] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
         break;
         case VSBSliderTopBg:
         pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV /*, true*/);
         break;
     case VSBSliderBtmBg:
         pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV /*, true*/);
         break;
     case VSBSliderMidBg:
         pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
         break;
 
         case HSlider:
         pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV /*, true*/);
         break;
     case HSBSliderTop:
     case HSBSliderTopHover:
         pixmaps[item] = processEmbedded("sbslider_top", btnH, btnS, btnV, true );
         *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
         break;
     case HSBSliderBtm:
     case HSBSliderBtmHover:
         pixmaps[item] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true );
         *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
         break;
     case HSBSliderMid:
     case HSBSliderMidHover:
         pixmaps[item] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
         *pixmaps[item] = pixmaps[item]->xForm(rMatrix);
         break;
     case HSBSliderTopBg:
         pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true );
         *pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix);
         break;
     case HSBSliderBtmBg:
         pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true );
         *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
         break;
     case HSBSliderMidBg:
         pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
         *pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix);
         break;
     default:
         break;
     }
     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;
         }
     }
     lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
     btnDict.clear();
     btnBorderDict.clear();
     bevelFillDict.clear();
     smallBevelFillDict.clear();
 
     Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
         int contrast = config. readNumEntry ( "StippleContrast", 5 );
         if ( contrast < 0 )
                 contrast = 0;
         else if ( contrast > 10 )
                 contrast = 10;
 
 //    QPalette pal = QApplication::palette();
 
     // button color stuff
     config. setGroup ( "Appearance" );
-    QColor c = 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 ))) {
+    QColor c = appPal. color ( QPalette::Active, QColorGroup::Button );
+    if ( c == appPal. color ( QPalette::Active, QColorGroup::Background )) {
         // force button color to be different from background
         QBrush btnBrush(QColor(200, 202, 228));
         appPal.setBrush(QColorGroup::Button, btnBrush);
     }
     c.hsv(&btnH, &btnS, &btnV);
     c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV);
 
     // menu pixmap
     if(!menuPix){
         menuPix = new QPixmap;
         menuPix->resize(64, 64);
     }
     QPainter painter;
     menuPix->fill(c.rgb());
     painter.begin(menuPix);
     painter.setPen(c.dark(105));
     for(i=0; i < 63; i+=4){
         painter.drawLine(0, i, 63, i);
         painter.drawLine(0, i+1, 63, i+1);
     };
     painter.end();
     menuBrush.setColor(c);
     menuBrush.setPixmap(*menuPix);
 
     // pager brush
     c = c.dark(120);
     QPixmap *pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
     if(!pix){
         int h, s, v;
         c.hsv(&h, &s, &v);
         pix = new QPixmap(*smallBevelFillPix);
         adjustHSV(*pix, h, s, v);
         smallBevelFillDict.insert(c.rgb(), pix);
     }
 //    pagerHoverBrush.setColor(c);
 //    pagerHoverBrush.setPixmap(*pix);
 
     c = c.dark(120);
     pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
     if(!pix){
         int h, s, v;
         c.hsv(&h, &s, &v);
         pix = new QPixmap(*smallBevelFillPix);
         adjustHSV(*pix, h, s, v);
         smallBevelFillDict.insert(c.rgb(), pix);
     }
 //    pagerBrush.setColor(c);
 //    pagerBrush.setPixmap(*pix);
 
     // background color stuff
-    c = oldqte ? QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )))
-               : appPal. color ( QPalette::Active, QColorGroup::Background );
+    c = appPal. color ( QPalette::Active, QColorGroup::Background );
 
     c.hsv(&bH, &bS, &bV);
     c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
 
     // FIXME?
     if(vsbSliderFillPix)
         delete vsbSliderFillPix;
     vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix));
     adjustHSV(*vsbSliderFillPix, bH, bS, bV);
 
     // background brush
     QPixmap wallPaper(32, 32);
     wallPaper.fill(c.rgb());
     painter.begin(&wallPaper);
     for(i=0; i < 32; i+=4){
         painter.setPen(c.dark(100 + contrast));
         painter.drawLine(0, i, 32, i);
         painter.setPen(c.dark(100 + 3 * contrast / 5 ) );
         painter.drawLine(0, i+1, 32, i+1);
     };
     painter.end();
     bgBrush.setColor(c);
     bgBrush.setPixmap(wallPaper);
     appPal.setBrush(QColorGroup::Background, bgBrush);
 }
 
 void LiquidStyle::polish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         //((QFrame*)w)->setLineWidth(0);
         w->setBackgroundMode(QWidget::PaletteBackground);
         w->setBackgroundOrigin(QWidget::ParentOrigin);
         return;
     }
     if(w->inherits("QToolBar")){
         w->installEventFilter(this);
         w->setBackgroundMode(QWidget::PaletteBackground);
         w->setBackgroundOrigin(QWidget::WidgetOrigin);
         return;
     }
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::NoBackground);
     else if(w-> testWFlags(Qt::WType_Popup) && 
             !w->inherits("QListBox") && 
             ( qstrcmp ( w-> name(), "automatic what's this? widget" ) != 0 )) {
             w->installEventFilter(menuHandler);
     }
     
     if(w->isTopLevel()){
         return;
     }
    
     if(w->inherits("QRadioButton") || w->inherits("QCheckBox") || w->inherits("QProgressBar")) {
         w->installEventFilter(this);
     }
 
     if(w->inherits("QButton") || w-> inherits("QComboBox")){
             w-> setBackgroundMode ( QWidget::PaletteBackground );
             w->setBackgroundOrigin ( QWidget::ParentOrigin);
     }
 
     bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
         qstrcmp(w->name(), "qt_clipped_viewport") == 0;
     bool isViewportChild = w->parent() &&
         ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
          (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
 
     if(isViewport && w->parent() && qstrcmp(w->parent()->name(), "proxyview") == 0){
         w->setBackgroundMode(QWidget::X11ParentRelative);
         return;
     }
     if(isViewportChild){
         if(w->inherits("QButton") || w->inherits("QComboBox")){
             if(w->parent()){ // heh, only way to test for KHTML children ;-)
                 if(w->parent()->parent()){
                     if(w->parent()->parent()->parent() &&
                        w->parent()->parent()->parent()->inherits("KHTMLView")){
                         w->setAutoMask(true);
                         w->setBackgroundMode(QWidget::NoBackground);
                     }
                 }
             }
             return;
         }
     }
     if(w->inherits("QHeader")){
         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->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
        palette().active().brush(QColorGroup::Background).pixmap()){
         qWarning("No parent pixmap for child widget %s", w->className());
         return;
     }
     if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
            !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
         if(w->backgroundMode() == QWidget::PaletteBackground ||
            w->backgroundMode() == QWidget::PaletteButton){
             w->setBackgroundMode(w->parentWidget()->backgroundMode( )/*QWidget::X11ParentRelative*/);
             w->setBackgroundOrigin(QWidget::ParentOrigin);
         //              w->setBackgroundMode(QWidget::NoBackground);
         }
     }
     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 );
         }
 }