Merge lp:~saviq/ubuntu-system-settings/dynamic-gu-support into lp:ubuntu-system-settings

[Michał Sawicz]

Dynamic grid unit size support

Also let the view be resized between 40 and 50 GU wide, since that's what will happen on phones anyway.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1596
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2643/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/826
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27997

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2643/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2016-02-04 16:26:15 +0000
+++ src/qml/MainWindow.qml	2016-02-18 15:21:46 +0000
@@ -25,8 +25,8 @@
 
 MainView {
     id: main
-    width: units.gu(50)
-    height: units.gu(90)
+    implicitWidth: units.gu(50)
+    implicitHeight: units.gu(90)
     applicationName: "ubuntu-system-settings"
     objectName: "systemSettingsMainView"
     automaticOrientation: true
@@ -65,9 +65,9 @@
                 Qt.quit()
         }
 
-        // when running in windowed mode, use a fixed width
-        view.minimumWidth  = units.gu(50)
-        view.maximumWidth = units.gu(50)
+        // when running in windowed mode, constrain width
+        view.minimumWidth  = Qt.binding( function() { return units.gu(40) } )
+        view.maximumWidth = Qt.binding( function() { return units.gu(50) } )
     }
 
     Connections {