Enhanced liquid style:

 1) All WType_Popup's now get a transparent background (volume-applet)
 2) Settings/Liquid Settings - a new app that acts like the KDE Control
    Panel page for Liquid

1 files changed, 53 insertions, 4 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 5f014ad..4653639 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -74,30 +74,35 @@ TransMenuHandler::TransMenuHandler(QObject *parent)
 
 void TransMenuHandler::reloadSettings()
 {
     pixDict.clear();
 
     Config config ( "qpe" );
     config. setGroup ( "MosfetMenus" );
 
     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)
 {
-    QPopupMenu *p = (QPopupMenu *)obj;
+    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());
@@ -109,32 +114,68 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
                 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"))
+                pixDict.insert(p->winId(), pix);
+            else {
+                    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"))
+                pixDict.remove(p->winId());
+            else {
+                    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;
+            }
+        }
+    }
+    else if(ev->type() == QEvent::Paint){
+        if(type == TransStippleBg || type == TransStippleBtn ||
+           type == Custom){
+//            qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
+
+            if (!p->inherits("QPopupMenu"))
+                    p->erase();
         }
     }
     return(false);
 }
 
 
 LiquidStyle::LiquidStyle()
     :QWindowsStyle()
 {
     setName ( "LiquidStyle" );
 
     btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
@@ -787,28 +828,33 @@ void LiquidStyle::polish(QPalette &appPal)
 
 }
 
 void LiquidStyle::polish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         //((QFrame*)w)->setLineWidth(0);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::NoBackground);
-
+    else if(w-> testWFlags(Qt::WType_Popup)) {
+            printf("install popup: %s\n", w-> className ( ));
+            w->installEventFilter(menuHandler);
+    }
+    
     if(w->isTopLevel()){
         return;
     }
+   
     
     w-> setBackgroundOrigin ( QWidget::ParentOrigin );
 
     if(w->inherits("QComboBox") ||
        w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
        w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
         w->installEventFilter(this);
     }
     if(w->inherits("QLineEdit")){
         QPalette pal = w->palette();
         pal.setBrush(QColorGroup::Base, baseBrush);
         w->setPalette(pal);
@@ -877,24 +923,27 @@ void LiquidStyle::polish(QWidget *w)
 }
 
 void LiquidStyle::unPolish(QWidget *w)
 {
     if(w->inherits("QMenuBar")){
         ((QFrame *)w)->setLineWidth(1);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
 
     if(w->inherits("QPopupMenu"))
         w->setBackgroundMode(QWidget::PaletteButton);
+    else if(w-> testWFlags(Qt::WType_Popup)) {
+            w->removeEventFilter(menuHandler);
+    }
 
     if(w->isTopLevel())
         return;
 
     // 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());
     if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
         if(w->inherits("QPushButton"))