Diffstat (limited to 'noncore/styles/liquid/settings') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/styles/liquid/settings/liquidset.cpp | 45 | ||||
-rw-r--r-- | noncore/styles/liquid/settings/liquidset.h | 3 |
2 files changed, 43 insertions, 5 deletions
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 @@ -35,45 +35,52 @@ #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::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 ); } LiquidSet::LiquidSet ( QWidget* parent, const char *name, WFlags fl ) : QDialog ( parent, name, 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 ); vbox-> setMargin ( 6 ); QButtonGroup *btngrp = new QButtonGroup ( this ); btngrp-> hide ( ); QRadioButton *rad; rad = new QRadioButton ( tr( "No translucency" ), this ); btngrp-> insert ( rad, None ); @@ -129,71 +136,99 @@ LiquidSet::LiquidSet ( QWidget* parent, const char *name, WFlags fl ) 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 ); + 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 ) { 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 ); + changeButtonColor ( m_menubtn, col ); m_menucol = col; } void LiquidSet::changeTextColor ( const QColor &col ) { - m_textbtn-> setPalette ( col ); + changeButtonColor ( m_textbtn, col ); m_textcol = col; } 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 ( ); QDialog::accept ( ); } 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 @@ -10,30 +10,33 @@ 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 ); + void changeDeco ( bool b ); protected: virtual void accept ( ); private: QColor m_menucol; 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; QToolButton *m_menubtn; QToolButton *m_textbtn; }; #endif |