Merge lp:~joergberroth/unav/fixFirstIcon into lp:unav

[JkB]

*fix Location.qml first item in history view

*fix Location.qml: first item in history view

[costales (costales)]

Awesome! Thanks a lot Joerg :D

review: Approve

=== modified file 'qml/Location.qml'
--- qml/Location.qml	2016-07-15 15:49:25 +0000
+++ qml/Location.qml	2016-07-15 19:13:40 +0000
@@ -35,6 +35,10 @@
         id: xmlSearchModel
 
         onStatusChanged: {
+            if (status === XmlListModel.Loading) {
+                historyModel.clear();
+            }
+
             if (status === XmlListModel.Error) {
                 historyModel.clear();
                 statusLabel.text = i18n.tr("Time out! Please try again");
@@ -48,12 +52,16 @@
                 statusLabel.text = i18n.tr("Sorry, nothing found. Try another search")
                 statusLabel.visible = true;
                 historyIcon.visible =  false;
+                listView.model = historyModel
+                listView.delegate = historyDelegateComponent
             }
 
             else if (status === XmlListModel.Ready && count >> 0) {
                 statusLabel.visible = false;
                 historyIcon.visible =  false;
                 sortedSearchModel.sortXmlList();
+                listView.model = sortedSearchModel
+                listView.delegate = searchDelegateComponent
             }
         }
 
@@ -194,8 +202,8 @@
 
         clip: true
         anchors { fill: parent; topMargin: units.gu(2) }
-        model: xmlSearchModel.status !== XmlListModel.Loading && sortedSearchModel.count === 0 ? historyModel : sortedSearchModel
-        delegate: xmlSearchModel.status !== XmlListModel.Loading && sortedSearchModel.count === 0 ? historyDelegateComponent : searchDelegateComponent
+        model: historyModel
+        delegate: historyDelegateComponent
 
         section.property: "title"
         section.criteria: ViewSection.FullString