Merge lp:~unity-2d-team/unity-2d/unity-2d-dash-fullscreen-by-formfactor into lp:unity-2d

[Ugo Riboni]

[dash][panel] Add a new dconf key that defines the device form factor (tv, tablet, phone, desktop...) and force dash fullscreen if it's not desktop

[lp:~unity-2d-team/unity-2d/unity-2d-dash-fullscreen-by-formfactor]

870. By Ugo Riboni on 2012-01-26

Merge changes from parent branch

871. By Ugo Riboni on 2012-01-26

Update tests and add a new one for the new feature

872. By Ugo Riboni on 2012-01-26

Merge fixes to tests from parent branch

873. By Ugo Riboni on 2012-01-26

Fix wrong quoting in dconf calls in tests

874. By Ugo Riboni on 2012-01-27

Merge changes from trunk

875. By Ugo Riboni on 2012-01-27

Add FIXME on workaround for dconf-qt deadlock

Unmerged revisions

=== modified file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	2012-01-24 14:41:27 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2012-01-24 14:41:27 +0000
@@ -8,6 +8,13 @@
         When set to false, the raster engine is used.
       </description>
     </key>
+    <key type="s" name="form-factor">
+      <default>"desktop"</default>
+      <summary>What sort of device Unity is running on.</summary>
+      <description>
+        Unity will adapt its shape and form to the device it is running on.
+      </description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity-2d/launcher/" id="com.canonical.Unity2d.Launcher" gettext-domain="unity-2d">
     <key type="b" name="super-key-enable">

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2012-01-24 14:41:27 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2012-01-24 14:41:27 +0000
@@ -22,7 +22,6 @@
 */
 #include "plugin.h"
 
-#include "dashsettings.h"
 #include "launcherapplication.h"
 #include "launcherdevice.h"
 #include "trash.h"
@@ -50,6 +49,7 @@
 #include "launcherdropitem.h"
 
 #include "config.h"
+#include "dashclient.h"
 
 #include "autohidebehavior.h"
 #include "intellihidebehavior.h"
@@ -81,8 +81,6 @@
 
 #include <X11/Xlib.h>
 
-using namespace Unity2d;
-
 /* FIXME: This should be done more properly, it's just an hack this way.
           We should silence only the errors that we know we can produce.
           We could probably also learn something from gdk-error-trap-push.
@@ -100,8 +98,6 @@
 {
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
 
-    qmlRegisterType<DashSettings>(uri, 0, 1, "DashSettings");
-
     qmlRegisterType<WindowInfo>(uri, 0, 1, "WindowInfo");
     qmlRegisterType<WindowsList>(uri, 0, 1, "WindowsList");
     qmlRegisterType<ScreenInfo>(); // Register the type as non creatable
@@ -162,6 +158,7 @@
     qmlRegisterType<FilterOption>();
     qmlRegisterType<FilterOptions>();
 
+    qmlRegisterType<DashClient>(uri, 0, 1, "DashClient");
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2012-01-19 14:35:41 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2012-01-24 14:41:27 +0000
@@ -4,7 +4,6 @@
 set(lib${LIB_NAME}_SRCS
     bfb.cpp
     dashclient.cpp
-    dashsettings.cpp
     debug.cpp
     gconnector.cpp
     gimageutils.cpp

=== modified file 'libunity-2d-private/src/dashclient.cpp'
--- libunity-2d-private/src/dashclient.cpp	2011-08-11 15:36:04 +0000
+++ libunity-2d-private/src/dashclient.cpp	2012-01-24 14:41:27 +0000
@@ -22,6 +22,7 @@
 #include "dashclient.h"
 
 // Local
+#include "config.h"
 
 // libunity-2d
 #include <debug_p.h>
@@ -32,15 +33,21 @@
 #include <QDBusConnectionInterface>
 #include <QDBusInterface>
 #include <QDBusServiceWatcher>
+#include <QDesktopWidget>
+#include <QRect>
 
 static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
 static const char* DASH_DBUS_PATH = "/Dash";
 static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
 
+static const int DASH_MIN_SCREEN_WIDTH = 1280;
+static const int DASH_MIN_SCREEN_HEIGHT = 1084;
+
 DashClient::DashClient(QObject* parent)
 : QObject(parent)
 , m_dashDbusIface(0)
 , m_dashActive(false)
+, m_alwaysFullScreen(false)
 {
     /* Check if the dash is already up and running by asking the bus instead of
        trying to create an instance of the interface. Creating an instance would
@@ -59,6 +66,14 @@
                                                                this);
         connect(watcher, SIGNAL(serviceRegistered(QString)), SLOT(connectToDash()));
     }
+
+    connect(QApplication::desktop(), SIGNAL(resized(int)), SLOT(updateAlwaysFullScreen()));
+
+    // NOTE: we need to use a queued connection here otherwise QConf will deadlock for some reason
+    // when we read any property from the slot (which we need to do).
+    connect(&unity2dConfiguration(), SIGNAL(formFactorChanged(QString)),
+                                     SLOT(updateAlwaysFullScreen()), Qt::QueuedConnection);
+    updateAlwaysFullScreen();
 }
 
 void DashClient::connectToDash()
@@ -152,4 +167,31 @@
     }
 }
 
+QSize DashClient::minimumSizeForDesktop()
+{
+    return QSize(DASH_MIN_SCREEN_WIDTH, DASH_MIN_SCREEN_HEIGHT);
+}
+
+void DashClient::updateAlwaysFullScreen()
+{
+    bool alwaysFullScreen;
+    if (unity2dConfiguration().property("formFactor").toString() != "desktop") {
+        alwaysFullScreen = true;
+    } else {
+        QRect rect = QApplication::desktop()->screenGeometry();
+        QSize minSize = minimumSizeForDesktop();
+        alwaysFullScreen = rect.width() < minSize.width() && rect.height() < minSize.height();
+    }
+
+    if (m_alwaysFullScreen != alwaysFullScreen) {
+        m_alwaysFullScreen = alwaysFullScreen;
+        Q_EMIT alwaysFullScreenChanged();
+    }
+}
+
+bool DashClient::alwaysFullScreen() const
+{
+    return m_alwaysFullScreen;
+}
+
 #include "dashclient.moc"

=== modified file 'libunity-2d-private/src/dashclient.h'
--- libunity-2d-private/src/dashclient.h	2011-08-11 15:36:04 +0000
+++ libunity-2d-private/src/dashclient.h	2012-01-24 14:41:27 +0000
@@ -25,6 +25,7 @@
 
 // Qt
 #include <QObject>
+#include <QSize>
 
 class QDBusInterface;
 
@@ -34,7 +35,10 @@
 class DashClient : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(bool alwaysFullScreen READ alwaysFullScreen NOTIFY alwaysFullScreenChanged)
+
 public:
+    DashClient(QObject* parent = 0);
     static DashClient* instance();
 
     /**
@@ -44,25 +48,28 @@
      * - "" if the dash is not visible
      */
     QString activePage() const;
-
+    bool alwaysFullScreen() const;
     void setActivePage(const QString& page, const QString& lensId=QString());
+    static QSize minimumSizeForDesktop();
 
 Q_SIGNALS:
     void activePageChanged(const QString&);
+    void alwaysFullScreenChanged();
 
 private Q_SLOTS:
     void connectToDash();
     void slotDashActiveChanged(bool);
     void slotDashActiveLensChanged(const QString&);
+    void updateAlwaysFullScreen();
 
 private:
-    DashClient(QObject* parent=0);
     void updateActivePage();
 
     QDBusInterface* m_dashDbusIface;
     bool m_dashActive;
     QString m_dashActiveLens;
     QString m_activePage;
+    bool m_alwaysFullScreen;
 };
 
 #endif /* DASHCLIENT_H */

=== removed file 'libunity-2d-private/src/dashsettings.cpp'
--- libunity-2d-private/src/dashsettings.cpp	2012-01-24 14:41:27 +0000
+++ libunity-2d-private/src/dashsettings.cpp	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Alberto Mardegan <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-// Self
-#include "dashsettings.h"
-
-#include <config.h>
-
-static const int DASH_MIN_SCREEN_WIDTH = 1280;
-static const int DASH_MIN_SCREEN_HEIGHT = 1084;
-
-namespace Unity2d {
-
-DashSettings::DashSettings(QObject* parent):
-    QObject(parent)
-{
-}
-
-static int getenvInt(const char* name, int defaultValue)
-{
-    QByteArray stringValue = qgetenv(name);
-    bool ok;
-    int value = stringValue.toInt(&ok);
-    return ok ? value : defaultValue;
-}
-
-QSize DashSettings::minimumSizeForDesktop()
-{
-    static int minWidth = getenvInt("DASH_MIN_SCREEN_WIDTH",
-                                    DASH_MIN_SCREEN_WIDTH);
-    static int minHeight = getenvInt("DASH_MIN_SCREEN_HEIGHT",
-                                     DASH_MIN_SCREEN_HEIGHT);
-    return QSize(minWidth, minHeight);
-}
-
-}; // namespace Unity2d
-
-#include "dashsettings.moc"

=== removed file 'libunity-2d-private/src/dashsettings.h'
--- libunity-2d-private/src/dashsettings.h	2012-01-24 14:41:27 +0000
+++ libunity-2d-private/src/dashsettings.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2011 Canonical Ltd.
- *
- * Authors:
- * - Alberto Mardegan <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef DASHSETTINGS_H
-#define DASHSETTINGS_H
-
-// Qt
-#include <QObject>
-#include <QSize>
-
-namespace Unity2d {
-
-/**
- * Provide easy access to the Dash settings (from Qt and QML)
- */
-class DashSettings: public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit DashSettings(QObject* parent = 0);
-
-    static QSize minimumSizeForDesktop();
-
-private:
-    Q_DISABLE_COPY(DashSettings)
-};
-
-} // namespace Unity2d
-
-#endif /* DASHSETTINGS_H */

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-01-13 17:33:12 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-01-24 14:41:27 +0000
@@ -28,6 +28,7 @@
 #include "panelstyle.h"
 #include "unity2dpanel.h"
 #include "windowhelper.h"
+#include "dashclient.h"
 
 // Unity-2d
 #include <debug_p.h>
@@ -226,6 +227,8 @@
     d->setupMenuBarWidget(panel->indicatorsManager());
     d->setupKeyboardModifiersMonitor();
 
+    connect(DashClient::instance(), SIGNAL(alwaysFullScreenChanged()), SLOT(updateWidgets()));
+
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -259,7 +262,7 @@
         || d->m_menuBarWidget->isOpened()
         );
     bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
-    bool dashCanResize = d->m_windowHelper->dashCanResize();
+    bool dashCanResize = !DashClient::instance()->alwaysFullScreen();
     bool dashIsVisible = d->m_windowHelper->dashIsVisible();
     bool showWindowButtons = (isOpened && isMaximized) || dashIsVisible;
     bool showAppLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-01-24 14:41:27 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-01-24 14:41:27 +0000
@@ -26,7 +26,7 @@
 #include "config.h"
 
 // unity-2d
-#include <dashsettings.h>
+#include <dashclient.h>
 #include <debug_p.h>
 #include <gconnector.h>
 #include <screeninfo.h>
@@ -53,32 +53,11 @@
 #include <X11/Xatom.h>
 #include <QX11Info>
 
-using namespace Unity2d;
-
 struct WindowHelperPrivate
 {
-    void updateDashCanResize()
-    {
-        WnckScreen* screen = wnck_window_get_screen(m_window);
-        int screenNumber = wnck_screen_get_number(screen);
-        QRect rect = QApplication::desktop()->screenGeometry(screenNumber);
-
-        /* If the screen size too small, we don't allow the Dash to be used
-         * in Desktop mode (not fullscreen) */
-        QSize minSize = DashSettings::minimumSizeForDesktop();
-        if (rect.width() < minSize.width() &&
-            rect.height() < minSize.height()) {
-            m_dashCanResize = false;
-        } else {
-            m_dashCanResize = true;
-        }
-    }
-
-    DashSettings* m_dashSettings;
     WnckWindow* m_window;
     GConnector m_connector;
     bool m_activeWindowIsDash;
-    bool m_dashCanResize;
 };
 
 WindowHelper::WindowHelper(QObject* parent)
@@ -86,7 +65,6 @@
 , d(new WindowHelperPrivate)
 {
     d->m_window = 0;
-    d->m_dashSettings = new DashSettings(this);
 
     WnckScreen* screen = wnck_screen_get_default();
     wnck_screen_force_update(screen);
@@ -139,9 +117,6 @@
 
         const char *name = wnck_window_get_name(d->m_window);
         d->m_activeWindowIsDash = qstrcmp(name, "unity-2d-places") == 0;
-        if (d->m_activeWindowIsDash) {
-            d->updateDashCanResize();
-        }
 
         d->m_connector.connect(G_OBJECT(d->m_window), "name-changed", G_CALLBACK(nameChangedCB), this);
         d->m_connector.connect(G_OBJECT(d->m_window), "state-changed", G_CALLBACK(stateChangedCB), this);
@@ -190,11 +165,6 @@
     return d->m_window != 0 && d->m_activeWindowIsDash;
 }
 
-bool WindowHelper::dashCanResize() const
-{
-    return d->m_dashCanResize;
-}
-
 void WindowHelper::close()
 {
     guint32 timestamp = QDateTime::currentDateTime().toTime_t();

=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2011-10-17 12:46:55 +0000
+++ panel/applets/appname/windowhelper.h	2012-01-24 14:41:27 +0000
@@ -42,7 +42,6 @@
     bool isMaximized() const;
     bool isMostlyOnScreen(int screen) const;
     bool dashIsVisible() const;
-    bool dashCanResize() const;
 
 public Q_SLOTS:
     void close();

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2012-01-24 14:41:27 +0000
+++ places/app/dashdeclarativeview.cpp	2012-01-24 14:41:27 +0000
@@ -18,9 +18,9 @@
 #include "dashadaptor.h"
 
 // unity-2d
-#include <dashsettings.h>
 #include <launcherclient.h>
 #include <screeninfo.h>
+#include <dashclient.h>
 
 // Qt
 #include <QDesktopWidget>
@@ -57,7 +57,6 @@
 
     QDesktopWidget* desktop = QApplication::desktop();
     connect(desktop, SIGNAL(resized(int)), SIGNAL(screenGeometryChanged()));
-    connect(desktop, SIGNAL(resized(int)), SLOT(updateDashModeDependingOnScreenGeometry()));
     connect(desktop, SIGNAL(workAreaResized(int)), SLOT(onWorkAreaResized(int)));
 
     updateSize();
@@ -74,18 +73,6 @@
 }
 
 void
-DashDeclarativeView::updateDashModeDependingOnScreenGeometry()
-{
-    QRect rect = QApplication::desktop()->screenGeometry(this);
-    QSize minSize = Unity2d::DashSettings::minimumSizeForDesktop();
-    if (rect.width() < minSize.width() && rect.height() < minSize.height()) {
-        setDashMode(FullScreenMode);
-    } else {
-        setDashMode(DesktopMode);
-    }
-}
-
-void
 DashDeclarativeView::updateSize()
 {
     if (m_mode == FullScreenMode) {

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-12-08 18:39:18 +0000
+++ places/app/dashdeclarativeview.h	2012-01-24 14:41:27 +0000
@@ -68,7 +68,6 @@
 
 private Q_SLOTS:
     void onWorkAreaResized(int screen);
-    void updateDashModeDependingOnScreenGeometry();
     void updateSize();
 
 private:

=== modified file 'places/dash.qml'
--- places/dash.qml	2012-01-24 14:41:27 +0000
+++ places/dash.qml	2012-01-24 14:41:27 +0000
@@ -40,11 +40,15 @@
         value: (currentPage && currentPage.expanded != undefined) ? currentPage.expanded : true
     }
 
+    DashClient {
+        id: dashClient
+    }
+
     Binding {
         target: dashView
         property: "dashMode"
-        value: return dash2dConfiguration.fullScreen ? DashDeclarativeView.FullScreenMode :
-                                                       DashDeclarativeView.DesktopMode
+        value: dashClient.alwaysFullScreen || dash2dConfiguration.fullScreen ?
+               DashDeclarativeView.FullScreenMode : DashDeclarativeView.DesktopMode
     }
 
     function activatePage(page) {