| -rw-r--r-- | core/settings/launcher/tabdialog.cpp | 8 | ||||
| -rw-r--r-- | libopie/ocolorbutton.cpp | 6 | ||||
| -rw-r--r-- | libopie/ocolorbutton.h | 2 | ||||
| -rw-r--r-- | noncore/settings/appearance2/editScheme.cpp | 3 | ||||
| -rw-r--r-- | noncore/styles/liquid/liquidset.cpp | 6 |
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 @@ -293,8 +293,8 @@ 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 ); @@ -357,5 +357,5 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) 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 ); @@ -423,5 +423,5 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) 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 ); diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp index 4734c0c..ddb6c4f 100644 --- a/libopie/ocolorbutton.cpp +++ b/libopie/ocolorbutton.cpp @@ -41,15 +41,15 @@ public: }; -OColorButton::OColorButton ( QWidget *parent, const char *name ) +OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *name ) : QPushButton ( parent, name ) { d = new OColorButtonPrivate; - d-> m_menu = new ColorPopupMenu ( black, 0, 0 ); + d-> m_menu = new ColorPopupMenu ( color, 0, 0 ); setPopup ( d-> m_menu ); // setPopupDelay ( 0 ); connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & ))); - updateColor ( black ); + updateColor ( color ); QSize s = sizeHint ( ) + QSize ( 12, 0 ); diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h index ec04833..fe40fae 100644 --- a/libopie/ocolorbutton.h +++ b/libopie/ocolorbutton.h @@ -38,5 +38,5 @@ class OColorButton : public QPushButton { Q_OBJECT 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 @@ -53,6 +53,5 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget layout-> addWidget ( l, i, 0 ); - 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 @@ -79,10 +79,8 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl ) grid-> addWidget ( m_opaclbl = new QLabel ( tr( "Opacity" ), this ), 1, 1 ); - 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 ); |