diff options
| -rw-r--r-- | qml/pages/WatchPage.qml | 29 | ||||
| -rw-r--r-- | rpm/waterwatch.yaml | 22 |
2 files changed, 40 insertions, 11 deletions
diff --git a/qml/pages/WatchPage.qml b/qml/pages/WatchPage.qml index bf76338..7cf77c4 100644 --- a/qml/pages/WatchPage.qml +++ b/qml/pages/WatchPage.qml @@ -37,6 +37,8 @@ import Sailfish.Bluetooth 1.0 import Bluetooth 0.0 import org.nemomobile.voicecall 1.0 import org.nemomobile.notifications 1.0 +import org.nemomobile.messages.internal 1.0 +import org.nemomobile.commhistory 1.0 import watch 0.1 Page { @@ -52,6 +54,7 @@ Page { } property var callerDetails: new Object + // This actually handles the voice call in SailfisOS VoiceCallManager { id:manager @@ -120,6 +123,7 @@ Page { onTriggered: manager.updateState() } + // Receive the calls Instantiator { id: callMonitor model: manager.voiceCalls @@ -152,6 +156,29 @@ Page { } } + // Handle SMS + ClassZeroSMSModel { + id: classZeroSMS + property Component dialogComponent + + onNewMessage: { + console.log("New message: " + text) + /* + if (dialogComponent === null) { + dialogComponent = Qt.createComponent("pages/ClassZeroSMS.qml") + if (dialogComponent.status === Component.Error) + console.log("ClassZeroSMS: ", dialogComponent.errorString()) + } + + var dialog = dialogComponent.createObject(mainWindow, { "messageToken": messageToken, "text": text }) + dialog.visibleChanged.connect(function() { if (!dialog.visible) { dialog.destroy() } }) + dialog.activate() + */ + + classZeroSMS.clear() + } + } + SilicaFlickable { anchors.fill: parent @@ -171,6 +198,7 @@ Page { text: "Waiting for watch...\nIf it can't be found plase\ncheck it's available and\npaired in Bluetooth settings." width: column.width } + // Select the device Repeater { model: KnownDevicesModel { id: knownDevicesModel } delegate: ListItem { @@ -181,6 +209,7 @@ Page { } onVisibleChanged: { if (pairedItem.visible) { + // Connect with the device watchConnector.deviceConnect(model.alias, model.address); } } diff --git a/rpm/waterwatch.yaml b/rpm/waterwatch.yaml index c2e84c7..e2f0359 100644 --- a/rpm/waterwatch.yaml +++ b/rpm/waterwatch.yaml @@ -12,20 +12,20 @@ Description: | Configure: none Builder: qtc5 PkgConfigBR: -- sailfishapp >= 0.0.10 -- Qt5Core -- Qt5Qml -- Qt5Quick - Qt5Bluetooth +- Qt5Quick +- Qt5Qml +- Qt5Core +- sailfishapp >= 0.0.10 Requires: - sailfishsilica-qt5 >= 0.10.9 Files: -- /usr/share/icons/hicolor/86x86/apps -- /usr/share/applications -- /usr/share/waterwatch -- /usr/bin -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/%{name}/qml' - '%{_bindir}' +- '%{_datadir}/%{name}/qml' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- /usr/bin +- /usr/share/waterwatch +- /usr/share/applications +- /usr/share/icons/hicolor/86x86/apps PkgBR: [] |