ivi-shell: bring back reference weston.ini
In commit d8e09afc9f
("tests: Convert ivi-shell-app-test.c to use
`weston_ini_setup`") the reference weston.ini for the ivi-shell was
removed, because it is not required by the test anymore.
The reference weston.ini still has value as an example for the ivi-shell
and how the ivi-shell-user-interface has to be configured. Retrieving
this information from the test case is not intuitive. Furthermore, the
file is still referenced by the ivi-shell/README, and the
configuration_data for generating the file was not fully removed.
Bring back the reference weston.ini for the ivi-shell and, while at it, cleanup
the configuration_data() to define only keys that are actually used in
weston.ivi.in.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
This commit is contained in:
parent
bfcb1adc14
commit
16e3f27fc7
|
@ -50,7 +50,10 @@ if get_option('shell-ivi')
|
|||
|
||||
ivi_test_config = configuration_data()
|
||||
ivi_test_config.set('bindir', dir_bin)
|
||||
ivi_test_config.set('libexecdir', dir_libexec)
|
||||
ivi_test_config.set('plugin_prefix', meson.current_build_dir())
|
||||
ivi_test_config.set('westondatadir', join_paths(dir_data, 'weston'))
|
||||
ivi_test_config.set('westondatadir', dir_data / 'weston')
|
||||
configure_file(
|
||||
input: 'weston.ini.in',
|
||||
output: 'weston.ini',
|
||||
configuration: ivi_test_config
|
||||
)
|
||||
endif
|
||||
|
|
|
@ -0,0 +1,98 @@
|
|||
[core]
|
||||
shell=ivi-shell.so
|
||||
modules=hmi-controller.so
|
||||
|
||||
[ivi-shell]
|
||||
ivi-shell-user-interface=weston-ivi-shell-user-interface
|
||||
|
||||
#developermode=true
|
||||
|
||||
cursor-theme=default
|
||||
cursor-size=32
|
||||
|
||||
base-layer-id=1000
|
||||
base-layer-id-offset=10000
|
||||
|
||||
workspace-background-layer-id=2000
|
||||
workspace-layer-id=3000
|
||||
application-layer-id=4000
|
||||
|
||||
transition-duration=300
|
||||
|
||||
background-image=@westondatadir@/background.png
|
||||
background-id=1001
|
||||
panel-image=@westondatadir@/panel.png
|
||||
panel-id=1002
|
||||
surface-id-offset=10
|
||||
tiling-image=@westondatadir@/tiling.png
|
||||
tiling-id=1003
|
||||
sidebyside-image=@westondatadir@/sidebyside.png
|
||||
sidebyside-id=1004
|
||||
fullscreen-image=@westondatadir@/fullscreen.png
|
||||
fullscreen-id=1005
|
||||
random-image=@westondatadir@/random.png
|
||||
random-id=1006
|
||||
home-image=@westondatadir@/home.png
|
||||
home-id=1007
|
||||
workspace-background-color=0x99000000
|
||||
workspace-background-id=2001
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=0
|
||||
icon-id=4001
|
||||
icon=@westondatadir@/icon_ivi_flower.png
|
||||
path=@bindir@/weston-flower
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=0
|
||||
icon-id=4002
|
||||
icon=@westondatadir@/icon_ivi_clickdot.png
|
||||
path=@bindir@/weston-clickdot
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=1
|
||||
icon-id=4003
|
||||
icon=@westondatadir@/icon_ivi_simple-egl.png
|
||||
path=@bindir@/weston-simple-egl
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=1
|
||||
icon-id=4004
|
||||
icon=@westondatadir@/icon_ivi_simple-shm.png
|
||||
path=@bindir@/weston-simple-shm
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=2
|
||||
icon-id=4005
|
||||
icon=@westondatadir@/icon_ivi_smoke.png
|
||||
path=@bindir@/weston-smoke
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4006
|
||||
icon=@westondatadir@/icon_ivi_flower.png
|
||||
path=@bindir@/weston-flower
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4007
|
||||
icon=@westondatadir@/icon_ivi_clickdot.png
|
||||
path=@bindir@/weston-clickdot
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4008
|
||||
icon=@westondatadir@/icon_ivi_simple-egl.png
|
||||
path=@bindir@/weston-simple-egl
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4009
|
||||
icon=@westondatadir@/icon_ivi_simple-shm.png
|
||||
path=@bindir@/weston-simple-shm
|
||||
|
||||
[ivi-launcher]
|
||||
workspace-id=3
|
||||
icon-id=4010
|
||||
icon=@westondatadir@/icon_ivi_smoke.png
|
||||
path=@bindir@/weston-smoke
|
Loading…
Reference in New Issue