From 526aaf57e6766bf5d0a2919ead36ae94546c0f13 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Fri, 15 Jul 2016 10:30:02 +0000 Subject: afm-launch.conf: handle URL, native, QML and hybrid types Provide a generic layout for all the application types and usecases that developers may want to use, and that we are going to provide as templates. Change-Id: I3f8100a16ea64262e0cb7a0e1ee38a24eab776e8 Signed-off-by: Manuel Bachmann --- conf/afm-launch.conf.in | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/conf/afm-launch.conf.in b/conf/afm-launch.conf.in index c5d4461..aa1812c 100644 --- a/conf/afm-launch.conf.in +++ b/conf/afm-launch.conf.in @@ -17,6 +17,8 @@ #----------------- mode local #----------------- + +# keep for compatibility purposes text/html /usr/bin/afb-daemon --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r --token=%S --sessiondir=%D/.afb-daemon /usr/bin/web-runtime http://localhost:%P/%c?token=%S @@ -24,12 +26,27 @@ text/html application/x-executable %r/%c +application/vnd.agl.url + /usr/bin/web-runtime %c + application/vnd.agl.service /usr/bin/afb-daemon --ldpaths=@CMAKE_INSTALL_FULL_LIBDIR@/afb:%r/%c --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r/htdocs --token=%S --sessiondir=%D/.afb-daemon -text/vnd.qt.qml +application/vnd.agl.native + /usr/bin/afb-daemon --ldpaths=@CMAKE_INSTALL_FULL_LIBDIR@/afb:%r/lib --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r/htdocs --token=%S --sessiondir=%D/.afb-daemon + %r/%c %P %S + +application/vnd.agl.qml /usr/bin/qt5/qmlscene -fullscreen -I %r -I %r/imports %r/%c +application/vnd.agl.qml.hybrid + /usr/bin/afb-daemon --ldpaths=@CMAKE_INSTALL_FULL_LIBDIR@/afb:%r/lib --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r/htdocs --token=%S --sessiondir=%D/.afb-daemon + /usr/bin/qt5/qmlscene %P %S -fullscreen -I %r -I %r/imports %r/%c + +application/vnd.agl.html.hybrid + /usr/bin/afb-daemon --ldpaths=@CMAKE_INSTALL_FULL_LIBDIR@/afb:%r/lib --mode=local --readyfd=%R --alias=/icons:%I --port=%P --rootdir=%r/htdocs --token=%S --sessiondir=%D/.afb-daemon + /usr/bin/web-runtime http://localhost:%P/%c?token=%S + #----------------- mode remote #----------------- -- cgit 1.2.3-korg