-rw-r--r-- | noncore/settings/appearance2/editScheme.cpp | 3 | ||||
-rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 6 |
2 files changed, 3 insertions, 6 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 @@ -49,14 +49,13 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget 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 ); } } EditScheme::~EditScheme ( ) { 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 @@ -75,18 +75,16 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) 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 ); m_opacsld-> setRange ( -20, 20 ); m_opacsld-> setSteps ( 1, 1 ); m_opacsld-> setValue ( opacity ); |