diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2014-09-25 20:11:32 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@digia.com> | 2014-09-26 09:38:04 +0200 |
| commit | bee07cc08bfcef6067150e63ce231c39404660dc (patch) | |
| tree | efb9bd1f6d97faa4e51c4938a1fb5a2247430bf8 /qml | |
| parent | 1e708e42c7a8df6dad83a438558cd0e120a0ba34 (diff) | |
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>
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/components/HomeScreen.qml | 21 |
1 files changed, 13 insertions, 8 deletions
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 { |