Merge lp:~rpadovani/webbrowser-app/remember-height-width-destkop into lp:webbrowser-app

[Riccardo Padovani]

Remember position (x and y), height and width on desktop at restart

Remember position (x and y), height and width on desktop at restart.

When you click reset in settings, it reset height and width but not the position. Does it make sense? Should I reset all 4? (or no one of them)?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:966
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1634/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/392
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19577

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1634/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

I think it would be ok to reset all 4 values.

This would need to be implemented for the webapp container as well, i.e. at BrowserWindow level (src/app/BrowserWindow.qml), and thus I guess it would make sense to store those values separately. The documentation for Qt.labs.settings isn’t really clear about that, so this would need to be tested: can we have two separate Settings object instances, each with a group of different properties, and have all of them written to the same file? If so, then we could have a generic Settings instance in BrowserWindow.qml for x, y, width and height, and the rest of the app-specific settings in Browser.qml.

[lp:~rpadovani/webbrowser-app/remember-height-width-destkop]

967. By Riccardo Padovani on 2015-04-27

Reset also x and y size on reset settings

[Riccardo Padovani (rpadovani)]

> I think it would be ok to reset all 4 values.

Done.

About Webapps, I thought about them, my doubt is: if we add a new settings object in the BrowserWindow.qml (and let's say it works) then how do we access it from Browser.qml to reset properties?

Maybe is better to create a new Settings object to WebApp.qml? (And maybe in future allow webapps to create settings)?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1691/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2450/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/448
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19922

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1691/rebuild

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Superseeded by https://code.launchpad.net/~fboucault/webbrowser-app/save_window_size/+merge/317467

Unmerged revisions

967. By Riccardo Padovani on 2015-04-27

Reset also x and y size on reset settings

966. By Riccardo Padovani on 2015-04-13

Remember height, width and position at next restart on desktop

965. By Launchpad Translations on behalf of phablet-team on 2015-04-13

Launchpad automatic translations update.

964. By Launchpad Translations on behalf of phablet-team on 2015-04-12

Launchpad automatic translations update.

963. By Launchpad Translations on behalf of phablet-team on 2015-04-11

Launchpad automatic translations update.

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-04-22 10:25:50 +0000
+++ src/app/webbrowser/Browser.qml	2015-04-27 07:25:56 +0000
@@ -34,6 +34,10 @@
 
     property var historyModel: (historyModelLoader.status == Loader.Ready) ? historyModelLoader.item : null
     property var bookmarksModel: (bookmarksModelLoader.status == Loader.Ready) ? bookmarksModelLoader.item : null
+    property alias browserWidth: settings.width
+    property alias browserHeight: settings.height
+    property alias browserX: settings.x
+    property alias browserY: settings.y
 
     property bool newSession: false
 
@@ -82,12 +86,20 @@
         property string searchEngine: settingsDefaults.searchEngine
         property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
         property bool restoreSession: settingsDefaults.restoreSession
+        property int height: settingsDefaults.height
+        property int width: settingsDefaults.width
+        property int x: settingsDefaults.x
+        property int y: settingsDefaults.y
 
         function restoreDefaults() {
             homepage  = settingsDefaults.homepage
             searchEngine = settingsDefaults.searchEngine
             allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
             restoreSession = settingsDefaults.restoreSession
+            height = settingsDefaults.height
+            width = settingsDefaults.width
+            x = settingsDefaults.x
+            y = settingsDefaults.y
         }
     }
 
@@ -98,6 +110,10 @@
         readonly property string searchEngine: "google"
         readonly property string allowOpenInBackgroundTab: "default"
         readonly property bool restoreSession: true
+        readonly property int height: 600
+        readonly property int width: 800
+        readonly property int x: 0
+        readonly property int y: 0
     }
 
     Item {

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2015-03-23 22:35:12 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2015-04-27 07:25:56 +0000
@@ -25,9 +25,23 @@
 
     property alias urls: browser.initialUrls
     property alias newSession: browser.newSession
+    property alias browserHeight: browser.browserHeight
+    property alias browserWidth: browser.browserWidth
+    property alias browserX: browser.browserX
+    property alias browserY: browser.browserY
 
     currentWebview: browser.currentWebview
 
+    height: browserHeight
+    width: browserWidth
+    x: browserX
+    y: browserY
+
+    Binding { target: window; property: "browserHeight"; value: height }
+    Binding { target: window; property: "browserWidth"; value: width }
+    Binding { target: window; property: "browserX"; value: x }
+    Binding { target: window; property: "browserY"; value: y }
+
     title: {
         if (browser.title) {
             // TRANSLATORS: %1 refers to the current page’s title