f2f6907 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge from trunk

commitf2f690767e867791d4de70d492cff5fcfeff870e authorMichael Terry <michael.terry@canonical.com> dateThu 19 Sep 2013, 15:33 (13 years ago) parent9500bbd 9cc9b74

25 files changed+731−58

compare with xenial

unifiedsplit

Components/VolumeControl.qml+5−20 Dash/GenericScopeView.qml+4−1 MouseTouchAdaptor.cpp+29−12 MouseTouchAdaptor.h+2−5 Shell.qml+20−10 debian/unity8-private.install+1 main.cpp−1 plugins/CMakeLists.txt+1 plugins/SessionBroadcast/CMakeLists.txt+13 plugins/SessionBroadcast/SessionBroadcast.cpp+41 plugins/SessionBroadcast/SessionBroadcast.h+41 plugins/SessionBroadcast/plugin.cpp+35 plugins/SessionBroadcast/plugin.h+33 plugins/SessionBroadcast/qmldir+3 plugins/Unity/Launcher/launchermodel.cpp+12−3 po/is.po+256 tests/autopilot/unity8/application_lifecycle/__init__.py+20 tests/autopilot/unity8/application_lifecycle/tests/__init__.py tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+136 tests/autopilot/unity8/shell/__init__.py+10 tests/autopilot/unity8/shell/tests/__init__.py+4−1 tests/plugins/Unity/Launcher/launchermodeltest.cpp+61−2 tests/qmltests/Dash/tst_DashContent.qml+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+3 tests/uqmlscene/main.cpp−2

Components/VolumeControl.qml+5−20

@@ -21,37 +21,22 @@ Item {

2121 id: root

2222 objectName: "volumeControl"

2323 visible: false

24− property int volume

2524

2625 QDBusActionGroup {

2726 id: actionGroup

2827 busType: 1

29− busName: "com.canonical.settings.sound"

30− objectPath: "/com/canonical/settings/sound"

28+ busName: "com.canonical.indicator.sound"

29+ objectPath: "/com/canonical/indicator/sound"

3130

32− property variant actionObject: action("volume")

33− property variant serverVolume: actionObject.valid ? actionObject.state: 0

34− }

35−

36− Binding {

37− target: root

38− property: "volume"

39− value: actionGroup.serverVolume * 100

40− }

41−

42− onVolumeChanged: {

43− if (actionGroup.serverVolume != volume) {

44− var targetVolume = Math.min(1, Math.max(0, volume / 100));

45− actionGroup.actionObject.updateState(targetVolume);

46− }

31+ property variant actionObject: action("scroll")

4732 }

4833

4934 function volumeUp() {

50− actionGroup.actionObject.updateState(Math.min(1, volume/100 + 0.10));

35+ actionGroup.actionObject.activate(1);

5136 }

5237

5338 function volumeDown() {

54− actionGroup.actionObject.updateState(Math.max(0, volume/100 - 0.10));

39+ actionGroup.actionObject.activate(-1);

5540 }

5641

5742 Component.onCompleted: actionGroup.start()

Dash/GenericScopeView.qml+4−1

@@ -21,10 +21,11 @@ import "../Components/ListItems" as ListItems

2121

2222ScopeView {

2323 id: scopeView

24− property alias previewShown: previewLoader.onScreen

24+ readonly property alias previewShown: previewLoader.onScreen

2525

2626 onIsCurrentChanged: {

2727 pageHeader.resetSearch();

28+ previewLoader.open = false;

2829 }

2930

3031 onMovementStarted: categoryView.showHeader()

@@ -179,6 +180,7 @@ ScopeView {

179180 case "grid": {

180181 switch (contentType) {

181182 case "video": return "Generic/GenericFilterGridPotrait.qml";

183+ case "music": return "Music/MusicFilterGrid.qml";

182184 default: return "Generic/GenericFilterGrid.qml";

183185 }

184186 }

@@ -246,6 +248,7 @@ ScopeView {

246248 }

247249

248250 Loader {

251+ objectName: "previewLoader"

249252 id: previewLoader

250253 property var previewData

251254 height: effect.bottomGapPx - effect.topGapPx

MouseTouchAdaptor.cpp+29−12

@@ -39,24 +39,16 @@ Qt::MouseButton translateMouseButton(xcb_button_t detail)

3939} // end of anonymous namespace

4040

4141MouseTouchAdaptor::MouseTouchAdaptor()

42− : m_targetWindow(0)

43− , m_leftButtonIsPressed(false)

42+ : m_leftButtonIsPressed(false)

4443{

4544 m_touchDevice = new QTouchDevice;

4645 m_touchDevice->setType(QTouchDevice::TouchScreen);

4746 QWindowSystemInterface::registerTouchDevice(m_touchDevice);

4847}

4948

50−void MouseTouchAdaptor::setTargetWindow(QWindow *window)

51−{

52− m_targetWindow = window;

53−}

54−

5549bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,

5650 void * message, long * /*result*/)

5751{

58− Q_ASSERT(m_targetWindow);

59−

6052 if (eventType != "xcb_generic_event_t") {

6153 // wrong backend.

6254 qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");

@@ -91,7 +83,9 @@ bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)

9183

9284 QPoint windowPos(pressEvent->event_x, pressEvent->event_y);

9385

94− QTouchEventSequence touchEvent = QTest::touchEvent(m_targetWindow, m_touchDevice,

86+ QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));

87+

88+ QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,

9589 false /* autoCommit */);

9690 touchEvent.press(0 /* touchId */, windowPos);

9791 touchEvent.commit(false /* processEvents */);

@@ -110,7 +104,9 @@ bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseE

110104

111105 QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);

112106

113− QTouchEventSequence touchEvent = QTest::touchEvent(m_targetWindow, m_touchDevice,

107+ QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));

108+

109+ QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,

114110 false /* autoCommit */);

115111 touchEvent.release(0 /* touchId */, windowPos);

116112 touchEvent.commit(false /* processEvents */);

@@ -127,10 +123,31 @@ bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)

127123

128124 QPoint windowPos(event->event_x, event->event_y);

129125

130− QTouchEventSequence touchEvent = QTest::touchEvent(m_targetWindow, m_touchDevice,

126+ QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));

127+

128+ QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,

131129 false /* autoCommit */);

132130 touchEvent.move(0 /* touchId */, windowPos);

133131 touchEvent.commit(false /* processEvents */);

134132

135133 return true;

136134}

135+

136+QWindow *MouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)

137+{

138+ QWindowList windowList = QGuiApplication::topLevelWindows();

139+ QWindow *foundWindow = nullptr;

140+

141+ int i = 0;

142+ while (!foundWindow && i < windowList.count()) {

143+ QWindow *window = windowList[i];

144+ if (window->winId() == windowId) {

145+ foundWindow = window;

146+ } else {

147+ ++i;

148+ }

149+ }

150+

151+ Q_ASSERT(foundWindow);

152+ return foundWindow;

153+}

MouseTouchAdaptor.h+2−5

@@ -20,11 +20,11 @@

2020#define MOUSE_TOUCH_ADAPTOR_H

2121

2222#include <QtCore/QAbstractNativeEventFilter>

23+#include <QWindow>

2324#include <xcb/xcb.h>

2425

2526class QMouseEvent;

2627class QTouchDevice;

27−class QWindow;

2828

2929// Transforms QMouseEvents into single-finger QTouchEvents.

3030class MouseTouchAdaptor : public QAbstractNativeEventFilter {

@@ -32,9 +32,6 @@ class MouseTouchAdaptor : public QAbstractNativeEventFilter {

3232public:

3333 MouseTouchAdaptor();

3434

35− // The window that will receive the generated QTouchEvents

36− void setTargetWindow(QWindow *window);

37−

3835 // Filters mouse events and posts the equivalent QTouchEvents.

3936 virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result);

4037

@@ -43,8 +40,8 @@ private:

4340 bool handleButtonPress(xcb_button_press_event_t *pressEvent);

4441 bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);

4542 bool handleMotionNotify(xcb_motion_notify_event_t *event);

43+ QWindow *findQWindowWithXWindowID(WId windowId);

4644

47− QWindow *m_targetWindow;

4845 QTouchDevice *m_touchDevice;

4946 bool m_leftButtonIsPressed;

5047};

Shell.qml+20−10

@@ -23,6 +23,7 @@ import Ubuntu.Gestures 0.1

2323import Unity.Launcher 0.1

2424import LightDM 0.1 as LightDM

2525import Powerd 0.1

26+import SessionBroadcast 0.1

2627import "Dash"

2728import "Greeter"

2829import "Launcher"

@@ -83,6 +84,8 @@ FocusScope {

8384

8485 readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication

8586 || !!applicationManager.sideStageFocusedApplication

87+ // Used for autopilot testing.

88+ readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId

8689

8790 readonly property bool fullscreenMode: {

8891 if (greeter.shown || lockscreen.shown) {

@@ -545,6 +548,17 @@ FocusScope {

545548 }

546549 }

547550

551+ function showHome() {

552+ greeter.hide()

553+ // Animate if moving between application and dash

554+ if (!stages.shown) {

555+ dash.setCurrentScope("home.scope", true, false)

556+ } else {

557+ dash.setCurrentScope("home.scope", false, false)

558+ }

559+ stages.hide()

560+ }

561+

548562 Item {

549563 id: overlay

550564

@@ -632,16 +646,7 @@ FocusScope {

632646 width: parent.width

633647 dragAreaWidth: shell.edgeSize

634648 available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled

635− onDashItemSelected: {

636− greeter.hide()

637− // Animate if moving between application and dash

638− if (!stages.shown) {

639− dash.setCurrentScope("home.scope", true, false)

640− } else {

641− dash.setCurrentScope("home.scope", false, false)

642− }

643− stages.hide();

644− }

649+ onDashItemSelected: showHome()

645650 onDash: {

646651 if (stages.shown) {

647652 dash.setCurrentScope("applications.scope", true, false)

@@ -749,4 +754,9 @@ FocusScope {

749754 indicators: panel.indicators

750755 underlay: underlay

751756 }

757+

758+ Connections {

759+ target: SessionBroadcast

760+ onShowHome: showHome()

761+ }

752762}

debian/unity8-private.install+1

@@ -3,6 +3,7 @@ usr/lib/*/unity8/qml/HudClient

33usr/lib/*/unity8/qml/LightDM

44usr/lib/*/unity8/qml/ListViewWithPageHeader

55usr/lib/*/unity8/qml/Powerd

6+usr/lib/*/unity8/qml/SessionBroadcast

67usr/lib/*/unity8/qml/Ubuntu

78usr/lib/*/unity8/qml/Unity

89usr/lib/*/unity8/qml/Utils

main.cpp−1

@@ -144,7 +144,6 @@ int startShell(int argc, const char** argv, void* server)

144144 MouseTouchAdaptor *mouseTouchAdaptor = 0;

145145 if (args.contains(QLatin1String("-mousetouch"))) {

146146 mouseTouchAdaptor = new MouseTouchAdaptor;

147− mouseTouchAdaptor->setTargetWindow(view);

148147 application->installNativeEventFilter(mouseTouchAdaptor);

149148 }

150149

plugins/CMakeLists.txt+1

@@ -3,6 +3,7 @@ add_subdirectory(HudClient)

33add_subdirectory(LightDM)

44add_subdirectory(ListViewWithPageHeader)

55add_subdirectory(Powerd)

6+add_subdirectory(SessionBroadcast)

67add_subdirectory(Ubuntu)

78add_subdirectory(Unity)

89add_subdirectory(Utils)

plugins/SessionBroadcast/CMakeLists.txtnew file+13

@@ -0,0 +1,13 @@

1+include(Plugins)

3+add_definitions(-DSM_BUSNAME=systemBus)

5+add_library(SessionBroadcast-qml MODULE

6+ SessionBroadcast.cpp

7+ plugin.cpp

8+ )

10+qt5_use_modules(SessionBroadcast-qml DBus Qml)

11+

12+export_qmlfiles(SessionBroadcast SessionBroadcast)

13+export_qmlplugin(SessionBroadcast 0.1 SessionBroadcast TARGETS SessionBroadcast-qml)

plugins/SessionBroadcast/SessionBroadcast.cppnew file+41

@@ -0,0 +1,41 @@

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+ * Author: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "SessionBroadcast.h"

20+#include <QDBusConnection>

21+

22+SessionBroadcast::SessionBroadcast(QObject* parent)

23+ : QObject(parent)

24+{

25+ auto connection = QDBusConnection::SM_BUSNAME();

26+

27+ connection.connect("com.canonical.Unity.Greeter.Broadcast",

28+ "/com/canonical/Unity/Greeter/Broadcast",

29+ "com.canonical.Unity.Greeter.Broadcast",

30+ "ShowHome",

31+ this,

32+ SLOT(onShowHome(const QString &)));

33+}

34+

35+void SessionBroadcast::onShowHome(const QString &username)

36+{

37+ // Only listen to requests meant for us

38+ if (username == qgetenv("USER")) {

39+ Q_EMIT showHome();

40+ }

41+}

plugins/SessionBroadcast/SessionBroadcast.hnew file+41

@@ -0,0 +1,41 @@

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 Terry <michael.terry@canonical.com>

17+ */

18+

19+#ifndef UNITY_SESSIONBROADCAST_H

20+#define UNITY_SESSIONBROADCAST_H

21+

22+#include <QObject>

23+#include <QString>

24+

25+class QDBusInterface;

26+

27+class SessionBroadcast: public QObject

28+{

29+ Q_OBJECT

30+

31+public:

32+ explicit SessionBroadcast(QObject *parent = 0);

33+

34+Q_SIGNALS:

35+ void showHome();

36+

37+private Q_SLOTS:

38+ void onShowHome(const QString &username);

39+};

40+

41+#endif

plugins/SessionBroadcast/plugin.cppnew file+35

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

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 Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "plugin.h"

20+#include "SessionBroadcast.h"

21+

22+#include <QtQml>

23+

24+static QObject *broadcast_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25+{

26+ Q_UNUSED(engine)

27+ Q_UNUSED(scriptEngine)

28+ return new SessionBroadcast();

29+}

30+

31+void SessionBroadcastPlugin::registerTypes(const char *uri)

32+{

33+ Q_ASSERT(uri == QLatin1String("SessionBroadcast"));

34+ qmlRegisterSingletonType<SessionBroadcast>(uri, 0, 1, "SessionBroadcast", broadcast_provider);

35+}

plugins/SessionBroadcast/plugin.hnew file+33

@@ -0,0 +1,33 @@

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 Terry <michael.terry@canonical.com>

17+ */

18+

19+#ifndef UNITY_SESSIONBROADCAST_PLUGIN_H

20+#define UNITY_SESSIONBROADCAST_PLUGIN_H

21+

22+#include <QQmlExtensionPlugin>

23+

24+class SessionBroadcastPlugin : public QQmlExtensionPlugin

25+{

26+ Q_OBJECT

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

28+

29+public:

30+ void registerTypes(const char *uri);

31+};

32+

33+#endif

plugins/SessionBroadcast/qmldirnew file+3

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

1+module SessionBroadcast

2+plugin SessionBroadcast-qml

3+typeinfo plugin.qmltypes

plugins/Unity/Launcher/launchermodel.cpp+12−3

@@ -115,9 +115,11 @@ void LauncherModel::move(int oldIndex, int newIndex)

115115 m_list.move(oldIndex, newIndex);

116116 endMoveRows();

117117

118− storeAppList();

119−

120− pin(m_list.at(newIndex)->appId());

118+ if (!m_list.at(newIndex)->pinned()) {

119+ pin(m_list.at(newIndex)->appId());

120+ } else {

121+ storeAppList();

122+ }

121123}

122124

123125void LauncherModel::pin(const QString &appId, int index)

@@ -146,6 +148,8 @@ void LauncherModel::pin(const QString &appId, int index)

146148 m_list.insert(index, item);

147149 endInsertRows();

148150 }

151+

152+ storeAppList();

149153}

150154

151155void LauncherModel::requestRemove(const QString &appId)

@@ -155,6 +159,11 @@ void LauncherModel::requestRemove(const QString &appId)

155159 return;

156160 }

157161

162+ if (m_appManager->findApplication(appId)) {

163+ m_list.at(index)->setPinned(false);

164+ return;

165+ }

166+

158167 beginRemoveRows(QModelIndex(), index, index);

159168 m_list.takeAt(index)->deleteLater();

160169 endRemoveRows();

po/is.ponew file+256

@@ -0,0 +1,256 @@

1+# Icelandic translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.

5+#

6+msgid ""

7+msgstr ""

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

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

10+"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11+"PO-Revision-Date: 2013-09-18 16:22+0000\n"

12+"Last-Translator: Andri Thorlacius <Unknown>\n"

13+"Language-Team: Icelandic <is@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+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2013-09-19 05:14+0000\n"

19+"X-Generator: Launchpad (build 16765)\n"

20+

21+#: Applications/applications.js:23

22+msgid "Phone"

23+msgstr "Sími"

24+

25+#: Applications/applications.js:29

26+msgid "Camera"

27+msgstr "Myndavél"

28+

29+#: Applications/applications.js:35

30+msgid "Gallery"

31+msgstr "Myndasafn"

32+

33+#: Applications/applications.js:40

34+msgid "Facebook"

35+msgstr "Facebook"

36+

37+#: Applications/applications.js:46

38+msgid "Browser"

39+msgstr "Vafri"

40+

41+#: Applications/applications.js:51

42+msgid "Twitter"

43+msgstr "Twitter"

44+

45+#: Applications/applications.js:57

46+msgid "GMail"

47+msgstr "GMail"

48+

49+#: Applications/applications.js:62

50+msgid "Weather"

51+msgstr "Veður"

52+

53+#: Applications/applications.js:68

54+msgid "Notepad"

55+msgstr "Skrifblokk"

56+

57+#: Applications/applications.js:74

58+msgid "Calendar"

59+msgstr "Dagatal"

60+

61+#: Applications/applications.js:80

62+msgid "Media Player"

63+msgstr "Margmiðlunarspilari"

64+

65+#: Applications/applications.js:86

66+msgid "Evernote"

67+msgstr "Evernote"

68+

69+#: Applications/applications.js:91

70+msgid "Map"

71+msgstr "Kort"

72+

73+#: Applications/applications.js:96

74+msgid "Pinterest"

75+msgstr "Pinterest"

76+

77+#: Applications/applications.js:101

78+msgid "SoundCloud"

79+msgstr "SoundCloud"

80+

81+#: Applications/applications.js:106

82+msgid "Wikipedia"

83+msgstr "Wikipedia"

84+

85+#: Applications/applications.js:111

86+msgid "YouTube"

87+msgstr "YouTube"

88+

89+#: Components/EdgeDemoOverlay.qml:145

90+msgid "Skip intro"

91+msgstr "Hoppa yfir kynningu"

92+

93+#: Components/EdgeDemo.qml:98

94+msgid "Right edge"

95+msgstr "Hægri brún"

96+

97+#: Components/EdgeDemo.qml:99

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+"Prufaðu að renna puttanum frá hægri brúninni til að aflæsa símanum þínum."

101+

102+#: Components/EdgeDemo.qml:135

103+msgid "Top edge"

104+msgstr "Efri brún"

105+

106+#: Components/EdgeDemo.qml:136

107+msgid "Try swiping from the top edge to access the indicators"

108+msgstr ""

109+

110+#: Components/EdgeDemo.qml:161

111+msgid "Close"

112+msgstr "Loka"

113+

114+#: Components/EdgeDemo.qml:162

115+msgid "Swipe up again to close the settings screen"

116+msgstr ""

117+

118+#: Components/EdgeDemo.qml:189

119+msgid "Left edge"

120+msgstr "Vinstri brún"

121+

122+#: Components/EdgeDemo.qml:190

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

124+msgstr ""

125+

126+#: Components/EdgeDemo.qml:217

127+msgid "Well done"

128+msgstr "Vel gert"

129+

130+#: Components/EdgeDemo.qml:218

131+msgid "You have now mastered the edge gestures and can start using the phone"

132+msgstr ""

133+

134+#: Components/PageHeader.qml:298

135+msgid "Recent searches"

136+msgstr "Nýlegar leitir"

137+

138+#. TRANSLATORS: Number of persons who rated this app

139+#: Dash/Apps/AppInfo.qml:73

140+#, qt-format

141+msgid "(%1)"

142+msgstr "(%1)"

143+

144+#. TRANSLATORS: Number of persons who wrote reviews for this app

145+#: Dash/Apps/AppInfo.qml:85

146+#, qt-format

147+msgid "%1 review"

148+msgid_plural "%1 reviews"

149+msgstr[0] "%1 ummæli"

150+msgstr[1] "%1 ummæli"

151+

152+#: Dash/Apps/AppPreview.qml:175

153+msgid "Rate this"

154+msgstr "Gefa þessu einkunn"

155+

156+#: Dash/Apps/AppReviews.qml:72

157+msgid "Add a review"

158+msgstr "Gefa umsögn"

159+

160+#: Dash/Apps/AppReviews.qml:84

161+msgid "Review"

162+msgstr "Umsögn"

163+

164+#: Dash/Apps/AppReviews.qml:118

165+msgid "Send"

166+msgstr "Senda"

167+

168+#: Dash/Apps/AppReviews.qml:136

169+msgid "Comments:"

170+msgstr "Athugasemdir:"

171+

172+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

173+msgid "Featured"

174+msgstr "Efst á baugi"

175+

176+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

177+msgid "Recent"

178+msgstr "Nýlegt"

179+

180+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

181+msgid "New Releases"

182+msgstr "Nýjar Útgáfur"

183+

184+#: Dash/DashMusic.qml:30

185+msgid "Top Charting"

186+msgstr "Topp Listi"

187+

188+#: Dash/DashMusic.qml:91

189+msgid "Music"

190+msgstr "Tónlist"

191+

192+#: Dash/DashVideos.qml:31

193+msgid "Popular Online"

194+msgstr "Vinsælt á Netinu"

195+

196+#: Dash/DashVideos.qml:146

197+msgid "Videos"

198+msgstr "Myndbönd"

199+

200+#: Dash/Video/VideoPreview.qml:130

201+msgid "Directed by:"

202+msgstr "Leikstýrt af:"

203+

204+#: Dash/Video/VideoPreview.qml:153

205+msgid "Starring:"

206+msgstr "Meðal leikara eru:"

207+

208+#: Dash/Video/VideoPreview.qml:176

209+msgid "Author:"

210+msgstr "Höfundur:"

211+

212+#: Greeter/Lockscreen.qml:134

213+msgid "Emergency Call"

214+msgstr "Neyðarsímtal"

215+

216+#: Greeter/PassphraseLockscreen.qml:59

217+#, qt-format

218+msgid "Hello %1"

219+msgstr "Hæ %1"

220+

221+#: Greeter/PassphraseLockscreen.qml:59

222+msgid "Hello"

223+msgstr "Hæ"

224+

225+#: Hud/HudParametrizedActionsPage.qml:132

226+msgid "Confirm"

227+msgstr "Staðfesta"

228+

229+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

230+msgid "Type or say a command"

231+msgstr "Skrifaðu eða segðu eitthvað"

232+

233+#: Hud/Hud.qml:84

234+msgid "Loading. Please Wait..."

235+msgstr "Hleð. Vinsamlegast Bíðið..."

236+

237+#: Hud/Hud.qml:89

238+msgid "Speak Now..."

239+msgstr "Talaðu Núna..."

240+

241+#: Hud/Hud.qml:94

242+msgid "Speaking..."

243+msgstr "Tala..."

244+

245+#: Panel/SearchIndicator.qml:27

246+msgid "Search"

247+msgstr "Leita"

248+

249+#: plugins/Unity/scope.cpp:317

250+msgid "Sorry, there is nothing that matches your search."

251+msgstr "Því miður, það var ekkert sem passaði við leitarorðið þitt."

252+

253+#: Shell.qml:429

254+#, qt-format

255+msgid "Please enter %1"

256+msgstr ""

tests/autopilot/unity8/application_lifecycle/__init__.pynew file+20

@@ -0,0 +1,20 @@

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+"""Tests for the application lifecycle base package."""

tests/autopilot/unity8/application_lifecycle/tests/__init__.pynew file

No changes to the content.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.pynew file+136

@@ -0,0 +1,136 @@

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+"""Tests for the application lifecycle."""

21+

22+from __future__ import absolute_import

23+

24+from unity8.shell import disable_qml_mocking

25+from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios

26+

27+from autopilot.matchers import Eventually

28+from autopilot.platform import model

29+from testtools.matchers import Equals, NotEquals

30+

31+import logging

32+

33+logger = logging.getLogger(__name__)

34+

35+

36+class ApplicationLifecycleTests(UnityTestCase):

37+

38+ scenarios = _get_device_emulation_scenarios()

39+

40+ def setUp(self):

41+ super(ApplicationLifecycleTests, self).setUp()

42+ if model() == "Desktop":

43+ self.skipTest("Test cannot be run on the desktop.")

44+

45+ def swipe_screen_from_right(self):

46+ qml_view = self.main_window.get_qml_view()

47+ width = qml_view.width

48+ height = qml_view.height

49+ start_x = width

50+ start_y = int(height/2)

51+ end_x = int(width/2)

52+ end_y = start_y

53+

54+ logger.info("Swiping screen from the right edge")

55+ self.touch.drag(start_x, start_y, end_x, end_y)

56+

57+ def _get_current_focused_app_id(self):

58+ return self._proxy.select_single("Shell").currentFocusedAppId

59+

60+ def _launch_app(self, app_name):

61+ """Launches the application *app_name*

62+

63+ Assumes that the desktop file resides at:

64+ /usr/share/applications/{app_name}.desktop

65+

66+ """

67+ desktop_file = "--desktop_file_hint="\

68+ "/usr/share/applications/{app_name}.desktop".format(

69+ app_name=app_name

70+ )

71+ return self.launch_test_application(

72+ app_name,

73+ desktop_file,

74+ "--stage_hint=main_stage",

75+ app_type='qt'

76+ )

77+

78+ @disable_qml_mocking

79+ def test_can_launch_application(self):

80+ """Must be able to launch an application."""

81+ self.launch_unity()

82+ self.main_window.get_greeter().swipe()

83+

84+ app = self._launch_app("messaging-app")

85+

86+ self.assertThat(app, NotEquals(None))

87+ self.assertThat(

88+ self._get_current_focused_app_id(),

89+ Eventually(Equals("messaging-app"))

90+ )

91+

92+ @disable_qml_mocking

93+ def test_can_launch_multiple_applications(self):

94+ """A second application launched must be focused."""

95+ self.launch_unity()

96+ self.main_window.get_greeter().swipe()

97+

98+ self._launch_app("messaging-app")

99+ self.assertThat(

100+ self._get_current_focused_app_id(),

101+ Eventually(Equals("messaging-app"))

102+ )

103+

104+ self._launch_app("address-book-app")

105+ self.assertThat(

106+ self._get_current_focused_app_id(),

107+ Eventually(Equals("address-book-app"))

108+ )

109+

110+ @disable_qml_mocking

111+ def test_app_moves_from_unfocused_to_focused(self):

112+ """An application that is in the unfocused state must be able to be

113+ brought back to the focused state.

114+

115+ """

116+ self.launch_unity()

117+ self.main_window.get_greeter().swipe()

118+

119+ self._launch_app("messaging-app")

120+ self.assertThat(

121+ self._get_current_focused_app_id(),

122+ Eventually(Equals("messaging-app"))

123+ )

124+

125+ self._launch_app("address-book-app")

126+ self.assertThat(

127+ self._get_current_focused_app_id(),

128+ Eventually(Equals("address-book-app"))

129+ )

130+

131+ self.swipe_screen_from_right()

132+

133+ self.assertThat(

134+ self._get_current_focused_app_id(),

135+ Eventually(Equals("messaging-app"))

136+ )

tests/autopilot/unity8/shell/__init__.py+10

@@ -36,3 +36,13 @@ def with_lightdm_mock(mock_type):

3636 return fn(*args, **kwargs)

3737 return wrapper

3838 return with_lightdm_mock_internal

39+

40+

41+def disable_qml_mocking(fn):

42+ """Simple decorator that disables the QML mocks from being loaded."""

43+ @wraps(fn)

44+ def wrapper(*args, **kwargs):

45+ tests_self = args[0]

46+ tests_self._qml_mock_enabled = False

47+ return fn(*args, **kwargs)

48+ return wrapper

tests/autopilot/unity8/shell/tests/__init__.py+4−1

@@ -86,6 +86,7 @@ class UnityTestCase(AutopilotTestCase):

8686

8787 self._proxy = None

8888 self._lightdm_mock_type = None

89+ self._qml_mock_enabled = True

8990 self.touch = Touch.create()

9091 self._setup_display_details()

9192

@@ -160,7 +161,9 @@ class UnityTestCase(AutopilotTestCase):

160161

161162 if self._lightdm_mock_type is None:

162163 self.patch_lightdm_mock()

163− self._setup_extra_mock_environment_patch()

164+

165+ if self._qml_mock_enabled:

166+ self._setup_extra_mock_environment_patch()

164167

165168 app_proxy = self.launch_test_application(

166169 binary_path,

tests/plugins/Unity/Launcher/launchermodeltest.cpp+61−2

@@ -62,7 +62,14 @@ public:

6262 return QString();

6363 }

6464 unity::shell::application::ApplicationInfoInterface *get(int index) const { return m_list.at(index); }

65− unity::shell::application::ApplicationInfoInterface *findApplication(const QString &) const { return nullptr; }

65+ unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const {

66+ Q_FOREACH(MockApp* app, m_list) {

67+ if (app->appId() == appId) {

68+ return app;

69+ }

70+ }

71+ return nullptr;

72+ }

6673 unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) { return nullptr; }

6774 bool stopApplication(const QString &) { return false; }

6875 bool focusApplication(const QString &appId) {

@@ -151,9 +158,54 @@ private Q_SLOTS:

151158 QCOMPARE(launcherModel->get(1)->pinned(), false);

152159 }

153160

161+ void testRemove_data() {

162+

163+ QTest::addColumn<bool>("pinned");

164+ QTest::addColumn<bool>("running");

165+

166+ QTest::newRow("non-pinned, running") << false << true;

167+ QTest::newRow("pinned, running") << true << false;

168+ QTest::newRow("pinned, non-running") << true << false;

169+ }

170+

154171 void testRemove() {

172+ QFETCH(bool, pinned);

173+ QFETCH(bool, running);

174+

175+ // In the beginning we always have two items

155176 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

156− launcherModel->requestRemove(launcherModel->get(0)->appId());

177+

178+ // pin one if required

179+ if (pinned) {

180+ launcherModel->pin(launcherModel->get(1)->appId());

181+ }

182+

183+ // stop it if required

184+ if (!running) {

185+ appManager->removeApplication(1);

186+ }

187+

188+ // Now remove it

189+ launcherModel->requestRemove(launcherModel->get(1)->appId());

190+

191+ if (running) {

192+ // both apps are running, both apps must still be here

193+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

194+

195+ // Item must be unpinned now

196+ QCOMPARE(launcherModel->get(1)->pinned(), false);

197+

198+ } else if (pinned) {

199+ // Item 1 must go away, item 0 is here to stay

200+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

201+ }

202+

203+ // done our checks. now stop the app if was still running

204+ if (running) {

205+ appManager->removeApplication(1);

206+ }

207+

208+ // It needs to go away in any case now

157209 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

158210 }

159211

@@ -181,6 +233,13 @@ private Q_SLOTS:

181233

182234 // quicklist needs to transform to remove item. trigger it and check it item goes away

183235 launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

236+ QCOMPARE(launcherModel->get(0)->pinned(), false);

237+

238+ // still needs to be here as the app is still here

239+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

240+ // close the app

241+ appManager->removeApplication(0);

242+ // Now it needs to go away

184243 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

185244 }

186245

tests/qmltests/Dash/tst_DashContent.qml+1−1

@@ -106,7 +106,7 @@ Item {

106106 contentEndReachedSpy.clear()

107107 clear_scope_status();

108108

109− // clear, wait for dahs to empty and load scopes.

109+ // clear, wait for dash to empty and load scopes.

110110 var dashContentList = findChild(dashContent, "dashContentList");

111111 verify(dashContentList != undefined)

112112 scopesModel.clear();

tests/qmltests/Dash/tst_GenericScopeView.qml+3

@@ -44,10 +44,13 @@ Item {

4444

4545 function test_isCurrent() {

4646 var pageHeader = findChild(genericScopeView, "pageHeader");

47+ var previewLoader = findChild(genericScopeView, "previewLoader");

4748 genericScopeView.isCurrent = true

4849 pageHeader.searchQuery = "test"

50+ previewLoader.open = true

4951 genericScopeView.isCurrent = false

5052 tryCompare(pageHeader, "searchQuery", "")

53+ tryCompare(genericScopeView, "previewShown", false);

5154 }

5255 }

5356 }

tests/uqmlscene/main.cpp−2

@@ -497,8 +497,6 @@ int main(int argc, char ** argv)

497497 }

498498

499499 if (window) {

500− mouseTouchAdaptor.setTargetWindow(window);

501−

502500 QSurfaceFormat surfaceFormat = window->requestedFormat();

503501 if (options.multisample)

504502 surfaceFormat.setSamples(16);