timer based ws reconnect + label names

CanvasController.pro

@@ -14,15 +14,6 @@ QML_IMPORT_PATH =
 # Default rules for deployment.
 include(deployment.pri)
 
-DISTFILES += \
-    android/AndroidManifest.xml \
-    android/gradle/wrapper/gradle-wrapper.jar \
-    android/gradlew \
-    android/res/values/libs.xml \
-    android/build.gradle \
-    android/gradle/wrapper/gradle-wrapper.properties \
-    android/gradlew.bat
-
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {

CanvasController.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.3, 2016-08-11T10:46:17. -->
+<!-- Written by QtCreator 4.0.3, 2016-11-09T21:58:57. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -649,7 +649,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android for armeabi-v7a (GCC 4.9, Qt 5.7.0)</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Android for armeabi-v7a (GCC 4.9, Qt 5.7.0)</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{adf126d9-d8b7-4993-bb9f-0f17f134f6d3}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -905,7 +905,7 @@
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
-    <value type="QString" key="AndroidDeviceSerialNumber">193b6404</value>
+    <value type="QString" key="AndroidDeviceSerialNumber">4e009033</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
     <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>

WebSocket.qml

@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+Item {
+
+}

main.qml

@@ -11,10 +11,21 @@ ApplicationWindow {
     width: 960
     height: 540
     color: "#fffffe"
-    property alias text1: text1
-    property alias text2: text2
+
+    property alias canvas: canvas
+    Timer {
+        interval: 800; running: true; repeat: true
+        onTriggered: {
+            if (socket.status != WebSocket.Open){//Reconnect
+                socket.active = false
+                socket.active = true
+                console.log(Date().toString())
+            }
+        }
+    }
 
     WebSocket {
+
         property int total_slides: 5
 
         id: socket
@@ -26,7 +37,11 @@ ApplicationWindow {
                 canvas.clean_path()
                 item1.curPDF = obj.PDF
                 item1.curImage = obj.slide //automagically change_image
-                total_slides = obj.total_slides
+                if (obj.total_slides === undefined)
+                    total_slides = 3
+                else
+                    total_slides = obj.total_slides
+
                 break
             case "preg":
                 item1.addPreg(obj.text)
@@ -93,14 +108,10 @@ ApplicationWindow {
 
         onStatusChanged: {
             //FIXME implement
-            if (socket.status == WebSocket.Error) {
-                text2.text = qsTr("ERROR En la conexion")
-                console.log("Error: " + socket.errorString)
-            } else if (socket.status == WebSocket.Open) {
-                text2.text = qsTr("Conectado")
-            } else if (socket.status == WebSocket.Closed) {
-                text2.text = qsTr("Desconectado.. RC..")
-                socket.active = true //Reconnect
+            if (socket.status == WebSocket.Open) {
+                wsStatus.text = qsTr("Conectado")
+            } else {
+                wsStatus.text = qsTr("Desconectado\nReconectando..")
             }
         }
         active: true
@@ -121,17 +132,17 @@ ApplicationWindow {
 
         onCurPDFChanged: {
             canvas.change_image(curPDF, curImage)
-            text1.text = qsTr("%1/%2 (%3 preg)").arg(curImage).arg(
+            diapoStatus.text = qsTr("%1/%2 (%3 preg)").arg(curImage).arg(
                         socket.total_slides).arg(pregs.length)
         }
         onPregsChanged: {
-            text1.text = qsTr("%1/%2 (%3 preg)").arg(curImage).arg(
+            diapoStatus.text = qsTr("%1/%2 (%3 preg)").arg(curImage).arg(
                         socket.total_slides).arg(pregs.length)
         }
 
         onCurImageChanged: {
             canvas.change_image(curPDF, curImage)
-            text1.text = qsTr("%1/%2 (%3 preg)").arg(curImage).arg(
+            diapoStatus.text = qsTr("%1/%2 (%3 preg)").arg(curImage).arg(
                         socket.total_slides).arg(pregs.length)
         }
         function addPreg(p) {
@@ -467,12 +478,12 @@ ApplicationWindow {
                     }
 
                     Text {
-                        id: text2
+                        id: wsStatus
                         text: qsTr("WS")
                     }
 
                     Text {
-                        id: text1
+                        id: diapoStatus
                         text: qsTr("test123")
                     }
 

qml.qrc

@@ -4,5 +4,6 @@
         <file>simplify.js</file>
         <file>images/back.png</file>
         <file>images/fwd.png</file>
+        <file>WebSocket.qml</file>
     </qresource>
 </RCC>