diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2014-08-06 01:08:33 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2014-08-06 01:08:33 +0200 |
| commit | c1534c22728355e658b275cf3f6ef13e85915676 (patch) | |
| tree | c4899b2f9fada23476e0566a9b0b101679f822f3 /app | |
| parent | 3d797fa577b640efc524467092ac502e783203f5 (diff) | |
Pages layouts improvements
Diffstat (limited to 'app')
| -rw-r--r-- | app/qml/pages/AboutPage.qml | 4 | ||||
| -rw-r--r-- | app/qml/pages/ManagerPage.qml | 18 | ||||
| -rw-r--r-- | app/qml/pages/WatchPage.qml | 34 |
3 files changed, 36 insertions, 20 deletions
diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml index 200abdf..bec1031 100644 --- a/app/qml/pages/AboutPage.qml +++ b/app/qml/pages/AboutPage.qml @@ -6,10 +6,12 @@ Page { id: page SilicaFlickable { + id: flickable anchors.fill: parent - contentHeight: column.height + VerticalScrollDecorator { flickable: flickable } + Column { id: column width: page.width diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml index 303c2fa..af247f5 100644 --- a/app/qml/pages/ManagerPage.qml +++ b/app/qml/pages/ManagerPage.qml @@ -53,9 +53,12 @@ Page { } SilicaFlickable { + id: flickable anchors.fill: parent contentHeight: column.height + VerticalScrollDecorator { flickable: flickable } + PullDownMenu { MenuItem { text: qsTr("About") @@ -85,16 +88,13 @@ Page { } } - ListItem { + Button { visible: pebbled.connected - Label { - text: pebbled.name - truncationMode: TruncationMode.Fade - anchors { - left: parent.left - right: parent.right - margins: Theme.paddingLarge - } + text: pebbled.name + anchors { + left: parent.left + right: parent.right + margins: Theme.paddingLarge } onClicked: pageStack.push(Qt.resolvedUrl("WatchPage.qml")) } diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml index 68502bd..90e5ec9 100644 --- a/app/qml/pages/WatchPage.qml +++ b/app/qml/pages/WatchPage.qml @@ -37,10 +37,12 @@ Page { id: page SilicaFlickable { + id: flickable anchors.fill: parent - contentHeight: column.height + VerticalScrollDecorator { flickable: flickable } + Column { id: column @@ -50,19 +52,31 @@ Page { title: pebbled.name } - Button { - text: "Ping" - onClicked: { - pebbled.ping(66) + Row { + anchors { + left: parent.left + right: parent.right + margins: Theme.paddingLarge } - } - Button { - text: "Sync Time" - onClicked: { - pebbled.time() + + Button { + text: "Ping" + width: parent.width / 2 + onClicked: { + pebbled.ping(66) + } + } + + Button { + text: "Sync Time" + width: parent.width / 2 + onClicked: { + pebbled.time() + } } } + } } } |