Add support for scope:// url in the dash Fixes: 1361349
Approved by: Michał Sawicz, PS Jenkins bot
commitb824684817c8a31dd36f3287163adea13c0d82e6
authorBenjamin Zeller <benjamin.zeller@canonical.com>
dateWed 27 Aug 2014, 15:35 (12 years ago)
parent674ddac471406a
data/CMakeLists.txt+3
@@ -8,3 +8,6 @@ install(FILES
88 ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop
99 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
1010 )
11+
12+# install url dispatcher files
13+install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
data/unity8-dash.conf+2
@@ -10,6 +10,8 @@ kill timeout 120
1010
1111respawn
1212
13+env APP_ID=unity8-dash
14+
1315pre-start script
1416 if [ -z "$UNITY_SCOPES_LIST" ]; then
1517 # FIXME: remove once we have this in dconf
data/unity8-dash.url-dispatchernew file+6
@@ -0,0 +1,6 @@
1+[
2+ {
3+ "protocol": "scope"
4+ }
5+]
6+
debian/unity8.install+1
@@ -10,3 +10,4 @@ usr/share/unity8/Launcher
1010usr/share/unity8/Panel
1111usr/share/unity8/Shell.qml
1212usr/share/unity8/Stages
13+usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
qml/Dash/DashContent.qml+5
@@ -52,6 +52,11 @@ Item {
5252 }
5353 }
5454
55+ Connections {
56+ target: UriHandler
57+ onOpened: dashContentList.currentItem.theScope.performQuery(uris[0])
58+ }
59+
5560 function setCurrentScopeAtIndex(index, animate, reset) {
5661 // if the scopes haven't loaded yet, then wait until they are.
5762 if (!scopes.loaded) {