- added an "All Tabs" tab entry, which will affect all tabs

- enabled "What's this" help mode -- many tooltips still missing

5 files changed, 73 insertions, 16 deletions

diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp
index c32d998..7b85602 100644
--- a/core/settings/launcher/launchersettings.cpp
+++ b/core/settings/launcher/launchersettings.cpp
@@ -38,3 +38,3 @@
 
-LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false )
+LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
 {
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 8d363fa..5a9fada 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -66,4 +66,4 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
 
-	QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the O-Menu." ));
-	QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher as menus in the O-Menu." ));
+	QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
+	QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
 
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index 8b6b103..eebfd36 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -50,2 +50,15 @@ struct TabConfig {
 	bool           m_changed;
+	
+	bool operator == ( const TabConfig &tc )
+	{
+		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_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 );
+	}
 };
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 6288f5f..a90ba7d 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -40,2 +40,3 @@
 #include <qpushbutton.h>
+#include <qwhatsthis.h>
 
@@ -264,3 +265,3 @@ 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 ), m_tc ( tc )
+	: QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
 {
@@ -300,2 +301,4 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
 	fontClicked ( m_fontselect-> selectedFont ( ));
+
+	QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
 }
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index 6cc69c0..a5afaf2 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -49,2 +49,4 @@
 
+#define GLOBALID 	"_launchersettings_global_dummy_"
+
 
@@ -63,14 +65,14 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
 	
-	QPushButton *p;
-	p = new QPushButton ( tr( "New" ), this );
-	lay-> addWidget ( p, 1, 1 );
-	connect ( p, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
+	QPushButton *p1, *p2, *p3;
+	p1 = new QPushButton ( tr( "New" ), this );
+	lay-> addWidget ( p1, 1, 1 );
+	connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
 
-	p = new QPushButton ( tr( "Edit" ), this );
-	lay-> addWidget ( p, 2, 1 );
-	connect ( p, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
+	p2 = new QPushButton ( tr( "Edit" ), this );
+	lay-> addWidget ( p2, 2, 1 );
+	connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
 
-	p = new QPushButton ( tr( "Delete" ), this );
-	lay-> addWidget ( p, 3, 1 );
-	connect ( p, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
+	p3 = new QPushButton ( tr( "Delete" ), this );
+	lay-> addWidget ( p3, 3, 1 );
+	connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
 
@@ -81,3 +83,12 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
 
+	p1-> setEnabled ( false );
+	p3-> setEnabled ( false );
+
 	init ( );
+	
+	QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." ));
+	QWhatsThis::add ( p1, tr( "Adds a new Tab to the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
+	QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." ));
+	QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
+	QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." ));
 }
@@ -88,2 +99,5 @@ void TabsSettings::init ( )
 	QStringList types = rootFolder. types ( );
+
+	m_list-> insertItem ( tr( "All Tabs" ));
+	m_ids << GLOBALID;
 	
@@ -119,2 +133,4 @@ void TabsSettings::readTabSettings ( Config &cfg )
 		cfg. setGroup ( grp. arg ( *it ));
+		if ( *it == GLOBALID )
+			cfg. clearGroup ( );
 
@@ -145,4 +161,21 @@ void TabsSettings::readTabSettings ( Config &cfg )
 		}
+		
 		m_tabs [*it] = tc;
 	}
+
+	// if all tabs have the same config, then initialize the GLOBALID tab to these values
+	
+	TabConfig *first = 0;
+	bool same = true;
+	
+	for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
+		if ( *it == GLOBALID )
+			continue;
+		else if ( !first ) 
+			first = &m_tabs [*it];
+		else
+			same &= ( *first == m_tabs [*it] );
+	}
+	if ( same )
+		m_tabs [GLOBALID] = *first;
 }
@@ -160,5 +193,6 @@ void TabsSettings::accept ( )
 
-		cfg. setGroup ( grp. arg ( *it ));
-		if ( !tc. m_changed )
+		if ( !tc. m_changed || ( *it == GLOBALID ))
 			continue;
+			
+		cfg. setGroup ( grp. arg ( *it ));
 		switch ( tc. m_view ) {
@@ -248,2 +282,9 @@ void TabsSettings::editClicked ( )
 		m_tabs [m_ids [ind]] = tc;
+		
+		if ( m_ids [ind] == GLOBALID ) {
+			for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
+				if ( *it != GLOBALID )
+					m_tabs [*it] = tc;
+			}	
+		}
 	}