fix batch, move stop button, add search and filter term show, fix aut…

…oscroll, add missing guide cursors

src/deviceInterface.h

@@ -31,7 +31,7 @@ public slots:
 
                 while (!in.atEnd()) {
                     this->sendCommand(in.readLine());
-                    QThread::msleep(150);
+                    QThread::msleep(200);
                 }
                 _file.close();
             }

views/AppNotification.qml

@@ -65,8 +65,7 @@ Item {
         }
 
         onVisibleChanged: {
-            if (visible)
-                timer.running = true
+            timer.running = visible
         }
     }
 }

views/BluetoothPage.qml

@@ -29,6 +29,7 @@ Item {
 
     Connections {
         target: toolPanel
+
         function onDisconnectClicked() {
             loadingIndicator.open()
             bluetooth.disconnect()

views/BluetoothWelcome.qml

@@ -33,8 +33,6 @@ Item {
         }
 
         function onConnectClicked() {
-
-            console.log("Connect clicked")
             if (!_root.isBtOn())
                 return
 

views/BtDeviceInfo.qml

@@ -40,18 +40,16 @@ Item {
     }
 
     function chooseIcon(rssi) {
-        let res = AppSettings.signalIcon
-
         if (rssi <= -90)
-            res = AppSettings.weakSignalIcon
+            return AppSettings.weakSignalIcon
         else if (rssi <= -67)
-            res = AppSettings.okaySignalIcon
+            return AppSettings.okaySignalIcon
         else if (rssi <= -55)
-            res = AppSettings.goodSignalIcon
+            return AppSettings.goodSignalIcon
         else if (rssi <= -30)
-            res = AppSettings.bestSignalIcon
+            return AppSettings.bestSignalIcon
 
-        return res
+        return AppSettings.signalIcon
     }
 
     MouseArea {

views/DeviceLog.qml

@@ -45,7 +45,7 @@ Rectangle {
         if (pattern === "")
             return
 
-        if (textView.mode === "search") {
+        if (textView.mode === "Search") {
             textView.searchFor(pattern)
             textView.deselectOnPress = false
             textView.nextMatch()
@@ -119,17 +119,15 @@ Rectangle {
 
     TextView {
         id: textView
-        property string mode: "search"
-
-        height: parent.height - placeholderText.height - textInput.height - 20
+        property string mode: "Search"
 
         anchors {
             left: parent.left
             right: parent.right
             top: placeholderText.bottom
-            topMargin: 5
+            topMargin: 3
             bottom: textInput.top
-            bottomMargin: 10
+            bottomMargin: 5
         }
 
         Keys.onPressed: function (event) {
@@ -156,7 +154,7 @@ Rectangle {
     }
 
     Rectangle {
-        id: stopMessage
+        id: guideMessage
 
         visible: !textInput.visible
 
@@ -172,8 +170,7 @@ Rectangle {
         color: Material.background
 
         TextLabel {
-            id: guideMessage
-            textValue: "Click STOP to stop " + textView.mode + "ing"
+            textValue: textView.mode + "ing for: " + textView.searchTerm
             bindFocusTo: true
         }
     }
@@ -194,7 +191,7 @@ Rectangle {
         }
         leftPadding: 40 // so the text not overlaps with the search icon
 
-        placeholderText: textView.mode === "search" ? "Type to search..." : "Type to filter..."
+        placeholderText: textView.mode === "Search" ? "Type to search..." : "Type to filter..."
 
         background: Rectangle {
             implicitHeight: Material.textFieldHeight
@@ -254,6 +251,7 @@ Rectangle {
             height: parent.height
             width: 40
             hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
             onClicked: {
                 _root.filterOrSearch()
             }
@@ -265,13 +263,14 @@ Rectangle {
             height: parent.height
             width: parent.leftPadding
             hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
 
             onClicked: {
-                if (textView.mode === "search") {
-                    textView.mode = "filter"
+                if (textView.mode === "Search") {
+                    textView.mode = "Filter"
                     modeImage.source = AppSettings.filterIcon
                 } else {
-                    textView.mode = "search"
+                    textView.mode = "Search"
                     modeImage.source = AppSettings.searchIcon
                 }
             }

views/InteractiveShell.qml

@@ -53,14 +53,13 @@ Rectangle {
 
     TextView {
         id: textView
-
         anchors {
             left: parent.left
             right: parent.right
             top: placeholderText.bottom
-            topMargin: 5
+            topMargin: 3
             bottom: textInput.top
-            bottomMargin: 10
+            bottomMargin: 5
         }
 
         Connections {
@@ -114,7 +113,6 @@ Rectangle {
 
         height: 45
         anchors {
-            // topMargin: 10
             bottom: parent.bottom
             bottomMargin: 2
             right: parent.right
@@ -178,6 +176,7 @@ Rectangle {
         MouseArea {
             id: mouseArea
             anchors.right: parent.right
+            cursorShape: Qt.PointingHandCursor
             height: parent.height
             width: 40
             hoverEnabled: true

views/SideButton.qml

@@ -43,6 +43,7 @@ Rectangle {
     }
 
     Column {
+        visible: _root.iconSource !== ""
         anchors.centerIn: parent
         spacing: 5
 
@@ -77,14 +78,36 @@ Rectangle {
         }
     }
 
+    // if no icon then center text
+    Text {
+        id: textItemCenter
+        anchors.centerIn: parent
+        visible: _root.textContent !== "" && _root.iconSource === ""
+        text: _root.textContent
+        font.family: labelFont.name
+        font.pixelSize: 12
+        property color textColor: AppSettings.whiteColor
+        color: textColor
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
+
+        // text color transition animation on click detected in MouseArea
+        Behavior on textColor {
+            ColorAnimation {
+                duration: 200
+                easing.type: Easing.InOutQuad
+            }
+        }
+    }
+
     Rectangle {
         id: leftBorder
         visible: _root.checked
         width: 3
         height: 0
         anchors.bottom: _root.bottom
-
         color: Material.accent
+
         Behavior on height {
             PropertyAnimation {
                 duration: 350

views/TextView.qml

@@ -11,14 +11,15 @@ Item {
     property alias listView: view
     property bool deselectOnPress: true
     property bool searching: false
+    property string searchTerm: ""
 
     signal newItemArrived
     signal scrollDetected
     signal noMatchesFound
     signal matchesFound
 
     function scrollToBottom() {
-        view.positionViewAtEnd()
+        Qt.callLater(view.positionViewAtEnd)
     }
 
     function togglePause() {
@@ -42,6 +43,7 @@ Item {
     }
 
     function searchFor(term) {
+        searchTerm = term
         view.searchTermLength = term.length
         messagesModel.searchAndHighlight(term)
         searching = true
@@ -83,6 +85,7 @@ Item {
 
     function filterFor(term) {
         messagesModel.filterFor(term)
+        searchTerm = term
     }
 
     // Shortcuts for manual scrolling
@@ -124,6 +127,7 @@ Item {
                 noMatchesFound()
                 searching = false
                 view.searchTermLength = 0
+                searchTerm = ""
             }
         }
     }
@@ -173,7 +177,7 @@ Item {
             }
 
             if (view.autoScroll) {
-                view.positionViewAtEnd()
+                _root.scrollToBottom()
             }
 
             newItemArrived()

views/ToolPanel.qml

@@ -180,17 +180,6 @@ Rectangle {
             }
         }
 
-        ToolButton {
-            id: undo
-            iconSource: AppSettings.undoIcon
-            textContent: "STOP"
-            borderHighlight: true
-            visibleOnInit: false
-            onButtonClicked: {
-                undoClicked()
-            }
-        }
-
         ToolButton {
             id: browse
             iconSource: AppSettings.folderIcon
@@ -264,7 +253,7 @@ Rectangle {
             textContent: "BATCH"
             iconSource: AppSettings.batchIcon
             onButtonClicked: {
-                buttonClicked()
+                batchCliClicked()
             }
         }
 
@@ -330,6 +319,17 @@ Rectangle {
             }
         }
 
+        ToolButton {
+            id: undo
+            height: logFile.height / 2
+            textContent: "STOP"
+            borderHighlight: true
+            visibleOnInit: false
+            onButtonClicked: {
+                undoClicked()
+            }
+        }
+
         ToolButton {
             id: down
             visibleOnInit: false