summaryrefslogtreecommitdiff
authordrw <drw>2002-12-05 17:13:45 (UTC)
committer drw <drw>2002-12-05 17:13:45 (UTC)
commit675ab68194cc25793a18fd9e495958a90aaf0173 (patch) (side-by-side diff)
treee2599a7dbef3184f015593f0b7ffe533c45a5ba5
parent1eb333726ccf7c608b9f987aac1a04d37d35936c (diff)
downloadopie-675ab68194cc25793a18fd9e495958a90aaf0173.zip
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.gz
opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.bz2
Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/tabdialog.cpp64
-rw-r--r--libopie/ocolorbutton.cpp20
-rw-r--r--libopie/ocolorbutton.h14
-rw-r--r--noncore/settings/appearance2/editScheme.cpp7
-rw-r--r--noncore/styles/liquid/liquidset.cpp20
5 files changed, 61 insertions, 64 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
@@ -103,7 +103,7 @@ public:
void setViewMode ( TabConfig::ViewMode m )
{
viewport ( )-> setUpdatesEnabled ( false );
-
+
switch ( m ) {
case TabConfig::List:
setItemTextPos( QIconView::Right );
@@ -182,7 +182,7 @@ public:
{
setFont ( f );
}
-
+
void setItemTextPos ( ItemTextPos pos )
{
calculateGrid ( pos );
@@ -243,7 +243,7 @@ public:
{
m_bgcolor = c;
}
-
+
void drawBackground ( QPainter *p, const QRect &r )
{
if ( !m_bgpix. isNull ( )) {
@@ -263,39 +263,39 @@ 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 )
{
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;
bgTypeClicked ( tc. m_bg_type );
m_fontuse-> setChecked ( tc. m_font_use );
@@ -319,21 +319,21 @@ QWidget *TabDialog::createFontTab ( QWidget *parent )
m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab );
vertLayout-> addWidget ( m_fontuse );
- 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 )));
connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
this, SLOT( fontClicked ( const QFont & )));
- return tab;
+ return tab;
}
QWidget *TabDialog::createBgTab ( QWidget *parent )
{
QWidget *tab = new QWidget( parent, "BgTab" );
QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
-
+
QGridLayout* gridLayout = new QGridLayout ( vertLayout );
gridLayout-> setColStretch ( 1, 10 );
@@ -352,11 +352,11 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
hb-> setSpacing ( 3 );
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 & )));
hb-> addWidget ( m_solidcolor );
hb-> addStretch ( 10 );
@@ -365,12 +365,12 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
hb = new QHBoxLayout ( );
hb-> setSpacing ( 3 );
-
+
rb = new QRadioButton( tr( "Image" ), tab, "image" );
m_bgtype-> insert ( rb, TabConfig::Image );
hb-> addWidget( rb );
hb-> addSpacing ( 10 );
-
+
m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( )));
hb-> addWidget ( m_imagebrowse );
@@ -407,7 +407,7 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" );
m_iconsize-> insert ( rb, TabConfig::List );
gridLayout-> addWidget( rb, 0, 1 );
-
+
rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
m_iconsize-> insert ( rb, TabConfig::Icon );
gridLayout-> addWidget( rb, 1, 1 );
@@ -418,13 +418,13 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
// gridLayout = new QGridLayout ( vertLayout );
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 );
vertLayout-> addStretch ( 10 );
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 4734c0c..ddb6c4f 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -31,30 +31,30 @@
#include <qcolor.h>
#include <qpixmap.h>
#include <qimage.h>
-
-#include <qpe/resource.h>
-
+
+#include <qpe/resource.h>
+
class OColorButtonPrivate {
public:
QPopupMenu *m_menu;
QColor m_color;
};
-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 );
setMinimumSize ( s );
- setMaximumSize ( s. width ( ) * 2, s. height ( ));
+ setMaximumSize ( s. width ( ) * 2, s. height ( ));
}
OColorButton::~OColorButton ( )
diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h
index ec04833..fe40fae 100644
--- a/libopie/ocolorbutton.h
+++ b/libopie/ocolorbutton.h
@@ -27,8 +27,8 @@
*/
#ifndef __OPIE_OCOLORBUTTON_H__
-#define __OPIE_OCOLORBUTTON_H__
-
+#define __OPIE_OCOLORBUTTON_H__
+
#include <qpushbutton.h>
class OColorButtonPrivate;
@@ -37,14 +37,14 @@ class QColor;
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 ( );
-
+
QColor color ( ) const;
-
+
signals:
- void colorSelected ( const QColor & );
-
+ void colorSelected ( const QColor & );
+
public slots:
virtual void setColor ( const QColor & );
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
@@ -46,14 +46,13 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
m_count = cnt;
m_buttons = new OColorButton * [cnt];
m_colors = colors;
-
+
for ( int i = 0; i < cnt; i++ )
{
QLabel *l = new QLabel ( labels [i], this );
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
@@ -42,7 +42,7 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
: QWidget ( parent, name, fl )
{
setCaption ( tr( "Liquid Style" ) );
-
+
Config config ( "qpe" );
config. setGroup ( "Liquid-Style" );
@@ -65,25 +65,23 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
cb-> insertItem ( tr( "Translucent stippled, background color" ), TransStippleBg );
cb-> insertItem ( tr( "Translucent stippled, button color" ), TransStippleBtn );
cb-> insertItem ( tr( "Custom translucency" ), Custom );
-
+
cb-> setCurrentItem ( m_type );
vbox-> addWidget ( cb );
-
-
+
+
QGridLayout *grid = new QGridLayout ( vbox );
grid-> addColSpacing ( 0, 16 );
grid-> addColSpacing ( 3, 8 );
-
+
grid-> addWidget ( m_menulbl = new QLabel ( tr( "Menu color" ), this ), 0, 1 );
grid-> addWidget ( m_textlbl = new QLabel ( tr( "Text color" ), this ), 0, 4 );
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 );
m_opacsld = new QSlider ( Horizontal, this );
@@ -92,9 +90,9 @@ LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
m_opacsld-> setValue ( opacity );
m_opacsld-> setTickmarks ( QSlider::Below );
grid-> addMultiCellWidget ( m_opacsld, 1, 1, 2, 5 );
-
+
vbox-> addSpacing ( 4 );
-
+
QCheckBox *shadow = new QCheckBox ( tr( "Use shadowed menu text" ), this );
shadow-> setChecked ( m_shadow );
vbox-> addWidget ( shadow );