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
@@ -105,49 +105,49 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     QPushButton* backspace = new QPushButton( i18n("-"), numberBox );
     numberLayout->addWidget( backspace, 3, 2 );
 
 
     pageLayout->addWidget(numberBox);
 #ifdef DESKTOP_VERSION
     resize( sizeHint() );
 #else
     resize( 200,sizeHint().height() );
 #endif
 
     connect( p0, SIGNAL( clicked() ), this, SLOT( add0() ) );
     connect( p1, SIGNAL( clicked() ), this, SLOT( add1() ) );
     connect( p2, SIGNAL( clicked() ), this, SLOT( add2() ) );
     connect( p3, SIGNAL( clicked() ), this, SLOT( add3() ) );
     connect( p4, SIGNAL( clicked() ), this, SLOT( add4() ) );
     connect( p5, SIGNAL( clicked() ), this, SLOT( add5() ) );
     connect( p6, SIGNAL( clicked() ), this, SLOT( add6() ) );
     connect( p7, SIGNAL( clicked() ), this, SLOT( add7() ) );
     connect( p8, SIGNAL( clicked() ), this, SLOT( add8() ) );
     connect( p9, SIGNAL( clicked() ), this, SLOT( add9() ) );
     connect( backspace, SIGNAL( clicked() ), this, SLOT( backspace() ) );
     connect( clear, SIGNAL( clicked() ), this, SLOT( clear() ) );
 
-
+    pwLineEdit->setFocus();
 
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 getMasterPwWnd::~getMasterPwWnd()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 void getMasterPwWnd::okButton_slot()
 {
     qWarning( "getMasterPwWnd::okButton_slot(): Not implemented yet" );
 }
 
 void getMasterPwWnd::cancelButton_slot()
 {
     qWarning( "getMasterPwWnd::cancelButton_slot(): Not implemented yet" );
 }
 
 void getMasterPwWnd::add0()
 {
   addCharacter("0");
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
@@ -127,55 +127,55 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   kcfg_hashAlgo->insertItem(i18n("MD5 (128 bit)"));
   kcfg_hashAlgo->insertItem(i18n("RIPE-MD-160 (160 bit)"));
   kcfg_hashAlgo->insertItem(i18n("Tiger (192 bit)"));
 #endif // CONFIG_PWMANAGER_GCRY
   fileLayout->addWidget( kcfg_hashAlgo,i,1);
   ++i;   
 
   permissionLineEdit = new QLineEdit(filePage);
   QLabel* permissionLineLabel = new QLabel(permissionLineEdit, i18n("Permissions:"), filePage);
   fileLayout->addWidget(permissionLineLabel,i,0);
   fileLayout->addWidget(permissionLineEdit,i,1);
   ++i;
 
   KPrefsWidBool *sb = addWidBool(i18n("Make backup before saving"),
                       &(prefs->mMakeFileBackup),filePage);
   fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   // Timeout page
   //////////////////////////////////////////////////////
   QWidget *timeoutPage = new QWidget( this );
   QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
 
   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);
   timeoutLayout->addMultiCellWidget(timeoutLabel,i, i, 0 ,0);
   timeoutLayout->addWidget(pwTimeoutSpinBox,i,1);
   ++i;
 
-  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);
   timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,0);
   timeoutLayout->addWidget(lockTimeoutSpinBox,i,1);
   ++i;
 
   sb = addWidBool(i18n("deep-lock on autolock"),
                       &(prefs->mAutoDeeplock),timeoutPage);
   timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
  
 
   // Autostart page
   //////////////////////////////////////////////////////
   QWidget *autostartPage = new QWidget( this );
   QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
 
   i = 0;
 
   autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit");
   QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage);
   autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1);
   ++i;
   autostartLayout->addMultiCellWidget(autostartLineEdit,i,i,0,1);
   ++i;
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
@@ -418,32 +418,37 @@ void LibGCryptIf::padData(unsigned char *buf,
 {
         size_t numPadBytes = boundary - ((bufLen + 1) % boundary);
         buf[bufLen] = static_cast<char>(0x01);
         size_t i = 0;
         Randomizer *rnd = Randomizer::obj();
         char c;
         unsigned char *b;
         while (i < numPadBytes) {
                 c = rnd->genRndChar();
                 if (c == static_cast<char>(0x01))
                         continue;
                 b = buf + bufLen + 1 + i;
                 *b = c;
                 ++i;
         }
 }
 
 void LibGCryptIf::unpadData(const unsigned char *buf,
                              size_t *bufLen)
 {
         size_t pos;
         BUG_ON(*bufLen % 8);
         pos = *bufLen - 1;
         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;
         }
         *bufLen = pos;
+    qDebug("ente ");
 }
 
 #endif // CONFIG_PWMANAGER_GCRY
 
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
@@ -188,32 +188,33 @@ int main(int argc, char *argv[])
 #else
       QString fileName ;
       fileName  = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
       QApplication::addLibraryPath ( qApp->applicationDirPath () );
 
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager")));
       KPimGlobalPrefs::instance()->setGlobalConfig();
 
       a.newInstance();
 
       //US       KAddressBookMain m ;
 
       //US      QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
       /*US
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m );
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
 #endif
       */
+      QObject::connect( &a, SIGNAL( lastWindowClosed()), &a, SLOT (quit()));
       a.exec();
       KPimGlobalPrefs::instance()->writeConfig();
   }
   qDebug("PWMPI: Bye! ");
 
 #endif
 
 }
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
@@ -172,53 +172,55 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
  , forceQuit (false)
  , forceMinimizeToTray (false)
 {
     syncManager = 0;
     virgin = !virginity;
         init = _init;
         connect(doc, SIGNAL(docClosed(PwMDoc *)),
                 this, SLOT(docClosed(PwMDoc *)));
         initMenubar();
         initToolbar();
         initMetrics();
         setVirgin(virginity);
         setFocusPolicy(QWidget::WheelFocus);
 #ifndef PWM_EMBEDDED
         statusBar()->show();
 #endif
         view = makeNewListView(doc);
         setCentralWidget(view);
         updateCaption();
         showStatMsg(i18n("Ready."));
 }
 
 PwM::~PwM()
 {
-  //qDebug("PwM::~PwM()");
+    qDebug("PwM::~PwM() %x", this);
         disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
                    this, SLOT(docClosed(PwMDoc *)));
         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)");
         delete view;
     delete syncManager;
 }
 
 void PwM::initMenubar()
 {
   KIconLoader* picons;
 #ifndef PWM_EMBEDDED
         KIconLoader icons;
         picons = &icons;
 #else
         picons = KGlobal::iconLoader();
 
 
         syncPopup = new KPopupMenu(this);
         
         syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::PWMPI, PWMPrefs::instance(), syncPopup);
         syncManager->setBlockSave(false);
 
         connect ( syncPopup, SIGNAL( activated ( int )  ), syncManager, SLOT (slotSyncMenu( int ) ) );
         syncManager->fillSyncMenu();
 
 #endif
@@ -866,53 +868,57 @@ void PwM::config_slot()
                                           end2 = ml->end();
 #else
         QValueList<PwM *>::ConstIterator i2 = ml->begin(),
                                           end2 = ml->end();
 #endif
         PwM *pwm;
         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());
                 ++i2;
         }
 }
 
 void PwM::activateMpButton(bool activate)
 {
         managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, activate);
 }
 
 void PwM::closeEvent(QCloseEvent *e)
 {
+    qDebug("PwM::closeEvent ");
+    emit closed( this );
+    return;
         e->accept();
 }
 
 void PwM::docClosed(PwMDoc *doc)
 {
+    qDebug("PwM::docClosed ");
         PARAM_UNUSED(doc);
         PWM_ASSERT(doc == curDoc());
         close();
 }
 
 void PwM::find_slot()
 {
         PWM_ASSERT(curDoc());
         if (curDoc()->isDocEmpty())
                 return;
         if (curDoc()->isDeepLocked())
                 return;
         curDoc()->timer()->getLock(DocTimer::id_autoLockTimer);
         FindWndImpl findWnd(view);
         findWnd.exec();
         curDoc()->timer()->putLock(DocTimer::id_autoLockTimer);
 }
 
 void PwM::exportToText()
 {
         PWM_ASSERT(curDoc());
         if (curDoc()->isDocEmpty()) {
                 KMessageBox::information(this,
                                          i18n
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
@@ -2956,48 +2956,49 @@ QString PwMDoc::getTitle()
 
         //US ENH: The whole filename on PDAs is too long. So use only the last characters
         if (QApplication::desktop()->width() < 640)
         {
           if (title.length() > 30)
             title = "..." + title.right(30);
 
         }
 
 
         if (title.isEmpty()) {
                 if (unnamedNum == 0) {
                         unnamedNum = PwMDocList::getNewUnnamedNumber();
                         PWM_ASSERT(unnamedNum != 0);
                 }
                 title = DEFAULT_TITLE;
                 title += " ";
                 title += tostr(unnamedNum).c_str();
         }
         return title;
 }
 
 bool PwMDoc::tryDelete()
 {
+ 
         if (deleted)
                 return true;
         int ret;
         if (isDirty()) {
                 ret = dirtyAskSave(getTitle());
                 if (ret == 0) { // save to disk
                         if (!saveDocUi(this))
                                 goto out_ignore;
                 } else if (ret == 1) { // don't save and delete
                         goto out_accept;
                 } else { // cancel operation
                         goto out_ignore;
                 }
         }
 out_accept:
         deleted = true;
         delete this;
         return true;
 out_ignore:
         return false;
 }
 
 
 
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
@@ -183,75 +183,78 @@ void PwMDocUi::noMpwMsgBox(bool chipcard, QString prefix, QString postfix)
 void PwMDocUi::rootAlertMsgBox()
 {
         KMessageBox::error(currentView,
                            i18n("This feature is not available,n"
                                 "if you execute PwM with \"root\" \n"
                                 "UID 0 privileges, for security reasons!"),
                            i18n("not allowed as root!"));
 }
 
 void PwMDocUi::cantDeeplock_notSavedMsgBox()
 {
         KMessageBox::error(currentView,
                            i18n("Can't deep-lock, because the document\n"
                                 "hasn't been saved, yet. Please save\n"
                                 "to a file and try again."),
                            i18n("not saved, yet"));
 }
 
 void PwMDocUi::gpmPwLenErrMsgBox()
 {
         KMessageBox::error(currentView,
                            i18n("GPasman does not support passwords\n"
                                 "shorter than 4 characters! Please try\n"
                                 "again with a longer password."),
-                           i18n("password too short"));
+                           i18n("Password too short"));
 }
 
 int PwMDocUi::dirtyAskSave(const QString &docTitle)
 {
         int ret;
 #ifndef PWM_EMBEDDED
         ret = KMessageBox::questionYesNoCancel(currentView,
-                                               i18n("The list \"") +
+                                               i18n("The list\n\"") +
                                                docTitle +
                                                i18n
                                                ("\" has been modified.\n"
                                                 "Do you want to save it?"),
-                                               i18n("save?"));
+                                               i18n("Save?"));
         if (ret == KMessageBox::Yes) {
                 return 0;
         } else if (ret == KMessageBox::No) {
                 return 1;
         }
 #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
                                                ("\"\nhas been modified.\n"
                                                 "Do you want to save it?"),
-                                               i18n("save?"));
+                                               i18n("Save?"));
         if (ret == KMessageBox::Yes) {
                 return 0;
         } else if (ret == KMessageBox::No) {
                 return 1;
         }
 
 #endif
 
         // cancel
         return -1;
 }
 
 bool PwMDocUi::saveDocUi(PwMDoc *doc)
 {
         PWM_ASSERT(doc);
         doc->timer()->getLock(DocTimer::id_autoLockTimer);
         if (doc->isDocEmpty()) {
                 KMessageBox::information(currentView,
                                          i18n
                                          ("Sorry, there's nothing to save.\n"
                                           "Please first add some passwords."),
                                          i18n("nothing to do"));
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return true;
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
@@ -67,48 +67,49 @@ static NOREGPARM void sig_handler(int signum)
                         sig_init_pointer->shutdownApp(20 + signum);
                         break;
                 default:
                         printDebug(string("unhandled signal ")
                                    + tostr(signum));
         }
 }
 
 
 
 PwMInit::PwMInit(PwMApplication *_app)
  : runStatus (unknown)
  , _curWidget (0)
  , _dcopClient (0)
  , _kwalletEmu (0)
  , _keycard (0)
  , _tray (0)
 {
         sig_init_pointer = this;
         app = _app;
 }
 
 PwMInit::~PwMInit()
 {
+    qDebug("PwMInit::~PwMInit() ");
 #ifndef PWM_EMBEDDED
         SelfTest::cancel();
         // close all open mainwnds
         QValueList<PwM *>::iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 
 #else
         // close all open mainwnds
         QValueList<PwM *>::Iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #endif
         while (i != end) {
                 disconnect(*i, SIGNAL(closed(PwM *)),
                            this, SLOT(mainWndClosed(PwM *)));
                 delete *i;
                 ++i;
         }
         _mainWndList.clear();
         // close all remaining open documents
         PwMDocList *_dl = PwMDoc::getOpenDocList();
         vector<PwMDocList::listItem> dl = *(_dl->getList());
         vector<PwMDocList::listItem>::iterator i2 = dl.begin(),
                                                end2 = dl.end();
         while (i2 != end2) {
@@ -158,49 +159,48 @@ void PwMInit::initializeApp()
                 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,
                               savedCmd.minimized);
         }
-
         runStatus = running;
 }
 
 void PwMInit::shutdownApp(int exitStatus)
 {
         printDebug(string("PwMInit::shutdownApp(")
                    + tostr(exitStatus) + ") called.");
         PWM_ASSERT((runStatus == running) || (runStatus == init));
         runStatus = shutdown;
         QApplication::exit(exitStatus);
         /* The destructor of PwMInit is called when control
          * leaves main()
          */
 }
 
 void PwMInit::initPosixSignalHandler()
 {
         signal(SIGINT, sig_handler);
         signal(SIGTERM, sig_handler);
 }
 
 void PwMInit::initDCOP()
 {
 #ifndef PWM_EMBEDDED
@@ -301,52 +301,50 @@ PwM * PwMInit::createMainWnd(const QString &loadFile,
 #ifndef PWM_EMBEDDED
         _mainWndList.push_back(newWnd);
 #else
         _mainWndList.append(newWnd);
 #endif
         connect(newWnd, SIGNAL(closed(PwM *)),
                 this, SLOT(mainWndClosed(PwM *)));
         connect(newWnd, SIGNAL(gotFocus(PwM *)),
                 this, SLOT(setCurWidget(PwM *)));
         connect(newWnd, SIGNAL(lostFocus(PwM *)),
                 this, SLOT(resetCurWidget()));
 
         //US ENH
 #ifndef PWM_EMBEDDED
         if (minimized)
                 newWnd->showMinimized();
         else
                 newWnd->show();
 
 #else //PWM_EMBEDDED
 
 #ifndef DESKTOP_VERSION
        app->showMainWidget( newWnd );
 #else //DESKTOP_VERSION
-       app->setMainWidget( newWnd );
        newWnd->resize (640, 480 );
        newWnd->show();
-       qDebug("show ");
 #endif //DESKTOP_VERSION
 
 #endif //PWM_EMBEDDED
 
         if (loadFile != QString::null &&
             loadFile != "") {
                 newWnd->openDoc(loadFile, loadFileDeepLocked);
         }
         return newWnd;
 }
 
 PwMDoc * PwMInit::createDoc()
 {
         PwMDoc *doc = new PwMDoc(this);
 #ifdef CONFIG_KEYCARD
         doc->setPwMKeyCard(keycard());
 #endif
 #ifdef CONFIG_KWALLETIF
         if (kwalletEmu())
                 kwalletEmu()->connectDocSignals(doc);
 #endif
 
         if (_tray)
                 _tray->connectDocToTray(doc);
@@ -370,88 +368,99 @@ again:
                         /* This should not happen! If we set forceMinimizeToTray ,
                          * we must be sure that _tray exists.
                          */
                         BUG();
                         wnd->setForceMinimizeToTray(false);
                         goto again;
                 }
                 doMinimizeToTray = true;
         } else {
           // Ask to minimize to tray. If not, delete doc.
                 if (_tray &&
                     runStatus != shutdown &&
                     !wnd->isForceQuit() &&
                     !wnd->curDoc()->isDeleted()) {
                             if (conf()->confWndClose())
                                 doDeleteDoc = true;
                         else
                                 doMinimizeToTray = true;
                 } else {
                         doDeleteDoc = true;
                 }
         }
 
         if (doMinimizeToTray) {
-
+        qDebug("doMinimizeToTray ");
                 PWM_ASSERT(_tray);
                 int mmlock = conf()->confGlobMinimizeLock();
                 switch (mmlock) {
                         case 0:         // don't lock anything
                         break;
                         case 1:         // normal lock
                         wnd->curDoc()->lockAll(true);
                         break;
                         case 2:         // deep-lock
                         wnd->curDoc()->deepLock();
                         break;
                 default:
                         WARN();
                 }
         } else if (doDeleteDoc) {
+        qDebug("doDeleteDoc ");
                 if (!wnd->curDoc()->tryDelete()) {
                         /* We failed deleting the doc,
                          * so open a new window with it, again.
                          */
                         createMainWnd(QString::null, false,
                                       false, wnd->curDoc());
                 }
         }
 #ifndef PWM_EMBEDDED
         // find the closed window in the "mainWndList" and delete it.
         QValueList<PwM *>::iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #else
         // find the closed window in the "mainWndList" and delete it.
         QValueList<PwM *>::Iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #endif
         while (i != end) {
                 if (*i == wnd) {
 #ifndef PWM_EMBEDDED
                         _mainWndList.erase(i);
 #else
                         _mainWndList.remove(i);
 #endif
+         
+            if ( app->mainWidget() == wnd ) {
+                if (  _mainWndList.count() ) {
+#ifndef DESKTOP_VERSION
+                    app->showMainWidget(_mainWndList.first() );
+#endif //DESKTOP_VERSION
+                   
+                }
+            }
+            delete wnd;
                         goto out_success;
                 }
                 ++i;
         }
         BUG();
 out_success:
 #ifndef PWM_EMBEDDED
         if (!_mainWndList.size()) 
 #else
         if (!_mainWndList.count()) 
 #endif
 
           {
                 /* If there's no main window and no tray icon
                  * left, we have no user interface, so we can
                  * shut down the application.
                  */
                 if (!_tray) {
 #ifndef PWM_EMBEDDED
                         dcopClient()->setAcceptCalls(true);
                         dcopClient()->resume();
 #endif
                         shutdownApp(0);
                         return;