src/CMakeLists.txt

@@ -5,18 +5,13 @@ qt_add_executable(${PROJECT_NAME}
 qt_add_qml_module(${PROJECT_NAME}
     URI Camper
     VERSION 1.0
-    DEPENDENCIES
+    DEPENDENCIES QtCore
-        QtCore
-        QtQuick
     SOURCES
         database.cpp database.h
-        mnemonicattached.cpp mnemonicattached.h
     QML_FILES
         ErrorNotification.qml
         LoginPage.qml
         Main.qml
-        MnemonicAction.qml
-        MnemonicLabel.qml
         ReservationsPage.qml
         SelectableLabel.qml
 )

src/LoginPage.qml

@@ -9,26 +9,36 @@ Page {
     title: qsTr("Login")
 
     ColumnLayout {
-        MnemonicLabel {
+        Label {
-            buddy: user
+            text: qsTr("&User:")
-            mnemonic: qsTr("&User:")
         }
 
         TextField {
             id: user
 
             focus: true
+
+            validator: RegularExpressionValidator {
+                regularExpression: /[^s].*/
             }
 
-        MnemonicLabel {
+            onAccepted: function () {
-            buddy: password
+                loginAction.trigger();
-            mnemonic: qsTr("&Password:")
+            }
+        }
+
+        Label {
+            text: qsTr("&Password:")
         }
 
         TextField {
             id: password
 
             echoMode: TextInput.Password
+
+            onAccepted: function () {
+                loginAction.trigger();
+            }
         }
 
         Button {
@@ -36,10 +46,11 @@ Page {
         }
     }
 
-    MnemonicAction {
+    Action {
         id: loginAction
 
-        mnemonic: qsTr("Log &in")
+        enabled: user.acceptableInput
+        text: "&Login"
 
         onTriggered: function () {
             Database.open(user.text, password.text);

src/MnemonicAction.qml

@@ -1,12 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-Action {
-    id: control
-
-    required property string mnemonic
-
-    Mnemonic.label: mnemonic
-    shortcut: Mnemonic.sequence
-    text: Mnemonic.richTextLabel
-}

src/MnemonicLabel.qml

@@ -1,21 +0,0 @@
-pragma ComponentBehavior: Bound
-import QtQuick
-import QtQuick.Controls
-
-Label {
-    id: control
-
-    required property Item buddy
-    required property string mnemonic
-
-    Mnemonic.label: control.mnemonic
-    text: Mnemonic.richTextLabel
-
-    Shortcut {
-        sequence: control.Mnemonic.sequence
-
-        onActivated: function () {
-            control.buddy.forceActiveFocus();
-        }
-    }
-}

src/ReservationsPage.qml

@@ -10,19 +10,13 @@ Page {
             anchors.fill: parent
 
             ToolButton {
-                action: logoutAction
-            }
-        }
-    }
-
-    MnemonicAction {
-        id: logoutAction
-
                 icon.name: "system-log-out"
-        mnemonic: qsTr("Log &out")
+                text: qsTr("&Log out")
 
-        onTriggered: function () {
+                onClicked: function () {
                     Database.close();
                 }
             }
+        }
+    }
 }

src/database.cpp

@@ -6,6 +6,7 @@
 Database::Database(QObject *parent)
     : QObject{parent}
     , m_pool{}
+    , m_connectionName{"main"}
 {
     m_pool.setMaxThreadCount(1);
     m_pool.setExpiryTimeout(-1);
@@ -14,36 +15,28 @@ Database::Database(QObject *parent)
 QFuture<void> Database::open(const QString &user, const QString &password)
 {
     return QtConcurrent::run(&m_pool, [this, user, password]() {
-        QString errorMessage;
+        QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL", m_connectionName);
-        QString connectionName;
-        {
-            QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL");
         db.setConnectOptions("service=camper; options=-csearch_path=camper,public");
         if (db.open(user, password)) {
             emit opened();
-                return;
+        } else {
-            }
+            const QString errorMessage(db.lastError().text());
-            errorMessage = db.lastError().text();
+            db = QSqlDatabase(); // Otherwise removeDatabase complains is still being used.
-            connectionName = db.connectionName();
+            QSqlDatabase::removeDatabase(m_connectionName);
-        }
-        QSqlDatabase::removeDatabase(connectionName);
             emit errorOcurred(errorMessage);
+        }
     });
 }
 
 QFuture<void> Database::close()
 {
     return QtConcurrent::run(&m_pool, [this]() {
-        QString connectionName;
+        QSqlDatabase db = QSqlDatabase::database(m_connectionName);
-        {
-            QSqlDatabase db = QSqlDatabase::database();
         if (!db.isValid()) {
             return;
         }
-            connectionName = db.connectionName();
         db.close();
-        }
+        QSqlDatabase::removeDatabase(m_connectionName);
-        QSqlDatabase::removeDatabase(connectionName);
         emit closed();
     });
 }

src/database.h

@@ -25,6 +25,7 @@ signals:
 
 private:
     QThreadPool m_pool;
+    QString m_connectionName;
 };
 
 #endif // DATABASE_H

src/mnemonicattached.cpp

@@ -1,147 +0,0 @@
-#include "mnemonicattached.h"
-#include <QEvent>
-#include <QGuiApplication>
-#include <QKeyEvent>
-
-using namespace Qt::Literals::StringLiterals;
-
-class MnemonicEventFilter : public QObject
-{
-    Q_OBJECT
-
-public:
-    static MnemonicEventFilter &instance()
-    {
-        static MnemonicEventFilter s_instance;
-        return s_instance;
-    }
-
-    bool isAltPressed() const { return m_altPressed; }
-
-    bool eventFilter(QObject *watched, QEvent *event) override
-    {
-        Q_UNUSED(watched);
-
-        if (event->type() == QEvent::KeyPress) {
-            QKeyEvent *ke = static_cast<QKeyEvent *>(event);
-            if (ke->key() == Qt::Key_Alt) {
-                m_altPressed = true;
-                emit altPressed();
-            }
-        } else if (event->type() == QEvent::KeyRelease) {
-            QKeyEvent *ke = static_cast<QKeyEvent *>(event);
-            if (ke->key() == Qt::Key_Alt) {
-                m_altPressed = false;
-                emit altReleased();
-            }
-        } else if (event->type() == QEvent::ApplicationStateChange) {
-            if (m_altPressed) {
-                m_altPressed = false;
-                emit altReleased();
-            }
-        }
-
-        return false;
-    }
-
-Q_SIGNALS:
-    void altPressed();
-    void altReleased();
-
-private:
-    MnemonicEventFilter()
-        : QObject(nullptr)
-    {
-        qGuiApp->installEventFilter(this);
-    }
-
-    bool m_altPressed = false;
-};
-
-MnemonicAttached::MnemonicAttached(QObject *parent)
-    : QObject{parent}
-    , m_label{}
-    , m_richTextLabel{}
-    , m_active{MnemonicEventFilter::instance().isAltPressed()}
-{
-    connect(&MnemonicEventFilter::instance(),
-            &MnemonicEventFilter::altPressed,
-            this,
-            &MnemonicAttached::onAltPressed);
-    connect(&MnemonicEventFilter::instance(),
-            &MnemonicEventFilter::altReleased,
-            this,
-            &MnemonicAttached::onAltReleased);
-}
-
-MnemonicAttached *MnemonicAttached::qmlAttachedProperties(QObject *object)
-{
-    return new MnemonicAttached(object);
-}
-
-QString MnemonicAttached::label() const
-{
-    return m_label;
-}
-
-void MnemonicAttached::setLabel(const QString &label)
-{
-    if (m_label == label) {
-        return;
-    }
-    m_label = label;
-    emit labelChanged();
-    emit sequenceChanged();
-
-    updateRichText();
-}
-
-QString MnemonicAttached::richTextLabel() const
-{
-    return m_richTextLabel;
-}
-
-QKeySequence MnemonicAttached::sequence() const
-{
-    return QKeySequence::mnemonic(m_label);
-}
-
-void MnemonicAttached::onAltPressed()
-{
-    if (m_active) {
-        return;
-    }
-    m_active = true;
-    updateRichText();
-}
-
-void MnemonicAttached::onAltReleased()
-{
-    if (!m_active) {
-        return;
-    }
-    m_active = false;
-    updateRichText();
-}
-
-void MnemonicAttached::updateRichText()
-{
-    QString richTextLabel;
-    qsizetype pos = m_label.indexOf('&'_L1);
-    if (pos < 0 || pos + 1 == m_label.length()) {
-        richTextLabel = m_label;
-    } else if (m_active) {
-        richTextLabel = m_label.left(pos) + "<u>"_L1 + m_label.at(pos + 1) + "</u>"
-                        + m_label.mid(pos + 2);
-    } else {
-        richTextLabel = m_label.left(pos) + m_label.mid(pos + 1);
-    }
-    if (m_richTextLabel == richTextLabel) {
-        return;
-    }
-    m_richTextLabel = richTextLabel;
-    emit richTextLabelChanged();
-}
-
-#include "mnemonicattached.moc"
-#include "moc_mnemonicattached.cpp"

src/mnemonicattached.h

@@ -1,50 +0,0 @@
-#ifndef MNEMONICATTACHED_H
-#define MNEMONICATTACHED_H
-
-#include <QKeySequence>
-#include <QObject>
-#include <QString>
-#include <QtQmlIntegration>
-
-class MnemonicAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged FINAL)
-    Q_PROPERTY(QString richTextLabel READ richTextLabel NOTIFY richTextLabelChanged FINAL)
-    Q_PROPERTY(QKeySequence sequence READ sequence NOTIFY sequenceChanged FINAL)
-
-    QML_NAMED_ELEMENT(Mnemonic)
-    QML_UNCREATABLE("Mnemonic is only available via attached properties")
-    QML_ATTACHED(MnemonicAttached)
-public:
-    explicit MnemonicAttached(QObject *parent = nullptr);
-
-    static MnemonicAttached *qmlAttachedProperties(QObject *object);
-
-    QString label() const;
-    void setLabel(const QString &label);
-
-    QString richTextLabel() const;
-
-    QKeySequence sequence() const;
-
-signals:
-    void enabledChanged();
-    void labelChanged();
-    void richTextLabelChanged();
-    void sequenceChanged();
-
-private slots:
-    void onAltPressed();
-    void onAltReleased();
-
-private:
-    void updateRichText();
-
-    QString m_label;
-    QString m_richTextLabel;
-    bool m_active;
-};
-
-#endif // MNEMONICATTACHED_H