summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/editScheme.cpp7
-rw-r--r--noncore/styles/liquid/liquidset.cpp20
2 files changed, 12 insertions, 15 deletions
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index c2e5355..eefeccc 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -46,14 +46,13 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
m_count = cnt;
m_buttons = new OColorButton * [cnt];
m_colors = colors;
-
+
for ( int i = 0; i < cnt; i++ )
{
QLabel *l = new QLabel ( labels [i], this );
layout-> addWidget ( l, i, 0 );
-
- m_buttons [i] = new OColorButton ( this );
- m_buttons [i]-> setColor ( colors [i] );
+
+ m_buttons [i] = new OColorButton ( this, colors [i] );
layout-> addWidget ( m_buttons [i], i, 1 );
}
}
diff --git a/noncore/styles/liquid/liquidset.cpp b/noncore/styles/liquid/liquidset.cpp
index 255456c..7747da7 100644
--- a/noncore/styles/liquid/liquidset.cpp
+++ b/noncore/styles/liquid/liquidset.cpp
@@ -42,7 +42,7 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
: QWidget ( parent, name, fl )
{
setCaption ( tr( "Liquid Style" ) );
-
+
Config config ( "qpe" );
config. setGroup ( "Liquid-Style" );
@@ -65,25 +65,23 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg );
cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn );
cb-> insertItem ( tr( "Custom translucency" ), Custom );
-
+
cb-> setCurrentItem ( m_type );
vbox-> addWidget ( cb );
-
-
+
+
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 OColorButton ( this );
- m_menubtn-> setColor ( mcol );
+ m_menubtn = new OColorButton ( this, mcol );
grid-> addWidget ( m_menubtn, 0, 2 );
- m_textbtn = new OColorButton ( this );
- m_textbtn-> setColor ( tcol );
+ m_textbtn = new OColorButton ( this, tcol );
grid-> addWidget ( m_textbtn, 0, 5 );
m_opacsld = new QSlider ( Horizontal, this );
@@ -92,9 +90,9 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
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 menu text" ), this );
shadow-> setChecked ( m_shadow );
vbox-> addWidget ( shadow );