VINklumpen

4 files changed, 25 insertions, 13 deletions

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
@@ -44,6 +44,7 @@ AddEntryWndImpl::AddEntryWndImpl( PwMDoc* doc, QWidget* parent, const char* name
   : addEntryWnd( doc, parent, name)
 #endif
 {
+	categoryComboBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred ));
 #ifndef PWM_EMBEDDED
 	editAdvCommentButton = 0;
 	commentTextEdit = 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
@@ -249,11 +249,6 @@ void PwM::initMenubar()
 			      i18n("&Close"), this,
 			      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,
 			      SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE);
@@ -367,7 +362,11 @@ void PwM::initMenubar()
 				 i18n("&Configure..."), this,
                  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
 	helpPopup = helpMenu(QString::null, false);
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
@@ -23,20 +23,32 @@
 #include "commentbox.h"
 
 #include <klocale.h>
+#include <kglobal.h>
+#include <kiconloader.h>
 #include "pwmprefs.h"
 
 PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
  : QObject()
 {
 	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);
 	splitter1->setOrientation(Qt::Vertical);
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
@@ -83,9 +83,9 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 #ifndef PWM_EMBEDDED
 	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"),
 			       view, SLOT(renCatButton_slot()));