display alternating category text in the add/edit dialogbox

5 files changed, 51 insertions, 15 deletions

diff --git a/pwmanager/pwmanager/addentrywnd_emb.cpp b/pwmanager/pwmanager/addentrywnd_emb.cpp
index dd09d13..f065058 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.cpp
+++ b/pwmanager/pwmanager/addentrywnd_emb.cpp
@@ -26,2 +26,3 @@ $Id$
 #include "addentrywnd_emb.h"
+#include "pwmdoc.h"
 
@@ -44,6 +45,6 @@ $Id$
  */
-addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
+addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
   : KDialogBase( KDialogBase::Plain, i18n( "edit/add a password entry" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
-                 KDialogBase::Ok, parent, name, true )
+                 KDialogBase::Ok, parent, name, true ), doc(d)
 {
@@ -67,4 +68,4 @@ addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
     descLineEdit = new KLineEdit( tab1, "descLineEdit" );
-    QLabel* label = new QLabel( descLineEdit, i18n("Description:"), tab1 );
-    layout->addWidget( label, i, 0 );
+    descLineLabel = new QLabel( descLineEdit, i18n("Description:"), tab1 );
+    layout->addWidget( descLineLabel, i, 0 );
     layout->addWidget( descLineEdit, i, 1 );
@@ -73,3 +74,3 @@ addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
     categoryComboBox = new KComboBox( tab1  );
-    label = new QLabel( categoryComboBox, i18n("Category:"), tab1 );
+    QLabel* label = new QLabel( categoryComboBox, i18n("Category:"), tab1 );
     layout->addWidget( label, i, 0 );
@@ -81,6 +82,8 @@ addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
     categoryComboBox->setDuplicatesEnabled( FALSE );
+    connect(categoryComboBox,SIGNAL(activated(const QString&)), SLOT(categorySelected(const QString&))); 
+
 
     usernameLineEdit = new KLineEdit( tab1, "usernameLineEdit" );
-    label = new QLabel( usernameLineEdit, i18n("Username:"), tab1 );
-    layout->addWidget( label, i, 0 );
+    usernameLineLabel = new QLabel( usernameLineEdit, i18n("Username:"), tab1 );
+    layout->addWidget( usernameLineLabel, i, 0 );
     layout->addWidget( usernameLineEdit, i, 1 );
@@ -90,4 +93,4 @@ addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
     pwLineEdit->setEchoMode( QLineEdit::Password );
-    label = new QLabel( pwLineEdit, i18n("Password:"), tab1 );
-    layout->addWidget( label, i, 0 );
+    pwLineLabel = new QLabel( pwLineEdit, i18n("Password:"), tab1 );
+    layout->addWidget( pwLineLabel, i, 0 );
     layout->addWidget( pwLineEdit, i, 1 );
@@ -198,2 +201,26 @@ void addEntryWnd::advancedCommentButton_slot(bool)
 
+void addEntryWnd::categorySelected ( const QString & string )
+{
+  unsigned int idx;
+  bool found = doc->findCategory(string, &idx);
+
+  if (found == true)
+    {
+      qDebug("addEntryWnd::categorySelected found");
+      PwMCategoryItem* catitem = doc->getCategoryEntry(idx);
+
+      descLineLabel->setText(catitem->desc_text.c_str());
+      usernameLineLabel->setText(catitem->name_text.c_str());
+      pwLineLabel->setText(catitem->pw_text.c_str());
+      return;
+    }
+  else
+    {
+      qDebug("addEntryWnd::categorySelected NOT found");
+  BUG();
+    }
+
+
+}
+
 
diff --git a/pwmanager/pwmanager/addentrywnd_emb.h b/pwmanager/pwmanager/addentrywnd_emb.h
index 83761dc..966d9d2 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.h
+++ b/pwmanager/pwmanager/addentrywnd_emb.h
@@ -41,2 +41,3 @@ class QGroupBox;
 class QMultiLineEdit;
+class PwMDoc;
 
@@ -47,3 +48,3 @@ class addEntryWnd : public KDialogBase
 public:
-    addEntryWnd( QWidget* parent = 0, const char* name = 0);
+    addEntryWnd( PwMDoc* doc, QWidget* parent = 0, const char* name = 0);
     ~addEntryWnd();
@@ -57,2 +58,5 @@ public:
     KLineEdit* urlLineEdit;
+    QLabel* descLineLabel;
+    QLabel* usernameLineLabel;
+    QLabel* pwLineLabel;
 
@@ -60,2 +64,3 @@ public:
     QMultiLineEdit* commentTextEdit;
+    PwMDoc* doc;
 
@@ -68,2 +73,3 @@ public slots:
     virtual void slotOk();
+  virtual void categorySelected ( const QString & string );
 
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp
index d47f32c..fa6b6c0 100644
--- a/pwmanager/pwmanager/addentrywndimpl.cpp
+++ b/pwmanager/pwmanager/addentrywndimpl.cpp
@@ -42,4 +42,4 @@ AddEntryWndImpl::AddEntryWndImpl()
 #else
-AddEntryWndImpl::AddEntryWndImpl( QWidget* parent, const char* name)
-  : addEntryWnd( parent, name)
+AddEntryWndImpl::AddEntryWndImpl( PwMDoc* doc, QWidget* parent, const char* name)
+  : addEntryWnd( doc, parent, name)
 #endif
@@ -117,2 +117,5 @@ void AddEntryWndImpl::setCurrCategory(const QString &cat)
 			categoryComboBox->setCurrentItem(i);
+#ifdef PWM_EMBEDDED
+			categorySelected(cat);
+#endif
 			return;
diff --git a/pwmanager/pwmanager/addentrywndimpl.h b/pwmanager/pwmanager/addentrywndimpl.h
index ce9a594..e13eb54 100644
--- a/pwmanager/pwmanager/addentrywndimpl.h
+++ b/pwmanager/pwmanager/addentrywndimpl.h
@@ -47,3 +47,3 @@ public:
 #else
-	AddEntryWndImpl( QWidget* parent = 0, const char* name = 0);
+	AddEntryWndImpl( PwMDoc* doc, QWidget* parent = 0, const char* name = 0);
 #endif
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index bd98d72..9642a43 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -635,3 +635,3 @@ void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
 #else
-	AddEntryWndImpl w(this, "addentrywndimpl");
+	AddEntryWndImpl w(doc, this, "addentrywndimpl");
 #endif
@@ -734,3 +734,3 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
 
-	AddEntryWndImpl w;
+	AddEntryWndImpl w(doc);
 	vector<string> catList;