From 8cc455a5f0bf0600d84a50b5bfb0fa74f0bceb55 Mon Sep 17 00:00:00 2001
From: Markus Brechtel <markus.brechtel+kita-pro@thengo.net>
Date: Sat, 22 Sep 2018 05:14:54 +0200
Subject: [PATCH] final adjustments

---
 defaults/main.yml                             |  3 +++
 files/xdg/xfce4/panel/whiskermenu-1.rc        |  4 ++--
 .../xfconf/xfce-perchannel-xml/xfwm4.xml      |  2 +-
 .../xfconf/xfce-perchannel-xml/xsettings.xml  |  2 +-
 templates/xfce4-panel.xml.j2                  | 22 ++++++++++---------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8aae92b..cd5353a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,6 +9,9 @@ application_starters:
   - xfce4-screenshooter
   - fotowall
   - org.kde.gwenview
+  - simple-scan
 
 install_fotowall: true
 install_cewe_fotobuch: true
+
+kiosk_unlocked_users: root
diff --git a/files/xdg/xfce4/panel/whiskermenu-1.rc b/files/xdg/xfce4/panel/whiskermenu-1.rc
index 7f07585..28984fc 100644
--- a/files/xdg/xfce4/panel/whiskermenu-1.rc
+++ b/files/xdg/xfce4/panel/whiskermenu-1.rc
@@ -26,13 +26,13 @@ show-command-settings=true
 command-lockscreen=xflock4
 show-command-lockscreen=true
 command-switchuser=gdmflexiserver
-show-command-switchuser=true
+show-command-switchuser=false
 command-logout=xfce4-session-logout
 show-command-logout=true
 command-menueditor=menulibre
 show-command-menueditor=true
 command-profile=mugshot
-show-command-profile=true
+show-command-profile=false
 search-actions=5
 
 [action0]
diff --git a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
index 9118cc3..ab3603d 100644
--- a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -1,6 +1,6 @@
 <?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="activate_action" type="string" value="bring"/>
     <property name="borderless_maximize" type="bool" value="true"/>
diff --git a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 049d685..4940e78 100644
--- a/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/files/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -1,6 +1,6 @@
 <?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="ThemeName" type="string" value="Adwaita"/>
     <property name="IconThemeName" type="string" value="Tango"/>
diff --git a/templates/xfce4-panel.xml.j2 b/templates/xfce4-panel.xml.j2
index 583c897..e39cd30 100644
--- a/templates/xfce4-panel.xml.j2
+++ b/templates/xfce4-panel.xml.j2
@@ -2,7 +2,7 @@
 
 {% 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="panels" type="array">
     <value type="int" value="1"/>
@@ -66,11 +66,7 @@
       <property name="style" type="uint" value="0"/>
     </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="workspace-actions" 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>
 
-    <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="enable-keyboard-shortcuts" type="bool" value="true"/>
@@ -96,9 +98,9 @@
       <property name="items" type="array">
         <value type="string" value="-separator"/>
         <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="-lock-screen"/>
         <value type="string" value="-hibernate"/>
         <value type="string" value="-suspend"/>
         <value type="string" value="-restart"/>