From c7c6a2c596637fd4942c7fb80341ca2ef7b47808 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Thu, 9 Aug 2012 16:38:56 +0200 Subject: moving scanner logic to ui, new icon --- sowatchui/qml/MainPage.qml | 6 ++++++ sowatchui/qml/WatchPage.qml | 1 + sowatchui/qml/main.qml | 13 ------------- 3 files changed, 7 insertions(+), 13 deletions(-) (limited to 'sowatchui/qml') 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") - } - } - } - } } -- cgit v1.2.3