diff options
| -rw-r--r-- | app/app.pro | 4 | ||||
| -rw-r--r-- | app/qml/pages/AppConfigDialog.qml (renamed from app/qml/pages/AppConfigPage.qml) | 10 | ||||
| -rw-r--r-- | app/qml/pages/WatchPage.qml | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/app/app.pro b/app/app.pro index 48fcf68..9cc2d09 100644 --- a/app/app.pro +++ b/app/app.pro @@ -27,5 +27,5 @@ OTHER_FILES += \ qml/images/* \ pebble.desktop \ pebble.png \ - qml/pages/AppConfigPage.qml \ - qml/pages/InstallAppDialog.qml + qml/pages/InstallAppDialog.qml \ + qml/pages/AppConfigDialog.qml diff --git a/app/qml/pages/AppConfigPage.qml b/app/qml/pages/AppConfigDialog.qml index 00eb05c..65a1f5b 100644 --- a/app/qml/pages/AppConfigPage.qml +++ b/app/qml/pages/AppConfigDialog.qml @@ -3,10 +3,11 @@ import QtQml 2.1 import QtWebKit 3.0 import Sailfish.Silica 1.0 -Page { +Dialog { id: appConfigPage property alias url: webview.url + property string uuid property string name SilicaWebView { @@ -14,7 +15,7 @@ Page { visible: url != "" anchors.fill: parent - header: PageHeader { + header: DialogHeader { title: "Configuring " + name } @@ -25,7 +26,8 @@ Page { var data = decodeURIComponent(url.substring(17)); console.log("appconfig requesting close; data: " + data); pebbled.setAppConfiguration(uuid, data); - pageStack.pop(); + appConfigPage.canAccept = true; + appConfigPage.accept(); request.action = WebView.IgnoreRequest; } else { request.action = WebView.AcceptRequest; @@ -46,4 +48,6 @@ Page { } color: Theme.highlightColor } + + canAccept: false } diff --git a/app/qml/pages/WatchPage.qml b/app/qml/pages/WatchPage.qml index 3a712ab..9096df6 100644 --- a/app/qml/pages/WatchPage.qml +++ b/app/qml/pages/WatchPage.qml @@ -109,8 +109,9 @@ Page { console.log("going to call configure on app with uuid " + uuid); var url = pebbled.configureApp(uuid); console.log("received url: " + url); - pageStack.push(Qt.resolvedUrl("AppConfigPage.qml"), { + pageStack.push(Qt.resolvedUrl("AppConfigDialog.qml"), { url: url, + uuid: uuid, name: appInfo.longName }); } |