src/CMakeLists.txt

@@ -13,7 +13,6 @@ qt_add_qml_module(${PROJECT_NAME}
         mnemonicattached.cpp mnemonicattached.h
     QML_FILES
         ErrorNotification.qml
-        Expander.qml
         LoginPage.qml
         Main.qml
         MnemonicAction.qml

src/ErrorNotification.qml

@@ -67,7 +67,6 @@ Control {
             text: qsTr("Close")
 
             onClicked: function () {
-                hideTimer.stop();
                 control.visible = false;
             }
         }

src/Expander.qml

@@ -1,93 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Shapes
-
-Control {
-    id: control
-
-    default property alias contentData: pane.contentData
-    property alias expanded: pane.visible
-    property string title
-
-    clip: true
-    implicitHeight: triangle.implicitHeight + (expanded ? pane.implicitHeight : 0)
-    implicitWidth: Math.max(triangle.implicitWidth, pane.implicitWidth)
-
-    Behavior on implicitHeight {
-        NumberAnimation {
-            duration: 200
-        }
-    }
-
-    ToolButton {
-        id: triangle
-
-        Mnemonic.label: control.title
-        anchors.left: parent.left
-        anchors.top: parent.top
-        text: Mnemonic.richTextLabel
-
-        contentItem: Row {
-            spacing: 4
-
-            Shape {
-                anchors.verticalCenter: parent.verticalCenter
-                height: 8
-                rotation: control.expanded ? 90 : 0
-                width: 8
-
-                Behavior on rotation {
-                    NumberAnimation {
-                        duration: 200
-                    }
-                }
-
-                ShapePath {
-                    fillColor: "transparent"
-                    startX: 2
-                    startY: 0
-                    strokeColor: triangle.palette.buttonText
-                    strokeWidth: 1
-
-                    PathLine {
-                        x: 6
-                        y: 4
-                    }
-
-                    PathLine {
-                        x: 2
-                        y: 8
-                    }
-                }
-            }
-
-            Label {
-                anchors.verticalCenter: parent.verticalCenter
-                color: triangle.palette.buttonText
-                font: triangle.font
-                text: triangle.text
-            }
-        }
-
-        onClicked: function () {
-            control.expanded = !control.expanded;
-        }
-
-        Shortcut {
-            sequence: triangle.Mnemonic.sequence
-
-            onActivated: function () {
-                triangle.click();
-            }
-        }
-    }
-
-    Pane {
-        id: pane
-
-        anchors.left: parent.left
-        anchors.top: triangle.bottom
-        padding: 0
-        visible: false
-    }
-}

src/LoginPage.qml

@@ -9,111 +9,29 @@ Page {
     title: qsTr("Login")
 
     ColumnLayout {
-        anchors.centerIn: parent
+        MnemonicLabel {
-
+            buddy: user
-        GridLayout {
+            mnemonic: qsTr("&User:")
-            columns: 2
-
-            MnemonicLabel {
-                Layout.alignment: Qt.AlignRight
-                buddy: user
-                mnemonic: qsTr("&User:")
-            }
-
-            TextField {
-                id: user
-
-                Layout.fillWidth: true
-                focus: true
-
-                onAccepted: loginAction.trigger()
-            }
-
-            MnemonicLabel {
-                Layout.alignment: Qt.AlignRight
-                buddy: password
-                mnemonic: qsTr("&Password:")
-            }
-
-            TextField {
-                id: password
-
-                Layout.fillWidth: true
-                echoMode: TextInput.Password
-
-                onAccepted: loginAction.trigger()
-            }
         }
 
-        Expander {
+        TextField {
-            Layout.fillWidth: true
+            id: user
-            Layout.topMargin: 8
-            title: qsTr("&Advanced options")
 
-            GridLayout {
+            focus: true
-                columns: 2
+        }
 
-                MnemonicLabel {
+        MnemonicLabel {
-                    Layout.alignment: Qt.AlignRight
+            buddy: password
-                    buddy: hostName
+            mnemonic: qsTr("&Password:")
-                    mnemonic: qsTr("&Host name:")
+        }
-                }
 
-                TextField {
+        TextField {
-                    id: hostName
+            id: password
 
-                    Layout.fillWidth: true
+            echoMode: TextInput.Password
-
-                    onAccepted: loginAction.trigger()
-                }
-
-                MnemonicLabel {
-                    Layout.alignment: Qt.AlignRight
-                    buddy: port
-                    mnemonic: qsTr("Por&t:")
-                }
-
-                SpinBox {
-                    id: port
-
-                    Layout.fillWidth: true
-                    editable: true
-                    from: 1
-                    to: 65535
-                }
-
-                MnemonicLabel {
-                    Layout.alignment: Qt.AlignRight
-                    buddy: databaseName
-                    mnemonic: qsTr("&Database name:")
-                }
-
-                TextField {
-                    id: databaseName
-
-                    Layout.fillWidth: true
-
-                    onAccepted: loginAction.trigger()
-                }
-
-                MnemonicLabel {
-                    Layout.alignment: Qt.AlignRight
-                    buddy: connectOptions
-                    mnemonic: qsTr("&Options:")
-                }
-
-                TextField {
-                    id: connectOptions
-
-                    Layout.fillWidth: true
-
-                    onAccepted: loginAction.trigger()
-                }
-            }
         }
 
         Button {
-            Layout.alignment: Qt.AlignRight
             action: loginAction
         }
     }