Commit 685ac27d authored by Alain Takoudjou's avatar Alain Takoudjou

bermiz-ide: use materia theme and custom font-size

parent 37e5b8f8
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = e8aae0fe3a8bc3f006b8638ed326bbcb md5sum = eac5155a458c8a2f37959833caa9d9fe
[template-instance-beremiz] [template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in filename = instance-beremiz.cfg.jinja2.in
md5sum = 2b990148e527117bcfb366f8b700c807 md5sum = 880a96ad5679b075a0681a6b1233f582
[template-instance-beremiz-test] [template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in filename = instance-beremiz-test.cfg.jinja2.in
md5sum = a2fa2b9d3a225a1dd71db67bd4fea769 md5sum = 34bf185731d479021f0c4472b5e524e0
[template-fluxbox-menu.in] [template-fluxbox-menu.in]
filename = fluxbox-menu.in filename = fluxbox-menu.in
......
...@@ -13,6 +13,12 @@ environment = ...@@ -13,6 +13,12 @@ environment =
XORG_LOCK_DIR=${xserver:lock-dir} XORG_LOCK_DIR=${xserver:lock-dir}
DISPLAY=${xserver:display} DISPLAY=${xserver:display}
[enable-matieria-theme]
inline =
[Settings]
gtk-font-name=FreeSans,12
gtk-theme-name=Materia
[xdotool] [xdotool]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ xdotool_bin }} command-line = {{ xdotool_bin }}
......
...@@ -11,6 +11,9 @@ var = ${buildout:directory}/var ...@@ -11,6 +11,9 @@ var = ${buildout:directory}/var
tmp = ${buildout:directory}/tmp tmp = ${buildout:directory}/tmp
log = ${:var}/log log = ${:var}/log
vnc = ${buildout:directory}/.vnc vnc = ${buildout:directory}/.vnc
themes = ${buildout:directory}/.themes
config = ${buildout:directory}/.config
gtk3-config = ${:config}/gtk-3.0
scripts = ${:etc}/run scripts = ${:etc}/run
services = ${:etc}/service services = ${:etc}/service
promise = ${:etc}/promise promise = ${:etc}/promise
...@@ -159,6 +162,21 @@ recipe = slapos.cookbook:wrapper ...@@ -159,6 +162,21 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:promise}/xserver-is-up wrapper-path = ${directory:promise}/xserver-is-up
command-line = bash -c "[ -S ${xserver:lock-dir}/.X11-unix/X${xserver:display-num} ]" command-line = bash -c "[ -S ${xserver:lock-dir}/.X11-unix/X${xserver:display-num} ]"
[install-gtk-materia-theme]
recipe = plone.recipe.command
command =
cp -r {{ gtk_materia_theme }}/share/themes/* ${directory:themes}/
update-command = ${:command}
stop-on-error = true
[enable-matieria-theme]
recipe = slapos.recipe.template
inline =
[Settings]
gtk-font-name=FreeSans,10
gtk-theme-name=Materia
output = ${directory:gtk3-config}/settings.ini
[fluxbox-menu] [fluxbox-menu]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
url = {{ fluxbox_menu }} url = {{ fluxbox_menu }}
...@@ -201,6 +219,9 @@ inline = ...@@ -201,6 +219,9 @@ inline =
export LD_LIBRARY_PATH={{ mesa_location }}/lib export LD_LIBRARY_PATH={{ mesa_location }}/lib
export PATH=${directory:bin}:{{ git_bin_dir }}:{{ cmake_bin }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH export PATH=${directory:bin}:{{ git_bin_dir }}:{{ cmake_bin }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH
export XDG_DATA_DIR={{ gtk3_location }}/share export XDG_DATA_DIR={{ gtk3_location }}/share
export GTK_THEME=Materia
export GTK_PATH={{ gtk_materia_theme }}
export HOME=${buildout:directory}
export GSETTINGS_SCHEMA_DIR={{ gtk3_location }}/share/glib-2.0/schemas export GSETTINGS_SCHEMA_DIR={{ gtk3_location }}/share/glib-2.0/schemas
export FONTCONFIG_FILE=${font-config:output} export FONTCONFIG_FILE=${font-config:output}
export DISPLAY=${xserver:display} export DISPLAY=${xserver:display}
...@@ -261,6 +282,8 @@ parts = ...@@ -261,6 +282,8 @@ parts =
novnc-promise novnc-promise
xserver-promise xserver-promise
x11vnc-listen-promise x11vnc-listen-promise
enable-matieria-theme
install-gtk-materia-theme
beremiz-x11 beremiz-x11
nginx-launcher nginx-launcher
nginx-graceful nginx-graceful
......
...@@ -61,6 +61,7 @@ extra-context = ...@@ -61,6 +61,7 @@ extra-context =
raw gcc_location {{ gcc_location }} raw gcc_location {{ gcc_location }}
raw git_bin_dir {{ git_location }} raw git_bin_dir {{ git_location }}
raw gtk3_location {{ gtk3_location }} raw gtk3_location {{ gtk3_location }}
raw gtk_materia_theme {{ gtk_materia_theme}}
raw matiec_location {{ matiec_location }} raw matiec_location {{ matiec_location }}
raw mesa_location {{ mesa_location }} raw mesa_location {{ mesa_location }}
raw nginx_executable {{ nginx_executable }} raw nginx_executable {{ nginx_executable }}
......
...@@ -139,6 +139,7 @@ context = ...@@ -139,6 +139,7 @@ context =
key gcc_location gcc:prefix key gcc_location gcc:prefix
key git_location git:location key git_location git:location
key gtk3_location gtk-3:location key gtk3_location gtk-3:location
key gtk_materia_theme gtk-materia-theme:location
key instance_template_type :type key instance_template_type :type
key matiec_location matiec:location key matiec_location matiec:location
key mesa_location mesa:location key mesa_location mesa:location
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment