pwm gui enhancements

2 files changed, 29 insertions, 16 deletions

diff --git a/pwmanager/pwmanager/commentbox.cpp b/pwmanager/pwmanager/commentbox.cpp
index 4a76f36..e2d2d2b 100644
--- a/pwmanager/pwmanager/commentbox.cpp
+++ b/pwmanager/pwmanager/commentbox.cpp
@@ -73,3 +73,3 @@ void CommentBox::setText(const QString &text)
 	PWM_ASSERT(textDta);
-	textDta->setText(i18n("Comment") + ":  " + text);
+	textDta->setText( text);
 	if (!textDta->isVisible())
@@ -248,3 +248,3 @@ void CommentBox::setText(const QString &text)
 {
-	QMultiLineEdit::setText(i18n("Comment") + ":  " + text);
+	QMultiLineEdit::setText( text);
 	if (!this->isVisible())
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 48257ef..fc6837f 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -251,2 +251,7 @@ void PwM::initMenubar()
 	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)),
@@ -288,2 +293,3 @@ void PwM::initMenubar()
 	filePopup->insertSeparator();
+#if 0
 	filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
@@ -292,2 +298,3 @@ void PwM::initMenubar()
 	filePopup->insertSeparator();
+#endif
 	filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
@@ -301,2 +308,3 @@ void PwM::initMenubar()
 				BUTTON_POPUP_MANAGE_ADD);
+	managePopup->insertSeparator();
 	managePopup->insertItem(QIconSet(picons->loadIcon("edit", KIcon::Small)),
@@ -416,6 +424,3 @@ void PwM::initToolbar()
 
-#ifdef PWM_EMBEDDED
-    if ( QApplication::desktop()->width() > 320 )
-#endif
-    {
+#if 0
 	toolBar()->insertButton(picons->loadIcon("filenew", KIcon::Toolbar),
@@ -423,2 +428,3 @@ void PwM::initToolbar()
 				SLOT(new_slot()), true, i18n("New"));
+#endif
 	toolBar()->insertButton(picons->loadIcon("fileopen", KIcon::Toolbar),
@@ -426,4 +432,12 @@ void PwM::initToolbar()
 				SLOT(open_slot()), true, i18n("Open"));
+	toolBar()->insertButton(picons->loadIcon("pencil", KIcon::Toolbar),
+				BUTTON_TOOL_ADD, SIGNAL(clicked(int)), this,
+				SLOT(addPwd_slot()), true,
+				i18n("Add password"));
+	toolBar()->insertSeparator();
+    
+	toolBar()->insertButton(picons->loadIcon("find", KIcon::Toolbar),
+				BUTTON_TOOL_FIND, SIGNAL(clicked(int)), this,
+				SLOT(find_slot()), true, i18n("Find entry"));	
 	toolBar()->insertSeparator();
-    }	
 	toolBar()->insertButton(picons->loadIcon("filesave", KIcon::Toolbar),
@@ -431,2 +445,3 @@ void PwM::initToolbar()
 				SLOT(save_slot()), true, i18n("Save"));
+#if 0
 	toolBar()->insertButton(picons->loadIcon("filesaveas", KIcon::Toolbar),
@@ -434,2 +449,6 @@ void PwM::initToolbar()
 				SLOT(saveAs_slot()), true, i18n("Save as"));
+#endif
+
+
+#if 0
 	toolBar()->insertButton(picons->loadIcon("fileprint", KIcon::Toolbar),
@@ -437,7 +456,4 @@ void PwM::initToolbar()
 				SLOT(print_slot()), true, i18n("Print..."));
+#endif
 	toolBar()->insertSeparator();
-	toolBar()->insertButton(picons->loadIcon("pencil", KIcon::Toolbar),
-				BUTTON_TOOL_ADD, SIGNAL(clicked(int)), this,
-				SLOT(addPwd_slot()), true,
-				i18n("Add password"));
 	toolBar()->insertButton(picons->loadIcon("edit", KIcon::Toolbar),
@@ -451,6 +467,2 @@ void PwM::initToolbar()
 	toolBar()->insertSeparator();
-	toolBar()->insertButton(picons->loadIcon("find", KIcon::Toolbar),
-				BUTTON_TOOL_FIND, SIGNAL(clicked(int)), this,
-				SLOT(find_slot()), true, i18n("Find entry"));
-	toolBar()->insertSeparator();
 	toolBar()->insertButton(picons->loadIcon("halfencrypted", KIcon::Toolbar),
@@ -637,3 +649,3 @@ void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
 #endif
-
+    w.setCaption( i18n ("Add new password") );
 	vector<string> catList;
@@ -735,2 +747,3 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
 	AddEntryWndImpl w(doc);
+    w.setCaption( i18n ("Edit password") );
 	vector<string> catList;