diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:17:53 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-22 19:49:07 +0200 |
| commit | c2c141ed1e13e6f0fbc740d0ff37caba0b2a7c08 (patch) | |
| tree | a7892e105c85c7d4a32d3b3202e60ec2131e42c8 /app/qml/pages/ManagerPage.qml | |
| parent | c9c1ed9faee07c0067827872ffe465d465c81470 (diff) | |
| parent | 9f8db04d6059e0b220e36a064d694a1b0649f5f0 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
Diffstat (limited to 'app/qml/pages/ManagerPage.qml')
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index a6b6699..6f94e4b 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -45,9 +45,15 @@ Page { SilicaFlickable { anchors.fill: parent - contentHeight: column.height + PullDownMenu { + MenuItem { + text: qsTr("About") + onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml")) + } + } + Column { id: column |