Merge bcfbd3e into 1d2731f

qmlui/js/GenericHelpers.js

@@ -29,6 +29,7 @@ function pluginIconFromName(name)
         case "OSC": return "qrc:/oscplugin.svg";
         case "E1.31": return "qrc:/e131plugin.svg";
         case "Loopback": return "qrc:/loop.svg";
+        case "Enttec": return "qrc:/ENTTEC.svg";
         default: return "";
     }
 }

qmlui/qml/IconButton.qml

@@ -36,10 +36,10 @@ Button
     rightPadding: 0
 
     property int counter: 1
-    property color bgColor: UISettings.bgLight
-    property color hoverColor: UISettings.hover
-    property color pressColor: UISettings.highlightPressed
-    property color checkedColor: UISettings.highlight
+    property color bgColor: UISettings.bgIconButton
+    property color hoverColor: UISettings.bgIconButtonHover
+    property color pressColor: UISettings.bgIconButtonHighlightPressed
+    property color checkedColor: UISettings.bgIconButtonHighlight
 
     property alias border: contentBody.border
     property alias radius: contentBody.radius

qmlui/qml/UISettings.qml

@@ -35,9 +35,15 @@ QtObject
     property color bgLight:    "#6F6F6F"
     property color bgLighter:  "#8F8F8F"
 
+    /* Icon Buttons */
+    property color bgIconButton:                  "#8F8F8F"
+    property color bgIconButtonHover:             "white"
+    property color bgIconButtonHighlight:         "white"
+    property color bgIconButtonHighlightPressed:  "white"
+
     property color fgMain:     "white"
     property color fgMedium:   "#888"
-    property color fgLight:    "#aaa"
+    property color fgLight:    "#aaa" 
 
     property color sectionHeader:    "#31456B"
     property color sectionHeaderDiv: "#22304a"

qmlui/qml/UISettingsEditor.qml

@@ -623,6 +623,79 @@ Rectangle
             }
         }
 
+        //Row 14
+        RobotoText
+        {
+            height: origItemHeight
+            label: qsTr("Icon Normal")
+        }
+        Loader
+        {
+            property string kName: "bgIconButton"
+            sourceComponent: colorSelector
+            onLoaded: item.init(this, uiManager.getDefault(kName),
+                                      uiManager.getModified(kName))
+
+            function updateColor(col)
+            {
+                uiManager.setModified(kName, col)
+            }
+        }
+
+        RobotoText
+        {
+            height: origItemHeight
+            label: qsTr("Icon Hover")
+        }
+        Loader
+        {
+            property string kName: "bgIconButtonHover"
+            sourceComponent: colorSelector
+            onLoaded: item.init(this, uiManager.getDefault(kName),
+                                      uiManager.getModified(kName))
+
+            function updateColor(col)
+            {
+                uiManager.setModified(kName, col)
+            }
+        }
+        //Row 15
+        RobotoText
+        {
+            height: origItemHeight
+            label: qsTr("Icon Pressed")
+        }
+        Loader
+        {
+            property string kName: "bgIconButtonHighlightPressed"
+            sourceComponent: colorSelector
+            onLoaded: item.init(this, uiManager.getDefault(kName),
+                                      uiManager.getModified(kName))
+
+            function updateColor(col)
+            {
+                uiManager.setModified(kName, col)
+            }
+        }
+
+        RobotoText
+        {
+            height: origItemHeight
+            label: qsTr("Icon highlighted")
+        }
+        Loader
+        {
+            property string kName: "bgIconButtonHighlight"
+            sourceComponent: colorSelector
+            onLoaded: item.init(this, uiManager.getDefault(kName),
+                                      uiManager.getModified(kName))
+
+            function updateColor(col)
+            {
+                uiManager.setModified(kName, col)
+            }
+        }
+
         GenericButton
         {
             Layout.columnSpan: 4

qmlui/uimanager.cpp

@@ -87,6 +87,12 @@ void UiManager::initialize()
     setDefaultParameter("colors", "toolbarSelectionMain", m_uiStyle->property("toolbarSelectionMain"));
     setDefaultParameter("colors", "toolbarSelectionSub", m_uiStyle->property("toolbarSelectionSub"));
 
+    /** Icon Buttons **/
+    setDefaultParameter("colors", "bgIconButton", m_uiStyle->property("bgIconButton"));
+    setDefaultParameter("colors", "bgIconButtonHover", m_uiStyle->property("bgIconButtonHover"));
+    setDefaultParameter("colors", "bgIconButtonHighlight", m_uiStyle->property("bgIconButtonHighlight"));
+    setDefaultParameter("colors", "bgIconButtonHighlightPressed", m_uiStyle->property("bgIconButtonHighlightPressed"));
+
     /** Then load (if available) the user configuration */
     QFile jsonFile(userConfFilepath());
     if (jsonFile.exists())