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

1 files changed, 4 insertions, 4 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
@@ -292,10 +292,10 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
         
         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;
         bgTypeClicked ( tc. m_bg_type );
         m_fontuse-> setChecked ( tc. m_font_use );
@@ -356,7 +356,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
     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 & )));
         hb-> addWidget ( m_solidcolor );
         hb-> addStretch ( 10 );
@@ -422,7 +422,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
         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 );