pwm gui enhancements

3 files changed, 33 insertions, 19 deletions

diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index 0ebc644..d481c42 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -1,10 +1,10 @@
 { " Local Time","Ortszeit" },

-{ "Default","Voreinstellungen" },

+{ "Default","Default" },

 { "Configure...","Konfigurieren..." },

 { "Remove sync info","Entferne Sync Info" },

 { "For all profiles","Für alle Profile" },

 { "Enable Pi-Sync","Aktiviere Pi-Sync" },

 { "Multiple sync","Multi Sync" },

 { "&Save","&Speichern" },

 { "&Print...","Drucken..." },

 { "&File","Datei" },

@@ -303,17 +303,17 @@
 { "Text3 (Password):","Text3 (Passwort):" },

 { "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" },

 { "Description:","Beschreibung:" },

 { "Username:","Benutzername:" },

 { "Password:","Passwort:" },

 { "&Reveal","&Offen zeigen" },

 { "&Generate","&Generiere" },

 { "&Password","&Passwort" },

-{ "&Comments","Kommentare" },

+{ "&Comments","Kommentar" },

 { "Launcher:","Launcher:" },

 { "$d = Description","$d = Beschreibung" },

 { "$n = Username","$n = Benutzername" },

 { "$c = Comment","$c = Kommentar" },

 { "$u = URL","$u = URL" },

 { "$p = Password","$p = Passwort" },

 { "&Launcher","&Launcher" },

 { "Password generator","Passwort Generator" },

@@ -340,14 +340,15 @@
 { "U&RL","URL" },

 { "delete?","Löschen?" },

 { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" },

 { "Save?","Speichern?" },

 { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" },

 { "The list\n "","Die Liste\n "" },

 { "nothing to do","Nichts zu tun" },

 { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." },

-{ "","" },

+{ "Add new password","Passwort hinzufügen" },

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

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 

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
@@ -66,17 +66,17 @@ void CommentBox::clearHtml()
 {
   delete_ifnot_null(htmlDta);
 }
 
 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();
 }
 
 bool CommentBox::getText(QString *text)
 {
         if (mode != mode_text)
                 return false;
@@ -241,17 +241,17 @@ CommentBox::~CommentBox()
 void CommentBox::clear()
 {
         this->hide();
 }
 
 
 void CommentBox::setText(const QString &text)
 {
-        QMultiLineEdit::setText(i18n("Comment") + ":  " + text);
+        QMultiLineEdit::setText( text);
         if (!this->isVisible())
                 this->show();
 }
 
 bool CommentBox::getText(QString *text)
 {
         *text = this->text();
         return true;
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
@@ -244,16 +244,21 @@ void PwM::initMenubar()
                               SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW);
         filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)),
                               i18n("&Open"), this,
                               SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN);
         filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)),
                               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);
         filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)),
                               i18n("Save &as..."),
                               this, SLOT(saveAs_slot()), 0,
                               BUTTON_POPUP_FILE_SAVEAS);
         filePopup->insertSeparator();
@@ -281,29 +286,32 @@ void PwM::initMenubar()
 #ifdef CONFIG_KWALLETIF
         importPopup->insertItem(i18n("&KWallet..."), this,
                                 SLOT(importKWallet()), 0, BUTTON_POPUP_IMPORT_KWALLET);
 #endif
         filePopup->insertItem(QIconSet(picons->loadIcon("fileimport", KIcon::Small)),
                               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);
         menuBar()->insertItem(i18n("&File"), filePopup);
 // "manage" popup menu
         managePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
                                 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);
         managePopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
                                 i18n("&Delete"), this, SLOT(deletePwd_slot()),
                                 0, BUTTON_POPUP_MANAGE_DEL);
         managePopup->insertSeparator();
         managePopup->insertItem(QIconSet(picons->loadIcon("rotate", KIcon::Small)),
@@ -409,55 +417,59 @@ void PwM::initToolbar()
   KIconLoader* picons;
 #ifndef PWM_EMBEDDED
         KIconLoader icons;
         picons = &icons;
 #else
         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,
                                 i18n("Edit password"));
         toolBar()->insertButton(picons->loadIcon("editdelete", KIcon::Toolbar),
                                 BUTTON_TOOL_DEL, SIGNAL(clicked(int)), this,
                                 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,
                                 i18n("Lock all entries"));
         toolBar()->insertButton(picons->loadIcon("encrypted", KIcon::Toolbar),
                                 BUTTON_TOOL_DEEPLOCK, SIGNAL(clicked(int)), this,
                                 SLOT(deepLockWnd_slot()), true,
                                 i18n("Deep-Lock all entries"));
@@ -630,17 +642,17 @@ void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
         }
         PWM_ASSERT(doc);
         doc->timer()->getLock(DocTimer::id_autoLockTimer);
 #ifndef PWM_EMBEDDED
         AddEntryWndImpl w;
 #else
         AddEntryWndImpl w(doc, this, "addentrywndimpl");
 #endif
-
+    w.setCaption( i18n ("Add new password") );
         vector<string> catList;
         doc->getCategoryList(&catList);
         unsigned i, size = catList.size();
         for (i = 0; i < size; ++i) {
                 w.addCategory(catList[i].c_str());
         }
         w.setCurrCategory(view->getCurrentCategory());
         if (pw)
@@ -728,16 +740,17 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
         PwMDataItem currItem;
         if (!doc->getEntry(curCategory, curEntryIndex, &currItem, true)) {
                 doc->timer()->putLock(DocTimer::id_autoLockTimer);
                 return;
         }
         BUG_ON(currItem.binary);
 
         AddEntryWndImpl w(doc);
+    w.setCaption( i18n ("Edit password") );
         vector<string> catList;
         doc->getCategoryList(&catList);
         unsigned i, size = catList.size();
         for (i = 0; i < size; ++i) {
                 w.addCategory(catList[i].c_str());
         }
         w.setCurrCategory(curCategory);
         w.setDescription(currItem.desc.c_str());