-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 75a3de5..6288f5f 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -262,97 +262,97 @@ private: | |||
262 | 262 | ||
263 | 263 | ||
264 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *name, bool modal, WFlags fl ) | 264 | TabDialog::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 ) | 265 | : QDialog ( parent, name, modal, fl ), m_tc ( tc ) |
266 | { | 266 | { |
267 | setCaption ( tr( "Edit Tab" )); | 267 | setCaption ( tr( "Edit Tab" )); |
268 | 268 | ||
269 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); | 269 | QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); |
270 | 270 | ||
271 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); | 271 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); |
272 | QWidget *bgtab; | 272 | QWidget *bgtab; |
273 | 273 | ||
274 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); | 274 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); |
275 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); | 275 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); |
276 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); | 276 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); |
277 | 277 | ||
278 | tw-> setCurrentTab ( bgtab ); | 278 | tw-> setCurrentTab ( bgtab ); |
279 | 279 | ||
280 | QWidget *sample = new QVBox ( this ); | 280 | QWidget *sample = new QVBox ( this ); |
281 | QTabBar *tb = new QTabBar ( sample ); | 281 | QTabBar *tb = new QTabBar ( sample ); |
282 | QString name ( tr( "Previewing %1" ). arg ( tabname )); | 282 | QString name ( tr( "Previewing %1" ). arg ( tabname )); |
283 | 283 | ||
284 | tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); | 284 | tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); |
285 | 285 | ||
286 | m_sample = new SampleView ( sample ); | 286 | m_sample = new SampleView ( sample ); |
287 | 287 | ||
288 | lay-> addWidget ( tw, 10 ); | 288 | lay-> addWidget ( tw, 10 ); |
289 | lay-> addWidget ( sample, 1 ); | 289 | lay-> addWidget ( sample, 1 ); |
290 | 290 | ||
291 | m_iconsize-> setButton ( tc. m_view ); | 291 | m_iconsize-> setButton ( tc. m_view ); |
292 | iconSizeClicked ( tc. m_view ); | 292 | iconSizeClicked ( tc. m_view ); |
293 | m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); | 293 | m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); |
294 | iconColorClicked ( m_iconcolor-> color ( )); | 294 | iconColorClicked ( m_iconcolor-> color ( )); |
295 | m_bgtype-> setButton ( tc. m_bg_type ); | 295 | m_bgtype-> setButton ( tc. m_bg_type ); |
296 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); | 296 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); |
297 | m_bgimage = tc. m_bg_image; | 297 | m_bgimage = tc. m_bg_image; |
298 | bgTypeClicked ( tc. m_bg_type ); | 298 | 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 )); | 299 | 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 ( )); | 300 | fontClicked ( m_fontselect-> selectedFont ( )); |
301 | } | 301 | } |
302 | 302 | ||
303 | 303 | ||
304 | TabDialog::~TabDialog ( ) | 304 | TabDialog::~TabDialog ( ) |
305 | { | 305 | { |
306 | } | 306 | } |
307 | 307 | ||
308 | QWidget *TabDialog::createFontTab ( QWidget *parent ) | 308 | QWidget *TabDialog::createFontTab ( QWidget *parent ) |
309 | { | 309 | { |
310 | m_fontselect = new OFontSelector ( parent, "FontTab" ); | 310 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); |
311 | 311 | ||
312 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 312 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
313 | this, SLOT( fontClicked ( const QFont & ))); | 313 | this, SLOT( fontClicked ( const QFont & ))); |
314 | 314 | ||
315 | return m_fontselect; | 315 | return m_fontselect; |
316 | } | 316 | } |
317 | 317 | ||
318 | QWidget *TabDialog::createBgTab ( QWidget *parent ) | 318 | QWidget *TabDialog::createBgTab ( QWidget *parent ) |
319 | { | 319 | { |
320 | QWidget *tab = new QWidget( parent, "AdvancedTab" ); | 320 | QWidget *tab = new QWidget( parent, "AdvancedTab" ); |
321 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); | 321 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 4, 4 ); |
322 | 322 | ||
323 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); | 323 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); |
324 | gridLayout-> setColStretch ( 1, 10 ); | 324 | gridLayout-> setColStretch ( 1, 10 ); |
325 | 325 | ||
326 | QLabel* label = new QLabel( tr( "Type:" ), tab ); | 326 | QLabel* label = new QLabel( tr( "Type:" ), tab ); |
327 | gridLayout-> addWidget ( label, 0, 0 ); | 327 | gridLayout-> addWidget ( label, 0, 0 ); |
328 | m_bgtype = new QButtonGroup( tab, "buttongroup" ); | 328 | m_bgtype = new QButtonGroup( tab, "buttongroup" ); |
329 | m_bgtype-> hide ( ); | 329 | m_bgtype-> hide ( ); |
330 | m_bgtype-> setExclusive ( true ); | 330 | m_bgtype-> setExclusive ( true ); |
331 | 331 | ||
332 | QRadioButton *rb; | 332 | QRadioButton *rb; |
333 | rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" ); | 333 | rb = new QRadioButton( tr( "Ruled" ), tab, "ruled" ); |
334 | m_bgtype-> insert ( rb, TabConfig::Ruled ); | 334 | m_bgtype-> insert ( rb, TabConfig::Ruled ); |
335 | gridLayout-> addWidget( rb, 0, 1 ); | 335 | gridLayout-> addWidget( rb, 0, 1 ); |
336 | 336 | ||
337 | QHBoxLayout *hb = new QHBoxLayout ( ); | 337 | QHBoxLayout *hb = new QHBoxLayout ( ); |
338 | hb-> setSpacing ( 4 ); | 338 | hb-> setSpacing ( 4 ); |
339 | 339 | ||
340 | rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); | 340 | rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); |
341 | m_bgtype-> insert ( rb, TabConfig::SolidColor ); | 341 | m_bgtype-> insert ( rb, TabConfig::SolidColor ); |
342 | hb-> addWidget ( rb ); | 342 | hb-> addWidget ( rb ); |
343 | hb-> addSpacing ( 10 ); | 343 | hb-> addSpacing ( 10 ); |
344 | 344 | ||
345 | m_solidcolor = new OColorButton ( tab ); | 345 | m_solidcolor = new OColorButton ( tab ); |
346 | connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); | 346 | connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); |
347 | hb-> addWidget ( m_solidcolor ); | 347 | hb-> addWidget ( m_solidcolor ); |
348 | hb-> addStretch ( 10 ); | 348 | hb-> addStretch ( 10 ); |
349 | 349 | ||
350 | gridLayout-> addLayout ( hb, 1, 1 ); | 350 | gridLayout-> addLayout ( hb, 1, 1 ); |
351 | 351 | ||
352 | hb = new QHBoxLayout ( ); | 352 | hb = new QHBoxLayout ( ); |
353 | hb-> setSpacing ( 4 ); | 353 | hb-> setSpacing ( 4 ); |
354 | 354 | ||
355 | rb = new QRadioButton( tr( "Image" ), tab, "image" ); | 355 | rb = new QRadioButton( tr( "Image" ), tab, "image" ); |
356 | m_bgtype-> insert ( rb, TabConfig::Image ); | 356 | m_bgtype-> insert ( rb, TabConfig::Image ); |
357 | hb-> addWidget( rb ); | 357 | hb-> addWidget( rb ); |
358 | hb-> addSpacing ( 10 ); | 358 | hb-> addSpacing ( 10 ); |
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index a5d216c..e269aec 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -206,97 +206,97 @@ QWidget *Appearance::createStyleTab ( QWidget *parent ) | |||
206 | vertLayout-> addWidget ( m_style_settings ); | 206 | vertLayout-> addWidget ( m_style_settings ); |
207 | 207 | ||
208 | loadStyles ( m_style_list ); | 208 | loadStyles ( m_style_list ); |
209 | 209 | ||
210 | QString s = config. readEntry ( "Style", "Light" ); | 210 | QString s = config. readEntry ( "Style", "Light" ); |
211 | m_style_list-> setCurrentItem ( m_style_list-> findItem ( s )); | 211 | m_style_list-> setCurrentItem ( m_style_list-> findItem ( s )); |
212 | m_original_style = m_style_list-> currentItem ( ); | 212 | m_original_style = m_style_list-> currentItem ( ); |
213 | styleClicked ( m_original_style ); | 213 | styleClicked ( m_original_style ); |
214 | 214 | ||
215 | connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) ); | 215 | connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) ); |
216 | 216 | ||
217 | return tab; | 217 | return tab; |
218 | } | 218 | } |
219 | 219 | ||
220 | QWidget *Appearance::createDecoTab ( QWidget *parent ) | 220 | QWidget *Appearance::createDecoTab ( QWidget *parent ) |
221 | { | 221 | { |
222 | Config config ( "qpe" ); | 222 | Config config ( "qpe" ); |
223 | config. setGroup ( "Appearance" ); | 223 | config. setGroup ( "Appearance" ); |
224 | 224 | ||
225 | QWidget* tab = new QWidget( parent, "DecoTab" ); | 225 | QWidget* tab = new QWidget( parent, "DecoTab" ); |
226 | QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); | 226 | QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); |
227 | 227 | ||
228 | m_deco_list = new QListBox( tab, "m_deco_list" ); | 228 | m_deco_list = new QListBox( tab, "m_deco_list" ); |
229 | vertLayout->addWidget( m_deco_list ); | 229 | vertLayout->addWidget( m_deco_list ); |
230 | 230 | ||
231 | loadDecos ( m_deco_list ); | 231 | loadDecos ( m_deco_list ); |
232 | 232 | ||
233 | QString s = config. readEntry ( "Decoration" ); | 233 | QString s = config. readEntry ( "Decoration" ); |
234 | m_deco_list-> setCurrentItem ( m_deco_list-> findItem ( s )); | 234 | m_deco_list-> setCurrentItem ( m_deco_list-> findItem ( s )); |
235 | m_original_deco = m_deco_list-> currentItem ( ); | 235 | m_original_deco = m_deco_list-> currentItem ( ); |
236 | if ( m_deco_list-> currentItem ( ) < 0 ) | 236 | if ( m_deco_list-> currentItem ( ) < 0 ) |
237 | m_deco_list-> setCurrentItem ( 0 ); | 237 | m_deco_list-> setCurrentItem ( 0 ); |
238 | decoClicked ( m_original_deco ); | 238 | decoClicked ( m_original_deco ); |
239 | 239 | ||
240 | connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); | 240 | connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); |
241 | 241 | ||
242 | return tab; | 242 | return tab; |
243 | } | 243 | } |
244 | 244 | ||
245 | QWidget *Appearance::createFontTab ( QWidget *parent ) | 245 | QWidget *Appearance::createFontTab ( QWidget *parent ) |
246 | { | 246 | { |
247 | Config config ( "qpe" ); | 247 | Config config ( "qpe" ); |
248 | config. setGroup ( "Appearance" ); | 248 | config. setGroup ( "Appearance" ); |
249 | 249 | ||
250 | QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); | 250 | QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); |
251 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); | 251 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); |
252 | int size = config.readNumEntry( "FontSize", 10 ); | 252 | int size = config.readNumEntry( "FontSize", 10 ); |
253 | 253 | ||
254 | m_fontselect = new OFontSelector ( parent, "FontTab" ); | 254 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); |
255 | m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); | 255 | m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); |
256 | 256 | ||
257 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 257 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
258 | this, SLOT( fontClicked ( const QFont & ))); | 258 | this, SLOT( fontClicked ( const QFont & ))); |
259 | 259 | ||
260 | return m_fontselect; | 260 | return m_fontselect; |
261 | } | 261 | } |
262 | 262 | ||
263 | QWidget *Appearance::createColorTab ( QWidget *parent ) | 263 | QWidget *Appearance::createColorTab ( QWidget *parent ) |
264 | { | 264 | { |
265 | Config config ( "qpe" ); | 265 | Config config ( "qpe" ); |
266 | config. setGroup ( "Appearance" ); | 266 | config. setGroup ( "Appearance" ); |
267 | 267 | ||
268 | 268 | ||
269 | QWidget *tab = new QWidget( parent, "ColorTab" ); | 269 | QWidget *tab = new QWidget( parent, "ColorTab" ); |
270 | QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 4, 4 ); | 270 | QGridLayout *gridLayout = new QGridLayout( tab, 0, 0, 4, 4 ); |
271 | gridLayout->setRowStretch ( 3, 10 ); | 271 | gridLayout->setRowStretch ( 3, 10 ); |
272 | 272 | ||
273 | m_color_list = new QListBox ( tab ); | 273 | m_color_list = new QListBox ( tab ); |
274 | gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 ); | 274 | gridLayout->addMultiCellWidget ( m_color_list, 0, 3, 0, 0 ); |
275 | connect( m_color_list, SIGNAL( highlighted( int ) ), this, SLOT( colorClicked( int ) ) ); | 275 | connect( m_color_list, SIGNAL( highlighted( int ) ), this, SLOT( colorClicked( int ) ) ); |
276 | 276 | ||
277 | loadColors ( m_color_list ); | 277 | loadColors ( m_color_list ); |
278 | m_color_list-> setCurrentItem ( 0 ); | 278 | m_color_list-> setCurrentItem ( 0 ); |
279 | 279 | ||
280 | QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" ); | 280 | QPushButton* tempButton = new QPushButton( tab, "editSchemeButton" ); |
281 | tempButton->setText( tr( "Edit..." ) ); | 281 | tempButton->setText( tr( "Edit..." ) ); |
282 | connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) ); | 282 | connect( tempButton, SIGNAL( clicked() ), this, SLOT( editSchemeClicked() ) ); |
283 | gridLayout->addWidget( tempButton, 0, 1 ); | 283 | gridLayout->addWidget( tempButton, 0, 1 ); |
284 | 284 | ||
285 | tempButton = new QPushButton( tab, "deleteSchemeButton" ); | 285 | tempButton = new QPushButton( tab, "deleteSchemeButton" ); |
286 | tempButton->setText( tr( "Delete" ) ); | 286 | tempButton->setText( tr( "Delete" ) ); |
287 | connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) ); | 287 | connect( tempButton, SIGNAL( clicked() ), this, SLOT( deleteSchemeClicked() ) ); |
288 | gridLayout->addWidget( tempButton, 1, 1 ); | 288 | gridLayout->addWidget( tempButton, 1, 1 ); |
289 | 289 | ||
290 | tempButton = new QPushButton( tab, "saveSchemeButton" ); | 290 | tempButton = new QPushButton( tab, "saveSchemeButton" ); |
291 | tempButton->setText( tr( "Save" ) ); | 291 | tempButton->setText( tr( "Save" ) ); |
292 | connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) ); | 292 | connect( tempButton, SIGNAL( clicked() ), this, SLOT( saveSchemeClicked() ) ); |
293 | gridLayout->addWidget( tempButton, 2, 1 ); | 293 | gridLayout->addWidget( tempButton, 2, 1 ); |
294 | 294 | ||
295 | return tab; | 295 | return tab; |
296 | } | 296 | } |
297 | 297 | ||
298 | QWidget *Appearance::createGuiTab ( QWidget *parent ) | 298 | QWidget *Appearance::createGuiTab ( QWidget *parent ) |
299 | { | 299 | { |
300 | Config config ( "qpe" ); | 300 | Config config ( "qpe" ); |
301 | config. setGroup ( "Appearance" ); | 301 | config. setGroup ( "Appearance" ); |
302 | 302 | ||