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

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
@@ -90,33 +90,33 @@ public:
                 setViewMode ( TabConfig::Icon );
                 calculateGrid ( Bottom );
 
 
                 new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "DateBook" ));
                 new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
                 new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
                 
                 setBackgroundType ( TabConfig::Ruled, QString::null );
                 
                 setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
         }           
 
         void setViewMode ( TabConfig::ViewMode m )
         {
                 viewport ( )-> setUpdatesEnabled ( false );
-                
+
                 switch ( m ) {
                                 case TabConfig::List:                   
                                 setItemTextPos( QIconView::Right );
                                 break;
                         case TabConfig::Icon:
                                 setItemTextPos( QIconView::Bottom );
                                 break;
                 }
         //      hideOrShowItems ( false );
 
                 for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( ))
                         ((SampleItem *) it )-> sizeChange ( );
                 arrangeItemsInGrid ( true );
                 viewport ( )-> setUpdatesEnabled ( true );
                 update ( );
         } 
@@ -169,33 +169,33 @@ public:
                 viewport ( )-> update ( );
         }
 
         void setTextColor ( const QColor &tc )
         {
                 m_textcolor = tc;
                 QColorGroup cg = colorGroup ( );
                 cg. setColor ( QColorGroup::Text, tc );
                 setPalette ( QPalette ( cg, cg, cg ));
                 viewport ( )-> update ( );
         }
 
         void setViewFont ( const QFont &f )
         {
                 setFont ( f );
         }
-        
+
         void setItemTextPos ( ItemTextPos pos )
         {
                 calculateGrid ( pos );
                 QIconView::setItemTextPos( pos );
         }
                             
         void calculateGrid ( ItemTextPos pos )
         {
                 int dw = QApplication::desktop ( )-> width ( );
                 int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( );
                 if ( pos == Bottom ) {
                         int cols = 3;
                         if ( viewerWidth <= 200 )
                                 cols = 2;
                         else if ( viewerWidth >= 400 )
                                 cols = viewerWidth/96;
@@ -230,160 +230,160 @@ public:
                 QColorGroup cg = colorGroup ( );
                 cg.setColor ( QColorGroup::Text, m_textcolor );
                 setPalette ( QPalette ( cg, cg, cg ));
                 
                 excllock = false;
         }
                             
         void setBackgroundPixmap ( const QPixmap &pm ) 
         {
                 m_bgpix = pm;
         }
         
         void setBackgroundColor ( const QColor &c ) 
         {
                 m_bgcolor = c;
         }
-        
+
         void drawBackground ( QPainter *p, const QRect &r )
         {
                 if ( !m_bgpix. isNull ( )) {
                         p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), 
                                                                   ( r. y ( ) + contentsY ( )) % m_bgpix. height ( )));
                 } 
                 else
                         p-> fillRect ( r, m_bgcolor );
         }
         
 private:
         QColor m_textcolor;
         QColor m_bgcolor;
         QPixmap m_bgpix;
         TabConfig::BackgroundType m_bgtype;
 };
 
 
 
-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 );
         m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
         m_fontselect-> setEnabled ( m_fontuse-> isChecked ( ));
         fontClicked ( m_fontselect-> selectedFont ( ));
 
         QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
 }
 
 
 TabDialog::~TabDialog ( )
 {
 }
 
 QWidget *TabDialog::createFontTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget ( parent, "FontTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 );
 
         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 );
 
     QLabel* label = new QLabel( tr( "Type:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_bgtype = new QButtonGroup( tab, "buttongroup" );
     m_bgtype-> hide ( );
     m_bgtype-> setExclusive ( true );
 
         QRadioButton *rb;
     rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" );
     m_bgtype-> insert ( rb, TabConfig::Ruled );
     gridLayout-> addWidget( rb, 0, 1 );
 
         QHBoxLayout *hb = new QHBoxLayout ( );
         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 );
 
     gridLayout-> addLayout ( hb, 1, 1 );
 
         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 );
         hb-> addStretch ( 10 );
         
     gridLayout-> addLayout ( hb, 2, 1 );
 
                 QPushButton *p = new QPushButton ( tr( "Default" ), tab );
         connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( )));
         gridLayout-> addWidget ( p, 3, 1 );
 
         connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
 
         vertLayout-> addStretch ( 10 );
 
         return tab;
@@ -394,50 +394,50 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
     QWidget *tab = new QWidget( parent, "IconTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
         
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Size:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
     m_iconsize = new QButtonGroup( tab, "buttongroup" );
     m_iconsize-> hide ( );
     m_iconsize-> setExclusive ( true );
 
         QRadioButton *rb;
     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 );
 
         connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int )));
 
         //vertLayout-> addSpacing ( 8 );
 
         //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 );
 
         return tab;
 }
 
 
 void TabDialog::iconSizeClicked ( int s )
 {
         m_sample-> setViewMode ((TabConfig::ViewMode) s );
 }
 
 void TabDialog::fontClicked ( const QFont &f )
 {
         m_sample-> setViewFont ( f );
 }
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 4734c0c..ddb6c4f 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -18,56 +18,56 @@
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie/colorpopupmenu.h>
 #include <opie/ocolorbutton.h>
 #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 ( )
 {
         delete d;
 }
 
 QColor OColorButton::color ( ) const
 {
         return d-> m_color;
 }
 
 void OColorButton::setColor ( const QColor &c )
 {
         updateColor ( c );
 }
diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h
index ec04833..fe40fae 100644
--- a/libopie/ocolorbutton.h
+++ b/libopie/ocolorbutton.h
@@ -14,46 +14,46 @@
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef __OPIE_OCOLORBUTTON_H__
-        #define __OPIE_OCOLORBUTTON_H__
-        
+#define __OPIE_OCOLORBUTTON_H__
+
 #include <qpushbutton.h>
 
 class OColorButtonPrivate;
 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 & );
         
         protected slots:
         virtual void updateColor ( const QColor & );
         
 private:
         OColorButtonPrivate *d;
         };
 
 #endif
 
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
@@ -33,40 +33,39 @@
 #include <qaction.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags fl )
         : QDialog ( parent, name, modal, fl )
 {
         setCaption ( tr( "Edit scheme" ) );
         QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
 
     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 );
     }
 }
 
 EditScheme::~EditScheme ( )
 {
         delete [] m_buttons;
 }
 
 void EditScheme::accept ( )
 {
         for ( int i = 0; i < m_count; i++ ) 
                 m_colors [i] = m_buttons [i]-> color ( );
                 
         QDialog::accept ( );
 }
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
@@ -29,85 +29,83 @@
 #include <qslider.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 
 #include <qpe/config.h>
 
 #include <opie/ocolorbutton.h>
 
 
 LiquidSettings::LiquidSettings ( QWidget* parent, const char *name, WFlags fl )
                 : QWidget ( parent, name, fl )
 {
         setCaption ( tr( "Liquid Style" ) );
-        
+
         Config config ( "qpe" );
     config. setGroup ( "Liquid-Style" );
 
         m_type       = config. readNumEntry ( "Type", TransStippleBg );
         QColor mcol  = QColor ( config. readEntry ( "Color",  QApplication::palette ( ). active ( ). button ( ). name ( )));
         QColor tcol  = QColor ( config. readEntry ( "TextColor", QApplication::palette ( ). active ( ). text ( ). name ( )));
         int opacity  = config. readNumEntry ( "Opacity", 10 );
         m_shadow     = config. readBoolEntry ( "ShadowText", true );
         int contrast = config. readNumEntry ( "StippleContrast", 5 );
         m_flat       = config. readBoolEntry ( "FlatToolButtons", false );
 
         QVBoxLayout *vbox = new QVBoxLayout ( this );
         vbox-> setSpacing ( 3 );
         vbox-> setMargin ( 4 );
 
         QComboBox *cb = new QComboBox ( this );
         cb-> insertItem ( tr( "No translucency" ), None );
         cb-> insertItem ( tr( "Stippled, background color" ), StippledBg );
         cb-> insertItem ( tr( "Stippled, button color" ), StippledBtn );
         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 );
         m_opacsld-> setRange ( -20, 20 );
         m_opacsld-> setSteps ( 1, 1 );
         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 );
         
         vbox-> addSpacing ( 4 );
         
         QCheckBox *flattb = new QCheckBox ( tr( "Make toolbar buttons appear flat" ), this );
         flattb-> setChecked ( m_flat );
         vbox-> addWidget ( flattb );
 
         vbox-> addSpacing ( 4 );
         
         QHBoxLayout *hbox = new QHBoxLayout ( vbox );
         
         hbox-> addWidget ( new QLabel ( tr( "Stipple contrast" ), this ));