refactor(capslockindicator): expose as a QAction to simplify API

src/widget/capslockindicator.cpp

@@ -4,9 +4,8 @@
 #endif
 #include <QCoreApplication>
 
-CapsLockIndicator::CapsLockIndicator(QLineEdit *parent) :
-    QAction(parent),
-    parent(parent)
+CapsLockIndicator::CapsLockIndicator(QObject* parent) :
+    QAction(parent)
 {
     setIcon(QIcon(":img/caps_lock.svg"));
     setToolTip(tr("CAPS-LOCK ENABLED"));
@@ -14,6 +13,11 @@ CapsLockIndicator::CapsLockIndicator(QLineEdit *parent) :
     QCoreApplication::instance()->installEventFilter(this);
 }
 
+CapsLockIndicator::~CapsLockIndicator()
+{
+    QCoreApplication::instance()->removeEventFilter(this);
+}
+
 void CapsLockIndicator::updateIndicator()
 {
     bool caps = false;
@@ -22,10 +26,7 @@ void CapsLockIndicator::updateIndicator()
     caps = Platform::capsLockEnabled();
 #endif
 
-    if (caps)
-        parent->addAction(this, QLineEdit::TrailingPosition);
-    else
-        parent->removeAction(this);
+    setVisible(caps);
 }
 
 bool CapsLockIndicator::eventFilter(QObject *obj, QEvent *event)

src/widget/capslockindicator.h

@@ -4,18 +4,16 @@
 #include <QAction>
 #include <QLineEdit>
 
-class CapsLockIndicator : QAction
+class CapsLockIndicator : public QAction
 {
 public:
-    CapsLockIndicator(QLineEdit *widget);
+    CapsLockIndicator(QObject *parent);
+    ~CapsLockIndicator();
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
 
 private:
     void updateIndicator();
-
-private:
-    QLineEdit *parent;
 };
 #endif // CAPSLOCKINDICATOR_H

src/widget/loginscreen.cpp

@@ -58,8 +58,8 @@ LoginScreen::LoginScreen(QWidget *parent) :
     connect(ui->autoLoginCB, &QCheckBox::stateChanged, this, &LoginScreen::onAutoLoginToggled);
     connect(ui->importButton,  &QPushButton::clicked, this, &LoginScreen::onImportProfile);
 
-    capsIndicator = new CapsLockIndicator(ui->newPass);
-    confimCapsIndicator = new CapsLockIndicator(ui->newPassConfirm);
+    ui->newPass->addAction(new CapsLockIndicator(this), QLineEdit::TrailingPosition);
+    ui->newPassConfirm->addAction(new CapsLockIndicator(this), QLineEdit::TrailingPosition);
 
     reset();
     this->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css"));
@@ -72,8 +72,6 @@ LoginScreen::~LoginScreen()
 {
     Translator::unregister(this);
     delete ui;
-    delete capsIndicator;
-    delete confimCapsIndicator;
 }
 
 void LoginScreen::reset()

src/widget/loginscreen.h

@@ -67,8 +67,6 @@ private:
 private:
     Ui::LoginScreen *ui;
     QShortcut quitShortcut;
-    CapsLockIndicator *capsIndicator;
-    CapsLockIndicator *confimCapsIndicator;
 };
 
 #endif // LOGINSCREEN_H