summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
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
@@ -48,3 +48,3 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
48 m_colors = colors; 48 m_colors = colors;
49 49
50 for ( int i = 0; i < cnt; i++ ) 50 for ( int i = 0; i < cnt; i++ )
@@ -53,5 +53,4 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
53 layout-> addWidget ( l, i, 0 ); 53 layout-> addWidget ( l, i, 0 );
54 54
55 m_buttons [i] = new OColorButton ( this ); 55 m_buttons [i] = new OColorButton ( this, colors [i] );
56 m_buttons [i]-> setColor ( colors [i] );
57 layout-> addWidget ( m_buttons [i], i, 1 ); 56 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
@@ -44,3 +44,3 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
44 setCaption ( tr( "Liquid Style" ) ); 44 setCaption ( tr( "Liquid Style" ) );
45 45
46 Config config ( "qpe" ); 46 Config config ( "qpe" );
@@ -67,7 +67,7 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
67 cb-> insertItem ( tr( "Custom translucency" ), Custom ); 67 cb-> insertItem ( tr( "Custom translucency" ), Custom );
68 68
69 cb-> setCurrentItem ( m_type ); 69 cb-> setCurrentItem ( m_type );
70 vbox-> addWidget ( cb ); 70 vbox-> addWidget ( cb );
71 71
72 72
73 QGridLayout *grid = new QGridLayout ( vbox ); 73 QGridLayout *grid = new QGridLayout ( vbox );
@@ -75,3 +75,3 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
75 grid-> addColSpacing ( 3, 8 ); 75 grid-> addColSpacing ( 3, 8 );
76 76
77 grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 ); 77 grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
@@ -80,8 +80,6 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
80 80
81 m_menubtn = new OColorButton ( this ); 81 m_menubtn = new OColorButton ( this, mcol );
82 m_menubtn-> setColor ( mcol );
83 grid-> addWidget ( m_menubtn, 0, 2 ); 82 grid-> addWidget ( m_menubtn, 0, 2 );
84 83
85 m_textbtn = new OColorButton ( this ); 84 m_textbtn = new OColorButton ( this, tcol );
86 m_textbtn-> setColor ( tcol );
87 grid-> addWidget ( m_textbtn, 0, 5 ); 85 grid-> addWidget ( m_textbtn, 0, 5 );
@@ -94,5 +92,5 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
94 grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 ); 92 grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
95 93
96 vbox-> addSpacing ( 4 ); 94 vbox-> addSpacing ( 4 );
97 95
98 QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this ); 96 QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this );