black theme,retrydialog; starttimersignal started

Author: karoltheguy

assets/.assets.index

@@ -1,5 +1,5 @@
 1
-15
+17
 About.qml
 backgrounds/1.jpg
 CamSettings.qml
@@ -9,9 +9,11 @@ images/battery-full-icon0.png
 images/battery-full-icon1.png
 images/battery-full-icon2.png
 images/battery-full-icon4.png
+images/dialogframe.png
 images/rec.png
 LivePreview.qml
 main.qml
+RetryConnectionDialog.qml
 Settings.qml
 Start.qml
 VideoViewer.qml

assets/RetryConnectionDialog.qml

@@ -0,0 +1,82 @@
+import bb.cascades 1.2
+import Network.GetterRequest 1.0
+
+Dialog {
+    id: retryDialog
+    attachedObjects: [
+        GetterRequest {
+            id: getThis
+        }
+    ]
+    Container {
+        preferredWidth: 768
+        preferredHeight: 1280
+        
+        background: Color.create(0.0, 0.0, 0.0, 0.5)
+        layout: DockLayout {
+        }
+        Container {
+            maxHeight: 397
+            horizontalAlignment: HorizontalAlignment.Center
+            verticalAlignment: VerticalAlignment.Center
+            layout: DockLayout {
+            }
+            ImageView {
+                imageSource: "asset:///images/dialogframe.png"
+            }
+            
+            Container {
+                topPadding: 10
+                bottomPadding: 143
+                leftPadding: 23
+                rightPadding: 23
+                horizontalAlignment: HorizontalAlignment.Fill
+                verticalAlignment: VerticalAlignment.Fill
+                
+                Label {
+                    text: "Can't Connect!"
+                    textStyle.base: SystemDefaults.TextStyles.TitleText
+                    textStyle.color: Color.White
+                    horizontalAlignment: HorizontalAlignment.Center
+                    layoutProperties: StackLayoutProperties {
+                        spaceQuota: 0.7
+                    }
+                }
+                Label {
+                    text: "    Retry?"
+                    textStyle.base: SystemDefaults.TextStyles.TitleText
+                    textStyle.color: Color.White
+                    layoutProperties: StackLayoutProperties {
+                        spaceQuota: 3.5
+                    }
+                }
+                Container {
+                    layout: StackLayout {
+                        orientation: LayoutOrientation.LeftToRight
+
+                    }
+                    Button {
+                        text: "Retry"
+                        preferredWidth: 262.0
+                        onClicked: {
+                        	getThis.startTimer()
+                            retryDialog.close()
+                        }
+                    }
+                    Button {
+                        text: "Cancel"
+                        preferredWidth: 262.0
+                        onClicked: {
+                            retryDialog.close()
+                        }
+                                            
+                    }    
+                }
+                
+            }
+
+        }
+        
+    }
+
+}

assets/Start.qml

@@ -12,6 +12,7 @@ Page {
             commandArea.text = commandSent;
         }
         onResponseReceived: {
+            
             responseArea.text = info;
 
         }
@@ -24,6 +25,15 @@ Page {
             seTimer.start()
             responseArea.text = "Connecting..."
         }
+        onTimerTimesOut: {
+            retryDialog.open()
+            seTimer.stop()
+                //sxTimer.stop()
+        }
+        onReStartTimerSignal: {
+            GetPassword();
+        }
+        
     },
     QTimer {
         id: sxTimer
@@ -32,6 +42,9 @@ Page {
             getThis.StatRequest(doitsettings.getSettings("password"),"sx")
 
         }
+    },
+    RetryConnectionDialog {
+        id: retryDialog
     }
 ]
 
@@ -45,6 +58,10 @@ Page {
             onTimeout: {
                 getThis.StatRequest(doitsettings.getSettings("password"),"se")
                 console.debug("seTimer")
+                if (responseArea.text = "Connecting...")
+                {
+                    responseArea.text = "Connected!"
+                }
             }
             visible: false
         }
@@ -90,7 +107,19 @@ Page {
                     orientation: LayoutOrientation.LeftToRight
 
                 }
-                Button {
+                ToggleButton {
+                    checked: false
+                    onCheckedChanged: {
+                        if (checked == true){
+                            getThis.GetRequest(doitsettings.getSettings("password"), "PW", "01");
+                        }
+                        else {
+                            getThis.GetRequest(doitsettings.getSettings("password"), "PW", "00");
+                        }
+                    }
+
+                }
+                /*                Button {
                     text: qsTr("On") + Retranslate.onLocaleOrLanguageChanged
                     
                     onClicked: {
@@ -107,7 +136,8 @@ Page {
                         getThis.GetRequest(doitsettings.getSettings("password"), "PW", "00")                
                     }
                     preferredWidth: 10.0
-                }
+                }*/
+
                 Label {
                     id: labelConnection
                     text: "  Hero3 White"
@@ -271,7 +301,6 @@ Page {
     }
     onCreationCompleted: {
         getThis.GetPassword()
-        //seTimer.start()
-        //sxTimer.start()
+
     }
 }

assets/images/dialogframe.png

@@ -50,6 +50,8 @@
 
     <!-- Copyright information. Optional. -->
     <!-- <copyright></copyright> -->
+    
+    <env var="CASCADES_THEME" value="dark"/>
 
     <!--  Name of author which is used for signing. Must match the developer name of your development certificate. -->
     <configuration name="Device-Debug">

bar-descriptor.xml

@@ -383,18 +383,21 @@ void GetterRequest::onGetPassword()
 ///////////////////////
 void GetterRequest::stopReplyTimer()
 {
-	qDebug() << "Stats request aborting...";
+	qDebug() << "request aborting...";
 	QTimer* timer = qobject_cast<QTimer*>(sender());
 
 	QNetworkReply* response = qobject_cast<QNetworkReply*>(timer->parent());
-
+	emit timerTimesOut("neverconnected");
 	response->abort();
-	//replyStatsPointer->close();
-	//replyStatsPointer->deleteLater();
 	qDebug() << "Aborted";
 
 }
 
+void GetterRequest::startTimer()
+{
+	qDebug() << "restard timer...";
+	emit reStartTimerSignal();
+}
 //END/////////////////////
 //SLOT called by QNetworkAccessManager
 //requests for timeouts

dialog.psd

@@ -11,8 +11,6 @@
 #include <QObject>
 
 class QNetworkAccessManager;
-class QNetworkReply;
-
 
 class GetterRequest : public QObject
 {
@@ -26,6 +24,7 @@ public Q_SLOTS:
     void GetRequest(const QString &password, const QString &cmd, const QString &cmdbyte);
     void StatRequest(const QString &password, const QString &cmd);
     void GetPassword();
+    void startTimer();
 
     void whatEveRequest(const QString &rest);
 
@@ -35,6 +34,8 @@ public Q_SLOTS:
     void statsReceived(const QString &info, const int &info2, const QString &info3);
     void passwordReceived(const QString &pass);
     void commandSent(const QUrl &commandSent);
+    void timerTimesOut(const QString &requestName);
+    void reStartTimerSignal();
 
 
 private Q_SLOTS:
@@ -49,8 +50,6 @@ private Q_SLOTS:
     QString mathMode(QByteArray &hexCode);
     //QNetworkReply* replyStatsPointer;
 
-
-
 };
 
 #endif

src/GetterRequest.cpp

@@ -45,22 +45,12 @@
 <context>
     <name>Start</name>
     <message>
-        <location filename="../assets/Start.qml" line="72"/>
+        <location filename="../assets/Start.qml" line="89"/>
         <source>DoIt GoPro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/Start.qml" line="94"/>
-        <source>On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../assets/Start.qml" line="105"/>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../assets/Start.qml" line="256"/>
+        <location filename="../assets/Start.qml" line="286"/>
         <source>Not Connected</source>
         <translation type="unfinished"></translation>
     </message>