-rw-r--r-- | bin/kdepim/WhatsNew.txt | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 13 |
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,21 +1,22 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.15 ************ | 3 | ********** VERSION 2.0.15 ************ |
4 | 4 | ||
5 | PwM/Pi: | 5 | PwM/Pi: |
6 | Added keyboard shorcuts for | 6 | Added keyboard shorcuts for |
7 | - toggling summary view (space bar) | 7 | - toggling summary view (space bar) |
8 | - delete item (delete + backspace key) | 8 | - delete item (delete + backspace key) |
9 | - add new item ( i + n key) | 9 | - add new item ( i + n key) |
10 | Fixed length of info in the title. | ||
10 | 11 | ||
11 | KO/Pi-KA/Pi: | 12 | KO/Pi-KA/Pi: |
12 | Changed "ME" menu bar entry to an icon. | 13 | Changed "ME" menu bar entry to an icon. |
13 | 14 | ||
14 | KO/Pi: | 15 | KO/Pi: |
15 | Fixed two minor bugs in displaying todos. | 16 | Fixed two minor bugs in displaying todos. |
16 | 17 | ||
17 | 18 | ||
18 | ********** VERSION 2.0.14 ************ | 19 | ********** VERSION 2.0.14 ************ |
19 | 20 | ||
20 | Made Passwordmanager PwM/Pi more userfriendly: | 21 | Made Passwordmanager PwM/Pi more userfriendly: |
21 | Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. | 22 | Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. |
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 | |||
@@ -480,25 +480,36 @@ void PwM::initToolbar() | |||
480 | 480 | ||
481 | void PwM::initMetrics() | 481 | void PwM::initMetrics() |
482 | { | 482 | { |
483 | QSize s = conf()->confWndMainWndSize(); | 483 | QSize s = conf()->confWndMainWndSize(); |
484 | if (s.isValid()) | 484 | if (s.isValid()) |
485 | resize(s); | 485 | resize(s); |
486 | else | 486 | else |
487 | resize(DEFAULT_SIZE); | 487 | resize(DEFAULT_SIZE); |
488 | } | 488 | } |
489 | 489 | ||
490 | void PwM::updateCaption() | 490 | void PwM::updateCaption() |
491 | { | 491 | { |
492 | setPlainCaption(curDoc()->getTitle() + " - " PROG_NAME " " PACKAGE_VER); | 492 | QString s = curDoc()->getTitle(); |
493 | int maxlen = 50; | ||
494 | if ( QApplication::desktop()->width() < 640 ) { | ||
495 | if ( QApplication::desktop()->width() < 320 ) | ||
496 | maxlen = 22; | ||
497 | else | ||
498 | maxlen = 35; | ||
499 | } | ||
500 | if ( s.length() > maxlen ) { | ||
501 | s = "..."+s.right(maxlen -3); | ||
502 | } | ||
503 | setPlainCaption( s ); | ||
493 | } | 504 | } |
494 | 505 | ||
495 | void PwM::hideEvent(QHideEvent *) | 506 | void PwM::hideEvent(QHideEvent *) |
496 | { | 507 | { |
497 | if (isMinimized()) { | 508 | if (isMinimized()) { |
498 | if (init->tray()) { | 509 | if (init->tray()) { |
499 | forceMinimizeToTray = true; | 510 | forceMinimizeToTray = true; |
500 | close(); | 511 | close(); |
501 | } | 512 | } |
502 | int mmlock = conf()->confGlobMinimizeLock(); | 513 | int mmlock = conf()->confGlobMinimizeLock(); |
503 | switch (mmlock) { | 514 | switch (mmlock) { |
504 | case 0: // don't lock anything | 515 | case 0: // don't lock anything |