summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/tabconfig.h13
-rw-r--r--core/settings/launcher/tabdialog.cpp45
-rw-r--r--core/settings/launcher/tabdialog.h2
-rw-r--r--core/settings/launcher/tabssettings.cpp69
-rw-r--r--core/settings/launcher/taskbarsettings.cpp3
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
@@ -43,6 +43,7 @@ struct TabConfig {
43 QString m_bg_image; 43 QString m_bg_image;
44 QString m_bg_color; 44 QString m_bg_color;
45 QString m_text_color; 45 QString m_text_color;
46 bool m_font_use;
46 QString m_font_family; 47 QString m_font_family;
47 int m_font_size; 48 int m_font_size;
48 int m_font_weight; 49 int m_font_weight;
@@ -56,10 +57,14 @@ struct TabConfig {
56 ( m_bg_image == tc. m_bg_image ) && 57 ( m_bg_image == tc. m_bg_image ) &&
57 ( m_bg_color == tc. m_bg_color ) && 58 ( m_bg_color == tc. m_bg_color ) &&
58 ( m_text_color == tc. m_text_color ) && 59 ( m_text_color == tc. m_text_color ) &&
59 ( m_font_family == tc. m_font_family ) && 60 ( m_font_use == tc. m_font_use ) &&
60 ( m_font_size == tc. m_font_size ) && 61 ( m_font_use ? (
61 ( m_font_weight == tc. m_font_weight ) && 62 ( m_font_family == tc. m_font_family ) &&
62 ( m_font_italic == tc. m_font_italic ); 63 ( m_font_size == tc. m_font_size ) &&
64 ( m_font_weight == tc. m_font_weight ) &&
65 ( m_font_italic == tc. m_font_italic )
66 ) : true );
67
63 } 68 }
64}; 69};
65 70
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
@@ -39,6 +39,7 @@
39#include <qbuttongroup.h> 39#include <qbuttongroup.h>
40#include <qpushbutton.h> 40#include <qpushbutton.h>
41#include <qwhatsthis.h> 41#include <qwhatsthis.h>
42#include <qcheckbox.h>
42 43
43#include <opie/ofontselector.h> 44#include <opie/ofontselector.h>
44#include <opie/otabwidget.h> 45#include <opie/otabwidget.h>
@@ -267,7 +268,7 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
267{ 268{
268 setCaption ( tr( "Edit Tab" )); 269 setCaption ( tr( "Edit Tab" ));
269 270
270 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 271 QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 );
271 272
272 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); 273 OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
273 QWidget *bgtab; 274 QWidget *bgtab;
@@ -297,7 +298,9 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
297 m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); 298 m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
298 m_bgimage = tc. m_bg_image; 299 m_bgimage = tc. m_bg_image;
299 bgTypeClicked ( tc. m_bg_type ); 300 bgTypeClicked ( tc. m_bg_type );
301 m_fontuse-> setChecked ( tc. m_font_use );
300 m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); 302 m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic ));
303 m_fontselect-> setEnabled ( m_fontuse-> isChecked ( ));
301 fontClicked ( m_fontselect-> selectedFont ( )); 304 fontClicked ( m_fontselect-> selectedFont ( ));
302 305
303 QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." )); 306 QWhatsThis::add ( sample, tr( "This is a rough preview of what the currently selected Tab will look like." ));
@@ -310,18 +313,26 @@ TabDialog::~TabDialog ( )
310 313
311QWidget *TabDialog::createFontTab ( QWidget *parent ) 314QWidget *TabDialog::createFontTab ( QWidget *parent )
312{ 315{
313 m_fontselect = new OFontSelector ( false, parent, "FontTab" ); 316 QWidget *tab = new QWidget ( parent, "FontTab" );
317 QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 );
318
319 m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab );
320 vertLayout-> addWidget ( m_fontuse );
321
322 m_fontselect = new OFontSelector ( false, tab, "fontsel" );
323 vertLayout-> addWidget ( m_fontselect );
314 324
325 connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool )));
315 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), 326 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
316 this, SLOT( fontClicked ( const QFont & ))); 327 this, SLOT( fontClicked ( const QFont & )));
317 328
318 return m_fontselect; 329 return tab;
319} 330}
320 331
321QWidget *TabDialog::createBgTab ( QWidget *parent ) 332QWidget *TabDialog::createBgTab ( QWidget *parent )
322{ 333{
323 QWidget *tab = new QWidget( parent, "AdvancedTab" ); 334 QWidget *tab = new QWidget( parent, "BgTab" );
324 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); 335 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
325 336
326 QGridLayout* gridLayout = new QGridLayout ( vertLayout ); 337 QGridLayout* gridLayout = new QGridLayout ( vertLayout );
327 gridLayout-> setColStretch ( 1, 10 ); 338 gridLayout-> setColStretch ( 1, 10 );
@@ -338,7 +349,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
338 gridLayout-> addWidget( rb, 0, 1 ); 349 gridLayout-> addWidget( rb, 0, 1 );
339 350
340 QHBoxLayout *hb = new QHBoxLayout ( ); 351 QHBoxLayout *hb = new QHBoxLayout ( );
341 hb-> setSpacing ( 4 ); 352 hb-> setSpacing ( 3 );
342 353
343 rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); 354 rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
344 m_bgtype-> insert ( rb, TabConfig::SolidColor ); 355 m_bgtype-> insert ( rb, TabConfig::SolidColor );
@@ -353,7 +364,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
353 gridLayout-> addLayout ( hb, 1, 1 ); 364 gridLayout-> addLayout ( hb, 1, 1 );
354 365
355 hb = new QHBoxLayout ( ); 366 hb = new QHBoxLayout ( );
356 hb-> setSpacing ( 4 ); 367 hb-> setSpacing ( 3 );
357 368
358 rb = new QRadioButton( tr( "Image" ), tab, "image" ); 369 rb = new QRadioButton( tr( "Image" ), tab, "image" );
359 m_bgtype-> insert ( rb, TabConfig::Image ); 370 m_bgtype-> insert ( rb, TabConfig::Image );
@@ -380,8 +391,8 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
380 391
381QWidget *TabDialog::createIconTab ( QWidget *parent ) 392QWidget *TabDialog::createIconTab ( QWidget *parent )
382{ 393{
383 QWidget *tab = new QWidget( parent, "AdvancedTab" ); 394 QWidget *tab = new QWidget( parent, "IconTab" );
384 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); 395 QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
385 396
386 QGridLayout* gridLayout = new QGridLayout ( vertLayout ); 397 QGridLayout* gridLayout = new QGridLayout ( vertLayout );
387 gridLayout-> setColStretch ( 1, 10 ); 398 gridLayout-> setColStretch ( 1, 10 );
@@ -489,13 +500,17 @@ void TabDialog::accept ( )
489 m_tc. m_bg_color = m_solidcolor-> color ( ). name ( ); 500 m_tc. m_bg_color = m_solidcolor-> color ( ). name ( );
490 m_tc. m_bg_image = m_bgimage; 501 m_tc. m_bg_image = m_bgimage;
491 m_tc. m_text_color = m_iconcolor-> color ( ). name ( ); 502 m_tc. m_text_color = m_iconcolor-> color ( ). name ( );
503
504 m_tc. m_font_use = m_fontuse-> isChecked ( );
505
506 if ( m_tc. m_font_use ) {
507 QFont f = m_fontselect-> selectedFont ( );
492 508
493 QFont f = m_fontselect-> selectedFont ( ); 509 m_tc. m_font_family = f. family ( );
494 510 m_tc. m_font_size = f. pointSize ( );
495 m_tc. m_font_family = f. family ( ); 511 m_tc. m_font_weight = f. weight ( );
496 m_tc. m_font_size = f. pointSize ( ); 512 m_tc. m_font_italic = f. italic ( );
497 m_tc. m_font_weight = f. weight ( ); 513 }
498 m_tc. m_font_italic = f. italic ( );
499 514
500 QDialog::accept ( ); 515 QDialog::accept ( );
501} 516}
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
@@ -36,6 +36,7 @@ class OFontSelector;
36class SampleView; 36class SampleView;
37class OColorButton; 37class OColorButton;
38class QPushButton; 38class QPushButton;
39class QCheckBox;
39 40
40 41
41class TabDialog : public QDialog { 42class TabDialog : public QDialog {
@@ -71,6 +72,7 @@ private:
71 QPushButton *m_imagebrowse; 72 QPushButton *m_imagebrowse;
72 QString m_bgimage; 73 QString m_bgimage;
73 QButtonGroup *m_bgtype; 74 QButtonGroup *m_bgtype;
75 QCheckBox *m_fontuse;
74 76
75 TabConfig &m_tc; 77 TabConfig &m_tc;
76}; 78};
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
@@ -47,7 +47,7 @@
47#include <qmessagebox.h> 47#include <qmessagebox.h>
48 48
49 49
50 #define GLOBALID "_launchersettings_global_dummy_" 50 #define GLOBALID ".global."
51 51
52 52
53TabsSettings::TabsSettings ( QWidget *parent, const char *name ) 53TabsSettings::TabsSettings ( QWidget *parent, const char *name )
@@ -124,42 +124,50 @@ void TabsSettings::readTabSettings ( Config &cfg )
124 QString grp ( "Tab %1" ); // No tr 124 QString grp ( "Tab %1" ); // No tr
125 m_tabs. clear ( ); 125 m_tabs. clear ( );
126 126
127 TabConfig global_def;
128 global_def. m_view = TabConfig::Icon;
129 global_def. m_bg_type = TabConfig::Ruled;
130 global_def. m_bg_image = "launcher/opie-background";
131 global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( );
132 global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( );
133 global_def. m_font_use = false;
134 global_def. m_font_family = font ( ). family ( );
135 global_def. m_font_size = font ( ). pointSize ( );
136 global_def. m_font_weight = 50;
137 global_def. m_font_italic = false;
138 global_def. m_changed = false;
139
140
127 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 141 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
128 TabConfig tc; 142 TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def;
129 tc. m_view = TabConfig::Icon;
130 tc. m_bg_type = TabConfig::Ruled;
131 tc. m_changed = false;
132 143
133 cfg. setGroup ( grp. arg ( *it )); 144 cfg. setGroup ( grp. arg ( *it ));
134 if ( *it == GLOBALID )
135 cfg. clearGroup ( );
136 145
137 QString view = cfg. readEntry ( "View", "Icon" ); 146 QString view = cfg. readEntry ( "View" );
147 if ( view == "Icon" ) // No tr
148 tc. m_view = TabConfig::Icon;
138 if ( view == "List" ) // No tr 149 if ( view == "List" ) // No tr
139 tc. m_view = TabConfig::List; 150 tc. m_view = TabConfig::List;
140 151
141 QString bgType = cfg. readEntry ( "BackgroundType", "Image" ); 152 QString bgType = cfg. readEntry ( "BackgroundType" );
142 if ( bgType == "SolidColor" ) 153 if ( bgType == "Image" )
154 tc. m_bg_type = TabConfig::Image;
155 else if ( bgType == "SolidColor" )
143 tc. m_bg_type = TabConfig::SolidColor; 156 tc. m_bg_type = TabConfig::SolidColor;
144 else if ( bgType == "Image" ) // No tr 157 else if ( bgType == "Image" ) // No tr
145 tc. m_bg_type = TabConfig::Image; 158 tc. m_bg_type = TabConfig::Image;
146 159
147 tc. m_bg_image = cfg. readEntry ( "BackgroundImage", "launcher/opie-background" ); 160 tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image );
148 tc. m_bg_color = cfg. readEntry ( "BackgroundColor", colorGroup ( ). color ( QColorGroup::Base ). name ( )); 161 tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color );
149 tc. m_text_color = cfg. readEntry ( "TextColor", colorGroup ( ). color ( QColorGroup::Text ). name ( )); 162 tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color );
150 QStringList f = cfg. readListEntry ( "Font", ',' ); 163 QStringList f = cfg. readListEntry ( "Font", ',' );
151 if ( f. count ( ) == 4 ) { 164 if ( f. count ( ) == 4 ) {
165 tc. m_font_use = true;
152 tc. m_font_family = f [0]; 166 tc. m_font_family = f [0];
153 tc. m_font_size = f [1]. toInt ( ); 167 tc. m_font_size = f [1]. toInt ( );
154 tc. m_font_weight = f [2]. toInt ( ); 168 tc. m_font_weight = f [2]. toInt ( );
155 tc. m_font_italic = ( f [3]. toInt ( )); 169 tc. m_font_italic = ( f [3]. toInt ( ));
156 } else { 170 }
157 tc. m_font_family = font ( ). family ( );
158 tc. m_font_size = font ( ). pointSize ( );
159 tc. m_font_weight = 50;
160 tc. m_font_italic = false;
161 }
162
163 m_tabs [*it] = tc; 171 m_tabs [*it] = tc;
164 } 172 }
165 173
@@ -176,8 +184,10 @@ void TabsSettings::readTabSettings ( Config &cfg )
176 else 184 else
177 same &= ( *first == m_tabs [*it] ); 185 same &= ( *first == m_tabs [*it] );
178 } 186 }
179 if ( same ) 187 if ( same ) {
180 m_tabs [GLOBALID] = *first; 188 m_tabs [GLOBALID] = *first;
189 m_tabs [GLOBALID]. m_changed = true;
190 }
181} 191}
182 192
183 193
@@ -191,7 +201,7 @@ void TabsSettings::accept ( )
191 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 201 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
192 TabConfig &tc = m_tabs [*it]; 202 TabConfig &tc = m_tabs [*it];
193 203
194 if ( !tc. m_changed || ( *it == GLOBALID )) 204 if ( !tc. m_changed )
195 continue; 205 continue;
196 206
197 cfg. setGroup ( grp. arg ( *it )); 207 cfg. setGroup ( grp. arg ( *it ));
@@ -211,8 +221,13 @@ void TabsSettings::accept ( )
211 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); 221 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color );
212 cfg. writeEntry ( "TextColor", tc. m_text_color ); 222 cfg. writeEntry ( "TextColor", tc. m_text_color );
213 223
214 QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); 224 if ( tc. m_font_use ) {
215 cfg. writeEntry ( "Font", f ); 225 QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" );
226 cfg. writeEntry ( "Font", f );
227 }
228 else
229 cfg. removeEntry ( "Font" );
230
216 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); 231 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" );
217 232
218 switch ( tc. m_bg_type ) { 233 switch ( tc. m_bg_type ) {
@@ -234,9 +249,11 @@ void TabsSettings::accept ( )
234 te << *it << tc. m_text_color; 249 te << *it << tc. m_text_color;
235 250
236 QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); 251 QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" );
237 fe << *it << tc. m_font_family; 252 fe << *it;
253 fe << ( tc. m_font_use ? tc. m_font_family : QString::null );
238 fe << tc. m_font_size; 254 fe << tc. m_font_size;
239 fe << tc. m_font_weight << ( tc. m_font_italic ? 1 : 0 ); 255 fe << tc. m_font_weight;
256 fe << ( tc. m_font_italic ? 1 : 0 );
240 257
241 tc. m_changed = false; 258 tc. m_changed = false;
242 } 259 }
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
@@ -135,6 +135,7 @@ void TaskbarSettings::accept ( )
135{ 135{
136 Config cfg ( "Taskbar" ); 136 Config cfg ( "Taskbar" );
137 cfg. setGroup ( "Applets" ); 137 cfg. setGroup ( "Applets" );
138
138 if ( m_applets_changed ) { 139 if ( m_applets_changed ) {
139 QStringList exclude; 140 QStringList exclude;
140 QMap <QString, QCheckListItem *>::Iterator it; 141 QMap <QString, QCheckListItem *>::Iterator it;
@@ -148,7 +149,7 @@ void TaskbarSettings::accept ( )
148 cfg. write ( ); 149 cfg. write ( );
149 150
150 if ( m_applets_changed ) { 151 if ( m_applets_changed ) {
151 QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); 152 QCopEnvelope e ( "QPE/TaskBar", "reloadApplets()" );
152 m_applets_changed = false; 153 m_applets_changed = false;
153 } 154 }
154} 155}