5 files changed, 11 insertions, 14 deletions

diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 5981d0b..4c9942f 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -294,6 +294,6 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
         iconSizeClicked ( tc. m_view );
-        m_iconcolor-> setColor ( QColor ( m_tc. m_text_color ));
+        //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color ));
         iconColorClicked ( m_iconcolor-> color ( ));
         m_bgtype-> setButton ( tc. m_bg_type );
-        m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
+        //m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
         m_bgimage = tc. m_bg_image;
@@ -358,3 +358,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     
-        m_solidcolor = new OColorButton ( tab );
+        m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
         connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & )));
@@ -424,3 +424,3 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
         
-        m_iconcolor = new OColorButton ( tab );
+        m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) );
         connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & )));
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 4734c0c..ddb6c4f 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -42,3 +42,3 @@ public:
 
-OColorButton::OColorButton ( QWidget *parent, const char *name ) 
+OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name )
         : QPushButton ( parent, name )
@@ -47,3 +47,3 @@ OColorButton::OColorButton ( QWidget *parent, const char *name )
         
-        d-> m_menu = new ColorPopupMenu ( black, 0, 0 );
+        d-> m_menu = new ColorPopupMenu ( color, 0, 0 );
         setPopup ( d-> m_menu );
@@ -52,3 +52,3 @@ OColorButton::OColorButton ( QWidget *parent, const char *name )
         
-        updateColor ( black );
+        updateColor ( color );
         
diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h
index ec04833..fe40fae 100644
--- a/libopie/ocolorbutton.h
+++ b/libopie/ocolorbutton.h
@@ -39,3 +39,3 @@ class OColorButton : public QPushButton {
 public:
-        OColorButton ( QWidget *parent = 0, const char *name = 0 );
+        OColorButton ( QWidget *parent = 0, const QColor & = black, const char *name = 0 );
         virtual ~OColorButton ( );
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
@@ -54,4 +54,3 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
         
-        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
@@ -80,8 +80,6 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 
-        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 );