summaryrefslogtreecommitdiff
path: root/qml
diff options
context:
space:
mode:
authorJavier S. Pedro <dev.git@javispedro.com>2014-09-06 03:25:38 +0200
committerJavier S. Pedro <dev.git@javispedro.com>2014-09-06 03:25:38 +0200
commited40a7f1cbc1da5ae21c58882df241fc0071c2f7 (patch)
treea3e34febb658c4cc5b631577d685361ab489678a /qml
parent643db0927177037646b61cc4af21b9af1428b0e4 (diff)
downloadsalmeta-ed40a7f1cbc1da5ae21c58882df241fc0071c2f7.tar.gz
salmeta-ed40a7f1cbc1da5ae21c58882df241fc0071c2f7.zip
adding initial UI to select device
Diffstat (limited to 'qml')
-rw-r--r--qml/cover/CoverPage.qml14
-rw-r--r--qml/pages/FirstPage.qml114
-rw-r--r--qml/pages/SecondPage.qml62
3 files changed, 56 insertions, 134 deletions
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index 786b78f..e6c3216 100644
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -35,19 +35,7 @@ CoverBackground {
Label {
id: label
anchors.centerIn: parent
- text: qsTr("My Cover")
- }
-
- CoverActionList {
- id: coverAction
-
- CoverAction {
- iconSource: "image://theme/icon-cover-next"
- }
-
- CoverAction {
- iconSource: "image://theme/icon-cover-pause"
- }
+ text: "Salmeta"
}
}
diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
index 14d7410..b86029e 100644
--- a/qml/pages/FirstPage.qml
+++ b/qml/pages/FirstPage.qml
@@ -1,73 +1,69 @@
-/*
- Copyright (C) 2013 Jolla Ltd.
- Contact: Thomas Perl <thomas.perl@jollamobile.com>
- All rights reserved.
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Bluetooth 1.0
+import org.nemomobile.configuration 1.0
+import com.javispedro.salmeta 1.0
- You may use this file under the terms of BSD license as follows:
+Page {
+ id: page
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the Jolla Ltd nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
+ ConfigurationValue {
+ id: deviceAddress
+ key: settingsPrefix + "/address"
+ defaultValue: "Select"
+ }
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ SilicaFlickable {
+ anchors.fill: parent
-import QtQuick 2.0
-import Sailfish.Silica 1.0
+ PullDownMenu {
+ MenuItem {
+ text: qsTr("Not done yet")
+ }
+ }
+ contentHeight: column.height
-Page {
- id: page
+ Column {
+ id: column
+ width: page.width
+ spacing: Theme.paddingLarge
+
+ PageHeader {
+ title: "Salmeta"
+ }
+
+ SectionHeader {
+ text: qsTr("Device settings");
+ }
- // To enable PullDownMenu, place our content in a SilicaFlickable
- SilicaFlickable {
- anchors.fill: parent
+ ValueButton {
+ x: Theme.paddingLarge
+ label: "Device"
+ value: deviceAddress.value
- // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
- PullDownMenu {
- MenuItem {
- text: qsTr("Show Page 2")
- onClicked: pageStack.push(Qt.resolvedUrl("SecondPage.qml"))
- }
- }
+ onClicked: {
+ var dialog = pageStack.push("Sailfish.Bluetooth.BluetoothDevicePickerDialog");
- // Tell SilicaFlickable the height of its content.
- contentHeight: column.height
+ dialog.selectedDeviceChanged.connect(function() {
+ if (dialog.selectedDevice != "") {
+ deviceAddress.value = dialog.selectedDevice
+ }
+ });
+ }
+ }
- // Place our content in a Column. The PageHeader is always placed at the top
- // of the page, followed by our content.
- Column {
- id: column
+ SectionHeader {
+ text: qsTr("Widgets");
+ }
- width: page.width
- spacing: Theme.paddingLarge
- PageHeader {
- title: qsTr("UI Template")
- }
- Label {
- x: Theme.paddingLarge
- text: qsTr("Hello Sailors")
- color: Theme.secondaryHighlightColor
- font.pixelSize: Theme.fontSizeExtraLarge
- }
- }
- }
+ WatchView {
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: 96 * 4
+ height: 96 * 4
+ }
+ }
+ }
}
diff --git a/qml/pages/SecondPage.qml b/qml/pages/SecondPage.qml
deleted file mode 100644
index 4f37362..0000000
--- a/qml/pages/SecondPage.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- Copyright (C) 2013 Jolla Ltd.
- Contact: Thomas Perl <thomas.perl@jollamobile.com>
- All rights reserved.
-
- You may use this file under the terms of BSD license as follows:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the Jolla Ltd nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-
-
-Page {
- id: page
- SilicaListView {
- id: listView
- model: 20
- anchors.fill: parent
- header: PageHeader {
- title: qsTr("Nested Page")
- }
- delegate: BackgroundItem {
- id: delegate
-
- Label {
- x: Theme.paddingLarge
- text: qsTr("Item") + " " + index
- anchors.verticalCenter: parent.verticalCenter
- color: delegate.highlighted ? Theme.highlightColor : Theme.primaryColor
- }
- onClicked: console.log("Clicked " + index)
- }
- VerticalScrollDecorator {}
- }
-}
-
-
-
-
-