author | ulf69 <ulf69> | 2004-09-21 19:44:23 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-09-21 19:44:23 (UTC) |
commit | a6a6544fc57542752fecc3763e0d35e6a38040ac (patch) (side-by-side diff) | |
tree | 3324285a4aaee1db873e0c83d0c8e911cbe1aefb /pwmanager/pwmanager/pwm.cpp | |
parent | 6a40d65ddd6657e34c69d839da458810a8d8ff98 (diff) | |
download | kdepimpi-a6a6544fc57542752fecc3763e0d35e6a38040ac.zip kdepimpi-a6a6544fc57542752fecc3763e0d35e6a38040ac.tar.gz kdepimpi-a6a6544fc57542752fecc3763e0d35e6a38040ac.tar.bz2 |
*** empty log message ***
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index e5579f8..08fcb25 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp @@ -25,15 +25,22 @@ #include <kmessagebox.h> #ifndef PWM_EMBEDDED #include <kmenubar.h> #include <kstatusbar.h> #include <dcopclient.h> +#include "configwndimpl.h" +#include "configuration.h" #else #include <qmenubar.h> #include <qmessagebox.h> +#include <pwmprefs.h> +#include <kpimglobalprefs.h> +#include <kcmconfigs/kcmpwmconfig.h> +#include <kcmconfigs/kcmkdepimconfig.h> +#include <kcmultidialog.h> #endif #include <qpixmap.h> #include <qcheckbox.h> #include <qspinbox.h> #include <qlineedit.h> @@ -42,18 +49,16 @@ #include <stdio.h> #include "pwm.h" #include "pwminit.h" -#include "configwndimpl.h" #include "pwmprint.h" #include "addentrywndimpl.h" #include "globalstuff.h" #include "findwndimpl.h" -#include "configuration.h" #ifdef CONFIG_KWALLETIF # include "kwalletif.h" # include "kwalletemu.h" #endif #ifdef CONFIG_KEYCARD @@ -748,20 +753,36 @@ void PwM::unlockWnd_slot() PWM_ASSERT(curDoc()); curDoc()->lockAll(false); } void PwM::config_slot() { - Configuration *conf = Configuration::obj(); - int oldStyle = conf->confWndMainViewStyle(); + int oldStyle = conf()->confWndMainViewStyle(); +#ifdef PWM_EMBEDDED + KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"pwmconfigdialog", true ); + + KCMPwmConfig* pwmcfg = new KCMPwmConfig( ConfigureDialog->getNewVBoxPage(i18n( "PwManager")) , "KCMPwmConfig" ); + ConfigureDialog->addModule(pwmcfg ); + KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); + ConfigureDialog->addModule(kdelibcfg ); + +#ifndef DESKTOP_VERSION + ConfigureDialog->showMaximized(); +#endif + if ( ConfigureDialog->exec() ) + KMessageBox::information( this, i18n("Some changes are only\neffective after a restart!\n") ); + delete ConfigureDialog; + +#else //PWM_EMBEDDED // display the configuration window (modal mode) - if (!conf->showConfWnd(this)) + if (!conf()->showConfWnd(this)) return; +#endif - int newStyle = conf->confWndMainViewStyle(); + int newStyle = conf()->confWndMainViewStyle(); // reinitialize tray init->initTray(); // reinitialize KWallet emulation init->initKWalletEmu(); PwMDocList *_dl = PwMDoc::getOpenDocList(); @@ -790,13 +811,13 @@ void PwM::config_slot() while (i2 != end2) { pwm = *i2; // reinitialize the window style. if (oldStyle != newStyle) pwm->curView()->initStyle(newStyle); // set the new font - pwm->curView()->setFont(conf->confGlobEntryFont()); + pwm->curView()->setFont(conf()->confGlobEntryFont()); ++i2; } } void PwM::activateMpButton(bool activate) { |