summaryrefslogtreecommitdiff
path: root/core/settings/launcher/tabdialog.cpp
Unidiff
Diffstat (limited to 'core/settings/launcher/tabdialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/settings/launcher/tabdialog.cpp8
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
292 292
293 m_iconsize-> setButton ( tc. m_view ); 293 m_iconsize-> setButton ( tc. m_view );
294 iconSizeClicked ( tc. m_view ); 294 iconSizeClicked ( tc. m_view );
295 m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); 295 //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color ));
296 iconColorClicked ( m_iconcolor-> color ( )); 296 iconColorClicked ( m_iconcolor-> color ( ));
297 m_bgtype-> setButton ( tc. m_bg_type ); 297 m_bgtype-> setButton ( tc. m_bg_type );
298 m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); 298 //m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
299 m_bgimage = tc. m_bg_image; 299 m_bgimage = tc. m_bg_image;
300 bgTypeClicked ( tc. m_bg_type ); 300 bgTypeClicked ( tc. m_bg_type );
301 m_fontuse-> setChecked ( tc. m_font_use ); 301 m_fontuse-> setChecked ( tc. m_font_use );
@@ -356,7 +356,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
356 hb-> addWidget ( rb ); 356 hb-> addWidget ( rb );
357 hb-> addSpacing ( 10 ); 357 hb-> addSpacing ( 10 );
358 358
359 m_solidcolor = new OColorButton ( tab ); 359 m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
360 connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); 360 connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & )));
361 hb-> addWidget ( m_solidcolor ); 361 hb-> addWidget ( m_solidcolor );
362 hb-> addStretch ( 10 ); 362 hb-> addStretch ( 10 );
@@ -422,7 +422,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
422 label = new QLabel ( tr( "Color:" ), tab ); 422 label = new QLabel ( tr( "Color:" ), tab );
423 gridLayout-> addWidget ( label, 3, 0 ); 423 gridLayout-> addWidget ( label, 3, 0 );
424 424
425 m_iconcolor = new OColorButton ( tab ); 425 m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) );
426 connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & ))); 426 connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & )));
427 gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); 427 gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );
428 428