summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/configwnd.cpp11
-rw-r--r--pwmanager/pwmanager/pwm.cpp35
-rw-r--r--pwmanager/pwmanager/pwmanagerE.pro27
-rw-r--r--pwmanager/pwmanager/pwmdoc.cpp2
-rw-r--r--pwmanager/pwmanager/pwmdoc.h2
-rw-r--r--pwmanager/pwmanager/pwmdocui.cpp1
-rw-r--r--pwmanager/pwmanager/pwminit.cpp19
-rw-r--r--pwmanager/pwmanager/pwmtray.cpp4
-rw-r--r--pwmanager/pwmanager/pwmview.cpp4
-rw-r--r--pwmanager/pwmanager/serializer.cpp1
10 files changed, 83 insertions, 23 deletions
diff --git a/pwmanager/pwmanager/configwnd.cpp b/pwmanager/pwmanager/configwnd.cpp
index 230ca1b..108c40f 100644
--- a/pwmanager/pwmanager/configwnd.cpp
+++ b/pwmanager/pwmanager/configwnd.cpp
@@ -45,4 +45,5 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
tabWidget2->setGeometry( QRect( 10, 10, 470, 260 ) );
+ //////////////////////////////
tab = new QWidget( tabWidget2, "tab" );
@@ -63,5 +64,5 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
currEntrFont->setGeometry( QRect( 30, 70, 230, 20 ) );
tabWidget2->insertTab( tab, QString("") );
-
+ //////////////////////////////////////
TabPage = new QWidget( tabWidget2, "TabPage" );
@@ -84,5 +85,5 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
fileBackupCheckBox->setGeometry( QRect( 80, 140, 360, 23 ) );
tabWidget2->insertTab( TabPage, QString("") );
-
+ //////////////////////////////////////
tab_2 = new QWidget( tabWidget2, "tab_2" );
@@ -104,5 +105,5 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
autoDeepLockCheckBox->setGeometry( QRect( 60, 180, 380, 25 ) );
tabWidget2->insertTab( tab_2, QString("") );
-
+ ///////////////////////////////////////////
tab_3 = new QWidget( tabWidget2, "tab_3" );
@@ -119,5 +120,5 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
autostartDeeplockedCheckBox->setGeometry( QRect( 40, 80, 390, 25 ) );
tabWidget2->insertTab( tab_3, QString("") );
-
+ ////////////////////////////////////////////
tab_4 = new QWidget( tabWidget2, "tab_4" );
@@ -136,5 +137,5 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
textLabel3->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
tabWidget2->insertTab( tab_4, QString("") );
-
+ ///////////////////////////////////////////////
tab_5 = new QWidget( tabWidget2, "tab_5" );
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
@@ -29,7 +29,14 @@
#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
@@ -46,10 +53,8 @@
#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
@@ -752,12 +757,28 @@ void PwM::unlockWnd_slot()
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();
@@ -794,5 +815,5 @@ void PwM::config_slot()
pwm->curView()->initStyle(newStyle);
// set the new font
- pwm->curView()->setFont(conf->confGlobEntryFont());
+ pwm->curView()->setFont(conf()->confGlobEntryFont());
++i2;
}
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 2cd69a5..5c29ea4 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -8,8 +8,9 @@ MOC_DIR = moc/$(PLATFORM)
DESTDIR=$(QPEDIR)/bin
-INCLUDEPATH += . ../../qtcompat ../../qtcompat/xml ../../microkde ../../microkde/kdecore ../../microkde/kdeui $(QPEDIR)/include
+INCLUDEPATH += . ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
DEFINES += PWM_EMBEDDED PWM_DEBUG
LIBS += -lmicrokde
LIBS += -lmicroqtcompat
+LIBS += -lmicrokdepim
LIBS += -L$(QPEDIR)/lib
LIBS += -lqpe
@@ -32,4 +33,8 @@ LIBS += $(QTOPIALIB)
#HEADERS = \
+#configuration_31compat.h \
+#configuration.h \
+#configwnd.h \
+#configwndimpl.h \
#selftest.h
@@ -44,8 +49,4 @@ compiler.h \
compressbzip2.h \
compressgzip.h \
-configuration_31compat.h \
-configuration.h \
-configwnd.h \
-configwndimpl.h \
findwnd.h \
findwndimpl.h \
@@ -69,4 +70,5 @@ pwmexception.h \
pwm.h \
pwminit.h \
+pwmprefs.h \
pwmprint.h \
pwmtray.h \
@@ -84,8 +86,14 @@ sha1.h \
subtbledit.h \
subtbleditimpl.h \
-waitwnd.h
+waitwnd.h \
+kcmconfigs/kcmpwmconfig.h \
+kcmconfigs/pwmconfigwidget.h \
+#sources that need not be build
#SOURCES = \
#advcommeditimpl.cpp \
+#configuration.cpp \
+#configwnd.cpp \
+#configwndimpl.cpp \
#configuration_31compat.cpp \
#htmlparse.cpp \
@@ -104,7 +112,4 @@ commentbox.cpp \
compressbzip2.cpp \
compressgzip.cpp \
-configuration.cpp \
-configwnd.cpp \
-configwndimpl.cpp \
findwnd.cpp \
findwndimpl.cpp \
@@ -127,4 +132,5 @@ pwmdocui.cpp \
pwmexception.cpp \
pwminit.cpp \
+pwmprefs.cpp \
pwmtray.cpp \
pwmview.cpp \
@@ -142,3 +148,6 @@ subtbledit.cpp \
subtbleditimpl.cpp \
waitwnd.cpp \
+kcmconfigs/kcmpwmconfig.cpp \
+kcmconfigs/pwmconfigwidget.cpp \
+
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 04af360..9fe4809 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -32,4 +32,6 @@
//US #include "libgryptif.h"
#else
+#include "pwmprefs.h"
+#include "kglobal.h"
#endif
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 9650d55..193247e 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -49,5 +49,4 @@
#include "pwmexception.h"
#include "pwmdocui.h"
-#include "configuration.h"
#include <qobject.h>
@@ -58,4 +57,5 @@
#ifndef PWM_EMBEDDED
+#include "configuration.h"
#else
#include <kapplication.h>
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index b308b40..3993fa8 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -37,4 +37,5 @@
#else
#include <qdir.h>
+#include "pwmprefs.h"
#endif
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 2f1aa4e..8946443 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -19,9 +19,11 @@
#include "pwminit.h"
-#include "configuration.h"
#include "randomizer.h"
#ifndef PWM_EMBEDDED
#include "selftest.h"
+#include "configuration.h"
+#else
+#include "pwmprefs.h"
#endif
@@ -120,5 +122,7 @@ PwMInit::~PwMInit()
Randomizer::cleanup();
+#ifndef PWM_EMBEDDED
Configuration::cleanup();
+#endif
}
@@ -129,5 +133,7 @@ void PwMInit::initializeApp()
initPosixSignalHandler();
Randomizer::init();
+#ifndef PWM_EMBEDDED
Configuration::init();
+#endif
initDCOP();
initKWalletEmu();
@@ -147,4 +153,15 @@ void PwMInit::initializeApp()
openDeeplocked)) {
delete newDoc;
+
+ //US ENH for embedded devices: in the case of failure, open a document the default way
+ createMainWnd(conf()->confGlobAutoStart(),
+ openDeeplocked,
+ true,
+ 0,
+ savedCmd.minimized);
+
+
+
+
}
} else {
diff --git a/pwmanager/pwmanager/pwmtray.cpp b/pwmanager/pwmanager/pwmtray.cpp
index 0f286c1..fe074ca 100644
--- a/pwmanager/pwmanager/pwmtray.cpp
+++ b/pwmanager/pwmanager/pwmtray.cpp
@@ -26,5 +26,9 @@
#include "pwmdoc.h"
#include "pwminit.h"
+#ifndef PWM_EMBEDDED
#include "configuration.h"
+#else
+#include "pwmprefs.h"
+#endif
#include <klocale.h>
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index c09fbf5..58c2fca 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -23,5 +23,9 @@
#include "pwm.h"
#include "rencatwnd.h"
+#ifndef PWM_EMBEDDED
#include "configuration.h"
+#else
+#include "pwmprefs.h"
+#endif
#include "commentbox.h"
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 65e442d..f29ef6c 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -23,4 +23,5 @@
#ifdef PWM_EMBEDDED
+#include <kglobal.h>
#include <klocale.h>
#endif