aafc6d8 · unity8 · git.iko.soy

CMakeLists.txt+1

compare with xenial

unifiedsplit

@@ -96,6 +96,7 @@ include(autopilot)

96declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)

97

98set(SHELL_APP unity8)

99+set(DASH_APP unity8-dash)

99set(SCOPE_TOOL unity-scope-tool)

100set(SCOPE_TOOL unity-scope-tool)

100

101

101include_directories(

102include_directories(

data/CMakeLists.txt+5−2

@@ -1,7 +1,10 @@

1−# generate desktop file

1+# generate desktop files

2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

3+configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)

3

4

4# install desktop files

5# install desktop files

6+install(FILES

5−install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

7+ ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

8+ ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop

6 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

9 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

7 )

10 )

data/unity8-dash.confnew file+22

@@ -0,0 +1,22 @@

1+description "Unity Shell v8 Dash"

2+author "Michael Zanetti <michael.zanetti@canonical.com>"

3+

4+emits scope-ui-starting

5+

6+start on started unity8

7+stop on stopping unity8

8+

9+kill timeout 120

10+

11+respawn

12+

13+pre-start script

14+ if [ -z "$UNITY_SCOPES_LIST" ]; then

15+ # FIXME: remove once we have this in dconf

16+ initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"

17+ fi

18+

19+ initctl emit scope-ui-starting

20+end script

21+

22+exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=/usr/share/applications/unity8-dash.desktop

data/unity8-dash.desktop.innew file+9

@@ -0,0 +1,9 @@

1+[Desktop Entry]

2+Type=Application

3+Name=Unity 8 Dash

4+Comment=The converged Unity shell dash

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-dash

6+Terminal=false

7+Icon=unity8

8+NoDisplay=true

9+X-Ubuntu-Touch=true

data/unity8.conf+1−7

@@ -1,7 +1,7 @@

1description "Unity Shell v8"

2author "Ricardo Mendoza <ricmm@ubuntu.com>"

3

4−emits scope-ui-starting indicator-services-start

4+emits indicator-services-start

5

6start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus

7stop on desktop-end

@@ -34,11 +34,6 @@ pre-start script

34 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"

35 fi

36

37− if [ -z "$UNITY_SCOPES_LIST" ]; then

38− # FIXME: remove once we have this in dconf

39− initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"

40− fi

41−

42 # Remove the socket if still there

37 # Remove the socket if still there

43 if [ -S "$MIR_SERVER_FILE" ]; then

38 if [ -S "$MIR_SERVER_FILE" ]; then

44 rm "$MIR_SERVER_FILE"

39 rm "$MIR_SERVER_FILE"

@@ -46,7 +41,6 @@ pre-start script

46

41

47 initctl set-env --global MIR_SERVER_PROMPT_FILE=1

42 initctl set-env --global MIR_SERVER_PROMPT_FILE=1

48

43

49− initctl emit scope-ui-starting

50 initctl emit --no-wait indicator-services-start

44 initctl emit --no-wait indicator-services-start

51end script

45end script

52

46

debian/changelog+13

@@ -1,3 +1,16 @@

1+unity8 (8.00+14.10.20140805-0ubuntu1) utopic; urgency=low

2+

3+ [ Michael Zanetti ]

4+ * Split the dash from the shell into a separate app (LP: #1232687)

5+

6+ [ Leo Arias ]

7+ * Update the autopilot tests to work with the new dash app.

8+

9+ [ Daniel d'Andrada ]

10+ * Split the dash from the shell into a separate app (LP: #1232687)

11+

12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 05 Aug 2014 12:06:31 +0000

13+

1unity8 (8.00+14.10.20140731.1-0ubuntu1) utopic; urgency=low

14unity8 (8.00+14.10.20140731.1-0ubuntu1) utopic; urgency=low

2

15

3 [ Gerry Boland ]

16 [ Gerry Boland ]

debian/unity8.install+3

@@ -1,6 +1,9 @@

1data/unity8.conf usr/share/upstart/sessions/

2+data/unity8-dash.conf usr/share/upstart/sessions/

2usr/bin/unity8

3usr/bin/unity8

4+usr/bin/unity8-dash

3usr/share/applications/unity8.desktop

5usr/share/applications/unity8.desktop

6+usr/share/applications/unity8-dash.desktop

4usr/share/unity8/Greeter

7usr/share/unity8/Greeter

5usr/share/unity8/Hud

8usr/share/unity8/Hud

6usr/share/unity8/Launcher

9usr/share/unity8/Launcher

plugins/Unity/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1add_subdirectory(Indicators)

2add_subdirectory(Launcher)

3add_subdirectory(Session)

4+add_subdirectory(DashCommunicator)

plugins/Unity/DashCommunicator/CMakeLists.txtnew file+19

@@ -0,0 +1,19 @@

1+include_directories(

2+ ${CMAKE_CURRENT_SOURCE_DIR}

3+)

4+

5+set(QMLDASHCOMMUNICATORPLUGIN_SRC

6+ plugin.cpp

7+ dbusdashcommunicatorservice.cpp

8+ dashcommunicatorservice.cpp

9+ dashcommunicator.cpp

10+ )

11+

12+add_library(DashCommunicator-qml MODULE

13+ ${QMLDASHCOMMUNICATORPLUGIN_SRC}

14+ )

15+

16+qt5_use_modules(DashCommunicator-qml DBus Qml)

17+

18+# export the qmldir and qmltypes files

19+add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)

plugins/Unity/DashCommunicator/dashcommunicator.cppnew file+43

@@ -0,0 +1,43 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashcommunicator.h"

18+

19+#include <QObject>

20+#include <QDBusConnection>

21+#include <QDBusInterface>

22+#include <QDebug>

23+

24+DashCommunicator::DashCommunicator(QObject *parent):

25+ QObject(parent)

26+{

27+}

28+

29+DashCommunicator::~DashCommunicator()

30+{

31+}

32+

33+

34+void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool reset)

35+{

36+ QDBusConnection connection = QDBusConnection::sessionBus();

37+ QDBusInterface dashIface ("com.canonical.UnityDash",

38+ "/com/canonical/UnityDash",

39+ "",

40+ connection);

41+

42+ dashIface.call("SetCurrentScope", scopeId, animate, reset);

43+}

plugins/Unity/DashCommunicator/dashcommunicator.hnew file+35

@@ -0,0 +1,35 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DASHCOMMUNICATOR_H

18+#define DASHCOMMUNICATOR_H

19+

20+#include <QObject>

21+

22+class DashCommunicator: public QObject

23+{

24+ Q_OBJECT

25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26+

27+public:

28+ DashCommunicator(QObject *parent = 0);

29+ ~DashCommunicator();

30+

31+public Q_SLOTS:

32+ void setCurrentScope(const QString &scopeId, bool animate, bool reset);

33+};

34+

35+#endif

plugins/Unity/DashCommunicator/dashcommunicatorservice.cppnew file+30

@@ -0,0 +1,30 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashcommunicatorservice.h"

18+

19+DashCommunicatorService::DashCommunicatorService(QObject *parent):

20+ QObject(parent),

21+ m_dbusService(new DBusDashCommunicatorService(this))

22+{

23+ connect(m_dbusService, &DBusDashCommunicatorService::setCurrentScopeRequested, this, &DashCommunicatorService::setCurrentScopeRequested);

24+}

25+

26+

27+DashCommunicatorService::~DashCommunicatorService()

28+{

29+

30+}

plugins/Unity/DashCommunicator/dashcommunicatorservice.hnew file+38

@@ -0,0 +1,38 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DASHCOMMUNICATORSERVICE_H

18+#define DASHCOMMUNICATORSERVICE_H

19+

20+#include "dbusdashcommunicatorservice.h"

21+

22+#include <QObject>

23+

24+class DashCommunicatorService: public QObject

25+{

26+ Q_OBJECT

27+public:

28+ DashCommunicatorService(QObject *parent = 0);

29+ ~DashCommunicatorService();

30+

31+Q_SIGNALS:

32+ void setCurrentScopeRequested(const QString &scopeId, bool animate, bool reset);

33+

34+private:

35+ DBusDashCommunicatorService *m_dbusService;

36+};

37+

38+#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cppnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dbusdashcommunicatorservice.h"

18+

19+#include <QDBusConnection>

20+#include <QDBusInterface>

21+#include <QDebug>

22+

23+DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):

24+ QObject(parent)

25+{

26+ QDBusConnection connection = QDBusConnection::sessionBus();

27+

28+ connection.registerService("com.canonical.UnityDash");

29+ connection.registerObject("/com/canonical/UnityDash", this, QDBusConnection::ExportScriptableSlots);

30+}

31+

32+DBusDashCommunicatorService::~DBusDashCommunicatorService()

33+{

34+}

35+

36+void DBusDashCommunicatorService::SetCurrentScope(const QString &scopeId, bool animate, bool reset)

37+{

38+ Q_EMIT setCurrentScopeRequested(scopeId, animate, reset);

39+}

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.hnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DBUSDASHCOMMUNICATORSERVICE_H

18+#define DBUSDASHCOMMUNICATORSERVICE_H

19+

20+#include <QObject>

21+

22+class DBusDashCommunicatorService: public QObject

23+{

24+ Q_OBJECT

25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26+

27+public:

28+ DBusDashCommunicatorService(QObject *parent = 0);

29+ ~DBusDashCommunicatorService();

30+

31+Q_SIGNALS:

32+ void setCurrentScopeRequested(const QString &scopeId, bool animate, bool reset);

33+

34+public Q_SLOTS:

35+ Q_SCRIPTABLE void SetCurrentScope(const QString &scopeId, bool animate, bool reset);

36+

37+};

38+

39+#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/DashCommunicator/plugin.cppnew file+31

@@ -0,0 +1,31 @@

1+/*

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+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17+ */

18+

19+#include "plugin.h"

20+#include "dashcommunicator.h"

21+#include "dashcommunicatorservice.h"

22+

23+#include <QDBusConnection>

24+#include <QtQml/qqml.h>

25+

26+void DashCommunicatorPlugin::registerTypes(const char *uri)

27+{

28+ Q_ASSERT(uri == QStringLiteral("Unity.DashCommunicator"));

29+ qmlRegisterType<DashCommunicatorService>(uri, 0, 1, "DashCommunicatorService");

30+ qmlRegisterType<DashCommunicator>(uri, 0, 1, "DashCommunicator");

31+}

plugins/Unity/DashCommunicator/plugin.hnew file+34

@@ -0,0 +1,34 @@

1+/*

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+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17+ */

18+

19+#ifndef DASHCOMMUNICATOR_PLUGIN_H

20+#define DASHCOMMUNICATOR_PLUGIN_H

21+

22+#include <QtQml/QQmlEngine>

23+#include <QtQml/QQmlExtensionPlugin>

24+

25+class DashCommunicatorPlugin : public QQmlExtensionPlugin

26+{

27+ Q_OBJECT

28+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

29+

30+public:

31+ void registerTypes(const char *uri);

32+};

33+

34+#endif

plugins/Unity/DashCommunicator/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Unity.DashCommunicator

2+plugin DashCommunicator-qml

3+typeinfo DashCommunicator.qmltypes

plugins/Unity/Launcher/launchermodel.cpp+5

@@ -317,6 +317,11 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

317 return;

318 }

319

320+ if (app->appId() == "unity8-dash") {

321+ // Not adding the dash app

322+ return;

323+ }

324+

320 bool found = false;

325 bool found = false;

321 Q_FOREACH(LauncherItem *item, m_list) {

326 Q_FOREACH(LauncherItem *item, m_list) {

322 if (app->appId() == item->appId()) {

327 if (app->appId() == item->appId()) {

po/am.po+10−10

@@ -8,14 +8,14 @@ msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-07-27 01:25+0000\n"

11+"PO-Revision-Date: 2014-08-04 16:30+0000\n"

12"Last-Translator: samson <Unknown>\n"

13"Language-Team: Amharic <am@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-28 06:44+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-05 06:45+0000\n"

18−"X-Generator: Launchpad (build 17131)\n"

18+"X-Generator: Launchpad (build 17147)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -36,7 +36,7 @@ msgstr "የቀኝ ጠርዝ"

36

37#: qml/Components/EdgeDemo.qml:114

38msgid "Try swiping from the right edge to unlock the phone"

39−msgstr ""

39+msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"

40

41#: qml/Components/EdgeDemo.qml:145

42msgid "Top edge"

@@ -44,7 +44,7 @@ msgstr "የላይ ጠርዝ"

44

45#: qml/Components/EdgeDemo.qml:146

46msgid "Try swiping from the top edge to access the indicators"

47−msgstr ""

47+msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"

48

49#: qml/Components/EdgeDemo.qml:171

50msgid "Close"

@@ -52,7 +52,7 @@ msgstr "መዝጊያ"

52

53#: qml/Components/EdgeDemo.qml:172

54msgid "Swipe up again to close the settings screen"

55−msgstr ""

55+msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"

56

57#: qml/Components/EdgeDemo.qml:199

58msgid "Left edge"

@@ -60,11 +60,11 @@ msgstr "የግራ ጠርዝ"

60

61#: qml/Components/EdgeDemo.qml:200

62msgid "Swipe from the left to reveal the launcher for quick access to apps"

63−msgstr ""

63+msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"

64

65#: qml/Components/EdgeDemo.qml:227

66msgid "Well done"

67−msgstr ""

67+msgstr "ጥሩ አድረገዋል"

68

69#: qml/Components/EdgeDemo.qml:228

70msgid ""

@@ -123,7 +123,7 @@ msgstr "አነስተኛ..."

123

124#: qml/Dash/Previews/PreviewRatingInput.qml:81

125msgid "Rate this"

126−msgstr ""

126+msgstr "ለዚህ ደረጃ ይስጡ"

127

128#: qml/Dash/Previews/PreviewRatingInput.qml:126

129msgid "Add a review"

@@ -135,7 +135,7 @@ msgstr "መላኪያ"

135

136#: qml/Greeter/Greeter.qml:157

137msgid "Swipe to unlock"

138−msgstr ""

138+msgstr "ለመክፈት ይጥረጉ"

139

140#: qml/Hud/HudParametrizedActionsPage.qml:132

141msgid "Confirm"

po/el.po+6−6

@@ -8,14 +8,14 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-07-28 16:06+0000\n"

11+"PO-Revision-Date: 2014-08-04 18:44+0000\n"

12−"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"

12+"Last-Translator: madvinegar <madvinegar@hotmail.com>\n"

13"Language-Team: Greek <el@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-29 06:54+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-05 06:45+0000\n"

18−"X-Generator: Launchpad (build 17131)\n"

18+"X-Generator: Launchpad (build 17147)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -171,7 +171,7 @@ msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"

171

172#: qml/Panel/ActiveCallHint.qml:77

173msgid "Tap to return to call..."

174−msgstr ""

174+msgstr "Πατήστε για να γυρίσετε στην κλήση..."

175

176#: qml/Panel/ActiveCallHint.qml:90

177msgid "Conference"

@@ -199,7 +199,7 @@ msgstr "Ολοκληρώθηκε"

199

200#: qml/Panel/Indicators/MenuItemFactory.qml:595

201msgid "Failed, tap to retry"

202−msgstr ""

202+msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"

203

204#: qml/Panel/SearchIndicator.qml:27

205msgid "Search"

po/hu.po+3−3

@@ -8,13 +8,13 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-08-03 17:15+0000\n"

11+"PO-Revision-Date: 2014-08-04 09:10+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-08-04 06:32+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-05 06:45+0000\n"

18"X-Generator: Launchpad (build 17147)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

@@ -82,7 +82,7 @@ msgstr "Vészhívás"

82

83#: qml/Components/Lockscreen.qml:231

84msgid "OK"

85−msgstr "Oké"

85+msgstr "Ok"

86

87#: qml/Components/PassphraseLockscreen.qml:60

88#, qt-format

po/pt_BR.po+11−11

@@ -8,14 +8,14 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-07-17 05:46+0000\n"

11+"PO-Revision-Date: 2014-08-04 18:33+0000\n"

12−"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"

12+"Last-Translator: Rafael Neri <Unknown>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-07-26 07:17+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-05 06:45+0000\n"

18−"X-Generator: Launchpad (build 17131)\n"

18+"X-Generator: Launchpad (build 17147)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -99,7 +99,7 @@ msgstr "CANCELAR"

99

100#: qml/Components/PinLockscreen.qml:216

101msgid "DONE"

102−msgstr ""

102+msgstr "FEITO"

103

104#: qml/Components/SeeMore.qml:35

105msgid "See more"

@@ -115,7 +115,7 @@ msgstr "Recentes"

115

116#: qml/Dash/GenericScopeView.qml:330

117msgid "See all"

118−msgstr ""

118+msgstr "Ver todos"

119

120#: qml/Dash/Previews/PreviewActionCombo.qml:34

121msgid "More..."

@@ -171,11 +171,11 @@ msgstr "Por favor, digite o PIN do cartão SIM"

171

172#: qml/Panel/ActiveCallHint.qml:77

173msgid "Tap to return to call..."

174−msgstr ""

174+msgstr "Toque para retornar para a chamada..."

175

176#: qml/Panel/ActiveCallHint.qml:90

177msgid "Conference"

178−msgstr ""

178+msgstr "Conferência"

179

180#: qml/Panel/Indicators/MenuItemFactory.qml:583

181msgid "In queue…"

@@ -187,7 +187,7 @@ msgstr "Baixando"

187

188#: qml/Panel/Indicators/MenuItemFactory.qml:589

189msgid "Paused, tap to resume"

190−msgstr ""

190+msgstr "Em pausa, toque para continuar"

191

192#: qml/Panel/Indicators/MenuItemFactory.qml:591

193msgid "Canceled"

@@ -195,11 +195,11 @@ msgstr "Cancelado"

195

196#: qml/Panel/Indicators/MenuItemFactory.qml:593

197msgid "Finished"

198−msgstr ""

198+msgstr "Finalizado"

199

200#: qml/Panel/Indicators/MenuItemFactory.qml:595

201msgid "Failed, tap to retry"

202−msgstr ""

202+msgstr "Falhou, toque para tentar novamente"

203

204#: qml/Panel/SearchIndicator.qml:27

205msgid "Search"

qml/Components/EdgeDemo.qml+5−6

@@ -22,7 +22,6 @@ Item {

22 id: demo

23

24 property Item greeter

25− property Item dash

26 property Item launcher

25 property Item launcher

27 property Item indicators

26 property Item indicators

28 property Item underlay

27 property Item underlay

@@ -144,7 +143,7 @@ Item {

144 "edge": "top",

143 "edge": "top",

145 "title": i18n.tr("Top edge"),

144 "title": i18n.tr("Top edge"),

146 "text": i18n.tr("Try swiping from the top edge to access the indicators"),

145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),

147− "anchors.fill": demo.dash,

146+ "anchors.fill": demo.underlay,

148 });

147 });

149 }

148 }

150 if (d.topEdgeDemo) {

149 if (d.topEdgeDemo) {

@@ -193,12 +192,12 @@ Item {

193 function startLeftEdgeDemo() {

192 function startLeftEdgeDemo() {

194 demo.panelEnabled = false;

193 demo.panelEnabled = false;

195 demo.launcherEnabled = true;

194 demo.launcherEnabled = true;

196− if (demo.dash && demo.underlay) {

195+ if (demo.underlay) {

197 d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {

196 d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {

198 "edge": "left",

197 "edge": "left",

199 "title": i18n.tr("Left edge"),

198 "title": i18n.tr("Left edge"),

200 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),

199 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),

201− "anchors.fill": demo.dash,

200+ "anchors.fill": demo.underlay,

202 });

201 });

203 }

202 }

204 if (d.leftEdgeDemo) {

203 if (d.leftEdgeDemo) {

@@ -221,12 +220,12 @@ Item {

221

220

222 function startFinalEdgeDemo() {

221 function startFinalEdgeDemo() {

223 demo.launcherEnabled = false;

222 demo.launcherEnabled = false;

224− if (demo.dash && demo.underlay) {

223+ if (demo.underlay) {

225 d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {

224 d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {

226 "edge": "none",

225 "edge": "none",

227 "title": i18n.tr("Well done"),

226 "title": i18n.tr("Well done"),

228 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),

227 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),

229− "anchors.fill": demo.dash,

228+ "anchors.fill": demo.underlay,

230 "showSkip": false,

229 "showSkip": false,

231 });

230 });

232 }

231 }

qml/Dash/Dash.qml+8

@@ -18,6 +18,7 @@ import QtQuick 2.0

18import Ubuntu.Components 0.1

19import Unity 0.2

20import Utils 0.1

21+import Unity.DashCommunicator 0.1

21import "../Components"

22import "../Components"

22

23

23Showable {

24Showable {

@@ -29,6 +30,13 @@ Showable {

29 property string showScopeOnLoaded: "clickscope"

30 property string showScopeOnLoaded: "clickscope"

30 property real contentScale: 1.0

31 property real contentScale: 1.0

31

32

33+ DashCommunicatorService {

34+ objectName: "dashCommunicatorService"

35+ onSetCurrentScopeRequested: {

36+ dash.setCurrentScope(scopeId, animate, reset)

37+ }

38+ }

39+

32 function setCurrentScope(scopeId, animate, reset) {

40 function setCurrentScope(scopeId, animate, reset) {

33 var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

41 var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

34

42

qml/Dash/DashApplication.qmlnew file+29

@@ -0,0 +1,29 @@

1+/*

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+import QtQuick 2.2

18+import Ubuntu.Components 1.0

19+

20+MainView {

21+ width: units.gu(40)

22+ height: units.gu(71)

23+

24+ useDeprecatedToolbar: false

25+

26+ Dash {

27+ anchors.fill: parent

28+ }

29+}

qml/Dash/GenericScopeView.qml+1−1

@@ -46,7 +46,7 @@ FocusScope {

46 }

47

48 function activateApp(appId) {

49− shell.activateApplication(appId);

49+ Qt.openUrlExternally(appId);

50 }

51

52 function positionAtBeginning() {

qml/Dash/ScopeListView.qml−5

@@ -20,9 +20,4 @@ import Dash 0.1

20ListViewWithPageHeader {

21 maximumFlickVelocity: height * 10

22 flickDeceleration: height * 2

23−

24− Connections {

25− target: greeter

26− onShownChanged: if (greeter.shown) showHeader()

27− }

28}

23}

qml/Dash/graphics/phone/screenshots/unity8-dash@12.pngnew file

Binary file not shown.

qml/Launcher/Launcher.qml+2−3

@@ -29,8 +29,7 @@ Item {

29 property int dragAreaWidth: units.gu(1)

30 property int minimizeDistance: units.gu(26)

31 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?

32− (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) :

32+ (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0

33− (dragArea.dragging ? 0.001 : 0)

34

33

35 readonly property bool shown: panel.x > -panel.width

34 readonly property bool shown: panel.x > -panel.width

36

35

@@ -245,7 +244,7 @@ Item {

245 if (!dragging) {

244 if (!dragging) {

246 if (distance > panel.width / 2) {

245 if (distance > panel.width / 2) {

247 if (distance > minimizeDistance) {

246 if (distance > minimizeDistance) {

248− root.dash()

247+ root.dash();

249 } else {

248 } else {

250 root.switchToNextState("visible")

249 root.switchToNextState("visible")

251 }

250 }

qml/Shell.qml+26−132

@@ -26,7 +26,6 @@ import Utils 0.1

26import LightDM 0.1 as LightDM

27import Powerd 0.1

28import SessionBroadcast 0.1

29−import "Dash"

30import "Greeter"

29import "Greeter"

31import "Launcher"

30import "Launcher"

32import "Panel"

31import "Panel"

@@ -35,6 +34,7 @@ import "Notifications"

35import "Stages"

34import "Stages"

36import Unity.Notifications 1.0 as NotificationBackend

35import Unity.Notifications 1.0 as NotificationBackend

37import Unity.Session 0.1

36import Unity.Session 0.1

37+import Unity.DashCommunicator 0.1

38

39Item {

40 id: shell

@@ -49,8 +49,6 @@ Item {

49 property url background

50 readonly property real panelHeight: panel.panelHeight

51

52− property bool dashShown: dash.shown && dash.available && underlay.visible

53−

54 property bool sideStageEnabled: shell.width >= units.gu(100)

52 property bool sideStageEnabled: shell.width >= units.gu(100)

55 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId

53 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId

56

54

@@ -60,7 +58,6 @@ Item {

60 } else {

58 } else {

61 var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;

59 var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;

62 ApplicationManager.startApplication(appId, execFlags);

60 ApplicationManager.startApplication(appId, execFlags);

63− stages.show();

64 }

61 }

65 }

62 }

66

63

@@ -87,6 +84,11 @@ Item {

87 id: volumeControl

84 id: volumeControl

88 }

85 }

89

86

87+ DashCommunicator {

88+ id: dash

89+ objectName: "dashCommunicator"

90+ }

91+

90 WindowKeysFilter {

92 WindowKeysFilter {

91 // Handle but do not filter out volume keys

93 // Handle but do not filter out volume keys

92 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

94 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

@@ -122,64 +124,12 @@ Item {

122 visible: !fullyCovered

124 visible: !fullyCovered

123

125

124 Image {

126 Image {

125− anchors.fill: dash

127+ anchors.fill: underlay

126 source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"

128 source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"

127 fillMode: Image.PreserveAspectCrop

129 fillMode: Image.PreserveAspectCrop

128 horizontalAlignment: Image.AlignRight

130 horizontalAlignment: Image.AlignRight

129 verticalAlignment: Image.AlignTop

131 verticalAlignment: Image.AlignTop

130 }

132 }

131−

132− Dash {

133− id: dash

134− objectName: "dash"

135−

136− available: !LightDM.Greeter.active

137− hides: [stages, launcher, panel.indicators]

138− shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0 &&

139− !(panel.indicators.fullyOpened && !sideStageEnabled)

140− enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled

141−

142− anchors {

143− fill: parent

144− topMargin: panel.panelHeight

145− }

146−

147− contentScale: 1.0 - 0.2 * disappearingAnimationProgress

148− opacity: 1.0 - disappearingAnimationProgress

149− property real disappearingAnimationProgress: stages.showProgress

150−

151− // FIXME: only necessary because stages.showProgress is not animated

152− Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

153− }

154− }

155−

156− EdgeDragArea {

157− id: stagesDragArea

158− direction: Direction.Leftwards

159−

160− anchors { top: parent.top; right: parent.right; bottom: parent.bottom }

161− width: shell.edgeSize

162−

163− property real progress: stages.width

164−

165− onTouchXChanged: {

166− if (status == DirectionalDragArea.Recognized) {

167− if (ApplicationManager.empty) {

168− progress = Math.max(stages.width - stagesDragArea.width + touchX, stages.width * .3);

169− } else {

170− progress = stages.width - stagesDragArea.width + touchX;

171− }

172− }

173− }

174−

175− onDraggingChanged: {

176− if (!dragging) {

177− if (!ApplicationManager.empty && progress < stages.width - units.gu(10)) {

178− stages.show();

179− }

180− stagesDragArea.progress = Qt.binding(function () { return stages.width; });

181− }

182− }

183 }

133 }

184

134

185 Item {

135 Item {

@@ -187,55 +137,7 @@ Item {

187 objectName: "stages"

137 objectName: "stages"

188 width: parent.width

138 width: parent.width

189 height: parent.height

139 height: parent.height

190−

191− visible: !fullyHidden && !ApplicationManager.empty

140+ visible: !ApplicationManager.empty

192−

193− x: {

194− if (shown) {

195− if (locked || greeter.fakeActiveForApp !== "") {

196− return 0;

197− }

198− return launcher.progress;

199− } else {

200− return stagesDragArea.progress

201− }

202− }

203− Behavior on x { SmoothedAnimation { velocity: 600; duration: UbuntuAnimation.FastDuration } }

204−

205− property bool shown: false

206− onShownChanged: {

207− if (shown) {

208− if (ApplicationManager.count > 0) {

209− ApplicationManager.focusApplication(ApplicationManager.get(0).appId);

210− }

211− } else {

212− if (ApplicationManager.focusedApplicationId) {

213− ApplicationManager.updateScreenshot(ApplicationManager.focusedApplicationId);

214− ApplicationManager.unfocusCurrentApplication();

215− }

216− }

217− }

218−

219− // Avoid a silent "divide by zero -> NaN" situation during init as shell.width will be

220− // zero. That breaks the property binding and the function won't be reevaluated once

221− // shell.width is set, with the NaN result staying there for good.

222− property real showProgress: shell.width ? MathUtils.clamp(1 - x / shell.width, 0, 1) : 0

223−

224− property bool fullyShown: x == 0

225− property bool fullyHidden: x == width

226−

227− property bool locked: applicationsDisplayLoader.item ? applicationsDisplayLoader.item.locked : false

228−

229− // It might technically not be fullyShown but visually it just looks so.

230− property bool roughlyFullyShown: x >= 0 && x <= units.gu(1)

231−

232− function show() {

233− shown = true;

234− }

235−

236− function hide() {

237− shown = false;

238− }

239

141

240 Connections {

142 Connections {

241 target: ApplicationManager

143 target: ApplicationManager

@@ -244,7 +146,6 @@ Item {

244 lockscreen.show();

146 lockscreen.show();

245 }

147 }

246 greeter.hide();

148 greeter.hide();

247− stages.show();

248 }

149 }

249

150

250 onFocusedApplicationIdChanged: {

151 onFocusedApplicationIdChanged: {

@@ -255,18 +156,9 @@ Item {

255 }

156 }

256

157

257 onApplicationAdded: {

158 onApplicationAdded: {

258− if (greeter.shown) {

159+ if (greeter.shown && appId != "unity8-dash") {

259 greeter.hide();

160 greeter.hide();

260 }

161 }

261− if (!stages.shown) {

262− stages.show();

263− }

264− }

265−

266− onEmptyChanged: {

267− if (ApplicationManager.empty) {

268− stages.hide();

269− }

270 }

162 }

271 }

163 }

272

164

@@ -295,14 +187,18 @@ Item {

295 Binding {

187 Binding {

296 target: applicationsDisplayLoader.item

188 target: applicationsDisplayLoader.item

297 property: "interactive"

189 property: "interactive"

298− value: stages.roughlyFullyShown && !greeter.shown && !lockscreen.shown

299− && panel.indicators.fullyClosed

190+ value: !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0

300 }

191 }

301 Binding {

192 Binding {

302 target: applicationsDisplayLoader.item

193 target: applicationsDisplayLoader.item

303 property: "spreadEnabled"

194 property: "spreadEnabled"

304 value: greeter.fakeActiveForApp === "" // to support emergency dialer hack

195 value: greeter.fakeActiveForApp === "" // to support emergency dialer hack

305 }

196 }

197+ Binding {

198+ target: applicationsDisplayLoader.item

199+ property: "inverseProgress"

200+ value: launcher.progress

201+ }

306 }

202 }

307 }

203 }

308

204

@@ -540,25 +436,20 @@ Item {

540

436

541 var animate = !LightDM.Greeter.active && !stages.shown

437 var animate = !LightDM.Greeter.active && !stages.shown

542 dash.setCurrentScope("clickscope", animate, false)

438 dash.setCurrentScope("clickscope", animate, false)

543− stages.hide()

439+ ApplicationManager.requestFocusApplication("unity8-dash")

544 }

440 }

545

441

546 function showDash() {

442 function showDash() {

547 if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {

443 if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {

548 return;

444 return;

549 }

445 }

550−

551− if (!stages.locked) {

552− stages.hide();

553− launcher.fadeOut();

554− } else {

555− launcher.switchToNextState("visible");

556− }

557−

558 if (greeter.shown) {

446 if (greeter.shown) {

559 greeter.hideRight();

447 greeter.hideRight();

560 launcher.fadeOut();

448 launcher.fadeOut();

561 }

449 }

450+

451+ ApplicationManager.requestFocusApplication("unity8-dash")

452+ launcher.fadeOut();

562 }

453 }

563

454

564 Item {

455 Item {

@@ -583,8 +474,8 @@ Item {

583 ApplicationManager.focusedApplicationId &&

474 ApplicationManager.focusedApplicationId &&

584 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen

475 ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen

585

476

586− fullscreenMode: (stages.roughlyFullyShown && topmostApplicationIsFullscreen

477+ fullscreenMode: (topmostApplicationIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)

587− && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""

478+ || greeter.fakeActiveForApp !== ""

588 }

479 }

589

480

590 Launcher {

481 Launcher {

@@ -601,7 +492,11 @@ Item {

601

492

602 onShowDashHome: showHome()

493 onShowDashHome: showHome()

603 onDash: showDash()

494 onDash: showDash()

495+ onDashSwipeChanged: {

496+ if (dashSwipe && ApplicationManager.focusedApplicationId !== "unity8-dash") {

604− onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)

497+ dash.setCurrentScope("clickscope", false, true)

498+ }

499+ }

605 onLauncherApplicationSelected: {

500 onLauncherApplicationSelected: {

606 if (greeter.fakeActiveForApp !== "") {

501 if (greeter.fakeActiveForApp !== "") {

607 lockscreen.show()

502 lockscreen.show()

@@ -693,7 +588,6 @@ Item {

693 z: alphaDisclaimerLabel.z + 10

588 z: alphaDisclaimerLabel.z + 10

694 greeter: greeter

589 greeter: greeter

695 launcher: launcher

590 launcher: launcher

696− dash: dash

697 indicators: panel.indicators

591 indicators: panel.indicators

698 underlay: underlay

592 underlay: underlay

699 }

593 }

qml/Stages/PhoneStage.qml+59−26

@@ -21,7 +21,7 @@ import Unity.Application 0.1

21import Utils 0.1

22import "../Components"

23

24−Item {

24+Rectangle {

25 id: root

26

27 // Controls to be set from outside

@@ -29,9 +29,9 @@ Item {

29 property real maximizedAppTopMargin

30 property bool interactive

31 property bool spreadEnabled: true // If false, animations and right edge will be disabled

32+ property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.

32

33

33− // State information propagated to the outside

34+ color: "black"

34− readonly property bool locked: spreadView.phase == 2

35

36 function select(appId) {

37 spreadView.snapTo(priv.indexOf(appId));

@@ -43,6 +43,16 @@ Item {

43 spreadView.contentX = -spreadView.shift;

44 }

45

46+ onInverseProgressChanged: {

47+ if (inverseProgress == 0 && priv.oldInverseProgress > 0) {

48+ // left edge drag released. Minimum distance is given by design.

49+ if (priv.oldInverseProgress > units.gu(22)) {

50+ ApplicationManager.focusApplication("unity8-dash");

51+ }

52+ }

53+ priv.oldInverseProgress = inverseProgress;

54+ }

55+

46 Connections {

56 Connections {

47 target: ApplicationManager

57 target: ApplicationManager

48

58

@@ -50,7 +60,7 @@ Item {

50 if (spreadView.phase > 0) {

60 if (spreadView.phase > 0) {

51 spreadView.snapTo(priv.indexOf(appId));

61 spreadView.snapTo(priv.indexOf(appId));

52 } else {

62 } else {

53− priv.switchToApp(appId);

63+ ApplicationManager.focusApplication(appId);

54 }

64 }

55 }

65 }

56

66

@@ -60,7 +70,7 @@ Item {

60 } else {

70 } else {

61 spreadView.phase = 0;

71 spreadView.phase = 0;

62 spreadView.contentX = -spreadView.shift;

72 spreadView.contentX = -spreadView.shift;

63− priv.switchToApp(appId);

73+ ApplicationManager.focusApplication(appId);

64 }

74 }

65 }

75 }

66

76

@@ -79,15 +89,11 @@ Item {

79

89

80 property string focusedAppId: ApplicationManager.focusedApplicationId

90 property string focusedAppId: ApplicationManager.focusedApplicationId

81 property var focusedApplication: ApplicationManager.findApplication(focusedAppId)

91 property var focusedApplication: ApplicationManager.findApplication(focusedAppId)

92+ property var focusedAppDelegate: null

82

93

83− function switchToApp(appId) {

94+ property real oldInverseProgress: 0

84− if (priv.focusedAppId) {

95+

85− spreadView.focusChanging = true;

96+ onFocusedAppIdChanged: focusedAppDelegate = spreadRepeater.itemAt(0);

86− ApplicationManager.focusApplication(appId);

87− } else {

88− ApplicationManager.focusApplication(appId);

89− }

90− }

91

97

92 function indexOf(appId) {

98 function indexOf(appId) {

93 for (var i = 0; i < ApplicationManager.count; i++) {

99 for (var i = 0; i < ApplicationManager.count; i++) {

@@ -100,14 +106,6 @@ Item {

100

106

101 }

107 }

102

108

103− Rectangle {

104− id: coverFlipBackground

105− anchors.fill: parent

106− color: "black"

107− visible: spreadView.visible

108− }

109−

110−

111 Flickable {

109 Flickable {

112 id: spreadView

110 id: spreadView

113 objectName: "spreadView"

111 objectName: "spreadView"

@@ -116,6 +114,10 @@ Item {

116 contentWidth: spreadRow.width - shift

114 contentWidth: spreadRow.width - shift

117 contentX: -shift

115 contentX: -shift

118

116

117+ // This indicates when the spreadView is active. That means, all the animations

118+ // are activated and tiles need to line up for the spread.

119+ readonly property bool active: shiftedContentX > 0 || spreadDragArea.dragging

120+

119 // The flickable needs to fill the screen in order to get touch events all over.

121 // The flickable needs to fill the screen in order to get touch events all over.

120 // However, we don't want to the user to be able to scroll back all the way. For

122 // However, we don't want to the user to be able to scroll back all the way. For

121 // that, the beginning of the gesture starts with a negative value for contentX

123 // that, the beginning of the gesture starts with a negative value for contentX

@@ -198,6 +200,12 @@ Item {

198 snapAnimation.start();

200 snapAnimation.start();

199 }

201 }

200

202

203+ // In case the ApplicationManager already holds an app when starting up we're missing animations

204+ // Make sure we end up in the same state

205+ Component.onCompleted: {

206+ spreadView.contentX = -spreadView.shift

207+ }

208+

201 SequentialAnimation {

209 SequentialAnimation {

202 id: snapAnimation

210 id: snapAnimation

203 property int targetContentX: -spreadView.shift

211 property int targetContentX: -spreadView.shift

@@ -260,14 +268,33 @@ Item {

260 && spreadView.shiftedContentX === 0 && root.interactive && index === 0

268 && spreadView.shiftedContentX === 0 && root.interactive && index === 0

261 swipeToCloseEnabled: spreadView.interactive

269 swipeToCloseEnabled: spreadView.interactive

262 maximizedAppTopMargin: root.maximizedAppTopMargin

270 maximizedAppTopMargin: root.maximizedAppTopMargin

263− dropShadow: spreadView.shiftedContentX > 0 || spreadDragArea.status == DirectionalDragArea.Undecided

271+ dropShadow: spreadView.active ||

272+ priv.focusedAppDelegate.x !== 0

273+

274+ readonly property bool isDash: model.appId == "unity8-dash"

275+

276+ z: isDash && !spreadView.active ? -1 : behavioredIndex

264

277

265− z: behavioredIndex

278+ x: {

279+ // focused app is always positioned at 0 except when following left edge drag

280+ if (index == 0) {

281+ if (!isDash && root.inverseProgress > 0) {

282+ return root.inverseProgress;

283+ }

284+ return 0;

285+ }

286+ if (isDash && !spreadView.active && !spreadDragArea.dragging) {

287+ return 0;

288+ }

289+

290+ // Otherwise line up for the spread

266− x: index == 0 ? 0 : spreadView.width + (index - 1) * spreadView.tileDistance

291+ return spreadView.width + (index - 1) * spreadView.tileDistance;

292+ }

267 property real behavioredIndex: index

293 property real behavioredIndex: index

268 Behavior on behavioredIndex {

294 Behavior on behavioredIndex {

269 enabled: spreadView.closingIndex >= 0

295 enabled: spreadView.closingIndex >= 0

270 UbuntuNumberAnimation {

296 UbuntuNumberAnimation {

297+ id: appXAnimation

271 onRunningChanged: {

298 onRunningChanged: {

272 if (!running) {

299 if (!running) {

273 spreadView.closingIndex = -1;

300 spreadView.closingIndex = -1;

@@ -277,11 +304,13 @@ Item {

277 }

304 }

278

305

279 Behavior on x {

306 Behavior on x {

280− enabled: spreadView.focusChanging && index == 0 && root.spreadEnabled

307+ enabled: root.spreadEnabled &&

308+ !spreadView.active &&

309+ !snapAnimation.running

281 UbuntuNumberAnimation {

310 UbuntuNumberAnimation {

282 duration: UbuntuAnimation.FastDuration

311 duration: UbuntuAnimation.FastDuration

283 onRunningChanged: {

312 onRunningChanged: {

284− if (!running) {

313+ if (!running && root.inverseProgress == 0) {

285 spreadView.focusChanging = false;

314 spreadView.focusChanging = false;

286 }

315 }

287 }

316 }

@@ -322,6 +351,10 @@ Item {

322 return progress;

351 return progress;

323 }

352 }

324

353

354+ // Hiding tiles when their progress is negative or reached the maximum

355+ visible: (progress >= 0 && progress < 1.7) ||

356+ (isDash && priv.focusedAppDelegate.x !== 0)

357+

325 EasingCurve {

358 EasingCurve {

326 id: snappingCurve

359 id: snappingCurve

327 type: EasingCurve.Linear

360 type: EasingCurve.Linear

qml/Stages/SpreadDelegate.qml+6

@@ -37,6 +37,7 @@ Item {

37

38 SurfaceContainer {

39 id: surfaceContainer

40+ objectName: "surfaceContainer"

40 anchors.fill: parent

41 anchors.fill: parent

41 surface: model.surface

42 surface: model.surface

42 property bool appHasCreatedASurface: false

43 property bool appHasCreatedASurface: false

@@ -172,6 +173,11 @@ Item {

172 }

173 }

173

174

174 onDragEnd: {

175 onDragEnd: {

176+ if (model.appId == "unity8-dash") {

177+ animation.animate("center")

178+ return;

179+ }

180+

175 // velocity and distance values specified by design prototype

181 // velocity and distance values specified by design prototype

176 if ((dragVelocity < -units.gu(40) && distance < -units.gu(8)) || distance < -root.height / 2) {

182 if ((dragVelocity < -units.gu(40) && distance < -units.gu(8)) || distance < -root.height / 2) {

177 animation.animate("up")

183 animation.animate("up")

qml/Stages/TabletStage.qml+85−41

@@ -21,10 +21,11 @@ import Unity.Application 0.1

21import Utils 0.1

22import "../Components"

23

24−Item {

24+Rectangle {

25 id: root

26 objectName: "stages"

27 anchors.fill: parent

28+ color: "black"

28

29

29 // Controls to be set from outside

30 // Controls to be set from outside

30 property bool shown: false

31 property bool shown: false

@@ -32,9 +33,17 @@ Item {

32 property int dragAreaWidth

33 property int dragAreaWidth

33 property real maximizedAppTopMargin

34 property real maximizedAppTopMargin

34 property bool interactive

35 property bool interactive

36+ property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.

35

37

36− // State information propagated to the outside

38+ onInverseProgressChanged: {

37− readonly property bool locked: spreadView.phase == 2

39+ if (inverseProgress == 0 && priv.oldInverseProgress > 0) {

40+ // left edge drag released. Minimum distance is given by design.

41+ if (priv.oldInverseProgress > units.gu(22)) {

42+ ApplicationManager.focusApplication("unity8-dash");

43+ }

44+ }

45+ priv.oldInverseProgress = inverseProgress;

46+ }

38

47

39 QtObject {

48 QtObject {

40 id: priv

49 id: priv

@@ -49,6 +58,8 @@ Item {

49 property string appId0

58 property string appId0

50 property string appId1

59 property string appId1

51

60

61+ property int oldInverseProgress: 0

62+

52 onFocusedAppIdChanged: {

63 onFocusedAppIdChanged: {

53 if (priv.focusedAppId.length > 0) {

64 if (priv.focusedAppId.length > 0) {

54 var focusedApp = ApplicationManager.findApplication(focusedAppId);

65 var focusedApp = ApplicationManager.findApplication(focusedAppId);

@@ -107,16 +118,26 @@ Item {

107 }

118 }

108 }

119 }

109

120

121+ onApplicationAdded: {

122+ if (spreadView.phase == 2) {

123+ spreadView.snapTo(ApplicationManager.count - 1);

124+ } else {

125+ spreadView.phase = 0;

126+ spreadView.contentX = -spreadView.shift;

127+ ApplicationManager.focusApplication(appId);

128+ }

129+ }

130+

110 onApplicationRemoved: {

131 onApplicationRemoved: {

111 if (priv.mainStageAppId == appId) {

132 if (priv.mainStageAppId == appId) {

112− priv.mainStageAppId = "";

133+ ApplicationManager.focusApplication("unity8-dash")

113 }

134 }

114 if (priv.sideStageAppId == appId) {

135 if (priv.sideStageAppId == appId) {

115 priv.sideStageAppId = "";

136 priv.sideStageAppId = "";

116 }

137 }

117 if (ApplicationManager.count == 0) {

138 if (ApplicationManager.count == 0) {

118 spreadView.phase = 0;

139 spreadView.phase = 0;

119− spreadView.contentX = 0;

140+ spreadView.contentX = -spreadView.shift;

120 }

141 }

121 }

142 }

122 }

143 }

@@ -124,13 +145,26 @@ Item {

124 Flickable {

145 Flickable {

125 id: spreadView

146 id: spreadView

126 anchors.fill: parent

147 anchors.fill: parent

127− contentWidth: spreadRow.width

128 interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1

148 interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1

149+ contentWidth: spreadRow.width - shift

150+ contentX: -shift

129

151

130 property int tileDistance: units.gu(20)

152 property int tileDistance: units.gu(20)

131 property int sideStageWidth: units.gu(40)

153 property int sideStageWidth: units.gu(40)

132 property bool sideStageVisible: priv.sideStageAppId

154 property bool sideStageVisible: priv.sideStageAppId

133

155

156+ // This indicates when the spreadView is active. That means, all the animations

157+ // are activated and tiles need to line up for the spread.

158+ readonly property bool active: shiftedContentX > 0 || spreadDragArea.dragging

159+

160+ // The flickable needs to fill the screen in order to get touch events all over.

161+ // However, we don't want to the user to be able to scroll back all the way. For

162+ // that, the beginning of the gesture starts with a negative value for contentX

163+ // so the flickable wants to pull it into the view already. "shift" tunes the

164+ // distance where to "lock" the content.

165+ readonly property real shift: width / 2

166+ readonly property real shiftedContentX: contentX + shift

167+

134 // Phase of the animation:

168 // Phase of the animation:

135 // 0: Starting from right edge, a new app (index 1) comes in from the right

169 // 0: Starting from right edge, a new app (index 1) comes in from the right

136 // 1: The app has reached the first snap position.

170 // 1: The app has reached the first snap position.

@@ -168,6 +202,12 @@ Item {

168 }

202 }

169 }

203 }

170

204

205+ // In case the ApplicationManager already holds an app when starting up we're missing animations

206+ // Make sure we end up in the same state

207+ Component.onCompleted: {

208+ spreadView.contentX = -spreadView.shift

209+ }

210+

171 property int nextInStack: {

211 property int nextInStack: {

172 switch (state) {

212 switch (state) {

173 case "main":

213 case "main":

@@ -224,31 +264,31 @@ Item {

224 return "empty";

264 return "empty";

225 }

265 }

226

266

227− onContentXChanged: {

267+ onShiftedContentXChanged: {

228− if (spreadView.phase == 0 && spreadView.contentX > spreadView.width * spreadView.positionMarker2) {

268+ if (spreadView.phase == 0 && spreadView.shiftedContentX > spreadView.width * spreadView.positionMarker2) {

229 spreadView.phase = 1;

269 spreadView.phase = 1;

230− } else if (spreadView.phase == 1 && spreadView.contentX > spreadView.width * spreadView.positionMarker4) {

270+ } else if (spreadView.phase == 1 && spreadView.shiftedContentX > spreadView.width * spreadView.positionMarker4) {

231 spreadView.phase = 2;

271 spreadView.phase = 2;

232− } else if (spreadView.phase == 1 && spreadView.contentX < spreadView.width * spreadView.positionMarker2) {

272+ } else if (spreadView.phase == 1 && spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker2) {

233 spreadView.phase = 0;

273 spreadView.phase = 0;

234 }

274 }

235 }

275 }

236

276

237 function snap() {

277 function snap() {

238− if (contentX < phase0Width) {

278+ if (shiftedContentX < phase0Width) {

239− snapAnimation.targetContentX = 0;

279+ snapAnimation.targetContentX = -shift;

240 snapAnimation.start();

280 snapAnimation.start();

241− } else if (contentX < phase1Width) {

281+ } else if (shiftedContentX < phase1Width) {

242 snapTo(1);

282 snapTo(1);

243 } else {

283 } else {

244 // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.

284 // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.

245− snapAnimation.targetContentX = spreadView.width * spreadView.positionMarker4 + 1;

285+ snapAnimation.targetContentX = spreadView.width * spreadView.positionMarker4 + 1 - shift;

246 snapAnimation.start();

286 snapAnimation.start();

247 }

287 }

248 }

288 }

249 function snapTo(index) {

289 function snapTo(index) {

250 spreadView.selectedIndex = index;

290 spreadView.selectedIndex = index;

251− snapAnimation.targetContentX = 0;

291+ snapAnimation.targetContentX = -shift;

252 snapAnimation.start();

292 snapAnimation.start();

253 }

293 }

254

294

@@ -261,12 +301,12 @@ Item {

261 return index;

301 return index;

262 }

302 }

263

303

264− var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;

304+ var active = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;

265− if (isActive && app.stage == ApplicationInfoInterface.MainStage) {

305+ if (active && app.stage == ApplicationInfoInterface.MainStage) {

266 // if this app is active, and its the MainStage, always put it to index 0

306 // if this app is active, and its the MainStage, always put it to index 0

267 return 0;

307 return 0;

268 }

308 }

269− if (isActive && app.stage == ApplicationInfoInterface.SideStage) {

309+ if (active && app.stage == ApplicationInfoInterface.SideStage) {

270 if (!priv.mainStageAppId) {

310 if (!priv.mainStageAppId) {

271 // Only have SS apps running. Put the active one at 0

311 // Only have SS apps running. Put the active one at 0

272 return 0;

312 return 0;

@@ -309,7 +349,7 @@ Item {

309

349

310 SequentialAnimation {

350 SequentialAnimation {

311 id: snapAnimation

351 id: snapAnimation

312− property int targetContentX: 0

352+ property int targetContentX: -spreadView.shift

313

353

314 UbuntuNumberAnimation {

354 UbuntuNumberAnimation {

315 target: spreadView

355 target: spreadView

@@ -325,15 +365,14 @@ Item {

325 spreadView.selectedIndex = -1;

365 spreadView.selectedIndex = -1;

326 ApplicationManager.focusApplication(ApplicationManager.get(newIndex).appId);

366 ApplicationManager.focusApplication(ApplicationManager.get(newIndex).appId);

327 spreadView.phase = 0;

367 spreadView.phase = 0;

328− spreadView.contentX = 0;

368+ spreadView.contentX = -spreadView.shift;

329 }

369 }

330 }

370 }

331 }

371 }

332 }

372 }

333

373

334− Rectangle {

374+ Item {

335 id: spreadRow

375 id: spreadRow

336− color: "black"

337 x: spreadView.contentX

376 x: spreadView.contentX

338 height: root.height

377 height: root.height

339 width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)

378 width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)

@@ -380,7 +419,7 @@ Item {

380 MouseArea {

419 MouseArea {

381 id: sideStageDragHandleMouseArea

420 id: sideStageDragHandleMouseArea

382 anchors.fill: parent

421 anchors.fill: parent

383− enabled: spreadView.contentX == 0

422+ enabled: spreadView.shiftedContentX == 0

384 property int startX

423 property int startX

385 property var gesturePoints: new Array()

424 property var gesturePoints: new Array()

386

425

@@ -413,7 +452,7 @@ Item {

413

452

414 onRunningChanged: {

453 onRunningChanged: {

415 if (!running) {

454 if (!running) {

416− sideStageDragHandle.dragging = false;;

455+ sideStageDragHandle.dragging = false;

417 }

456 }

418 }

457 }

419 }

458 }

@@ -427,17 +466,26 @@ Item {

427 id: spreadTile

466 id: spreadTile

428 height: spreadView.height

467 height: spreadView.height

429 width: model.stage == ApplicationInfoInterface.MainStage ? spreadView.width : spreadView.sideStageWidth

468 width: model.stage == ApplicationInfoInterface.MainStage ? spreadView.width : spreadView.sideStageWidth

430− x: spreadView.width

431− z: spreadView.indexToZIndex(index)

432 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId

469 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId

433− zIndex: z

470+ zIndex: spreadView.indexToZIndex(index)

434 selected: spreadView.selectedIndex == index

471 selected: spreadView.selectedIndex == index

435 otherSelected: spreadView.selectedIndex >= 0 && !selected

472 otherSelected: spreadView.selectedIndex >= 0 && !selected

436 isInSideStage: priv.sideStageAppId == model.appId

473 isInSideStage: priv.sideStageAppId == model.appId

437 interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive

474 interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive

438 swipeToCloseEnabled: spreadView.interactive

475 swipeToCloseEnabled: spreadView.interactive

439 maximizedAppTopMargin: root.maximizedAppTopMargin

476 maximizedAppTopMargin: root.maximizedAppTopMargin

440− dropShadow: spreadView.contentX > 0 || spreadDragArea.status == DirectionalDragArea.Undecided

477+ dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 ? root.inverseProgress : 0

478+

479+ readonly property bool isDash: model.appId == "unity8-dash"

480+

481+ // FIXME: A regular binding doesn't update any more after closing an app.

482+ // Using a Binding for now.

483+ Binding {

484+ target: spreadTile

485+ property: "z"

486+ value: (!spreadView.active && isDash && !active) ? -1 : spreadTile.zIndex

487+ }

488+ x: spreadView.width

441

489

442 property real behavioredZIndex: zIndex

490 property real behavioredZIndex: zIndex

443 Behavior on behavioredZIndex {

491 Behavior on behavioredZIndex {

@@ -458,7 +506,7 @@ Item {

458 }

506 }

459

507

460 progress: {

508 progress: {

461− var tileProgress = (spreadView.contentX - behavioredZIndex * spreadView.tileDistance) / spreadView.width;

509+ var tileProgress = (spreadView.shiftedContentX - behavioredZIndex * spreadView.tileDistance) / spreadView.width;

462 // Some tiles (nextInStack, active) need to move directly from the beginning, normalize progress to immediately start at 0

510 // Some tiles (nextInStack, active) need to move directly from the beginning, normalize progress to immediately start at 0

463 if ((index == spreadView.nextInStack && spreadView.phase < 2) || (active && spreadView.phase < 1)) {

511 if ((index == spreadView.nextInStack && spreadView.phase < 2) || (active && spreadView.phase < 1)) {

464 tileProgress += behavioredZIndex * spreadView.tileDistance / spreadView.width;

512 tileProgress += behavioredZIndex * spreadView.tileDistance / spreadView.width;

@@ -481,11 +529,7 @@ Item {

481

529

482 onClicked: {

530 onClicked: {

483 if (spreadView.phase == 2) {

531 if (spreadView.phase == 2) {

484− if (ApplicationManager.focusedApplicationId == ApplicationManager.get(index).appId) {

485− spreadView.snapTo(index);

532+ spreadView.snapTo(index);

486− } else {

487− ApplicationManager.requestFocusApplication(ApplicationManager.get(index).appId);

488− }

489 }

533 }

490 }

534 }

491

535

@@ -518,12 +562,12 @@ Item {

518 onTouchXChanged: {

562 onTouchXChanged: {

519 if (!dragging) {

563 if (!dragging) {

520 spreadView.phase = 0;

564 spreadView.phase = 0;

521− spreadView.contentX = 0;

565+ spreadView.contentX = -spreadView.shift;

522 }

566 }

523

567

524− if (attachedToView) {

568+ if (dragging && attachedToView) {

525− spreadView.contentX = -touchX + spreadDragArea.width;

569+ spreadView.contentX = -touchX + spreadDragArea.width - spreadView.shift;

526− if (spreadView.contentX > spreadView.phase0Width + spreadView.phase1Width / 2) {

570+ if (spreadView.shiftedContentX > spreadView.phase0Width + spreadView.phase1Width / 2) {

527 attachedToView = false;

571 attachedToView = false;

528 spreadView.snap();

572 spreadView.snap();

529 }

573 }

@@ -548,14 +592,14 @@ Item {

548 var oneWayFlick = priv.evaluateOneWayFlick(gesturePoints);

592 var oneWayFlick = priv.evaluateOneWayFlick(gesturePoints);

549 gesturePoints = [];

593 gesturePoints = [];

550

594

551− if (oneWayFlick && spreadView.contentX < spreadView.positionMarker1 * spreadView.width) {

595+ if (oneWayFlick && spreadView.shiftedContentX < spreadView.positionMarker1 * spreadView.width) {

552 // If it was a short one-way movement, do the Alt+Tab switch

596 // If it was a short one-way movement, do the Alt+Tab switch

553 // no matter if we didn't cross positionMarker1 yet.

597 // no matter if we didn't cross positionMarker1 yet.

554 spreadView.snapTo(spreadView.nextInStack);

598 spreadView.snapTo(spreadView.nextInStack);

555 } else if (!dragging && attachedToView) {

599 } else if (!dragging && attachedToView) {

556− if (spreadView.contentX < spreadView.width * spreadView.positionMarker1) {

600+ if (spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker1) {

557 spreadView.snap();

601 spreadView.snap();

558− } else if (spreadView.contentX < spreadView.width * spreadView.positionMarker2) {

602+ } else if (spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker2) {

559 spreadView.snapTo(spreadView.nextInStack);

603 spreadView.snapTo(spreadView.nextInStack);

560 } else {

604 } else {

561 // otherwise snap to the closest snap position we can find

605 // otherwise snap to the closest snap position we can find

qml/Stages/TransformedSpreadDelegate.qml+6−5

@@ -46,9 +46,6 @@ SpreadDelegate {

46 property real startDistance: units.gu(5)

47 property real endDistance: units.gu(.5)

48

49− // Hiding tiles when their progress is negative or reached the maximum

50− visible: progress >= 0 && progress < 1.7

51−

52 onSelectedChanged: {

49 onSelectedChanged: {

53 if (selected) {

50 if (selected) {

54 priv.snapshot();

51 priv.snapshot();

@@ -132,6 +129,10 @@ SpreadDelegate {

132 // the selected tile, which is animated from the snapshotted position to be fullscreen.

129 // the selected tile, which is animated from the snapshotted position to be fullscreen.

133

130

134 readonly property real xTranslate: {

131 readonly property real xTranslate: {

132+ if (!spreadView.active) {

133+ return 0;

134+ }

135+

135 if (otherSelected) {

136 if (otherSelected) {

136 if (spreadView.phase < 2 && index == 0) {

137 if (spreadView.phase < 2 && index == 0) {

137 return linearAnimation(selectedProgress, 0, selectedXTranslate,

138 return linearAnimation(selectedProgress, 0, selectedXTranslate,

@@ -183,7 +184,7 @@ SpreadDelegate {

183 }

184 }

184

185

185 readonly property real angle: {

186 readonly property real angle: {

186− if (spreadView.focusChanging) {

187+ if (!spreadView.active) {

187 return 0;

188 return 0;

188 }

189 }

189

190

@@ -216,7 +217,7 @@ SpreadDelegate {

216 }

217 }

217

218

218 readonly property real scale: {

219 readonly property real scale: {

219− if (spreadView.focusChanging) {

220+ if (!spreadView.active) {

220 return 1;

221 return 1;

221 }

222 }

222 if (priv.otherSelected) {

223 if (priv.otherSelected) {

qml/Stages/TransformedTabletSpreadDelegate.qml+28

@@ -47,6 +47,11 @@ SpreadDelegate {

47

48 property bool isInSideStage: false

49

50+ property int dragOffset: 0

51+

52+ dropShadow: spreadView.active ||

53+ (active && model.stage == ApplicationInfoInterface.MainStage && priv.xTranslate != 0)

54+

50 onSelectedChanged: {

55 onSelectedChanged: {

51 if (selected) {

56 if (selected) {

52 priv.snapshot();

57 priv.snapshot();

@@ -129,6 +134,16 @@ SpreadDelegate {

129 return helperEasingCurve.value * (endValue - startValue) + startValue;

134 return helperEasingCurve.value * (endValue - startValue) + startValue;

130 }

135 }

131

136

137+ Behavior on xTranslate {

138+ enabled: !spreadView.active &&

139+ !snapAnimation.running &&

140+ model.appId !== "unity8-dash" &&

141+ !spreadView.sideStageDragging

142+ UbuntuNumberAnimation {

143+ duration: UbuntuAnimation.FastDuration

144+ }

145+ }

146+

132 property real xTranslate: {

147 property real xTranslate: {

133 var newTranslate = 0;

148 var newTranslate = 0;

134

149

@@ -155,7 +170,12 @@ SpreadDelegate {

155 if (spreadView.phase == 0 && shouldMoveAway) {

170 if (spreadView.phase == 0 && shouldMoveAway) {

156 newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress);

171 newTranslate += linearAnimation(0, spreadView.positionMarker2, 0, -units.gu(4), root.animatedProgress);

157 }

172 }

173+ newTranslate += root.dragOffset;

174+ }

175+ if (!spreadView.active && model.appId == "unity8-dash" && !root.active) {

176+ newTranslate -= root.width;

158 }

177 }

178+

159 if (nextInStack && spreadView.phase == 0) {

179 if (nextInStack && spreadView.phase == 0) {

160 if (model.stage == ApplicationInfoInterface.MainStage) {

180 if (model.stage == ApplicationInfoInterface.MainStage) {

161 if (spreadView.sideStageVisible && root.progress > 0) {

181 if (spreadView.sideStageVisible && root.progress > 0) {

@@ -205,6 +225,10 @@ SpreadDelegate {

205 }

225 }

206

226

207 property real scale: {

227 property real scale: {

228+ if (!spreadView.active) {

229+ return 1;

230+ }

231+

208 if (otherSelected) {

232 if (otherSelected) {

209 return selectedScale;

233 return selectedScale;

210 }

234 }

@@ -249,6 +273,10 @@ SpreadDelegate {

249 }

273 }

250

274

251 property real angle: {

275 property real angle: {

276+ if (!spreadView.active) {

277+ return 0;

278+ }

279+

252 if (otherSelected) {

280 if (otherSelected) {

253 return selectedAngle;

281 return selectedAngle;

254 }

282 }

src/CMakeLists.txt+1

@@ -35,3 +35,4 @@ install(TARGETS ${SHELL_APP}

35 )

36

37add_subdirectory(Panel)

38+add_subdirectory(Dash)

src/Dash/CMakeLists.txtnew file+12

@@ -0,0 +1,12 @@

1+set(DASH_SRCS

2+ main.cpp

3+)

4+

5+add_executable(unity8-dash ${DASH_SRCS})

6+

7+qt5_use_modules(unity8-dash Gui Qml Quick Test)

8+

9+# install binaries

10+install(TARGETS ${DASH_APP}

11+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

12+)

src/Dash/main.cppnew file+74

@@ -0,0 +1,74 @@

1+/*

3+ *

4+ * Authors:

5+ * Michael Zanetti <michael.zanetti@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+#include <QtQuick/QQuickView>

21+#include <QtGui/QGuiApplication>

22+#include <QtQml/QQmlEngine>

23+#include <QtQml/QQmlContext>

24+#include <QDebug>

25+#include <QCommandLineParser>

26+#include <QLibrary>

27+

28+#include <paths.h>

29+

30+int main(int argc, const char *argv[])

31+{

32+ QGuiApplication *application = new QGuiApplication(argc, (char**)argv);

33+

34+ QCommandLineParser parser;

35+ parser.setApplicationDescription("Description: Unity 8 Shell Dash");

36+ parser.addHelpOption();

37+

38+ QCommandLineOption testabilityOption("testability",

39+ "Load the testability driver (Alternatively export QT_LOAD_TESTABILITY");

40+ parser.addOption(testabilityOption);

41+

42+ if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {

43+ QLibrary testLib(QLatin1String("qttestability"));

44+ if (testLib.load()) {

45+ typedef void (*TasInitialize)(void);

46+ TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");

47+ if (initFunction) {

48+ initFunction();

49+ } else {

50+ qCritical("Library qttestability resolve failed!");

51+ }

52+ } else {

53+ qCritical("Library qttestability load failed!");

54+ }

55+ }

56+

57+ QQuickView* view = new QQuickView();

58+ view->setResizeMode(QQuickView::SizeRootObjectToView);

59+ view->setTitle("Unity Dash");

60+

61+ QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

62+ prependImportPaths(view->engine(), ::overrideImportPaths());

63+ appendImportPaths(view->engine(), ::fallbackImportPaths());

64+

65+ view->setSource(source);

66+ view->show();

67+

68+ int result = application->exec();

69+

70+ delete view;

71+ delete application;

72+

73+ return result;

74+}

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+1−1

@@ -106,7 +106,7 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):

106 self.assert_current_focused_application(application_name)

107

108 self.main_window.show_dash_swiping()

109− self.assert_current_focused_application('')

109+ self.assert_current_focused_application('unity8-dash')

110

111 process_helpers.lock_unity()

112 greeter = self.main_window.get_greeter()

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+3−2

@@ -39,7 +39,8 @@ class URLDispatcherTestCase(tests.ApplicationLifeCycleTestCase):

39 desktop_file_name = os.path.basename(desktop_file_path)

40 application_name, _ = os.path.splitext(desktop_file_name)

41

42+ self.assertEqual(

42− self.assertEqual('', self.main_window.get_current_focused_app_id())

43+ 'unity8-dash', self.main_window.get_current_focused_app_id())

43 self.addCleanup(os.system, 'pkill qmlscene')

44 self.addCleanup(os.system, 'pkill qmlscene')

44

45

45 subprocess.check_call(

46 subprocess.check_call(

@@ -47,4 +48,4 @@ class URLDispatcherTestCase(tests.ApplicationLifeCycleTestCase):

47 self.assert_current_focused_application(application_name)

48 self.assert_current_focused_application(application_name)

48

49

49 self.main_window.show_dash_swiping()

50 self.main_window.show_dash_swiping()

50− self.assert_current_focused_application('')

51+ self.assert_current_focused_application('unity8-dash')

tests/autopilot/unity8/fixture_setup.pynew file+64

@@ -0,0 +1,64 @@

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Autopilot Test Suite

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

11+# This program is distributed in the hope that it will be useful,

12+# but WITHOUT ANY WARRANTY; without even the implied warranty of

13+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+# GNU General Public License for more details.

15+#

16+# You should have received a copy of the GNU General Public License

17+# along with this program. If not, see <http://www.gnu.org/licenses/>.

18+#

19+

20+import fixtures

21+from autopilot import introspection

22+

23+from unity8 import process_helpers

24+from unity8.shell import emulators

25+

26+

27+class LaunchDashApp(fixtures.Fixture):

28+

29+ """Fixture to launch the Dash app."""

30+

31+ def __init__(self, binary_path, variables):

32+ """Initialize an instance.

33+

34+ :param str binary_path: The path to the Dash app binary.

35+ :param variables: The variables to use when launching the app.

36+ :type variables: A dictionary.

37+

38+ """

39+ super(LaunchDashApp, self).__init__()

40+ self.binary_path = binary_path

41+ self.variables = variables

42+

43+ def setUp(self):

44+ """Launch the dash app when the fixture is used."""

45+ super(LaunchDashApp, self).setUp()

46+ self.addCleanup(self.stop_application)

47+ self.application_proxy = self.launch_application()

48+

49+ def launch_application(self):

50+ binary_arg = 'BINARY={}'.format(self.binary_path)

51+ testability_arg = 'QT_LOAD_TESTABILITY={}'.format(1)

52+ env_args = [

53+ '{}={}'.format(key, value) for key, value in self.variables.items()

54+ ]

55+ all_args = [binary_arg, testability_arg] + env_args

56+

57+ pid = process_helpers.start_job('unity8-dash', *all_args)

58+ return introspection.get_proxy_object_for_existing_process(

59+ pid=pid,

60+ emulator_base=emulators.UnityEmulatorBase,

61+ )

62+

63+ def stop_application(self):

64+ process_helpers.stop_job('unity8-dash')

tests/autopilot/unity8/process_helpers.py+89−20

@@ -36,6 +36,10 @@ from unity8.shell.emulators import main_window as main_window_emulator

36logger = logging.getLogger(__name__)

37

38

39+class JobError(Exception):

40+ pass

41+

42+

39class CannotAccessUnity(Exception):

43class CannotAccessUnity(Exception):

40 pass

44 pass

41

45

@@ -134,48 +138,113 @@ def restart_unity(*args):

134 """

138 """

135 status = _get_unity_status()

139 status = _get_unity_status()

136 if "start/" in status:

140 if "start/" in status:

137− try:

141+ stop_job('unity8')

138− output = subprocess.check_output(

142+

139− ['/sbin/initctl', 'stop', 'unity8'])

143+ pid = start_job('unity8', *args)

140− logger.info(output)

144+ return _get_unity_proxy_object(pid)

141− except subprocess.CalledProcessError as e:

142− e.args += (

143− "Failed to stop running instance of unity8: %s" % e.output,

144− )

145− raise

146

145

146+

147+def start_job(name, *args):

148+ """Start a job.

149+

150+ :param str name: The name of the job.

151+ :param args: The arguments to be used when starting the job.

152+ :return: The process id of the started job.

153+ :raises CalledProcessError: if the job failed to start.

154+

155+ """

156+ logger.info('Starting job {} with arguments {}.'.format(name, args))

157+ command = ['/sbin/initctl', 'start', name] + list(args)

147 try:

158 try:

148− command = ['/sbin/initctl', 'start', 'unity8'] + list(args)

149 output = subprocess.check_output(

159 output = subprocess.check_output(

150 command,

160 command,

151 stderr=subprocess.STDOUT,

161 stderr=subprocess.STDOUT,

152 universal_newlines=True,

162 universal_newlines=True,

153 )

163 )

154 logger.info(output)

164 logger.info(output)

155− pid = _get_unity_pid()

165+ pid = get_job_pid(name)

156 except subprocess.CalledProcessError as e:

166 except subprocess.CalledProcessError as e:

157− e.args += ("Failed to start unity8: %s" % e.output,)

167+ e.args += ('Failed to start {}: {}.'.format(name, e.output),)

158 raise

168 raise

159 else:

169 else:

160− return _get_unity_proxy_object(pid)

170+ return pid

161

171

162

172

163−def _get_unity_status():

173+def get_job_pid(name):

174+ """Return the process id of a running job.

175+

176+ :param str name: The name of the job.

177+ :raises JobError: if the job is not running.

178+

179+ """

180+ status = get_job_status(name)

181+ if "start/" not in status:

182+ raise JobError('{} is not in the running state.'.format(name))

183+ return int(status.split()[-1])

184+

185+

186+def get_job_status(name):

187+ """Return the status of a job.

188+

189+ :param str name: The name of the job.

190+ :raises JobError: if it's not possible to get the status of the job.

191+

192+ """

164 try:

193 try:

165 return subprocess.check_output([

194 return subprocess.check_output([

166 '/sbin/initctl',

195 '/sbin/initctl',

167 'status',

196 'status',

168− 'unity8'

197+ name

169 ], universal_newlines=True)

198 ], universal_newlines=True)

199+ except subprocess.CalledProcessError as error:

200+ raise JobError(

201+ "Unable to get {}'s status: {}".format(name, error)

202+ )

203+

204+

205+def stop_job(name):

206+ """Stop a job.

207+

208+ :param str name: The name of the job.

209+ :raises CalledProcessError: if the job failed to stop.

210+

211+ """

212+ logger.info('Stoping job {}.'.format(name))

213+ command = ['/sbin/initctl', 'stop', name]

214+ try:

215+ output = subprocess.check_output(

216+ command,

217+ stderr=subprocess.STDOUT,

218+ universal_newlines=True,

219+ )

220+ logger.info(output)

170 except subprocess.CalledProcessError as e:

221 except subprocess.CalledProcessError as e:

171− raise CannotAccessUnity("Unable to get unity's status: %s" % str(e))

222+ e.args += ('Failed to stop {}: {}.'.format(name, e.output),)

223+ raise

224+

225+

226+def is_job_running(name):

227+ """Return True if the job is running. Otherwise, False.

228+

229+ :param str name: The name of the job.

230+ :raises JobError: if it's not possible to get the status of the job.

231+

232+ """

233+ return 'start/' in get_job_status(name)

234+

235+

236+def _get_unity_status():

237+ try:

238+ return get_job_status('unity8')

239+ except JobError as error:

240+ raise CannotAccessUnity(str(error))

172

241

173

242

174def _get_unity_pid():

243def _get_unity_pid():

175− status = _get_unity_status()

244+ try:

176− if "start/" not in status:

245+ return get_job_pid('unity8')

246+ except JobError as error:

177− raise CannotAccessUnity("Unity is not in the running state.")

247+ raise CannotAccessUnity(str(error))

178− return int(status.split()[-1])

179

248

180

249

181def _get_unity_proxy_object(pid):

250def _get_unity_proxy_object(pid):

tests/autopilot/unity8/shell/emulators/dash.py+21−8

@@ -31,6 +31,17 @@ from ubuntuuitoolkit import emulators as toolkit_emulators

31logger = logging.getLogger(__name__)

32

33

34+class DashApp(object):

35+

36+ """Autopilot helper for the Dash app."""

37+

38+ def __init__(self, app_proxy):

39+ self.app_proxy = app_proxy

40+ self.main_view = self.app_proxy.select_single(

41+ toolkit_emulators.MainView)

42+ self.dash = self.main_view.select_single(Dash)

43+

44+

34class Dash(emulators.UnityEmulatorBase):

45class Dash(emulators.UnityEmulatorBase):

35 """An emulator that understands the Dash."""

46 """An emulator that understands the Dash."""

36

47

@@ -109,20 +120,22 @@ class Dash(emulators.UnityEmulatorBase):

109 @autopilot_logging.log_action(logger.info)

120 @autopilot_logging.log_action(logger.info)

110 def _scroll_to_left_scope(self):

121 def _scroll_to_left_scope(self):

111 original_index = self.dash_content_list.currentIndex

122 original_index = self.dash_content_list.currentIndex

112− dashContent = self.select_single(objectName="dashContent")

123+ dash_content = self.select_single(objectName="dashContent")

124+ x, y, width, height = dash_content.globalRect

113− start_x = dashContent.width / 3

125+ start_x = x + width / 3

114− stop_x = dashContent.width / 3 * 2

126+ stop_x = x + width / 3 * 2

115− start_y = stop_y = dashContent.globalRect.y + 1

127+ start_y = stop_y = y + 1

116 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

128 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

117 self.dash_content_list.currentIndex.wait_for(original_index - 1)

129 self.dash_content_list.currentIndex.wait_for(original_index - 1)

118

130

119 @autopilot_logging.log_action(logger.info)

131 @autopilot_logging.log_action(logger.info)

120 def _scroll_to_right_scope(self):

132 def _scroll_to_right_scope(self):

121 original_index = self.dash_content_list.currentIndex

133 original_index = self.dash_content_list.currentIndex

122− dashContent = self.select_single(objectName="dashContent")

134+ dash_content = self.select_single(objectName="dashContent")

135+ x, y, width, height = dash_content.globalRect

123− start_x = dashContent.width / 3 * 2

136+ start_x = x + width / 3 * 2

124− stop_x = dashContent.width / 3

137+ stop_x = x + width / 3

125− start_y = stop_y = dashContent.globalRect.y + 1

138+ start_y = stop_y = y + 1

126 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

139 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

127 self.dash_content_list.currentIndex.wait_for(original_index + 1)

140 self.dash_content_list.currentIndex.wait_for(original_index + 1)

128

141

tests/autopilot/unity8/shell/emulators/greeter.py+4−1

@@ -17,6 +17,8 @@

17# along with this program. If not, see <http://www.gnu.org/licenses/>.

18#

19

20+import ubuntuuitoolkit

21+

20from unity8.shell.emulators import UnityEmulatorBase

22from unity8.shell.emulators import UnityEmulatorBase

21

23

22

24

@@ -37,4 +39,5 @@ class Greeter(UnityEmulatorBase):

37 self.created.wait_for(False)

39 self.created.wait_for(False)

38

40

39 def get_prompt(self):

41 def get_prompt(self):

42+ return self.select_single(

40− return self.select_single("TextField", objectName="passwordInput")

43+ ubuntuuitoolkit.TextField, objectName='passwordInput')

tests/autopilot/unity8/shell/emulators/main_window.py+34−20

@@ -25,7 +25,6 @@ from autopilot import input

25from unity8.shell import emulators

26from unity8.shell.emulators.greeter import Greeter

27from unity8.shell.emulators.hud import Hud

28−from unity8.shell.emulators.dash import Dash

29from unity8.shell.emulators.launcher import Launcher

28from unity8.shell.emulators.launcher import Launcher

30

29

31logger = logging.getLogger(__name__)

30logger = logging.getLogger(__name__)

@@ -61,9 +60,6 @@ class QQuickView(emulators.UnityEmulatorBase):

61 def get_hud_edge_drag_area(self):

60 def get_hud_edge_drag_area(self):

62 return self.select_single(objectName="hudDragArea")

61 return self.select_single(objectName="hudDragArea")

63

62

64− def get_dash(self):

65− return self.select_single(Dash)

66−

67 def get_bottombar(self):

63 def get_bottombar(self):

68 return self.select_single("Bottombar")

64 return self.select_single("Bottombar")

69

65

@@ -76,12 +72,6 @@ class QQuickView(emulators.UnityEmulatorBase):

76 objectName="pinPadLoader"

72 objectName="pinPadLoader"

77 )

73 )

78

74

79− def get_pinPadButton(self, buttonId):

80− return self.select_single(

81− "PinPadButton",

82− objectName="pinPadButton%i" % buttonId

83− )

84−

85 def get_lockscreen(self):

75 def get_lockscreen(self):

86 return self.select_single("Lockscreen")

76 return self.select_single("Lockscreen")

87

77

@@ -117,20 +107,44 @@ class QQuickView(emulators.UnityEmulatorBase):

117 @autopilot_logging.log_action(logger.info)

107 @autopilot_logging.log_action(logger.info)

118 def show_dash_swiping(self):

108 def show_dash_swiping(self):

119 """Show the dash swiping from the left."""

109 """Show the dash swiping from the left."""

120− width = self.width

110+ x, y, width, height = self._get_shell().globalRect

121− height = self.height

122− start_x = 0

111+ start_x = x

123− start_y = height // 2

124− end_x = width

112+ end_x = x + width

125− end_y = start_y

113+ start_y = end_y = y + height // 2

126

114

127 self.pointing_device.drag(start_x, start_y, end_x, end_y)

115 self.pointing_device.drag(start_x, start_y, end_x, end_y)

116+

117+ def _get_shell(self):

128− return self.get_dash()

118+ return self.select_single('Shell')

129

119

130 def get_current_focused_app_id(self):

120 def get_current_focused_app_id(self):

131 """Return the id of the focused application."""

121 """Return the id of the focused application."""

132− return self.select_single('Shell').focusedApplicationId

122+ return self._get_shell().focusedApplicationId

133

123

134 @autopilot_logging.log_action(logger.info)

124 @autopilot_logging.log_action(logger.info)

135− def search(self, query):

125+ def enter_pin_code(self, code):

136− self.get_dash().enter_search_query(query)

126+ """Enter code 'code' into the single-pin lightdm pincode entry screen.

127+

128+ :param code: must be a string of numeric characters.

129+ :raises: TypeError if code is not a string.

130+ :raises: ValueError if code contains non-numeric characters.

131+

132+ """

133+ if not isinstance(code, str):

134+ raise TypeError(

135+ "'code' parameter must be a string, not %r."

136+ % type(code)

137+ )

138+ for num in code:

139+ if not num.isdigit():

140+ raise ValueError(

141+ "'code' parameter contains non-numeric characters."

142+ )

143+ self.pointing_device.click_object(

144+ self._get_pinpad_button(int(num)))

145+

146+ def _get_pinpad_button(self, button_id):

147+ return self.select_single(

148+ 'PinPadButton',

149+ objectName='pinPadButton{}'.format(button_id)

150+ )

tests/autopilot/unity8/shell/tests/__init__.py+141−48

@@ -24,6 +24,7 @@ try:

24except ImportError:

25 Gio = None

26

27+from autopilot import introspection

27from autopilot.platform import model

28from autopilot.platform import model

28from autopilot.testcase import AutopilotTestCase

29from autopilot.testcase import AutopilotTestCase

29from autopilot.matchers import Eventually

30from autopilot.matchers import Eventually

@@ -34,6 +35,10 @@ import os.path

34import subprocess

35import subprocess

35import sys

36import sys

36from testtools.matchers import Equals

37from testtools.matchers import Equals

38+from ubuntuuitoolkit import (

39+ fixture_setup as toolkit_fixtures,

40+ ubuntu_scenarios

41+)

37

42

38from unity8 import (

43from unity8 import (

39 get_lib_path,

44 get_lib_path,

@@ -42,9 +47,15 @@ from unity8 import (

42 get_default_extra_mock_libraries,

47 get_default_extra_mock_libraries,

43 get_data_dirs

48 get_data_dirs

44)

49)

45−from unity8.process_helpers import restart_unity_with_testability

50+from unity8 import (

51+ fixture_setup,

52+ process_helpers

53+)

54+from unity8.shell import emulators

55+from unity8.shell.emulators import (

56+ dash as dash_helpers,

46−from unity8.shell.emulators import main_window as main_window_emulator

57+ main_window as main_window_emulator,

47−from unity8.shell.emulators.dash import Dash

58+)

48

59

49

60

50logger = logging.getLogger(__name__)

61logger = logging.getLogger(__name__)

@@ -78,6 +89,26 @@ def _get_device_emulation_scenarios(devices='All'):

78 return [native]

89 return [native]

79

90

80

91

92+def is_unity7_running():

93+ """Return True if Unity7 is running. Otherwise, return False."""

94+ return (

95+ Gio is not None and

96+ UNITYSHELL_GSETTINGS_SCHEMA in

97+ Gio.Settings.list_relocatable_schemas()

98+ )

99+

100+

101+def get_qml_import_path_with_mock():

102+ """Return the QML2_IMPORT_PATH value with the mock path prepended."""

103+ qml_import_path = [get_mocks_library_path()]

104+ if os.getenv('QML2_IMPORT_PATH') is not None:

105+ qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))

106+

107+ qml_import_path = ':'.join(qml_import_path)

108+ logger.info("New QML2 import path: %s", qml_import_path)

109+ return qml_import_path

110+

111+

81class UnityTestCase(AutopilotTestCase):

112class UnityTestCase(AutopilotTestCase):

82

113

83 """A test case base class for the Unity shell tests."""

114 """A test case base class for the Unity shell tests."""

@@ -118,23 +149,8 @@ class UnityTestCase(AutopilotTestCase):

118

149

119 def setUp(self):

150 def setUp(self):

120 super(UnityTestCase, self).setUp()

151 super(UnityTestCase, self).setUp()

121− if (Gio is not None and

152+ if is_unity7_running():

122− UNITYSHELL_GSETTINGS_SCHEMA in

153+ self.useFixture(toolkit_fixtures.HideUnity7Launcher())

123− Gio.Settings.list_relocatable_schemas()):

124−

125− # Hide Unity launcher

126− self._unityshell_schema = Gio.Settings.new_with_path(

127− UNITYSHELL_GSETTINGS_SCHEMA,

128− UNITYSHELL_GSETTINGS_PATH,

129− )

130− self._launcher_hide_mode = self._unityshell_schema.get_int(

131− UNITYSHELL_LAUNCHER_KEY,

132− )

133− self._unityshell_schema.set_int(

134− UNITYSHELL_LAUNCHER_KEY,

135− UNITYSHELL_LAUNCHER_MODE,

136− )

137− self.addCleanup(self._reset_launcher)

138

154

139 self._proxy = None

155 self._proxy = None

140 self._lightdm_mock_type = None

156 self._lightdm_mock_type = None

@@ -151,13 +167,6 @@ class UnityTestCase(AutopilotTestCase):

151 self.touch = Touch.create()

167 self.touch = Touch.create()

152 self._setup_display_details()

168 self._setup_display_details()

153

169

154− def _reset_launcher(self):

155− """Reset Unity launcher hide mode"""

156− self._unityshell_schema.set_int(

157− UNITYSHELL_LAUNCHER_KEY,

158− self._launcher_hide_mode,

159− )

160−

161 def _setup_display_details(self):

170 def _setup_display_details(self):

162 scale_divisor = self._determine_geometry()

171 scale_divisor = self._determine_geometry()

163 self._setup_grid_size(scale_divisor)

172 self._setup_grid_size(scale_divisor)

@@ -263,7 +272,9 @@ class UnityTestCase(AutopilotTestCase):

263 self.patch_lightdm_mock()

272 self.patch_lightdm_mock()

264

273

265 if self._qml_mock_enabled:

274 if self._qml_mock_enabled:

266− self._setup_extra_mock_environment_patch()

275+ self._environment['QML2_IMPORT_PATH'] = (

276+ get_qml_import_path_with_mock()

277+ )

267

278

268 if self._data_dirs_mock_enabled:

279 if self._data_dirs_mock_enabled:

269 self._patch_data_dirs()

280 self._patch_data_dirs()

@@ -292,9 +303,14 @@ class UnityTestCase(AutopilotTestCase):

292

303

293 # Ensure that the dash is visible before we return:

304 # Ensure that the dash is visible before we return:

294 logger.debug("Unity started, waiting for it to be ready.")

305 logger.debug("Unity started, waiting for it to be ready.")

295− self.assertUnityReady()

306+ self.wait_for_unity()

296 logger.debug("Unity loaded and ready.")

307 logger.debug("Unity loaded and ready.")

297

308

309+ if model() == 'Desktop':

310+ # On desktop, close the dash because it's opened in a separate

311+ # window and it gets in the way.

312+ process_helpers.stop_job('unity8-dash')

313+

298 return app_proxy

314 return app_proxy

299

315

300 def _launch_unity_with_upstart(self, binary_path, args):

316 def _launch_unity_with_upstart(self, binary_path, args):

@@ -308,7 +324,7 @@ class UnityTestCase(AutopilotTestCase):

308

324

309 self.addCleanup(self._cleanup_launching_upstart_unity)

325 self.addCleanup(self._cleanup_launching_upstart_unity)

310

326

311− return restart_unity_with_testability(*all_args)

327+ return process_helpers.restart_unity_with_testability(*all_args)

312

328

313 def _cleanup_launching_upstart_unity(self):

329 def _cleanup_launching_upstart_unity(self):

314 logger.info("Stopping unity")

330 logger.info("Stopping unity")

@@ -353,15 +369,6 @@ class UnityTestCase(AutopilotTestCase):

353 )

369 )

354 return lightdm_mock_path

370 return lightdm_mock_path

355

371

356− def _setup_extra_mock_environment_patch(self):

357− qml_import_path = [get_mocks_library_path()]

358− if os.getenv('QML2_IMPORT_PATH') is not None:

359− qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))

360−

361− qml_import_path = ':'.join(qml_import_path)

362− logger.info("New QML2 import path: %s", qml_import_path)

363− self._environment['QML2_IMPORT_PATH'] = qml_import_path

364−

365 def _set_proxy(self, proxy):

372 def _set_proxy(self, proxy):

366 """Keep a copy of the proxy object, so we can use it to get common

373 """Keep a copy of the proxy object, so we can use it to get common

367 parts of the shell later on.

374 parts of the shell later on.

@@ -373,10 +380,80 @@ class UnityTestCase(AutopilotTestCase):

373 def _clear_proxy(self):

380 def _clear_proxy(self):

374 self._proxy = None

381 self._proxy = None

375

382

376− def assertUnityReady(self):

383+ def wait_for_unity(self):

384+ greeter_content_loader = self.main_window.wait_select_single(

385+ objectName='greeterContentLoader')

386+ greeter_content_loader.progress.wait_for(1)

387+

377− dash = self.get_dash()

388+ def get_dash(self):

378− home_scope = dash.get_scope('clickscope')

389+ pid = process_helpers.get_job_pid('unity8-dash')

390+ dash_proxy = introspection.get_proxy_object_for_existing_process(

391+ pid=pid,

392+ emulator_base=emulators.UnityEmulatorBase,

393+ )

394+ dash_app = dash_helpers.DashApp(dash_proxy)

395+ return dash_app.dash

396+

397+ @property

398+ def main_window(self):

399+ return self._proxy.select_single(main_window_emulator.QQuickView)

379

400

401+

402+class DashBaseTestCase(AutopilotTestCase):

403+

404+ scenarios = ubuntu_scenarios.get_device_simulation_scenarios()

405+ qml_mock_enabled = True

406+ environment = {}

407+

408+ def setUp(self):

409+ super(DashBaseTestCase, self).setUp()

410+

411+ if is_unity7_running():

412+ self.useFixture(toolkit_fixtures.HideUnity7Launcher())

413+

414+ if model() != 'Desktop':

415+ # On the phone, we need unity to be running and unlocked.

416+ self.addCleanup(process_helpers.stop_job, 'unity8')

417+ process_helpers.restart_unity_with_testability()

418+ process_helpers.unlock_unity()

419+

420+ self.ensure_dash_not_running()

421+

422+ if self.qml_mock_enabled:

423+ self.environment['QML2_IMPORT_PATH'] = (

424+ get_qml_import_path_with_mock()

425+ )

426+

427+ if self.should_simulate_device():

428+ # This sets the grid units, so it should be called before launching

429+ # the app.

430+ self.simulate_device()

431+

432+ binary_path = get_binary_path('unity8-dash')

433+ dash_proxy = self.launch_dash(binary_path, self.environment)

434+

435+ if self.should_simulate_device():

436+ # XXX Currently we have no way to launch the application with a

437+ # specific size, so we must resize it after it's launched.

438+ # --elopio - 2014-06-25

439+ self.resize_window()

440+

441+ self.dash_app = dash_helpers.DashApp(dash_proxy)

442+ self.dash = self.dash_app.dash

443+ self.wait_for_dash()

444+

445+ def ensure_dash_not_running(self):

446+ if process_helpers.is_job_running('unity8-dash'):

447+ process_helpers.stop_job('unity8-dash')

448+

449+ def launch_dash(self, binary_path, variables):

450+ launch_dash_app_fixture = fixture_setup.LaunchDashApp(

451+ binary_path, variables)

452+ self.useFixture(launch_dash_app_fixture)

453+ return launch_dash_app_fixture.application_proxy

454+

455+ def wait_for_dash(self):

456+ home_scope = self.dash.get_scope('clickscope')

380 # FIXME! There is a huge timeout here for when we're doing CI on

457 # FIXME! There is a huge timeout here for when we're doing CI on

381 # VMs. See lp:1203715

458 # VMs. See lp:1203715

382 self.assertThat(

459 self.assertThat(

@@ -385,10 +462,26 @@ class UnityTestCase(AutopilotTestCase):

385 )

462 )

386 self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))

463 self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))

387

464

388− def get_dash(self):

465+ def should_simulate_device(self):

389− dash = self._proxy.wait_select_single(Dash)

466+ return (hasattr(self, 'app_width') and hasattr(self, 'app_height') and

390− return dash

467+ hasattr(self, 'grid_unit_px'))

391

468

392− @property

469+ def simulate_device(self):

393− def main_window(self):

470+ simulate_device_fixture = self.useFixture(

394− return self._proxy.select_single(main_window_emulator.QQuickView)

471+ toolkit_fixtures.SimulateDevice(

472+ self.app_width, self.app_height, self.grid_unit_px))

473+ self.app_width = simulate_device_fixture.app_width

474+ self.app_height = simulate_device_fixture.app_height

475+

476+ def resize_window(self):

477+ application = self.process_manager.get_running_applications()[0]

478+ window = application.get_windows()[0]

479+ window.resize(self.app_width, self.app_height)

480+

481+ def get_window_size():

482+ _, _, window_width, window_height = window.geometry

483+ return window_width, window_height

484+

485+ self.assertThat(

486+ get_window_size,

487+ Eventually(Equals((self.app_width, self.app_height))))

tests/autopilot/unity8/shell/tests/test_emulators.py+7−18

@@ -47,24 +47,13 @@ class MainWindowTestCase(tests.UnityTestCase):

47 unity_proxy = self.launch_unity()

48 process_helpers.unlock_unity(unity_proxy)

49

50− def test_search(self):

51− self.main_window.search('Test')

52− text_field = self.main_window.get_dash()._get_search_text_field()

53− self.assertEqual(text_field.text, 'Test')

54−

55−

56−class DashBaseTestCase(tests.UnityTestCase):

57−

58− scenarios = tests._get_device_emulation_scenarios()

59

50

60− def setUp(self):

61− super(DashBaseTestCase, self).setUp()

51+class DashEmulatorTestCase(tests.DashBaseTestCase):

62− unity_proxy = self.launch_unity()

63− process_helpers.unlock_unity(unity_proxy)

64− self.dash = self.main_window.get_dash()

65

52

66−

53+ def test_search(self):

67−class DashEmulatorTestCase(DashBaseTestCase):

54+ self.dash.enter_search_query('Test')

55+ text_field = self.dash._get_search_text_field()

56+ self.assertEqual(text_field.text, 'Test')

68

57

69 def test_open_unexisting_scope(self):

58 def test_open_unexisting_scope(self):

70 scope_name = 'unexisting'

59 scope_name = 'unexisting'

@@ -145,7 +134,7 @@ class DashEmulatorTestCase(DashBaseTestCase):

145 self.assertIsInstance(scope, dash_emulators.GenericScopeView)

134 self.assertIsInstance(scope, dash_emulators.GenericScopeView)

146

135

147

136

148−class GenericScopeViewEmulatorTestCase(DashBaseTestCase):

137+class GenericScopeViewEmulatorTestCase(tests.DashBaseTestCase):

149

138

150 def setUp(self):

139 def setUp(self):

151 # Set up the fake scopes before launching unity.

140 # Set up the fake scopes before launching unity.

@@ -159,7 +148,7 @@ class GenericScopeViewEmulatorTestCase(DashBaseTestCase):

159 self.assertTrue(preview.isCurrent)

148 self.assertTrue(preview.isCurrent)

160

149

161

150

162−class DashAppsEmulatorTestCase(DashBaseTestCase):

151+class DashAppsEmulatorTestCase(tests.DashBaseTestCase):

163

152

164 available_applications = [

153 available_applications = [

165 'Title.2.0', 'Title.2.1', 'Title.2.2', 'Title.2.3', 'Title.2.4',

154 'Title.2.0', 'Title.2.1', 'Title.2.2', 'Title.2.3', 'Title.2.4',

tests/autopilot/unity8/shell/tests/test_lock_screen.py+7−47

@@ -51,7 +51,7 @@ class TestLockscreen(UnityTestCase):

51 if greeter.narrowMode:

52 unlock_unity(unity_proxy)

53 lockscreen = self._wait_for_lockscreen()

54− self._enter_pincode("1234")

54+ self.main_window.enter_pin_code("1234")

55 self.assertThat(lockscreen.shown, Eventually(Equals(False)))

56 else:

57 self._enter_prompt_passphrase("1234")

@@ -81,7 +81,7 @@ class TestLockscreen(UnityTestCase):

81 if greeter.narrowMode:

82 unlock_unity(unity_proxy)

83 lockscreen = self._wait_for_lockscreen()

84− self._enter_pincode("4321")

84+ self.main_window.enter_pin_code("4321")

85 pinentryField = self.main_window.get_pinentryField()

86 self.assertThat(pinentryField.text, Eventually(Equals("")))

87 self.assertThat(lockscreen.shown, Eventually(Equals(True)))

@@ -118,28 +118,6 @@ class TestLockscreen(UnityTestCase):

118 self.assertThat(lockscreen.shown, Eventually(Equals(True)))

119 return lockscreen

120

121− def _enter_pincode(self, code):

122− """Enter code 'code' into the single-pin lightdm pincode entry

123− screen.

124−

125− :param code: must be a string of numeric characters.

126− :raises: TypeError if code is not a string.

127− :raises: ValueError if code contains non-numeric characters.

128−

129− """

130−

131− if not isinstance(code, basestring):

132− raise TypeError(

133− "'code' parameter must be a string, not %r."

134− % type(code)

135− )

136− for num in code:

137− if not num.isdigit():

138− raise ValueError(

139− "'code' parameter contains non-numeric characters."

140− )

141− self.touch.tap_object(self.main_window.get_pinPadButton(int(num)))

142−

143 def _enter_pin_passphrase(self, passphrase):

121 def _enter_pin_passphrase(self, passphrase):

144 """Enter the password specified in 'passphrase' into the password entry

122 """Enter the password specified in 'passphrase' into the password entry

145 field of the pin lock screen.

123 field of the pin lock screen.

@@ -148,18 +126,15 @@ class TestLockscreen(UnityTestCase):

148 :raises: TypeError if passphrase is not a string.

126 :raises: TypeError if passphrase is not a string.

149

127

150 """

128 """

151− if not isinstance(passphrase, basestring):

129+ if not isinstance(passphrase, str):

152 raise TypeError(

130 raise TypeError(

153 "'passphrase' parameter must be a string, not %r."

131 "'passphrase' parameter must be a string, not %r."

154 % type(passphrase)

132 % type(passphrase)

155 )

133 )

156

134

157− pinentryField = self.main_window.get_pinentryField()

135+ pin_entry_field = self.main_window.get_pinentryField()

158− self.touch.tap_object(pinentryField)

136+ pin_entry_field.write(passphrase)

159− self.assertThat(pinentryField.activeFocus, Eventually(Equals(True)))

160− for character in passphrase:

161− self._type_character(character, pinentryField)

162− logger.debug("Typed passphrase: %s", pinentryField.text)

137+ logger.debug("Typed passphrase: %s", pin_entry_field.text)

163 self.keyboard.type("\n")

138 self.keyboard.type("\n")

164

139

165 def _enter_prompt_passphrase(self, passphrase):

140 def _enter_prompt_passphrase(self, passphrase):

@@ -177,21 +152,6 @@ class TestLockscreen(UnityTestCase):

177 )

152 )

178

153

179 prompt = self.main_window.get_greeter().get_prompt()

154 prompt = self.main_window.get_greeter().get_prompt()

180− self.touch.tap_object(prompt)

181− self.assertThat(prompt.activeFocus, Eventually(Equals(True)))

182− for character in passphrase:

155+ prompt.write(passphrase)

183− self._type_character(character, prompt)

184 logger.debug("Typed passphrase: %s", prompt.text)

156 logger.debug("Typed passphrase: %s", prompt.text)

185 self.keyboard.type("\n")

157 self.keyboard.type("\n")

186−

187− def _type_character(self, character, prompt, retries=5):

188− current_text = prompt.text

189− self.keyboard.type(character)

190− try:

191− self.assertThat(

192− prompt.text, Eventually(Equals(current_text + character)))

193− except AssertionError:

194− if retries > 0:

195− self._type_character(character, prompt, retries-1)

196− else:

197− raise

tests/autopilot/unity8/shell/tests/test_notifications.py+12−7

@@ -154,7 +154,7 @@ class InteractiveNotificationBase(NotificationsBase):

154 'Notification', objectName='notification1')

155 notification = get_notification()

156

157− self.touch.tap_object(

157+ notification.pointing_device.click_object(

158 notification.select_single(objectName="interactiveArea")

159 )

160

@@ -201,11 +201,14 @@ class InteractiveNotificationBase(NotificationsBase):

201 'Notification', objectName='notification1')

202 notification = get_notification()

203 self._assert_notification(notification, summary, body, True, True, 1.0)

204− initial_height = notification.height

204+ notification.pointing_device.click_object(

205− self.touch.tap_object(notification.select_single(objectName="combobutton_dropdown"))

205+ notification.select_single(objectName="combobutton_dropdown"))

206+ self.assertThat(

206− self.assertThat(notification.select_single(objectName="button2").expanded, Eventually(Equals(True)))

207+ notification.select_single(objectName="button2").expanded,

208+ Eventually(Equals(True)))

207 time.sleep(2)

209 time.sleep(2)

210+ notification.pointing_device.click_object(

208− self.touch.tap_object(notification.select_single(objectName="button4"))

211+ notification.select_single(objectName="button4"))

209 self.assert_notification_action_id_was_called("action_decline_4")

212 self.assert_notification_action_id_was_called("action_decline_4")

210

213

211 def test_modal_sd_without_greeter(self):

214 def test_modal_sd_without_greeter(self):

@@ -249,7 +252,8 @@ class InteractiveNotificationBase(NotificationsBase):

249 notification = get_notification()

252 notification = get_notification()

250 self._assert_notification(

253 self._assert_notification(

251 notification, summary, body, True, False, 1.0)

254 notification, summary, body, True, False, 1.0)

255+ notification.pointing_device.click_object(

252− self.touch.tap_object(notification.select_single(objectName="button0"))

256+ notification.select_single(objectName="button0"))

253 self.assert_notification_action_id_was_called("action_accept")

257 self.assert_notification_action_id_was_called("action_accept")

254

258

255 def test_modal_sd_with_greeter(self):

259 def test_modal_sd_with_greeter(self):

@@ -291,7 +295,8 @@ class InteractiveNotificationBase(NotificationsBase):

291 notification = get_notification()

295 notification = get_notification()

292 self._assert_notification(

296 self._assert_notification(

293 notification, summary, body, True, False, 1.0)

297 notification, summary, body, True, False, 1.0)

298+ notification.pointing_device.click_object(

294− self.touch.tap_object(notification.select_single(objectName="button0"))

299+ notification.select_single(objectName="button0"))

295 self.assert_notification_action_id_was_called("action_accept")

300 self.assert_notification_action_id_was_called("action_accept")

296

301

297 def _create_interactive_notification(

302 def _create_interactive_notification(

tests/autopilot/unity8/shell/tests/test_upstart.py+2−2

@@ -119,7 +119,7 @@ class UpstartIntegrationTests(UnityTestCase):

119 self._set_proxy()

120

121 logger.debug("Unity started, waiting for it to be ready.")

122− self.assertUnityReady()

122+ self.wait_for_unity()

123 logger.debug("Unity loaded and ready.")

124

125 def test_expect_sigstop(self):

@@ -137,5 +137,5 @@ class UpstartIntegrationTests(UnityTestCase):

137

138 logger.debug("Unity started, waiting for it to be ready.")

139 self._set_proxy()

140− self.assertUnityReady()

140+ self.wait_for_unity()

141 logger.debug("Unity loaded and ready.")

tests/mocks/Unity/Application/ApplicationInfo.cpp−62

@@ -31,8 +31,6 @@ ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)

31 , m_state(Starting)

32 , m_focused(false)

33 , m_fullscreen(false)

34− , m_windowItem(0)

35− , m_windowComponent(0)

36 , m_parentItem(0)

34 , m_parentItem(0)

37 , m_surface(0)

35 , m_surface(0)

38{

36{

@@ -45,8 +43,6 @@ ApplicationInfo::ApplicationInfo(QObject *parent)

45 , m_state(Starting)

43 , m_state(Starting)

46 , m_focused(false)

44 , m_focused(false)

47 , m_fullscreen(false)

45 , m_fullscreen(false)

48− , m_windowItem(0)

49− , m_windowComponent(0)

50 , m_parentItem(0)

46 , m_parentItem(0)

51 , m_surface(0)

47 , m_surface(0)

52{

48{

@@ -61,12 +57,6 @@ ApplicationInfo::~ApplicationInfo()

61 }

57 }

62}

58}

63

59

64−void ApplicationInfo::onWindowComponentStatusChanged(QQmlComponent::Status status)

65−{

66− if (status == QQmlComponent::Ready && !m_windowItem)

67− doCreateWindowItem();

68−}

69−

70void ApplicationInfo::onStateChanged(State state)

60void ApplicationInfo::onStateChanged(State state)

71{

61{

72 if (state == ApplicationInfo::Running) {

62 if (state == ApplicationInfo::Running) {

@@ -108,55 +98,3 @@ void ApplicationInfo::setSurface(MirSurfaceItem* surface)

108 Q_EMIT surfaceChanged(m_surface);

98 Q_EMIT surfaceChanged(m_surface);

109 SurfaceManager::singleton()->registerSurface(m_surface);

99 SurfaceManager::singleton()->registerSurface(m_surface);

110}

100}

111−

112−void ApplicationInfo::createWindowComponent()

113−{

114− // The assumptions I make here really should hold.

115− QQuickView *quickView =

116− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

117−

118− QQmlEngine *engine = quickView->engine();

119−

120− m_windowComponent = new QQmlComponent(engine, this);

121− m_windowComponent->setData(m_windowQml.toLatin1(), QUrl());

122−}

123−

124−void ApplicationInfo::doCreateWindowItem()

125−{

126− m_windowItem = qobject_cast<QQuickItem *>(m_windowComponent->create());

127− m_windowItem->setParentItem(m_parentItem);

128−}

129−

130−void ApplicationInfo::createWindowItem()

131−{

132− if (!m_windowComponent)

133− createWindowComponent();

134−

135− // only create the windowItem once the component is ready

136− if (!m_windowComponent->isReady()) {

137− connect(m_windowComponent, &QQmlComponent::statusChanged,

138− this, &ApplicationInfo::onWindowComponentStatusChanged);

139− } else {

140− doCreateWindowItem();

141− }

142−}

143−

144−void ApplicationInfo::showWindow(QQuickItem *parent)

145−{

146− m_parentItem = parent;

147−

148− if (!m_windowItem)

149− createWindowItem();

150−

151− if (m_windowItem) {

152− m_windowItem->setVisible(true);

153− }

154−}

155−

156−void ApplicationInfo::hideWindow()

157−{

158− if (!m_windowItem)

159− return;

160−

161− m_windowItem->setVisible(false);

162−}

tests/mocks/Unity/Application/ApplicationInfo.h−10

@@ -88,22 +88,12 @@ public:

88Q_SIGNALS:

89 void surfaceChanged(MirSurfaceItem*);

90

91−public:

92− void showWindow(QQuickItem *parent);

93− void hideWindow();

94−

95private Q_SLOTS:

91private Q_SLOTS:

96− void onWindowComponentStatusChanged(QQmlComponent::Status status);

97 void onStateChanged(State state);

92 void onStateChanged(State state);

98

93

99 void createSurface();

94 void createSurface();

100

95

101private:

96private:

102− void createWindowItem();

103− void doCreateWindowItem();

104− void createWindowComponent();

105− QQuickItem *m_windowItem;

106− QQmlComponent *m_windowComponent;

107 QQuickItem *m_parentItem;

97 QQuickItem *m_parentItem;

108 MirSurfaceItem* m_surface;

98 MirSurfaceItem* m_surface;

109};

99};

tests/mocks/Unity/Application/ApplicationManager.cpp+17−147

@@ -48,16 +48,14 @@ ApplicationManager *ApplicationManager::singleton()

48ApplicationManager::ApplicationManager(QObject *parent)

49 : ApplicationManagerInterface(parent)

50 , m_suspended(false)

51− , m_mainStageComponent(0)

52− , m_mainStage(0)

53− , m_sideStageComponent(0)

54− , m_sideStage(0)

55− , m_rightMargin(0)

56{

51{

57 m_roleNames.insert(RoleSurface, "surface");

52 m_roleNames.insert(RoleSurface, "surface");

58 m_roleNames.insert(RoleFullscreen, "fullscreen");

53 m_roleNames.insert(RoleFullscreen, "fullscreen");

59

54

60 buildListOfAvailableApplications();

55 buildListOfAvailableApplications();

56+

57+ startApplication("unity8-dash");

58+ focusApplication("unity8-dash");

61}

59}

62

60

63ApplicationManager::~ApplicationManager()

61ApplicationManager::~ApplicationManager()

@@ -136,7 +134,6 @@ void ApplicationManager::add(ApplicationInfo *application) {

136 Q_EMIT applicationAdded(application->appId());

134 Q_EMIT applicationAdded(application->appId());

137 Q_EMIT countChanged();

135 Q_EMIT countChanged();

138 if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore

136 if (count() == 1) Q_EMIT emptyChanged(isEmpty()); // was empty but not anymore

139− Q_EMIT focusRequested(application->appId());

140

137

141 connect(application, &ApplicationInfo::surfaceChanged, this, [application, this]() {

138 connect(application, &ApplicationInfo::surfaceChanged, this, [application, this]() {

142 QModelIndex appIndex = findIndex(application);

139 QModelIndex appIndex = findIndex(application);

@@ -222,6 +219,10 @@ ApplicationInfo* ApplicationManager::startApplication(const QString &appId,

222

219

223bool ApplicationManager::stopApplication(const QString &appId)

220bool ApplicationManager::stopApplication(const QString &appId)

224{

221{

222+ if (appId == "unity8-dash") {

223+ return false;

224+ }

225+

225 ApplicationInfo *application = findApplication(appId);

226 ApplicationInfo *application = findApplication(appId);

226 if (application == nullptr)

227 if (application == nullptr)

227 return false;

228 return false;

@@ -294,39 +295,25 @@ bool ApplicationManager::focusApplication(const QString &appId)

294 for (ApplicationInfo *app : m_runningApplications) {

295 for (ApplicationInfo *app : m_runningApplications) {

295 if (app->focused() && app->stage() == ApplicationInfo::MainStage) {

296 if (app->focused() && app->stage() == ApplicationInfo::MainStage) {

296 app->setFocused(false);

297 app->setFocused(false);

297− app->hideWindow();

298 app->setState(ApplicationInfo::Suspended);

299 }

300 }

301

302 // focus this app

303 application->setFocused(true);

304− if (!m_mainStage)

305− createMainStage();

306 application->setState(ApplicationInfo::Running);

304 application->setState(ApplicationInfo::Running);

307− application->showWindow(m_mainStage);

308− m_mainStage->setZ(-1000);

309− if (m_sideStage)

310− m_sideStage->setZ(-2000);

311 } else if (application->stage() == ApplicationInfo::SideStage) {

305 } else if (application->stage() == ApplicationInfo::SideStage) {

312 // unfocus currently focused sidestage app

306 // unfocus currently focused sidestage app

313 for (ApplicationInfo *app : m_runningApplications) {

307 for (ApplicationInfo *app : m_runningApplications) {

314 if (app->focused() && app->stage() == ApplicationInfo::SideStage) {

308 if (app->focused() && app->stage() == ApplicationInfo::SideStage) {

315 app->setFocused(false);

309 app->setFocused(false);

316− app->hideWindow();

317 app->setState(ApplicationInfo::Suspended);

310 app->setState(ApplicationInfo::Suspended);

318 }

311 }

319 }

312 }

320

313

321 // focus this app

314 // focus this app

322 application->setFocused(true);

315 application->setFocused(true);

323− if (!m_sideStage)

324− createSideStage();

325 application->setState(ApplicationInfo::Running);

316 application->setState(ApplicationInfo::Running);

326− application->showWindow(m_sideStage);

327− m_sideStage->setZ(-1000);

328− if (m_mainStage)

329− m_mainStage->setZ(-2000);

330 }

317 }

331

318

332 // move app to top of stack

319 // move app to top of stack

@@ -337,18 +324,14 @@ bool ApplicationManager::focusApplication(const QString &appId)

337

324

338bool ApplicationManager::requestFocusApplication(const QString &appId)

325bool ApplicationManager::requestFocusApplication(const QString &appId)

339{

326{

340− if (appId != focusedApplicationId()) {

341− QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));

327+ QMetaObject::invokeMethod(this, "focusRequested", Qt::QueuedConnection, Q_ARG(QString, appId));

342− return true;

328+ return true;

343− }

344− return false;

345}

329}

346

330

347void ApplicationManager::unfocusCurrentApplication()

331void ApplicationManager::unfocusCurrentApplication()

348{

332{

349 for (ApplicationInfo *app : m_runningApplications) {

333 for (ApplicationInfo *app : m_runningApplications) {

350 if (app->focused()) {

334 if (app->focused()) {

351− app->hideWindow();

352 app->setFocused(false);

335 app->setFocused(false);

353 }

336 }

354 }

337 }

@@ -357,42 +340,6 @@ void ApplicationManager::unfocusCurrentApplication()

357

340

358void ApplicationManager::generateQmlStrings(ApplicationInfo *application)

341void ApplicationManager::generateQmlStrings(ApplicationInfo *application)

359{

342{

360− // TODO: Is there a better way of solving this fullscreen vs. regular

361− // application height?

362− QString topMargin;

363− if (application->fullscreen()) {

364− topMargin.append("0");

365− } else {

366− // Taken from Panel.panelHeight

367− topMargin.append("units.gu(3) + units.dp(2)");

368− }

369−

370− QString windowQml = QString(

371− "import QtQuick 2.0\n"

372− "Image {\n"

373− " anchors.fill: parent\n"

374− " anchors.topMargin: %1\n"

375− " anchors.rightMargin: %2\n"

376− " source: \"file://%3/Dash/graphics/phone/screenshots/%4.png\"\n"

377− " smooth: true\n"

378− " fillMode: Image.PreserveAspectCrop\n"

379− "}").arg(topMargin)

380− .arg(m_rightMargin)

381− .arg(qmlDirectory())

382− .arg(application->icon().toString());

383− application->setWindowQml(windowQml);

384−

385− QString imageQml = QString(

386− "import QtQuick 2.0\n"

387− "Image {\n"

388− " anchors.fill: parent\n"

389− " source: \"file://%1/Dash/graphics/phone/screenshots/%2.png\"\n"

390− " smooth: true\n"

391− " fillMode: Image.PreserveAspectCrop\n"

392− "}").arg(qmlDirectory())

393− .arg(application->icon().toString());

394− application->setImageQml(imageQml);

395−

396 application->setScreenshot(QString("file://%1/Dash/graphics/phone/screenshots/%2@12.png").arg(qmlDirectory())

343 application->setScreenshot(QString("file://%1/Dash/graphics/phone/screenshots/%2@12.png").arg(qmlDirectory())

397 .arg(application->icon().toString()));

344 .arg(application->icon().toString()));

398}

345}

@@ -401,6 +348,14 @@ void ApplicationManager::buildListOfAvailableApplications()

401{

348{

402 ApplicationInfo *application;

349 ApplicationInfo *application;

403

350

351+ application = new ApplicationInfo(this);

352+ application->setAppId("unity8-dash");

353+ application->setName("Unity 8 Mock Dash");

354+ application->setIcon(QUrl("unity8-dash"));

355+ application->setStage(ApplicationInfo::MainStage);

356+ generateQmlStrings(application);

357+ m_availableApplications.append(application);

358+

404 application = new ApplicationInfo(this);

359 application = new ApplicationInfo(this);

405 application->setAppId("dialer-app");

360 application->setAppId("dialer-app");

406 application->setName("Dialer");

361 application->setName("Dialer");

@@ -521,78 +476,6 @@ void ApplicationManager::buildListOfAvailableApplications()

521 m_availableApplications.append(application);

476 m_availableApplications.append(application);

522}

477}

523

478

524−void ApplicationManager::createMainStageComponent()

525−{

526− // The assumptions I make here really should hold.

527− QQuickView *quickView =

528− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

529−

530− QQmlEngine *engine = quickView->engine();

531−

532− m_mainStageComponent = new QQmlComponent(engine, this);

533− QString mainStageQml =

534− "import QtQuick 2.0\n"

535− "Rectangle {\n"

536− " anchors.fill: parent\n"

537− " color: 'black'\n"

538− " z: -2000\n"

539− "}\n";

540− m_mainStageComponent->setData(mainStageQml.toLatin1(), QUrl());

541−}

542−

543−void ApplicationManager::createMainStage()

544−{

545− if (!m_mainStageComponent)

546− createMainStageComponent();

547−

548− // The assumptions I make here really should hold.

549− QQuickView *quickView =

550− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

551−

552− QQuickItem *shell = quickView->rootObject();

553−

554− m_mainStage = qobject_cast<QQuickItem *>(m_mainStageComponent->create());

555− m_mainStage->setParentItem(shell);

556−}

557−

558−void ApplicationManager::createSideStageComponent()

559−{

560− // The assumptions I make here really should hold.

561− QQuickView *quickView =

562− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

563−

564− QQmlEngine *engine = quickView->engine();

565−

566− m_sideStageComponent = new QQmlComponent(engine, this);

567− QString sideStageQml =

568− "import QtQuick 2.0\n"

569− "import Ubuntu.Components 0.1\n"

570− "Item {\n"

571− " width: units.gu(40)\n" // from SideStage in Shell.qml

572− " anchors.top: parent.top\n"

573− " anchors.bottom: parent.bottom\n"

574− " anchors.right: parent.right\n"

575− " z: -1000\n"

576− "}\n";

577− m_sideStageComponent->setData(sideStageQml.toLatin1(), QUrl());

578−}

579−

580−void ApplicationManager::createSideStage()

581−{

582− if (!m_sideStageComponent)

583− createSideStageComponent();

584−

585− // The assumptions I make here really should hold.

586− QQuickView *quickView =

587− qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

588−

589− QQuickItem *shell = quickView->rootObject();

590−

591− m_sideStage = qobject_cast<QQuickItem *>(m_sideStageComponent->create());

592− m_sideStage->setParentItem(shell);

593− m_sideStage->setFlag(QQuickItem::ItemHasContents, false);

594−}

595−

596QStringList ApplicationManager::availableApplications()

479QStringList ApplicationManager::availableApplications()

597{

480{

598 QStringList appIds;

481 QStringList appIds;

@@ -602,19 +485,6 @@ QStringList ApplicationManager::availableApplications()

602 return appIds;

485 return appIds;

603}

486}

604

487

605−int ApplicationManager::rightMargin() const

606−{

607− return m_rightMargin;

608−}

609−

610−void ApplicationManager::setRightMargin(int rightMargin)

611−{

612− m_rightMargin = rightMargin;

613− Q_FOREACH(ApplicationInfo *app, m_availableApplications) {

614− generateQmlStrings(app);

615− }

616−}

617−

618bool ApplicationManager::isEmpty() const

488bool ApplicationManager::isEmpty() const

619{

489{

620 return m_runningApplications.isEmpty();

490 return m_runningApplications.isEmpty();

tests/mocks/Unity/Application/ApplicationManager.h−16

@@ -44,10 +44,6 @@ class ApplicationManager : public ApplicationManagerInterface {

44

45 Q_PROPERTY(bool fake READ fake CONSTANT)

46

47− // Only for testing

48− // This can be used to place some controls to right, like make tryPhoneStage for example

49− Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin)

50−

51 public:

47 public:

52 ApplicationManager(QObject *parent = NULL);

48 ApplicationManager(QObject *parent = NULL);

53 virtual ~ApplicationManager();

49 virtual ~ApplicationManager();

@@ -108,8 +104,6 @@ class ApplicationManager : public ApplicationManagerInterface {

108

104

109 // Only for testing

105 // Only for testing

110 Q_INVOKABLE QStringList availableApplications();

106 Q_INVOKABLE QStringList availableApplications();

111− int rightMargin() const;

112− void setRightMargin(int rightMargin);

113

107

114 QModelIndex findIndex(ApplicationInfo* application);

108 QModelIndex findIndex(ApplicationInfo* application);

115

109

@@ -126,19 +120,9 @@ class ApplicationManager : public ApplicationManagerInterface {

126 void showApplicationWindow(ApplicationInfo *application);

120 void showApplicationWindow(ApplicationInfo *application);

127 void buildListOfAvailableApplications();

121 void buildListOfAvailableApplications();

128 void generateQmlStrings(ApplicationInfo *application);

122 void generateQmlStrings(ApplicationInfo *application);

129− void createMainStageComponent();

130− void createMainStage();

131− void createSideStageComponent();

132− void createSideStage();

133 bool m_suspended;

123 bool m_suspended;

134 QList<ApplicationInfo*> m_runningApplications;

124 QList<ApplicationInfo*> m_runningApplications;

135 QList<ApplicationInfo*> m_availableApplications;

125 QList<ApplicationInfo*> m_availableApplications;

136− QQmlComponent *m_mainStageComponent;

137− QQuickItem *m_mainStage;

138− QQmlComponent *m_sideStageComponent;

139− QQuickItem *m_sideStage;

140−

141− int m_rightMargin;

142

126

143 static ApplicationManager *the_application_manager;

127 static ApplicationManager *the_application_manager;

144};

128};

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp+1−1

@@ -64,7 +64,7 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize

64 Q_FOREACH (QWindow *win, unity->allWindows()) {

65 QQuickWindow *quickWin = qobject_cast<QQuickWindow*>(win);

66 if (quickWin) {

67− image = image.scaledToWidth(quickWin->width() - m_appManager->rightMargin());

67+ image = image.scaledToWidth(quickWin->width());

68 break;

69 }

70 }

tests/mocks/Unity/CMakeLists.txt+1

@@ -2,6 +2,7 @@ add_subdirectory(Application)

2add_subdirectory(Indicators)

3add_subdirectory(Launcher)

4add_subdirectory(Notifications)

5+add_subdirectory(DashCommunicator)

5

6

6pkg_search_module(DEE dee-1.0 REQUIRED)

7pkg_search_module(DEE dee-1.0 REQUIRED)

7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

8pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

tests/mocks/Unity/DashCommunicator/CMakeLists.txtnew file+18

@@ -0,0 +1,18 @@

1+include_directories(

2+ ${CMAKE_CURRENT_SOURCE_DIR}

3+)

4+

5+set(QMLDASHCOMMUNICATORPLUGIN_SRC

6+ plugin.cpp

7+ dashcommunicatorservice.cpp

8+ dashcommunicator.cpp

9+ )

10+

11+add_library(MockDashCommunicator-qml MODULE

12+ ${QMLDASHCOMMUNICATORPLUGIN_SRC}

13+ )

14+

15+qt5_use_modules(MockDashCommunicator-qml DBus Qml)

16+

17+# export the qmldir and qmltypes files

18+add_unity8_mock(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS MockDashCommunicator-qml)

tests/mocks/Unity/DashCommunicator/dashcommunicator.cppnew file+37

@@ -0,0 +1,37 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashcommunicator.h"

18+

19+#include <QObject>

20+#include <QDBusConnection>

21+#include <QDBusInterface>

22+#include <QDebug>

23+

24+DashCommunicator::DashCommunicator(QObject *parent):

25+ QObject(parent)

26+{

27+}

28+

29+DashCommunicator::~DashCommunicator()

30+{

31+}

32+

33+

34+void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool reset)

35+{

36+ Q_EMIT setCurrentScopeCalled(scopeId, animate, reset);

37+}

tests/mocks/Unity/DashCommunicator/dashcommunicator.hnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DASHCOMMUNICATOR_H

18+#define DASHCOMMUNICATOR_H

19+

20+#include <QObject>

21+

22+class DashCommunicator: public QObject

23+{

24+ Q_OBJECT

25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26+

27+public:

28+ DashCommunicator(QObject *parent = 0);

29+ ~DashCommunicator();

30+

31+public Q_SLOTS:

32+ void setCurrentScope(const QString &scopeId, bool animate, bool reset);

33+

34+Q_SIGNALS:

35+ // This mock just emits calls back to the QML api for the plugin to verify calls

36+ void setCurrentScopeCalled(const QString &scopeId, bool animate, bool reset);

37+};

38+

39+#endif

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cppnew file+33

@@ -0,0 +1,33 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashcommunicatorservice.h"

18+

19+DashCommunicatorService::DashCommunicatorService(QObject *parent):

20+ QObject(parent)

21+{

22+}

23+

24+

25+DashCommunicatorService::~DashCommunicatorService()

26+{

27+

28+}

29+

30+void DashCommunicatorService::mockSetCurrentScope(const QString &scopeId, bool animate, bool reset)

31+{

32+ Q_EMIT setCurrentScopeRequested(scopeId, animate, reset);

33+}

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.hnew file+36

@@ -0,0 +1,36 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DASHCOMMUNICATORSERVICE_H

18+#define DASHCOMMUNICATORSERVICE_H

19+

20+#include <QObject>

21+

22+class DashCommunicatorService: public QObject

23+{

24+ Q_OBJECT

25+public:

26+ DashCommunicatorService(QObject *parent = 0);

27+ ~DashCommunicatorService();

28+

29+Q_SIGNALS:

30+ void setCurrentScopeRequested(const QString &scopeId, bool animate, bool reset);

31+

32+public Q_SLOTS:

33+ void mockSetCurrentScope(const QString &scopeId, bool animate, bool reset);

34+};

35+

36+#endif // DBUSUNITYSESSIONSERVICE_H

tests/mocks/Unity/DashCommunicator/plugin.cppnew file+31

@@ -0,0 +1,31 @@

1+/*

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+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17+ */

18+

19+#include "plugin.h"

20+#include "dashcommunicator.h"

21+#include "dashcommunicatorservice.h"

22+

23+#include <QDBusConnection>

24+#include <QtQml/qqml.h>

25+

26+void DashCommunicatorPlugin::registerTypes(const char *uri)

27+{

28+ Q_ASSERT(uri == QStringLiteral("Unity.DashCommunicator"));

29+ qmlRegisterType<DashCommunicatorService>(uri, 0, 1, "DashCommunicatorService");

30+ qmlRegisterType<DashCommunicator>(uri, 0, 1, "DashCommunicator");

31+}

tests/mocks/Unity/DashCommunicator/plugin.hnew file+34

@@ -0,0 +1,34 @@

1+/*

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+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17+ */

18+

19+#ifndef DASHCOMMUNICATOR_PLUGIN_H

20+#define DASHCOMMUNICATOR_PLUGIN_H

21+

22+#include <QtQml/QQmlEngine>

23+#include <QtQml/QQmlExtensionPlugin>

24+

25+class DashCommunicatorPlugin : public QQmlExtensionPlugin

26+{

27+ Q_OBJECT

28+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

29+

30+public:

31+ void registerTypes(const char *uri);

32+};

33+

34+#endif

tests/mocks/Unity/DashCommunicator/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Unity.DashCommunicator

2+plugin MockDashCommunicator-qml

3+typeinfo DashCommunicator.qmltypes

tests/qmltests/Dash/tst_Dash.qml+19

@@ -59,6 +59,7 @@ Item {

59 verify(dashContentList != undefined);

60 tryCompare(dashContentList, "count", 0);

61 scopes.load();

62+ tryCompare(dashContentList, "currentIndex", 0);

62 }

63 }

63

64

64 function get_scope_data() {

65 function get_scope_data() {

@@ -91,5 +92,23 @@ Item {

91 verify(dashContentList != undefined);

92 verify(dashContentList != undefined);

92 tryCompare(dashContentList, "currentIndex", data.visualIndex);

93 tryCompare(dashContentList, "currentIndex", data.visualIndex);

93 }

94 }

95+

96+ function test_setCurrentScope() {

97+ var dashContentList = findChild(dash, "dashContentList");

98+ var startX = dash.width - units.gu(1);

99+ var startY = dash.height / 2;

100+ var stopX = units.gu(1)

101+ var stopY = startY;

102+ var retry = 0;

103+ while (dashContentList.currentIndex != 2 && retry <= 5) {

104+ mouseFlick(dash, startX, startY, stopX, stopY)

105+ waitForRendering(dashContentList)

106+ retry++;

107+ }

108+ compare(dashContentList.currentIndex, 2);

109+ var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");

110+ dashCommunicatorService.mockSetCurrentScope("clickscope", true, true);

111+ tryCompare(dashContentList, "currentIndex", 1)

112+ }

94 }

113 }

95}

114}

tests/qmltests/Stages/tst_PhoneStage.qml+3−2

@@ -231,9 +231,10 @@ Item {

231 }

232

233 function cleanup() {

234− while (ApplicationManager.count > 0) {

234+ while (ApplicationManager.count > 1) {

235 var oldCount = ApplicationManager.count;

236+ var closingIndex = ApplicationManager.focusedApplicationId == "unity8-dash" ? 1 : 0

236− ApplicationManager.stopApplication(ApplicationManager.get(0).appId)

237+ ApplicationManager.stopApplication(ApplicationManager.get(closingIndex).appId)

237 tryCompare(ApplicationManager, "count", oldCount - 1)

238 tryCompare(ApplicationManager, "count", oldCount - 1)

238 }

239 }

240 }

tests/qmltests/tst_Shell.qml+62−275

@@ -57,6 +57,11 @@ Item {

57 signalName: "sessionStarted"

58 }

59

60+ SignalSpy {

61+ id: dashCommunicatorSpy

62+ signalName: "setCurrentScopeCalled"

63+ }

64+

60 Telephony.CallEntry {

65 Telephony.CallEntry {

61 id: phoneCall

66 id: phoneCall

62 phoneNumber: "+447812221111"

67 phoneNumber: "+447812221111"

@@ -67,44 +72,10 @@ Item {

67 when: windowShown

72 when: windowShown

68

73

69 function initTestCase() {

74 function initTestCase() {

70− var ok = false;

71− var attempts = 0;

72− var maxAttempts = 1000;

73−

74− // Qt loads a qml scene asynchronously. So early on, some findChild() calls made in

75− // tests may fail because the desired child item wasn't loaded yet.

76− // Thus here we try to ensure the scene has been fully loaded before proceeding with the tests.

77− // As I couldn't find an API in QQuickView & friends to tell me that the scene is 100% loaded

78− // (all items instantiated, etc), I resort to checking the existence of some key items until

79− // repeatedly until they're all there.

80− do {

81− var dashContentList = findChild(shell, "dashContentList");

82− waitForRendering(dashContentList);

83− var homeLoader = findChild(dashContentList, "clickscope loader");

84− ok = homeLoader !== null

85− && homeLoader.item !== undefined;

86−

87− var greeter = findChild(shell, "greeter");

88− ok &= greeter !== null;

89−

90− var launcherPanel = findChild(shell, "launcherPanel");

91− ok &= launcherPanel !== null;

92−

93− attempts++;

94− if (!ok) {

95− console.log("Attempt " + attempts + " failed. Waiting a bit before trying again.");

96− // wait a bit before retrying

97− wait(100);

98− } else {

99− console.log("All seem fine after " + attempts + " attempts.");

100− }

101− } while (!ok && attempts <= maxAttempts);

102−

103− verify(ok);

104−

105 swipeAwayGreeter();

75 swipeAwayGreeter();

106

76

107 sessionSpy.target = findChild(shell, "greeter")

77 sessionSpy.target = findChild(shell, "greeter")

78+ dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");

108 }

79 }

109

80

110 function cleanup() {

81 function cleanup() {

@@ -117,56 +88,16 @@ Item {

117 // kill all (fake) running apps

88 // kill all (fake) running apps

118 killApps(ApplicationManager);

89 killApps(ApplicationManager);

119

90

120− var dashContent = findChild(shell, "dashContent");

91+ waitForUIToSettle();

121− dashContent.closePreview();

122−

123− var dashHome = findChild(shell, "clickscope loader");

124− swipeUntilScopeViewIsReached(dashHome);

125−

126 hideIndicators();

92 hideIndicators();

127 }

93 }

128

94

129− function killApps(apps) {

95+ function killApps() {

130− if (!apps) return;

131− while (apps.count > 0) {

96+ while (ApplicationManager.count > 1) {

97+ var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0

132− ApplicationManager.stopApplication(apps.get(0).appId);

98+ ApplicationManager.stopApplication(ApplicationManager.get(appIndex).appId);

133 }

99 }

134− compare(ApplicationManager.count, 0)

100+ compare(ApplicationManager.count, 1)

135− }

136−

137− /*

138− Test the effect of a right-edge drag on the dash in 3 situations:

139− 1 - when no application has been launched yet

140− 2 - when there's a minimized application

141− 3 - after the last running application has been closed/stopped

142−

143− The behavior of Dash on 3 should be the same as on 1.

144− */

145− function test_rightEdgeDrag() {

146− checkRightEdgeDragWithNoRunningApps();

147−

148− dragLauncherIntoView();

149−

150− // Launch an app from the launcher

151− tapOnAppIconInLauncher();

152− waitUntilApplicationWindowIsFullyVisible();

153−

154− // Minimize the application we just launched

155− swipeFromLeftEdge(units.gu(27));

156−

157− waitForUIToSettle();

158−

159− checkRightEdgeDragWithMinimizedApp();

160−

161− // Minimize that application once again

162− swipeFromLeftEdge(units.gu(27));

163−

164− // Right edge behavior should now be the same as before that app,

165− // was launched. Manually cleanup beforehand to get to initial

166− // state.

167− cleanup();

168− waitForUIToSettle();

169− checkRightEdgeDragWithNoRunningApps();

170 }

101 }

171

102

172 function test_leftEdgeDrag_data() {

103 function test_leftEdgeDrag_data() {

@@ -189,7 +120,7 @@ Item {

189

120

190 swipeFromLeftEdge(data.swipeLength);

121 swipeFromLeftEdge(data.swipeLength);

191 if (data.appHides)

122 if (data.appHides)

192− waitUntilApplicationWindowIsFullyHidden();

123+ waitUntilDashIsFocused();

193 else

124 else

194 waitUntilApplicationWindowIsFullyVisible();

125 waitUntilApplicationWindowIsFullyVisible();

195 }

126 }

@@ -244,100 +175,18 @@ Item {

244 waitForRendering(greeter);

175 waitForRendering(greeter);

245 }

176 }

246

177

247− /*

248− Perform a right-edge drag when the Dash is being show and there are

249− no running/minimized apps to be restored.

250−

251− The expected behavior is that an animation should be played to hint the

252− user that his right-edge drag gesture has been successfully recognized

253− but there is no application to be brought to foreground.

254− */

255− function checkRightEdgeDragWithNoRunningApps() {

256− var touchX = shell.width - (shell.edgeSize / 2);

257− var touchY = shell.height / 2;

258−

259− var dash = findChild(shell, "dash");

260− // check that dash has normal scale and opacity

261− tryCompare(dash, "contentScale", 1.0);

262− tryCompare(dash, "opacity", 1.0);

263−

264− touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

265− true /* beginTouch */, false /* endTouch */, units.gu(10), 50);

266−

267− // check that Dash has been scaled down and had its opacity reduced

268− tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);

269− tryCompareFunction(function() { return dash.opacity <= 0.5; }, true);

270−

271− touchRelease(shell, shell.width * 0.1, touchY);

272−

273− // and now everything should have gone back to normal

274− tryCompare(dash, "contentScale", 1.0);

275− tryCompare(dash, "opacity", 1.0);

276− }

277−

278− /*

279− Perform a right-edge drag when the Dash is being show and there is

280− a running/minimized app to be restored.

281−

282− The expected behavior is that the dash should fade away and ultimately be

283− made invisible once the gesture is finished as the restored app will now

284− be on foreground.

285− */

286− function checkRightEdgeDragWithMinimizedApp() {

287− var touchX = shell.width - (shell.edgeSize / 2);

288− var touchY = shell.height / 2;

289−

290− var dash = findChild(shell, "dash");

291− // check that dash has normal scale and opacity

292− tryCompare(dash, "contentScale", 1.0);

293− tryCompare(dash, "opacity", 1.0);

294−

295− touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

296− true /* beginTouch */, false /* endTouch */, units.gu(10), 50);

297−

298− // check that Dash has been scaled down and had its opacity reduced

299− tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);

300− tryCompareFunction(function() { return dash.opacity <= 0.5; }, true);

301−

302− touchRelease(shell, shell.width * 0.1, touchY);

303−

304− // dash should have gone away, now that the app is on foreground

305− tryCompare(dash, "visible", false);

306− }

307−

308 /*

178 /*

309 Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419

179 Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419

310

180

311− When the user minimizes an application (left-edge swipe) he should always end up in the "Running Apps"

181+ When the user minimizes an application (left-edge swipe) he should always end up in the

312− category of the "Applications" scope view.

182+ "Applications" scope view.

313

183

314 Steps:

184 Steps:

315− - go to apps lens

316− - scroll to the bottom

317− - reveal launcher and launch an app

185+ - reveal launcher and launch an app that covers the dash

318 - perform long left edge swipe to go minimize the app and go back to the dash.

186 - perform long left edge swipe to go minimize the app and go back to the dash.

319−

187+ - verify the setCurrentScope() D-Bus call to the dash has been called for the correct scope id.

320− Expected Results

321− - apps lens shown

322 */

188 */

323 function test_minimizingAppTakesToDashApps() {

189 function test_minimizingAppTakesToDashApps() {

324− var dashApps = findChild(shell, "clickscope");

325− swipeUntilScopeViewIsReached(dashApps);

326−

327− // swipe finger up until the running/recent apps section (which we assume

328− // it's the first one) is as far from view as possible.

329− // We also assume that DashApps is tall enough that it's scrollable

330− var appsCategoryListView = findChild(dashApps, "categoryListView");

331− while (!appsCategoryListView.atYEnd) {

332− swipeUpFromCenter();

333− tryCompare(appsCategoryListView, "moving", false);

334− }

335−

336− // Switch away from the Applications scope.

337− swipeRightFromCenter();

338− waitUntilItemStopsMoving(dashApps);

339− verify(!itemIsOnScreen(dashApps));

340−

341 dragLauncherIntoView();

190 dragLauncherIntoView();

342

191

343 // Launch an app from the launcher

192 // Launch an app from the launcher

@@ -345,19 +194,16 @@ Item {

345

194

346 waitUntilApplicationWindowIsFullyVisible();

195 waitUntilApplicationWindowIsFullyVisible();

347

196

348− // Dragging launcher into view with a little bit of gap (units.gu(1)) should switch to Apps scope

197+ verify(ApplicationManager.focusedApplicationId !== "unity8-dash")

349− dragLauncherIntoView();

350− verify(itemIsOnScreen(dashApps));

351

198

199+ dashCommunicatorSpy.clear();

352 // Minimize the application we just launched

200 // Minimize the application we just launched

353 swipeFromLeftEdge(units.gu(27));

201 swipeFromLeftEdge(units.gu(27));

354

202

355− // Wait for the whole UI to settle down

203+ tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

356− waitUntilApplicationWindowIsFullyHidden();

357− waitUntilItemStopsMoving(dashApps);

358− tryCompare(appsCategoryListView, "moving", false);

359

204

360− verify(itemIsOnScreen(dashApps));

205+ compare(dashCommunicatorSpy.count, 1);

206+ compare(dashCommunicatorSpy.signalArguments[0][0], "clickscope");

361 }

207 }

362

208

363 function test_showInputMethod() {

209 function test_showInputMethod() {

@@ -414,9 +260,14 @@ Item {

414

260

415 // Wait for the whole UI to settle down

261 // Wait for the whole UI to settle down

416 function waitForUIToSettle() {

262 function waitForUIToSettle() {

417− waitUntilApplicationWindowIsFullyHidden();

418− var dashContentList = findChild(shell, "dashContentList");

263+ var launcher = findChild(shell, "launcherPanel")

419− tryCompare(dashContentList, "moving", false);

264+ tryCompareFunction(function() {return launcher.x === 0 || launcher.x === -launcher.width;}, true);

265+ if (launcher.x === 0) {

266+ mouseClick(shell, shell.width / 2, shell.height / 2)

267+ }

268+ tryCompare(launcher, "x", -launcher.width)

269+

270+ waitForRendering(shell)

420 }

271 }

421

272

422 function dragToCloseIndicatorsPanel() {

273 function dragToCloseIndicatorsPanel() {

@@ -473,24 +324,13 @@ Item {

473 }

324 }

474

325

475 function waitUntilApplicationWindowIsFullyVisible() {

326 function waitUntilApplicationWindowIsFullyVisible() {

476− var underlay = findChild(shell, "underlay");

327+ var appDelegate = findChild(shell, "appDelegate0")

477− tryCompare(underlay, "visible", false);

328+ var surfaceContainer = findChild(appDelegate, "surfaceContainer");

329+ tryCompareFunction(function() { return surfaceContainer.surface !== null; }, true);

478 }

330 }

479

331

480− function waitUntilApplicationWindowIsFullyHidden() {

332+ function waitUntilDashIsFocused() {

481− var stages = findChild(shell, "stages");

333+ tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

482− tryCompare(stages, "fullyHidden", true);

483− }

484−

485− function swipeUntilScopeViewIsReached(scopeView) {

486− while (!itemIsOnScreen(scopeView)) {

487− if (itemIsToLeftOfScreen(scopeView)) {

488− swipeRightFromCenter();

489− } else {

490− swipeLeftFromCenter();

491− }

492− waitUntilItemStopsMoving(scopeView);

493− }

494 }

334 }

495

335

496 function swipeFromLeftEdge(swipeLength) {

336 function swipeFromLeftEdge(swipeLength) {

@@ -499,24 +339,6 @@ Item {

499 touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);

339 touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);

500 }

340 }

501

341

502− function swipeLeftFromCenter() {

503− var touchStartX = shell.width * 3 / 4;

504− var touchStartY = shell.height / 2;

505− touchFlick(shell, touchStartX, touchStartY, 0, touchStartY);

506− }

507−

508− function swipeRightFromCenter() {

509− var touchStartX = shell.width * 3 / 4;

510− var touchStartY = shell.height / 2;

511− touchFlick(shell, touchStartX, touchStartY, shell.width, touchStartY);

512− }

513−

514− function swipeUpFromCenter() {

515− var touchStartX = shell.width / 2;

516− var touchStartY = shell.height / 2;

517− touchFlick(shell, touchStartX, touchStartY, touchStartX, 0);

518− }

519−

520 function itemIsOnScreen(item) {

342 function itemIsOnScreen(item) {

521 var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

343 var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

522

344

@@ -526,64 +348,6 @@ Item {

526 && itemRectInShell.y + itemRectInShell.height <= shell.height;

348 && itemRectInShell.y + itemRectInShell.height <= shell.height;

527 }

349 }

528

350

529− function itemIsToLeftOfScreen(item) {

530− var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

531− return itemRectInShell.x < 0;

532− }

533−

534− function waitUntilItemStopsMoving(item) {

535− var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

536− var previousX = itemRectInShell.x;

537− var previousY = itemRectInShell.y;

538− var isStill = false;

539−

540− do {

541− wait(100);

542− itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

543− if (itemRectInShell.x == previousX && itemRectInShell.y == previousY) {

544− isStill = true;

545− } else {

546− previousX = itemRectInShell.x;

547− previousY = itemRectInShell.y;

548− }

549− } while (!isStill);

550− }

551−

552− function test_DashShown_data() {

553− return [

554− {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},

555− {tag: "under greeter", greeter: true, app: false, launcher: false, indicators: false, expectedShown: false},

556− {tag: "under app", greeter: false, app: true, launcher: false, indicators: false, expectedShown: false},

557− {tag: "under launcher", greeter: false, app: false, launcher: true, indicators: false, expectedShown: true},

558− {tag: "under indicators", greeter: false, app: false, launcher: false, indicators: true, expectedShown: false},

559− ]

560− }

561−

562− function test_DashShown(data) {

563− if (data.greeter) {

564− // Swipe the greeter in

565− var greeter = findChild(shell, "greeter");

566− LightDM.Greeter.showGreeter();

567− tryCompare(greeter, "showProgress", 1);

568− }

569−

570− if (data.app) {

571− dragLauncherIntoView();

572− tapOnAppIconInLauncher();

573− }

574−

575− if (data.launcher) {

576− dragLauncherIntoView();

577− }

578−

579− if (data.indicators) {

580− showIndicators();

581− }

582−

583− var dash = findChild(shell, "dash");

584− tryCompare(dash, "shown", data.expectedShown);

585− }

586−

587 function test_focusRequestedHidesGreeter() {

351 function test_focusRequestedHidesGreeter() {

588 var greeter = findChild(shell, "greeter");

352 var greeter = findChild(shell, "greeter");

589

353

@@ -592,10 +356,9 @@ Item {

592 tryCompareFunction(function() { return app.surface != null }, true);

356 tryCompareFunction(function() { return app.surface != null }, true);

593

357

594 // Minimize the application we just launched

358 // Minimize the application we just launched

595− swipeFromLeftEdge(units.gu(27));

359+ swipeFromLeftEdge(units.gu(26) + 1);

596

360

597− // Wait for the whole UI to settle down

361+ waitUntilDashIsFocused();

598− waitUntilApplicationWindowIsFullyHidden();

599

362

600 greeter.show();

363 greeter.show();

601 tryCompare(greeter, "showProgress", 1);

364 tryCompare(greeter, "showProgress", 1);

@@ -611,8 +374,9 @@ Item {

611

374

612 showIndicators();

375 showIndicators();

613

376

377+ var oldCount = ApplicationManager.count;

614 ApplicationManager.startApplication("camera-app");

378 ApplicationManager.startApplication("camera-app");

615− tryCompare(ApplicationManager, "count", 1);

379+ tryCompare(ApplicationManager, "count", oldCount + 1);

616

380

617 tryCompare(indicators, "fullyClosed", true);

381 tryCompare(indicators, "fullyClosed", true);

618 }

382 }

@@ -621,6 +385,7 @@ Item {

621 function test_showGreeterDBusCall() {

385 function test_showGreeterDBusCall() {

622 var greeter = findChild(shell, "greeter")

386 var greeter = findChild(shell, "greeter")

623 tryCompare(greeter, "showProgress", 0)

387 tryCompare(greeter, "showProgress", 0)

388+ waitForRendering(greeter);

624 LightDM.Greeter.showGreeter()

389 LightDM.Greeter.showGreeter()

625 tryCompare(greeter, "showProgress", 1)

390 tryCompare(greeter, "showProgress", 1)

626 }

391 }

@@ -629,6 +394,7 @@ Item {

629 sessionSpy.clear()

394 sessionSpy.clear()

630

395

631 var greeter = findChild(shell, "greeter")

396 var greeter = findChild(shell, "greeter")

397+ waitForRendering(greeter)

632 greeter.show()

398 greeter.show()

633 tryCompare(greeter, "showProgress", 1)

399 tryCompare(greeter, "showProgress", 1)

634

400

@@ -649,5 +415,26 @@ Item {

649 ApplicationManager.requestFocusApplication("gallery-app");

415 ApplicationManager.requestFocusApplication("gallery-app");

650 tryCompare(panel, "fullscreenMode", false);

416 tryCompare(panel, "fullscreenMode", false);

651 }

417 }

418+

419+ function test_leftEdgeDragFullscreen() {

420+ var panel = findChild(shell, "panel");

421+ tryCompare(panel, "fullscreenMode", false)

422+

423+ ApplicationManager.startApplication("camera-app");

424+ tryCompare(panel, "fullscreenMode", true)

425+

426+ var touchStartX = 2;

427+ var touchStartY = shell.height / 2;

428+

429+ touchFlick(shell, touchStartX, touchStartY, units.gu(2), touchStartY, true, false);

430+

431+ compare(panel.fullscreenMode, true);

432+

433+ touchFlick(shell, units.gu(2), touchStartY, units.gu(10), touchStartY, false, false);

434+

435+ tryCompare(panel, "fullscreenMode", false);

436+

437+ touchRelease(shell);

438+ }

652 }

439 }

653}

440}

tests/qmltests/tst_ShellWithPin.qml+4−37

@@ -58,40 +58,6 @@ Item {

58 when: windowShown

59

60 function initTestCase() {

61− var ok = false;

62− var attempts = 0;

63− var maxAttempts = 1000;

64−

65− // Qt loads a qml scene asynchronously. So early on, some findChild() calls made in

66− // tests may fail because the desired child item wasn't loaded yet.

67− // Thus here we try to ensure the scene has been fully loaded before proceeding with the tests.

68− // As I couldn't find an API in QQuickView & friends to tell me that the scene is 100% loaded

69− // (all items instantiated, etc), I resort to checking the existence of some key items until

70− // repeatedly until they're all there.

71− do {

72− var dashContentList = findChild(shell, "dashContentList");

73− waitForRendering(dashContentList);

74− var homeLoader = findChild(dashContentList, "clickscope loader");

75− ok = homeLoader !== null

76− && homeLoader.item !== undefined;

77−

78− var greeter = findChild(shell, "greeter");

79− ok &= greeter !== null;

80−

81− var launcherPanel = findChild(shell, "launcherPanel");

82− ok &= launcherPanel !== null;

83−

84− attempts++;

85− if (!ok) {

86− console.log("Attempt " + attempts + " failed. Waiting a bit before trying again.");

87− // wait a bit before retrying

88− wait(100);

89− } else {

90− console.log("All seem fine after " + attempts + " attempts.");

91− }

92− } while (!ok && attempts <= maxAttempts);

93−

94− verify(ok);

95

61

96 sessionSpy.target = findChild(shell, "greeter")

62 sessionSpy.target = findChild(shell, "greeter")

97 }

63 }

@@ -110,10 +76,11 @@ Item {

110 }

76 }

111

77

112 function killApps() {

78 function killApps() {

113− while (ApplicationManager.count > 0) {

79+ while (ApplicationManager.count > 1) {

80+ var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0

114− ApplicationManager.stopApplication(ApplicationManager.get(0).appId)

81+ ApplicationManager.stopApplication(ApplicationManager.get(appIndex).appId);

115 }

82 }

116− compare(ApplicationManager.count, 0)

83+ compare(ApplicationManager.count, 1)

117 }

84 }

118

85

119 function swipeAwayGreeter() {

86 function swipeAwayGreeter() {