Merge lp:~bfiller/gallery-app/no-fullscreen-on-desktop into lp:gallery-app

[Bill Filler]

don't run in fullscreen if DESKTOP_MODE=1

don't run in fullscreen if DESKTOP_MODE=1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:909
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/637/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2582
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4820
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3314

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2013-10-10 09:19:16 +0000
+++ src/gallery-application.cpp	2014-01-23 20:19:06 +0000
@@ -138,6 +138,15 @@
 }
 
 /*!
+ * \brief GalleryApplication::isDesktopMode
+ * Returns true if the DESKTOP_MODE env var is set
+ */
+bool GalleryApplication::isDesktopMode() const
+{
+  return (qEnvironmentVariableIsSet("DESKTOP_MODE") && (qgetenv("DESKTOP_MODE") == "1"));
+}
+
+/*!
  * \brief GalleryApplication::createView
  * Create the master QDeclarativeView that all the pages will operate within
  */
@@ -151,7 +160,7 @@
         size.transpose();
 
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
-    if (m_cmdLineParser->formFactor() == "desktop") {
+    if (m_cmdLineParser->formFactor() == "desktop" || isDesktopMode()) {
         m_view->setMinimumSize(QSize(60 * m_bguSize, 60 * m_bguSize));
     }
 
@@ -174,7 +183,8 @@
     QObject* rootObject = dynamic_cast<QObject*>(m_view->rootObject());
     QObject::connect(this, SIGNAL(mediaLoaded()), rootObject, SLOT(onLoaded()));
 
-    if (m_cmdLineParser->isFullscreen())
+    //run fullscreen if specified at command line or not in DESKTOP_MODE (i.e. on a device)
+    if (m_cmdLineParser->isFullscreen() || !isDesktopMode())
         m_view->showFullScreen();
     else
         m_view->show();

=== modified file 'src/gallery-application.h'
--- src/gallery-application.h	2013-09-06 16:10:25 +0000
+++ src/gallery-application.h	2014-01-23 20:19:06 +0000
@@ -37,6 +37,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool pickModeEnabled READ pickModeEnabled NOTIFY pickModeEnabledChanged)
+    Q_PROPERTY(bool desktopMode READ isDesktopMode)
 
 public:
     enum UiMode{
@@ -53,6 +54,7 @@
     UiMode defaultUiMode() const;
     void setUiMode(UiMode mode);
     bool pickModeEnabled() const;
+    bool isDesktopMode() const;
 
     Q_INVOKABLE void returnPickedContent(QVariant variant);
     Q_INVOKABLE void contentPickingCanceled();