diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-10-13 14:22:25 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-10-14 13:08:45 +0200 |
| commit | 627e2f544bcf2c0d5562be5c6ae8d3960323469d (patch) | |
| tree | 6d76c39c2b8c56ced885961f6614d9d37b1f2ba8 /qml | |
| parent | 0625c1941bd84a5b5d81a743f17183fa1034914e (diff) | |
Add conference id to events and favorites
Change-Id: I9bfa2aad533a1de595a4509a3549410205d7d951
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/components/Event.qml | 2 | ||||
| -rw-r--r-- | qml/components/EventsList.qml | 2 | ||||
| -rw-r--r-- | qml/main.qml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qml/components/Event.qml b/qml/components/Event.qml index d1cd688..4bb1e95 100644 --- a/qml/components/Event.qml +++ b/qml/components/Event.qml @@ -64,7 +64,7 @@ Rectangle { SubTitle { id: subTitle - titleText: Theme.text.talks + titleText: Theme.text.talks.arg(applicationClient.currentConferenceDetails.title) } Flickable { diff --git a/qml/components/EventsList.qml b/qml/components/EventsList.qml index f34a53d..d053d84 100644 --- a/qml/components/EventsList.qml +++ b/qml/components/EventsList.qml @@ -50,7 +50,7 @@ Rectangle { SubTitle { id: subTitle - titleText: isFavoriteView ? Theme.text.favorites : Theme.text.talks + titleText: isFavoriteView ? Theme.text.favorites.arg(applicationClient.currentConferenceDetails.title) : Theme.text.talks.arg(applicationClient.currentConferenceDetails.title) } ListView { diff --git a/qml/main.qml b/qml/main.qml index 632f834..0859980 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -85,10 +85,10 @@ ApplicationWindow { ListModel { id: menuModel Component.onCompleted: { - append({name: Theme.text.home, id: "home" }) + append({name: Theme.text.home.arg(applicationClient.currentConferenceDetails.title), id: "home" }) append({name: Theme.text.schedule, id: "schedule" }) - append({name: Theme.text.talks, id: "talks" }) - append({name: Theme.text.favorites, id: "favorites" }) + append({name: Theme.text.talks.arg(""), id: "talks" }) + append({name: Theme.text.favorites.arg(""), id: "favorites" }) append({name: Theme.text.floorPlan, id: "floorPlan" }) append({name: Theme.text.switchConf, id: "switchConf" }) menuRectangle.height = Theme.sizes.buttonHeight * menuModel.count |