From bee07cc08bfcef6067150e63ce231c39404660dc Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Thu, 25 Sep 2014 20:11:32 +0200
Subject: Fix upcoming event list not being updated after a conference switch

+ Remove unused error item

Change-Id: Ia9adf5d05ffcc34e1df05edef48f17888b316f9d
Reviewed-by: Niels Weber <niels.weber@digia.com>
---
 qml/components/HomeScreen.qml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'qml')

diff --git a/qml/components/HomeScreen.qml b/qml/components/HomeScreen.qml
index e3152de..de67f43 100644
--- a/qml/components/HomeScreen.qml
+++ b/qml/components/HomeScreen.qml
@@ -94,14 +94,6 @@ Rectangle {
         return text.replace(/\n/g, '<br>');
     }
 
-
-    Text {
-        visible: ModelsSingleton.conferenceId === ""
-        text: "Error: " + ModelsSingleton.errorMessage
-        anchors.centerIn: parent
-        font.pointSize: Theme.fonts.eight_pt
-    }
-
     Column {
         spacing: 0
         visible: ModelsSingleton.conferenceId !== ""
@@ -120,8 +112,11 @@ Rectangle {
 
                 function init()
                 {
+                    emptyUpcoming.visible = false
                     if (sortModelNextEvents.rowCount() > 0)
                         upcomingItem.visibleDate = Qt.formatDate(sortModelNextEvents.get(0, "start"), upcomingItem.formatDate)
+                    if (sortModelNextEvents.rowCount() === 0)
+                        emptyUpcoming.visible = true
                 }
 
                 sortRole: "start"
@@ -165,10 +160,20 @@ Rectangle {
                 model: sortModelNextEvents
                 clip: true
                 onVisibleChanged: {
+                    emptyUpcoming.visible = false
                     if (visible && sortModelNextEvents.rowCount() > 0) {
                         sortModelNextEvents.filter()
                         upcomingItem.visibleDate = Qt.formatDate(sortModelNextEvents.get(0, "start"), upcomingItem.formatDate)
                     }
+                    if (sortModelNextEvents.rowCount() === 0)
+                        emptyUpcoming.visible = true
+                }
+                Text {
+                    id: emptyUpcoming
+                    visible: false
+                    text: Theme.text.endedEvent
+                    anchors.centerIn: parent
+                    font.pointSize: Theme.fonts.eight_pt
                 }
                 spacing: Theme.margins.ten
                 delegate: RowLayout {
-- 
cgit v1.2.3