pwmpi windows management fixes

8 files changed, 40 insertions, 15 deletions

diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
index 8404c3e..678f05f 100644
--- a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
+++ b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
@@ -128,3 +128,3 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
 
-
+    pwLineEdit->setFocus();
 
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
index 26b9708..a8696ea 100644
--- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
@@ -150,3 +150,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   i = 0;
-  pwTimeoutSpinBox = new QSpinBox( timeoutPage, "pwTimeoutSpinBox" );
+  pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" );
   QLabel* timeoutLabel = new QLabel(pwTimeoutSpinBox, i18n("Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:"), timeoutPage);
@@ -156,3 +156,3 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
 
-  lockTimeoutSpinBox = new QSpinBox( timeoutPage, "lockTimeoutSpinBox" );
+  lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" );
   QLabel* lockTimeoutLabel = new QLabel(lockTimeoutSpinBox, i18n("Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:"), timeoutPage);
diff --git a/pwmanager/pwmanager/libgcryptif.cpp b/pwmanager/pwmanager/libgcryptif.cpp
index eafd318..ff94bf6 100644
--- a/pwmanager/pwmanager/libgcryptif.cpp
+++ b/pwmanager/pwmanager/libgcryptif.cpp
@@ -441,3 +441,7 @@ void LibGCryptIf::unpadData(const unsigned char *buf,
         while (buf[pos] != static_cast<char>(0x01)) {
+        qDebug("pos %d %d %d", pos, buf[pos],   static_cast<char>(0x01)     );
                 BUG_ON(!pos);
+        //LR BUG we should terminte the loop if p == 0
+        if ( pos == 0 )
+            break;
                 --pos;
@@ -445,2 +449,3 @@ void LibGCryptIf::unpadData(const unsigned char *buf,
         *bufLen = pos;
+    qDebug("ente ");
 }
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 1ca7ba8..70df15d 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -211,2 +211,3 @@ int main(int argc, char *argv[])
       */
+      QObject::connect( &a, SIGNAL( lastWindowClosed()), &a, SLOT (quit()));
       a.exec();
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 1ab2b71..2b8f2fa 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -195,3 +195,3 @@ PwM::~PwM()
 {
-  //qDebug("PwM::~PwM()");
+    qDebug("PwM::~PwM() %x", this);
         disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
@@ -199,3 +199,5 @@ PwM::~PwM()
         conf()->confWndMainWndSize(size());
-        emit closed(this);
+    //LR closing of windows changed
+    //needed for fastload option on PDA
+        //emit closed(this);
         //qDebug("PwM::~PwM() emited closed(this)");
@@ -889,2 +891,5 @@ void PwM::closeEvent(QCloseEvent *e)
 {
+    qDebug("PwM::closeEvent ");
+    emit closed( this );
+    return;
         e->accept();
@@ -894,2 +899,3 @@ void PwM::docClosed(PwMDoc *doc)
 {
+    qDebug("PwM::docClosed ");
         PARAM_UNUSED(doc);
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 129bf7b..cf8690f 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2979,2 +2979,3 @@ bool PwMDoc::tryDelete()
 {
+ 
         if (deleted)
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index 71b4a8d..a9916c2 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -206,3 +206,3 @@ void PwMDocUi::gpmPwLenErrMsgBox()
                                 "again with a longer password."),
-                           i18n("password too short"));
+                           i18n("Password too short"));
 }
@@ -214,3 +214,3 @@ int PwMDocUi::dirtyAskSave(const QString &docTitle)
         ret = KMessageBox::questionYesNoCancel(currentView,
-                                               i18n("The list \"") +
+                                               i18n("The list\n\"") +
                                                docTitle +
@@ -219,3 +219,3 @@ int PwMDocUi::dirtyAskSave(const QString &docTitle)
                                                 "Do you want to save it?"),
-                                               i18n("save?"));
+                                               i18n("Save?"));
         if (ret == KMessageBox::Yes) {
@@ -226,5 +226,8 @@ int PwMDocUi::dirtyAskSave(const QString &docTitle)
 #else
+    QString doc = docTitle;
+    if ( doc.length() > 33 )
+        doc = "..." + doc.right(30);
         ret = KMessageBox::warningYesNoCancel(currentView,
-                                               i18n("The list \"") +
-                                               docTitle +
+                                               i18n("The list\n \"") +
+                                               doc +
                                                i18n
@@ -232,3 +235,3 @@ int PwMDocUi::dirtyAskSave(const QString &docTitle)
                                                 "Do you want to save it?"),
-                                               i18n("save?"));
+                                               i18n("Save?"));
         if (ret == KMessageBox::Yes) {
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index d775aa9..fbd17a7 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -90,2 +90,3 @@ PwMInit::~PwMInit()
 {
+    qDebug("PwMInit::~PwMInit() ");
 #ifndef PWM_EMBEDDED
@@ -181,3 +182,2 @@ void PwMInit::initializeApp()
         }
-
         runStatus = running;
@@ -324,6 +324,4 @@ PwM * PwMInit::createMainWnd(const QString &loadFile,
 #else //DESKTOP_VERSION
-       app->setMainWidget( newWnd );
        newWnd->resize (640, 480 );
        newWnd->show();
-       qDebug("show ");
 #endif //DESKTOP_VERSION
@@ -393,3 +391,3 @@ again:
         if (doMinimizeToTray) {
-
+        qDebug("doMinimizeToTray ");
                 PWM_ASSERT(_tray);
@@ -409,2 +407,3 @@ again:
         } else if (doDeleteDoc) {
+        qDebug("doDeleteDoc ");
                 if (!wnd->curDoc()->tryDelete()) {
@@ -433,2 +432,12 @@ again:
 #endif
+         
+            if ( app->mainWidget() == wnd ) {
+                if (  _mainWndList.count() ) {
+#ifndef DESKTOP_VERSION
+                    app->showMainWidget(_mainWndList.first() );
+#endif //DESKTOP_VERSION
+                   
+                }
+            }
+            delete wnd;
                         goto out_success;