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
@@ -41,12 +41,13 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
cancelButton = new QPushButton( this, "cancelButton" );
cancelButton->setGeometry( QRect( 370, 280, 107, 27 ) );
tabWidget2 = new QTabWidget( this, "tabWidget2" );
tabWidget2->setGeometry( QRect( 10, 10, 470, 260 ) );
+ //////////////////////////////
tab = new QWidget( tabWidget2, "tab" );
windowStyleComboBox = new QComboBox( FALSE, tab, "windowStyleComboBox" );
windowStyleComboBox->setGeometry( QRect( 220, 180, 210, 28 ) );
textLabel1_5 = new QLabel( tab, "textLabel1_5" );
@@ -59,13 +60,13 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
selEntrFontButton = new QPushButton( tab, "selEntrFontButton" );
selEntrFontButton->setGeometry( QRect( 30, 90, 160, 27 ) );
currEntrFont = new QLabel( tab, "currEntrFont" );
currEntrFont->setGeometry( QRect( 30, 70, 230, 20 ) );
tabWidget2->insertTab( tab, QString("") );
-
+ //////////////////////////////////////
TabPage = new QWidget( tabWidget2, "TabPage" );
compressionComboBox = new QComboBox( FALSE, TabPage, "compressionComboBox" );
compressionComboBox->setGeometry( QRect( 290, 50, 150, 28 ) );
textLabel1_6 = new QLabel( TabPage, "textLabel1_6" );
@@ -80,13 +81,13 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
permissionLineEdit->setGeometry( QRect( 290, 90, 142, 27 ) );
permissionLineEdit->setMaxLength( 3 );
fileBackupCheckBox = new QCheckBox( TabPage, "fileBackupCheckBox" );
fileBackupCheckBox->setGeometry( QRect( 80, 140, 360, 23 ) );
tabWidget2->insertTab( TabPage, QString("") );
-
+ //////////////////////////////////////
tab_2 = new QWidget( tabWidget2, "tab_2" );
pwTimeoutSpinBox = new QSpinBox( tab_2, "pwTimeoutSpinBox" );
pwTimeoutSpinBox->setGeometry( QRect( 390, 50, 55, 23 ) );
textLabel1 = new QLabel( tab_2, "textLabel1" );
@@ -100,13 +101,13 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
lockTimeoutSpinBox = new QSpinBox( tab_2, "lockTimeoutSpinBox" );
lockTimeoutSpinBox->setGeometry( QRect( 390, 140, 55, 23 ) );
autoDeepLockCheckBox = new QCheckBox( tab_2, "autoDeepLockCheckBox" );
autoDeepLockCheckBox->setGeometry( QRect( 60, 180, 380, 25 ) );
tabWidget2->insertTab( tab_2, QString("") );
-
+ ///////////////////////////////////////////
tab_3 = new QWidget( tabWidget2, "tab_3" );
textLabel1_3 = new QLabel( tab_3, "textLabel1_3" );
textLabel1_3->setGeometry( QRect( 30, 30, 400, 20 ) );
autoStartLineEdit = new QLineEdit( tab_3, "autoStartLineEdit" );
@@ -115,13 +116,13 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
browseAutoStButton = new QPushButton( tab_3, "browseAutoStButton" );
browseAutoStButton->setGeometry( QRect( 400, 50, 30, 20 ) );
autostartDeeplockedCheckBox = new QCheckBox( tab_3, "autostartDeeplockedCheckBox" );
autostartDeeplockedCheckBox->setGeometry( QRect( 40, 80, 390, 25 ) );
tabWidget2->insertTab( tab_3, QString("") );
-
+ ////////////////////////////////////////////
tab_4 = new QWidget( tabWidget2, "tab_4" );
textLabel2 = new QLabel( tab_4, "textLabel2" );
textLabel2->setGeometry( QRect( 20, 40, 280, 20 ) );
textLabel2->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
@@ -132,13 +133,13 @@ configWnd::configWnd( QWidget* parent, const char* name, bool modal, WFlags fl )
xtermLineEdit->setGeometry( QRect( 310, 100, 130, 27 ) );
textLabel3 = new QLabel( tab_4, "textLabel3" );
textLabel3->setGeometry( QRect( 20, 100, 280, 20 ) );
textLabel3->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
tabWidget2->insertTab( tab_4, QString("") );
-
+ ///////////////////////////////////////////////
tab_5 = new QWidget( tabWidget2, "tab_5" );
trayCheckBox = new QCheckBox( tab_5, "trayCheckBox" );
trayCheckBox->setGeometry( QRect( 30, 30, 400, 20 ) );
openUnlockedCheckBox = new QCheckBox( tab_5, "openUnlockedCheckBox" );
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)
{
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
@@ -4,16 +4,17 @@ CONFIG += qt warn_on
TARGET = pwmpi
OBJECTS_DIR = obj/$(PLATFORM)
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
LIBS += -lbz2
LIBS += $(QTOPIALIB)
#INTERFACES = \
@@ -28,28 +29,28 @@ LIBS += $(QTOPIALIB)
#INTERFACES = \
#subtbledit.ui \
#HEADERS = \
+#configuration_31compat.h \
+#configuration.h \
+#configwnd.h \
+#configwndimpl.h \
#selftest.h
HEADERS = \
addentrywnd.h \
addentrywndimpl.h \
base64.h \
binentrygen.h \
blowfish.h \
commentbox.h \
compiler.h \
compressbzip2.h \
compressgzip.h \
-configuration_31compat.h \
-configuration.h \
-configwnd.h \
-configwndimpl.h \
findwnd.h \
findwndimpl.h \
genpasswd.h \
getkeycardwnd.h \
getmasterpwwnd.h \
getmasterpwwndimpl.h \
@@ -65,12 +66,13 @@ pwgenwnd.h \
pwgenwndimpl.h \
pwmdoc.h \
pwmdocui.h \
pwmexception.h \
pwm.h \
pwminit.h \
+pwmprefs.h \
pwmprint.h \
pwmtray.h \
pwmview.h \
pwmviewstyle_0.h \
pwmviewstyle_1.h \
pwmviewstyle.h \
@@ -80,16 +82,22 @@ rencatwnd.h \
serializer.h \
setmasterpwwnd.h \
setmasterpwwndimpl.h \
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 \
#printtext.cpp \
#selftest.cpp \
#pwmprint.cpp \
#spinforsignal.cpp
@@ -100,15 +108,12 @@ addentrywndimpl.cpp \
base64.cpp \
binentrygen.cpp \
blowfish.cpp \
commentbox.cpp \
compressbzip2.cpp \
compressgzip.cpp \
-configuration.cpp \
-configwnd.cpp \
-configwndimpl.cpp \
findwnd.cpp \
findwndimpl.cpp \
genpasswd.cpp \
getkeycardwnd.cpp \
getmasterpwwnd.cpp \
getmasterpwwndimpl.cpp \
@@ -123,12 +128,13 @@ pwgenwnd.cpp \
pwgenwndimpl.cpp \
pwm.cpp \
pwmdoc.cpp \
pwmdocui.cpp \
pwmexception.cpp \
pwminit.cpp \
+pwmprefs.cpp \
pwmtray.cpp \
pwmview.cpp \
pwmviewstyle_0.cpp \
pwmviewstyle_1.cpp \
pwmviewstyle.cpp \
randomizer.cpp \
@@ -138,7 +144,10 @@ serializer.cpp \
setmasterpwwnd.cpp \
setmasterpwwndimpl.cpp \
sha1.cpp \
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
@@ -28,12 +28,14 @@
#include "compressbzip2.h"
#include "randomizer.h"
#include "pwminit.h"
#ifndef PWM_EMBEDDED
//US #include "libgryptif.h"
#else
+#include "pwmprefs.h"
+#include "kglobal.h"
#endif
#ifdef CONFIG_KWALLETIF
# include "kwalletemu.h"
#endif // CONFIG_KWALLETIF
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
@@ -45,21 +45,21 @@
#define DEFAULT_MAX_ENTRIES (~(static_cast<unsigned int>(0)))
#define FILE_ID_HEADER "PWM_PASSWORD_FILE"
#include "pwmexception.h"
#include "pwmdocui.h"
-#include "configuration.h"
#include <qobject.h>
#include <qtimer.h>
#include <qdatetime.h>
#include <kprocess.h>
#ifndef PWM_EMBEDDED
+#include "configuration.h"
#else
#include <kapplication.h>
#endif
#include <string>
#include <vector>
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
@@ -33,12 +33,13 @@
#include <kfiledialog.h>
#ifndef PWM_EMBEDDED
#include <kwin.h>
#else
#include <qdir.h>
+#include "pwmprefs.h"
#endif
#ifdef CONFIG_KEYCARD
# include "pwmkeycard.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
@@ -15,17 +15,19 @@
* and was modified to run on embedded devices that run microkde
*
* $Id$
**************************************************************************/
#include "pwminit.h"
-#include "configuration.h"
#include "randomizer.h"
#ifndef PWM_EMBEDDED
#include "selftest.h"
+#include "configuration.h"
+#else
+#include "pwmprefs.h"
#endif
#include "pwm.h"
#include "pwmexception.h"
#include "pwmtray.h"
#include "pwmdoc.h"
@@ -116,22 +118,26 @@ PwMInit::~PwMInit()
#ifdef CONFIG_KEYCARD
delete_ifnot_null(_keycard);
#endif // CONFIG_KEYCARD
delete_ifnot_null(_tray);
Randomizer::cleanup();
+#ifndef PWM_EMBEDDED
Configuration::cleanup();
+#endif
}
void PwMInit::initializeApp()
{
PWM_ASSERT(runStatus == unknown);
runStatus = init;
initPosixSignalHandler();
Randomizer::init();
+#ifndef PWM_EMBEDDED
Configuration::init();
+#endif
initDCOP();
initKWalletEmu();
initKeycard();
initTray();
handleCmdLineArgs();
@@ -143,12 +149,23 @@ void PwMInit::initializeApp()
savedCmd.minToTray) {
PwMDoc *newDoc = createDoc();
if (!newDoc->openDocUi(newDoc,
conf()->confGlobAutoStart(),
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 {
createMainWnd(conf()->confGlobAutoStart(),
openDeeplocked,
true,
0,
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
@@ -22,13 +22,17 @@
#include "pwmtray.h"
#include "pwmexception.h"
#include "pwm.h"
#include "pwmdoc.h"
#include "pwminit.h"
+#ifndef PWM_EMBEDDED
#include "configuration.h"
+#else
+#include "pwmprefs.h"
+#endif
#include <klocale.h>
void ActiveTreeItem::execIt()
{
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
@@ -19,13 +19,17 @@
#include "pwmview.h"
#include "pwmexception.h"
#include "globalstuff.h"
#include "pwm.h"
#include "rencatwnd.h"
+#ifndef PWM_EMBEDDED
#include "configuration.h"
+#else
+#include "pwmprefs.h"
+#endif
#include "commentbox.h"
#include <kmessagebox.h>
#include <klocale.h>
#include <qlineedit.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
@@ -19,12 +19,13 @@
**************************************************************************/
#include "serializer.h"
#include "pwmexception.h"
#ifdef PWM_EMBEDDED
+#include <kglobal.h>
#include <klocale.h>
#endif
/* enable/disable serializer debugging (0/1) */
#define SERIALIZER_DEBUG 0
/* use the old xml tags for writing (0/1) */