Browse Source

further improvements

master
Markus Brechtel 6 years ago
parent
commit
8159eec1d3
8 changed files with 58 additions and 19 deletions
  1. +3
    -1
      defaults/main.yml
  2. +5
    -0
      files/xdg/xfce4/panel/datetime-10.rc
  3. +1
    -1
      files/xdg/xfce4/panel/whiskermenu-1.rc
  4. +0
    -1
      files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
  5. +2
    -2
      files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
  6. +20
    -0
      tasks/xfce.yaml
  7. +25
    -12
      templates/xfce4-panel.xml.j2
  8. +2
    -2
      templates/xfwm4.xml.j2

+ 3
- 1
defaults/main.yml View File

@@ -2,10 +2,10 @@
application_starters: application_starters:
- exo-web-browser - exo-web-browser
- exo-mail-reader - exo-mail-reader
- exo-file-manager
- libreoffice-writer - libreoffice-writer
- libreoffice-calc - libreoffice-calc
- libreoffice-impress - libreoffice-impress
- xfce-display-settings
- xfce4-screenshooter - xfce4-screenshooter
- fotowall - fotowall
- org.kde.gwenview - org.kde.gwenview
@@ -15,3 +15,5 @@ install_fotowall: true
install_cewe_fotobuch: true install_cewe_fotobuch: true


kiosk_unlocked_users: root kiosk_unlocked_users: root

xfwm4_use_compositing: true

+ 5
- 0
files/xdg/xfce4/panel/datetime-10.rc View File

@@ -0,0 +1,5 @@
layout=1
date_font=Sans 16
time_font=Sans Bold 28
date_format=%a, %d.%m.
time_format=%H:%M

+ 1
- 1
files/xdg/xfce4/panel/whiskermenu-1.rc View File

@@ -20,7 +20,7 @@ position-commands-alternate=false
position-categories-alternate=false position-categories-alternate=false
menu-width=600 menu-width=600
menu-height=600 menu-height=600
menu-opacity=70
menu-opacity=90
command-settings=xfce4-settings-manager command-settings=xfce4-settings-manager
show-command-settings=true show-command-settings=true
command-lockscreen=xflock4 command-lockscreen=xflock4


+ 0
- 1
files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>


<channel name="xfce4-desktop" version="1.0"> <channel name="xfce4-desktop" version="1.0">
<property name="backdrop" type="empty"> <property name="backdrop" type="empty">


+ 2
- 2
files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>


<channel name="xsettings" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
<channel name="xsettings" version="1.0">
<property name="Net" type="empty"> <property name="Net" type="empty">
<property name="ThemeName" type="string" value="Adwaita"/> <property name="ThemeName" type="string" value="Adwaita"/>
<property name="IconThemeName" type="string" value="Tango"/>
<property name="IconThemeName" type="string" value="gnome-brave"/>
<property name="DoubleClickTime" type="empty"/> <property name="DoubleClickTime" type="empty"/>
<property name="DoubleClickDistance" type="empty"/> <property name="DoubleClickDistance" type="empty"/>
<property name="DndDragThreshold" type="empty"/> <property name="DndDragThreshold" type="empty"/>


+ 20
- 0
tasks/xfce.yaml View File

@@ -11,6 +11,21 @@
- task-german-desktop - task-german-desktop
- eog - eog
- dmz-cursor-theme - dmz-cursor-theme
- gnome-brave-icon-theme
- gnome-dust-icon-theme
- gnome-human-icon-theme
- gnome-icon-theme
- gnome-icon-theme-extras
- gnome-icon-theme-gartoon
- gnome-icon-theme-nuovo
- gnome-icon-theme-suede
- gnome-icon-theme-symbolic
- gnome-icon-theme-yasis
- gnome-illustrious-icon-theme
- gnome-noble-icon-theme
- gnome-wine-icon-theme
- gnome-wise-icon-theme
- xfonts-terminus


- name: xdg config - name: xdg config
copy: copy:
@@ -21,3 +36,8 @@
template: template:
src: xfce4-panel.xml.j2 src: xfce4-panel.xml.j2
dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

- name: xfwm4 config
template:
src: xfwm4.xml.j2
dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml

+ 25
- 12
templates/xfce4-panel.xml.j2 View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>


{% set i = 12 %}
{% set i = 13 %}


<channel name="xfce4-panel" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}"> <channel name="xfce4-panel" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
<property name="configver" type="int" value="2"/> <property name="configver" type="int" value="2"/>
<property name="panels" type="array"> <property name="panels" type="array">
<value type="int" value="1"/> <value type="int" value="1"/>
<property name="panel-1" type="empty"> <property name="panel-1" type="empty">
<property name="position" type="string" value="p=12;x=302;y=997"/>
<property name="position" type="string" value="p=12;x=0;y=997"/>
<property name="length" type="uint" value="100"/> <property name="length" type="uint" value="100"/>
<property name="position-locked" type="bool" value="true"/> <property name="position-locked" type="bool" value="true"/>
<property name="size" type="uint" value="32"/>
<property name="size" type="uint" value="42"/>
<property name="plugin-ids" type="array"> <property name="plugin-ids" type="array">
<value type="int" value="1"/> <value type="int" value="1"/>
<value type="int" value="12"/>
{% for app in application_starters %} {% for app in application_starters %}
<value type="int" value="{{ loop.index0 + i }}"/> <value type="int" value="{{ loop.index0 + i }}"/>
{% endfor %} {% endfor %}
@@ -32,9 +33,9 @@
<property name="background-style" type="uint" value="1"/> <property name="background-style" type="uint" value="1"/>
<property name="background-alpha" type="uint" value="50"/> <property name="background-alpha" type="uint" value="50"/>
<property name="background-color" type="array"> <property name="background-color" type="array">
<value type="uint" value="54965"/>
<value type="uint" value="54965"/>
<value type="uint" value="54965"/>
<value type="uint" value="58982"/>
<value type="uint" value="58982"/>
<value type="uint" value="58982"/>
<value type="uint" value="65535"/> <value type="uint" value="65535"/>
</property> </property>


@@ -43,6 +44,18 @@
<property name="plugins" type="empty"> <property name="plugins" type="empty">
<property name="plugin-1" type="string" value="whiskermenu"/> <property name="plugin-1" type="string" value="whiskermenu"/>


<property name="plugin-12" type="string" value="places">
<property name="show-button-type" type="int" value="2"/>
<property name="show-icons" type="bool" value="true"/>
<property name="button-label" type="string" value=""/>
<property name="search-cmd" type="string" value="gnome-search-tool"/>
<property name="mount-open-volumes" type="bool" value="true"/>
<property name="show-volumes" type="bool" value="true"/>
<property name="show-bookmarks" type="bool" value="true"/>
<property name="show-recent" type="bool" value="true"/>
<property name="show-recent-clear" type="bool" value="true"/>
</property>

{% for app in application_starters %} {% for app in application_starters %}
<property name="plugin-{{ loop.index0 + i }}" type="string" value="launcher"> <property name="plugin-{{ loop.index0 + i }}" type="string" value="launcher">
<property name="items" type="array"> <property name="items" type="array">
@@ -82,25 +95,25 @@
<property name="rows" type="uint" value="2"/> <property name="rows" type="uint" value="2"/>
</property> </property>


<property name="plugin-7" type="string" value="systray"/>
<property name="plugin-7" type="string" value="systray">
<property name="size-max" type="uint" value="32"/>
<property name="show-frame" type="bool" value="false"/>
</property>


<property name="plugin-8" type="string" value="pulseaudio"> <property name="plugin-8" type="string" value="pulseaudio">
<property name="enable-keyboard-shortcuts" type="bool" value="true"/> <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
</property> </property>
<property name="plugin-9" type="string" value="power-manager-plugin"/> <property name="plugin-9" type="string" value="power-manager-plugin"/>


<property name="plugin-10" type="string" value="clock">
<property name="digital-format" type="string" value="%a %d.%m. – %H:%M"/>
<property name="mode" type="uint" value="2"/>
</property>
<property name="plugin-10" type="string" value="datetime"/>


<property name="plugin-11" type="string" value="actions"> <property name="plugin-11" type="string" value="actions">
<property name="items" type="array"> <property name="items" type="array">
<value type="string" value="-separator"/> <value type="string" value="-separator"/>
<value type="string" value="-logout-dialog"/> <value type="string" value="-logout-dialog"/>
<value type="string" value="-switch-user"/> <value type="string" value="-switch-user"/>
<value type="string" value="+lock-screen"/>
<value type="string" value="+logout"/> <value type="string" value="+logout"/>
<value type="string" value="+lock-screen"/>
<value type="string" value="-hibernate"/> <value type="string" value="-hibernate"/>
<value type="string" value="-suspend"/> <value type="string" value="-suspend"/>
<value type="string" value="-restart"/> <value type="string" value="-restart"/>


files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml → templates/xfwm4.xml.j2 View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>


<channel name="xfwm4" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
<channel name="xfwm4" version="1.0">
<property name="general" type="empty"> <property name="general" type="empty">
<property name="activate_action" type="string" value="bring"/> <property name="activate_action" type="string" value="bring"/>
<property name="borderless_maximize" type="bool" value="true"/> <property name="borderless_maximize" type="bool" value="true"/>
@@ -69,7 +69,7 @@
<property name="toggle_workspaces" type="bool" value="false"/> <property name="toggle_workspaces" type="bool" value="false"/>
<property name="unredirect_overlays" type="bool" value="true"/> <property name="unredirect_overlays" type="bool" value="true"/>
<property name="urgent_blink" type="bool" value="false"/> <property name="urgent_blink" type="bool" value="false"/>
<property name="use_compositing" type="bool" value="true"/>
<property name="use_compositing" type="bool" value="{{ xfwm4_use_compositing | ternary('true','false') }}"/>
<property name="workspace_count" type="int" value="4"/> <property name="workspace_count" type="int" value="4"/>
<property name="wrap_cycle" type="bool" value="true"/> <property name="wrap_cycle" type="bool" value="true"/>
<property name="wrap_layout" type="bool" value="true"/> <property name="wrap_layout" type="bool" value="true"/>

Loading…
Cancel
Save