6 files changed, 30 insertions, 3 deletions

diff --git a/pwmanager/pwmanager/addentrywnd_emb.cpp b/pwmanager/pwmanager/addentrywnd_emb.cpp
index f065058..c2590f0 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.cpp
+++ b/pwmanager/pwmanager/addentrywnd_emb.cpp
@@ -166,12 +166,19 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
     mTabWidget->addTab( tab3, i18n( "&Launcher" ) );
 
     // signals and slots connections
     connect( generateButton, SIGNAL( clicked() ), this, SLOT( generateButton_slot() ) );
     connect( revealButton, SIGNAL( toggled(bool) ), this, SLOT( revealButton_slot() ) );
+
+#if 0
+    if ( QApplication::desktop()->width() <= 640 && QApplication::desktop()->width() >= 480 ) {
+        resize ( 440, 400 );
+    }
+#endif
+
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 addEntryWnd::~addEntryWnd()
diff --git a/pwmanager/pwmanager/commentbox.cpp b/pwmanager/pwmanager/commentbox.cpp
index e2d2d2b..0f32561 100644
--- a/pwmanager/pwmanager/commentbox.cpp
+++ b/pwmanager/pwmanager/commentbox.cpp
@@ -229,12 +229,13 @@ QSize CommentBox::size()
 
 CommentBox::CommentBox(QWidget *_parentWidget)
   : QMultiLineEdit(_parentWidget) 
 
 {
   this->setReadOnly(true);
+  setFocusPolicy( QWidget::ClickFocus );
 }
 
 CommentBox::~CommentBox()
 {
 }
 
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index fc6837f..aed8ec0 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -656,12 +656,13 @@ void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
 	}
 	w.setCurrCategory(view->getCurrentCategory());
 	if (pw)
 		w.pwLineEdit->setText(*pw);
 
       tryAgain:
+    w.descLineEdit->setFocus();
 	if (w.exec() == 1) 
 	  {
 		PwMDataItem d;
 
 		//US BUG: to initialize all values of curEntr with meaningfulldata,
 		// we call clear on it. Reason: Metadata will be uninitialized otherwise.
@@ -756,12 +757,13 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
 	w.setDescription(currItem.desc.c_str());
 	w.setUsername(currItem.name.c_str());
 	w.setPassword(currItem.pw.c_str());
 	w.setUrl(currItem.url.c_str());
 	w.setLauncher(currItem.launcher.c_str());
 	w.setComment(currItem.comment.c_str());
+    w.descLineEdit->setFocus();
 	if (w.exec() == 1) {
 		currItem.desc = w.getDescription().latin1();
 		currItem.name = w.getUsername().latin1();
 		currItem.pw = w.getPassword().latin1();
 		currItem.comment = w.getComment().latin1();
 		currItem.url = w.getUrl().latin1();
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index 8c4d9cc..7f7dd6f 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -62,12 +62,13 @@ PwMView::PwMView(PwM *_mainClass,
 	mainClass = _mainClass;
 	resize(_mainClass->size());
 	initStyle(conf()->confWndMainViewStyle());
 	initCtxMenu();
 	doc->setCurrentView(this);
 	connect(doc, SIGNAL(dataChanged(PwMDoc *)), this, SLOT(updateView()));
+	connect(this, SIGNAL(editPW()), mainClass, SLOT(editPwd_slot()));
 }
 
 PwMView::~PwMView()
 {
 }
 
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index 0af1473..5f25880 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -58,12 +58,18 @@ PwMViewStyle::~PwMViewStyle()
 	PWMPrefs::instance()->writeConfig();
 
 	delete_ifnot_null(s0);
 	delete_ifnot_null(s1);
 }
 
+void PwMViewStyle::editPassWord( QListViewItem * i )
+{
+    if ( !i )
+        return;
+    emit editPW();
+}
 void PwMViewStyle::initStyle(style_t style)
 {
 	printDebug(string("initializing style ") + tostr(style));
 	bool wasMaximized = v->isMaximized();
 	if (v->isVisible())
 		v->hide();
@@ -90,12 +96,17 @@ void PwMViewStyle::initStyle(style_t style)
 	connect(lv, SIGNAL(pressed(QListViewItem *)),
 		v, SLOT(handleToggle(QListViewItem *)));
 	connect(lv, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)),
 		v, SLOT(handleRightClick(QListViewItem *, const QPoint &, int)));
 	connect(lv, SIGNAL(clicked(QListViewItem *)),
 		v, SLOT(refreshCommentTextEdit(QListViewItem *)));
+	connect(lv, SIGNAL(returnPressed(QListViewItem *)),
+		this, SLOT(editPassWord(QListViewItem *)));
+	connect(lv, SIGNAL(doubleClicked(QListViewItem *)),
+		this, SLOT(editPassWord(QListViewItem *)));
+
 	lv->addColumn(i18n("Description"), 180);
 	lv->addColumn(i18n("Username"), 150);
 	lv->addColumn(i18n("Password"), 150);
 	lv->addColumn(i18n("URL"), 180);
 	lv->addColumn(i18n("Launcher"), 120);
 	v->tmpReEnableSort();
diff --git a/pwmanager/pwmanager/pwmviewstyle.h b/pwmanager/pwmanager/pwmviewstyle.h
index bf5ce91..5656cbc 100644
--- a/pwmanager/pwmanager/pwmviewstyle.h
+++ b/pwmanager/pwmanager/pwmviewstyle.h
@@ -39,12 +39,13 @@
 #include <qsize.h>
 
 class ListViewPwM;
 class PwMViewStyle_0;
 class PwMViewStyle_1;
 class PwMView;
+class QListViewItem;
 class CommentBox;
 
 class PwMViewStyle : public QWidget
 {
 	Q_OBJECT
 
@@ -86,23 +87,27 @@ protected:
 	  * This value dosn't say anything about the number of
 	  * categories in the document.
 	  */
 	int numCategories();
 	/** resize the view */
 	void resizeView(const QSize &size);
+	ListViewPwM *lv;
+	CommentBox *commentBox;
+
+protected slots:
+    void editPassWord( QListViewItem * );
 
 private:
 	/** which style has the view?
 	  * KListBox on the left,
 	  * or QComboBox on the top?
 	  */
 	style_t curStyle;
 
 	PwMViewStyle_0 *s0;
 	PwMViewStyle_1 *s1;
 	PwMView *v;
+ signals:
+    void editPW();
 
-protected:
-	ListViewPwM *lv;
-	CommentBox *commentBox;
 };
 #endif