diff options
23 files changed, 51 insertions, 34 deletions
diff --git a/localization/localization_ar_MA.ts b/localization/localization_ar_MA.ts index 4c39d729..6497c3d6 100644 --- a/localization/localization_ar_MA.ts +++ b/localization/localization_ar_MA.ts @@ -702,7 +702,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_cs_CZ.ts b/localization/localization_cs_CZ.ts index c2ead9f4..f81252a6 100644 --- a/localization/localization_cs_CZ.ts +++ b/localization/localization_cs_CZ.ts @@ -659,7 +659,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Heslo</translation> </message> diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 436509a0..147fd563 100755 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts @@ -638,7 +638,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Passwort</translation> </message> diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index a6cb2692..4e8bfa32 100755 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts @@ -637,7 +637,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Passwort</translation> </message> diff --git a/localization/localization_el_GR.ts b/localization/localization_el_GR.ts index a6142438..b6e9c998 100644 --- a/localization/localization_el_GR.ts +++ b/localization/localization_el_GR.ts @@ -618,7 +618,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_en_GB.ts b/localization/localization_en_GB.ts index eaaf7f3b..36852898 100644 --- a/localization/localization_en_GB.ts +++ b/localization/localization_en_GB.ts @@ -659,7 +659,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Password</translation> </message> diff --git a/localization/localization_en_US.ts b/localization/localization_en_US.ts index d9d0652a..f0b7a73a 100644 --- a/localization/localization_en_US.ts +++ b/localization/localization_en_US.ts @@ -659,7 +659,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Password</translation> </message> diff --git a/localization/localization_es_ES.ts b/localization/localization_es_ES.ts index 925deccf..16cf9e61 100644 --- a/localization/localization_es_ES.ts +++ b/localization/localization_es_ES.ts @@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Contraseña</translation> </message> diff --git a/localization/localization_fr_BE.ts b/localization/localization_fr_BE.ts index c69b2f01..ab16908f 100644 --- a/localization/localization_fr_BE.ts +++ b/localization/localization_fr_BE.ts @@ -659,7 +659,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Mot de passe</translation> </message> diff --git a/localization/localization_fr_FR.ts b/localization/localization_fr_FR.ts index 7f5dcdb4..1cb20f8d 100644 --- a/localization/localization_fr_FR.ts +++ b/localization/localization_fr_FR.ts @@ -659,7 +659,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Mot de passe</translation> </message> diff --git a/localization/localization_fr_LU.ts b/localization/localization_fr_LU.ts index 63509bb5..d6bb6944 100644 --- a/localization/localization_fr_LU.ts +++ b/localization/localization_fr_LU.ts @@ -659,7 +659,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Mot de passe</translation> </message> diff --git a/localization/localization_gl_ES.ts b/localization/localization_gl_ES.ts index fdb3d1cb..f0805b30 100644 --- a/localization/localization_gl_ES.ts +++ b/localization/localization_gl_ES.ts @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_he_IL.ts b/localization/localization_he_IL.ts index 7d237348..2174529f 100644 --- a/localization/localization_he_IL.ts +++ b/localization/localization_he_IL.ts @@ -702,7 +702,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts index b910fa7a..ab5936a5 100644 --- a/localization/localization_hu_HU.ts +++ b/localization/localization_hu_HU.ts @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_it_IT.ts b/localization/localization_it_IT.ts index cdf20617..cc982e55 100644 --- a/localization/localization_it_IT.ts +++ b/localization/localization_it_IT.ts @@ -640,7 +640,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_lb_LU.ts b/localization/localization_lb_LU.ts index b53a5914..4367065b 100644 --- a/localization/localization_lb_LU.ts +++ b/localization/localization_lb_LU.ts @@ -618,7 +618,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_nl_BE.ts b/localization/localization_nl_BE.ts index 53ecfe9a..95f23d68 100644 --- a/localization/localization_nl_BE.ts +++ b/localization/localization_nl_BE.ts @@ -683,7 +683,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Wachtwoord</translation> </message> diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts index d54e32e1..9d104353 100644 --- a/localization/localization_nl_NL.ts +++ b/localization/localization_nl_NL.ts @@ -683,7 +683,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Wachtwoord</translation> </message> diff --git a/localization/localization_pl_PL.ts b/localization/localization_pl_PL.ts index 05bdb00e..c6cd37b7 100644 --- a/localization/localization_pl_PL.ts +++ b/localization/localization_pl_PL.ts @@ -615,7 +615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished"></translation> </message> diff --git a/localization/localization_ru_RU.ts b/localization/localization_ru_RU.ts index ddf74a78..7de38d6e 100644 --- a/localization/localization_ru_RU.ts +++ b/localization/localization_ru_RU.ts @@ -651,7 +651,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Пароль</translation> </message> diff --git a/localization/localization_sv_SE.ts b/localization/localization_sv_SE.ts index b2c5719b..88d5ca10 100644 --- a/localization/localization_sv_SE.ts +++ b/localization/localization_sv_SE.ts @@ -611,7 +611,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">Lösenord</translation> </message> diff --git a/localization/localization_zh_CN.ts b/localization/localization_zh_CN.ts index 0668e6e7..bf2bbf00 100644 --- a/localization/localization_zh_CN.ts +++ b/localization/localization_zh_CN.ts @@ -660,7 +660,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mainwindow.cpp" line="750"/> - <location filename="../mainwindow.cpp" line="1978"/> + <location filename="../mainwindow.cpp" line="1987"/> <source>Password</source> <translation type="unfinished">密码</translation> </message> diff --git a/mainwindow.cpp b/mainwindow.cpp index 9b9627f9..943798a0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1968,17 +1968,6 @@ void MainWindow::addToGridLayout(int position, const QString &field, QString trimmedField = field.trimmed(); QString trimmedValue = value.trimmed(); - QLineEdit *line = new QLineEdit(); - line->setObjectName(trimmedField); - line->setText(trimmedValue); - line->setReadOnly(true); - line->setStyleSheet("border-style: none ; background: transparent;"); - line->setContentsMargins(0, 0, 0, 0); - // set the echo mode to password, if the field is "password" - if (QtPassSettings::isHidePassword() && trimmedField == tr("Password")) { - line->setEchoMode(QLineEdit::Password); - } - // Combine the Copy button and the line edit in one widget QFrame *frame = new QFrame(); QLayout *ly = new QHBoxLayout(); @@ -1993,7 +1982,35 @@ void MainWindow::addToGridLayout(int position, const QString &field, // fieldLabel->setContentsMargins(0,5,5,0); frame->layout()->addWidget(fieldLabel); } - frame->layout()->addWidget(line); + + // set the echo mode to password, if the field is "password" + if (QtPassSettings::isHidePassword() && trimmedField == tr("Password")) { + QLineEdit *line = new QLineEdit(); + line->setObjectName(trimmedField); + line->setText(trimmedValue); + line->setReadOnly(true); + line->setStyleSheet("border-style: none ; background: transparent;"); + line->setContentsMargins(0, 0, 0, 0); + line->setEchoMode(QLineEdit::Password); + frame->layout()->addWidget(line); + } else { + QTextBrowser *line = new QTextBrowser(); + line->setOpenExternalLinks(true); + line->setOpenLinks(true); + line->setMaximumHeight(26); + line->setMinimumHeight(26); + line->setSizePolicy( + QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); + line->setObjectName(trimmedField); + trimmedValue.replace(QRegExp("((?:https?|ftp|ssh)://\\S+)"), + "<a href=\"\\1\">\\1</a>"); + line->setText(trimmedValue); + line->setReadOnly(true); + line->setStyleSheet("border-style: none ; background: transparent;"); + line->setContentsMargins(0, 0, 0, 0); + frame->layout()->addWidget(line); + } + frame->setStyleSheet( ".QFrame{border: 1px solid lightgrey; border-radius: 5px;}"); |