author | drw <drw> | 2002-12-05 17:13:45 (UTC) |
---|---|---|
committer | drw <drw> | 2002-12-05 17:13:45 (UTC) |
commit | 675ab68194cc25793a18fd9e495958a90aaf0173 (patch) (unidiff) | |
tree | e2599a7dbef3184f015593f0b7ffe533c45a5ba5 /core/settings/launcher | |
parent | 1eb333726ccf7c608b9f987aac1a04d37d35936c (diff) | |
download | opie-675ab68194cc25793a18fd9e495958a90aaf0173.zip opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.gz opie-675ab68194cc25793a18fd9e495958a90aaf0173.tar.bz2 |
Modified OColorButton to pass color to color dialog. Impacts appearance, launcher settings and liquid settings.
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 5981d0b..4c9942f 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp | |||
@@ -100,13 +100,13 @@ public: | |||
100 | setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); | 100 | setMaximumHeight ( firstItem ( )-> height ( ) + 16 ); |
101 | } | 101 | } |
102 | 102 | ||
103 | void setViewMode ( TabConfig::ViewMode m ) | 103 | void setViewMode ( TabConfig::ViewMode m ) |
104 | { | 104 | { |
105 | viewport ( )-> setUpdatesEnabled ( false ); | 105 | viewport ( )-> setUpdatesEnabled ( false ); |
106 | 106 | ||
107 | switch ( m ) { | 107 | switch ( m ) { |
108 | case TabConfig::List: | 108 | case TabConfig::List: |
109 | setItemTextPos( QIconView::Right ); | 109 | setItemTextPos( QIconView::Right ); |
110 | break; | 110 | break; |
111 | case TabConfig::Icon: | 111 | case TabConfig::Icon: |
112 | setItemTextPos( QIconView::Bottom ); | 112 | setItemTextPos( QIconView::Bottom ); |
@@ -179,13 +179,13 @@ public: | |||
179 | } | 179 | } |
180 | 180 | ||
181 | void setViewFont ( const QFont &f ) | 181 | void setViewFont ( const QFont &f ) |
182 | { | 182 | { |
183 | setFont ( f ); | 183 | setFont ( f ); |
184 | } | 184 | } |
185 | 185 | ||
186 | void setItemTextPos ( ItemTextPos pos ) | 186 | void setItemTextPos ( ItemTextPos pos ) |
187 | { | 187 | { |
188 | calculateGrid ( pos ); | 188 | calculateGrid ( pos ); |
189 | QIconView::setItemTextPos( pos ); | 189 | QIconView::setItemTextPos( pos ); |
190 | } | 190 | } |
191 | 191 | ||
@@ -240,13 +240,13 @@ public: | |||
240 | } | 240 | } |
241 | 241 | ||
242 | void setBackgroundColor ( const QColor &c ) | 242 | void setBackgroundColor ( const QColor &c ) |
243 | { | 243 | { |
244 | m_bgcolor = c; | 244 | m_bgcolor = c; |
245 | } | 245 | } |
246 | 246 | ||
247 | void drawBackground ( QPainter *p, const QRect &r ) | 247 | void drawBackground ( QPainter *p, const QRect &r ) |
248 | { | 248 | { |
249 | if ( !m_bgpix. isNull ( )) { | 249 | if ( !m_bgpix. isNull ( )) { |
250 | p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), | 250 | p-> drawTiledPixmap ( r, m_bgpix, QPoint (( r. x ( ) + contentsX ( )) % m_bgpix. width ( ), |
251 | ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); | 251 | ( r. y ( ) + contentsY ( )) % m_bgpix. height ( ))); |
252 | } | 252 | } |
@@ -260,45 +260,45 @@ private: | |||
260 | QPixmap m_bgpix; | 260 | QPixmap m_bgpix; |
261 | TabConfig::BackgroundType m_bgtype; | 261 | TabConfig::BackgroundType m_bgtype; |
262 | }; | 262 | }; |
263 | 263 | ||
264 | 264 | ||
265 | 265 | ||
266 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) | 266 | TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &tc, QWidget *parent, const char *dname, bool modal, WFlags fl ) |
267 | : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) | 267 | : QDialog ( parent, dname, modal, fl | WStyle_ContextHelp ), m_tc ( tc ) |
268 | { | 268 | { |
269 | setCaption ( tr( "Edit Tab" )); | 269 | setCaption ( tr( "Edit Tab" )); |
270 | 270 | ||
271 | QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); | 271 | QVBoxLayout *lay = new QVBoxLayout ( this, 3, 3 ); |
272 | 272 | ||
273 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); | 273 | OTabWidget *tw = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom ); |
274 | QWidget *bgtab; | 274 | QWidget *bgtab; |
275 | 275 | ||
276 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); | 276 | tw-> addTab ( bgtab = createBgTab ( tw ), "appearance/backgroundtabicon.png", tr( "Background" )); |
277 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); | 277 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); |
278 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); | 278 | tw-> addTab ( createIconTab ( tw ), "appearance/colorstabicon.png", tr( "Icons" ) ); |
279 | 279 | ||
280 | tw-> setCurrentTab ( bgtab ); | 280 | tw-> setCurrentTab ( bgtab ); |
281 | 281 | ||
282 | QWidget *sample = new QVBox ( this ); | 282 | QWidget *sample = new QVBox ( this ); |
283 | QTabBar *tb = new QTabBar ( sample ); | 283 | QTabBar *tb = new QTabBar ( sample ); |
284 | QString name ( tr( "Previewing %1" ). arg ( tabname )); | 284 | QString name ( tr( "Previewing %1" ). arg ( tabname )); |
285 | 285 | ||
286 | tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); | 286 | tb-> addTab ( tabicon ? new QTab ( *tabicon, name ) : new QTab ( name )); |
287 | 287 | ||
288 | m_sample = new SampleView ( sample ); | 288 | m_sample = new SampleView ( sample ); |
289 | 289 | ||
290 | lay-> addWidget ( tw, 10 ); | 290 | lay-> addWidget ( tw, 10 ); |
291 | lay-> addWidget ( sample, 1 ); | 291 | lay-> addWidget ( sample, 1 ); |
292 | 292 | ||
293 | m_iconsize-> setButton ( tc. m_view ); | 293 | m_iconsize-> setButton ( tc. m_view ); |
294 | iconSizeClicked ( tc. m_view ); | 294 | iconSizeClicked ( tc. m_view ); |
295 | m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); | 295 | //m_iconcolor-> setColor ( QColor ( m_tc. m_text_color )); |
296 | iconColorClicked ( m_iconcolor-> color ( )); | 296 | iconColorClicked ( m_iconcolor-> color ( )); |
297 | m_bgtype-> setButton ( tc. m_bg_type ); | 297 | m_bgtype-> setButton ( tc. m_bg_type ); |
298 | m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); | 298 | //m_solidcolor-> setColor ( QColor ( tc. m_bg_color )); |
299 | m_bgimage = tc. m_bg_image; | 299 | m_bgimage = tc. m_bg_image; |
300 | bgTypeClicked ( tc. m_bg_type ); | 300 | bgTypeClicked ( tc. m_bg_type ); |
301 | m_fontuse-> setChecked ( tc. m_font_use ); | 301 | m_fontuse-> setChecked ( tc. m_font_use ); |
302 | 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 ( )); | 303 | m_fontselect-> setEnabled ( m_fontuse-> isChecked ( )); |
304 | fontClicked ( m_fontselect-> selectedFont ( )); | 304 | fontClicked ( m_fontselect-> selectedFont ( )); |
@@ -316,27 +316,27 @@ QWidget *TabDialog::createFontTab ( QWidget *parent ) | |||
316 | QWidget *tab = new QWidget ( parent, "FontTab" ); | 316 | QWidget *tab = new QWidget ( parent, "FontTab" ); |
317 | QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 ); | 317 | QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 ); |
318 | 318 | ||
319 | m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab ); | 319 | m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab ); |
320 | vertLayout-> addWidget ( m_fontuse ); | 320 | vertLayout-> addWidget ( m_fontuse ); |
321 | 321 | ||
322 | m_fontselect = new OFontSelector ( false, tab, "fontsel" ); | 322 | m_fontselect = new OFontSelector ( false, tab, "fontsel" ); |
323 | vertLayout-> addWidget ( m_fontselect ); | 323 | vertLayout-> addWidget ( m_fontselect ); |
324 | 324 | ||
325 | connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool ))); | 325 | connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool ))); |
326 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 326 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
327 | this, SLOT( fontClicked ( const QFont & ))); | 327 | this, SLOT( fontClicked ( const QFont & ))); |
328 | 328 | ||
329 | return tab; | 329 | return tab; |
330 | } | 330 | } |
331 | 331 | ||
332 | QWidget *TabDialog::createBgTab ( QWidget *parent ) | 332 | QWidget *TabDialog::createBgTab ( QWidget *parent ) |
333 | { | 333 | { |
334 | QWidget *tab = new QWidget( parent, "BgTab" ); | 334 | QWidget *tab = new QWidget( parent, "BgTab" ); |
335 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 ); | 335 | QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 ); |
336 | 336 | ||
337 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); | 337 | QGridLayout* gridLayout = new QGridLayout ( vertLayout ); |
338 | gridLayout-> setColStretch ( 1, 10 ); | 338 | gridLayout-> setColStretch ( 1, 10 ); |
339 | 339 | ||
340 | QLabel* label = new QLabel( tr( "Type:" ), tab ); | 340 | QLabel* label = new QLabel( tr( "Type:" ), tab ); |
341 | gridLayout-> addWidget ( label, 0, 0 ); | 341 | gridLayout-> addWidget ( label, 0, 0 ); |
342 | m_bgtype = new QButtonGroup( tab, "buttongroup" ); | 342 | m_bgtype = new QButtonGroup( tab, "buttongroup" ); |
@@ -349,31 +349,31 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) | |||
349 | gridLayout-> addWidget( rb, 0, 1 ); | 349 | gridLayout-> addWidget( rb, 0, 1 ); |
350 | 350 | ||
351 | QHBoxLayout *hb = new QHBoxLayout ( ); | 351 | QHBoxLayout *hb = new QHBoxLayout ( ); |
352 | hb-> setSpacing ( 3 ); | 352 | hb-> setSpacing ( 3 ); |
353 | 353 | ||
354 | rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); | 354 | rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); |
355 | m_bgtype-> insert ( rb, TabConfig::SolidColor ); | 355 | m_bgtype-> insert ( rb, TabConfig::SolidColor ); |
356 | hb-> addWidget ( rb ); | 356 | hb-> addWidget ( rb ); |
357 | hb-> addSpacing ( 10 ); | 357 | hb-> addSpacing ( 10 ); |
358 | 358 | ||
359 | m_solidcolor = new OColorButton ( tab ); | 359 | m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); |
360 | connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); | 360 | connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & ))); |
361 | hb-> addWidget ( m_solidcolor ); | 361 | hb-> addWidget ( m_solidcolor ); |
362 | hb-> addStretch ( 10 ); | 362 | hb-> addStretch ( 10 ); |
363 | 363 | ||
364 | gridLayout-> addLayout ( hb, 1, 1 ); | 364 | gridLayout-> addLayout ( hb, 1, 1 ); |
365 | 365 | ||
366 | hb = new QHBoxLayout ( ); | 366 | hb = new QHBoxLayout ( ); |
367 | hb-> setSpacing ( 3 ); | 367 | hb-> setSpacing ( 3 ); |
368 | 368 | ||
369 | rb = new QRadioButton( tr( "Image" ), tab, "image" ); | 369 | rb = new QRadioButton( tr( "Image" ), tab, "image" ); |
370 | m_bgtype-> insert ( rb, TabConfig::Image ); | 370 | m_bgtype-> insert ( rb, TabConfig::Image ); |
371 | hb-> addWidget( rb ); | 371 | hb-> addWidget( rb ); |
372 | hb-> addSpacing ( 10 ); | 372 | hb-> addSpacing ( 10 ); |
373 | 373 | ||
374 | m_imagebrowse = new QPushButton ( tr( "Select..." ), tab ); | 374 | m_imagebrowse = new QPushButton ( tr( "Select..." ), tab ); |
375 | connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( ))); | 375 | connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( ))); |
376 | hb-> addWidget ( m_imagebrowse ); | 376 | hb-> addWidget ( m_imagebrowse ); |
377 | hb-> addStretch ( 10 ); | 377 | hb-> addStretch ( 10 ); |
378 | 378 | ||
379 | gridLayout-> addLayout ( hb, 2, 1 ); | 379 | gridLayout-> addLayout ( hb, 2, 1 ); |
@@ -404,30 +404,30 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) | |||
404 | m_iconsize-> setExclusive ( true ); | 404 | m_iconsize-> setExclusive ( true ); |
405 | 405 | ||
406 | QRadioButton *rb; | 406 | QRadioButton *rb; |
407 | rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" ); | 407 | rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" ); |
408 | m_iconsize-> insert ( rb, TabConfig::List ); | 408 | m_iconsize-> insert ( rb, TabConfig::List ); |
409 | gridLayout-> addWidget( rb, 0, 1 ); | 409 | gridLayout-> addWidget( rb, 0, 1 ); |
410 | 410 | ||
411 | rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" ); | 411 | rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" ); |
412 | m_iconsize-> insert ( rb, TabConfig::Icon ); | 412 | m_iconsize-> insert ( rb, TabConfig::Icon ); |
413 | gridLayout-> addWidget( rb, 1, 1 ); | 413 | gridLayout-> addWidget( rb, 1, 1 ); |
414 | 414 | ||
415 | connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int ))); | 415 | connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int ))); |
416 | 416 | ||
417 | //vertLayout-> addSpacing ( 8 ); | 417 | //vertLayout-> addSpacing ( 8 ); |
418 | 418 | ||
419 | //gridLayout = new QGridLayout ( vertLayout ); | 419 | //gridLayout = new QGridLayout ( vertLayout ); |
420 | gridLayout-> addRowSpacing ( 2, 8 ); | 420 | gridLayout-> addRowSpacing ( 2, 8 ); |
421 | 421 | ||
422 | label = new QLabel ( tr( "Color:" ), tab ); | 422 | label = new QLabel ( tr( "Color:" ), tab ); |
423 | gridLayout-> addWidget ( label, 3, 0 ); | 423 | gridLayout-> addWidget ( label, 3, 0 ); |
424 | 424 | ||
425 | m_iconcolor = new OColorButton ( tab ); | 425 | m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) ); |
426 | connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & ))); | 426 | connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & ))); |
427 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); | 427 | gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); |
428 | 428 | ||
429 | vertLayout-> addStretch ( 10 ); | 429 | vertLayout-> addStretch ( 10 ); |
430 | 430 | ||
431 | return tab; | 431 | return tab; |
432 | } | 432 | } |
433 | 433 | ||