Browse Source

final adjustments

master
Markus Brechtel 6 years ago
parent
commit
8cc455a5f0
5 changed files with 19 additions and 14 deletions
  1. +3
    -0
      defaults/main.yml
  2. +2
    -2
      files/xdg/xfce4/panel/whiskermenu-1.rc
  3. +1
    -1
      files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
  4. +1
    -1
      files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
  5. +12
    -10
      templates/xfce4-panel.xml.j2

+ 3
- 0
defaults/main.yml View File

@@ -9,6 +9,9 @@ application_starters:
- xfce4-screenshooter - xfce4-screenshooter
- fotowall - fotowall
- org.kde.gwenview - org.kde.gwenview
- simple-scan


install_fotowall: true install_fotowall: true
install_cewe_fotobuch: true install_cewe_fotobuch: true

kiosk_unlocked_users: root

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

@@ -26,13 +26,13 @@ show-command-settings=true
command-lockscreen=xflock4 command-lockscreen=xflock4
show-command-lockscreen=true show-command-lockscreen=true
command-switchuser=gdmflexiserver command-switchuser=gdmflexiserver
show-command-switchuser=true
show-command-switchuser=false
command-logout=xfce4-session-logout command-logout=xfce4-session-logout
show-command-logout=true show-command-logout=true
command-menueditor=menulibre command-menueditor=menulibre
show-command-menueditor=true show-command-menueditor=true
command-profile=mugshot command-profile=mugshot
show-command-profile=true
show-command-profile=false
search-actions=5 search-actions=5


[action0] [action0]


+ 1
- 1
files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml 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">
<channel name="xfwm4" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
<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"/>


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

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


<channel name="xsettings" version="1.0">
<channel name="xsettings" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
<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="Tango"/>


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

@@ -2,7 +2,7 @@


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


<channel name="xfce4-panel" version="1.0" locked="*" unlocked="root">
<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"/>
@@ -66,11 +66,7 @@
<property name="style" type="uint" value="0"/> <property name="style" type="uint" value="0"/>
</property> </property>


<property name="plugin-4" type="string" value="showdesktop">
<property name="digital-format" type="empty"/>
</property>

<property name="plugin-5" type="string" value="windowmenu">
<property name="plugin-4" type="string" value="windowmenu">
<property name="style" type="uint" value="0"/> <property name="style" type="uint" value="0"/>
<property name="workspace-actions" type="bool" value="true"/> <property name="workspace-actions" type="bool" value="true"/>
<property name="workspace-names" type="bool" value="true"/> <property name="workspace-names" type="bool" value="true"/>
@@ -78,9 +74,15 @@
<property name="all-workspaces" type="bool" value="true"/> <property name="all-workspaces" type="bool" value="true"/>
</property> </property>


<property name="plugin-6" type="string" value="systray"/>
<property name="plugin-5" type="string" value="showdesktop">
<property name="digital-format" type="empty"/>
</property>

<property name="plugin-6" type="string" value="pager">
<property name="rows" type="uint" value="2"/>
</property>


<property name="plugin-7" type="string" value="pager"/>
<property name="plugin-7" type="string" value="systray"/>


<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"/>
@@ -96,9 +98,9 @@
<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"/>


Loading…
Cancel
Save