Added two new settings to liquid-style / Liquid-Settings:

 - en/disable the new window decoration
 - set the stipple contrast (from no stipple to twice the normal value)

4 files changed, 58 insertions, 15 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 313d52c..acf0a42 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -78,7 +78,7 @@ void TransMenuHandler::reloadSettings()
     pixDict.clear();
 
     Config config ( "qpe" );
-    config. setGroup ( "MosfetMenus" );
+    config. setGroup ( "Liquid-Style" );
 
     type = config. readNumEntry("Type", TransStippleBg);
     color = QColor ( config. readEntry("Color",  QApplication::palette().active().button().name()));
@@ -710,6 +710,13 @@ void LiquidStyle::polish(QPalette &appPal)
     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
@@ -781,9 +788,9 @@ void LiquidStyle::polish(QPalette &appPal)
     wallPaper.fill(c.rgb());
     painter.begin(&wallPaper);
     for(i=0; i < 32; i+=4){
-        painter.setPen(c.dark(105));
+        painter.setPen(c.dark(100 + contrast));
         painter.drawLine(0, i, 32, i);
-        painter.setPen(c.dark(103));
+        painter.setPen(c.dark(100 + 3 * contrast / 5 ) );
         painter.drawLine(0, i+1, 32, i+1);
     };
     painter.end();
@@ -989,6 +996,10 @@ 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 ( ));
 }
 
diff --git a/noncore/styles/liquid/liquiddeco.cpp b/noncore/styles/liquid/liquiddeco.cpp
index 8eee1b1..5488c67 100644
--- a/noncore/styles/liquid/liquiddeco.cpp
+++ b/noncore/styles/liquid/liquiddeco.cpp
@@ -98,12 +98,6 @@ void LiquidDecoration::paint( QPainter *painter, const QWidget *widget )
         painter->setClipRegion( oldClip );
 
         if ( titleWidth > 0 ) {
-                QBrush titleBrush;
-                QPen titlePen;
-                QPen titleLines;
-                int titleLeft = titleHeight + 4;
-
-                titleLeft = rect.left() + 5;
                 painter->setPen( cg.midlight() );
                 painter->drawLine( rect.left() - BORDER_WIDTH + 2,
                                    rect.bottom() + 1, rect.right() + BORDER_WIDTH - 2,
@@ -124,7 +118,7 @@ void LiquidDecoration::paint( QPainter *painter, const QWidget *widget )
                 painter-> setFont( f );
 
                 QColor textcol = cg.color( isActive ? QColorGroup::HighlightedText : QColorGroup::Text );
-                QColor shadecol = ( qGray ( textcol. rgb ( ) ) > 128 ) ? textcol. dark ( 130 ) : textcol.light( 200 );
+                QColor shadecol = ( qGray ( textcol. rgb ( ) ) > 128 ) ? textcol. dark ( 230 ) : textcol.light( 300 );
 
                 if ( textcol == shadecol ) {
                         if ( qGray ( shadecol. rgb ( ) ) < 128 )
diff --git a/noncore/styles/liquid/settings/liquidset.cpp b/noncore/styles/liquid/settings/liquidset.cpp
index 0ef5dbe..1479ac0 100644
--- a/noncore/styles/liquid/settings/liquidset.cpp
+++ b/noncore/styles/liquid/settings/liquidset.cpp
@@ -44,9 +44,14 @@ static void changeButtonColor ( QWidget *btn, const QColor &col )
 {
         QPalette pal = btn-> palette ( );
 
+        pal. setColor ( QPalette::Normal, QColorGroup::Button, col );
         pal. setColor ( QPalette::Active, QColorGroup::Button, col );
         pal. setColor ( QPalette::Disabled, QColorGroup::Button, col );
         pal. setColor ( QPalette::Inactive, QColorGroup::Button, col );
+        pal. setColor ( QPalette::Normal, QColorGroup::Background, col );
+        pal. setColor ( QPalette::Active, QColorGroup::Background, col );
+        pal. setColor ( QPalette::Disabled, QColorGroup::Background, col );
+        pal. setColor ( QPalette::Inactive, QColorGroup::Background, col );
 
         btn-> setPalette ( pal );
 }
@@ -58,13 +63,15 @@ LiquidSet::LiquidSet ( QWidget* parent, const char *name, WFlags fl )
         setCaption ( tr( "Liquid Style" ) );
         
         Config config ( "qpe" );
-    config. setGroup ( "MosfetMenus" );
+    config. setGroup ( "Liquid-Style" );
 
         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 );
+        m_deco       = config. readBoolEntry ( "WinDecoration", true );
+        int contrast = config. readNumEntry ( "StippleContrast", 5 );
 
         QVBoxLayout *vbox = new QVBoxLayout ( this );
         vbox-> setSpacing ( 3 );
@@ -138,14 +145,35 @@ LiquidSet::LiquidSet ( QWidget* parent, const char *name, WFlags fl )
         
         vbox-> addSpacing ( 4 );
         
-        QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed text" ), this );
+        QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this );
         shadow-> setChecked ( m_shadow );
         vbox-> addWidget ( shadow );
         
+        vbox-> addSpacing ( 4 );
+        
+        QCheckBox *windeco = new QCheckBox ( tr( "Draw liquid window title bars" ), this );
+        windeco-> setChecked ( m_deco );
+        vbox-> addWidget ( windeco );
+
+        vbox-> addSpacing ( 4 );
+        
+        QHBoxLayout *hbox = new QHBoxLayout ( vbox );
+        
+        hbox-> addWidget ( new QLabel ( tr( "Stipple contrast" ), this )); 
+        
+        m_contsld = new QSlider ( Horizontal, this );
+        m_contsld-> setRange ( 0, 10 );
+        m_contsld-> setValue ( contrast );
+        m_contsld-> setTickmarks ( QSlider::Below );
+        hbox-> addWidget ( m_contsld, 10 );
+        
         vbox-> addStretch ( 10 );
         
+        changeType ( m_type );
+        
         connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( changeType ( int ) ) );
         connect ( shadow, SIGNAL( toggled ( bool ) ), this, SLOT( changeShadow ( bool ) ) );
+        connect ( windeco, SIGNAL( toggled ( bool ) ), this, SLOT( changeDeco ( bool ) ) );
 }
 
 void LiquidSet::changeType ( int t )
@@ -164,13 +192,13 @@ void LiquidSet::changeType ( int t )
 
 void LiquidSet::changeMenuColor ( const QColor &col )
 {
-        m_menubtn-> setPalette ( col );
+        changeButtonColor ( m_menubtn, col );
         m_menucol = col;
 }
 
 void LiquidSet::changeTextColor ( const QColor &col )
 {
-        m_textbtn-> setPalette ( col );
+        changeButtonColor ( m_textbtn, col );
         m_textcol = col;
 }
 
@@ -179,17 +207,24 @@ void LiquidSet::changeShadow ( bool b )
         m_shadow = b;
 }
 
+void LiquidSet::changeDeco ( bool b )
+{
+        m_deco = b;
+}
+
 
 void LiquidSet::accept ( )
 {
         Config config ( "qpe" );
-    config. setGroup ( "MosfetMenus" );
+    config. setGroup ( "Liquid-Style" );
 
         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. writeEntry ( "WinDecoration", m_deco );
+        config. writeEntry ( "StippleContrast", m_contsld-> value ( ));
         config. write ( );
 
         Global::applyStyle ( );
diff --git a/noncore/styles/liquid/settings/liquidset.h b/noncore/styles/liquid/settings/liquidset.h
index 944b1ec..a0f590a 100644
--- a/noncore/styles/liquid/settings/liquidset.h
+++ b/noncore/styles/liquid/settings/liquidset.h
@@ -19,6 +19,7 @@ public slots:
         void changeMenuColor ( const QColor &col );
         void changeTextColor ( const QColor &col );
         void changeShadow ( bool b );
+        void changeDeco ( bool b );
 
 protected:
         virtual void accept ( );
@@ -28,8 +29,10 @@ private:
         QColor m_textcol;
         int    m_type;
         bool   m_shadow;
+        bool   m_deco;
         
         QSlider *    m_opacsld;
+        QSlider *    m_contsld;
         QLabel *     m_menulbl;
         QLabel *     m_textlbl;
         QLabel *     m_opaclbl;