5 files changed, 86 insertions, 46 deletions

diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index eebfd36..9086341 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -44,4 +44,5 @@ struct TabConfig {
         QString        m_bg_color;
         QString        m_text_color;
+        bool           m_font_use;
         QString        m_font_family;
         int            m_font_size;
@@ -57,8 +58,12 @@ struct TabConfig {
                        ( m_bg_color == tc. m_bg_color ) &&
                        ( m_text_color == tc. m_text_color ) &&
-                       ( m_font_family == tc. m_font_family ) &&
-                       ( m_font_size == tc. m_font_size ) &&
-                       ( m_font_weight == tc. m_font_weight ) &&
-                       ( m_font_italic == tc. m_font_italic );
+                       ( m_font_use == tc. m_font_use ) && 
+                       ( m_font_use ? (
+                         ( m_font_family == tc. m_font_family ) &&
+                         ( m_font_size == tc. m_font_size ) &&
+                         ( m_font_weight == tc. m_font_weight ) &&
+                         ( m_font_italic == tc. m_font_italic )
+                        ) : true );
+                        
         }
 };
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index a90ba7d..d20412a 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -40,4 +40,5 @@
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
+#include <qcheckbox.h>
 
 #include <opie/ofontselector.h>
@@ -268,5 +269,5 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
         setCaption ( tr( "Edit Tab" ));
         
-        QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
+        QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
         
         OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
@@ -298,5 +299,7 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
         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 ( ));
 
@@ -311,16 +314,24 @@ TabDialog::~TabDialog ( )
 QWidget *TabDialog::createFontTab ( QWidget *parent )
 {
-    m_fontselect = new OFontSelector ( false, parent, "FontTab" );    
+    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" );    
+    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 m_fontselect; 
+    return tab; 
 }
 
 QWidget *TabDialog::createBgTab ( QWidget *parent )
 {
-    QWidget *tab = new QWidget( parent, "AdvancedTab" );
-    QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 );
+    QWidget *tab = new QWidget( parent, "BgTab" );
+    QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
         
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
@@ -339,5 +350,5 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 
         QHBoxLayout *hb = new QHBoxLayout ( );
-        hb-> setSpacing ( 4 );
+        hb-> setSpacing ( 3 );
 
     rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
@@ -354,5 +365,5 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 
         hb = new QHBoxLayout ( );
-        hb-> setSpacing ( 4 );
+        hb-> setSpacing ( 3 );
         
         rb = new QRadioButton( tr( "Image" ), tab, "image" );
@@ -381,6 +392,6 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 QWidget *TabDialog::createIconTab ( QWidget *parent )
 {
-    QWidget *tab = new QWidget( parent, "AdvancedTab" );
-    QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 );
+    QWidget *tab = new QWidget( parent, "IconTab" );
+    QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
         
     QGridLayout* gridLayout = new QGridLayout ( vertLayout );
@@ -490,11 +501,15 @@ void TabDialog::accept ( )
         m_tc. m_bg_image = m_bgimage;
         m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
+                
+        m_tc. m_font_use = m_fontuse-> isChecked ( );
+
+                if ( m_tc. m_font_use ) {
+                QFont f = m_fontselect-> selectedFont ( );
         
-        QFont f = m_fontselect-> selectedFont ( );
-        
-        m_tc. m_font_family = f. family ( );
-        m_tc. m_font_size = f. pointSize ( );
-        m_tc. m_font_weight = f. weight ( );
-        m_tc. m_font_italic = f. italic ( );
+                m_tc. m_font_family = f. family ( );
+                m_tc. m_font_size = f. pointSize ( );
+                m_tc. m_font_weight = f. weight ( );
+                m_tc. m_font_italic = f. italic ( );
+        }
         
         QDialog::accept ( );
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h
index b0afd47..892a3ad 100644
--- a/core/settings/launcher/tabdialog.h
+++ b/core/settings/launcher/tabdialog.h
@@ -37,4 +37,5 @@ class SampleView;
 class OColorButton;
 class QPushButton;
+class QCheckBox;
 
 
@@ -72,4 +73,5 @@ private:
                 QString m_bgimage;
         QButtonGroup *m_bgtype;
+        QCheckBox *m_fontuse;
         
         TabConfig &m_tc;
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index a5afaf2..9d6e8c1 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -48,5 +48,5 @@
 
 
-        #define GLOBALID "_launchersettings_global_dummy_"
+        #define GLOBALID ".global."
 
 
@@ -125,40 +125,48 @@ void TabsSettings::readTabSettings ( Config &cfg )
         m_tabs. clear ( );
 
+        TabConfig global_def;
+        global_def. m_view        = TabConfig::Icon;
+        global_def. m_bg_type     = TabConfig::Ruled;
+        global_def. m_bg_image    = "launcher/opie-background";
+        global_def. m_bg_color    = colorGroup ( ). color ( QColorGroup::Base ). name ( );
+        global_def. m_text_color  = colorGroup ( ). color ( QColorGroup::Text ). name ( );
+        global_def. m_font_use    = false;
+        global_def. m_font_family = font ( ). family ( );
+        global_def. m_font_size   = font ( ). pointSize ( );
+        global_def. m_font_weight = 50;
+        global_def. m_font_italic = false;
+        global_def. m_changed     = false;
+         
+
         for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
-                TabConfig tc;
-                tc. m_view    = TabConfig::Icon;
-                tc. m_bg_type = TabConfig::Ruled;
-                tc. m_changed = false;
+                TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def;
 
                 cfg. setGroup ( grp. arg ( *it ));
-                if ( *it == GLOBALID )
-                        cfg. clearGroup ( );
 
-                QString view = cfg. readEntry ( "View", "Icon" );
+                QString view = cfg. readEntry ( "View" );
+                if ( view == "Icon" ) // No tr
+                        tc. m_view = TabConfig::Icon;
                 if ( view == "List" ) // No tr
                         tc. m_view = TabConfig::List;
 
-                QString bgType = cfg. readEntry ( "BackgroundType", "Image" );
-                if ( bgType == "SolidColor" )
+                QString bgType = cfg. readEntry ( "BackgroundType" );
+                if ( bgType == "Image" )
+                        tc. m_bg_type = TabConfig::Image;
+                else if ( bgType == "SolidColor" )
                         tc. m_bg_type = TabConfig::SolidColor;
                 else if ( bgType == "Image" ) // No tr
                         tc. m_bg_type = TabConfig::Image;
 
-                tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "launcher/opie-background" );
-                tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( ));
-                tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( ));
+                tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image );
+                tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color );
+                tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color );
                 QStringList f = cfg. readListEntry ( "Font", ',' );
                 if ( f. count ( ) == 4 ) {
+                        tc. m_font_use = true;
                         tc. m_font_family = f [0];
                         tc. m_font_size = f [1]. toInt ( );
                         tc. m_font_weight = f [2]. toInt ( );
                         tc. m_font_italic = ( f [3]. toInt ( ));
-                } else {
-                        tc. m_font_family = font ( ). family ( );
-                        tc. m_font_size = font ( ). pointSize ( );
-                        tc. m_font_weight = 50;
-                        tc. m_font_italic = false;
-                }
-                
+                        }       
                 m_tabs [*it] = tc;
         }
@@ -177,6 +185,8 @@ void TabsSettings::readTabSettings ( Config &cfg )
                         same &= ( *first == m_tabs [*it] );
         }
-        if ( same )
+        if ( same ) {
                 m_tabs [GLOBALID] = *first;
+                m_tabs [GLOBALID]. m_changed = true;
+        }
 }
 
@@ -192,5 +202,5 @@ void TabsSettings::accept ( )
                 TabConfig &tc = m_tabs [*it];
 
-                if ( !tc. m_changed || ( *it == GLOBALID ))
+                if ( !tc. m_changed )
                         continue;
                         
@@ -212,6 +222,11 @@ void TabsSettings::accept ( )
                 cfg. writeEntry ( "TextColor", tc. m_text_color );
 
-                QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" );
-                cfg. writeEntry ( "Font", f );
+                if ( tc. m_font_use ) {
+                        QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" );
+                        cfg. writeEntry ( "Font", f );
+                }
+                else
+                        cfg. removeEntry ( "Font" );
+                
                 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" );
 
@@ -235,7 +250,9 @@ void TabsSettings::accept ( )
 
                 QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" );
-                fe << *it << tc. m_font_family;
+                fe << *it;
+                fe << ( tc. m_font_use ? tc. m_font_family : QString::null );
                 fe << tc. m_font_size;
-                fe << tc. m_font_weight << ( tc. m_font_italic ? 1 : 0 );
+                fe << tc. m_font_weight;
+                fe << ( tc. m_font_italic ? 1 : 0 );
 
                 tc. m_changed = false;
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 5bc5ad2..b3e302a 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -136,4 +136,5 @@ void TaskbarSettings::accept ( )
         Config cfg ( "Taskbar" );
         cfg. setGroup ( "Applets" );
+
         if ( m_applets_changed ) {
                 QStringList exclude;
@@ -149,5 +150,5 @@ void TaskbarSettings::accept ( )
 
         if ( m_applets_changed ) {
-                QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
+                QCopEnvelope e ( "QPE/TaskBar", "reloadApplets()" );
                 m_applets_changed = false;
         }