Merge commit 'adf09281281a5175cf4009aa763ec3f41b1f5e19'

Conflicts:
	3rdparty/BBIOConfig/qml/BBIOConfig.qml
	3rdparty/BBIOConfig/qml/Pin.qml

Author: machinekoder

qml/BBIOConfig.qml

@@ -211,7 +211,8 @@ Rectangle {
             currentColorMap: selector.currentColorMap
             loadedOverlays: overlaySelector.output
             previewType: legend.previewType
-            previewEnabled: legend.previewEnabled
+            previewOverlay: overlaySelector.hoveredItem
+            previewEnabled: (legend.previewType != "") || (overlaySelector.hoveredItem != "")
             configMode: configModeSelector.currentIndex
             portNumber: 9
             displayUneditablePins: displayUneditablePinsCheck.checked
@@ -242,7 +243,12 @@ Rectangle {
             currentColorMap: selector.currentColorMap
             loadedOverlays: overlaySelector.output
             previewType: legend.previewType
+<<<<<<< HEAD
             previewEnabled: legend.previewEnabled
+=======
+            previewOverlay: overlaySelector.hoveredItem
+            previewEnabled: (legend.previewType != "") || (overlaySelector.hoveredItem != "")
+>>>>>>> adf09281281a5175cf4009aa763ec3f41b1f5e19
             configMode: configModeSelector.currentIndex
             portNumber: 8
             displayUneditablePins: displayUneditablePinsCheck.checked

qml/Legend.qml

@@ -24,7 +24,6 @@ GroupBox {
     property var colorMap: [["GPIO", "red"], ["I2C", "blue"], ["UART", "green"]]
     property var pinList: []
     property string previewType: ""
-    property bool previewEnabled: false
     property int pinSize: main.width*0.125
     property int pinSpacing: 2
 
@@ -101,10 +100,9 @@ GroupBox {
 
     function previewEntered(type) {
         main.previewType = type
-        main.previewEnabled = true
     }
 
     function previewExited() {
-        main.previewEnabled = false
+        main.previewType = ""
     }
 }

qml/OverlaySelector.qml

@@ -23,6 +23,7 @@ import QtQuick.Controls 1.0
 GroupBox {
     property var input: ["test", "test2", "test3"]
     property var output: []
+    property string hoveredItem: ""
 
     id: main
     width: 300
@@ -42,6 +43,7 @@ GroupBox {
                 text: name
                 checked: itemChecked
                 onClicked: selectionChanged(index, checked)
+                onHoveredChanged: hovered ? main.hoveredItem = text : main.hoveredItem = ""
             }
     }
 

qml/Pin.qml

@@ -31,6 +31,7 @@ Item {
     property var    loadedOverlays: ["cape-test", "cape-test2"]                         // currently loaded overlay
     property bool   pinmuxActive: getPinmuxActive()                                     // determines wheter the pinmux is active or not
     property string previewType: ""                                                     // type for preview mode
+    property string previewOverlay: ""                                                  // overlay for preview mode
     property bool   previewEnabled: false                                               // enabled the preview mdoe
     property bool   previewActive:  getPreviewActive()                                  // holds whether the preview is active or not
     property string gpioDirection: "unmodified"                                         // type of the gpio pin (in or out)
@@ -109,7 +110,12 @@ Item {
             searchValue = main.gpioValue
         }
         else if (main.previewActive) {
-            searchValue = main.previewType
+            if (main.previewType != "")
+                searchValue = main.previewType
+            else if (overlayPreviewTimer.x)     // previewing an overlay -> blinking
+                 return "white"
+            else
+                searchValue = main.defaultFunction
         }
         else if (main.pinmuxActive) {
             searchValue = main.type
@@ -130,6 +136,9 @@ Item {
 
     function getPreviewActive() {
 
+        if (previewEnabled && (previewType == "") && (previewOverlay == overlay))
+            return true
+
         if ((!previewEnabled) || (previewType == ""))
             return false
 
@@ -146,6 +155,19 @@ Item {
     width: 100
     height: 62
 
+<<<<<<< HEAD
+=======
+    Timer {
+        property color previewColor: "white"
+        property bool x: true
+        id: overlayPreviewTimer
+        interval: 400
+        running: previewActive && (previewOverlay != "")
+        repeat: true
+        onTriggered: x = !x
+    }
+
+>>>>>>> adf09281281a5175cf4009aa763ec3f41b1f5e19
     ToolTip {
         anchors.left: rightSide?parent.right:undefined
         anchors.leftMargin: parent.width*0.8
@@ -156,7 +178,7 @@ Item {
         color: "white"
         border.color: "black"
 
-        visible: (comboBox.hovered || mouseArea.containsMouse) && !(previewEnabled && (previewType == ""))
+        visible: (comboBox.hovered || comboBox2.hovered || comboBox3.hovered || mouseArea.containsMouse) && !(previewEnabled && (previewType == ""))
         z: 1000
 
         Text {

qml/Port.qml

@@ -27,6 +27,7 @@ Rectangle {
     property var currentColorMap: [[["GPIO", "red"], ["I2C", "blue"], ["UART", "green"]]]
     property var loadedOverlays: []
     property string previewType: ""
+    property string previewOverlay: ""
     property bool previewEnabled: false
     property int configMode: 0
     property int portNumber: 0
@@ -55,6 +56,7 @@ Rectangle {
                                              "functions": [],
                                              "loadedOverlays": Qt.binding(function(){return main.loadedOverlays}),
                                              "previewType": Qt.binding(function(){return main.previewType}),
+                                             "previewOverlay": Qt.binding(function(){return main.previewOverlay}),
                                              "previewEnabled": Qt.binding(function(){return main.previewEnabled}),
                                              "configMode": Qt.binding(function(){return main.configMode}),
                                              "displayUneditablePins": Qt.binding(function(){return main.displayUneditablePins}),