summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJavier <dev.git@javispedro.com>2014-12-21 22:36:14 +0100
committerJavier <dev.git@javispedro.com>2014-12-21 22:36:14 +0100
commite6ec758b364fcaf9fda35e56740c3fcd7e8fe25e (patch)
tree1bf3d245abd0ec473e3d16385a43ad1b3307aeab /app
parented43269c2adebed7baf4e2452f998d7e60c797e6 (diff)
use overridePageStackNavigation to ensure accept() works
Diffstat (limited to 'app')
-rw-r--r--app/qml/pages/AppConfigDialog.qml2
-rw-r--r--app/translations/pebble-es.ts2
-rw-r--r--app/translations/pebble.ts2
3 files changed, 4 insertions, 2 deletions
diff --git a/app/qml/pages/AppConfigDialog.qml b/app/qml/pages/AppConfigDialog.qml
index 304bced..1562985 100644
--- a/app/qml/pages/AppConfigDialog.qml
+++ b/app/qml/pages/AppConfigDialog.qml
@@ -21,6 +21,8 @@ Dialog {
VerticalScrollDecorator { flickable: webview }
+ overridePageStackNavigation: true
+
onNavigationRequested: {
console.log("appconfig navigation requested to " + request.url);
var url = request.url.toString();
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 18b1ec2..0316ecb 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -22,7 +22,7 @@
<context>
<name>AppConfigDialog</name>
<message>
- <location filename="../qml/pages/AppConfigDialog.qml" line="74"/>
+ <location filename="../qml/pages/AppConfigDialog.qml" line="75"/>
<source>No configuration settings available</source>
<translation>No hay opciones disponibles para configurar</translation>
</message>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index 222645c..7a78d9d 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -22,7 +22,7 @@
<context>
<name>AppConfigDialog</name>
<message>
- <location filename="../qml/pages/AppConfigDialog.qml" line="74"/>
+ <location filename="../qml/pages/AppConfigDialog.qml" line="75"/>
<source>No configuration settings available</source>
<translation type="unfinished"></translation>
</message>