8 files changed, 29 insertions, 15 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 11c50f8..657d1de 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -4,5 +4,7 @@ Info about the changes in new versions of KDE-Pim/Pi
 
 Made Passwordmanager PwM/Pi more userfriendly:
-Rearranged some toolbar icons and optimized setting of focus.
+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 ************
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index a63be31..ccc9d83 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -350,5 +350,5 @@
 { "Add new password","Passwort hinzufügen" },

 { "Successfully saved data.","Datei gespeichert." },

-{ "","" },

+{ "Category:","Kategorie:" },

 { "","" },

 { "","" },

diff --git a/bin/kdepim/pwmanager/icons16/decrypted.png b/bin/kdepim/pwmanager/icons16/decrypted.png
index a52d790..3777a12 100644
--- a/bin/kdepim/pwmanager/icons16/decrypted.png
+++ b/bin/kdepim/pwmanager/icons16/decrypted.png
diff --git a/bin/kdepim/pwmanager/icons22/decrypted.png b/bin/kdepim/pwmanager/icons22/decrypted.png
index 2228639..ea770ea 100644
--- a/bin/kdepim/pwmanager/icons22/decrypted.png
+++ b/bin/kdepim/pwmanager/icons22/decrypted.png
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp
index fa6b6c0..09efd1c 100644
--- a/pwmanager/pwmanager/addentrywndimpl.cpp
+++ b/pwmanager/pwmanager/addentrywndimpl.cpp
@@ -45,4 +45,5 @@ AddEntryWndImpl::AddEntryWndImpl( PwMDoc* doc, QWidget* parent, const char* name
 #endif
 {
+        categoryComboBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred ));
 #ifndef PWM_EMBEDDED
         editAdvCommentButton = 0;
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 9187380..a751fce 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -250,9 +250,4 @@ void PwM::initMenubar()
                               SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE);
         filePopup->insertSeparator();
-        filePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
-                                i18n("&Add password"), this,
-                                SLOT(addPwd_slot()), 0,
-                                BUTTON_POPUP_MANAGE_ADD);
-        filePopup->insertSeparator();
         filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)),
                               i18n("&Save"), this,
@@ -368,5 +363,9 @@ void PwM::initMenubar()
                  SLOT(config_slot()),0,
                                  BUTTON_POPUP_OPTIONS_CONFIG);
-        menuBar()->insertItem(i18n("&Options"), optionsPopup);
+    if ( QApplication::desktop()->width() <= 240 ) {
+        managePopup->insertSeparator();
+        managePopup->insertItem(i18n("&Options"), optionsPopup);
+    } else
+        menuBar()->insertItem(i18n("&Options"), optionsPopup);
 // "help" popup menu
 #ifndef PWM_EMBEDDED
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp
index d82eb15..1d88a34 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp
@@ -24,4 +24,6 @@
 
 #include <klocale.h>
+#include <kglobal.h>
+#include <kiconloader.h>
 #include "pwmprefs.h"
 
@@ -30,12 +32,22 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
 {
         vbox1 = new QVBox(view);
-        vbox1->setSpacing(3);
+        vbox1->setSpacing(0);
         hbox1 = new QHBox(vbox1);
-        hbox1->setSpacing(3);
+        hbox1->setSpacing(0);
         categoriesTitle = new QLabel(hbox1);
-        categoriesTitle->setText(i18n("Categories:"));
+        categoriesTitle->setText(i18n("Category:"));
         categoriesCombo = new QComboBox(hbox1);
-        renCatButton = new QPushButton(i18n("&Rename"), hbox1);
-        delCatButton = new QPushButton(i18n("&Delete"), hbox1);
+        categoriesCombo->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred ));
+        renCatButton = new QPushButton( hbox1);
+    renCatButton->setPixmap (KGlobal::iconLoader()->loadIcon("edit", KIcon::Small) );
+    int maxsi = renCatButton->sizeHint().height()+4;
+    renCatButton->setMinimumSize( maxsi, maxsi );
+        delCatButton = new QPushButton( hbox1);
+    delCatButton->setPixmap (KGlobal::iconLoader()->loadIcon("editdelete", KIcon::Small) );
+    maxsi = delCatButton->sizeHint().height()+4;
+    delCatButton->setMinimumSize( maxsi, maxsi );
+    delCatButton->setFocusPolicy( QWidget::NoFocus );
+    renCatButton->setFocusPolicy( QWidget::NoFocus );
+    
 #ifndef PWM_EMBEDDED
         splitter1 = new QSplitter(vbox1);
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index 7294f34..e335a3f 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -84,7 +84,7 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
         categoriesTitle->setFrameShape(QFrame::MenuBarPanel);
 #else
-        categoriesTitle->setFrameShape(QFrame::StyledPanel);
+        //categoriesTitle->setFrameShape(QFrame::StyledPanel);
 #endif
-        categoriesTitle->setText(i18n("Categories:"));
+        categoriesTitle->setText(i18n("Category:"));
         catCtxMenu = new QPopupMenu(view);
         catCtxMenu->insertItem(i18n("&Rename"),