8 files changed, 357 insertions, 5 deletions

diff --git a/apps/Settings/Liquid.desktop b/apps/Settings/Liquid.desktop
new file mode 100644
index 0000000..8a1727f
--- a/dev/null
+++ b/apps/Settings/Liquid.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Exec=liquid-settings
+Icon=liquid/Liquid
+Name=Liquid-Settings
+Name[de]=Liquid-Einstellungen
+
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
@@ -1,256 +1,297 @@
 /*-
  * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
  */
 
 
 
 #ifndef INCLUDE_MENUITEM_DEF
 #define INCLUDE_MENUITEM_DEF
 #endif
 
 #include <qmenudata.h>
 #include "liquid.h"
 #include <qapplication.h>
 #include <qpe/config.h>
 #include "effects.h"
 #include <qpalette.h>
 #include <qbitmap.h>
 #include <qtabbar.h>
 #include <qpopupmenu.h>
 #include <qobjectlist.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include <qpixmapcache.h>
 #include <qradiobutton.h>
 #include <qcombobox.h>
 #include <qdrawutil.h>
 #include <qwidgetlist.h>
 #include <qtoolbutton.h>
 #include <qheader.h>
 #include <unistd.h>
 #include <qmenubar.h>
 
 
 #include <stdio.h>
 
 #include "htmlmasks.h"
 #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 ( "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());
                 }
                 *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"))
+                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);
     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);
     customBtnColorList.setAutoDelete(true);
     customBtnIconList.setAutoDelete(true);
     customBtnLabelList.setAutoDelete(true);
 
     rMatrix.rotate(270.0);
     highcolor = QPixmap::defaultDepth() > 8;
     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);
         }
@@ -671,346 +712,354 @@ void LiquidStyle::polish(QPalette &appPal)
 
     loadCustomButtons();
     lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
     btnDict.clear();
     btnBorderDict.clear();
     bevelFillDict.clear();
     smallBevelFillDict.clear();
 
     Config config ( "qpe" );
     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 ( )))) {
         // 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 = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));
     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(105));
         painter.drawLine(0, i, 32, i);
         painter.setPen(c.dark(103));
         painter.drawLine(0, i+1, 32, i+1);
     };
     painter.end();
     bgBrush.setColor(c);
     bgBrush.setPixmap(wallPaper);
     appPal.setBrush(QColorGroup::Background, bgBrush);
 
     // lineedits
     c = QColor ( config. readEntry("Base", ( Qt::white). name ( )));
     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){
         painter.drawLine(0, i, 32, i);
         painter.drawLine(0, i+1, 32, i+1);
     };
     painter.end();
     baseBrush.setColor(c);
     baseBrush.setPixmap(basePix);
     it.toFirst();
     while ((w=it.current()) != 0 ){
         ++it;
         if(w->inherits("QLineEdit")){
             QPalette pal = w->palette();
             pal.setBrush(QColorGroup::Base, baseBrush);
             w->setPalette(pal);
         }
         else if(w->inherits("QPushButton")){
             applyCustomAttributes((QPushButton *)w);
         }
     }
 
 }
 
 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);
     }
     if(w->inherits("QPushButton")){
         applyCustomAttributes((QPushButton *)w);
         w->installEventFilter(this);
     }
     if(w->inherits("QButton") || w-> inherits("QComboBox")){
             w-> setBackgroundMode ( QWidget::PaletteBackground );
     }
 
     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")) {
             ((QToolButton*)w)->setAutoRaise (false);
     }
     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(QWidget::X11ParentRelative);
         }
     }
     if(w->inherits("QToolBar")){
         w->installEventFilter(this);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
 
 }
 
 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"))
             w->setBackgroundMode(QWidget::PaletteButton);
         else
             w->setBackgroundMode(QWidget::PaletteBackground);
     }
 
     if(isViewportChild)
         w->setAutoMask(false);
 
     if(w->inherits("QPushButton")){
         unapplyCustomAttributes((QPushButton *)w);
         w->removeEventFilter(this);
     }
 /*
     if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
             w-> setBackgroundMode ( PaletteBackground );
     }
 */
     if(w->inherits("QComboBox") ||
        w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
        w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
         w->removeEventFilter(this);
     }
     if(w->inherits("QButton") || w->inherits("QComboBox")){
         if(w->parent() && w->parent()->inherits("KHTMLPart")){
             w->setAutoMask(false);
         }
     }
     if(w->inherits("QToolBar")){
         w->removeEventFilter(this);
         w->setBackgroundMode(QWidget::PaletteBackground);
         return;
     }
     if(w->inherits("QHeader")){
         w->setMouseTracking(false);
         w->removeEventFilter(this);
     }
 }
 
 void LiquidStyle::polish(QApplication *app)
 {
 
     QWindowsStyle::polish(app);
     menuAni = app->isEffectEnabled(UI_AnimateMenu);
     menuFade = app->isEffectEnabled(UI_FadeMenu);
     if(menuAni)
         app->setEffectEnabled(UI_AnimateMenu, false);
     if(menuFade)
         app->setEffectEnabled(UI_FadeMenu, false);
         
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
 }
 
 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 );
 }
 
 /*
  * 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,
  * QComboBox, and Panel applet handles capture mouse enter and leaves in order
  * to set the highlightwidget and repaint for mouse hovers. CheckBoxes and
  * RadioButtons need to do this differently. Qt buffers these in pixmaps and
  * caches them in QPixmapCache, which is bad for doing things like hover
  * because the style methods aren't called in paintEvents if everything
  * is cached. We use our own Paint event handler instead. Taskbuttons and
  * pager buttons draw into a pixmap buffer, so we handle those with palette
  * modifications. For QHeader, different header items are actually one widget
  * that draws multiple items, so we need to check which ID is hightlighted
  * and draw it. Finally, we also check enter and leave events for QLineEdit,
  * since if it's inside a combobox we want to highlight the combobox during
  * hovering in the edit.
  */
 bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
 {
     if(obj->inherits("QToolBar")){
         if(ev->type() == QEvent::Resize){
             const QObjectList *tbChildList = obj->children();
             QObjectListIt it(*tbChildList);
             QObject *child;
             while((child = it.current()) != NULL){
                 ++it;
                 if(child->isWidgetType())
                     ((QWidget *)child)->repaint(true);
             }
 
         }
     }
     else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
         QWidget *btn = (QWidget *)obj;
         if(ev->type() == QEvent::Enter){
             if(btn->isEnabled()){
                 highlightWidget = btn;
                 btn->repaint(false);
             }
         }
         else if(ev->type() == QEvent::Leave){
             if(btn == highlightWidget){
                 highlightWidget = NULL;
                 btn->repaint(false);
             }
         }
     }
     else if(obj->inherits("QToolButton")){
         QToolButton *btn = (QToolButton *)btn;
         if(!btn->autoRaise()){
             if(btn->isEnabled()){
                 highlightWidget = btn;
                 btn->repaint(false);
             }
         }
diff --git a/noncore/styles/liquid/opie-liquid.control b/noncore/styles/liquid/opie-liquid.control
index 7b6ae71..6311dee 100644
--- a/noncore/styles/liquid/opie-liquid.control
+++ b/noncore/styles/liquid/opie-liquid.control
@@ -1,10 +1,10 @@
-Files: plugins/styles/libliquid.so*
+Files: plugins/styles/libliquid.so* bin/liquid-settings apps/Settings/Liquid.desktop pics/liquid/Liquid.png
 Priority: optional
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: opie-base ($QPE_VERSION)
 Description: Liquid style by Mosfet.
  Mosfet's well known Liquid GUI style from KDE,
 ported to OPIE.
diff --git a/noncore/styles/liquid/settings/liquidset.cpp b/noncore/styles/liquid/settings/liquidset.cpp
new file mode 100644
index 0000000..0ef5dbe
--- a/dev/null
+++ b/noncore/styles/liquid/settings/liquidset.cpp
@@ -0,0 +1,199 @@
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+
+
+#include "liquidset.h"
+#include "../liquid.h"
+
+#include <qpe/qpeapplication.h>
+#include <qpe/global.h>
+
+#include <qslider.h>
+#include <qtoolbutton.h>
+#include <qbuttongroup.h>
+#include <qradiobutton.h>
+#include <qcheckbox.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpalette.h>
+
+#include <qpe/config.h>
+
+#include <opie/colorpopupmenu.h>
+
+
+static void changeButtonColor ( QWidget *btn, const QColor &col )
+{
+        QPalette pal = btn-> palette ( );
+
+        pal. setColor ( QPalette::Active, QColorGroup::Button, col );
+        pal. setColor ( QPalette::Disabled, QColorGroup::Button, col );
+        pal. setColor ( QPalette::Inactive, QColorGroup::Button, col );
+
+        btn-> setPalette ( pal );
+}
+
+
+LiquidSet::LiquidSet ( QWidget* parent, const char *name, WFlags fl )
+                : QDialog ( parent, name, fl )
+{
+        setCaption ( tr( "Liquid Style" ) );
+        
+        Config config ( "qpe" );
+    config. setGroup ( "MosfetMenus" );
+
+        m_type      = config. readNumEntry ( "Type", TransStippleBg );
+        m_menucol   = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
+        m_textcol   = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
+        int opacity = config. readNumEntry ( "Opacity", 10 );
+        m_shadow    = config. readBoolEntry ( "ShadowText", true );
+
+        QVBoxLayout *vbox = new QVBoxLayout ( this );
+        vbox-> setSpacing ( 3 );
+        vbox-> setMargin ( 6 );
+
+        QButtonGroup *btngrp = new QButtonGroup ( this );
+        btngrp-> hide ( );
+
+        QRadioButton *rad;
+        
+        rad = new QRadioButton ( tr( "No translucency" ), this );
+        btngrp-> insert ( rad, None );
+        vbox-> addWidget ( rad );
+        
+        rad = new QRadioButton ( tr( "Stippled, background color" ), this );
+        btngrp-> insert ( rad, StippledBg );
+        vbox-> addWidget ( rad );
+        
+        rad = new QRadioButton ( tr( "Stippled, button color" ), this );
+        btngrp-> insert ( rad, StippledBtn );
+        vbox-> addWidget ( rad );
+        
+        rad = new QRadioButton ( tr( "Translucent stippled, background color" ), this );
+        btngrp-> insert ( rad, TransStippleBg );
+        vbox-> addWidget ( rad );
+        
+        rad = new QRadioButton ( tr( "Translucent stippled, button color" ), this );
+        btngrp-> insert ( rad, TransStippleBtn );
+        vbox-> addWidget ( rad );
+        
+        rad = new QRadioButton ( tr( "Custom translucency" ), this );
+        btngrp-> insert ( rad, Custom );
+        vbox-> addWidget ( rad );
+        
+        btngrp-> setExclusive ( true );
+        btngrp-> setButton ( m_type );
+        
+        QGridLayout *grid = new QGridLayout ( vbox );
+        grid-> addColSpacing ( 0, 16 );
+        grid-> addColSpacing ( 3, 8 );
+        
+        grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
+        grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
+        grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 );
+
+        m_menubtn = new QToolButton ( this );
+        grid-> addWidget ( m_menubtn, 0, 2 );
+
+        QPopupMenu *popup;
+
+        popup = new ColorPopupMenu ( m_menucol, this );
+        m_menubtn-> setPopup ( popup );
+        m_menubtn-> setPopupDelay ( 0 );
+        connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeMenuColor ( const QColor & )));
+        changeMenuColor ( m_menucol );
+
+        m_textbtn = new QToolButton ( this );
+        grid-> addWidget ( m_textbtn, 0, 5 );
+
+        popup = new ColorPopupMenu ( m_textcol, this );
+        m_textbtn-> setPopup ( popup );
+        m_textbtn-> setPopupDelay ( 0 );
+        connect ( popup, SIGNAL( colorSelected ( const QColor & )), this, SLOT( changeTextColor ( const QColor & )));
+        changeTextColor ( m_textcol );
+
+        m_opacsld = new QSlider ( Horizontal, this );
+        m_opacsld-> setRange ( -20, 20 );
+        m_opacsld-> setValue ( opacity );
+        m_opacsld-> setTickmarks ( QSlider::Below );
+        grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
+        
+        vbox-> addSpacing ( 4 );
+        
+        QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed text" ), this );
+        shadow-> setChecked ( m_shadow );
+        vbox-> addWidget ( shadow );
+        
+        vbox-> addStretch ( 10 );
+        
+        connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( changeType ( int ) ) );
+        connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) );
+}
+
+void LiquidSet::changeType ( int t )
+{
+        bool custom = ( t == Custom );
+        
+                m_menulbl-> setEnabled ( custom );
+                m_textlbl-> setEnabled ( custom );
+                m_opaclbl-> setEnabled ( custom );
+                m_menubtn-> setEnabled ( custom );
+                m_textbtn-> setEnabled ( custom );
+                m_opacsld-> setEnabled ( custom );
+        
+        m_type = t;
+}
+
+void LiquidSet::changeMenuColor ( const QColor &col )
+{
+        m_menubtn-> setPalette ( col );
+        m_menucol = col;
+}
+
+void LiquidSet::changeTextColor ( const QColor &col )
+{
+        m_textbtn-> setPalette ( col );
+        m_textcol = col;
+}
+
+void LiquidSet::changeShadow ( bool b )
+{
+        m_shadow = b;
+}
+
+
+void LiquidSet::accept ( )
+{
+        Config config ( "qpe" );
+    config. setGroup ( "MosfetMenus" );
+
+        config. writeEntry ( "Type", m_type  );
+        config. writeEntry ( "Color",  m_menucol. name ( ));
+        config. writeEntry ( "TextColor", m_textcol. name ( ));
+        config. writeEntry ( "Opacity", m_opacsld-> value ( ));
+                config. writeEntry ( "ShadowText", m_shadow );
+        config. write ( );
+
+        Global::applyStyle ( );
+
+        QDialog::accept ( );
+}
+
diff --git a/noncore/styles/liquid/settings/liquidset.h b/noncore/styles/liquid/settings/liquidset.h
new file mode 100644
index 0000000..944b1ec
--- a/dev/null
+++ b/noncore/styles/liquid/settings/liquidset.h
@@ -0,0 +1,39 @@
+#ifndef __OPIE_LIQUID_SET_H__
+#define __OPIE_LIQUID_SET_H__
+
+#include <qdialog.h>
+#include <qcolor.h>
+
+class QLabel;
+class QToolButton;
+class QSlider;
+
+class LiquidSet : public QDialog {
+        Q_OBJECT
+        
+public:
+        LiquidSet ( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
+
+public slots:
+        void changeType ( int t );
+        void changeMenuColor ( const QColor &col );
+        void changeTextColor ( const QColor &col );
+        void changeShadow ( bool b );
+
+protected:
+        virtual void accept ( );
+        
+private:
+        QColor m_menucol;
+        QColor m_textcol;
+        int    m_type;
+        bool   m_shadow;
+        
+        QSlider *    m_opacsld;
+        QLabel *     m_menulbl;
+        QLabel *     m_textlbl;
+        QLabel *     m_opaclbl;
+        QToolButton *m_menubtn;
+        QToolButton *m_textbtn;
+};
+#endif
diff --git a/noncore/styles/liquid/settings/main.cpp b/noncore/styles/liquid/settings/main.cpp
new file mode 100644
index 0000000..fd69007
--- a/dev/null
+++ b/noncore/styles/liquid/settings/main.cpp
@@ -0,0 +1,34 @@
+/**********************************************************************
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+**
+** This file is part of Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+#include "liquidset.h"
+
+#include <qpe/qpeapplication.h>
+
+
+int main ( int argc, char** argv )
+{
+        QPEApplication a ( argc, argv );
+
+        LiquidSet dlg;
+        a. showMainWidget ( &dlg );
+
+        return a. exec ( );
+}
diff --git a/noncore/styles/liquid/settings/settings.pro b/noncore/styles/liquid/settings/settings.pro
new file mode 100644
index 0000000..b385d92
--- a/dev/null
+++ b/noncore/styles/liquid/settings/settings.pro
@@ -0,0 +1,24 @@
+        TEMPLATE= app
+        CONFIG  += qt warn_on release
+        DESTDIR         = $(OPIEDIR)/bin
+        HEADERS         = liquidset.h
+        SOURCES         = liquidset.cpp main.cpp
+INCLUDEPATH += $(OPIEDIR)/include
+        DEPENDPATH+= ../$(OPIEDIR)/include
+LIBS            += -lqpe -lopie
+        TARGET  = liquid-settings
+
+TRANSLATIONS = ../../../i18n/de/liquid-settings.ts \
+         ../../../i18n/en/liquid-settings.ts \
+         ../../../i18n/es/liquid-settings.ts \
+         ../../../i18n/fr/liquid-settings.ts \
+         ../../../i18n/hu/liquid-settings.ts \
+         ../../../i18n/ja/liquid-settings.ts \
+         ../../../i18n/ko/liquid-settings.ts \
+         ../../../i18n/no/liquid-settings.ts \
+         ../../../i18n/pl/liquid-settings.ts \
+         ../../../i18n/pt/liquid-settings.ts \
+         ../../../i18n/pt_BR/liquid-settings.ts \
+         ../../../i18n/sl/liquid-settings.ts \
+         ../../../i18n/zh_CN/liquid-settings.ts \
+         ../../../i18n/zh_TW/liquid-settings.ts
diff --git a/pics/liquid/Liquid.png b/pics/liquid/Liquid.png
new file mode 100644
index 0000000..67647d0
--- a/dev/null
+++ b/pics/liquid/Liquid.png