Merge pull request #18 from QuasarApp/histury_ui_fixes

Ssome gui fixes:

NotifyModule/NotificationHistoryView.qml

@@ -1,27 +1,20 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Controls.Material 2.15
+import QtQuick.Layouts 1.3
 
-Popup {
+Dialog {
     id: root
 
     readonly property var historyModel: notificationService.history
 
-    ToolBar {
+    header: ToolBar {
         id: toolbar
-        width: parent.width
-        height: parent.height * 0.1
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-        }
 
         ToolButton {
             id: clearAllButton
-            text: qsTr("Clear All")
+            text: qsTr("clear")
             height: parent.height
-            font.pointSize: 10
             anchors {
                 left: parent.left
                 verticalCenter: parent.verticalCenter
@@ -33,53 +26,25 @@ Popup {
         Label {
             id: toolbarTitle
             text: qsTr("Notification history")
-            font.pointSize: 12
             anchors {
                 horizontalCenter: parent.horizontalCenter
                 verticalCenter: parent.verticalCenter
             }
         }
-
-        ToolButton {
-            id: closePopupButton
-            text: "X"
-            font.pointSize: 12
-            anchors {
-                right: parent.right
-                verticalCenter: parent.verticalCenter
     }
 
-            onClicked: root.close()
+    contentItem: ListView {
-        }
-    }
-
-    ListView {
         id: notificationLV
-        width: parent.width
-        height: parent.height * 0.9
         clip: true
-        spacing: 5
+        spacing: 10
         model: historyModel
-        anchors {
-            top: toolbar.bottom
-            horizontalCenter: parent.horizontalCenter
-        }
 
-        ScrollBar.vertical: ScrollBar {
+        ScrollBar.vertical: ScrollBar {}
-            hoverEnabled: true
-            active: hovered || pressed
-            anchors {
-                top: notificationLV.top
-                right: notificationLV.right
-                bottom: notificationLV.bottom
-            }
-        }
 
         delegate: SwipeDelegate {
             id: swipeDelegate
             text: model.notificationValue
             width: notificationLV.width
-            height: notificationLV.height * 0.15
 
             ListView.onRemove: SequentialAnimation {
 
@@ -91,9 +56,9 @@ Popup {
 
                 NumberAnimation {
                     target: swipeDelegate
-                    property: "height"
+                    property: "x"
-                    to: 0
+                    to: -swipeDelegate.width
-                    duration: 20
+                    duration: 200
                     easing.type: Easing.InOutQuad
                 }
 
@@ -104,43 +69,33 @@ Popup {
                 }
             }
 
-            contentItem: Row {
+            contentItem: RowLayout {
-                width: parent.width
-                spacing: width * 0.2
 
                 Image {
-                    id: notificationIcon
+                    id: image
-                    width: notificationIcon.sourceSize.width * 0.2
+                    Layout.preferredWidth:  toolbar.height;
-                    height: notificationIcon.sourceSize.height * 0.2
+                    Layout.preferredHeight: toolbar.height;
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+
+                    fillMode: Image.PreserveAspectCrop
+                    clip: true
                     source: model.icon
-                    fillMode: Image.PreserveAspectFit
-                    anchors {
-                        verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                Column {
-                    id: column
-                    width: parent.width - notificationIcon.width - parent.spacing
-                    anchors {
-                        verticalCenter: parent.verticalCenter
                 }
 
+                ColumnLayout {
                     Label {
                         id: notificationTitle
-                        width: parent.width
+                        text: model.title
-                        text: qsTr(model.title)
-                        font.pointSize: 12
                         elide: Label.ElideRight
                     }
 
                     Label {
                         id: notificationText
-                        width: parent.width
+                        text: model.text
-                        text: qsTr(model.text)
-                        font.pointSize: 12
                         elide:  Label.ElideRight
                         linkColor: Material.accent
+                        wrapMode: Text.WordWrap
+                        Layout.fillWidth: true
                     }
                 }
             }

NotifyModule/NotificationServiceView.qml

@@ -76,8 +76,9 @@ Item {
 
     NotificationHistoryView {
         id: history
-        width: parent.width * 0.8
+        width: Math.min(Math.max(Math.min(parent.width * 0.6, 1024 ), 320), parent.width)
-        height: parent.height * 0.5
+        height: Math.min(Math.max(Math.min(parent.height * 0.6, 720), 240), parent.height)
+
         anchors.centerIn: parent
     }
 

qmlNotify_languages/de.ts

@@ -8,4 +8,19 @@
         <translation>Botschaft</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/en.ts

@@ -8,4 +8,19 @@
         <translation>Message</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/es.ts

@@ -8,4 +8,19 @@
         <translation>Mensaje</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/fr.ts

@@ -8,4 +8,19 @@
         <translation>Un message</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/ja.ts

@@ -8,4 +8,19 @@
         <translation>メッセージ</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/pl.ts

@@ -8,4 +8,19 @@
         <translation>Wiadomość</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/ru.ts

@@ -8,4 +8,19 @@
         <translation>Cообщение</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/tr.ts

@@ -8,4 +8,19 @@
         <translation>İleti</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/uk.ts

@@ -8,4 +8,19 @@
         <translation>Повідомлення</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

qmlNotify_languages/zh.ts

@@ -8,4 +8,19 @@
         <translation>信息</translation>
     </message>
 </context>
+<context>
+    <name>NotificationHistoryView</name>
+    <message>
+        <source>Notification history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>