Add password strength indicator to PasswordEditWidget

Fixes #7437 (entry edit view only)
Fixes #5220

16 files changed, 402 insertions, 156 deletions

diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 5fa8e7542..6f625f943 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -1427,10 +1427,6 @@ Backup database located at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;In addition to a password, you can use a secret file to enhance the security of your database. This file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave this field empty.&lt;/p&gt;&lt;p&gt;Click for more information…&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key file help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1443,11 +1439,6 @@ Backup database located at %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
-&lt;p&gt;Click for more information…&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Hardware key help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1581,6 +1572,15 @@ If you do not have a key file, please leave the field empty.</source>
         <source>Select hardware key…</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;In addition to a password, you can use a secret file to enhance the security of your database. This file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave this field empty.&lt;/p&gt;&lt;p&gt;Click for more information…&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
+&lt;p&gt;Click for more information…&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingWidgetMetaData</name>
@@ -5750,29 +5750,6 @@ We recommend you use the AppImage available on our downloads page.</source>
     </message>
 </context>
 <context>
-    <name>PasswordEdit</name>
-    <message>
-        <source>Passwords do not match</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passwords match so far</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Password (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Generate Password (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning: Caps Lock enabled!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>PasswordEditWidget</name>
     <message>
         <source>Enter password:</source>
@@ -5951,10 +5928,6 @@ We recommend you use the AppImage available on our downloads page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Exclude look-alike characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6103,6 +6076,57 @@ Do you want to overwrite it?</source>
         <comment>Password quality</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PasswordWidget</name>
+    <message>
+        <source>Passwords do not match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords match so far</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle Password (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate Password (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning: Caps Lock enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PickcharsDialog</name>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c4f66e713..8e6fbc425 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,7 +121,7 @@ set(keepassx_SOURCES
         gui/MessageBox.cpp
         gui/MessageWidget.cpp
         gui/OpVaultOpenWidget.cpp
-        gui/PasswordEdit.cpp
+        gui/PasswordWidget.cpp
         gui/PasswordGeneratorWidget.cpp
         gui/ApplicationSettingsWidget.cpp
         gui/Icons.cpp
diff --git a/src/autotype/PickcharsDialog.ui b/src/autotype/PickcharsDialog.ui
index de9704eb0..2ff3ac0c6 100644
--- a/src/autotype/PickcharsDialog.ui
+++ b/src/autotype/PickcharsDialog.ui
@@ -34,7 +34,7 @@
     <layout class="QGridLayout" name="charsGrid"/>

    </item>

    <item>

-    <widget class="PasswordEdit" name="selectedChars">

+    <widget class="PasswordWidget" name="selectedChars">

      <property name="sizePolicy">

       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">

        <horstretch>0</horstretch>

@@ -74,9 +74,10 @@
  </widget>

  <customwidgets>

   <customwidget>

-   <class>PasswordEdit</class>

+   <class>PasswordWidget</class>

    <extends>QLineEdit</extends>

-   <header>gui/PasswordEdit.h</header>

+   <header>gui/PasswordWidget.h</header>

+   <container>1</container>

   </customwidget>

  </customwidgets>

  <tabstops>

diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui
index 101bef632..7cd4f281e 100644
--- a/src/gui/DatabaseOpenWidget.ui
+++ b/src/gui/DatabaseOpenWidget.ui
@@ -145,7 +145,7 @@
              </widget>
             </item>
             <item>
-             <widget class="PasswordEdit" name="editPassword">
+             <widget class="PasswordWidget" name="editPassword">
               <property name="accessibleName">
                <string>Password field</string>
               </property>
@@ -380,7 +380,7 @@
                    <number>0</number>
                   </property>
                   <item row="0" column="1">
-                   <widget class="PasswordEdit" name="keyFileLineEdit">
+                   <widget class="PasswordWidget" name="keyFileLineEdit">
                     <property name="sizePolicy">
                      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                       <horstretch>0</horstretch>
@@ -617,9 +617,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>PasswordEdit</class>
+   <class>PasswordWidget</class>
    <extends>QLineEdit</extends>
-   <header>gui/PasswordEdit.h</header>
+   <header>gui/PasswordWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 547c5a0ab..2fafaf2ea 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -87,7 +87,7 @@
       </layout>
      </item>
      <item row="0" column="0">
-      <widget class="PasswordEdit" name="editNewPassword">
+      <widget class="PasswordWidget" name="editNewPassword">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -990,9 +990,9 @@ QProgressBar::chunk {
  </widget>
  <customwidgets>
   <customwidget>
-   <class>PasswordEdit</class>
+   <class>PasswordWidget</class>
    <extends>QLineEdit</extends>
-   <header>gui/PasswordEdit.h</header>
+   <header>gui/PasswordWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/gui/PasswordEdit.cpp b/src/gui/PasswordWidget.cpp
index 5f9272b1b..f5e97ba08 100644
--- a/src/gui/PasswordEdit.cpp
+++ b/src/gui/PasswordWidget.cpp
@@ -16,9 +16,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "PasswordEdit.h"
+#include "PasswordWidget.h"
+#include "ui_PasswordWidget.h"
 
 #include "core/Config.h"
+#include "core/PasswordHealth.h"
 #include "gui/Font.h"
 #include "gui/Icons.h"
 #include "gui/PasswordGeneratorWidget.h"
@@ -26,19 +28,24 @@
 #include "gui/styles/StateColorPalette.h"
 
 #include <QEvent>
+#include <QLineEdit>
 #include <QTimer>
 #include <QToolTip>
 
-PasswordEdit::PasswordEdit(QWidget* parent)
-    : QLineEdit(parent)
+PasswordWidget::PasswordWidget(QWidget* parent)
+    : QWidget(parent)
+    , m_ui(new Ui::PasswordWidget())
 {
+    m_ui->setupUi(this);
+    setFocusProxy(m_ui->passwordEdit);
+
     const QIcon errorIcon = icons()->icon("dialog-error");
-    m_errorAction = addAction(errorIcon, QLineEdit::TrailingPosition);
+    m_errorAction = m_ui->passwordEdit->addAction(errorIcon, QLineEdit::TrailingPosition);
     m_errorAction->setVisible(false);
     m_errorAction->setToolTip(tr("Passwords do not match"));
 
     const QIcon correctIcon = icons()->icon("dialog-ok");
-    m_correctAction = addAction(correctIcon, QLineEdit::TrailingPosition);
+    m_correctAction = m_ui->passwordEdit->addAction(correctIcon, QLineEdit::TrailingPosition);
     m_correctAction->setVisible(false);
     m_correctAction->setToolTip(tr("Passwords match so far"));
 
@@ -63,8 +70,8 @@ PasswordEdit::PasswordEdit(QWidget* parent)
     m_toggleVisibleAction->setCheckable(true);
     m_toggleVisibleAction->setShortcut(modifier + Qt::Key_H);
     m_toggleVisibleAction->setShortcutContext(Qt::WidgetShortcut);
-    addAction(m_toggleVisibleAction, QLineEdit::TrailingPosition);
-    connect(m_toggleVisibleAction, &QAction::triggered, this, &PasswordEdit::setShowPassword);
+    m_ui->passwordEdit->addAction(m_toggleVisibleAction, QLineEdit::TrailingPosition);
+    connect(m_toggleVisibleAction, &QAction::triggered, this, &PasswordWidget::setShowPassword);
 
     m_passwordGeneratorAction = new QAction(
         icons()->icon("password-generator"),
@@ -72,44 +79,98 @@ PasswordEdit::PasswordEdit(QWidget* parent)
         this);
     m_passwordGeneratorAction->setShortcut(modifier + Qt::Key_G);
     m_passwordGeneratorAction->setShortcutContext(Qt::WidgetShortcut);
-    addAction(m_passwordGeneratorAction, QLineEdit::TrailingPosition);
+    m_ui->passwordEdit->addAction(m_passwordGeneratorAction, QLineEdit::TrailingPosition);
     m_passwordGeneratorAction->setVisible(false);
 
     m_capslockAction =
         new QAction(icons()->icon("dialog-warning", true, StateColorPalette().color(StateColorPalette::Error)),
                     tr("Warning: Caps Lock enabled!"),
                     this);
-    addAction(m_capslockAction, QLineEdit::LeadingPosition);
+    m_ui->passwordEdit->addAction(m_capslockAction, QLineEdit::LeadingPosition);
     m_capslockAction->setVisible(false);
+
+    // Reset the password strength bar, hidden by default
+    updatePasswordStrength("");
+    m_ui->qualityProgressBar->setVisible(false);
+
+    connect(m_ui->passwordEdit, &QLineEdit::textChanged, this, [this](const QString& pwd) {
+        updatePasswordStrength(pwd);
+        emit textChanged(pwd);
+    });
+}
+
+PasswordWidget::~PasswordWidget()
+{
+}
+
+void PasswordWidget::setQualityVisible(bool state)
+{
+    m_ui->qualityProgressBar->setVisible(state);
+}
+
+QString PasswordWidget::text()
+{
+    return m_ui->passwordEdit->text();
+}
+
+void PasswordWidget::setText(const QString& text)
+{
+    m_ui->passwordEdit->setText(text);
 }
 
-void PasswordEdit::setRepeatPartner(PasswordEdit* repeatEdit)
+void PasswordWidget::setEchoMode(QLineEdit::EchoMode mode)
+{
+    m_ui->passwordEdit->setEchoMode(mode);
+}
+
+void PasswordWidget::clear()
+{
+    m_ui->passwordEdit->clear();
+}
+
+void PasswordWidget::setClearButtonEnabled(bool enabled)
+{
+    m_ui->passwordEdit->setClearButtonEnabled(enabled);
+}
+
+void PasswordWidget::selectAll()
+{
+    m_ui->passwordEdit->selectAll();
+}
+
+void PasswordWidget::setReadOnly(bool state)
+{
+    m_ui->passwordEdit->setReadOnly(state);
+}
+
+void PasswordWidget::setRepeatPartner(PasswordWidget* repeatEdit)
 {
     m_repeatPasswordEdit = repeatEdit;
     m_repeatPasswordEdit->setParentPasswordEdit(this);
 
-    connect(this, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(autocompletePassword(QString)));
-    connect(this, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(updateRepeatStatus()));
-    connect(m_repeatPasswordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(updateRepeatStatus()));
+    connect(
+        m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(autocompletePassword(QString)));
+    connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordEdit, SLOT(updateRepeatStatus()));
 }
 
-void PasswordEdit::setParentPasswordEdit(PasswordEdit* parent)
+void PasswordWidget::setParentPasswordEdit(PasswordWidget* parent)
 {
     m_parentPasswordEdit = parent;
     // Hide actions
     m_toggleVisibleAction->setVisible(false);
     m_passwordGeneratorAction->setVisible(false);
+    connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), this, SLOT(updateRepeatStatus()));
 }
 
-void PasswordEdit::enablePasswordGenerator()
+void PasswordWidget::enablePasswordGenerator()
 {
     if (!m_passwordGeneratorAction->isVisible()) {
         m_passwordGeneratorAction->setVisible(true);
-        connect(m_passwordGeneratorAction, &QAction::triggered, this, &PasswordEdit::popupPasswordGenerator);
+        connect(m_passwordGeneratorAction, &QAction::triggered, this, &PasswordWidget::popupPasswordGenerator);
     }
 }
 
-void PasswordEdit::setShowPassword(bool show)
+void PasswordWidget::setShowPassword(bool show)
 {
     setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password);
     m_toggleVisibleAction->setIcon(icons()->onOffIcon("password-show", show));
@@ -126,12 +187,12 @@ void PasswordEdit::setShowPassword(bool show)
     }
 }
 
-bool PasswordEdit::isPasswordVisible() const
+bool PasswordWidget::isPasswordVisible() const
 {
-    return echoMode() == QLineEdit::Normal;
+    return m_ui->passwordEdit->echoMode() == QLineEdit::Normal;
 }
 
-void PasswordEdit::popupPasswordGenerator()
+void PasswordWidget::popupPasswordGenerator()
 {
     auto generator = PasswordGeneratorWidget::popupGenerator(this);
     generator->setPasswordVisible(isPasswordVisible());
@@ -143,7 +204,7 @@ void PasswordEdit::popupPasswordGenerator()
     }
 }
 
-void PasswordEdit::updateRepeatStatus()
+void PasswordWidget::updateRepeatStatus()
 {
     static const auto stylesheetTemplate = QStringLiteral("QLineEdit { background: %1; }");
     if (!m_parentPasswordEdit) {
@@ -170,24 +231,25 @@ void PasswordEdit::updateRepeatStatus()
     }
 }
 
-void PasswordEdit::autocompletePassword(const QString& password)
+void PasswordWidget::autocompletePassword(const QString& password)
 {
-    if (!config()->get(Config::Security_PasswordsRepeatVisible).toBool() && echoMode() == QLineEdit::Normal) {
+    if (!config()->get(Config::Security_PasswordsRepeatVisible).toBool()
+        && m_ui->passwordEdit->echoMode() == QLineEdit::Normal) {
         setText(password);
     }
 }
 
-bool PasswordEdit::event(QEvent* event)
+bool PasswordWidget::event(QEvent* event)
 {
     if (isVisible()
         && (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease
             || event->type() == QEvent::FocusIn)) {
         checkCapslockState();
     }
-    return QLineEdit::event(event);
+    return QWidget::event(event);
 }
 
-void PasswordEdit::checkCapslockState()
+void PasswordWidget::checkCapslockState()
 {
     if (m_parentPasswordEdit) {
         return;
@@ -201,8 +263,6 @@ void PasswordEdit::checkCapslockState()
         // Force repaint to avoid rendering glitches of QLineEdit contents
         repaint();
 
-        emit capslockToggled(m_capslockState);
-
         if (newCapslockState) {
             QTimer::singleShot(
                 150, [this] { QToolTip::showText(mapToGlobal(rect().bottomLeft()), m_capslockAction->text()); });
@@ -211,3 +271,55 @@ void PasswordEdit::checkCapslockState()
         }
     }
 }
+
+void PasswordWidget::updatePasswordStrength(const QString& password)
+{
+    if (password.isEmpty()) {
+        m_ui->qualityProgressBar->setValue(0);
+        m_ui->qualityProgressBar->setToolTip((tr("")));
+        return;
+    }
+
+    PasswordHealth health(password);
+
+    m_ui->qualityProgressBar->setValue(std::min(int(health.entropy()), m_ui->qualityProgressBar->maximum()));
+
+    QString style = m_ui->qualityProgressBar->styleSheet();
+    QRegularExpression re("(QProgressBar::chunk\\s*\\{.*?background-color:)[^;]+;",
+                          QRegularExpression::CaseInsensitiveOption | QRegularExpression::DotMatchesEverythingOption);
+    style.replace(re, "\\1 %1;");
+
+    StateColorPalette qualityPalette;
+
+    switch (health.quality()) {
+    case PasswordHealth::Quality::Bad:
+    case PasswordHealth::Quality::Poor:
+        m_ui->qualityProgressBar->setStyleSheet(
+            style.arg(qualityPalette.color(StateColorPalette::HealthCritical).name()));
+
+        m_ui->qualityProgressBar->setToolTip(tr("Quality: %1").arg(tr("Poor", "Password quality")));
+
+        break;
+
+    case PasswordHealth::Quality::Weak:
+        m_ui->qualityProgressBar->setStyleSheet(style.arg(qualityPalette.color(StateColorPalette::HealthBad).name()));
+
+        m_ui->qualityProgressBar->setToolTip(tr("Quality: %1").arg(tr("Weak", "Password quality")));
+
+        break;
+    case PasswordHealth::Quality::Good:
+        m_ui->qualityProgressBar->setStyleSheet(style.arg(qualityPalette.color(StateColorPalette::HealthOk).name()));
+
+        m_ui->qualityProgressBar->setToolTip(tr("Quality: %1").arg(tr("Good", "Password quality")));
+
+        break;
+    case PasswordHealth::Quality::Excellent:
+
+        m_ui->qualityProgressBar->setStyleSheet(
+            style.arg(qualityPalette.color(StateColorPalette::HealthExcellent).name()));
+
+        m_ui->qualityProgressBar->setToolTip(tr("Quality: %1").arg(tr("Excellent", "Password quality")));
+
+        break;
+    }
+}
\ No newline at end of file
diff --git a/src/gui/PasswordEdit.h b/src/gui/PasswordWidget.h
index 559394bd0..f844d7737 100644
--- a/src/gui/PasswordEdit.h
+++ b/src/gui/PasswordWidget.h
@@ -16,50 +16,70 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEEPASSX_PASSWORDEDIT_H
-#define KEEPASSX_PASSWORDEDIT_H
+#ifndef KEEPASSX_PASSWORDWIDGET_H
+#define KEEPASSX_PASSWORDWIDGET_H
 
 #include <QAction>
 #include <QLineEdit>
 #include <QPointer>
+#include <QWidget>
 
-class QDialog;
+namespace Ui
+{
+    class PasswordWidget;
+}
 
-class PasswordEdit : public QLineEdit
+class PasswordWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit PasswordEdit(QWidget* parent = nullptr);
+    explicit PasswordWidget(QWidget* parent = nullptr);
+    ~PasswordWidget() override;
     void enablePasswordGenerator();
-    void setRepeatPartner(PasswordEdit* repeatEdit);
+    void setRepeatPartner(PasswordWidget* repeatEdit);
+    void setQualityVisible(bool state);
+
     bool isPasswordVisible() const;
+    QString text();
+
+signals:
+    void textChanged(QString text);
 
 public slots:
+    void setText(const QString& text);
     void setShowPassword(bool show);
-    void updateRepeatStatus();
+
+    void clear();
+    void selectAll();
+    void setReadOnly(bool state);
+    void setEchoMode(QLineEdit::EchoMode mode);
+    void setClearButtonEnabled(bool enabled);
 
 protected:
     bool event(QEvent* event) override;
 
-signals:
-    void capslockToggled(bool capslockOn);
-
 private slots:
     void autocompletePassword(const QString& password);
     void popupPasswordGenerator();
-    void setParentPasswordEdit(PasswordEdit* parent);
-    void checkCapslockState();
+    void updateRepeatStatus();
+    void updatePasswordStrength(const QString& password);
 
 private:
+    void checkCapslockState();
+    void setParentPasswordEdit(PasswordWidget* parent);
+
+    const QScopedPointer<Ui::PasswordWidget> m_ui;
+
     QPointer<QAction> m_errorAction;
     QPointer<QAction> m_correctAction;
     QPointer<QAction> m_toggleVisibleAction;
     QPointer<QAction> m_passwordGeneratorAction;
     QPointer<QAction> m_capslockAction;
-    QPointer<PasswordEdit> m_repeatPasswordEdit;
-    QPointer<PasswordEdit> m_parentPasswordEdit;
+    QPointer<PasswordWidget> m_repeatPasswordEdit;
+    QPointer<PasswordWidget> m_parentPasswordEdit;
+
     bool m_capslockState = false;
 };
 
-#endif // KEEPASSX_PASSWORDEDIT_H
+#endif // KEEPASSX_PASSWORDWIDGET_H
diff --git a/src/gui/PasswordWidget.ui b/src/gui/PasswordWidget.ui
new file mode 100644
index 000000000..4419ad79b
--- /dev/null
+++ b/src/gui/PasswordWidget.ui
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PasswordWidget</class>
+ <widget class="QWidget" name="PasswordWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>471</width>
+    <height>25</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLineEdit" name="passwordEdit"/>
+   </item>
+   <item>
+    <widget class="QProgressBar" name="qualityProgressBar">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>4</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">QProgressBar {
+              border: none;
+              background-color: transparent;
+              }
+              QProgressBar::chunk {
+              background-color: #c0392b;
+              border-radius: 1px;
+              }
+            </string>
+     </property>
+     <property name="value">
+      <number>24</number>
+     </property>
+     <property name="textVisible">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>passwordEdit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gui/databasekey/PasswordEditWidget.cpp b/src/gui/databasekey/PasswordEditWidget.cpp
index 5f12f7d19..5ed6b6328 100644
--- a/src/gui/databasekey/PasswordEditWidget.cpp
+++ b/src/gui/databasekey/PasswordEditWidget.cpp
@@ -78,6 +78,9 @@ void PasswordEditWidget::initComponentEditWidget(QWidget* widget)
     Q_UNUSED(widget);
     Q_ASSERT(m_compEditWidget);
     m_compUi->enterPasswordEdit->setFocus();
+
+    m_compUi->enterPasswordEdit->setQualityVisible(true);
+    m_compUi->repeatPasswordEdit->setQualityVisible(false);
 }
 
 void PasswordEditWidget::initComponent()
diff --git a/src/gui/databasekey/PasswordEditWidget.ui b/src/gui/databasekey/PasswordEditWidget.ui
index d8382ed94..e3b1679e1 100644
--- a/src/gui/databasekey/PasswordEditWidget.ui
+++ b/src/gui/databasekey/PasswordEditWidget.ui
@@ -31,7 +31,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="PasswordEdit" name="enterPasswordEdit">
+    <widget class="PasswordWidget" name="enterPasswordEdit">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -60,7 +60,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="PasswordEdit" name="repeatPasswordEdit">
+    <widget class="PasswordWidget" name="repeatPasswordEdit">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -85,9 +85,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>PasswordEdit</class>
+   <class>PasswordWidget</class>
    <extends>QLineEdit</extends>
-   <header>gui/PasswordEdit.h</header>
+   <header>gui/PasswordWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index e2a4f426c..3087aeb4a 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -131,6 +131,8 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
     connect(m_iconsWidget, SIGNAL(messageEditEntryDismiss()), SLOT(hideMessage()));
 
     m_editWidgetProperties->setCustomData(m_customData.data());
+
+    m_mainUi->passwordEdit->setQualityVisible(true);
 }
 
 EditEntryWidget::~EditEntryWidget()
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index 555c719fa..6b0f95178 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -243,7 +243,7 @@
      </widget>

     </item>

     <item row="2" column="1">

-     <widget class="PasswordEdit" name="passwordEdit">

+     <widget class="PasswordWidget" name="passwordEdit">

       <property name="accessibleName">

        <string>Password field</string>

       </property>

@@ -297,15 +297,15 @@
  </widget>

  <customwidgets>

   <customwidget>

-   <class>TagsEdit</class>

-   <extends>QWidget</extends>

-   <header>gui/tag/TagsEdit.h</header>

+   <class>PasswordWidget</class>

+   <extends>QLineEdit</extends>

+   <header>gui/PasswordWidget.h</header>

    <container>1</container>

   </customwidget>

   <customwidget>

-   <class>PasswordEdit</class>

-   <extends>QLineEdit</extends>

-   <header>gui/PasswordEdit.h</header>

+   <class>TagsEdit</class>

+   <extends>QWidget</extends>

+   <header>gui/tag/TagsEdit.h</header>

    <container>1</container>

   </customwidget>

   <customwidget>

diff --git a/src/keeshare/group/EditGroupWidgetKeeShare.ui b/src/keeshare/group/EditGroupWidgetKeeShare.ui
index 9b87f963f..4f655ee4d 100644
--- a/src/keeshare/group/EditGroupWidgetKeeShare.ui
+++ b/src/keeshare/group/EditGroupWidgetKeeShare.ui
@@ -51,7 +51,7 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="PasswordEdit" name="passwordEdit">
+      <widget class="PasswordWidget" name="passwordEdit">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -190,9 +190,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>PasswordEdit</class>
+   <class>PasswordWidget</class>
    <extends>QLineEdit</extends>
-   <header>gui/PasswordEdit.h</header>
+   <header>gui/PasswordWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index fc3da4ea9..c00e3a10b 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -40,8 +40,8 @@
 #include "gui/EntryPreviewWidget.h"
 #include "gui/FileDialog.h"
 #include "gui/MessageBox.h"
-#include "gui/PasswordEdit.h"
 #include "gui/PasswordGeneratorWidget.h"
+#include "gui/PasswordWidget.h"
 #include "gui/SearchWidget.h"
 #include "gui/TotpDialog.h"
 #include "gui/TotpSetupDialog.h"
@@ -131,7 +131,9 @@ void TestGui::init()
     m_dbWidget = m_tabWidget->currentDatabaseWidget();
     auto* databaseOpenWidget = m_tabWidget->currentDatabaseWidget()->findChild<QWidget*>("databaseOpenWidget");
     QVERIFY(databaseOpenWidget);
-    auto* editPassword = databaseOpenWidget->findChild<QLineEdit*>("editPassword");
+    // editPassword is not QLineEdit anymore but PasswordWidget
+    auto* editPassword =
+        databaseOpenWidget->findChild<PasswordWidget*>("editPassword")->findChild<QLineEdit*>("passwordEdit");
     QVERIFY(editPassword);
     editPassword->setFocus();
 
@@ -242,8 +244,10 @@ void TestGui::testCreateDatabase()
         // enter password
         auto* passwordWidget = wizard->currentPage()->findChild<PasswordEditWidget*>();
         QCOMPARE(passwordWidget->visiblePage(), KeyFileEditWidget::Page::Edit);
-        auto* passwordEdit = passwordWidget->findChild<QLineEdit*>("enterPasswordEdit");
-        auto* passwordRepeatEdit = passwordWidget->findChild<QLineEdit*>("repeatPasswordEdit");
+        auto* passwordEdit =
+            passwordWidget->findChild<PasswordWidget*>("enterPasswordEdit")->findChild<QLineEdit*>("passwordEdit");
+        auto* passwordRepeatEdit =
+            passwordWidget->findChild<PasswordWidget*>("repeatPasswordEdit")->findChild<QLineEdit*>("passwordEdit");
         QTRY_VERIFY(passwordEdit->isVisible());
         QTRY_VERIFY(passwordEdit->hasFocus());
         QTest::keyClicks(passwordEdit, "test");
@@ -318,7 +322,7 @@ void TestGui::testMergeDatabase()
     fileDialog()->setNextFileName(QString(KEEPASSX_TEST_DATA_DIR).append("/MergeDatabase.kdbx"));
     triggerAction("actionDatabaseMerge");
 
-    QTRY_COMPARE(QApplication::focusWidget()->objectName(), QString("editPassword"));
+    QTRY_COMPARE(QApplication::focusWidget()->objectName(), QString("passwordEdit"));
     auto* editPasswordMerge = QApplication::focusWidget();
     QVERIFY(editPasswordMerge->isVisible());
 
@@ -518,7 +522,7 @@ void TestGui::testEditEntry()
     QCOMPARE(m_dbWidget->currentMode(), DatabaseWidget::Mode::EditMode);
     titleEdit->setText("multiline\ntitle");
     editEntryWidget->findChild<QComboBox*>("usernameComboBox")->lineEdit()->setText("multiline\nusername");
-    editEntryWidget->findChild<QLineEdit*>("passwordEdit")->setText("multiline\npassword");
+    editEntryWidget->findChild<PasswordWidget*>("passwordEdit")->setText("multiline\npassword");
     editEntryWidget->findChild<QLineEdit*>("urlEdit")->setText("multiline\nurl");
     QTest::mouseClick(okButton, Qt::LeftButton);
 
@@ -626,7 +630,8 @@ void TestGui::testAddEntry()
     QTest::mouseClick(usernameComboBox, Qt::LeftButton);
     QTest::keyClicks(usernameComboBox, "Auto");
     QTest::keyPress(usernameComboBox, Qt::Key_Right);
-    auto* passwordEdit = editEntryWidget->findChild<QLineEdit*>("passwordEdit");
+    auto* passwordEdit =
+        editEntryWidget->findChild<PasswordWidget*>("passwordEdit")->findChild<QLineEdit*>("passwordEdit");
     QTest::keyClicks(passwordEdit, "something 2");
     QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton);
 
@@ -742,7 +747,8 @@ void TestGui::testPasswordEntryEntropy()
     QTest::keyClicks(titleEdit, "test");
 
     // Open the password generator
-    auto* passwordEdit = editEntryWidget->findChild<PasswordEdit*>();
+    auto* passwordEdit =
+        editEntryWidget->findChild<PasswordWidget*>("passwordEdit")->findChild<QLineEdit*>("passwordEdit");
     QVERIFY(passwordEdit);
     QTest::mouseClick(passwordEdit, Qt::LeftButton);
 
@@ -752,24 +758,26 @@ void TestGui::testPasswordEntryEntropy()
     QTest::keyClick(passwordEdit, Qt::Key_G, Qt::ControlModifier);
 #endif
 
-    TEST_MODAL(PasswordGeneratorWidget * pwGeneratorWidget;
-               QTRY_VERIFY(pwGeneratorWidget = m_dbWidget->findChild<PasswordGeneratorWidget*>());
+    TEST_MODAL(
+        PasswordGeneratorWidget * pwGeneratorWidget;
+        QTRY_VERIFY(pwGeneratorWidget = m_dbWidget->findChild<PasswordGeneratorWidget*>());
 
-               // Type in some password
-               auto* generatedPassword = pwGeneratorWidget->findChild<QLineEdit*>("editNewPassword");
-               auto* entropyLabel = pwGeneratorWidget->findChild<QLabel*>("entropyLabel");
-               auto* strengthLabel = pwGeneratorWidget->findChild<QLabel*>("strengthLabel");
+        // Type in some password
+        auto* generatedPassword =
+            pwGeneratorWidget->findChild<PasswordWidget*>("editNewPassword")->findChild<QLineEdit*>("passwordEdit");
+        auto* entropyLabel = pwGeneratorWidget->findChild<QLabel*>("entropyLabel");
+        auto* strengthLabel = pwGeneratorWidget->findChild<QLabel*>("strengthLabel");
 
-               QFETCH(QString, password);
-               QFETCH(QString, expectedEntropyLabel);
-               QFETCH(QString, expectedStrengthLabel);
+        QFETCH(QString, password);
+        QFETCH(QString, expectedEntropyLabel);
+        QFETCH(QString, expectedStrengthLabel);
 
-               generatedPassword->setText(password);
-               QCOMPARE(entropyLabel->text(), expectedEntropyLabel);
-               QCOMPARE(strengthLabel->text(), expectedStrengthLabel);
+        generatedPassword->setText(password);
+        QCOMPARE(entropyLabel->text(), expectedEntropyLabel);
+        QCOMPARE(strengthLabel->text(), expectedStrengthLabel);
 
-               QTest::mouseClick(generatedPassword, Qt::LeftButton);
-               QTest::keyClick(generatedPassword, Qt::Key_Escape););
+        QTest::mouseClick(generatedPassword, Qt::LeftButton);
+        QTest::keyClick(generatedPassword, Qt::Key_Escape););
 }
 
 void TestGui::testDicewareEntryEntropy()
@@ -795,7 +803,7 @@ void TestGui::testDicewareEntryEntropy()
     QTest::keyClicks(titleEdit, "test");
 
     // Open the password generator
-    auto* passwordEdit = editEntryWidget->findChild<PasswordEdit*>();
+    auto* passwordEdit = editEntryWidget->findChild<PasswordWidget*>()->findChild<QLineEdit*>("passwordEdit");
     QVERIFY(passwordEdit);
     QTest::mouseClick(passwordEdit, Qt::LeftButton);
 
@@ -805,34 +813,36 @@ void TestGui::testDicewareEntryEntropy()
     QTest::keyClick(passwordEdit, Qt::Key_G, Qt::ControlModifier);
 #endif
 
-    TEST_MODAL(PasswordGeneratorWidget * pwGeneratorWidget;
-               QTRY_VERIFY(pwGeneratorWidget = m_dbWidget->findChild<PasswordGeneratorWidget*>());
+    TEST_MODAL(
+        PasswordGeneratorWidget * pwGeneratorWidget;
+        QTRY_VERIFY(pwGeneratorWidget = m_dbWidget->findChild<PasswordGeneratorWidget*>());
 
-               // Select Diceware
-               auto* generatedPassword = pwGeneratorWidget->findChild<QLineEdit*>("editNewPassword");
-               auto* tabWidget = pwGeneratorWidget->findChild<QTabWidget*>("tabWidget");
-               auto* dicewareWidget = pwGeneratorWidget->findChild<QWidget*>("dicewareWidget");
-               tabWidget->setCurrentWidget(dicewareWidget);
+        // Select Diceware
+        auto* generatedPassword =
+            pwGeneratorWidget->findChild<PasswordWidget*>("editNewPassword")->findChild<QLineEdit*>("passwordEdit");
+        auto* tabWidget = pwGeneratorWidget->findChild<QTabWidget*>("tabWidget");
+        auto* dicewareWidget = pwGeneratorWidget->findChild<QWidget*>("dicewareWidget");
+        tabWidget->setCurrentWidget(dicewareWidget);
 
-               auto* comboBoxWordList = dicewareWidget->findChild<QComboBox*>("comboBoxWordList");
-               comboBoxWordList->setCurrentText("eff_large.wordlist");
-               auto* spinBoxWordCount = dicewareWidget->findChild<QSpinBox*>("spinBoxWordCount");
-               spinBoxWordCount->setValue(6);
+        auto* comboBoxWordList = dicewareWidget->findChild<QComboBox*>("comboBoxWordList");
+        comboBoxWordList->setCurrentText("eff_large.wordlist");
+        auto* spinBoxWordCount = dicewareWidget->findChild<QSpinBox*>("spinBoxWordCount");
+        spinBoxWordCount->setValue(6);
 
-               // Confirm a password was generated
-               QVERIFY(!pwGeneratorWidget->getGeneratedPassword().isEmpty());
+        // Confirm a password was generated
+        QVERIFY(!pwGeneratorWidget->getGeneratedPassword().isEmpty());
 
-               // Verify entropy and strength
-               auto* entropyLabel = pwGeneratorWidget->findChild<QLabel*>("entropyLabel");
-               auto* strengthLabel = pwGeneratorWidget->findChild<QLabel*>("strengthLabel");
-               auto* wordLengthLabel = pwGeneratorWidget->findChild<QLabel*>("charactersInPassphraseLabel");
+        // Verify entropy and strength
+        auto* entropyLabel = pwGeneratorWidget->findChild<QLabel*>("entropyLabel");
+        auto* strengthLabel = pwGeneratorWidget->findChild<QLabel*>("strengthLabel");
+        auto* wordLengthLabel = pwGeneratorWidget->findChild<QLabel*>("charactersInPassphraseLabel");
 
-               QTRY_COMPARE_WITH_TIMEOUT(entropyLabel->text(), QString("Entropy: 77.55 bit"), 200);
-               QCOMPARE(strengthLabel->text(), QString("Password Quality: Good"));
-               QCOMPARE(wordLengthLabel->text().toInt(), pwGeneratorWidget->getGeneratedPassword().size());
+        QTRY_COMPARE_WITH_TIMEOUT(entropyLabel->text(), QString("Entropy: 77.55 bit"), 200);
+        QCOMPARE(strengthLabel->text(), QString("Password Quality: Good"));
+        QCOMPARE(wordLengthLabel->text().toInt(), pwGeneratorWidget->getGeneratedPassword().size());
 
-               QTest::mouseClick(generatedPassword, Qt::LeftButton);
-               QTest::keyClick(generatedPassword, Qt::Key_Escape););
+        QTest::mouseClick(generatedPassword, Qt::LeftButton);
+        QTest::keyClick(generatedPassword, Qt::Key_Escape););
 }
 
 void TestGui::testTotp()
@@ -1431,7 +1441,8 @@ void TestGui::testKeePass1Import()
     triggerAction("actionImportKeePass1");
 
     auto* keepass1OpenWidget = m_tabWidget->currentDatabaseWidget()->findChild<QWidget*>("keepass1OpenWidget");
-    auto* editPassword = keepass1OpenWidget->findChild<QLineEdit*>("editPassword");
+    auto* editPassword =
+        keepass1OpenWidget->findChild<PasswordWidget*>("editPassword")->findChild<QLineEdit*>("passwordEdit");
     QVERIFY(editPassword);
 
     QTest::keyClicks(editPassword, "masterpw");
@@ -1463,7 +1474,8 @@ void TestGui::testDatabaseLocking()
     DatabaseWidget* dbWidget = m_tabWidget->currentDatabaseWidget();
     QVERIFY(dbWidget->isLocked());
     auto* unlockDatabaseWidget = dbWidget->findChild<QWidget*>("databaseOpenWidget");
-    QWidget* editPassword = unlockDatabaseWidget->findChild<QLineEdit*>("editPassword");
+    QWidget* editPassword =
+        unlockDatabaseWidget->findChild<PasswordWidget*>("editPassword")->findChild<QLineEdit*>("passwordEdit");
     QVERIFY(editPassword);
 
     QTest::keyClicks(editPassword, "a");
@@ -1798,7 +1810,8 @@ void TestGui::addCannedEntries()
     QWidget* entryNewWidget = toolBar->widgetForAction(m_mainWindow->findChild<QAction*>("actionEntryNew"));
     auto* editEntryWidget = m_dbWidget->findChild<EditEntryWidget*>("editEntryWidget");
     auto* titleEdit = editEntryWidget->findChild<QLineEdit*>("titleEdit");
-    auto* passwordEdit = editEntryWidget->findChild<QLineEdit*>("passwordEdit");
+    auto* passwordEdit =
+        editEntryWidget->findChild<PasswordWidget*>("passwordEdit")->findChild<QLineEdit*>("passwordEdit");
 
     // Add entry "test" and confirm added
     QTest::mouseClick(entryNewWidget, Qt::LeftButton);
diff --git a/tests/gui/TestGuiBrowser.cpp b/tests/gui/TestGuiBrowser.cpp
index bcc218240..075d49dc9 100644
--- a/tests/gui/TestGuiBrowser.cpp
+++ b/tests/gui/TestGuiBrowser.cpp
@@ -35,6 +35,7 @@
 #include "gui/DatabaseTabWidget.h"
 #include "gui/FileDialog.h"
 #include "gui/MessageBox.h"
+#include "gui/PasswordWidget.h"
 #include "gui/entry/EditEntryWidget.h"
 #include "gui/entry/EntryView.h"
 
@@ -90,7 +91,8 @@ void TestGuiBrowser::init()
 
     auto* databaseOpenWidget = m_tabWidget->currentDatabaseWidget()->findChild<QWidget*>("databaseOpenWidget");
     QVERIFY(databaseOpenWidget);
-    auto* editPassword = databaseOpenWidget->findChild<QLineEdit*>("editPassword");
+    auto* editPassword =
+        databaseOpenWidget->findChild<PasswordWidget*>("editPassword")->findChild<QLineEdit*>("passwordEdit");
     QVERIFY(editPassword);
     editPassword->setFocus();
 
diff --git a/tests/gui/TestGuiFdoSecrets.cpp b/tests/gui/TestGuiFdoSecrets.cpp
index 9bc3e6121..ec9a16b5c 100644
--- a/tests/gui/TestGuiFdoSecrets.cpp
+++ b/tests/gui/TestGuiFdoSecrets.cpp
@@ -33,6 +33,7 @@
 #include "gui/FileDialog.h"
 #include "gui/MainWindow.h"
 #include "gui/MessageBox.h"
+#include "gui/PasswordWidget.h"
 #include "gui/wizard/NewDatabaseWizard.h"
 #include "util/FdoSecretsProxy.h"
 #include "util/TemporaryFile.h"
@@ -1768,8 +1769,10 @@ bool TestGuiFdoSecrets::driveNewDatabaseWizard()
             COMPARE(wizard->currentId(), 2);
 
             // enter password
-            auto* passwordEdit = wizard->findChild<QLineEdit*>("enterPasswordEdit");
-            auto* passwordRepeatEdit = wizard->findChild<QLineEdit*>("repeatPasswordEdit");
+            auto* passwordEdit =
+                wizard->findChild<PasswordWidget*>("enterPasswordEdit")->findChild<QLineEdit*>("passwordEdit");
+            auto* passwordRepeatEdit =
+                wizard->findChild<PasswordWidget*>("repeatPasswordEdit")->findChild<QLineEdit*>("passwordEdit");
             VERIFY(passwordEdit);
             VERIFY(passwordRepeatEdit);
             QTest::keyClicks(passwordEdit, "test");
@@ -1797,7 +1800,7 @@ bool TestGuiFdoSecrets::driveUnlockDialog()
     processEvents();
     auto dbOpenDlg = m_tabWidget->findChild<DatabaseOpenDialog*>();
     VERIFY(dbOpenDlg);
-    auto editPassword = dbOpenDlg->findChild<QLineEdit*>("editPassword");
+    auto editPassword = dbOpenDlg->findChild<PasswordWidget*>("editPassword")->findChild<QLineEdit*>("passwordEdit");
     VERIFY(editPassword);
     editPassword->setFocus();
     QTest::keyClicks(editPassword, "a");