Merge lp:~vthompson/ubuntu-filemanager-app/1312883-initialize-setting into lp:ubuntu-filemanager-app

[Victor Thompson]

Default to icon/grid view only when in wide aspect mode

This change defaults the app to list view mode when not in wide aspect mode. To test this you'll need to remove the LocalSettings db on the device by running the following command prior to running the app:

"rm -rf /home/phablet/.local/share/com.ubuntu.filemanager/ubuntu-filemanager-app.db"

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:165
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/175/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2250
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/125

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/175/rebuild

review: Approve (continuous-integration)

[Michael Spencer (ibelieve)]

Thanks for fixing this, the code looks good!

review: Approve

=== modified file 'src/app/qml/ubuntu-filemanager-app.qml'
--- src/app/qml/ubuntu-filemanager-app.qml	2014-03-29 09:11:29 +0000
+++ src/app/qml/ubuntu-filemanager-app.qml	2014-04-27 19:30:46 +0000
@@ -183,7 +183,7 @@
 
     function reloadSettings() {
         //showAdvancedFeatures = getSetting("showAdvancedFeatures", false)
-        viewMethod = getSetting("viewMethod", width > units.gu(40) ? i18n.tr("Icons") : i18n.tr("List"))
+        viewMethod = getSetting("viewMethod", wideAspect ? i18n.tr("Icons") : i18n.tr("List"))
         collapsedSidebar = getSetting("collapsedSidebar", false)
     }