git.iko.soy/unity8
on xenial help sign in
Merged and fixed
e9ffb1eAndrea Cimitan
debian/changelog+13
compare with xenial
unifiedsplit
@@ -1,3 +1,16 @@
1+unity8 (7.84+14.04.20140306-0ubuntu1) trusty; urgency=low
2+
3+ [ Bill Filler ]
4+ * Convert gallery and camera to click
5+
6+ [ Michael Zanetti ]
7+ * Just disable HUD tests, without really disabling the HUD itself
8+
9+ [ Sergio Schvezov ]
10+ * Convert gallery and camera to click
11+
12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 06 Mar 2014 16:45:46 +0000
13+
1unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low
14unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low
2
15
3 [ Michael Terry ]
16 [ Michael Terry ]
po/ug.po+1−2
@@ -6,12 +6,11 @@
6msgid ""
6msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9−"Report-Msgid-Bugs-To: \n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-02-13 18:37+0000\n"
10"POT-Creation-Date: 2014-02-13 18:37+0000\n"
11"PO-Revision-Date: 2014-02-15 12:09+0000\n"
11"PO-Revision-Date: 2014-02-15 12:09+0000\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13"Language-Team: Uyghur <ug@li.org>\n"
13"Language-Team: Uyghur <ug@li.org>\n"
14−"Language: \n"
15"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6
@@ -48,24 +48,24 @@ ListModel {
48 metadata: "subscope:applications.scope/applications-non-click.scope"
48 metadata: "subscope:applications.scope/applications-non-click.scope"
49 }
49 }
50 ListElement {
50 ListElement {
51− uri: "application://camera-app.desktop"
51+ uri: "appid://com.ubuntu.camera/camera/current-user-version"
52 icon: "../../graphics/applicationIcons/camera.png"
52 icon: "../../graphics/applicationIcons/camera.png"
53 category: 0
53 category: 0
54 mimetype: "application/x-desktop"
54 mimetype: "application/x-desktop"
55 title: "Camera"
55 title: "Camera"
56 comment: ""
56 comment: ""
57− dndUri: "file:///usr/share/applications/camera-app.desktop"
57+ dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
58− metadata: "subscope:applications.scope/applications-non-click.scope"
58+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
59 }
59 }
60 ListElement {
60 ListElement {
61− uri: "application://gallery-app.desktop"
61+ uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
62 icon: "../../graphics/applicationIcons/gallery.png"
62 icon: "../../graphics/applicationIcons/gallery.png"
63 category: 0
63 category: 0
64 mimetype: "application/x-desktop"
64 mimetype: "application/x-desktop"
65 title: "Gallery"
65 title: "Gallery"
66 comment: ""
66 comment: ""
67− dndUri: "file:///usr/share/applications/gallery.desktop"
67+ dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
68− metadata: "subscope:applications.scope/applications-non-click.scope"
68+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
69 }
69 }
70 ListElement {
70 ListElement {
71 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
71 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
qml/Dash/CardTool.qml−5
@@ -65,11 +65,6 @@ Item {
65 return layout;
65 return layout;
66 }
66 }
67
67
68− /*!
69− \brief The category layout for this card tool
70− */
71− property string categoryLayout: template ? template["category-layout"] : ""
72−
73 // FIXME: Saviq
68 // FIXME: Saviq
74 // Only way for the card below to actually be laid out completely.
69 // Only way for the card below to actually be laid out completely.
75 // If invisible or in "data" array, some components are not taken into account.
70 // If invisible or in "data" array, some components are not taken into account.
qml/Dash/PreviewListView.qml−5
@@ -115,11 +115,6 @@ Item {
115 var previewStack = root.scope.preview(result);
115 var previewStack = root.scope.preview(result);
116 return previewStack.get(0);
116 return previewStack.get(0);
117 }
117 }
118−
119− // onClose: {
120− // previewListView.open = false
121− // }
122−
123 }
118 }
124
119
125 MouseArea {
120 MouseArea {
qml/Dash/Previews/Preview.qml−11
@@ -38,17 +38,6 @@ Item {
38
38
39 clip: true
39 clip: true
40
40
41− Connections {
42− target: shell.applicationManager || null
43− ignoreUnknownSignals: true
44− onMainStageFocusedApplicationChanged: {
45− root.close();
46− }
47− onSideStageFocusedApplicationChanged: {
48− root.close();
49− }
50− }
51−
52 Binding {
41 Binding {
53 target: previewModel
42 target: previewModel
54 property: "widgetColumnCount"
43 property: "widgetColumnCount"
tests/autopilot/unity8/shell/tests/test_hud.py → tests/autopilot/unity8/shell/tests/disabled_test_hud.pyrenamed+2−2
@@ -163,7 +163,7 @@ class TestHud(UnityTestCase, DragMixin):
163 self.assertThat(hud.shown, Eventually(Equals(False)))
163 self.assertThat(hud.shown, Eventually(Equals(False)))
164
164
165 def _launch_test_app_from_app_screen(self):
165 def _launch_test_app_from_app_screen(self):
166− """Launches the camera app using the Dash UI.
166+ """Launches the browser app using the Dash UI.
167
167
168 Because when testing on the desktop running
168 Because when testing on the desktop running
169 self.launch_application() will launch the application on the desktop
169 self.launch_application() will launch the application on the desktop
@@ -171,7 +171,7 @@ class TestHud(UnityTestCase, DragMixin):
171
171
172 """
172 """
173 dash = self.main_window.get_dash()
173 dash = self.main_window.get_dash()
174− icon = dash.get_application_icon('Camera')
174+ icon = dash.get_application_icon('Browser')
175 self.touch.tap_object(icon)
175 self.touch.tap_object(icon)
176
176
177 # Ensure application is open
177 # Ensure application is open
tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktoprenamed

The content is the same.

tests/plugins/DashViews/organicgridtest.cpp+2−1
@@ -134,11 +134,12 @@ private Q_SLOTS:
134 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/organicgridtest.qml"));
134 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/organicgridtest.qml"));
135
135
136 view->show();
136 view->show();
137− view->resize(470, 400);
138 QTest::qWaitForWindowExposed(view);
137 QTest::qWaitForWindowExposed(view);
138+ view->resize(470, 400);
139
139
140 grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
140 grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
141 grid->setModel(model);
141 grid->setModel(model);
142+ QTRY_COMPARE(grid->width(), 470.);
142
143
143 checkInitialPositions();
144 checkInitialPositions();
144 }
145 }
tests/plugins/DashViews/verticaljournaltest.cpp+2−1
@@ -135,11 +135,12 @@ private Q_SLOTS:
135 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));
135 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));
136
136
137 view->show();
137 view->show();
138− view->resize(470, 400);
139 QTest::qWaitForWindowExposed(view);
138 QTest::qWaitForWindowExposed(view);
139+ view->resize(470, 400);
140
140
141 vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
141 vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
142 vj->setModel(model);
142 vj->setModel(model);
143+ QTRY_COMPARE(vj->width(), 470.);
143
144
144 checkInitialPositions();
145 checkInitialPositions();
145 }
146 }
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+8
@@ -103,6 +103,14 @@ void tst_DirectionalDragArea::init()
103{
103{
104 GestureTest::init();
104 GestureTest::init();
105
105
106+ // We shouldn't need the three lines below, but a compiz/unity7
107+ // regression means we don't pass the test without them because
108+ // the window doesn't have the proper size. Can be removed in the
109+ // future if the regression is fixed and tests pass again
110+ m_view->resize(m_view->rootObject()->width(), m_view->rootObject()->height());
111+ QTRY_COMPARE(m_view->width(), (int)m_view->rootObject()->width());
112+ QTRY_COMPARE(m_view->height(), (int)m_view->rootObject()->height());
113+
106 fakeTimeSource.reset(new FakeTimeSource);
114 fakeTimeSource.reset(new FakeTimeSource);
107 fakeTimer = new FakeTimer(fakeTimeSource);
115 fakeTimer = new FakeTimer(fakeTimeSource);
108}
116}