summaryrefslogtreecommitdiffabout
path: root/microkde
authorzautrix <zautrix>2005-01-18 23:10:44 (UTC)
committer zautrix <zautrix>2005-01-18 23:10:44 (UTC)
commitc626089f47244d0c0a9ba73bcd12f42927acb28f (patch) (unidiff)
tree2f0ca8591dab470ed3ddd6c2af860c2a8081db97 /microkde
parentbfb2947510c52f9c6b35c35786490f261adf30e3 (diff)
downloadkdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.zip
kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.tar.gz
kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.tar.bz2
fix
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/klocale.cpp2
-rw-r--r--microkde/kresources/configpage.cpp7
-rw-r--r--microkde/kresources/configwidget.h2
3 files changed, 4 insertions, 7 deletions
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index aec74fa..7f31ab1 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -1,43 +1,43 @@
1#include <qregexp.h> 1#include <qregexp.h>
2#include <qapplication.h> 2#include <qapplication.h>
3 3
4#include "kdebug.h" 4#include "kdebug.h"
5#include "kcalendarsystemgregorian.h" 5#include "kcalendarsystemgregorian.h"
6 6
7#include "klocale.h" 7#include "klocale.h"
8 8
9#include <qstringlist.h> 9#include <qstringlist.h>
10 10
11#define COLLECT_TRANSLATION 11//#define COLLECT_TRANSLATION
12 12
13 13
14QDict<QString> *mLocaleDict = 0; 14QDict<QString> *mLocaleDict = 0;
15void setLocaleDict( QDict<QString> * dict ) 15void setLocaleDict( QDict<QString> * dict )
16{ 16{
17 mLocaleDict = dict; 17 mLocaleDict = dict;
18 18
19} 19}
20 20
21#ifdef COLLECT_TRANSLATION 21#ifdef COLLECT_TRANSLATION
22 22
23QStringList missingTrans; 23QStringList missingTrans;
24QStringList existingTrans1; 24QStringList existingTrans1;
25QStringList existingTrans2; 25QStringList existingTrans2;
26 26
27void addMissing(const char *text) 27void addMissing(const char *text)
28{ 28{
29 29
30 QString mis ( text ); 30 QString mis ( text );
31 if ( !missingTrans.contains( mis ) ) 31 if ( !missingTrans.contains( mis ) )
32 missingTrans.append(mis); 32 missingTrans.append(mis);
33 33
34} 34}
35void addExist(const char *text,QString trans ) 35void addExist(const char *text,QString trans )
36{ 36{
37 //return; 37 //return;
38 QString mis ( text ); 38 QString mis ( text );
39 if ( !existingTrans1.contains( mis ) ) { 39 if ( !existingTrans1.contains( mis ) ) {
40 existingTrans1.append(mis); 40 existingTrans1.append(mis);
41 existingTrans2.append(trans); 41 existingTrans2.append(trans);
42 42
43 } 43 }
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
@@ -428,106 +428,103 @@ void ConfigPage::slotStandard()
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
448void ConfigPage::slotSelectionChanged() 448void 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
457void ConfigPage::resourceAdded( Resource* resource ) 457void 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
472void ConfigPage::resourceModified( Resource* resource ) 471void 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
478void ConfigPage::resourceDeleted( Resource* resource ) 476void 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
484void ConfigPage::slotItemClicked( QListViewItem *item ) 481void 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
500void ConfigPage::saveResourceSettings() 497void 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
@@ -22,40 +22,40 @@
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
31namespace KRES { 31namespace KRES {
32 32
33class ConfigWidget : public QWidget 33class ConfigWidget : public QWidget
34{ 34{
35 Q_OBJECT 35 Q_OBJECT
36 36
37public: 37public:
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
47public slots: 47public 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
51signals: 51signals:
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
56protected: 56protected:
57 Resource* mResource; 57 Resource* mResource;
58}; 58};
59 59
60} 60}
61#endif 61#endif