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
@@ -71,7 +71,7 @@ void CommentBox::setText(const QString &text)
 {
 	switchTo(mode_text);
 	PWM_ASSERT(textDta);
-	textDta->setText(i18n("Comment") + ":  " + text);
+	textDta->setText( text);
 	if (!textDta->isVisible())
 		textDta->show();
 }
@@ -246,7 +246,7 @@ void CommentBox::clear()
 
 void CommentBox::setText(const QString &text)
 {
-	QMultiLineEdit::setText(i18n("Comment") + ":  " + text);
+	QMultiLineEdit::setText( text);
 	if (!this->isVisible())
 		this->show();
 }
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
@@ -249,6 +249,11 @@ 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);
@@ -286,10 +291,12 @@ void PwM::initMenubar()
 			      i18n("I&mport"), importPopup,
 			      BUTTON_POPUP_FILE_IMPORT);
 	filePopup->insertSeparator();
+#if 0
 	filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
 			      i18n("&Print..."), this,
 			      SLOT(print_slot()), 0, BUTTON_POPUP_FILE_PRINT);
 	filePopup->insertSeparator();
+#endif
 	filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
 			      i18n("&Quit"), this,
 			      SLOT(quitButton_slot()), 0, BUTTON_POPUP_FILE_QUIT);
@@ -299,6 +306,7 @@ void PwM::initMenubar()
 				i18n("&Add password"), this,
 				SLOT(addPwd_slot()), 0,
 				BUTTON_POPUP_MANAGE_ADD);
+	managePopup->insertSeparator();
 	managePopup->insertItem(QIconSet(picons->loadIcon("edit", KIcon::Small)),
 				i18n("&Edit"), this, SLOT(editPwd_slot()), 0,
 				BUTTON_POPUP_MANAGE_EDIT);
@@ -414,32 +422,40 @@ void PwM::initToolbar()
 	picons = KGlobal::iconLoader();
 #endif
 
-#ifdef PWM_EMBEDDED
-    if ( QApplication::desktop()->width() > 320 )
-#endif
-    {
+#if 0
 	toolBar()->insertButton(picons->loadIcon("filenew", KIcon::Toolbar),
 				BUTTON_TOOL_NEW, SIGNAL(clicked(int)), this,
 				SLOT(new_slot()), true, i18n("New"));
+#endif
 	toolBar()->insertButton(picons->loadIcon("fileopen", KIcon::Toolbar),
 				BUTTON_TOOL_OPEN, SIGNAL(clicked(int)), this,
 				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),
 				BUTTON_TOOL_SAVE, SIGNAL(clicked(int)), this,
 				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("pencil", KIcon::Toolbar),
-				BUTTON_TOOL_ADD, SIGNAL(clicked(int)), this,
-				SLOT(addPwd_slot()), true,
-				i18n("Add password"));
 	toolBar()->insertButton(picons->loadIcon("edit", KIcon::Toolbar),
 				BUTTON_TOOL_EDIT, SIGNAL(clicked(int)), this,
 				SLOT(editPwd_slot()), true,
@@ -449,10 +465,6 @@ void PwM::initToolbar()
 				SLOT(deletePwd_slot()), true,
 				i18n("Delete 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("halfencrypted", KIcon::Toolbar),
 				BUTTON_TOOL_LOCK, SIGNAL(clicked(int)), this,
 				SLOT(lockWnd_slot()), true,
@@ -635,7 +647,7 @@ void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
 #else
 	AddEntryWndImpl w(doc, this, "addentrywndimpl");
 #endif
-
+    w.setCaption( i18n ("Add new password") );
 	vector<string> catList;
 	doc->getCategoryList(&catList);
 	unsigned i, size = catList.size();
@@ -733,6 +745,7 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
 	BUG_ON(currItem.binary);
 
 	AddEntryWndImpl w(doc);
+    w.setCaption( i18n ("Edit password") );
 	vector<string> catList;
 	doc->getCategoryList(&catList);
 	unsigned i, size = catList.size();