Merge lp:~marcinello/ubuntu-calendar-app/fix-1280612 into lp:ubuntu-calendar-app

[Marcin]

fix for Bug #1280612 do not display map when no location: https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1280612

Now we not only hide the map, but also show "Not specified" under location label.

fix for Bug #1280612 do not display map when no location: https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1280612

Now we not only hide the map, but also show "Not specified" under location label.

[lp:~marcinello/ubuntu-calendar-app/fix-1280612]

224. By Marcin on 2014-03-27

fix #1280612, handle image load error

[Kunal Parmar (pkunal-parmar)]

49 + visible: false

what if we use following code instead ?

49 + visible: mapImage.status == Image.Ready

[lp:~marcinello/ubuntu-calendar-app/fix-1280612]

225. By Marcin on 2014-03-28

fix #1280612, improved implementation, save fix

[Marcin (marcinello)]

@Kunal thanks, it looks better this way. I fixed the code.

[Kunal Parmar (pkunal-parmar)]

works great, thanks

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2014-02-19 11:39:13 +0000
+++ EventDetails.qml	2014-03-28 17:50:07 +0000
@@ -51,11 +51,6 @@
             titleLabel.text = e.displayLabel;
         }
 
-        var location = "";
-        if( e.location ) {
-            locationLabel.text = e.location;
-            location = e.location;
-        }
         if( e.description ) {
             descLabel.text = e.description;
         }
@@ -83,12 +78,20 @@
         }
         reminderHeader.value = Defines.reminderLabel[index];
 
+        if( e.location ) {
+            locationLabel.text = e.location;
 
-        // FIXME: need to cache map image to avoid duplicate download every time
-        var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+location+
-                "&markers=color:red|"+location+"&zoom=15&size="+mapContainer.width+
-                "x"+mapContainer.height+"&sensor=false";
-        mapImage.source=imageSrc;
+            // FIXME: need to cache map image to avoid duplicate download every time
+            var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+e.location+
+                    "&markers=color:red|"+e.location+"&zoom=15&size="+mapContainer.width+
+                    "x"+mapContainer.height+"&sensor=false";
+            mapImage.source = imageSrc;
+        }
+        else {
+            // TODO: use different color for empty text
+            locationLabel.text = i18n.tr("Not specified")
+            mapImage.source = "";
+        }
     }
 
     tools: ToolbarItems {
@@ -195,6 +198,7 @@
                 id: mapContainer
                 width:parent.width
                 height: units.gu(10)
+                visible: mapImage.status == Image.Ready
 
                 Image {
                     id: mapImage