summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/addentrywnd_emb.cpp7
-rw-r--r--pwmanager/pwmanager/commentbox.cpp1
-rw-r--r--pwmanager/pwmanager/pwm.cpp2
-rw-r--r--pwmanager/pwmanager/pwmview.cpp1
-rw-r--r--pwmanager/pwmanager/pwmviewstyle.cpp11
-rw-r--r--pwmanager/pwmanager/pwmviewstyle.h11
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
@@ -169,6 +169,13 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
// 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
+
}
/*
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
@@ -232,6 +232,7 @@ CommentBox::CommentBox(QWidget *_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
@@ -659,6 +659,7 @@ void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
w.pwLineEdit->setText(*pw);
tryAgain:
+ w.descLineEdit->setFocus();
if (w.exec() == 1)
{
PwMDataItem d;
@@ -759,6 +760,7 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
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();
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
@@ -65,6 +65,7 @@ PwMView::PwMView(PwM *_mainClass,
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
@@ -61,6 +61,12 @@ PwMViewStyle::~PwMViewStyle()
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));
@@ -93,6 +99,11 @@ void PwMViewStyle::initStyle(style_t style)
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);
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
@@ -42,6 +42,7 @@ class ListViewPwM;
class PwMViewStyle_0;
class PwMViewStyle_1;
class PwMView;
+class QListViewItem;
class CommentBox;
class PwMViewStyle : public QWidget
@@ -89,6 +90,11 @@ protected:
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?
@@ -100,9 +106,8 @@ private:
PwMViewStyle_0 *s0;
PwMViewStyle_1 *s1;
PwMView *v;
+ signals:
+ void editPW();
-protected:
- ListViewPwM *lv;
- CommentBox *commentBox;
};
#endif