pwmp fix

2 files changed, 13 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index a7b8530..d4b7971 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,57 +1,58 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.15 ************
 
 PwM/Pi:
 Added keyboard shorcuts for 
 - toggling summary view (space bar)
 - delete item (delete + backspace key)
 - add new item ( i + n key)
+Fixed length of info in the title.
 
 KO/Pi-KA/Pi:
 Changed "ME" menu bar entry to an icon.
 
 KO/Pi:
 Fixed two minor bugs in displaying todos.
 
 
 ********** VERSION 2.0.14 ************
 
 Made Passwordmanager PwM/Pi more userfriendly:
 Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more.
 Fixed bug in KO/Pi todo printing.
 Made Qtopia calendar import possible on desktop .
 
 ********** VERSION 2.0.13 ************
 
 Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter.
 
 In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down".  
 
 OM/Pi:
 Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails.
 Added missing German translation.
 Added warning if path is specified in local folder settings of account config.
 
 ********** VERSION 2.0.12 ************
 
 KO/Pi:
 Fixed a bug in todo start/due date handling for non recurring todos with a start and due date.
 Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. 
 Fixed several problems of the keyboard focus in the desktop versions when opening the search dialog/event viewer.
 
 Fixed problem in pi-sync mode when wrong password was sent.
 
 OM/Pi:
 Fixed a crash when displaying mails with "Show mail as html" was checked in the config.
 Added a check before displaying the mail if the mail is in html format, if "Show mail as html" is enabled.
 
 ********** VERSION 2.0.11 ************
 
 Fixed some problems in pi-sync mode
 (e.g. details of events were not synced properly)
 
 ********** VERSION 2.0.10 ************
 
 KO/Pi:
 In the desktop versions the context menu in the search dialog was broken after introducing the What'sThis info for the list view.
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index a751fce..9c8d12d 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -444,97 +444,108 @@ void PwM::initToolbar()
                                 SLOT(save_slot()), true, i18n("Save"));
 #if 0
         toolBar()->insertButton(picons->loadIcon("filesaveas", KIcon::Toolbar),
                                 BUTTON_TOOL_SAVEAS, SIGNAL(clicked(int)), this,
                                 SLOT(saveAs_slot()), true, i18n("Save as"));
 #endif
 
 
 #if 0
         toolBar()->insertButton(picons->loadIcon("fileprint", KIcon::Toolbar),
                                 BUTTON_TOOL_PRINT, SIGNAL(clicked(int)), this,
                                 SLOT(print_slot()), true, i18n("Print..."));
 #endif
         toolBar()->insertSeparator();
         toolBar()->insertButton(picons->loadIcon("edit", KIcon::Toolbar),
                                 BUTTON_TOOL_EDIT, SIGNAL(clicked(int)), this,
                                 SLOT(editPwd_slot()), true,
                                 i18n("Edit password"));
         toolBar()->insertButton(picons->loadIcon("editdelete", KIcon::Toolbar),
                                 BUTTON_TOOL_DEL, SIGNAL(clicked(int)), this,
                                 SLOT(deletePwd_slot()), true,
                                 i18n("Delete password"));
         toolBar()->insertSeparator();
         toolBar()->insertButton(picons->loadIcon("halfencrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_LOCK, SIGNAL(clicked(int)), this,
                                 SLOT(lockWnd_slot()), true,
                                 i18n("Lock all entries"));
         toolBar()->insertButton(picons->loadIcon("encrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_DEEPLOCK, SIGNAL(clicked(int)), this,
                                 SLOT(deepLockWnd_slot()), true,
                                 i18n("Deep-Lock all entries"));
         toolBar()->insertButton(picons->loadIcon("decrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_UNLOCK, SIGNAL(clicked(int)), this,
                                 SLOT(unlockWnd_slot()), true,
                                 i18n("Unlock all entries"));
 }
 
 void PwM::initMetrics()
 {
         QSize s = conf()->confWndMainWndSize();
         if (s.isValid())
                 resize(s);
         else
                 resize(DEFAULT_SIZE);
 }
 
 void PwM::updateCaption()
 {
-        setPlainCaption(curDoc()->getTitle() + " - " PROG_NAME " " PACKAGE_VER);
+    QString  s = curDoc()->getTitle();
+   int maxlen = 50;
+    if ( QApplication::desktop()->width() < 640 ) {
+        if ( QApplication::desktop()->width() < 320 )
+            maxlen = 22;
+        else
+            maxlen = 35;
+    }
+    if ( s.length() > maxlen ) {
+        s = "..."+s.right(maxlen -3);
+    }
+        setPlainCaption( s );
 }
 
 void PwM::hideEvent(QHideEvent *)
 {
         if (isMinimized()) {
                 if (init->tray()) {
                         forceMinimizeToTray = true;
                         close();
                 }
                 int mmlock = conf()->confGlobMinimizeLock();
                 switch (mmlock) {
                         case 0:         // don't lock anything
                         break;
                         case 1: {// normal lock
                         curDoc()->lockAll(true);
                         break;
                         } case 2: {// deep-lock
                         curDoc()->deepLock();
                         break;
                 } default:
                         WARN();
                 }
         }
 }
 
 void PwM::setVirgin(bool v)
 {
         if (virgin == v)
                 return;
         virgin = v;
         filePopup->setItemEnabled(BUTTON_POPUP_FILE_SAVE, !v);
         filePopup->setItemEnabled(BUTTON_POPUP_FILE_SAVEAS, !v);
         filePopup->setItemEnabled(BUTTON_POPUP_FILE_EXPORT, !v);
         filePopup->setItemEnabled(BUTTON_POPUP_FILE_PRINT, !v);
         managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_EDIT, !v);
         managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_DEL, !v);
         managePopup->setItemEnabled(BUTTON_POPUP_MANAGE_CHANGEMP, !v);
         viewPopup->setItemEnabled(BUTTON_POPUP_VIEW_LOCK, !v);
         viewPopup->setItemEnabled(BUTTON_POPUP_VIEW_DEEPLOCK, !v);
         viewPopup->setItemEnabled(BUTTON_POPUP_VIEW_UNLOCK, !v);
         viewPopup->setItemEnabled(BUTTON_POPUP_VIEW_FIND, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_SAVE, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_SAVEAS, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_PRINT, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_EDIT, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_DEL, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_LOCK, !v);
         toolBar()->setItemEnabled(BUTTON_TOOL_DEEPLOCK, !v);