- added a "[x] Use custom font" checkbox -- if this is not checked

  (default), then launcher uses the global font for the tabs.
- reworked the internal handling of "All tabs", to make it possible to use
  this information for newly added tabs (still missing)

5 files changed, 74 insertions, 34 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
@@ -40,12 +40,13 @@ struct TabConfig {
 
 	ViewMode       m_view;
 	BackgroundType m_bg_type;
 	QString        m_bg_image;
 	QString        m_bg_color;
 	QString        m_text_color;
+	bool           m_font_use;
 	QString        m_font_family;
 	int            m_font_size;
 	int            m_font_weight;
 	bool           m_font_italic;
 	bool           m_changed;
 	
@@ -53,14 +54,18 @@ struct TabConfig {
 	{
 		return ( m_view == tc. m_view ) && 
 		       ( m_bg_type == tc. m_bg_type ) &&
 		       ( m_bg_image == tc. m_bg_image ) &&
 		       ( m_bg_color == tc. m_bg_color ) &&
 		       ( m_text_color == tc. m_text_color ) &&
+		       ( 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 );
+		         ( m_font_italic == tc. m_font_italic )
+		        ) : true );
+		        
 	}
 };
 
 #endif
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
@@ -36,12 +36,13 @@
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
+#include <qcheckbox.h>
 
 #include <opie/ofontselector.h>
 #include <opie/otabwidget.h>
 #include <opie/ocolorbutton.h>
 #include <opie/ofiledialog.h>
 
@@ -264,13 +265,13 @@ private:
 
 TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 
 	: QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
 {
 	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 );
 	QWidget *bgtab;
 	       
 	tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" ));
 	tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" ));
@@ -294,37 +295,47 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 	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_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 )
 {
-    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 );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Type:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
@@ -335,13 +346,13 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 	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 ( 4 );
+	hb-> setSpacing ( 3 );
 
     rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
     m_bgtype-> insert ( rb, TabConfig::SolidColor ); 
     hb-> addWidget ( rb );
 	hb-> addSpacing ( 10 );
     
@@ -350,13 +361,13 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 	hb-> addWidget ( m_solidcolor );
 	hb-> addStretch ( 10 );
 
     gridLayout-> addLayout ( hb, 1, 1 );
 
 	hb = new QHBoxLayout ( );
-	hb-> setSpacing ( 4 );
+	hb-> setSpacing ( 3 );
 	
 	rb = new QRadioButton( tr( "Image" ), tab, "image" );
     m_bgtype-> insert ( rb, TabConfig::Image );
     hb-> addWidget( rb );
     hb-> addSpacing ( 10 );
     
@@ -377,14 +388,14 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
 
 	return tab;
 }
 
 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 );
     gridLayout-> setColStretch ( 1, 10 );
 
     QLabel* label = new QLabel( tr( "Size:" ), tab );
     gridLayout-> addWidget ( label, 0, 0 );
@@ -487,15 +498,19 @@ void TabDialog::accept ( )
 	m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( ));
 	m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( ));
 	m_tc. m_bg_color = m_solidcolor-> color ( ). name ( );
 	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 ( );
 	
 	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
@@ -33,12 +33,13 @@
 
 class QButtonGroup;
 class OFontSelector;
 class SampleView;
 class OColorButton;
 class QPushButton;
+class QCheckBox;
 
 
 class TabDialog : public QDialog {
 	Q_OBJECT
 public:
 	TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 );
@@ -68,12 +69,13 @@ private:
 	OFontSelector *m_fontselect;
 	OColorButton *m_solidcolor;
 	OColorButton *m_iconcolor;
 	QPushButton *m_imagebrowse;
 	QString m_bgimage;	
 	QButtonGroup *m_bgtype;
+	QCheckBox *m_fontuse;
 	
 	TabConfig &m_tc;
 };
 
 
 #endif
\ No newline at end of file
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
@@ -44,13 +44,13 @@
 #include "tabdialog.h"
 
 #include <stdlib.h>
 #include <qmessagebox.h>
 
 
-#define GLOBALID 	"_launchersettings_global_dummy_"
+#define GLOBALID 	".global."
 
 
 TabsSettings::TabsSettings ( QWidget *parent, const char *name )
 	: QWidget ( parent, name )
 {
 	QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 );
@@ -121,48 +121,56 @@ void TabsSettings::init ( )
 
 void TabsSettings::readTabSettings ( Config &cfg )
 {
 	QString grp ( "Tab %1" ); // No tr
 	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;
 	}
 
 	// if all tabs have the same config, then initialize the GLOBALID tab to these values
 	
 	TabConfig *first = 0;
@@ -173,14 +181,16 @@ void TabsSettings::readTabSettings ( Config &cfg )
 			continue;
 		else if ( !first ) 
 			first = &m_tabs [*it];
 		else
 			same &= ( *first == m_tabs [*it] );
 	}
-	if ( same )
+	if ( same ) {
 		m_tabs [GLOBALID] = *first;
+		m_tabs [GLOBALID]. m_changed = true;
+	}
 }
 
 
 void TabsSettings::accept ( )
 {
 	Config cfg ( "Launcher" );
@@ -188,13 +198,13 @@ void TabsSettings::accept ( )
 	// Launcher Tab
 	QString grp ( "Tab %1" ); // No tr
 
 	for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
 		TabConfig &tc = m_tabs [*it];
 
-		if ( !tc. m_changed || ( *it == GLOBALID ))
+		if ( !tc. m_changed )
 			continue;
 			
 		cfg. setGroup ( grp. arg ( *it ));
 		switch ( tc. m_view ) {
 			case TabConfig::Icon:
 				cfg.writeEntry ( "View", "Icon" );
@@ -208,14 +218,19 @@ void TabsSettings::accept ( )
 		e << *it << tc. m_view;
 
 		cfg. writeEntry ( "BackgroundImage", tc. m_bg_image );
 		cfg. writeEntry ( "BackgroundColor", tc. m_bg_color );
 		cfg. writeEntry ( "TextColor", tc. m_text_color );
 
+		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)" );
 
 		switch ( tc. m_bg_type ) {
 			case TabConfig::Ruled:
 				cfg.writeEntry( "BackgroundType", "Ruled" );
 				be << *it << tc. m_bg_type << QString("");
@@ -231,15 +246,17 @@ void TabsSettings::accept ( )
 		}
 
 		QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" );
 		te << *it << tc. m_text_color;
 
 		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;
 	}
 	cfg. setGroup ( "GUI" );    
 	QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" );
 
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
@@ -132,12 +132,13 @@ void TaskbarSettings::appletChanged()
 }
 
 void TaskbarSettings::accept ( )
 {
 	Config cfg ( "Taskbar" );
 	cfg. setGroup ( "Applets" );
+
 	if ( m_applets_changed ) {
 		QStringList exclude;
 		QMap <QString, QCheckListItem *>::Iterator it;
 		for ( it = m_applets. begin ( ); it != m_applets. end ( ); ++it ) {
 			if ( !(*it)-> isOn ( ))
 				exclude << it. key ( );
@@ -145,11 +146,11 @@ void TaskbarSettings::accept ( )
 		cfg. writeEntry ( "ExcludeApplets", exclude, ',' );
 	}
 	cfg. writeEntry ( "SafeMode", false );
 	cfg. write ( );
 
 	if ( m_applets_changed ) {
-		QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
+		QCopEnvelope e ( "QPE/TaskBar", "reloadApplets()" );
 		m_applets_changed = false;
 	}
 }