Merge lp:~lukas-kde/unity8/platformPlugin into lp:unity8

[Lukáš Tinkl]

Implement Unity.Platform plugin wrapping org.freedesktop.hostname1

Implement Unity.Platform plugin wrapping org.freedesktop.hostname1

To get access to platform properties like form factor to be able to distinguish whether we run on a PC or on a phone/tablet. See http://www.freedesktop.org/wiki/Software/systemd/hostnamed/ for more details.

Allows fixing lpbug#1504318: power off dialog pops up instantly in window mode (https://bugs.launchpad.net/bugs/1504318)

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

[Michael Zanetti (mzanetti)]

Tested, works fine. Code looks good

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

waiting

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[Michał Sawicz (saviq)]

Is this really the distinction we want to make? Shouldn't the phone, when connected to a kbd and mouse, behave like a desktop (so pressing the power button should not blank the screen but display the dialog)? Should not mouse and touch input wake the screen then?

review: Needs Information

[Michael Zanetti (mzanetti)]

> Is this really the distinction we want to make? Shouldn't the phone, when
> connected to a kbd and mouse, behave like a desktop (so pressing the power
> button should not blank the screen but display the dialog)? Should not mouse
> and touch input wake the screen then?

I think would allow being convinced otherwise but right now I would say, if I dock my phone to an external monitor and use it as a pocket PC, that still doesn't mean I want to shut the phone down with the power button. The device itself is still a "phone" and meant to be always on, keeping me reachable for phone calls etc. So I suggest to continue to walk the path in this MP, keeping phone-ish behavior for the power button even in pocket-desktop mode.

As for waking the screen up with mouse/keyboard, yes I would agree we want that. It's kinda unrelated to the power button situation though.

[Michał Sawicz (saviq)]

OK I can be forced to think that ;)

review: Approve (conceptual)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2002
http://jenkins.qa.ubuntu.com/job/unity8-ci/6445/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4582
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/685
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4579
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24115
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24109

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6445/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/CMakeLists.txt'
--- plugins/Unity/CMakeLists.txt	2015-05-05 11:19:15 +0000
+++ plugins/Unity/CMakeLists.txt	2015-10-09 12:43:13 +0000
@@ -4,3 +4,4 @@
 add_subdirectory(Session)
 add_subdirectory(DashCommunicator)
 add_subdirectory(InputInfo)
+add_subdirectory(Platform)

=== added directory 'plugins/Unity/Platform'
=== added file 'plugins/Unity/Platform/CMakeLists.txt'
--- plugins/Unity/Platform/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Platform/CMakeLists.txt	2015-10-09 12:43:13 +0000
@@ -0,0 +1,9 @@
+set(platformplugin_SRCS
+    platform.cpp
+    plugin.cpp)
+
+add_library(Platform-qml SHARED ${platformplugin_SRCS})
+
+qt5_use_modules(Platform-qml DBus Qml)
+
+add_unity8_plugin(Unity.Platform 1.0 Unity/Platform TARGETS Platform-qml)

=== added file 'plugins/Unity/Platform/platform.cpp'
--- plugins/Unity/Platform/platform.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Platform/platform.cpp	2015-10-09 12:43:13 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * 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/>.
+ */
+
+#include "platform.h"
+
+#include <QDBusConnection>
+
+Platform::Platform(QObject *parent)
+    : QObject(parent)
+    , m_iface("org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1",
+              QDBusConnection::systemBus(), this)
+{
+    QMetaObject::invokeMethod(this, "init");
+}
+
+void Platform::init()
+{
+    m_chassis = m_iface.property("Chassis").toString();
+    m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");
+}
+
+QString Platform::chassis() const
+{
+    return m_chassis;
+}
+
+bool Platform::isPC() const
+{
+    return m_isPC;
+}

=== added file 'plugins/Unity/Platform/platform.h'
--- plugins/Unity/Platform/platform.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Platform/platform.h	2015-10-09 12:43:13 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * 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 PLATFORM_H
+#define PLATFORM_H
+
+#include <QDBusInterface>
+
+/**
+ * @brief The Platform class
+ *
+ * Wrapper around platform detection support (org.freedesktop.hostname1)
+ */
+class Platform: public QObject
+{
+    Q_OBJECT
+    /**
+     * The chassis property
+     *
+     * Supported values include: "laptop", "computer", "handset" or "tablet"
+     * For full list see: http://www.freedesktop.org/wiki/Software/systemd/hostnamed/
+     */
+    Q_PROPERTY(QString chassis READ chassis CONSTANT)
+    /**
+     * Whether the machine is an ordinary PC (desktop, laptop or server)
+     */
+    Q_PROPERTY(bool isPC READ isPC CONSTANT)
+
+public:
+    Platform(QObject *parent = nullptr);
+    ~Platform() = default;
+
+    QString chassis() const;
+    bool isPC() const;
+
+private Q_SLOTS:
+    void init();
+
+private:
+    QDBusInterface m_iface;
+    QString m_chassis;
+    bool m_isPC;
+};
+
+#endif // PLATFORM_H

=== added file 'plugins/Unity/Platform/plugin.cpp'
--- plugins/Unity/Platform/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Platform/plugin.cpp	2015-10-09 12:43:13 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * 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/>.
+ */
+
+#include "plugin.h"
+#include "platform.h"
+
+#include <QtQml>
+
+void GlobalShortcutPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Unity.Platform"));
+
+    qmlRegisterSingletonType<Platform>(uri, 1, 0, "Platform", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Platform; });
+}

=== added file 'plugins/Unity/Platform/plugin.h'
--- plugins/Unity/Platform/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Platform/plugin.h	2015-10-09 12:43:13 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * 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 PLATFORMPLUGIN_H
+#define PLATFORMPLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class GlobalShortcutPlugin: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+
+#endif // PLATFORMPLUGIN_H

=== added file 'plugins/Unity/Platform/qmldir'
--- plugins/Unity/Platform/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Unity/Platform/qmldir	2015-10-09 12:43:13 +0000
@@ -0,0 +1,2 @@
+module Unity.Platform
+plugin Platform-qml

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-09-02 09:30:32 +0000
+++ qml/Components/Dialogs.qml	2015-10-09 12:43:13 +0000
@@ -20,6 +20,7 @@
 import Unity.Session 0.1
 import Ubuntu.Components 1.1
 import GlobalShortcut 1.0
+import Unity.Platform 1.0
 import "../Greeter"
 
 Item {
@@ -46,13 +47,13 @@
 
     GlobalShortcut { // reboot/shutdown dialog
         shortcut: Qt.Key_PowerDown
-        active: root.usageScenario === "desktop"
+        active: Platform.isPC
         onTriggered: root.unitySessionService.RequestShutdown()
     }
 
     GlobalShortcut { // reboot/shutdown dialog
         shortcut: Qt.Key_PowerOff
-        active: root.usageScenario === "desktop"
+        active: Platform.isPC
         onTriggered: root.unitySessionService.RequestShutdown()
     }