-rw-r--r-- | microkde/kresources/configpage.cpp | 7 | ||||
-rw-r--r-- | microkde/kresources/configwidget.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp index 533be51..011e47e 100644 --- a/microkde/kresources/configpage.cpp +++ b/microkde/kresources/configpage.cpp | |||
@@ -364,170 +364,167 @@ void ConfigPage::slotRemove() | |||
364 | 364 | ||
365 | QListViewItem *item = mListView->currentItem(); | 365 | QListViewItem *item = mListView->currentItem(); |
366 | ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item ); | 366 | ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item ); |
367 | 367 | ||
368 | if ( !confItem ) | 368 | if ( !confItem ) |
369 | return; | 369 | return; |
370 | 370 | ||
371 | if ( confItem->standard() ) { | 371 | if ( confItem->standard() ) { |
372 | KMessageBox::sorry( this, i18n( "You cannot remove your standard resource!\n Please select a new standard resource first." ) ); | 372 | KMessageBox::sorry( this, i18n( "You cannot remove your standard resource!\n Please select a new standard resource first." ) ); |
373 | return; | 373 | return; |
374 | } | 374 | } |
375 | 375 | ||
376 | mCurrentManager->remove( confItem->resource() ); | 376 | mCurrentManager->remove( confItem->resource() ); |
377 | 377 | ||
378 | if ( item == mLastItem ) | 378 | if ( item == mLastItem ) |
379 | mLastItem = 0; | 379 | mLastItem = 0; |
380 | 380 | ||
381 | mListView->takeItem( item ); | 381 | mListView->takeItem( item ); |
382 | delete item; | 382 | delete item; |
383 | 383 | ||
384 | emit changed( true ); | 384 | emit changed( true ); |
385 | } | 385 | } |
386 | 386 | ||
387 | void ConfigPage::slotEdit() | 387 | void ConfigPage::slotEdit() |
388 | { | 388 | { |
389 | if ( !mCurrentManager ) | 389 | if ( !mCurrentManager ) |
390 | return; | 390 | return; |
391 | 391 | ||
392 | QListViewItem *item = mListView->currentItem(); | 392 | QListViewItem *item = mListView->currentItem(); |
393 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); | 393 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); |
394 | if ( !configItem ) | 394 | if ( !configItem ) |
395 | return; | 395 | return; |
396 | 396 | ||
397 | Resource *resource = configItem->resource(); | 397 | Resource *resource = configItem->resource(); |
398 | 398 | ||
399 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); | 399 | ConfigDialog dlg( this, mFamily, resource, "KRES::ConfigDialog" ); |
400 | 400 | ||
401 | if ( dlg.exec() ) { | 401 | if ( dlg.exec() ) { |
402 | configItem->setText( 0, resource->resourceName() ); | 402 | configItem->setText( 0, resource->resourceName() ); |
403 | configItem->setText( 1, resource->type() ); | 403 | configItem->setText( 1, resource->type() ); |
404 | 404 | ||
405 | if ( configItem->standard() && configItem->readOnly() ) { | 405 | if ( configItem->standard() && configItem->readOnly() ) { |
406 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br> resource as standard!" ) ); | 406 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br> resource as standard!" ) ); |
407 | configItem->setStandard( false ); | 407 | configItem->setStandard( false ); |
408 | } | 408 | } |
409 | 409 | ||
410 | mCurrentManager->resourceChanged( resource ); | 410 | mCurrentManager->resourceChanged( resource ); |
411 | emit changed( true ); | 411 | emit changed( true ); |
412 | } | 412 | } |
413 | } | 413 | } |
414 | 414 | ||
415 | void ConfigPage::slotStandard() | 415 | void ConfigPage::slotStandard() |
416 | { | 416 | { |
417 | if ( !mCurrentManager ) | 417 | if ( !mCurrentManager ) |
418 | return; | 418 | return; |
419 | 419 | ||
420 | ConfigViewItem *item = static_cast<ConfigViewItem*>( mListView->currentItem() ); | 420 | ConfigViewItem *item = static_cast<ConfigViewItem*>( mListView->currentItem() ); |
421 | if ( !item ) | 421 | if ( !item ) |
422 | return; | 422 | return; |
423 | 423 | ||
424 | if ( item->readOnly() ) { | 424 | if ( item->readOnly() ) { |
425 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br>resource as standard!" ) ); | 425 | KMessageBox::sorry( this, i18n( "You cannot use a read-only<br>resource as standard!" ) ); |
426 | return; | 426 | return; |
427 | } | 427 | } |
428 | 428 | ||
429 | if ( !item->isOn() ) { | 429 | if ( !item->isOn() ) { |
430 | KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) ); | 430 | KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) ); |
431 | return; | 431 | return; |
432 | } | 432 | } |
433 | 433 | ||
434 | QListViewItem *it = mListView->firstChild(); | 434 | QListViewItem *it = mListView->firstChild(); |
435 | while ( it != 0 ) { | 435 | while ( it != 0 ) { |
436 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it ); | 436 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it ); |
437 | if ( configItem->standard() ) | 437 | if ( configItem->standard() ) |
438 | configItem->setStandard( false ); | 438 | configItem->setStandard( false ); |
439 | it = it->itemBelow(); | 439 | it = it->itemBelow(); |
440 | } | 440 | } |
441 | 441 | ||
442 | item->setStandard( true ); | 442 | item->setStandard( true ); |
443 | mCurrentManager->setStandardResource( item->resource() ); | 443 | mCurrentManager->setStandardResource( item->resource() ); |
444 | emit changed( true ); | 444 | emit changed( true ); |
445 | 445 | ||
446 | } | 446 | } |
447 | 447 | ||
448 | void ConfigPage::slotSelectionChanged() | 448 | void ConfigPage::slotSelectionChanged() |
449 | { | 449 | { |
450 | bool state = ( mListView->currentItem() != 0 ); | 450 | bool state = ( mListView->currentItem() != 0 ); |
451 | 451 | ||
452 | mRemoveButton->setEnabled( state ); | 452 | mRemoveButton->setEnabled( state ); |
453 | mEditButton->setEnabled( state ); | 453 | mEditButton->setEnabled( state ); |
454 | mStandardButton->setEnabled( state ); | 454 | mStandardButton->setEnabled( state ); |
455 | } | 455 | } |
456 | 456 | ||
457 | void ConfigPage::resourceAdded( Resource* resource ) | 457 | void ConfigPage::resourceAdded( Resource* resource ) |
458 | { | 458 | { |
459 | qDebug("ConfigPage::resourceAdded : %s", resource->resourceName().latin1()); | 459 | qDebug("ConfigPage::resourceAdded : %s", resource->resourceName().latin1()); |
460 | kdDebug(5650) << "ConfigPage::resourceAdded( " << resource->resourceName() << " )" << endl; | ||
461 | ConfigViewItem *item = new ConfigViewItem( mListView, resource ); | 460 | ConfigViewItem *item = new ConfigViewItem( mListView, resource ); |
462 | 461 | ||
463 | // FIXME: this sucks. This should be in the config file, | 462 | // FIXME: this sucks. This should be in the config file, |
464 | // or application-dependent, in which case it's always Off | 463 | // or application-dependent, in which case it's always Off |
465 | item->setOn( false ); | 464 | item->setOn( false ); |
466 | 465 | ||
467 | mLastItem = item; | 466 | mLastItem = item; |
468 | 467 | ||
469 | emit changed( true ); | 468 | emit changed( true ); |
470 | } | 469 | } |
471 | 470 | ||
472 | void ConfigPage::resourceModified( Resource* resource ) | 471 | void ConfigPage::resourceModified( Resource* resource ) |
473 | { | 472 | { |
474 | qDebug("ConfigPage::resourceModified : %s", resource->resourceName().latin1()); | 473 | qDebug("ConfigPage::resourceModified : %s", resource->resourceName().latin1()); |
475 | kdDebug(5650) << "ConfigPage::resourceModified( " << resource->resourceName() << " )" << endl; | ||
476 | } | 474 | } |
477 | 475 | ||
478 | void ConfigPage::resourceDeleted( Resource* resource ) | 476 | void ConfigPage::resourceDeleted( Resource* resource ) |
479 | { | 477 | { |
480 | qDebug("ConfigPage::resourceDeleted : %s", resource->resourceName().latin1()); | 478 | qDebug("ConfigPage::resourceDeleted : %s", resource->resourceName().latin1()); |
481 | kdDebug(5650) << "ConfigPage::resourceDeleted( " << resource->resourceName() << " )" << endl; | ||
482 | } | 479 | } |
483 | 480 | ||
484 | void ConfigPage::slotItemClicked( QListViewItem *item ) | 481 | void ConfigPage::slotItemClicked( QListViewItem *item ) |
485 | { | 482 | { |
486 | ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item ); | 483 | ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item ); |
487 | if ( !configItem ) return; | 484 | if ( !configItem ) return; |
488 | 485 | ||
489 | if ( configItem->standard() && !configItem->isOn() ) { | 486 | if ( configItem->standard() && !configItem->isOn() ) { |
490 | KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) ); | 487 | KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) ); |
491 | configItem->setOn( true ); | 488 | configItem->setOn( true ); |
492 | return; | 489 | return; |
493 | } | 490 | } |
494 | 491 | ||
495 | if ( configItem->isOn() != configItem->resource()->isActive() ) { | 492 | if ( configItem->isOn() != configItem->resource()->isActive() ) { |
496 | emit changed( true ); | 493 | emit changed( true ); |
497 | } | 494 | } |
498 | } | 495 | } |
499 | 496 | ||
500 | void ConfigPage::saveResourceSettings() | 497 | void ConfigPage::saveResourceSettings() |
501 | { | 498 | { |
502 | qDebug("ConfigPage::saveResourceSettings() begin"); | 499 | //qDebug("ConfigPage::saveResourceSettings() begin"); |
503 | 500 | ||
504 | if ( mCurrentManager ) { | 501 | if ( mCurrentManager ) { |
505 | 502 | ||
506 | QListViewItem *item = mListView->firstChild(); | 503 | QListViewItem *item = mListView->firstChild(); |
507 | while ( item ) { | 504 | while ( item ) { |
508 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); | 505 | ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item ); |
509 | 506 | ||
510 | // check if standard resource | 507 | // check if standard resource |
511 | if ( configItem->standard() && !configItem->readOnly() && | 508 | if ( configItem->standard() && !configItem->readOnly() && |
512 | configItem->isOn() ) { | 509 | configItem->isOn() ) { |
513 | 510 | ||
514 | mCurrentManager->setStandardResource( configItem->resource() ); | 511 | mCurrentManager->setStandardResource( configItem->resource() ); |
515 | } | 512 | } |
516 | 513 | ||
517 | // check if active or passive resource | 514 | // check if active or passive resource |
518 | configItem->resource()->setActive( configItem->isOn() ); | 515 | configItem->resource()->setActive( configItem->isOn() ); |
519 | 516 | ||
520 | item = item->nextSibling(); | 517 | item = item->nextSibling(); |
521 | } | 518 | } |
522 | mCurrentManager->writeConfig( mCurrentConfig ); | 519 | mCurrentManager->writeConfig( mCurrentConfig ); |
523 | 520 | ||
524 | if ( !mCurrentManager->standardResource() ) | 521 | if ( !mCurrentManager->standardResource() ) |
525 | KMessageBox::sorry( this, i18n( "There is no valid standard resource!<br>Please select one which is neither read-only nor inactive." ) ); | 522 | KMessageBox::sorry( this, i18n( "There is no valid standard resource!<br>Please select one which is neither read-only nor inactive." ) ); |
526 | } | 523 | } |
527 | 524 | ||
528 | qDebug("ConfigPage::saveResourceSettings() end"); | 525 | //qDebug("ConfigPage::saveResourceSettings() end"); |
529 | 526 | ||
530 | } | 527 | } |
531 | 528 | ||
532 | //US #include "configpage.moc" | 529 | //US #include "configpage.moc" |
533 | 530 | ||
diff --git a/microkde/kresources/configwidget.h b/microkde/kresources/configwidget.h index b97e278..aecdda9 100644 --- a/microkde/kresources/configwidget.h +++ b/microkde/kresources/configwidget.h | |||
@@ -1,61 +1,61 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkresources. | 2 | This file is part of libkresources. |
3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
4 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> | 4 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifndef KRESOURCES_CONFIGWIDGET_H | 22 | #ifndef KRESOURCES_CONFIGWIDGET_H |
23 | #define KRESOURCES_CONFIGWIDGET_H | 23 | #define KRESOURCES_CONFIGWIDGET_H |
24 | 24 | ||
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | 26 | ||
27 | #include <kconfig.h> | 27 | #include <kconfig.h> |
28 | 28 | ||
29 | #include "resource.h" | 29 | #include "resource.h" |
30 | 30 | ||
31 | namespace KRES { | 31 | namespace KRES { |
32 | 32 | ||
33 | class ConfigWidget : public QWidget | 33 | class ConfigWidget : public QWidget |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | 36 | ||
37 | public: | 37 | public: |
38 | ConfigWidget( QWidget *parent = 0, const char *name = 0 ); | 38 | ConfigWidget( QWidget *parent = 0, const char *name = 0 ); |
39 | 39 | ||
40 | /** | 40 | /** |
41 | Sets the widget to 'edit' mode. Reimplement this method if you are | 41 | Sets the widget to 'edit' mode. Reimplement this method if you are |
42 | interested in the mode change (to disable some GUI element for | 42 | interested in the mode change (to disable some GUI element for |
43 | example). By default the widget is in 'create new' mode. | 43 | example). By default the widget is in 'create new' mode. |
44 | */ | 44 | */ |
45 | virtual void setInEditMode( bool value ); | 45 | virtual void setInEditMode( bool value ); |
46 | 46 | ||
47 | public slots: | 47 | public slots: |
48 | virtual void loadSettings( Resource *resource ); | 48 | virtual void loadSettings( Resource *resource ); |
49 | virtual void saveSettings( Resource *resource ); | 49 | virtual void saveSettings( Resource *resource ); |
50 | 50 | ||
51 | signals: | 51 | signals: |
52 | void setReadOnly( bool value ); | 52 | void setReadOnly( bool value ); |
53 | void setPersistentReadOnly( bool value ); | 53 | void setPersistentReadOnly( bool value ); |
54 | 54 | void setIncludeInSync(bool); | |
55 | 55 | ||
56 | protected: | 56 | protected: |
57 | Resource* mResource; | 57 | Resource* mResource; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | } | 60 | } |
61 | #endif | 61 | #endif |