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

1 files changed, 32 insertions, 32 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
@@ -105,3 +105,3 @@ public:
 		viewport ( )-> setUpdatesEnabled ( false );
-		
+
 		switch ( m ) {
@@ -184,3 +184,3 @@ public:
 	}
-	
+
 	void setItemTextPos ( ItemTextPos pos )
@@ -245,3 +245,3 @@ public:
 	}
-	
+
 	void drawBackground ( QPainter *p, const QRect &r )
@@ -265,3 +265,3 @@ private:
 
-TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) 
+TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl )
 	: QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
@@ -269,31 +269,31 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 	setCaption ( tr( "Edit Tab" ));
-	
+
 	QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
-	
+
 	OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
 	QWidget *bgtab;
-	       
+
 	tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" ));
 	tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
-	tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) );	                           
-	
-	tw-> setCurrentTab ( bgtab );                                       
-	
-	QWidget *sample = new QVBox ( this );	
+	tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) );
+
+	tw-> setCurrentTab ( bgtab );
+
+	QWidget *sample = new QVBox ( this );
 	QTabBar *tb = new QTabBar ( sample );
 	QString name ( tr( "Previewing %1" ). arg ( tabname ));
-	
+
 	tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name ));
-	
+
 	m_sample = new SampleView ( sample );
-			
+
 	lay-> addWidget ( tw, 10 );
 	lay-> addWidget ( sample, 1 );
-	
+
 	m_iconsize-> setButton ( tc. m_view );
 	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;
@@ -321,5 +321,5 @@ QWidget *TabDialog::createFontTab ( QWidget *parent )
 
-    m_fontselect = new OFontSelector ( false, tab, "fontsel" );    
+    m_fontselect = new OFontSelector ( false, tab, "fontsel" );
     vertLayout-> addWidget ( m_fontselect );
-    
+
 	connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool )));
@@ -328,3 +328,3 @@ QWidget *TabDialog::createFontTab ( QWidget *parent )
 
-    return tab; 
+    return tab;
 }
@@ -335,3 +335,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
-        
+
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
@@ -354,7 +354,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
-    m_bgtype-> insert ( rb, TabConfig::SolidColor ); 
+    m_bgtype-> insert ( rb, TabConfig::SolidColor );
     hb-> addWidget ( rb );
 	hb-> addSpacing ( 10 );
-    
-	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 & )));
@@ -367,3 +367,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 	hb-> setSpacing ( 3 );
-	
+
 	rb = new QRadioButton( tr( "Image" ), tab, "image" );
@@ -372,3 +372,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     hb-> addSpacing ( 10 );
-    
+
 	m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
@@ -409,3 +409,3 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
     gridLayout-> addWidget( rb, 0, 1 );
-    
+
     rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
@@ -420,9 +420,9 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
 	gridLayout-> addRowSpacing ( 2, 8 );
-	
+
 	label = new QLabel ( tr( "Color:" ), tab );
 	gridLayout-> addWidget ( label, 3, 0 );
-	
-	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 & )));
-	gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );        	
+	gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );