Fixed gobos rendering on Android

Fixed the Android build with GCC 4.9 Removed libs.xml from android extras Improved side panels mouse icon
mcallegari · Aug 17, 2015 · dc53df0 · dc53df0
1 parent 684e950
commit dc53df0
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 36 deletions.
diff --git a/android-files/res/values/libs.xml b/android-files/res/values/libs.xml
diff --git a/qmlui/inputoutputmanager.cpp b/qmlui/inputoutputmanager.cpp
@@ -171,7 +171,7 @@ QVariant InputOutputManager::universeInputSources(int universe)
 {
     QVariantList inputSources;
     QString currPlugin;
-    int currLine;
+    int currLine = -1;
     InputPatch *ip = m_ioMap->inputPatch(universe);
     if (ip != NULL)
     {
@@ -212,7 +212,7 @@ QVariant InputOutputManager::universeOutputSources(int universe)
 {
     QVariantList outputSources;
     QString currPlugin;
-    int currLine;
+    int currLine = -1;
     OutputPatch *op = m_ioMap->outputPatch(universe);
     if (op != NULL)
     {

diff --git a/qmlui/qml/fixturesfunctions/BottomPanel.qml b/qmlui/qml/fixturesfunctions/BottomPanel.qml
@@ -121,7 +121,7 @@ Rectangle
             anchors.fill: parent
             z: 1
             hoverEnabled: true
-            cursorShape: Qt.OpenHandCursor
+            cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
             drag.target: bottomSidePanel
             drag.axis: Drag.YAxis
             drag.minimumY: collapseHeight

diff --git a/qmlui/qml/fixturesfunctions/Fixture2DItem.qml b/qmlui/qml/fixturesfunctions/Fixture2DItem.qml
@@ -110,7 +110,10 @@ Rectangle
 
     function setGoboPicture(headIndex, resource)
     {
-        headsRepeater.itemAt(headIndex).goboSource = "file:/" + resource
+        if (Qt.platform.os === "android")
+            headsRepeater.itemAt(headIndex).goboSource = resource
+        else
+            headsRepeater.itemAt(headIndex).goboSource = "file:/" + resource
     }
 
     Flow

diff --git a/qmlui/qml/fixturesfunctions/LeftPanel.qml b/qmlui/qml/fixturesfunctions/LeftPanel.qml
@@ -294,7 +294,7 @@ Rectangle
             z: 1
             x: parent.width - width
             hoverEnabled: true
-            cursorShape: Qt.OpenHandCursor
+            cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
             drag.target: leftSidePanel
             drag.axis: Drag.XAxis
             drag.minimumX: collapseWidth

diff --git a/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml b/qmlui/qml/fixturesfunctions/PresetCapabilityItem.qml
@@ -50,7 +50,12 @@ Rectangle
 
         //console.log("Capability res name: " + capability.resourceName)
         if (capability.resourceName)
-            pic.source = "file:/" + capability.resourceName
+        {
+            if (Qt.platform.os === "android")
+                pic.source = capability.resourceName
+            else
+                pic.source = "file:/" + capability.resourceName
+        }
         if (capability.resourceColor1 == "#000000" &&
             capability.resourceColor2 == "#000000" &&
             capability.resourceName == "")

diff --git a/qmlui/qml/fixturesfunctions/RightPanel.qml b/qmlui/qml/fixturesfunctions/RightPanel.qml
@@ -214,7 +214,7 @@ Rectangle
             z: 1
             x: parent.width - width
             hoverEnabled: true
-            cursorShape: Qt.OpenHandCursor
+            cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
             drag.target: rightSidePanel
             drag.axis: Drag.XAxis
             drag.minimumX: collapseWidth

diff --git a/qmlui/qml/inputoutput/IOLeftPanel.qml b/qmlui/qml/inputoutput/IOLeftPanel.qml
@@ -213,7 +213,7 @@ Rectangle
             z: 1
             x: parent.width - width
             hoverEnabled: true
-            cursorShape: Qt.OpenHandCursor
+            cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
             drag.target: leftSidePanel
             drag.axis: Drag.XAxis
             drag.minimumX: collapseWidth

diff --git a/qmlui/qml/inputoutput/IORightPanel.qml b/qmlui/qml/inputoutput/IORightPanel.qml
@@ -176,7 +176,7 @@ Rectangle
             z: 1
             x: parent.width - width
             hoverEnabled: true
-            cursorShape: Qt.OpenHandCursor
+            cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
             drag.target: rightSidePanel
             drag.axis: Drag.XAxis
             drag.minimumX: collapseWidth

diff --git a/qmlui/qml/virtualconsole/VCLeftPanel.qml b/qmlui/qml/virtualconsole/VCLeftPanel.qml
@@ -141,7 +141,7 @@ Rectangle
 
     PropertyAnimation
     {
-        id: animateClose;
+        id: animateClose
         target: leftSidePanel
         properties: "width"
         to: collapseWidth
@@ -173,7 +173,7 @@ Rectangle
             z: 1
             x: parent.width - width
             hoverEnabled: true
-            cursorShape: Qt.OpenHandCursor
+            cursorShape: pressed ? Qt.ClosedHandCursor : Qt.OpenHandCursor
             drag.target: leftSidePanel
             drag.axis: Drag.XAxis
             drag.minimumX: collapseWidth