author | zautrix <zautrix> | 2005-01-18 23:10:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-18 23:10:44 (UTC) |
commit | c626089f47244d0c0a9ba73bcd12f42927acb28f (patch) (unidiff) | |
tree | 2f0ca8591dab470ed3ddd6c2af860c2a8081db97 | |
parent | bfb2947510c52f9c6b35c35786490f261adf30e3 (diff) | |
download | kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.zip kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.tar.gz kdepimpi-c626089f47244d0c0a9ba73bcd12f42927acb28f.tar.bz2 |
fix
-rw-r--r-- | kaddressbook/kabcore.cpp | 2 | ||||
-rw-r--r-- | microkde/kdecore/klocale.cpp | 2 | ||||
-rw-r--r-- | microkde/kresources/configpage.cpp | 7 | ||||
-rw-r--r-- | microkde/kresources/configwidget.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e88706e..505cbf4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1813,65 +1813,65 @@ void KABCore::initGUI() | |||
1813 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1813 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1814 | 1814 | ||
1815 | mDetails = new ViewContainer( mDetailsSplitter ); | 1815 | mDetails = new ViewContainer( mDetailsSplitter ); |
1816 | 1816 | ||
1817 | topLayout->addWidget( mDetailsSplitter ); | 1817 | topLayout->addWidget( mDetailsSplitter ); |
1818 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1818 | topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1819 | #else //KAB_NOSPLITTER | 1819 | #else //KAB_NOSPLITTER |
1820 | QHBoxLayout *topLayout = new QHBoxLayout( this ); | 1820 | QHBoxLayout *topLayout = new QHBoxLayout( this ); |
1821 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); | 1821 | //US topLayout->setSpacing( KDialogBase::spacingHint() ); |
1822 | topLayout->setSpacing( 10 ); | 1822 | topLayout->setSpacing( 10 ); |
1823 | 1823 | ||
1824 | // mDetailsSplitter = new QSplitter( this ); | 1824 | // mDetailsSplitter = new QSplitter( this ); |
1825 | 1825 | ||
1826 | QVBox *viewSpace = new QVBox( this ); | 1826 | QVBox *viewSpace = new QVBox( this ); |
1827 | 1827 | ||
1828 | mViewManager = new ViewManager( this, viewSpace ); | 1828 | mViewManager = new ViewManager( this, viewSpace ); |
1829 | viewSpace->setStretchFactor( mViewManager, 1 ); | 1829 | viewSpace->setStretchFactor( mViewManager, 1 ); |
1830 | 1830 | ||
1831 | mDetails = new ViewContainer( this ); | 1831 | mDetails = new ViewContainer( this ); |
1832 | 1832 | ||
1833 | topLayout->addWidget( viewSpace ); | 1833 | topLayout->addWidget( viewSpace ); |
1834 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); | 1834 | // topLayout->setStretchFactor( mDetailsSplitter, 100 ); |
1835 | topLayout->addWidget( mDetails ); | 1835 | topLayout->addWidget( mDetails ); |
1836 | #endif //KAB_NOSPLITTER | 1836 | #endif //KAB_NOSPLITTER |
1837 | */ | 1837 | */ |
1838 | 1838 | ||
1839 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 1839 | syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
1840 | syncManager->setBlockSave(false); | 1840 | syncManager->setBlockSave(false); |
1841 | 1841 | ||
1842 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 1842 | connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
1843 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 1843 | connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
1844 | QString sync_file = sentSyncFile(); | 1844 | QString sync_file = sentSyncFile(); |
1845 | qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); | 1845 | //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); |
1846 | syncManager->setDefaultFileName( sync_file ); | 1846 | syncManager->setDefaultFileName( sync_file ); |
1847 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); | 1847 | //connect(syncManager , SIGNAL( ), this, SLOT( ) ); |
1848 | 1848 | ||
1849 | #endif //KAB_EMBEDDED | 1849 | #endif //KAB_EMBEDDED |
1850 | initActions(); | 1850 | initActions(); |
1851 | 1851 | ||
1852 | #ifdef KAB_EMBEDDED | 1852 | #ifdef KAB_EMBEDDED |
1853 | addActionsManually(); | 1853 | addActionsManually(); |
1854 | //US make sure the export and import menues are initialized before creating the xxPortManager. | 1854 | //US make sure the export and import menues are initialized before creating the xxPortManager. |
1855 | mXXPortManager = new XXPortManager( this, this ); | 1855 | mXXPortManager = new XXPortManager( this, this ); |
1856 | 1856 | ||
1857 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); | 1857 | // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() ); |
1858 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); | 1858 | //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget); |
1859 | // mActionQuit->plug ( mMainWindow->toolBar()); | 1859 | // mActionQuit->plug ( mMainWindow->toolBar()); |
1860 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); | 1860 | //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() ); |
1861 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); | 1861 | //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget); |
1862 | // mIncSearchWidget->hide(); | 1862 | // mIncSearchWidget->hide(); |
1863 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), | 1863 | connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), |
1864 | SLOT( incrementalSearch( const QString& ) ) ); | 1864 | SLOT( incrementalSearch( const QString& ) ) ); |
1865 | connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) ); | 1865 | connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) ); |
1866 | connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) ); | 1866 | connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) ); |
1867 | 1867 | ||
1868 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1868 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1869 | 1869 | ||
1870 | topLayout->addWidget( mJumpButtonBar ); | 1870 | topLayout->addWidget( mJumpButtonBar ); |
1871 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); | 1871 | //US topLayout->setStretchFactor( mJumpButtonBar, 10 ); |
1872 | 1872 | ||
1873 | // mMainWindow->getIconToolBar()->raise(); | 1873 | // mMainWindow->getIconToolBar()->raise(); |
1874 | 1874 | ||
1875 | #endif //KAB_EMBEDDED | 1875 | #endif //KAB_EMBEDDED |
1876 | 1876 | ||
1877 | } | 1877 | } |
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 | ||
14 | QDict<QString> *mLocaleDict = 0; | 14 | QDict<QString> *mLocaleDict = 0; |
15 | void setLocaleDict( QDict<QString> * dict ) | 15 | void 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 | ||
23 | QStringList missingTrans; | 23 | QStringList missingTrans; |
24 | QStringList existingTrans1; | 24 | QStringList existingTrans1; |
25 | QStringList existingTrans2; | 25 | QStringList existingTrans2; |
26 | 26 | ||
27 | void addMissing(const char *text) | 27 | void 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 | } |
35 | void addExist(const char *text,QString trans ) | 35 | void 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 | ||
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 | |||
@@ -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 | ||
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 |