git.iko.soy/unity8
on xenial help sign in
Merged and fixed
commite9ffb1e244d7aa35b7997c8fc8b5d16018c7bd91 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 11 Mar 2014, 15:10 (13 years ago) parent2f797dca4ded32
11 files changed+34−33
compare with xenial
unifiedsplit
debian/changelog+13 po/ug.po+1−2 qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6 qml/Dash/CardTool.qml−5 qml/Dash/PreviewListView.qml−5 qml/Dash/Previews/Preview.qml−11 tests/autopilot/unity8/shell/tests/test_hud.py → tests/autopilot/unity8/shell/tests/disabled_test_hud.py+2−2 tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktop tests/plugins/DashViews/organicgridtest.cpp+2−1 tests/plugins/DashViews/verticaljournaltest.cpp+2−1 tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+8
debian/changelog+13
@@ -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+
114unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low
215
316 [ Michael Terry ]
po/ug.po+1−2
@@ -6,12 +6,11 @@
66msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
9−"Report-Msgid-Bugs-To: \n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-02-13 18:37+0000\n"
1111"PO-Revision-Date: 2014-02-15 12:09+0000\n"
1212"Last-Translator: Gheyret T.Kenji <Unknown>\n"
1313"Language-Team: Uyghur <ug@li.org>\n"
14−"Language: \n"
1514"MIME-Version: 1.0\n"
1615"Content-Type: text/plain; charset=UTF-8\n"
1716"Content-Transfer-Encoding: 8bit\n"
qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6
@@ -48,24 +48,24 @@ ListModel {
4848 metadata: "subscope:applications.scope/applications-non-click.scope"
4949 }
5050 ListElement {
51− uri: "application://camera-app.desktop"
51+ uri: "appid://com.ubuntu.camera/camera/current-user-version"
5252 icon: "../../graphics/applicationIcons/camera.png"
5353 category: 0
5454 mimetype: "application/x-desktop"
5555 title: "Camera"
5656 comment: ""
57− dndUri: "file:///usr/share/applications/camera-app.desktop"
58− metadata: "subscope:applications.scope/applications-non-click.scope"
57+ dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
58+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
5959 }
6060 ListElement {
61− uri: "application://gallery-app.desktop"
61+ uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
6262 icon: "../../graphics/applicationIcons/gallery.png"
6363 category: 0
6464 mimetype: "application/x-desktop"
6565 title: "Gallery"
6666 comment: ""
67− dndUri: "file:///usr/share/applications/gallery.desktop"
68− metadata: "subscope:applications.scope/applications-non-click.scope"
67+ dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
68+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
6969 }
7070 ListElement {
7171 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
qml/Dash/CardTool.qml−5
@@ -65,11 +65,6 @@ Item {
6565 return layout;
6666 }
6767
68− /*!
69− \brief The category layout for this card tool
70− */
71− property string categoryLayout: template ? template["category-layout"] : ""
72−
7368 // FIXME: Saviq
7469 // Only way for the card below to actually be laid out completely.
7570 // If invisible or in "data" array, some components are not taken into account.
qml/Dash/PreviewListView.qml−5
@@ -115,11 +115,6 @@ Item {
115115 var previewStack = root.scope.preview(result);
116116 return previewStack.get(0);
117117 }
118−
119− // onClose: {
120− // previewListView.open = false
121− // }
122−
123118 }
124119
125120 MouseArea {
qml/Dash/Previews/Preview.qml−11
@@ -38,17 +38,6 @@ Item {
3838
3939 clip: true
4040
41− Connections {
42− target: shell.applicationManager || null
43− ignoreUnknownSignals: true
44− onMainStageFocusedApplicationChanged: {
45− root.close();
46− }
47− onSideStageFocusedApplicationChanged: {
48− root.close();
49− }
50− }
51−
5241 Binding {
5342 target: previewModel
5443 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):
163163 self.assertThat(hud.shown, Eventually(Equals(False)))
164164
165165 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.
167167
168168 Because when testing on the desktop running
169169 self.launch_application() will launch the application on the desktop
@@ -171,7 +171,7 @@ class TestHud(UnityTestCase, DragMixin):
171171
172172 """
173173 dash = self.main_window.get_dash()
174− icon = dash.get_application_icon('Camera')
174+ icon = dash.get_application_icon('Browser')
175175 self.touch.tap_object(icon)
176176
177177 # 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:
134134 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/organicgridtest.qml"));
135135
136136 view->show();
137− view->resize(470, 400);
138137 QTest::qWaitForWindowExposed(view);
138+ view->resize(470, 400);
139139
140140 grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));
141141 grid->setModel(model);
142+ QTRY_COMPARE(grid->width(), 470.);
142143
143144 checkInitialPositions();
144145 }
tests/plugins/DashViews/verticaljournaltest.cpp+2−1
@@ -135,11 +135,12 @@ private Q_SLOTS:
135135 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));
136136
137137 view->show();
138− view->resize(470, 400);
139138 QTest::qWaitForWindowExposed(view);
139+ view->resize(470, 400);
140140
141141 vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));
142142 vj->setModel(model);
143+ QTRY_COMPARE(vj->width(), 470.);
143144
144145 checkInitialPositions();
145146 }
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+8
@@ -103,6 +103,14 @@ void tst_DirectionalDragArea::init()
103103{
104104 GestureTest::init();
105105
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+
106114 fakeTimeSource.reset(new FakeTimeSource);
107115 fakeTimer = new FakeTimer(fakeTimeSource);
108116}