LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryBrowser.qml

@@ -18,7 +18,6 @@
 
 import QtQuick.Controls 2.12
 import QtQuick 2.12 
-import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 import "../js/utils.js" as Utils
 
 
@@ -33,9 +32,11 @@ import "../js/utils.js" as Utils
     
     \sa LogarithmPlotter, Settings, ObjectLists
 */
-Item {
+ScrollView {
     id: historyBrowser
     
+    ScrollBar.horizontal.visible: false
+    
     /*!
        \qmlproperty int HistoryBrowser::actionWidth
        Width of the actions.
@@ -48,108 +49,89 @@ Item {
     */
     property bool darkTheme: isDarkTheme()
     
-    Setting.TextSetting {
+    Flickable {
-        id: filterInput
+        width: parent.width
-        anchors.left: parent.left
+        height: parent.height
-        anchors.right: parent.right
+        contentHeight: redoColumn.height + nowRect.height + undoColumn.height
-        anchors.top: parent.top
+        contentWidth: parent.width
-        placeholderText: "Filter..."
-    }
-    
-    ScrollView {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.top: filterInput.bottom
-    
-        ScrollBar.horizontal.visible: false
         
-        Flickable {
+        Column {
-            width: parent.width
+            id: redoColumn
-            height: parent.height
+            anchors.right: parent.right
-            contentHeight: redoColumn.height + nowRect.height + undoColumn.height
+            anchors.top: parent.top
-            contentWidth: parent.width
+            width: actionWidth
             
-            Column {
+            Repeater {
-                id: redoColumn
+                model: history.redoCount
-                anchors.right: parent.right
+            
-                anchors.top: parent.top
+                HistoryItem {
-                width: actionWidth
+                    id: redoButton
-                
+                    width: actionWidth
-                Repeater {
+                    //height: actionHeight
-                    model: history.redoCount
+                    isRedo: true
-                
+                    idx: index
-                    HistoryItem {
+                    darkTheme: historyBrowser.darkTheme
-                        id: redoButton
-                        width: actionWidth
-                        //height: actionHeight
-                        isRedo: true
-                        idx: index
-                        darkTheme: historyBrowser.darkTheme
-                        hidden: !(filterInput.value == "" || content.includes(filterInput.value))
-                    }
                 }
             }
-            
+        }
+        
+        Text {
+            anchors.left: parent.left
+            anchors.bottom: nowRect.top
+            text: qsTr("Redo >")
+            color: sysPaletteIn.windowText
+            transform: Rotation { origin.x: 30; origin.y: 30; angle: 270}
+            height: 70
+            width: 20
+            visible: history.redoCount > 0
+        }
+        
+        Rectangle {
+            id: nowRect
+            anchors.right: parent.right
+            anchors.top: redoColumn.bottom
+            width: actionWidth
+            height: 40
+            color: sysPalette.highlight
             Text {
+                anchors.verticalCenter: parent.verticalCenter
                 anchors.left: parent.left
-                anchors.bottom: nowRect.top
+                anchors.leftMargin: 5
-                text: qsTr("Redo >")
+                text: qsTr("> Now")
-                color: sysPaletteIn.windowText
+                color: sysPalette.windowText
-                transform: Rotation { origin.x: 30; origin.y: 30; angle: 270}
-                height: 70
-                width: 20
-                visible: history.redoCount > 0
             }
+        }
+        
+        Column {
+            id: undoColumn
+            anchors.right: parent.right
+            anchors.top: nowRect.bottom
+            width: actionWidth
             
-            Rectangle {
+            Repeater {
-                id: nowRect
+                model: history.undoCount
-                anchors.right: parent.right
+            
-                anchors.top: redoColumn.bottom
+                
-                width: actionWidth
+                HistoryItem {
-                height: 40
+                    id: undoButton
-                color: sysPalette.highlight
+                    width: actionWidth
-                Text {
+                    //height: actionHeight
-                    anchors.verticalCenter: parent.verticalCenter
+                    isRedo: false
-                    anchors.left: parent.left
+                    idx: index
-                    anchors.leftMargin: 5
+                    darkTheme: historyBrowser.darkTheme
-                    text: qsTr("> Now")
-                    color: sysPalette.windowText
                 }
             }
-            
+        }
-            Column {
+        
-                id: undoColumn
+        Text {
-                anchors.right: parent.right
+            anchors.left: parent.left
-                anchors.top: nowRect.bottom
+            anchors.top: undoColumn.top
-                width: actionWidth
+            text: qsTr("< Undo")
-                
+            color: sysPaletteIn.windowText
-                Repeater {
+            transform: Rotation { origin.x: 30; origin.y: 30; angle: 270}
-                    model: history.undoCount
+            height: 60
-                
+            width: 20
-                    
+            visible: history.undoCount > 0
-                    HistoryItem {
-                        id: undoButton
-                        width: actionWidth
-                        //height: actionHeight
-                        isRedo: false
-                        idx: index
-                        darkTheme: historyBrowser.darkTheme
-                        hidden: !(filterInput.value == "" || content.includes(filterInput.value))
-                    }
-                }
-            }
-            
-            Text {
-                anchors.left: parent.left
-                anchors.top: undoColumn.top
-                text: qsTr("< Undo")
-                color: sysPaletteIn.windowText
-                transform: Rotation { origin.x: 30; origin.y: 30; angle: 270}
-                height: 60
-                width: 20
-                visible: history.undoCount > 0
-            }
         }
     }
     

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml

@@ -49,15 +49,10 @@ Button {
     */
     property int idx
     /*!
-       \qmlproperty bool HistoryItem::darkTheme
+       \qmlproperty int HistoryItem::idx
        true when the system is running with a dark theme, false otherwise.
     */
     property bool darkTheme
-    /*!
-       \qmlproperty bool HistoryItem::hidden
-       true when the item is filtered out, false otherwise.
-    */
-    property bool hidden: false
     /*!
        \qmlproperty int HistoryItem::historyAction
        Associated history action.
@@ -74,18 +69,12 @@ Button {
        Color of the history action.
     */
     readonly property color clr: historyAction.color(darkTheme)
-    /*!
-       \qmlproperty string HistoryItem::clr
-       Label description of the history item.
-    */
-    readonly property string content: historyAction.getReadableString()
     
-    height: hidden ? 8 : Math.max(actionHeight, label.height + 15)
+    height: Math.max(actionHeight, label.height + 15)
     
     
     LinearGradient {
         anchors.fill: parent
-        visible: !hidden
         start: Qt.point(0, 0)
         end: Qt.point(parent.width, 0)
         gradient: Gradient {
@@ -96,12 +85,11 @@ Button {
     
     Setting.Icon {
         id: icon
+        width: 18
+        height: 18
         anchors.left: parent.left
         anchors.leftMargin: 6
         anchors.verticalCenter: parent.verticalCenter
-        visible: !hidden
-        width: 18
-        height: 18
         
         color: sysPalette.windowText
         source: `../icons/history/${historyAction.icon()}.svg`
@@ -114,7 +102,6 @@ Button {
         anchors.leftMargin: 6
         anchors.rightMargin: 20
         anchors.verticalCenter: parent.verticalCenter
-        visible: !hidden
         font.pixelSize: 14
         text: historyAction.getHTMLString().replace(/\$\{tag_color\}/g, clr)
         textFormat: Text.RichText
@@ -122,21 +109,11 @@ Button {
         wrapMode: Text.WordWrap
     }
     
-    Rectangle {
+    //text: historyAction.getReadableString()
-        id: hiddenDot
-        anchors.centerIn: parent
-        visible: hidden
-        width: 5
-        height: 5
-        radius: 5
-        color: sysPalette.windowText
-    }
-    
-    //text: content
     
     ToolTip.visible: hovered
     ToolTip.delay: 200
-    ToolTip.text: content
+    ToolTip.text: historyAction.getReadableString()
     
     onClicked: {
         if(isRedo)
@@ -144,6 +121,14 @@ Button {
         else
             history.undoMultipleDefered(+idx+1)
     }
+    
+    Rectangle {
+        color: sysPalette. window
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        height: 1
+    }
 }
 
 

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectLists.qml

@@ -77,7 +77,7 @@ ListView {
             Label {
                 id: typeHeaderText
                 verticalAlignment: TextInput.AlignVCenter
-                text: qsTranslate("control", "%1: ").arg(Objects.types[objType].displayTypeMultiple())
+                text: Objects.types[objType].displayTypeMultiple() + ":"
                 font.pixelSize: 20
             }
         }

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml

@@ -63,11 +63,6 @@ Item {
        Value of the input.
     */
     property alias value: input.text
-    /*!
-       \qmlproperty string TextSetting::placeholderText
-       Value of the input.
-    */
-    property alias placeholderText: input.placeholderText
     /*!
        \qmlproperty string TextSetting::label
        Label of the setting.
@@ -97,8 +92,7 @@ Item {
         anchors.top: parent.top
         verticalAlignment: TextInput.AlignVCenter
         //color: sysPalette.windowText
-        text: visible ? qsTranslate("control", "%1: ").arg(control.label) : ""
+        text: qsTranslate("control", "%1: ").arg(control.label)
-        visible: control.label != ""
     }
     
         
@@ -107,10 +101,10 @@ Item {
         anchors.top: parent.top
         anchors.left: labelItem.right
         anchors.leftMargin: 5
-        width: control.width - (labelItem.visible ? labelItem.width + 5 : 0) - iconLabel.width - 5
+        width: control.width - labelItem.width - iconLabel.width - 10
         height: parent.height
         verticalAlignment: TextInput.AlignVCenter
-        horizontalAlignment: control.label == "" ? TextInput.AlignLeft : TextInput.AlignHCenter
+        horizontalAlignment: TextInput.AlignHCenter
         color: sysPalette.windowText
         focus: true
         text: control.defValue