diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2012-08-09 16:38:56 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2012-08-09 16:38:56 +0200 |
| commit | c7c6a2c596637fd4942c7fb80341ca2ef7b47808 (patch) | |
| tree | 0d4196fa95444dd7e14fbaed61299454609d4762 /sowatchui/qml | |
| parent | 406332eb6b3199d19388f359d04c9f184e6082b5 (diff) | |
| download | sowatch-c7c6a2c596637fd4942c7fb80341ca2ef7b47808.tar.gz sowatch-c7c6a2c596637fd4942c7fb80341ca2ef7b47808.zip | |
moving scanner logic to ui, new icon
Diffstat (limited to 'sowatchui/qml')
| -rw-r--r-- | sowatchui/qml/MainPage.qml | 6 | ||||
| -rw-r--r-- | sowatchui/qml/WatchPage.qml | 1 | ||||
| -rw-r--r-- | sowatchui/qml/main.qml | 13 |
3 files changed, 7 insertions, 13 deletions
diff --git a/sowatchui/qml/MainPage.qml b/sowatchui/qml/MainPage.qml index b660161..d722b3d 100644 --- a/sowatchui/qml/MainPage.qml +++ b/sowatchui/qml/MainPage.qml @@ -6,6 +6,7 @@ Page { id: mainPage anchors.leftMargin: UiConstants.DefaultMargin anchors.rightMargin: UiConstants.DefaultMargin + orientationLock: PageOrientation.LockPortrait tools: ToolBarLayout { ToolIcon { @@ -30,6 +31,11 @@ Page { anchors.right: parent.right; anchors.verticalCenter: parent.verticalCenter } + + onClicked: { + var page = Qt.createComponent("WatchPage.qml"); + pageStack.push(page); + } } } ScrollDecorator { diff --git a/sowatchui/qml/WatchPage.qml b/sowatchui/qml/WatchPage.qml index fb7011c..8159834 100644 --- a/sowatchui/qml/WatchPage.qml +++ b/sowatchui/qml/WatchPage.qml @@ -6,6 +6,7 @@ Page { id: watchPage anchors.leftMargin: UiConstants.DefaultMargin anchors.rightMargin: UiConstants.DefaultMargin + orientationLock: PageOrientation.LockPortrait tools: ToolBarLayout { ToolIcon { diff --git a/sowatchui/qml/main.qml b/sowatchui/qml/main.qml index ca838a2..0fd3ad0 100644 --- a/sowatchui/qml/main.qml +++ b/sowatchui/qml/main.qml @@ -9,17 +9,4 @@ PageStackWindow { MainPage { id: mainPage } - - Menu { - id: myMenu - visualParent: pageStack - MenuLayout { - MenuItem { - text: qsTr("Crap") - onClicked: { - console.log("Crap") - } - } - } - } } |