Unity 8

Merge lp:~zeller-benjamin/unity8/scope-url into lp:unity8

  1. scope-url
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1188
Merged at revision: 1216
Proposed branch: lp:~zeller-benjamin/unity8/scope-url
Merge into: lp:unity8
Diff against target: 59 lines (+17/-0)
5 files modified
data/CMakeLists.txt (+3/-0)
data/unity8-dash.conf (+2/-0)
data/unity8-dash.url-dispatcher (+6/-0)
debian/unity8.install (+1/-0)
qml/Dash/DashContent.qml (+5/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/unity8/scope-url
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+231749@code.launchpad.net

Commit message

Add support for scope:// url in the dash

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
lp:~ted/url-dispatcher/scope-uri needed to work, but can land separately

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1185
http://jenkins.qa.ubuntu.com/job/unity8-ci/4060/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1061/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5169/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4060/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1186
http://jenkins.qa.ubuntu.com/job/unity8-ci/4062/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3946
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5193
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11946

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4062/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Hey, you can drop the .url-dispatcher file after all, scope:// will be handled in a custom way towards unity8-dash.

review: Needs Fixing
Revision history for this message
Michał Sawicz (saviq) wrote :

Apparently Ted still will parse the file, just the activation will be special.

review: Abstain
Revision history for this message
Ted Gould (ted) wrote :

Actually, I think having the url-dispatcher file is a good idea. Then the dash can configure which URLs it wants in case others are needed later. I'll just special case the unity8-dash name instead of which URL patterns are associated with it.

Revision history for this message
Michał Sawicz (saviq) wrote :

Huum, can't see how to test this atm, we'd need to mock UITK ;|

There should probably be a platform test for this instead.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Is running now, only failed test before is fixed now in trunk

review: Approve
Revision history for this message
Michał Sawicz (saviq) :
review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1187
http://jenkins.qa.ubuntu.com/job/unity8-ci/4112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12146

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4112/rebuild

review: Approve (continuous-integration)
lp:~zeller-benjamin/unity8/scope-url updated
1188. By Benjamin Zeller

Move url-dispatcher file from common to unity package

Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1188
http://jenkins.qa.ubuntu.com/job/unity8-ci/4122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5347
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12187

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4122/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2014-07-23 06:54:10 +0000
+++ data/CMakeLists.txt 2014-08-27 08:03:23 +0000
@@ -8,3 +8,6 @@
8 ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop8 ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop
9 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications9 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
10 )10 )
11
12# install url dispatcher files
13install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
1114
=== modified file 'data/unity8-dash.conf'
--- data/unity8-dash.conf 2014-08-06 08:17:31 +0000
+++ data/unity8-dash.conf 2014-08-27 08:03:23 +0000
@@ -10,6 +10,8 @@
1010
11respawn11respawn
1212
13env APP_ID=unity8-dash
14
13pre-start script15pre-start script
14 if [ -z "$UNITY_SCOPES_LIST" ]; then16 if [ -z "$UNITY_SCOPES_LIST" ]; then
15 # FIXME: remove once we have this in dconf17 # FIXME: remove once we have this in dconf
1618
=== added file 'data/unity8-dash.url-dispatcher'
--- data/unity8-dash.url-dispatcher 1970-01-01 00:00:00 +0000
+++ data/unity8-dash.url-dispatcher 2014-08-27 08:03:23 +0000
@@ -0,0 +1,6 @@
1[
2 {
3 "protocol": "scope"
4 }
5]
6
07
=== modified file 'debian/unity8.install'
--- debian/unity8.install 2014-07-23 16:25:19 +0000
+++ debian/unity8.install 2014-08-27 08:03:23 +0000
@@ -10,3 +10,4 @@
10usr/share/unity8/Panel10usr/share/unity8/Panel
11usr/share/unity8/Shell.qml11usr/share/unity8/Shell.qml
12usr/share/unity8/Stages12usr/share/unity8/Stages
13usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
1314
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml 2014-08-08 08:47:36 +0000
+++ qml/Dash/DashContent.qml 2014-08-27 08:03:23 +0000
@@ -52,6 +52,11 @@
52 }52 }
53 }53 }
5454
55 Connections {
56 target: UriHandler
57 onOpened: dashContentList.currentItem.theScope.performQuery(uris[0])
58 }
59
55 function setCurrentScopeAtIndex(index, animate, reset) {60 function setCurrentScopeAtIndex(index, animate, reset) {
56 // if the scopes haven't loaded yet, then wait until they are.61 // if the scopes haven't loaded yet, then wait until they are.
57 if (!scopes.loaded) {62 if (!scopes.loaded) {

Subscribers

People subscribed via source and target branches