git.iko.soy/unity8
on xenial help sign in
Convert gallery and camera to click
commit8b4c8f61ac26ec8671c1923618a2bb179e0b8640 authorBill Filler <bill.filler@canonical.com> dateThu 6 Mar 2014, 16:45 (13 years ago) parent8851f0ebb55418
3 files changed+8−8
compare with xenial
unifiedsplit
qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6 tests/autopilot/unity8/shell/tests/test_hud.py+2−2 tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktop
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"
tests/autopilot/unity8/shell/tests/test_hud.py+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.