From 89c5159208fd982f527117e49d67ea1f90553dbe Mon Sep 17 00:00:00 2001 From: zautrix Date: Thu, 09 Jun 2005 16:17:14 +0000 Subject: dialog fixes --- diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 6b62d4e..bb3a00d 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1378,8 +1378,8 @@ { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" }, { "Print List View...","Drucke Listenansicht..." }, { "You can make a printout of the List View and the list view in the Search Dialog! To do this, please go to the List View/Search Dialog. Right click on the list. Select in the popup menu the entry Print complete list. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose Hide selected items. After that you can print the list without these items.","Sie können die Listenansicht und die Listenansicht im Suchdialog ausdrucken! Um das zu machen gehen Sie bitte zur Listenansicht oder zum Suchdialog. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag Drucke komplette Liste. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen Verstecke Selektierte. Danach können Sie die Liste ohne diese Einträge ausdrucken." }, -{ "","" }, -{ "","" }, +{ "Configure KO/Pi...","Konfiguriere KO/Pi..." }, +{ "Global Settings...","Globale Einstellungen..." }, { "","" }, { "","" }, { "","" }, diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7c7466b..4794414 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2520,13 +2520,12 @@ void CalendarView::edit_paste() changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); } - -void CalendarView::edit_options() +void CalendarView::edit_global_options() { QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; emit save(); emit saveStopTimer(); - mDialogManager->showOptionsDialog(); + mDialogManager->showGlobalOptionsDialog(); if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { emit saveStopTimer(); if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), @@ -2540,7 +2539,10 @@ void CalendarView::edit_options() } else qDebug("KO: No tz change "); - +} +void CalendarView::edit_options() +{ + mDialogManager->showOptionsDialog(); } diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 4600090..1215a99 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -349,6 +349,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser /** edit viewing and configuration options. */ void edit_options(); + void edit_global_options(); /** Functions for printing, previewing a print, and setting up printing parameters. diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index c927b37..aa30c52 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -88,17 +88,32 @@ void KODialogManager::createOutgoingDialog() } } +void KODialogManager::showGlobalOptionsDialog( bool showSync ) +{ + if (!mOptionsDialog) { + mOptionsDialog = new KOPrefsDialog(0); + connect(mOptionsDialog,SIGNAL(configChanged()), + mMainView,SLOT(updateConfig())); + } + mOptionsDialog->readConfig(); +#ifndef DESKTOP_VERSION + mOptionsDialog->showMaximized(); +#else + mOptionsDialog->show(); +#endif + if ( showSync ) + mOptionsDialog->showSyncPage(); + mOptionsDialog->exec(); + delete mOptionsDialog; + mOptionsDialog = 0; +} void KODialogManager::showOptionsDialog( bool showSync ) { if (!mOptionsDialog) { mOptionsDialog = new KOPrefsDialog(mMainView); - //mOptionsDialog->readConfig(); connect(mOptionsDialog,SIGNAL(configChanged()), mMainView,SLOT(updateConfig())); - //connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), - // mOptionsDialog,SLOT(updateCategories())); - } mOptionsDialog->readConfig(); #ifndef DESKTOP_VERSION @@ -109,11 +124,12 @@ void KODialogManager::showOptionsDialog( bool showSync ) if ( showSync ) mOptionsDialog->showSyncPage(); mOptionsDialog->exec(); - + delete mOptionsDialog; + mOptionsDialog = 0; } void KODialogManager::showSyncOptions() { - showOptionsDialog( true ); + showGlobalOptionsDialog( true ); } void KODialogManager::showOutgoingDialog() diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h index a6cc621..b68ddc2 100644 --- a/korganizer/kodialogmanager.h +++ b/korganizer/kodialogmanager.h @@ -71,6 +71,7 @@ class KODialogManager : public QObject public slots: void showOptionsDialog( bool showSync = false); + void showGlobalOptionsDialog(bool showSync = false); void showSyncOptions(); void showIncomingDialog(); void showOutgoingDialog(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index c9477e3..4b5b66a 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -86,8 +86,10 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : if ( QApplication::desktop()->height() == 480 ) hideButtons(); #endif - + kdelibcfg = 0; + if ( !parent ) setupGlobalTab(); + else { setupMainTab(); // setupLocaleTab(); //setupTimeZoneTab(); @@ -101,7 +103,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : //setupPrinterTab(); //setupGroupSchedulingTab(); //setupGroupAutomationTab(); - + } } @@ -111,10 +113,10 @@ KOPrefsDialog::~KOPrefsDialog() } void KOPrefsDialog::setupGlobalTab() { - QFrame *topFrame = addPage(i18n("Global"),0,0); - kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); - QVBoxLayout *topLayout = new QVBoxLayout(topFrame); - topLayout->addWidget( kdelibcfg ); + //QFrame *topFrame = addPage(i18n("Global"),0,0); + kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), this, "KCMKdeLibConfig" ); + setMainWidget( kdelibcfg ); + setCaption( i18n("KDE-Pim Global Settings")); } @@ -240,7 +242,7 @@ void KOPrefsDialog::setupLocaleTab() } void KOPrefsDialog::showSyncPage() { - showPage ( 0 ) ; + // showPage ( 0 ) ; kdelibcfg->showTimeZoneTab() ; } @@ -1458,7 +1460,9 @@ void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, void KOPrefsDialog::usrReadConfig() { - kdelibcfg->readConfig(); + if ( kdelibcfg ) + kdelibcfg->readConfig(); + else { mNameEdit->setText(KOPrefs::instance()->fullName()); mEmailEdit->setText(KOPrefs::instance()->email()); @@ -1502,13 +1506,15 @@ void KOPrefsDialog::usrReadConfig() mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); + } } void KOPrefsDialog::usrWriteConfig() { - - kdelibcfg->writeConfig(); + if ( kdelibcfg ) + kdelibcfg->writeConfig(); + else { // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); @@ -1566,7 +1572,7 @@ void KOPrefsDialog::usrWriteConfig() KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; - + } } void KOPrefsDialog::updateCategories() diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 25e76ee..2c04852 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -724,10 +724,15 @@ void MainWindow::initActions() this, SLOT( showConfigureAgenda( ) ) ); icon = loadPixmap( pathString + "configure" ); - action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this ); + action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); action->addTo( actionMenu ); connect( action, SIGNAL( activated() ), - mView, SLOT( edit_options() ) ); + mView, SLOT( edit_options() ) ); + icon = loadPixmap( pathString + "configure" ); + action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); + action->addTo( actionMenu ); + connect( action, SIGNAL( activated() ), + mView, SLOT( edit_global_options() ) ); actionMenu->insertSeparator(); action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); -- cgit v0.9.0.2