[git] Pinentry - branch, master, updated. pinentry-0.9.7-17-ged066c2
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Apr 25 12:10:36 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via ed066c261594de69c3c2aeaac98aeaf74bbb5f9e (commit)
via d580304566b5b1c4e7c97c060d7a7b8c0b810ae3 (commit)
via 1532b60dcc5a45a74195cfbc20225006d027e7fa (commit)
from e925e8955b0a82f1a0e3c697704007c503a5f8b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ed066c261594de69c3c2aeaac98aeaf74bbb5f9e
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 25 12:08:03 2016 +0200
Qt: Only use one line action for visibility
* qt/pinentrydialog.cpp (PinEntryDialog::toggleVisibility): Toggle
both lines in repeat mode.
(PinEntryDialog::PinEntryDialog): Remove repeat line action.
--
It does not appear sensible to show / hide only one edit in
repeat mode this should make the usage of the visibility action
a bit more intutive.
diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
index 04f5c58..11a157c 100644
--- a/qt/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -123,7 +123,6 @@ PinEntryDialog::PinEntryDialog(QWidget *parent, const char *name,
mVisibilityTT(visibilityTT),
mHideTT(hideTT),
mVisiActionEdit(NULL),
- mVisiActionRepeat(NULL),
mVisiCB(NULL)
{
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -226,12 +225,6 @@ PinEntryDialog::PinEntryDialog(QWidget *parent, const char *name,
mVisiActionEdit = _edit->addAction(visibilityIcon, QLineEdit::TrailingPosition);
mVisiActionEdit->setVisible(false);
mVisiActionEdit->setToolTip(mVisibilityTT);
- if (mRepeat) {
- mVisiActionRepeat = mRepeat->addAction(visibilityIcon, QLineEdit::TrailingPosition);
- mVisiActionRepeat->setVisible(false);
- mVisiActionRepeat->setToolTip(mVisibilityTT);
- connect(mVisiActionRepeat, SIGNAL(triggered()), this, SLOT(toggleVisibility()));
- }
connect(mVisiActionEdit, SIGNAL(triggered()), this, SLOT(toggleVisibility()));
} else
#endif
@@ -416,9 +409,6 @@ void PinEntryDialog::textChanged(const QString &text)
if (mVisiActionEdit && sender() == _edit) {
mVisiActionEdit->setVisible(!_edit->text().isEmpty());
}
- if (mVisiActionRepeat && sender() == mRepeat) {
- mVisiActionRepeat->setVisible(!mRepeat->text().isEmpty());
- }
}
void PinEntryDialog::toggleVisibility()
@@ -428,21 +418,16 @@ void PinEntryDialog::toggleVisibility()
mVisiActionEdit->setIcon(QIcon::fromTheme(QLatin1String("hint")));
mVisiActionEdit->setToolTip(mHideTT);
_edit->setEchoMode(QLineEdit::Normal);
+ if (mRepeat) {
+ mRepeat->setEchoMode(QLineEdit::Normal);
+ }
} else {
mVisiActionEdit->setIcon(QIcon::fromTheme(QLatin1String("visibility")));
mVisiActionEdit->setToolTip(mVisibilityTT);
_edit->setEchoMode(QLineEdit::Password);
- }
- }
- if (sender() == mVisiActionRepeat) {
- if (mRepeat->echoMode() == QLineEdit::Password) {
- mVisiActionRepeat->setIcon(QIcon::fromTheme(QLatin1String("hint")));
- mVisiActionRepeat->setToolTip(mHideTT);
- mRepeat->setEchoMode(QLineEdit::Normal);
- } else {
- mVisiActionRepeat->setIcon(QIcon::fromTheme(QLatin1String("visibility")));
- mVisiActionRepeat->setToolTip(mVisibilityTT);
- mRepeat->setEchoMode(QLineEdit::Password);
+ if (mRepeat) {
+ mRepeat->setEchoMode(QLineEdit::Password);
+ }
}
}
if (sender() == mVisiCB) {
diff --git a/qt/pinentrydialog.h b/qt/pinentrydialog.h
index 4c1241c..c302f95 100644
--- a/qt/pinentrydialog.h
+++ b/qt/pinentrydialog.h
@@ -110,8 +110,7 @@ private:
QString mRepeatError,
mVisibilityTT,
mHideTT;
- QAction *mVisiActionEdit,
- *mVisiActionRepeat;
+ QAction *mVisiActionEdit;
QCheckBox *mVisiCB;
};
commit d580304566b5b1c4e7c97c060d7a7b8c0b810ae3
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 25 12:05:35 2016 +0200
Qt: Move qualitybar below repeat
* qt/pinentrydialog.cpp (PinEntryDialog::PinEntryDialog): Move
quality bar below repeat.
--
Havin the repeat directly below the entry field looks better and
adds more connection between the entries.
diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
index 292d46f..04f5c58 100644
--- a/qt/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -201,10 +201,6 @@ PinEntryDialog::PinEntryDialog(QWidget *parent, const char *name,
//grid->addItem( new QSpacerItem( 0, _edit->height() / 10, QSizePolicy::Minimum, QSizePolicy::Fixed ), 1, 1 );
grid->addWidget(_prompt, row, 1);
grid->addWidget(_edit, row++, 2);
- if (enable_quality_bar) {
- grid->addWidget(_quality_bar_label, row, 1);
- grid->addWidget(_quality_bar, row++, 2);
- }
if (!repeatString.isNull()) {
mRepeat = new QLineEdit;
mRepeat->setMaxLength(256);
@@ -218,6 +214,10 @@ PinEntryDialog::PinEntryDialog(QWidget *parent, const char *name,
setTabOrder(_edit, mRepeat);
setTabOrder(mRepeat, _ok);
}
+ if (enable_quality_bar) {
+ grid->addWidget(_quality_bar_label, row, 1);
+ grid->addWidget(_quality_bar, row++, 2);
+ }
/* Set up the show password action */
const QIcon visibilityIcon = QIcon::fromTheme(QLatin1String("visibility"));
const QIcon hideIcon = QIcon::fromTheme(QLatin1String("hint"));
commit 1532b60dcc5a45a74195cfbc20225006d027e7fa
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Apr 25 11:11:51 2016 +0200
Qt: Do not take icon from theme
* qt/main.cpp (main): Revert changes to take icon from theme.
--
Feedback was that pinentry should be recognisable and use it's
own Icon.
diff --git a/qt/main.cpp b/qt/main.cpp
index bc7796f..d5da4a8 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -340,20 +340,7 @@ main(int argc, char *argv[])
window anymore. */
i = argc;
app.reset(new QApplication(i, new_argv));
- const QIcon fallback = QIcon(QLatin1String(":/document-encrypt.png"));
- const QString themeName = QIcon::themeName().toLower();
- /* Some themes dont have an lock representation for document-encrypt
- we need to filter out these. */
- const QStringList okThemes = QStringList() << QLatin1String("breeze")
- << QLatin1String("breeze-dark")
- << QLatin1String("oxygen")
- << QLatin1String("mono");
- if (okThemes.contains(themeName)) {
- app->setWindowIcon(QIcon::fromTheme(QLatin1String("document-encrypt"),
- fallback));
- } else {
- app->setWindowIcon(fallback);
- }
+ app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png")));
}
pinentry_parse_opts(argc, argv);
-----------------------------------------------------------------------
Summary of changes:
qt/main.cpp | 15 +--------------
qt/pinentrydialog.cpp | 35 ++++++++++-------------------------
qt/pinentrydialog.h | 3 +--
3 files changed, 12 insertions(+), 41 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list