summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/tabconfig.h1
-rw-r--r--core/settings/launcher/tabdialog.cpp34
-rw-r--r--core/settings/launcher/tabdialog.h5
-rw-r--r--core/settings/launcher/tabssettings.cpp4
4 files changed, 32 insertions, 12 deletions
diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index 52ae81f..8f21eb4 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -18,6 +18,7 @@ struct TabConfig {
18 QString m_bg_color; 18 QString m_bg_color;
19 QString m_text_color; 19 QString m_text_color;
20 QString m_font_family; 20 QString m_font_family;
21 QString m_font_style;
21 int m_font_size; 22 int m_font_size;
22 bool m_changed; 23 bool m_changed;
23}; 24};
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 7b01cc7..ca48e66 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -224,7 +224,7 @@ private:
224 224
225 225
226TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) 226TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl )
227 : QDialog ( parent, name, modal, fl ) 227 : QDialog ( parent, name, modal, fl ), m_tc ( tc )
228{ 228{
229 setCaption ( tr( "Edit Tab" )); 229 setCaption ( tr( "Edit Tab" ));
230 230
@@ -249,6 +249,14 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig
249 249
250 lay-> addWidget ( tw, 10 ); 250 lay-> addWidget ( tw, 10 );
251 lay-> addWidget ( sample, 1 ); 251 lay-> addWidget ( sample, 1 );
252
253 m_iconsize-> setButton ( tc. m_view );
254 iconSizeClicked ( tc. m_view );
255 m_bgtype-> setButton ( tc. m_bg_type );
256 m_solidcolor-> setColor ( QColor ( tc. m_bg_color ));
257 bgTypeClicked ( tc. m_bg_type );
258 m_fontselect-> setSelectedFont ( tc. m_font_family, tc. m_font_style, tc. m_font_size );
259 fontClicked ( m_fontselect-> selectedFont ( ));
252} 260}
253 261
254 262
@@ -258,15 +266,7 @@ TabDialog::~TabDialog ( )
258 266
259QWidget *TabDialog::createFontTab ( QWidget *parent ) 267QWidget *TabDialog::createFontTab ( QWidget *parent )
260{ 268{
261 Config config ( "qpe" );
262 config. setGroup ( "Appearance" );
263
264 QString familyStr = config.readEntry( "FontFamily", "Helvetica" );
265 QString styleStr = config.readEntry( "FontStyle", "Regular" );
266 int size = config.readNumEntry( "FontSize", 10 );
267
268 m_fontselect = new OFontSelector ( parent, "FontTab" ); 269 m_fontselect = new OFontSelector ( parent, "FontTab" );
269 m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
270 270
271 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), 271 connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
272 this, SLOT( fontClicked ( const QFont & ))); 272 this, SLOT( fontClicked ( const QFont & )));
@@ -299,11 +299,11 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
299 rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); 299 rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
300 m_bgtype-> insert ( rb, TabConfig::SolidColor ); 300 m_bgtype-> insert ( rb, TabConfig::SolidColor );
301 hb-> addWidget ( rb ); 301 hb-> addWidget ( rb );
302 hb-> addSpacing ( 10 );
302 303
303 m_solidcolor = new OColorButton ( tab ); 304 m_solidcolor = new OColorButton ( tab );
304 connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( colorClicked ( const QColor & ))); 305 connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( colorClicked ( const QColor & )));
305 hb-> addWidget ( m_solidcolor ); 306 hb-> addWidget ( m_solidcolor );
306 hb-> addStretch ( 10 );
307 307
308 gridLayout-> addLayout ( hb, 1, 1 ); 308 gridLayout-> addLayout ( hb, 1, 1 );
309 309
@@ -311,7 +311,7 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
311 m_bgtype-> insert ( rb, TabConfig::Image ); 311 m_bgtype-> insert ( rb, TabConfig::Image );
312 gridLayout-> addWidget( rb, 3, 1 ); 312 gridLayout-> addWidget( rb, 3, 1 );
313 313
314 QPushButton *p; 314 //QPushButton *p;
315 315
316 connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int ))); 316 connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
317 317
@@ -379,3 +379,15 @@ void TabDialog::colorClicked ( const QColor &col )
379{ 379{
380 m_sample-> setBackgroundType ( TabConfig::SolidColor, col. name ( )); 380 m_sample-> setBackgroundType ( TabConfig::SolidColor, col. name ( ));
381} 381}
382
383void TabDialog::accept ( )
384{
385 m_tc. m_view = (TabConfig::ViewMode) m_iconsize-> id ( m_iconsize-> selected ( ));
386 m_tc. m_bg_type = (TabConfig::BackgroundType) m_bgtype-> id ( m_bgtype-> selected ( ));
387 m_tc. m_bg_color = m_solidcolor-> color ( ). name ( );
388 m_tc. m_font_family = m_fontselect-> fontFamily ( );
389 m_tc. m_font_size = m_fontselect-> fontSize ( );
390 m_tc. m_font_style = m_fontselect-> fontStyle ( );
391
392 QDialog::accept ( );
393}
diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h
index d602573..e1935fd 100644
--- a/core/settings/launcher/tabdialog.h
+++ b/core/settings/launcher/tabdialog.h
@@ -15,6 +15,9 @@ public:
15 TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 ); 15 TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags = 0 );
16 virtual ~TabDialog ( ); 16 virtual ~TabDialog ( );
17 17
18public slots:
19 virtual void accept ( );
20
18protected slots: 21protected slots:
19 void iconSizeClicked ( int ); 22 void iconSizeClicked ( int );
20 void fontClicked ( const QFont & ); 23 void fontClicked ( const QFont & );
@@ -34,6 +37,8 @@ private:
34 OColorButton *m_solidcolor; 37 OColorButton *m_solidcolor;
35 38
36 QButtonGroup *m_bgtype; 39 QButtonGroup *m_bgtype;
40
41 TabConfig &m_tc;
37}; 42};
38 43
39 44
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index fc2d2c9..ae78733 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -120,9 +120,11 @@ void TabsSettings::readTabSettings ( )
120 if ( f. count ( ) == 4 ) { 120 if ( f. count ( ) == 4 ) {
121 tc. m_font_family = f [0]; 121 tc. m_font_family = f [0];
122 tc. m_font_size = f [1]. toInt ( ); 122 tc. m_font_size = f [1]. toInt ( );
123 tc. m_font_style = f [2];
123 } else { 124 } else {
124 tc. m_font_family = font ( ). family ( ); 125 tc. m_font_family = font ( ). family ( );
125 tc. m_font_size = font ( ). pointSize ( ); 126 tc. m_font_size = font ( ). pointSize ( );
127 tc. m_font_style = "Regular";
126 } 128 }
127 m_tabs [*it] = tc; 129 m_tabs [*it] = tc;
128 } 130 }
@@ -158,7 +160,7 @@ void TabsSettings::accept ( )
158 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); 160 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color );
159 cfg. writeEntry ( "TextColor", tc. m_text_color ); 161 cfg. writeEntry ( "TextColor", tc. m_text_color );
160 162
161 QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + ",50,0"; 163 QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + tc. m_font_style + ",0";
162 cfg. writeEntry ( "Font", f ); 164 cfg. writeEntry ( "Font", f );
163 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); 165 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" );
164 166