author | sandman <sandman> | 2002-10-08 01:21:52 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-08 01:21:52 (UTC) |
commit | c43b5d600a7d1dcaadcba2cb047a60313b37f2f2 (patch) (side-by-side diff) | |
tree | dbe1311d34631e7d933aa10b2d6a9dc8f97206ab /core | |
parent | 5e450f24ca13923535754b33a1d1645709a8259d (diff) | |
download | opie-c43b5d600a7d1dcaadcba2cb047a60313b37f2f2.zip opie-c43b5d600a7d1dcaadcba2cb047a60313b37f2f2.tar.gz opie-c43b5d600a7d1dcaadcba2cb047a60313b37f2f2.tar.bz2 |
- added an "All Tabs" tab entry, which will affect all tabs
- enabled "What's this" help mode -- many tooltips still missing
-rw-r--r-- | core/settings/launcher/launchersettings.cpp | 2 | ||||
-rw-r--r-- | core/settings/launcher/menusettings.cpp | 4 | ||||
-rw-r--r-- | core/settings/launcher/tabconfig.h | 13 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 5 | ||||
-rw-r--r-- | core/settings/launcher/tabssettings.cpp | 65 |
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 @@ -36,7 +36,7 @@ #include "taskbarsettings.h" -LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) +LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) { setCaption ( tr( "Launcher Settings" )); 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 @@ -64,8 +64,8 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name ) m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); lay-> addWidget ( m_menutabs ); - 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." )); connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); 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 @@ -48,6 +48,19 @@ struct TabConfig { int m_font_weight; bool m_font_italic; 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 ); + } }; #endif 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 @@ -38,6 +38,7 @@ #include <qradiobutton.h> #include <qbuttongroup.h> #include <qpushbutton.h> +#include <qwhatsthis.h> #include <opie/ofontselector.h> #include <opie/otabwidget.h> @@ -262,7 +263,7 @@ 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 ) { setCaption ( tr( "Edit Tab" )); @@ -298,6 +299,8 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig bgTypeClicked ( tc. m_bg_type ); m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); 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 @@ -47,6 +47,8 @@ #include <qmessagebox.h> +#define GLOBALID "_launchersettings_global_dummy_" + TabsSettings::TabsSettings ( QWidget *parent, const char *name ) : QWidget ( parent, name ) @@ -61,25 +63,34 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name ) QWhatsThis::add ( m_list, tr( "foobar" )); - 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 ( ))); lay-> setRowStretch ( 4, 10 ); m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); lay-> addMultiCellWidget ( m_busyblink, 5, 5, 0, 1 ); + 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." )); } void TabsSettings::init ( ) @@ -87,6 +98,9 @@ void TabsSettings::init ( ) AppLnkSet rootFolder( MimeType::appsFolderName ( )); QStringList types = rootFolder. types ( ); + m_list-> insertItem ( tr( "All Tabs" )); + m_ids << GLOBALID; + for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); m_ids << *it; @@ -117,6 +131,8 @@ void TabsSettings::readTabSettings ( Config &cfg ) tc. m_changed = false; cfg. setGroup ( grp. arg ( *it )); + if ( *it == GLOBALID ) + cfg. clearGroup ( ); QString view = cfg. readEntry ( "View", "Icon" ); if ( view == "List" ) // No tr @@ -143,8 +159,25 @@ void TabsSettings::readTabSettings ( Config &cfg ) 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; + 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; } @@ -158,9 +191,10 @@ void TabsSettings::accept ( ) for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { TabConfig &tc = m_tabs [*it]; - 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 ) { case TabConfig::Icon: cfg.writeEntry ( "View", "Icon" ); @@ -246,6 +280,13 @@ void TabsSettings::editClicked ( ) if ( d-> exec ( ) == QDialog::Accepted ) { tc. m_changed = true; 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; + } + } } delete d; |