-rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/kodialogmanager.cpp | 28 | ||||
-rw-r--r-- | korganizer/kodialogmanager.h | 1 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 24 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 7 |
6 files changed, 51 insertions, 20 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7c7466b..4794414 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2521,11 +2521,10 @@ void CalendarView::edit_paste() | |||
2521 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2521 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); |
2522 | } | 2522 | } |
2523 | 2523 | void CalendarView::edit_global_options() | |
2524 | void CalendarView::edit_options() | ||
2525 | { | 2524 | { |
2526 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; | 2525 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; |
2527 | emit save(); | 2526 | emit save(); |
2528 | emit saveStopTimer(); | 2527 | emit saveStopTimer(); |
2529 | mDialogManager->showOptionsDialog(); | 2528 | mDialogManager->showGlobalOptionsDialog(); |
2530 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { | 2529 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { |
2531 | emit saveStopTimer(); | 2530 | emit saveStopTimer(); |
@@ -2541,5 +2540,8 @@ void CalendarView::edit_options() | |||
2541 | else | 2540 | else |
2542 | qDebug("KO: No tz change "); | 2541 | qDebug("KO: No tz change "); |
2543 | 2542 | } | |
2543 | void CalendarView::edit_options() | ||
2544 | { | ||
2545 | mDialogManager->showOptionsDialog(); | ||
2544 | } | 2546 | } |
2545 | 2547 | ||
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 4600090..1215a99 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -350,4 +350,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
350 | /** edit viewing and configuration options. */ | 350 | /** edit viewing and configuration options. */ |
351 | void edit_options(); | 351 | void edit_options(); |
352 | void edit_global_options(); | ||
352 | /** | 353 | /** |
353 | Functions for printing, previewing a print, and setting up printing | 354 | Functions for printing, previewing a print, and setting up printing |
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index c927b37..aa30c52 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -89,4 +89,23 @@ void KODialogManager::createOutgoingDialog() | |||
89 | } | 89 | } |
90 | 90 | ||
91 | void KODialogManager::showGlobalOptionsDialog( bool showSync ) | ||
92 | { | ||
93 | if (!mOptionsDialog) { | ||
94 | mOptionsDialog = new KOPrefsDialog(0); | ||
95 | connect(mOptionsDialog,SIGNAL(configChanged()), | ||
96 | mMainView,SLOT(updateConfig())); | ||
97 | } | ||
98 | mOptionsDialog->readConfig(); | ||
99 | #ifndef DESKTOP_VERSION | ||
100 | mOptionsDialog->showMaximized(); | ||
101 | #else | ||
102 | mOptionsDialog->show(); | ||
103 | #endif | ||
104 | if ( showSync ) | ||
105 | mOptionsDialog->showSyncPage(); | ||
106 | mOptionsDialog->exec(); | ||
107 | delete mOptionsDialog; | ||
108 | mOptionsDialog = 0; | ||
109 | } | ||
91 | void KODialogManager::showOptionsDialog( bool showSync ) | 110 | void KODialogManager::showOptionsDialog( bool showSync ) |
92 | { | 111 | { |
@@ -94,10 +113,6 @@ void KODialogManager::showOptionsDialog( bool showSync ) | |||
94 | if (!mOptionsDialog) { | 113 | if (!mOptionsDialog) { |
95 | mOptionsDialog = new KOPrefsDialog(mMainView); | 114 | mOptionsDialog = new KOPrefsDialog(mMainView); |
96 | //mOptionsDialog->readConfig(); | ||
97 | connect(mOptionsDialog,SIGNAL(configChanged()), | 115 | connect(mOptionsDialog,SIGNAL(configChanged()), |
98 | mMainView,SLOT(updateConfig())); | 116 | mMainView,SLOT(updateConfig())); |
99 | //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), | ||
100 | // mOptionsDialog,SLOT(updateCategories())); | ||
101 | |||
102 | } | 117 | } |
103 | mOptionsDialog->readConfig(); | 118 | mOptionsDialog->readConfig(); |
@@ -110,9 +125,10 @@ void KODialogManager::showOptionsDialog( bool showSync ) | |||
110 | mOptionsDialog->showSyncPage(); | 125 | mOptionsDialog->showSyncPage(); |
111 | mOptionsDialog->exec(); | 126 | mOptionsDialog->exec(); |
112 | 127 | delete mOptionsDialog; | |
128 | mOptionsDialog = 0; | ||
113 | } | 129 | } |
114 | void KODialogManager::showSyncOptions() | 130 | void KODialogManager::showSyncOptions() |
115 | { | 131 | { |
116 | showOptionsDialog( true ); | 132 | showGlobalOptionsDialog( true ); |
117 | 133 | ||
118 | } | 134 | } |
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h index a6cc621..b68ddc2 100644 --- a/korganizer/kodialogmanager.h +++ b/korganizer/kodialogmanager.h | |||
@@ -72,4 +72,5 @@ class KODialogManager : public QObject | |||
72 | public slots: | 72 | public slots: |
73 | void showOptionsDialog( bool showSync = false); | 73 | void showOptionsDialog( bool showSync = false); |
74 | void showGlobalOptionsDialog(bool showSync = false); | ||
74 | void showSyncOptions(); | 75 | void showSyncOptions(); |
75 | void showIncomingDialog(); | 76 | void showIncomingDialog(); |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index c9477e3..4b5b66a 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -87,6 +87,8 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
87 | hideButtons(); | 87 | hideButtons(); |
88 | #endif | 88 | #endif |
89 | 89 | kdelibcfg = 0; | |
90 | if ( !parent ) | ||
90 | setupGlobalTab(); | 91 | setupGlobalTab(); |
92 | else { | ||
91 | setupMainTab(); | 93 | setupMainTab(); |
92 | // setupLocaleTab(); | 94 | // setupLocaleTab(); |
@@ -102,5 +104,5 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
102 | //setupGroupSchedulingTab(); | 104 | //setupGroupSchedulingTab(); |
103 | //setupGroupAutomationTab(); | 105 | //setupGroupAutomationTab(); |
104 | 106 | } | |
105 | 107 | ||
106 | } | 108 | } |
@@ -112,8 +114,8 @@ KOPrefsDialog::~KOPrefsDialog() | |||
112 | void KOPrefsDialog::setupGlobalTab() | 114 | void KOPrefsDialog::setupGlobalTab() |
113 | { | 115 | { |
114 | QFrame *topFrame = addPage(i18n("Global"),0,0); | 116 | //QFrame *topFrame = addPage(i18n("Global"),0,0); |
115 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); | 117 | kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), this, "KCMKdeLibConfig" ); |
116 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | 118 | setMainWidget( kdelibcfg ); |
117 | topLayout->addWidget( kdelibcfg ); | 119 | setCaption( i18n("KDE-Pim Global Settings")); |
118 | 120 | ||
119 | 121 | ||
@@ -241,5 +243,5 @@ void KOPrefsDialog::setupLocaleTab() | |||
241 | void KOPrefsDialog::showSyncPage() | 243 | void KOPrefsDialog::showSyncPage() |
242 | { | 244 | { |
243 | showPage ( 0 ) ; | 245 | // showPage ( 0 ) ; |
244 | kdelibcfg->showTimeZoneTab() ; | 246 | kdelibcfg->showTimeZoneTab() ; |
245 | 247 | ||
@@ -1459,5 +1461,7 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, | |||
1459 | void KOPrefsDialog::usrReadConfig() | 1461 | void KOPrefsDialog::usrReadConfig() |
1460 | { | 1462 | { |
1463 | if ( kdelibcfg ) | ||
1461 | kdelibcfg->readConfig(); | 1464 | kdelibcfg->readConfig(); |
1465 | else { | ||
1462 | mNameEdit->setText(KOPrefs::instance()->fullName()); | 1466 | mNameEdit->setText(KOPrefs::instance()->fullName()); |
1463 | mEmailEdit->setText(KOPrefs::instance()->email()); | 1467 | mEmailEdit->setText(KOPrefs::instance()->email()); |
@@ -1504,10 +1508,12 @@ void KOPrefsDialog::usrReadConfig() | |||
1504 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); | 1508 | mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); |
1505 | } | 1509 | } |
1510 | } | ||
1506 | 1511 | ||
1507 | 1512 | ||
1508 | void KOPrefsDialog::usrWriteConfig() | 1513 | void KOPrefsDialog::usrWriteConfig() |
1509 | { | 1514 | { |
1510 | 1515 | if ( kdelibcfg ) | |
1511 | kdelibcfg->writeConfig(); | 1516 | kdelibcfg->writeConfig(); |
1517 | else { | ||
1512 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); | 1518 | // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); |
1513 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); | 1519 | //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); |
@@ -1567,5 +1573,5 @@ void KOPrefsDialog::usrWriteConfig() | |||
1567 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; | 1573 | KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; |
1568 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; | 1574 | KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; |
1569 | 1575 | } | |
1570 | } | 1576 | } |
1571 | 1577 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 25e76ee..2c04852 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -725,8 +725,13 @@ void MainWindow::initActions() | |||
725 | 725 | ||
726 | icon = loadPixmap( pathString + "configure" ); | 726 | icon = loadPixmap( pathString + "configure" ); |
727 | action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); | 727 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); |
728 | action->addTo( actionMenu ); | 728 | action->addTo( actionMenu ); |
729 | connect( action, SIGNAL( activated() ), | 729 | connect( action, SIGNAL( activated() ), |
730 | mView, SLOT( edit_options() ) ); | 730 | mView, SLOT( edit_options() ) ); |
731 | icon = loadPixmap( pathString + "configure" ); | ||
732 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | ||
733 | action->addTo( actionMenu ); | ||
734 | connect( action, SIGNAL( activated() ), | ||
735 | mView, SLOT( edit_global_options() ) ); | ||
731 | actionMenu->insertSeparator(); | 736 | actionMenu->insertSeparator(); |
732 | 737 | ||