summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-08 01:21:52 (UTC)
committer sandman <sandman>2002-10-08 01:21:52 (UTC)
commitc43b5d600a7d1dcaadcba2cb047a60313b37f2f2 (patch) (unidiff)
treedbe1311d34631e7d933aa10b2d6a9dc8f97206ab
parent5e450f24ca13923535754b33a1d1645709a8259d (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/launchersettings.cpp2
-rw-r--r--core/settings/launcher/menusettings.cpp4
-rw-r--r--core/settings/launcher/tabconfig.h13
-rw-r--r--core/settings/launcher/tabdialog.cpp5
-rw-r--r--core/settings/launcher/tabssettings.cpp65
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
@@ -33,13 +33,13 @@
33#include "launchersettings.h" 33#include "launchersettings.h"
34#include "tabssettings.h" 34#include "tabssettings.h"
35#include "menusettings.h" 35#include "menusettings.h"
36#include "taskbarsettings.h" 36#include "taskbarsettings.h"
37 37
38 38
39LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false ) 39LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
40{ 40{
41 setCaption ( tr( "Launcher Settings" )); 41 setCaption ( tr( "Launcher Settings" ));
42 42
43 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 43 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
44 44
45 OTabWidget *tw = new OTabWidget ( this, "otab" ); 45 OTabWidget *tw = new OTabWidget ( this, "otab" );
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
@@ -61,14 +61,14 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
61 61
62 lay-> addWidget ( m_list ); 62 lay-> addWidget ( m_list );
63 63
64 m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); 64 m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
65 lay-> addWidget ( m_menutabs ); 65 lay-> addWidget ( m_menutabs );
66 66
67 QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the O-Menu." )); 67 QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
68 QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher as menus in the O-Menu." )); 68 QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
69 69
70 connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); 70 connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
71 71
72 init ( ); 72 init ( );
73} 73}
74 74
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
@@ -45,9 +45,22 @@ struct TabConfig {
45 QString m_text_color; 45 QString m_text_color;
46 QString m_font_family; 46 QString m_font_family;
47 int m_font_size; 47 int m_font_size;
48 int m_font_weight; 48 int m_font_weight;
49 bool m_font_italic; 49 bool m_font_italic;
50 bool m_changed; 50 bool m_changed;
51
52 bool operator == ( const TabConfig &tc )
53 {
54 return ( m_view == tc. m_view ) &&
55 ( m_bg_type == tc. m_bg_type ) &&
56 ( m_bg_image == tc. m_bg_image ) &&
57 ( m_bg_color == tc. m_bg_color ) &&
58 ( m_text_color == tc. m_text_color ) &&
59 ( m_font_family == tc. m_font_family ) &&
60 ( m_font_size == tc. m_font_size ) &&
61 ( m_font_weight == tc. m_font_weight ) &&
62 ( m_font_italic == tc. m_font_italic );
63 }
51}; 64};
52 65
53#endif 66#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
@@ -35,12 +35,13 @@
35#include <qiconview.h> 35#include <qiconview.h>
36#include <qapplication.h> 36#include <qapplication.h>
37#include <qlabel.h> 37#include <qlabel.h>
38#include <qradiobutton.h> 38#include <qradiobutton.h>
39#include <qbuttongroup.h> 39#include <qbuttongroup.h>
40#include <qpushbutton.h> 40#include <qpushbutton.h>
41#include <qwhatsthis.h>
41 42
42#include <opie/ofontselector.h> 43#include <opie/ofontselector.h>
43#include <opie/otabwidget.h> 44#include <opie/otabwidget.h>
44#include <opie/ocolorbutton.h> 45#include <opie/ocolorbutton.h>
45#include <opie/ofiledialog.h> 46#include <opie/ofiledialog.h>
46 47
@@ -259,13 +260,13 @@ private:
259 TabConfig::BackgroundType m_bgtype; 260 TabConfig::BackgroundType m_bgtype;
260}; 261};
261 262
262 263
263 264
264TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 265TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl )
265 : QDialog ( parent, name, modal, fl ), m_tc ( tc ) 266 : QDialog ( parent, name, modal, fl | WStyle_ContextHelp ), m_tc ( tc )
266{ 267{
267 setCaption ( tr( "Edit Tab" )); 268 setCaption ( tr( "Edit Tab" ));
268 269
269 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 270 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
270 271
271 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); 272 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
@@ -295,12 +296,14 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
295 m_bgtype-> setButton ( tc. m_bg_type ); 296 m_bgtype-> setButton ( tc. m_bg_type );
296 m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); 297 m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
297 m_bgimage = tc. m_bg_image; 298 m_bgimage = tc. m_bg_image;
298 bgTypeClicked ( tc. m_bg_type ); 299 bgTypeClicked ( tc. m_bg_type );
299 m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); 300 m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
300 fontClicked ( m_fontselect-> selectedFont ( )); 301 fontClicked ( m_fontselect-> selectedFont ( ));
302
303 QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
301} 304}
302 305
303 306
304TabDialog::~TabDialog ( ) 307TabDialog::~TabDialog ( )
305{ 308{
306} 309}
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
@@ -44,12 +44,14 @@
44#include "tabdialog.h" 44#include "tabdialog.h"
45 45
46#include <stdlib.h> 46#include <stdlib.h>
47#include <qmessagebox.h> 47#include <qmessagebox.h>
48 48
49 49
50 #define GLOBALID "_launchersettings_global_dummy_"
51
50 52
51TabsSettings::TabsSettings ( QWidget *parent, const char *name ) 53TabsSettings::TabsSettings ( QWidget *parent, const char *name )
52 : QWidget ( parent, name ) 54 : QWidget ( parent, name )
53{ 55{
54 QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); 56 QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 );
55 57
@@ -58,37 +60,49 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
58 60
59 m_list = new QListBox ( this ); 61 m_list = new QListBox ( this );
60 lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 ); 62 lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 );
61 63
62 QWhatsThis::add ( m_list, tr( "foobar" )); 64 QWhatsThis::add ( m_list, tr( "foobar" ));
63 65
64 QPushButton *p; 66 QPushButton *p1, *p2, *p3;
65 p = new QPushButton ( tr( "New" ), this ); 67 p1 = new QPushButton ( tr( "New" ), this );
66 lay-> addWidget ( p, 1, 1 ); 68 lay-> addWidget ( p1, 1, 1 );
67 connect ( p, SIGNAL( clicked ( )), this, SLOT( newClicked ( ))); 69 connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
68 70
69 p = new QPushButton ( tr( "Edit" ), this ); 71 p2 = new QPushButton ( tr( "Edit" ), this );
70 lay-> addWidget ( p, 2, 1 ); 72 lay-> addWidget ( p2, 2, 1 );
71 connect ( p, SIGNAL( clicked ( )), this, SLOT( editClicked ( ))); 73 connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
72 74
73 p = new QPushButton ( tr( "Delete" ), this ); 75 p3 = new QPushButton ( tr( "Delete" ), this );
74 lay-> addWidget ( p, 3, 1 ); 76 lay-> addWidget ( p3, 3, 1 );
75 connect ( p, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( ))); 77 connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
76 78
77 lay-> setRowStretch ( 4, 10 ); 79 lay-> setRowStretch ( 4, 10 );
78 80
79 m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); 81 m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this );
80 lay-> addMultiCellWidget ( m_busyblink, 5, 5, 0, 1 ); 82 lay-> addMultiCellWidget ( m_busyblink, 5, 5, 0, 1 );
81 83
84 p1-> setEnabled ( false );
85 p3-> setEnabled ( false );
86
82 init ( ); 87 init ( );
88
89 QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." ));
90 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>." ));
91 QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." ));
92 QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
93 QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." ));
83} 94}
84 95
85void TabsSettings::init ( ) 96void TabsSettings::init ( )
86{ 97{
87 AppLnkSet rootFolder( MimeType::appsFolderName ( )); 98 AppLnkSet rootFolder( MimeType::appsFolderName ( ));
88 QStringList types = rootFolder. types ( ); 99 QStringList types = rootFolder. types ( );
100
101 m_list-> insertItem ( tr( "All Tabs" ));
102 m_ids << GLOBALID;
89 103
90 for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { 104 for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {
91 m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); 105 m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it ));
92 m_ids << *it; 106 m_ids << *it;
93 } 107 }
94 QImage img ( Resource::loadImage ( "DocsIcon" )); 108 QImage img ( Resource::loadImage ( "DocsIcon" ));
@@ -114,12 +128,14 @@ void TabsSettings::readTabSettings ( Config &cfg )
114 TabConfig tc; 128 TabConfig tc;
115 tc. m_view = TabConfig::Icon; 129 tc. m_view = TabConfig::Icon;
116 tc. m_bg_type = TabConfig::Ruled; 130 tc. m_bg_type = TabConfig::Ruled;
117 tc. m_changed = false; 131 tc. m_changed = false;
118 132
119 cfg. setGroup ( grp. arg ( *it )); 133 cfg. setGroup ( grp. arg ( *it ));
134 if ( *it == GLOBALID )
135 cfg. clearGroup ( );
120 136
121 QString view = cfg. readEntry ( "View", "Icon" ); 137 QString view = cfg. readEntry ( "View", "Icon" );
122 if ( view == "List" ) // No tr 138 if ( view == "List" ) // No tr
123 tc. m_view = TabConfig::List; 139 tc. m_view = TabConfig::List;
124 140
125 QString bgType = cfg. readEntry ( "BackgroundType", "Image" ); 141 QString bgType = cfg. readEntry ( "BackgroundType", "Image" );
@@ -140,14 +156,31 @@ void TabsSettings::readTabSettings ( Config &cfg )
140 } else { 156 } else {
141 tc. m_font_family = font ( ). family ( ); 157 tc. m_font_family = font ( ). family ( );
142 tc. m_font_size = font ( ). pointSize ( ); 158 tc. m_font_size = font ( ). pointSize ( );
143 tc. m_font_weight = 50; 159 tc. m_font_weight = 50;
144 tc. m_font_italic = false; 160 tc. m_font_italic = false;
145 } 161 }
162
146 m_tabs [*it] = tc; 163 m_tabs [*it] = tc;
147 } 164 }
165
166 // if all tabs have the same config, then initialize the GLOBALID tab to these values
167
168 TabConfig *first = 0;
169 bool same = true;
170
171 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
172 if ( *it == GLOBALID )
173 continue;
174 else if ( !first )
175 first = &m_tabs [*it];
176 else
177 same &= ( *first == m_tabs [*it] );
178 }
179 if ( same )
180 m_tabs [GLOBALID] = *first;
148} 181}
149 182
150 183
151void TabsSettings::accept ( ) 184void TabsSettings::accept ( )
152{ 185{
153 Config cfg ( "Launcher" ); 186 Config cfg ( "Launcher" );
@@ -155,15 +188,16 @@ void TabsSettings::accept ( )
155 // Launcher Tab 188 // Launcher Tab
156 QString grp ( "Tab %1" ); // No tr 189 QString grp ( "Tab %1" ); // No tr
157 190
158 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 191 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
159 TabConfig &tc = m_tabs [*it]; 192 TabConfig &tc = m_tabs [*it];
160 193
161 cfg. setGroup ( grp. arg ( *it )); 194 if ( !tc. m_changed || ( *it == GLOBALID ))
162 if ( !tc. m_changed )
163 continue; 195 continue;
196
197 cfg. setGroup ( grp. arg ( *it ));
164 switch ( tc. m_view ) { 198 switch ( tc. m_view ) {
165 case TabConfig::Icon: 199 case TabConfig::Icon:
166 cfg.writeEntry ( "View", "Icon" ); 200 cfg.writeEntry ( "View", "Icon" );
167 break; 201 break;
168 case TabConfig::List: 202 case TabConfig::List:
169 cfg.writeEntry ( "View", "List" ); 203 cfg.writeEntry ( "View", "List" );
@@ -243,10 +277,17 @@ void TabsSettings::editClicked ( )
243 TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true ); 277 TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true );
244 278
245 d-> showMaximized ( ); 279 d-> showMaximized ( );
246 if ( d-> exec ( ) == QDialog::Accepted ) { 280 if ( d-> exec ( ) == QDialog::Accepted ) {
247 tc. m_changed = true; 281 tc. m_changed = true;
248 m_tabs [m_ids [ind]] = tc; 282 m_tabs [m_ids [ind]] = tc;
283
284 if ( m_ids [ind] == GLOBALID ) {
285 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
286 if ( *it != GLOBALID )
287 m_tabs [*it] = tc;
288 }
289 }
249 } 290 }
250 291
251 delete d; 292 delete d;
252} 293}