-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 27 | ||||
-rw-r--r-- | noncore/settings/appearance2/decolistitem.h | 10 | ||||
-rw-r--r-- | noncore/settings/appearance2/stylelistitem.h | 5 |
3 files changed, 32 insertions, 10 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 43ff24c..8cd54a2 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -120,147 +120,161 @@ void Appearance::loadStyles ( QListBox *list ) | |||
120 | list->insertItem( new StyleListItem ( "Motif", new QMotifStyle ( ))); | 120 | list->insertItem( new StyleListItem ( "Motif", new QMotifStyle ( ))); |
121 | #endif | 121 | #endif |
122 | #ifndef QT_NO_STYLE_MOTIFPLUS | 122 | #ifndef QT_NO_STYLE_MOTIFPLUS |
123 | list->insertItem( new StyleListItem ( "MotifPlus", new QMotifPlusStyle ( ))); | 123 | list->insertItem( new StyleListItem ( "MotifPlus", new QMotifPlusStyle ( ))); |
124 | #endif | 124 | #endif |
125 | #ifndef QT_NO_STYLE_PLATINUM | 125 | #ifndef QT_NO_STYLE_PLATINUM |
126 | list->insertItem( new StyleListItem ( "Platinum", new QPlatinumStyle ( ))); | 126 | list->insertItem( new StyleListItem ( "Platinum", new QPlatinumStyle ( ))); |
127 | #endif | 127 | #endif |
128 | #endif | 128 | #endif |
129 | list->insertItem( new StyleListItem ( "QPE", new QPEStyle ( ))); | 129 | list->insertItem( new StyleListItem ( "QPE", new QPEStyle ( ))); |
130 | 130 | ||
131 | #if QT_VERSION < 300 | 131 | #if QT_VERSION < 300 |
132 | { | 132 | { |
133 | QString path = QPEApplication::qpeDir() + "/plugins/styles/"; | 133 | QString path = QPEApplication::qpeDir() + "/plugins/styles/"; |
134 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); | 134 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); |
135 | 135 | ||
136 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { | 136 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { |
137 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 137 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
138 | StyleInterface *iface; | 138 | StyleInterface *iface; |
139 | 139 | ||
140 | if ( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) | 140 | if ( lib-> queryInterface ( IID_Style, (QUnknownInterface **) &iface ) == QS_OK ) |
141 | list-> insertItem ( new StyleListItem ( lib, iface )); | 141 | list-> insertItem ( new StyleListItem ( lib, iface )); |
142 | else | 142 | else |
143 | delete lib; | 143 | delete lib; |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | #endif | 147 | #endif |
148 | } | 148 | } |
149 | 149 | ||
150 | void Appearance::loadDecos ( QListBox *list ) | 150 | void Appearance::loadDecos ( QListBox *list ) |
151 | { | 151 | { |
152 | list-> insertItem ( new DecoListItem ( tr( "Default" ))); | 152 | list-> insertItem ( new DecoListItem ( "QPE" )); |
153 | 153 | ||
154 | { | 154 | { |
155 | QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; | 155 | QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; |
156 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); | 156 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); |
157 | 157 | ||
158 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { | 158 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { |
159 | QLibrary *lib = new QLibrary ( path + "/" + *it ); | 159 | QLibrary *lib = new QLibrary ( path + "/" + *it ); |
160 | WindowDecorationInterface *iface; | 160 | WindowDecorationInterface *iface; |
161 | 161 | ||
162 | if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) | 162 | if ( lib-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &iface ) == QS_OK ) |
163 | list-> insertItem ( new DecoListItem ( lib, iface )); | 163 | list-> insertItem ( new DecoListItem ( lib, iface )); |
164 | else | 164 | else |
165 | delete lib; | 165 | delete lib; |
166 | } | 166 | } |
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | void Appearance::loadColors ( QListBox *list ) | 170 | void Appearance::loadColors ( QListBox *list ) |
171 | { | 171 | { |
172 | list-> clear ( ); | 172 | list-> clear ( ); |
173 | { | 173 | { |
174 | Config config ( "qpe" ); | 174 | Config config ( "qpe" ); |
175 | config. setGroup ( "Appearance" ); | 175 | config. setGroup ( "Appearance" ); |
176 | 176 | ||
177 | list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), config )); | 177 | list-> insertItem ( new ColorListItem ( tr( "Current scheme" ), config )); |
178 | } | 178 | } |
179 | 179 | ||
180 | QString path = QPEApplication::qpeDir ( ) + "/etc/colors/"; | 180 | QString path = QPEApplication::qpeDir ( ) + "/etc/colors/"; |
181 | QStringList sl = QDir ( path ). entryList ( "*.scheme" ); | 181 | QStringList sl = QDir ( path ). entryList ( "*.scheme" ); |
182 | 182 | ||
183 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { | 183 | for ( QStringList::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) { |
184 | QString name = (*it). left ((*it). find ( ".scheme" )); | 184 | QString name = (*it). left ((*it). find ( ".scheme" )); |
185 | Config config ( path + *it, Config::File ); | 185 | Config config ( path + *it, Config::File ); |
186 | config. setGroup ( "Colors" ); | 186 | config. setGroup ( "Colors" ); |
187 | 187 | ||
188 | list-> insertItem ( new ColorListItem ( name, config )); | 188 | list-> insertItem ( new ColorListItem ( name, config )); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | 191 | ||
192 | 192 | ||
193 | QWidget *Appearance::createStyleTab ( QWidget *parent ) | 193 | QWidget *Appearance::createStyleTab ( QWidget *parent ) |
194 | { | 194 | { |
195 | Config config ( "qpe" ); | 195 | Config config ( "qpe" ); |
196 | config. setGroup ( "Appearance" ); | 196 | config. setGroup ( "Appearance" ); |
197 | 197 | ||
198 | QWidget* tab = new QWidget( parent, "StyleTab" ); | 198 | QWidget* tab = new QWidget( parent, "StyleTab" ); |
199 | QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); | 199 | QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); |
200 | 200 | ||
201 | m_style_list = new QListBox( tab, "m_style_list" ); | 201 | m_style_list = new QListBox( tab, "m_style_list" ); |
202 | vertLayout->addWidget( m_style_list ); | 202 | vertLayout->addWidget( m_style_list ); |
203 | 203 | ||
204 | m_style_settings = new QPushButton ( tr( "Settings..." ), tab ); | 204 | m_style_settings = new QPushButton ( tr( "Settings..." ), tab ); |
205 | connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( ))); | 205 | connect ( m_style_settings, SIGNAL( clicked ( )), this, SLOT( styleSettingsClicked ( ))); |
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 | |
212 | for ( uint i = 0; i < m_style_list-> count ( ); i++ ) { | ||
213 | if (((StyleListItem *) m_style_list-> item ( i ))-> key ( ) == s ) { | ||
214 | m_style_list-> setCurrentItem ( i ); | ||
215 | break; | ||
216 | } | ||
217 | } | ||
218 | |||
212 | m_original_style = m_style_list-> currentItem ( ); | 219 | m_original_style = m_style_list-> currentItem ( ); |
213 | styleClicked ( m_original_style ); | 220 | styleClicked ( m_original_style ); |
214 | 221 | ||
215 | connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) ); | 222 | connect( m_style_list, SIGNAL( highlighted( int ) ), this, SLOT( styleClicked( int ) ) ); |
216 | 223 | ||
217 | return tab; | 224 | return tab; |
218 | } | 225 | } |
219 | 226 | ||
220 | QWidget *Appearance::createDecoTab ( QWidget *parent ) | 227 | QWidget *Appearance::createDecoTab ( QWidget *parent ) |
221 | { | 228 | { |
222 | Config config ( "qpe" ); | 229 | Config config ( "qpe" ); |
223 | config. setGroup ( "Appearance" ); | 230 | config. setGroup ( "Appearance" ); |
224 | 231 | ||
225 | QWidget* tab = new QWidget( parent, "DecoTab" ); | 232 | QWidget* tab = new QWidget( parent, "DecoTab" ); |
226 | QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); | 233 | QVBoxLayout* vertLayout = new QVBoxLayout( tab, 4, 4 ); |
227 | 234 | ||
228 | m_deco_list = new QListBox( tab, "m_deco_list" ); | 235 | m_deco_list = new QListBox( tab, "m_deco_list" ); |
229 | vertLayout->addWidget( m_deco_list ); | 236 | vertLayout->addWidget( m_deco_list ); |
230 | 237 | ||
231 | loadDecos ( m_deco_list ); | 238 | loadDecos ( m_deco_list ); |
232 | 239 | ||
233 | QString s = config. readEntry ( "Decoration" ); | 240 | QString s = config. readEntry ( "Decoration" ); |
234 | m_deco_list-> setCurrentItem ( m_deco_list-> findItem ( s )); | 241 | |
242 | for ( uint i = 0; i < m_deco_list-> count ( ); i++ ) { | ||
243 | if (((DecoListItem *) m_deco_list-> item ( i ))-> key ( ) == s ) { | ||
244 | m_deco_list-> setCurrentItem ( i ); | ||
245 | break; | ||
246 | } | ||
247 | } | ||
248 | |||
235 | m_original_deco = m_deco_list-> currentItem ( ); | 249 | m_original_deco = m_deco_list-> currentItem ( ); |
236 | if ( m_deco_list-> currentItem ( ) < 0 ) | 250 | if ( m_deco_list-> currentItem ( ) < 0 ) |
237 | m_deco_list-> setCurrentItem ( 0 ); | 251 | m_deco_list-> setCurrentItem ( 0 ); |
238 | decoClicked ( m_original_deco ); | 252 | decoClicked ( m_original_deco ); |
239 | 253 | ||
240 | connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); | 254 | connect( m_deco_list, SIGNAL( highlighted( int ) ), this, SLOT( decoClicked( int ) ) ); |
241 | 255 | ||
242 | return tab; | 256 | return tab; |
243 | } | 257 | } |
244 | 258 | ||
245 | QWidget *Appearance::createFontTab ( QWidget *parent ) | 259 | QWidget *Appearance::createFontTab ( QWidget *parent ) |
246 | { | 260 | { |
247 | Config config ( "qpe" ); | 261 | Config config ( "qpe" ); |
248 | config. setGroup ( "Appearance" ); | 262 | config. setGroup ( "Appearance" ); |
249 | 263 | ||
250 | QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); | 264 | QString familyStr = config.readEntry( "FontFamily", "Helvetica" ); |
251 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); | 265 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); |
252 | int size = config.readNumEntry( "FontSize", 10 ); | 266 | int size = config.readNumEntry( "FontSize", 10 ); |
253 | 267 | ||
254 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); | 268 | m_fontselect = new OFontSelector ( false, parent, "FontTab" ); |
255 | m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); | 269 | m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); |
256 | 270 | ||
257 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), | 271 | connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )), |
258 | this, SLOT( fontClicked ( const QFont & ))); | 272 | this, SLOT( fontClicked ( const QFont & ))); |
259 | 273 | ||
260 | return m_fontselect; | 274 | return m_fontselect; |
261 | } | 275 | } |
262 | 276 | ||
263 | QWidget *Appearance::createColorTab ( QWidget *parent ) | 277 | QWidget *Appearance::createColorTab ( QWidget *parent ) |
264 | { | 278 | { |
265 | Config config ( "qpe" ); | 279 | Config config ( "qpe" ); |
266 | config. setGroup ( "Appearance" ); | 280 | config. setGroup ( "Appearance" ); |
@@ -357,64 +371,70 @@ Appearance::Appearance( QWidget* parent, const char* name, WFlags ) | |||
357 | QWidget *styletab; | 371 | QWidget *styletab; |
358 | 372 | ||
359 | tw-> addTab ( styletab = createStyleTab ( tw ), "appearance/styletabicon.png", tr( "Style" )); | 373 | tw-> addTab ( styletab = createStyleTab ( tw ), "appearance/styletabicon.png", tr( "Style" )); |
360 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); | 374 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); |
361 | tw-> addTab ( createColorTab ( tw ), "appearance/colorstabicon.png", tr( "Colors" ) ); | 375 | tw-> addTab ( createColorTab ( tw ), "appearance/colorstabicon.png", tr( "Colors" ) ); |
362 | tw-> addTab ( createDecoTab ( tw ), "appearance/decotabicon.png", tr( "Windows" ) ); | 376 | tw-> addTab ( createDecoTab ( tw ), "appearance/decotabicon.png", tr( "Windows" ) ); |
363 | tw-> addTab ( createGuiTab ( tw ), "appearance/advancedtabicon.png", tr( "Gui" ) ); | 377 | tw-> addTab ( createGuiTab ( tw ), "appearance/advancedtabicon.png", tr( "Gui" ) ); |
364 | 378 | ||
365 | top-> addWidget ( tw, 10 ); | 379 | top-> addWidget ( tw, 10 ); |
366 | top-> addWidget ( m_sample, 1 ); | 380 | top-> addWidget ( m_sample, 1 ); |
367 | 381 | ||
368 | tw-> setCurrentTab ( styletab ); | 382 | tw-> setCurrentTab ( styletab ); |
369 | } | 383 | } |
370 | 384 | ||
371 | Appearance::~Appearance() | 385 | Appearance::~Appearance() |
372 | { | 386 | { |
373 | } | 387 | } |
374 | 388 | ||
375 | void Appearance::accept ( ) | 389 | void Appearance::accept ( ) |
376 | { | 390 | { |
377 | Config config("qpe"); | 391 | Config config("qpe"); |
378 | config.setGroup( "Appearance" ); | 392 | config.setGroup( "Appearance" ); |
379 | 393 | ||
380 | int newtabstyle = m_tabstyle_list-> currentItem ( ); | 394 | int newtabstyle = m_tabstyle_list-> currentItem ( ); |
381 | bool newtabpos = m_tabstyle_top-> isChecked ( ); | 395 | bool newtabpos = m_tabstyle_top-> isChecked ( ); |
382 | 396 | ||
383 | 397 | ||
384 | if ( m_style_changed ) { | 398 | if ( m_style_changed ) { |
385 | StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); | 399 | StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); |
386 | if ( item ) | 400 | if ( item ) |
387 | config.writeEntry( "Style", item-> key ( )); | 401 | config.writeEntry( "Style", item-> key ( )); |
388 | } | 402 | } |
403 | |||
404 | if ( m_deco_changed ) { | ||
405 | DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( )); | ||
406 | if ( item ) | ||
407 | config.writeEntry( "Decoration", item-> key ( )); | ||
408 | } | ||
389 | 409 | ||
390 | if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos )) { | 410 | if (( newtabstyle != m_original_tabstyle ) || ( newtabpos != m_original_tabpos )) { |
391 | config. writeEntry ( "TabStyle", newtabstyle + 1 ); | 411 | config. writeEntry ( "TabStyle", newtabstyle + 1 ); |
392 | config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" ); | 412 | config. writeEntry ( "TabPosition", newtabpos ? "Top" : "Bottom" ); |
393 | } | 413 | } |
394 | 414 | ||
395 | if ( m_font_changed ) { | 415 | if ( m_font_changed ) { |
396 | config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( )); | 416 | config. writeEntry ( "FontFamily", m_fontselect-> fontFamily ( )); |
397 | config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( )); | 417 | config. writeEntry ( "FontStyle", m_fontselect-> fontStyle ( )); |
398 | config. writeEntry ( "FontSize", m_fontselect-> fontSize ( )); | 418 | config. writeEntry ( "FontSize", m_fontselect-> fontSize ( )); |
399 | } | 419 | } |
400 | 420 | ||
401 | 421 | ||
402 | if ( m_color_changed ) | 422 | if ( m_color_changed ) |
403 | { | 423 | { |
404 | ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( )); | 424 | ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( )); |
405 | 425 | ||
406 | if ( item ) | 426 | if ( item ) |
407 | item-> save ( config ); | 427 | item-> save ( config ); |
408 | } | 428 | } |
409 | 429 | ||
410 | config. write ( ); // need to flush the config info first | 430 | config. write ( ); // need to flush the config info first |
411 | Global::applyStyle ( ); | 431 | Global::applyStyle ( ); |
412 | 432 | ||
413 | if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart Opie now?" ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) { | 433 | if ( QMessageBox::warning ( this, tr( "Restart" ), tr( "Do you want to restart Opie now?" ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ) == 0 ) { |
414 | QCopEnvelope e( "QPE/System", "restart()" ); | 434 | QCopEnvelope e( "QPE/System", "restart()" ); |
415 | } | 435 | } |
416 | 436 | ||
417 | QDialog::accept ( ); | 437 | QDialog::accept ( ); |
418 | } | 438 | } |
419 | 439 | ||
420 | void Appearance::done ( int r ) | 440 | void Appearance::done ( int r ) |
@@ -440,64 +460,65 @@ void Appearance::styleSettingsClicked ( ) | |||
440 | StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); | 460 | StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); |
441 | 461 | ||
442 | if ( item && item-> hasSettings ( )) { | 462 | if ( item && item-> hasSettings ( )) { |
443 | QDialog *d = new QDialog ( this, "SETTINGS-DLG", true ); | 463 | QDialog *d = new QDialog ( this, "SETTINGS-DLG", true ); |
444 | QVBoxLayout *vbox = new QVBoxLayout ( d, 4, 0 ); | 464 | QVBoxLayout *vbox = new QVBoxLayout ( d, 4, 0 ); |
445 | 465 | ||
446 | QWidget *w = item-> settings ( d ); | 466 | QWidget *w = item-> settings ( d ); |
447 | 467 | ||
448 | if ( w ) { | 468 | if ( w ) { |
449 | vbox-> addWidget ( w ); | 469 | vbox-> addWidget ( w ); |
450 | 470 | ||
451 | d-> setCaption ( w-> caption ( )); | 471 | d-> setCaption ( w-> caption ( )); |
452 | 472 | ||
453 | d-> showMaximized ( ); | 473 | d-> showMaximized ( ); |
454 | bool accepted = ( d-> exec ( ) == QDialog::Accepted ); | 474 | bool accepted = ( d-> exec ( ) == QDialog::Accepted ); |
455 | 475 | ||
456 | if ( item-> setSettings ( accepted )) | 476 | if ( item-> setSettings ( accepted )) |
457 | m_style_changed = true; | 477 | m_style_changed = true; |
458 | } | 478 | } |
459 | delete d; | 479 | delete d; |
460 | } | 480 | } |
461 | } | 481 | } |
462 | 482 | ||
463 | void Appearance::decoClicked ( int index ) | 483 | void Appearance::decoClicked ( int index ) |
464 | { | 484 | { |
465 | DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index ); | 485 | DecoListItem *dli = (DecoListItem *) m_deco_list-> item ( index ); |
466 | 486 | ||
467 | if ( m_sample ) { | 487 | if ( m_sample ) { |
468 | if ( dli && dli-> interface ( )) | 488 | if ( dli && dli-> interface ( )) |
469 | m_sample-> setDecoration ( dli-> interface ( )); | 489 | m_sample-> setDecoration ( dli-> interface ( )); |
470 | else | 490 | else |
471 | m_sample-> setDecoration ( new DefaultWindowDecoration ( )); | 491 | m_sample-> setDecoration ( new DefaultWindowDecoration ( )); |
492 | m_sample-> repaint ( ); | ||
472 | } | 493 | } |
473 | m_deco_changed |= ( index != m_original_deco ); | 494 | m_deco_changed |= ( index != m_original_deco ); |
474 | } | 495 | } |
475 | 496 | ||
476 | void Appearance::fontClicked ( const QFont &f ) | 497 | void Appearance::fontClicked ( const QFont &f ) |
477 | { | 498 | { |
478 | m_font_changed |= ( f != m_sample-> font ( )); | 499 | m_font_changed |= ( f != m_sample-> font ( )); |
479 | m_sample-> setFont ( f ); | 500 | m_sample-> setFont ( f ); |
480 | } | 501 | } |
481 | 502 | ||
482 | void Appearance::colorClicked ( int index ) | 503 | void Appearance::colorClicked ( int index ) |
483 | { | 504 | { |
484 | ColorListItem *item = (ColorListItem *) m_color_list-> item ( index ); | 505 | ColorListItem *item = (ColorListItem *) m_color_list-> item ( index ); |
485 | 506 | ||
486 | if ( item ) | 507 | if ( item ) |
487 | m_sample-> setPalette ( item-> palette ( )); | 508 | m_sample-> setPalette ( item-> palette ( )); |
488 | 509 | ||
489 | m_color_changed |= ( item-> palette ( ) != qApp-> palette ( )); | 510 | m_color_changed |= ( item-> palette ( ) != qApp-> palette ( )); |
490 | } | 511 | } |
491 | 512 | ||
492 | 513 | ||
493 | void Appearance::editSchemeClicked ( ) | 514 | void Appearance::editSchemeClicked ( ) |
494 | { | 515 | { |
495 | ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( )); | 516 | ColorListItem *item = (ColorListItem *) m_color_list-> item ( m_color_list-> currentItem ( )); |
496 | 517 | ||
497 | int cnt = 0; | 518 | int cnt = 0; |
498 | QString labels [QColorGroup::NColorRoles]; | 519 | QString labels [QColorGroup::NColorRoles]; |
499 | QColor colors [QColorGroup::NColorRoles]; | 520 | QColor colors [QColorGroup::NColorRoles]; |
500 | 521 | ||
501 | for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { | 522 | for ( QColorGroup::ColorRole role = (QColorGroup::ColorRole) 0; role != QColorGroup::NColorRoles; ((int) role )++ ) { |
502 | QColor col = item-> color ( role ); | 523 | QColor col = item-> color ( role ); |
503 | 524 | ||
diff --git a/noncore/settings/appearance2/decolistitem.h b/noncore/settings/appearance2/decolistitem.h index 23261b1..d190ceb 100644 --- a/noncore/settings/appearance2/decolistitem.h +++ b/noncore/settings/appearance2/decolistitem.h | |||
@@ -2,105 +2,105 @@ | |||
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #ifndef DECOLISTITEM_H | 28 | #ifndef DECOLISTITEM_H |
29 | #define DECOLISTITEM_H | 29 | #define DECOLISTITEM_H |
30 | 30 | ||
31 | #include <qpe/windowdecorationinterface.h> | 31 | #include <qpe/windowdecorationinterface.h> |
32 | #include <qlistbox.h> | 32 | #include <qlistbox.h> |
33 | 33 | ||
34 | class DecoListItem : public QListBoxText { | 34 | class DecoListItem : public QListBoxPixmap { |
35 | public: | 35 | public: |
36 | DecoListItem ( const QString &t ) : QListBoxText ( t ) | 36 | DecoListItem ( const QString &t ) : QListBoxPixmap ( QPixmap ( ), t ) |
37 | { | 37 | { |
38 | m_lib = 0; | 38 | m_lib = 0; |
39 | m_window_if = 0; | 39 | m_window_if = 0; |
40 | // m_settings_if = 0; | 40 | // m_settings_if = 0; |
41 | } | 41 | } |
42 | 42 | ||
43 | DecoListItem ( QLibrary *lib, WindowDecorationInterface *iface ) : QListBoxText ( iface-> name ( )) | 43 | DecoListItem ( QLibrary *lib, WindowDecorationInterface *iface ) : QListBoxPixmap ( iface-> icon ( ), iface-> name ( )) |
44 | { | 44 | { |
45 | m_lib = lib; | 45 | m_lib = lib; |
46 | m_window_if = iface; | 46 | m_window_if = iface; |
47 | 47 | ||
48 | // iface-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &m_settings_if ); | 48 | // iface-> queryInterface ( IID_WindowDecoration, (QUnknownInterface **) &m_settings_if ); |
49 | } | 49 | } |
50 | 50 | ||
51 | virtual ~DecoListItem ( ) | 51 | virtual ~DecoListItem ( ) |
52 | { | 52 | { |
53 | // if ( m_settings_if ) | 53 | // if ( m_settings_if ) |
54 | // m_settings_if-> release ( ); | 54 | // m_settings_if-> release ( ); |
55 | if ( m_window_if ) | 55 | if ( m_window_if ) |
56 | m_window_if-> release ( ); | 56 | m_window_if-> release ( ); |
57 | delete m_lib; | 57 | delete m_lib; |
58 | } | 58 | } |
59 | 59 | ||
60 | bool hasSettings ( ) const | 60 | bool hasSettings ( ) const |
61 | { | 61 | { |
62 | // return ( m_settings_if ); | 62 | // return ( m_settings_if ); |
63 | return false; | 63 | return false; |
64 | } | 64 | } |
65 | 65 | ||
66 | QWidget *settings ( QWidget * /*parent*/ ) | 66 | QWidget *settings ( QWidget * /*parent*/ ) |
67 | { | 67 | { |
68 | // return m_settings_if ? m_settings_if-> create ( parent ) : 0; | 68 | // return m_settings_if ? m_settings_if-> create ( parent ) : 0; |
69 | return 0; | 69 | return 0; |
70 | } | 70 | } |
71 | 71 | ||
72 | bool setSettings ( bool /*accepted*/ ) | 72 | bool setSettings ( bool /*accepted*/ ) |
73 | { | 73 | { |
74 | // if ( !m_settings_if ) | 74 | // if ( !m_settings_if ) |
75 | // return false; | 75 | // return false; |
76 | 76 | ||
77 | // if ( accepted ) | 77 | // if ( accepted ) |
78 | // return m_settings_if-> accept ( ); | 78 | // return m_settings_if-> accept ( ); |
79 | // else { | 79 | // else { |
80 | // m_settings_if-> reject ( ); | 80 | // m_settings_if-> reject ( ); |
81 | // return false; | 81 | // return false; |
82 | // } | 82 | // } |
83 | return false; | 83 | return false; |
84 | } | 84 | } |
85 | 85 | ||
86 | QString key ( ) | 86 | QString key ( ) |
87 | { | 87 | { |
88 | if ( m_window_if ) | 88 | if ( m_lib ) |
89 | return QString ( m_window_if-> name ( )); | 89 | return QFileInfo ( m_lib-> library ( )). fileName ( ); |
90 | else | 90 | else |
91 | return text ( ); | 91 | return text ( ); |
92 | } | 92 | } |
93 | 93 | ||
94 | WindowDecorationInterface *interface ( ) | 94 | WindowDecorationInterface *interface ( ) |
95 | { | 95 | { |
96 | return m_window_if; | 96 | return m_window_if; |
97 | } | 97 | } |
98 | 98 | ||
99 | private: | 99 | private: |
100 | QLibrary *m_lib; | 100 | QLibrary *m_lib; |
101 | WindowDecorationInterface *m_window_if; | 101 | WindowDecorationInterface *m_window_if; |
102 | //WindowDecorationSettingsInterface *m_settings_if; | 102 | //WindowDecorationSettingsInterface *m_settings_if; |
103 | 103 | ||
104 | }; | 104 | }; |
105 | 105 | ||
106 | #endif \ No newline at end of file | 106 | #endif \ No newline at end of file |
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h index c0258e0..e261511 100644 --- a/noncore/settings/appearance2/stylelistitem.h +++ b/noncore/settings/appearance2/stylelistitem.h | |||
@@ -60,53 +60,54 @@ public: | |||
60 | if ( m_settings_if ) | 60 | if ( m_settings_if ) |
61 | m_settings_if-> release ( ); | 61 | m_settings_if-> release ( ); |
62 | if ( m_style_if ) | 62 | if ( m_style_if ) |
63 | m_style_if-> release ( ); | 63 | m_style_if-> release ( ); |
64 | delete m_lib; | 64 | delete m_lib; |
65 | } | 65 | } |
66 | 66 | ||
67 | bool hasSettings ( ) const | 67 | bool hasSettings ( ) const |
68 | { | 68 | { |
69 | return ( m_settings_if ); | 69 | return ( m_settings_if ); |
70 | } | 70 | } |
71 | 71 | ||
72 | QWidget *settings ( QWidget *parent ) | 72 | QWidget *settings ( QWidget *parent ) |
73 | { | 73 | { |
74 | return m_settings_if ? m_settings_if-> create ( parent ) : 0; | 74 | return m_settings_if ? m_settings_if-> create ( parent ) : 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | bool setSettings ( bool accepted ) | 77 | bool setSettings ( bool accepted ) |
78 | { | 78 | { |
79 | if ( !m_settings_if ) | 79 | if ( !m_settings_if ) |
80 | return false; | 80 | return false; |
81 | 81 | ||
82 | if ( accepted ) | 82 | if ( accepted ) |
83 | return m_settings_if-> accept ( ); | 83 | return m_settings_if-> accept ( ); |
84 | else { | 84 | else { |
85 | m_settings_if-> reject ( ); | 85 | m_settings_if-> reject ( ); |
86 | return false; | 86 | return false; |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
90 | QString key ( ) | 90 | QString key ( ) |
91 | { | 91 | { |
92 | if ( m_style_if ) | 92 | if ( m_lib ) |
93 | return QString ( m_style_if-> key ( )); | 93 | return QFileInfo ( m_lib-> library ( )). fileName ( ); |
94 | //return QString ( m_style_if-> key ( )); | ||
94 | else | 95 | else |
95 | return text ( ); | 96 | return text ( ); |
96 | } | 97 | } |
97 | 98 | ||
98 | QStyle *style ( ) | 99 | QStyle *style ( ) |
99 | { | 100 | { |
100 | return m_style; | 101 | return m_style; |
101 | } | 102 | } |
102 | 103 | ||
103 | private: | 104 | private: |
104 | QLibrary *m_lib; | 105 | QLibrary *m_lib; |
105 | QStyle *m_style; | 106 | QStyle *m_style; |
106 | StyleInterface *m_style_if; | 107 | StyleInterface *m_style_if; |
107 | StyleSettingsInterface *m_settings_if; | 108 | StyleSettingsInterface *m_settings_if; |
108 | 109 | ||
109 | }; | 110 | }; |
110 | 111 | ||
111 | 112 | ||
112 | #endif | 113 | #endif |