on xenial help sign in
Merge trunk.
commite9618740a06fd1a4db444d8899f2a5758d810763 authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 18 Jul 2014, 12:11 (12 years ago) parent59b854815cea47
35 files changed+701−136
data/unity8.conf+3 debian/changelog+45 debian/control+3−3 plugins/LightDM/CMakeLists.txt+1 plugins/LightDM/DBusGreeter.cpp+65 plugins/LightDM/DBusGreeter.h+55 plugins/LightDM/Greeter.cpp+17 plugins/LightDM/Greeter.h+5 plugins/LightDM/plugin.cpp+3 plugins/Lights/Lights.qmltypes+45 plugins/Powerd/Powerd.qmltypes+6−13 plugins/Ubuntu/Gestures/Gestures.qmltypes+1 plugins/Unity/Session/dbusunitysessionservice.cpp+33 plugins/Unity/Session/dbusunitysessionservice.h+61−4 po/gl.po+4−4 po/ko.po+1−1 po/nl.po+11−9 po/pt.po+23−23 po/pt_BR.po+1−1 qml/Notifications/Notification.qml+21−7 qml/Notifications/NotificationMenuItemFactory.qml+12−3 qml/Notifications/Notifications.qml+17−1 qml/Panel/Indicators.qml+1 qml/Panel/Indicators/MenuItemFactory.qml−6 qml/Panel/Indicators/MessageMenuItemFactory.qml−3 qml/Panel/Panel.qml−22 qml/Shell.qml+200−6 tests/mocks/LightDM/CMakeLists.txt+1 tests/mocks/Powerd/Powerd.qmltypes+6−13 tests/mocks/Unity/Unity.qmltypes+10−2 tests/plugins/LightDM/CMakeLists.txt+1−1 tests/plugins/LightDM/dbus.cpp+40 tests/qmltests/Dash/tst_DashContent.qml+1 tests/qmltests/Panel/tst_Panel.qml−14 tests/qmltests/tst_Shell.qml+8
data/unity8.conf+3
@@ -44,6 +44,8 @@ pre-start script
4444 rm "$MIR_SERVER_FILE"
4545 fi
4646
47+ initctl set-env --global MIR_SERVER_PROMPT_FILE=1
48+
4749 initctl emit scope-ui-starting
4850 initctl emit --no-wait indicator-services-start
4951end script
@@ -53,4 +55,5 @@ exec ${BINARY:-unity8} $ARGS
5355post-stop script
5456 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
5557 initctl unset-env --global UNITY_MIR_SOCKET
58+ initctl unset-env --global MIR_SERVER_PROMPT_FILE
5659end script
debian/changelog+45
@@ -1,3 +1,48 @@
1+unity8 (7.90+14.10.20140717.3-0ubuntu1) utopic; urgency=low
2+
3+ [ Nick Dedekind ]
4+ * Added environment variable to upstart conf for mir trusted socket
5+ * Removed indicator menu dismissal on menu activation (LP: #1337771)
6+
7+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 17 Jul 2014 16:35:52 +0000
8+
9+unity8 (7.90+14.10.20140717.1-0ubuntu1) utopic; urgency=low
10+
11+ [ Michał Sawicz ]
12+ * Only generate .qmltypes files manually, no need to do it build-time.
13+ It didn't work when cross-compiling either, and required builders to
14+ have otherwise unnecessary environment.
15+ * Fix CardCreator test. It got broken with a merge that got landed
16+ along side of it.
17+
18+ [ Ying-Chun Liu ]
19+ * Add reboot/shutdown (LP: #1234062)
20+
21+ [ Albert Astals ]
22+ * Make the departments test more stable
23+
24+ [ Mirco Müller ]
25+ * Fixes gap at top of sim-unlock/fullscreen notification (point 1.),
26+ fixes blocking overlay if underlying UnityMenuModel vanishes from
27+ DBus (point 2.). The third bullet-point of the bug-report, lockup of
28+ shell-UI, could not be reproduced. (LP: #1308011)
29+
30+ [ Michael Terry ]
31+ * Expose a new greeter DBus property, IsActive, which tells apps and
32+ indicators when the integrated-greeter screen is active. Useful for
33+ switching UI modes when the screen is locked.
34+ * Allow the session to bring up the greeter/lockscreen over DBus. The
35+ emergency dialer will need this support in order to cancel bringing
36+ it up.
37+
38+ [ Michael Zanetti ]
39+ * Fixes gap at top of sim-unlock/fullscreen notification (point 1.),
40+ fixes blocking overlay if underlying UnityMenuModel vanishes from
41+ DBus (point 2.). The third bullet-point of the bug-report, lockup of
42+ shell-UI, could not be reproduced. (LP: #1308011)
43+
44+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 17 Jul 2014 09:38:20 +0000
45+
146unity8 (7.90+14.10.20140714-0ubuntu1) utopic; urgency=low
247
348 [ Michał Sawicz ]
debian/control+3−3
@@ -17,7 +17,7 @@ Build-Depends: cmake,
1717 libhud-client2-dev,
1818 libpay1-dev,
1919 libpulse-dev,
20− libqmenumodel-dev (>= 0.2.7),
20+ libqmenumodel-dev (>= 0.2.8),
2121 libqt5xmlpatterns5-dev,
2222 libunity-api-dev (>= 7.85),
2323 libunity-mir-dev,
@@ -52,7 +52,7 @@ Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
5252
5353Package: indicators-client
5454Architecture: amd64 armhf i386
55−Depends: qmenumodel-qml (>= 0.2.7),
55+Depends: qmenumodel-qml (>= 0.2.8),
5656 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
5757 unity8 (= ${binary:Version}),
5858 ${misc:Depends},
@@ -77,7 +77,7 @@ Depends: gsettings-desktop-schemas,
7777 libcap2-bin,
7878 libglib2.0-bin,
7979 libunity-mir1 (>= 0.4),
80− qmenumodel-qml (>= 0.2.7),
80+ qmenumodel-qml (>= 0.2.8),
8181 qml-module-qtquick-xmllistmodel,
8282 qtdeclarative5-gsettings1.0,
8383 qtdeclarative5-ubuntu-settings-components (>= 0.3),
plugins/LightDM/CMakeLists.txt+1
@@ -15,6 +15,7 @@ include_directories(
1515
1616set(QMLPLUGIN_SRC
1717 ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
18+ DBusGreeter.cpp
1819 DBusGreeterList.cpp
1920 Greeter.cpp
2021 plugin.cpp
plugins/LightDM/DBusGreeter.cppnew file+65
@@ -0,0 +1,65 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "DBusGreeter.h"
18+#include "Greeter.h"
19+
20+#include <QDBusMessage>
21+#include <QStringList>
22+
23+DBusGreeter::DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path)
24+ : QObject(greeter),
25+ m_greeter(greeter),
26+ m_connection(connection),
27+ m_path(path)
28+{
29+ connect(m_greeter, SIGNAL(isActiveChanged()), this, SLOT(isActiveChangedHandler()));
30+}
31+
32+bool DBusGreeter::isActive() const
33+{
34+ return m_greeter->isActive();
35+}
36+
37+void DBusGreeter::ShowGreeter()
38+{
39+ return Q_EMIT m_greeter->showGreeter();
40+}
41+
42+void DBusGreeter::isActiveChangedHandler()
43+{
44+ notifyPropertyChanged("IsActive", isActive());
45+ Q_EMIT isActiveChanged();
46+}
47+
48+// Manually emit a PropertiesChanged signal over DBus, because QtDBus
49+// doesn't do it for us on Q_PROPERTIES, oddly enough.
50+void DBusGreeter::notifyPropertyChanged(const QString& propertyName, const QVariant &value)
51+{
52+ QDBusMessage message;
53+ QVariantMap changedProps;
54+
55+ changedProps.insert(propertyName, value);
56+
57+ message = QDBusMessage::createSignal(m_path,
58+ "org.freedesktop.DBus.Properties",
59+ "PropertiesChanged");
60+ message << "com.canonical.UnityGreeter";
61+ message << changedProps;
62+ message << QStringList();
63+
64+ m_connection.send(message);
65+}
plugins/LightDM/DBusGreeter.hnew file+55
@@ -0,0 +1,55 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef UNITY_DBUSGREETER_H
18+#define UNITY_DBUSGREETER_H
19+
20+#include <QDBusConnection>
21+#include <QObject>
22+
23+class Greeter;
24+class QDBusInterface;
25+
26+/** This is an internal class used to talk with the indicators.
27+ */
28+
29+class DBusGreeter : public QObject
30+{
31+ Q_OBJECT
32+ Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter")
33+
34+ Q_PROPERTY(bool IsActive READ isActive NOTIFY isActiveChanged) // since 14.10
35+
36+public:
37+ explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);
38+
39+ bool isActive() const;
40+ Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
41+
42+Q_SIGNALS:
43+ void isActiveChanged();
44+
45+private Q_SLOTS:
46+ void isActiveChangedHandler();
47+ void notifyPropertyChanged(const QString &propertyName, const QVariant &value);
48+
49+private:
50+ Greeter *m_greeter;
51+ QDBusConnection m_connection;
52+ QString m_path;
53+};
54+
55+#endif
plugins/LightDM/Greeter.cpp+17
@@ -25,6 +25,7 @@ public:
2525 explicit GreeterPrivate(Greeter *parent);
2626
2727 QLightDM::Greeter *m_greeter;
28+ bool m_active;
2829 bool wasPrompted;
2930 bool promptless;
3031
@@ -38,6 +39,7 @@ private:
3839
3940GreeterPrivate::GreeterPrivate(Greeter* parent)
4041 : m_greeter(new QLightDM::Greeter(parent)),
42+ m_active(false),
4143 wasPrompted(false),
4244 promptless(false),
4345 q_ptr(parent)
@@ -60,6 +62,21 @@ Greeter::Greeter(QObject* parent)
6062 d->m_greeter->connectSync();
6163}
6264
65+bool Greeter::isActive() const
66+{
67+ Q_D(const Greeter);
68+ return d->m_active;
69+}
70+
71+void Greeter::setIsActive(bool active)
72+{
73+ Q_D(Greeter);
74+ if (d->m_active != active) {
75+ d->m_active = active;
76+ Q_EMIT isActiveChanged();
77+ }
78+}
79+
6380bool Greeter::isAuthenticated() const
6481{
6582 Q_D(const Greeter);
plugins/LightDM/Greeter.h+5
@@ -34,6 +34,7 @@ class Greeter : public QObject
3434{
3535 Q_OBJECT
3636
37+ Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
3738 Q_PROPERTY(bool authenticated READ isAuthenticated)
3839 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
3940 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
@@ -41,6 +42,7 @@ class Greeter : public QObject
4142public:
4243 explicit Greeter(QObject* parent=0);
4344
45+ bool isActive() const;
4446 bool isAuthenticated() const;
4547 QString authenticationUser() const;
4648 bool promptless() const;
@@ -49,13 +51,16 @@ public Q_SLOTS:
4951 void authenticate(const QString &username=QString());
5052 void respond(const QString &response);
5153 bool startSessionSync(const QString &session=QString());
54+ void setIsActive(bool isActive);
5255
5356Q_SIGNALS:
5457 void showMessage(const QString &text, bool isError);
5558 void showPrompt(const QString &text, bool isSecret);
5659 void authenticationComplete();
5760 void authenticationUserChanged(const QString &user);
61+ void isActiveChanged();
5862 void promptlessChanged();
63+ void showGreeter();
5964
6065 // This signal is emitted by external agents like indicators, and the UI
6166 // should switch to this user if possible.
plugins/LightDM/plugin.cpp+3
@@ -18,6 +18,7 @@
1818 */
1919
2020#include "plugin.h"
21+#include "DBusGreeter.h"
2122#include "DBusGreeterList.h"
2223#include "Greeter.h"
2324#include "UsersModel.h"
@@ -39,6 +40,8 @@ static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
3940
4041 Greeter *greeter = new Greeter();
4142 QDBusConnection connection = QDBusConnection::sessionBus();
43+ DBusGreeter *root = new DBusGreeter(greeter, connection, "/");
44+ connection.registerObject("/", root, QDBusConnection::ExportScriptableContents);
4245 DBusGreeterList *list = new DBusGreeterList(greeter, connection, GREETER_LIST_DBUS_PATH);
4346 connection.registerObject(GREETER_LIST_DBUS_PATH, list, QDBusConnection::ExportScriptableContents);
4447 connection.registerService(GREETER_DBUS_SERVICE);
plugins/Lights/Lights.qmltypesnew file+45
@@ -0,0 +1,45 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Lights 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "Lights"
12+ prototype: "QObject"
13+ exports: ["Lights/Lights 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Enum {
18+ name: "State"
19+ values: {
20+ "Off": 0,
21+ "On": 1
22+ }
23+ }
24+ Property { name: "state"; type: "State" }
25+ Property { name: "color"; type: "QColor" }
26+ Property { name: "onMillisec"; type: "int" }
27+ Property { name: "offMillisec"; type: "int" }
28+ Signal {
29+ name: "stateChanged"
30+ Parameter { name: "newState"; type: "State" }
31+ }
32+ Signal {
33+ name: "colorChanged"
34+ Parameter { name: "color"; type: "QColor" }
35+ }
36+ Signal {
37+ name: "onMillisecChanged"
38+ Parameter { name: "onMs"; type: "int" }
39+ }
40+ Signal {
41+ name: "offMillisecChanged"
42+ Parameter { name: "offMs"; type: "int" }
43+ }
44+ }
45+}
plugins/Powerd/Powerd.qmltypes+6−13
@@ -15,19 +15,12 @@ Module {
1515 isSingleton: true
1616 exportMetaObjectRevisions: [0]
1717 Enum {
18− name: "DisplayFlag"
18+ name: "DisplayStateChangeReason"
1919 values: {
20− "UseProximity": 1,
21− "DisableAutoBrightness": 2,
22− "Bright": 4
23− }
24− }
25− Enum {
26− name: "DisplayFlags"
27− values: {
28− "UseProximity": 1,
29− "DisableAutoBrightness": 2,
30− "Bright": 4
20+ "Unknown": 0,
21+ "Inactivity": 1,
22+ "PowerKey": 2,
23+ "Proximity": 3
3124 }
3225 }
3326 Enum {
@@ -40,7 +33,7 @@ Module {
4033 Signal {
4134 name: "displayPowerStateChange"
4235 Parameter { name: "status"; type: "int" }
43− Parameter { name: "flags"; type: "uint" }
36+ Parameter { name: "reason"; type: "int" }
4437 }
4538 }
4639}
plugins/Ubuntu/Gestures/Gestures.qmltypes+1
@@ -141,6 +141,7 @@ Module {
141141 name: "touchSceneYChanged"
142142 Parameter { name: "value"; type: "double" }
143143 }
144+ Signal { name: "tapped" }
144145 }
145146 Component {
146147 name: "PressedOutsideNotifier"
plugins/Unity/Session/dbusunitysessionservice.cpp+33
@@ -19,6 +19,7 @@
1919
2020// Qt
2121#include <QDBusConnection>
22+#include <QDBusInterface>
2223
2324DBusUnitySessionService::DBusUnitySessionService() : QObject()
2425{
@@ -44,3 +45,35 @@ void DBusUnitySessionService::RequestLogout()
4445{
4546 Q_EMIT logoutRequested(false);
4647}
48+
49+void DBusUnitySessionService::Reboot()
50+{
51+ QDBusConnection connection = QDBusConnection::systemBus();
52+ QDBusInterface iface1 ("org.freedesktop.login1",
53+ "/org/freedesktop/login1",
54+ "org.freedesktop.login1.Manager",
55+ connection);
56+
57+ iface1.call("Reboot", false);
58+}
59+
60+void DBusUnitySessionService::RequestReboot()
61+{
62+ Q_EMIT rebootRequested(false);
63+}
64+
65+void DBusUnitySessionService::Shutdown()
66+{
67+ QDBusConnection connection = QDBusConnection::systemBus();
68+ QDBusInterface iface1 ("org.freedesktop.login1",
69+ "/org/freedesktop/login1",
70+ "org.freedesktop.login1.Manager",
71+ connection);
72+
73+ iface1.call("PowerOff", false);
74+}
75+
76+void DBusUnitySessionService::RequestShutdown()
77+{
78+ Q_EMIT shutdownRequested(false);
79+}
plugins/Unity/Session/dbusunitysessionservice.h+61−4
@@ -46,6 +46,27 @@ Q_SIGNALS:
4646 */
4747 void logoutRequested(bool have_inhibitors);
4848
49+ /**
50+ * rebootRequested signal
51+ *
52+ * This signal is emitted when some applications request the system to
53+ * reboot.
54+ * @param have_inhibitors if there are any special running applications
55+ * which inhibit the reboot.
56+ */
57+ void rebootRequested(bool have_inhibitors);
58+
59+ /**
60+ * shutdownRequested signal
61+ *
62+ * This signal is emitted when some applications request the system to
63+ * shutdown.
64+ * @param have_inhibitors if there are any special running applications
65+ * which inhibit the shutdown.
66+ */
67+ void shutdownRequested(bool have_inhibitors);
68+
69+
4970 /**
5071 * logoutReady signal
5172 *
@@ -61,22 +82,58 @@ public Q_SLOTS:
6182 * This method directly logout the system without user's confirmation.
6283 * Ordinary applications should avoid calling this method. Please call
6384 * RequestLogout() to ask the user to decide logout or not.
64− * This method will stop all the running applications and then signal
65− * logoutReady when all the apps stopped.
6685 */
6786 Q_SCRIPTABLE void Logout();
6887
88+ /**
89+ * Reboot the system.
90+ *
91+ * This method directly reboot the system without user's confirmation.
92+ * Ordinary applications should avoid calling this method. Please call
93+ * RequestReboot() to ask the user to decide reboot or not.
94+ */
95+ Q_SCRIPTABLE void Reboot();
96+
97+ /**
98+ * Shutdown the system.
99+ *
100+ * This method directly shutdown the system without user's confirmation.
101+ * Ordinary applications should avoid calling this method. Please call
102+ * RequestShutdown() to ask the user to decide shutdown or not.
103+ */
104+ Q_SCRIPTABLE void Shutdown();
105+
69106 /**
70107 * Issue a logout request.
71108 *
72109 * This method emit the logoutRequested signal to the shell with a boolean
73110 * which indicates if there's any inhibitors. The shell should receive
74111 * this signal and display a dialog to ask the user to confirm the logout
75− * action. If confirmed, shell can call Logout() method to kill the apps
76− * and then logout
112+ * action. If confirmed, shell can call Logout() method to logout.
77113 */
78114 Q_SCRIPTABLE void RequestLogout();
79115
116+ /**
117+ * Issue a reboot request.
118+ *
119+ * This method emit the rebootRequested signal to the shell with a boolean
120+ * which indicates if there's any inhibitors. The shell should receive
121+ * this signal and display a dialog to ask the user to confirm the reboot
122+ * action. If confirmed, shell can call Reboot() method to reboot
123+ */
124+ Q_SCRIPTABLE void RequestReboot();
125+
126+ /**
127+ * Issue a shutdown request.
128+ *
129+ * This method emit the shutdownRequested signal to the shell with a
130+ * boolean which indicates if there's any inhibitors.
131+ * The shell should receive
132+ * this signal and display a dialog to ask the user to confirm the reboot
133+ * action. If confirmed, shell can call Shutdown() method to reboot
134+ */
135+ Q_SCRIPTABLE void RequestShutdown();
136+
80137};
81138
82139#endif // DBUSUNITYSESSIONSERVICE_H
po/gl.po+4−4
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-09 12:17+0000\n"
11+"PO-Revision-Date: 2014-07-17 19:55+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-10 07:29+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -52,7 +52,7 @@ msgstr "Pechar"
5252
5353#: qml/Components/EdgeDemo.qml:172
5454msgid "Swipe up again to close the settings screen"
55−msgstr "Esvare o dedo cara a arriba para pechar os axustes"
55+msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
5656
5757#: qml/Components/EdgeDemo.qml:199
5858msgid "Left edge"
po/ko.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-17 06:38+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
1818"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
po/nl.po+11−9
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-07-15 14:11+0000\n"
12−"Last-Translator: Hannie Dumoleyn <Unknown>\n"
11+"PO-Revision-Date: 2014-07-17 19:21+0000\n"
12+"Last-Translator: Pjotr12345 <Unknown>\n"
1313"Language-Team: Dutch <nl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-16 07:27+0000\n"
18−"X-Generator: Launchpad (build 17112)\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Snelkoppeling vastzetten"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Snelkoppeling losmaken"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -36,7 +36,7 @@ msgstr "Rechterrand"
3636
3737#: qml/Components/EdgeDemo.qml:114
3838msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
39+msgstr "Veeg vanuit de rechterrand om het scherm te ontgrendelen"
4040
4141#: qml/Components/EdgeDemo.qml:145
4242msgid "Top edge"
@@ -44,7 +44,7 @@ msgstr "Bovenrand"
4444
4545#: qml/Components/EdgeDemo.qml:146
4646msgid "Try swiping from the top edge to access the indicators"
47−msgstr ""
47+msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"
4848
4949#: qml/Components/EdgeDemo.qml:171
5050msgid "Close"
@@ -71,6 +71,8 @@ msgid ""
7171"You have now mastered the edge gestures and can start using the "
7272"phone<br><br>Tap on the screen to start"
7373msgstr ""
74+"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
75+"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
7476
7577#: qml/Components/Lockscreen.qml:214
7678msgid "Emergency Call"
@@ -163,7 +165,7 @@ msgstr "Wachtwoord tonen"
163165
164166#: qml/Notifications/NotificationMenuItemFactory.qml:103
165167msgid "Please enter SIM PIN"
166−msgstr "Voer SIM PIN in"
168+msgstr "Voer SIM-pincode in"
167169
168170#: qml/Panel/Indicators/MenuItemFactory.qml:583
169171msgid "In queue…"
po/pt.po+23−23
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 19:18+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
11+"PO-Revision-Date: 2014-07-18 00:00+0000\n"
12+"Last-Translator: Nuno André <Unknown>\n"
1313"Language-Team: Portuguese <pt@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Afixar atalho"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Remover atalho"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -64,7 +64,7 @@ msgstr ""
6464
6565#: qml/Components/EdgeDemo.qml:227
6666msgid "Well done"
67−msgstr ""
67+msgstr "Muito bem"
6868
6969#: qml/Components/EdgeDemo.qml:228
7070msgid ""
@@ -74,7 +74,7 @@ msgstr ""
7474
7575#: qml/Components/Lockscreen.qml:214
7676msgid "Emergency Call"
77−msgstr ""
77+msgstr "Chamada de emergência"
7878
7979#: qml/Components/Lockscreen.qml:231
8080msgid "OK"
@@ -82,16 +82,16 @@ msgstr ""
8282
8383#: qml/Components/PageHeader.qml:366
8484msgid "Recent searches"
85−msgstr ""
85+msgstr "Pesquisas recentes"
8686
8787#: qml/Components/PassphraseLockscreen.qml:60
8888#, qt-format
8989msgid "Hello %1"
90−msgstr ""
90+msgstr "Olá %1"
9191
9292#: qml/Components/PassphraseLockscreen.qml:60
9393msgid "Hello"
94−msgstr ""
94+msgstr "Olá"
9595
9696#: qml/Components/PinLockscreen.qml:198
9797msgid "CANCEL"
@@ -103,11 +103,11 @@ msgstr ""
103103
104104#: qml/Components/SeeMore.qml:35
105105msgid "See more"
106−msgstr ""
106+msgstr "Ver mais"
107107
108108#: qml/Components/SeeMore.qml:58
109109msgid "See less"
110−msgstr ""
110+msgstr "Ver menos"
111111
112112#: qml/Dash/DashApps.qml:37
113113msgid "Recent"
@@ -115,11 +115,11 @@ msgstr ""
115115
116116#: qml/Dash/Previews/PreviewActionCombo.qml:34
117117msgid "More..."
118−msgstr ""
118+msgstr "Mais..."
119119
120120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121121msgid "Less..."
122−msgstr ""
122+msgstr "Menos..."
123123
124124#: qml/Dash/Previews/PreviewRatingInput.qml:82
125125msgid "Rate this"
@@ -131,7 +131,7 @@ msgstr ""
131131
132132#: qml/Dash/Previews/PreviewRatingInput.qml:168
133133msgid "Send"
134−msgstr ""
134+msgstr "Enviar"
135135
136136#: qml/Greeter/Greeter.qml:157
137137msgid "Swipe to unlock"
@@ -139,11 +139,11 @@ msgstr ""
139139
140140#: qml/Hud/HudParametrizedActionsPage.qml:132
141141msgid "Confirm"
142−msgstr ""
142+msgstr "Confirmar"
143143
144144#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
145145msgid "Type or say a command"
146−msgstr ""
146+msgstr "Digite ou diga um comando"
147147
148148#: qml/Hud/Hud.qml:84
149149msgid "Loading. Please Wait..."
@@ -151,11 +151,11 @@ msgstr ""
151151
152152#: qml/Hud/Hud.qml:89
153153msgid "Speak Now..."
154−msgstr ""
154+msgstr "Fale agora..."
155155
156156#: qml/Hud/Hud.qml:94
157157msgid "Speaking..."
158−msgstr ""
158+msgstr "A falar..."
159159
160160#: qml/Notifications/NotificationMenuItemFactory.qml:91
161161msgid "Show password"
@@ -163,7 +163,7 @@ msgstr ""
163163
164164#: qml/Notifications/NotificationMenuItemFactory.qml:103
165165msgid "Please enter SIM PIN"
166−msgstr ""
166+msgstr "Por favor insira o PIN"
167167
168168#: qml/Panel/Indicators/MenuItemFactory.qml:583
169169msgid "In queue…"
@@ -175,11 +175,11 @@ msgstr ""
175175
176176#: qml/Panel/Indicators/MenuItemFactory.qml:589
177177msgid "Paused, tap to resume"
178−msgstr ""
178+msgstr "Parado, toque para continuar"
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:591
181181msgid "Canceled"
182−msgstr ""
182+msgstr "Cancelado"
183183
184184#: qml/Panel/Indicators/MenuItemFactory.qml:593
185185msgid "Finished"
po/pt_BR.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-17 06:38+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-18 05:28+0000\n"
1818"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
qml/Notifications/Notification.qml+21−7
@@ -36,7 +36,7 @@ Item {
3636 property var hints
3737 property var notification
3838 property color color
39− property bool fullscreen
39+ property bool fullscreen: false
4040 property int maxHeight
4141 property int margins
4242 property Gradient greenGradient : Gradient {
@@ -48,7 +48,6 @@ Item {
4848 GradientStop { position: 1.0; color: "#4d4745" }
4949 }
5050
51− fullscreen: false
5251 objectName: "background"
5352 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
5453
@@ -80,7 +79,7 @@ Item {
8079 Audio {
8180 id: sound
8281 objectName: "sound"
83− source: hints["suppress-sound"] != "" ? hints["sound-file"] : undefined
82+ source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
8483 }
8584
8685 onOpacityChanged: {
@@ -159,9 +158,17 @@ Item {
159158 UnityMenuModel {
160159 id: unityMenuModel
161160
161+ property string lastNameOwner: ""
162+
162163 busName: paths.busName
163164 actions: paths.actions
164165 menuObjectPath: paths.menuObjectPath
166+ onNameOwnerChanged: {
167+ if (lastNameOwner != "" && nameOwner == "" && notification.notification != undefined) {
168+ notification.notification.close()
169+ }
170+ lastNameOwner = nameOwner
171+ }
165172 }
166173
167174 Behavior on implicitHeight {
@@ -272,14 +279,18 @@ Item {
272279 }
273280
274281 Column {
282+ id: dialogColumn
275283 objectName: "dialogListView"
276284 spacing: units.gu(2)
277285
278286 visible: count > 0
279287
280− anchors.left: parent.left; anchors.right: parent.right
281− anchors.top: fullscreen ? parent.top : undefined
282− anchors.bottom: fullscreen ? parent.bottom : undefined
288+ anchors {
289+ left: parent.left
290+ right: parent.right
291+ top: fullscreen ? parent.top : undefined
292+ bottom: fullscreen ? parent.bottom : undefined
293+ }
283294
284295 Repeater {
285296 model: unityMenuModel
@@ -287,7 +298,10 @@ Item {
287298 NotificationMenuItemFactory {
288299 id: menuItemFactory
289300
290− anchors.left: parent.left; anchors.right: parent.right
301+ anchors {
302+ left: dialogColumn.left
303+ right: dialogColumn.right
304+ }
291305
292306 menuModel: unityMenuModel
293307 menuData: model
qml/Notifications/NotificationMenuItemFactory.qml+12−3
@@ -50,7 +50,10 @@ Loader {
5050 Column {
5151 spacing: units.gu(2)
5252
53− anchors.left: parent.left; anchors.right: parent.right
53+ anchors {
54+ left: parent.left
55+ right: parent.right
56+ }
5457
5558 Component.onCompleted: {
5659 menuModel.loadExtendedAttributes(menuIndex, {"x-echo-mode-password": "bool"});
@@ -67,7 +70,10 @@ Loader {
6770
6871 // TODO using Qt.ImhNoPredictiveText here until lp #1291575 is fixed for ubuntu-ui-toolkit
6972 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
70− anchors.left: parent.left; anchors.right: parent.right
73+ anchors {
74+ left: parent.left
75+ right: parent.right
76+ }
7177 echoMode: checkBox.checked ? TextInput.Normal : TextInput.Password
7278 height: units.gu(5)
7379 onTextChanged: {
@@ -98,7 +104,10 @@ Loader {
98104 id: pinLock
99105
100106 Lockscreen {
101− anchors.left: parent.left; anchors.right: parent.right
107+ anchors {
108+ left: parent.left
109+ right: parent.right
110+ }
102111 height: menuFactory.maxHeight
103112 placeholderText: i18n.tr("Please enter SIM PIN")
104113 background: shell.background
qml/Notifications/Notifications.qml+17−1
@@ -36,8 +36,11 @@ ListView {
3636 filterRole: UnityNotifications.ModelInterface.RoleType
3737 filterRegExp: RegExp(UnityNotifications.Notification.SnapDecision)
3838 }
39− spacing: delegate.fullscreen ? 0 : units.gu(.5)
4039
40+ property bool topmostIsFullscreen: false
41+ spacing: topmostIsFullscreen ? 0 : units.gu(.5)
42+
43+ // FIXME: This doesn't make any sense and results in a binding loop
4144 currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1
4245
4346 delegate: Notification {
@@ -61,6 +64,19 @@ ListView {
6164 // make sure there's no opacity-difference between the several
6265 // elements in a notification
6366 layer.enabled: add.running || remove.running || populate.running
67+
68+ Component.onCompleted: {
69+ if (index == 1) {
70+ notificationList.topmostIsFullscreen = fullscreen
71+ }
72+ }
73+
74+ onFullscreenChanged: {
75+ // index 1 because 0 is the PlaceHolder...
76+ if (index == 1) {
77+ notificationList.topmostIsFullscreen = fullscreen
78+ }
79+ }
6480 }
6581
6682 populate: Transition {
qml/Panel/Indicators.qml+1
@@ -262,6 +262,7 @@ Showable {
262262 indicators.calculateCurrentItem(touchX, false);
263263 } else {
264264 indicators.state = "commit";
265+ indicatorRow.currentItemOffset = 0;
265266 }
266267 }
267268
qml/Panel/Indicators/MenuItemFactory.qml−6
@@ -140,7 +140,6 @@ Item {
140140
141141 onTriggered: {
142142 menuModel.activate(menuIndex);
143− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
144143 }
145144 }
146145 }
@@ -186,7 +185,6 @@ Item {
186185
187186 onTriggered: {
188187 menuModel.activate(menuIndex);
189− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
190188 }
191189 }
192190 }
@@ -205,7 +203,6 @@ Item {
205203
206204 onTriggered: {
207205 menuModel.activate(menuIndex);
208− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
209206 }
210207 }
211208 }
@@ -226,7 +223,6 @@ Item {
226223
227224 onTriggered: {
228225 menuModel.activate(menuIndex);
229− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
230226 }
231227 }
232228 }
@@ -367,7 +363,6 @@ Item {
367363 }
368364 onTriggered: {
369365 menuModel.activate(menuIndex);
370− shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
371366 }
372367
373368 function loadAttributes() {
@@ -412,7 +407,6 @@ Item {
412407 }
413408 onClicked: {
414409 menuModel.activate(menuIndex, true);
415− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
416410 }
417411 onDismissed: {
418412 menuModel.activate(menuIndex, false);
qml/Panel/Indicators/MessageMenuItemFactory.qml−3
@@ -95,7 +95,6 @@ Item {
9595
9696 onAppActivated: {
9797 menuModel.activate(menuIndex, true);
98− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
9998 }
10099 onDismissed: {
101100 menuModel.activate(menuIndex, false);
@@ -144,7 +143,6 @@ Item {
144143
145144 onAppActivated: {
146145 menuModel.activate(menuIndex, true);
147− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
148146 }
149147 onDismissed: {
150148 menuModel.activate(menuIndex, false);
@@ -204,7 +202,6 @@ Item {
204202
205203 onAppActivated: {
206204 menuModel.activate(menuIndex, true);
207− shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
208205 }
209206 onDismissed: {
210207 menuModel.activate(menuIndex, false);
qml/Panel/Panel.qml−22
@@ -27,28 +27,6 @@ Item {
2727 property alias callHint: __callHint
2828 property bool fullscreenMode: false
2929
30− function hideIndicatorMenu(delay) {
31− if (delay !== undefined) {
32− hideTimer.interval = delay;
33− hideTimer.start();
34− } else {
35− indicators.hide();
36− }
37− }
38−
39− Timer {
40− id: hideTimer
41− running: false
42− onTriggered: {
43− indicators.hide();
44− }
45− }
46−
47− Connections {
48− target: indicators
49− onShownChanged: hideTimer.stop()
50− }
51−
5230 Rectangle {
5331 id: darkenedArea
5432 property real darkenedOpacity: 0.6
qml/Shell.qml+200−6
@@ -19,6 +19,7 @@ import AccountsService 0.1
1919import GSettings 1.0
2020import Unity.Application 0.1
2121import Ubuntu.Components 0.1
22+import Ubuntu.Components.Popups 0.1
2223import Ubuntu.Gestures 0.1
2324import Unity.Launcher 0.1
2425import LightDM 0.1 as LightDM
@@ -268,7 +269,128 @@ FocusScope {
268269 }
269270 }
270271
272+ property bool dialogShown: false
273+
274+ Component {
275+ id: logoutDialog
276+ Dialog {
277+ id: dialogueLogout
278+ title: "Logout"
279+ text: "Are you sure that you want to logout?"
280+ Button {
281+ text: "Cancel"
282+ onClicked: {
283+ PopupUtils.close(dialogueLogout);
284+ stages.dialogShown = false;
285+ }
286+ }
287+ Button {
288+ text: "Yes"
289+ onClicked: {
290+ DBusUnitySessionService.Logout();
291+ PopupUtils.close(dialogueLogout);
292+ stages.dialogShown = false;
293+ }
294+ }
295+ }
296+ }
297+
298+ Component {
299+ id: shutdownDialog
300+ Dialog {
301+ id: dialogueShutdown
302+ title: "Shutdown"
303+ text: "Are you sure that you want to shutdown?"
304+ Button {
305+ text: "Cancel"
306+ onClicked: {
307+ PopupUtils.close(dialogueShutdown);
308+ stages.dialogShown = false;
309+ }
310+ }
311+ Button {
312+ text: "Yes"
313+ onClicked: {
314+ dBusUnitySessionServiceConnection.closeAllApps();
315+ DBusUnitySessionService.Shutdown();
316+ PopupUtils.close(dialogueShutdown);
317+ stages.dialogShown = false;
318+ }
319+ }
320+ }
321+ }
322+
323+ Component {
324+ id: rebootDialog
325+ Dialog {
326+ id: dialogueReboot
327+ title: "Reboot"
328+ text: "Are you sure that you want to reboot?"
329+ Button {
330+ text: "Cancel"
331+ onClicked: {
332+ PopupUtils.close(dialogueReboot)
333+ stages.dialogShown = false;
334+ }
335+ }
336+ Button {
337+ text: "Yes"
338+ onClicked: {
339+ dBusUnitySessionServiceConnection.closeAllApps();
340+ DBusUnitySessionService.Reboot();
341+ PopupUtils.close(dialogueReboot);
342+ stages.dialogShown = false;
343+ }
344+ }
345+ }
346+ }
347+
348+ Component {
349+ id: powerDialog
350+ Dialog {
351+ id: dialoguePower
352+ title: "Power"
353+ text: i18n.tr("Are you sure you would like to turn power off?")
354+ Button {
355+ text: i18n.tr("Power off")
356+ onClicked: {
357+ dBusUnitySessionServiceConnection.closeAllApps();
358+ PopupUtils.close(dialoguePower);
359+ stages.dialogShown = false;
360+ shutdownFadeOutRectangle.enabled = true;
361+ shutdownFadeOutRectangle.visible = true;
362+ shutdownFadeOut.start();
363+ }
364+ }
365+ Button {
366+ text: i18n.tr("Restart")
367+ onClicked: {
368+ dBusUnitySessionServiceConnection.closeAllApps();
369+ DBusUnitySessionService.Reboot();
370+ PopupUtils.close(dialoguePower);
371+ stages.dialogShown = false;
372+ }
373+ }
374+ Button {
375+ text: i18n.tr("Cancel")
376+ onClicked: {
377+ PopupUtils.close(dialoguePower);
378+ stages.dialogShown = false;
379+ }
380+ }
381+ }
382+ }
383+
384+ function showPowerDialog() {
385+ if (!stages.dialogShown) {
386+ stages.dialogShown = true;
387+ PopupUtils.open(powerDialog);
388+ }
389+ }
390+
271391 Connections {
392+ id: dBusUnitySessionServiceConnection
393+ objectName: "dBusUnitySessionServiceConnection"
272394 target: DBusUnitySessionService
273395
274396 function closeAllApps() {
@@ -282,8 +404,27 @@ FocusScope {
282404 }
283405
284406 onLogoutRequested: {
285− // TODO: Display a dialog to ask the user to confirm.
286− DBusUnitySessionService.Logout();
407+ // Display a dialog to ask the user to confirm.
408+ if (!stages.dialogShown) {
409+ stages.dialogShown = true;
410+ PopupUtils.open(logoutDialog);
411+ }
412+ }
413+
414+ onShutdownRequested: {
415+ // Display a dialog to ask the user to confirm.
416+ if (!stages.dialogShown) {
417+ stages.dialogShown = true;
418+ PopupUtils.open(shutdownDialog);
419+ }
420+ }
421+
422+ onRebootRequested: {
423+ // Display a dialog to ask the user to confirm.
424+ if (!stages.dialogShown) {
425+ stages.dialogShown = true;
426+ PopupUtils.open(rebootDialog);
427+ }
287428 }
288429
289430 onLogoutReady: {
@@ -348,6 +489,8 @@ FocusScope {
348489 Connections {
349490 target: LightDM.Greeter
350491
492+ onShowGreeter: greeter.show()
493+
351494 onShowPrompt: {
352495 if (LightDM.Users.count == 1) {
353496 // TODO: There's no better way for now to determine if its a PIN or a passphrase.
@@ -373,6 +516,12 @@ FocusScope {
373516 }
374517 }
375518
519+ Binding {
520+ target: LightDM.Greeter
521+ property: "active"
522+ value: greeter.shown || lockscreen.shown
523+ }
524+
376525 Rectangle {
377526 anchors.fill: parent
378527 color: "black"
@@ -412,6 +561,9 @@ FocusScope {
412561 onShownChanged: {
413562 if (shown) {
414563 lockscreen.reset();
564+ if (!LightDM.Greeter.promptless) {
565+ lockscreen.show();
566+ }
415567 // If there is only one user, we start authenticating with that one here.
416568 // If there are more users, the Greeter will handle that
417569 if (LightDM.Users.count == 1) {
@@ -472,10 +624,6 @@ FocusScope {
472624 stages.hide()
473625 }
474626
475− function hideIndicatorMenu(delay) {
476− panel.hideIndicatorMenu(delay);
477− }
478−
479627 Item {
480628 id: overlay
481629
@@ -679,4 +827,50 @@ FocusScope {
679827 target: SessionBroadcast
680828 onShowHome: showHome()
681829 }
830+
831+ Keys.onPressed: {
832+ if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
833+ if (!powerKeyTimer.running) {
834+ powerKeyTimer.start();
835+ }
836+ event.accepted = true;
837+ }
838+ }
839+
840+ Keys.onReleased: {
841+ if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
842+ powerKeyTimer.stop();
843+ event.accepted = true;
844+ }
845+ }
846+
847+ Timer {
848+ id: powerKeyTimer
849+ interval: 2000
850+ repeat: false
851+ triggeredOnStart: false
852+
853+ onTriggered: {
854+ stages.showPowerDialog();
855+ }
856+ }
857+
858+ Rectangle {
859+ id: shutdownFadeOutRectangle
860+ enabled: false
861+ visible: false
862+ color: "black"
863+ anchors.fill: parent
864+ opacity: 0.0
865+ NumberAnimation on opacity {
866+ id: shutdownFadeOut
867+ from: 0.0
868+ to: 1.0
869+ onStopped: {
870+ if (shutdownFadeOutRectangle.enabled && shutdownFadeOutRectangle.visible) {
871+ DBusUnitySessionService.Shutdown();
872+ }
873+ }
874+ }
875+ }
682876}
tests/mocks/LightDM/CMakeLists.txt+1
@@ -18,6 +18,7 @@ include_directories(
1818)
1919
2020set(QMLPLUGIN_SRC
21+ ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
2122 ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
2223 ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
2324 ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
tests/mocks/Powerd/Powerd.qmltypes+6−13
@@ -15,19 +15,12 @@ Module {
1515 isSingleton: true
1616 exportMetaObjectRevisions: [0]
1717 Enum {
18− name: "DisplayFlag"
18+ name: "DisplayStateChangeReason"
1919 values: {
20− "UseProximity": 1,
21− "DisableAutoBrightness": 2,
22− "Bright": 4
23− }
24− }
25− Enum {
26− name: "DisplayFlags"
27− values: {
28− "UseProximity": 1,
29− "DisableAutoBrightness": 2,
30− "Bright": 4
20+ "Unknown": 0,
21+ "Inactivity": 1,
22+ "PowerKey": 2,
23+ "Proximity": 3
3124 }
3225 }
3326 Enum {
@@ -40,7 +33,7 @@ Module {
4033 Signal {
4134 name: "displayPowerStateChange"
4235 Parameter { name: "status"; type: "int" }
43− Parameter { name: "flags"; type: "uint" }
36+ Parameter { name: "reason"; type: "int" }
4437 }
4538 }
4639}
tests/mocks/Unity/Unity.qmltypes+10−2
@@ -89,6 +89,10 @@ Module {
8989 name: "loadDepartment"
9090 Parameter { name: "id"; type: "string" }
9191 }
92+ Method {
93+ name: "performQuery"
94+ Parameter { name: "query"; type: "string" }
95+ }
9296 }
9397 Component {
9498 name: "Scopes"
@@ -133,8 +137,8 @@ Module {
133137 "RoleRawRendererTemplate": 3,
134138 "RoleRenderer": 4,
135139 "RoleComponents": 5,
136− "RoleResults": 6,
137− "RoleCount": 7
140+ "RoleResults": 7,
141+ "RoleCount": 8
138142 }
139143 }
140144 Method {
@@ -179,6 +183,9 @@ Module {
179183 Component {
180184 name: "unity::shell::scopes::PreviewModelInterface"
181185 prototype: "QAbstractListModel"
186+ exports: ["Unity/PreviewModel 0.2"]
187+ isCreatable: false
188+ exportMetaObjectRevisions: [0]
182189 Enum {
183190 name: "Roles"
184191 values: {
@@ -272,6 +279,7 @@ Module {
272279 Property { name: "isActive"; type: "bool" }
273280 Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
274281 Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
282+ Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
275283 Signal { name: "showDash" }
276284 Signal { name: "hideDash" }
277285 Signal {
tests/plugins/LightDM/CMakeLists.txt+1−1
@@ -19,7 +19,7 @@ target_link_libraries(test-lightdm-dbus
1919
2020add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
2121
22−add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
22+add_custom_target(testLightDMDBus xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
2323add_dependencies(testLightDMDBus test-lightdm-dbus)
2424
2525add_dependencies(qmluitests testLightDMDBus)
tests/plugins/LightDM/dbus.cpp+40
@@ -38,6 +38,13 @@ private Q_SLOTS:
3838 // SIGNAL method, because QtDBus doesn't know about PropertiesChanged.
3939 // So we connect the hard way for the benefit of any tests that want
4040 // to watch.
41+ QDBusConnection::sessionBus().connect(
42+ "com.canonical.UnityGreeter",
43+ "/",
44+ "org.freedesktop.DBus.Properties",
45+ "PropertiesChanged",
46+ this,
47+ SIGNAL(PropertiesChangedRelay(const QString&, const QVariantMap&, const QStringList&)));
4148 QDBusConnection::sessionBus().connect(
4249 "com.canonical.UnityGreeter",
4350 "/list",
@@ -57,6 +64,12 @@ private Q_SLOTS:
5764 view->show();
5865 QTest::qWaitForWindowExposed(view);
5966
67+ dbusMain = new QDBusInterface("com.canonical.UnityGreeter",
68+ "/",
69+ "com.canonical.UnityGreeter",
70+ QDBusConnection::sessionBus(), view);
71+ QVERIFY(dbusMain->isValid());
72+
6073 dbusList = new QDBusInterface("com.canonical.UnityGreeter",
6174 "/list",
6275 "com.canonical.UnityGreeter.List",
@@ -155,9 +168,36 @@ private Q_SLOTS:
155168 QVERIFY(arguments.at(1).toMap()["EntryIsLocked"] == false);
156169 }
157170
171+ void testIsActive()
172+ {
173+ QVERIFY(!greeter->isActive());
174+ QVERIFY(!dbusMain->property("IsActive").toBool());
175+
176+ QSignalSpy spy(this, SIGNAL(PropertiesChangedRelay(QString, QVariantMap, QStringList)));
177+ greeter->setIsActive(true);
178+ spy.wait();
179+
180+ QVERIFY(greeter->isActive());
181+ QVERIFY(dbusMain->property("IsActive").toBool());
182+
183+ QCOMPARE(spy.count(), 1);
184+ QList<QVariant> arguments = spy.takeFirst();
185+ QCOMPARE(arguments.at(0).toString(), QString("com.canonical.UnityGreeter"));
186+ QVERIFY(arguments.at(1).toMap().contains("IsActive"));
187+ QVERIFY(arguments.at(1).toMap()["IsActive"].toBool());
188+ }
189+
190+ void testShowGreeter()
191+ {
192+ // Just confirm the call exists and doesn't fail
193+ QDBusReply<void> reply = dbusMain->call("ShowGreeter");
194+ QVERIFY(reply.isValid());
195+ }
196+
158197private:
159198 QQuickView *view;
160199 Greeter *greeter;
200+ QDBusInterface *dbusMain;
161201 QDBusInterface *dbusList;
162202};
163203
tests/qmltests/Dash/tst_DashContent.qml+1
@@ -316,6 +316,7 @@ Item {
316316 compare(allButton.visible, true);
317317 compare(backButton.visible, true);
318318
319+ tryCompare(departmentListView, "contentX", departmentList1.x);
319320 waitForRendering(departmentListView);
320321 mouseClick(allButton, 0, 0);
321322 compare(dashDepartments.showList, false);
tests/qmltests/Panel/tst_Panel.qml−14
@@ -333,19 +333,5 @@ Item {
333333
334334 compare(indicatorRow.currentItem, indicatorItemFirst, "First indicator should still be the current item");
335335 }
336−
337− function test_hideIndicatorMenu_data() {
338− return [ {tag: "no-delay", delay: undefined },
339− {tag: "delayed", delay: 200 }
340− ];
341− }
342−
343− function test_hideIndicatorMenu(data) {
344− panel.indicators.show();
345− compare(panel.indicators.shown, true);
346−
347− panel.hideIndicatorMenu(data.delay);
348− tryCompare(panel.indicators, "shown", false);
349− }
350336 }
351337}
tests/qmltests/tst_Shell.qml+8
@@ -20,6 +20,7 @@
2020import QtQuick 2.0
2121import QtTest 1.0
2222import GSettings 1.0
23+import LightDM 0.1 as LightDM
2324import Unity.Application 0.1
2425import Unity.Test 0.1 as UT
2526import Powerd 0.1
@@ -520,5 +521,12 @@ Item {
520521 tryCompare(greeter, "showProgress", 0)
521522 waitUntilApplicationWindowIsFullyVisible()
522523 }
524+
525+ function test_showGreeterDBusCall() {
526+ var greeter = findChild(shell, "greeter")
527+ tryCompare(greeter, "showProgress", 0)
528+ LightDM.Greeter.showGreeter()
529+ tryCompare(greeter, "showProgress", 1)
530+ }
523531 }
524532}