Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.

1 files changed, 9 insertions, 11 deletions

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 )
 	setCaption ( tr( "Liquid Style" ) );
-	
+
 	Config config ( "qpe" );
@@ -67,7 +67,7 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 	cb-> insertItem ( tr( "Custom translucency" ), Custom );
-	
+
 	cb-> setCurrentItem ( m_type );
 	vbox-> addWidget ( cb );
-	
-	
+
+
 	QGridLayout *grid = new QGridLayout ( vbox );
@@ -75,3 +75,3 @@ 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 );
@@ -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 );
@@ -94,5 +92,5 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
 	grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
-	
+
 	vbox-> addSpacing ( 4 );
-	
+
 	QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this );