Merge lp:~rpadovani/stock-ticker-mobile-app/error-dialog into lp:stock-ticker-mobile-app

[Riccardo Padovani]

For now if there is an error loading resources remains endlessly turning circle, which can be frustrating for a user.
I implemented a primitive error message.

For now if there is an error loading resources remains endlessly turning circle, which can be frustrating for a user.
I implemented a primitive error message.

[Robert Steckroth (robertsteckroth)]

Error popup will always display due to the "Operation canceled" error mesage that happens at listview load time.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'Stock_Ticker.qml'
--- Stock_Ticker.qml	2013-07-10 01:46:45 +0000
+++ Stock_Ticker.qml	2013-07-10 15:50:35 +0000
@@ -41,6 +41,7 @@
     property string changedFormat: "%"
     property int chart_index: 1
     property string lastSortType: "Name"
+    property string errorText;
 
     property int dummyTextWidth: 0  // Holds the width of the percent sign in Stock_Component_Main
 
@@ -353,8 +354,11 @@
         onStatusChanged: {
             if ( XmlListModel.Loading )
                 log("Loading newsFeed: "+source)
-            if ( XmlListModel.Error && errorString() )
-                log("Error loading "+source+" : "+errorString())
+            if ( XmlListModel.Error && errorString()) {
+                errorText = i18n.tr("Error loading ") +source+" : "+i18n.tr("check your connection and your firewall settings.")
+                errorPopupDialog.show();
+                console.log("Error loading "+source+" : "+errorString())
+            }
             if ( status === XmlListModel.Ready )
                  for ( var y = 0; y < count; y++ )
                        newsFeedList.set(y, {"title": get(y).title, "description": get(y).description, "link": get(y).link })
@@ -391,8 +395,11 @@
         onStatusChanged: {  // Rember, the component methods that start with "on" do not evealuate external program signals
             if ( XmlListModel.Loading )
                 log("Loading currentStocks: "+source)
-            if ( XmlListModel.Error && errorString() )
-                log("Error loading "+source+" : "+errorString())
+            if ( XmlListModel.Error && errorString() ) {
+                errorText = i18n.tr("Error loading ") +source+" : "+i18n.tr("check your connection and your firewall settings.")
+                errorPopupDialog.show();
+                console.log("Error loading "+source+" : "+errorString())
+            }
             if  ( status === XmlListModel.Ready ) {
                    Storage.setSetting("currentStocks_source", source)
                          manageCurrentModel()  // Populate the models with this cool function
@@ -443,8 +450,11 @@
         onStatusChanged: { // Rember, the component methods that start with "on" do not evealuate external program signals
             if ( XmlListModel.Loading )
                 log("Loading stksearchresults: "+source)
-            if ( XmlListModel.Error && errorString() )
-                log("Error loading "+source+" : "+errorString())
+            if ( XmlListModel.Error && errorString() ) {
+                errorText = i18n.tr("Error loading ") +source+" : "+i18n.tr("check your connection and your firewall settings.")
+                errorPopupDialog.show();
+                console.log("Error loading "+source+" : "+errorString())
+            }
             if ( status === XmlListModel.Ready ) {
                   Storage.setSetting("stksearchresults_source", source)
                   manageSearchModel()
@@ -473,8 +483,11 @@
         onStatusChanged: { // Rember, the component methods that start with "on" do not evealuate external program signals
             if ( XmlListModel.Loading )
                 log("Loading currentStocksChart: "+source)
-            if ( XmlListModel.Error && errorString() )
-                log("Error loading "+source+" : "+errorString())
+            if ( XmlListModel.Error && errorString() ) {
+                errorText = i18n.tr("Error loading ") +source+" : "+i18n.tr("check your connection and your firewall settings.")
+                errorPopupDialog.show();
+                console.log("Error loading "+source+" : "+errorString())
+            }
             if ( status === XmlListModel.Ready )
                  chartsPage.repaintCanvas()
         }
@@ -617,5 +630,15 @@
                     }
             }
         }
+
+        Dialog {
+            id: errorPopupDialog
+            title: i18n.tr("Error")
+            text: errorText
+            Button {
+                text: i18n.tr("Ok")
+                onClicked: PopupUtils.close(errorPopupDialog)
+            }
+        }
     }
 }