From 008dda33524ff022c130783d5ba647ea3cccda77 Mon Sep 17 00:00:00 2001
From: Markus Brechtel <markus.brechtel+kita-pro@thengo.net>
Date: Sun, 23 Sep 2018 15:15:23 +0200
Subject: [PATCH] firefox and thunderbird directly in the panel

---
 defaults/main.yml                              | 18 ++++++++++++++++--
 tasks/xfce.yaml                                |  5 +++++
 .../whiskermenu-1.rc.j2                        |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)
 rename files/xdg/xfce4/panel/whiskermenu-1.rc => templates/whiskermenu-1.rc.j2 (93%)

diff --git a/defaults/main.yml b/defaults/main.yml
index e35bae6..6295373 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,15 +1,29 @@
 ---
 application_starters:
-  - exo-web-browser
-  - exo-mail-reader
+  - firefox-esr # exo-web-browser
+  - thunderbird # exo-mail-reader
   - libreoffice-writer
   - libreoffice-calc
   - libreoffice-impress
   - xfce-display-settings
   - xfce4-screenshooter
+  - simple-scan
   - fotowall
   - org.kde.gwenview
+
+application_default_favorites:
+  - exo-file-manager
+  - gnome-search-tool
+  - firefox-esr # exo-web-browser
+  - thunderbird # exo-mail-reader
+  - libreoffice-writer
+  - libreoffice-calc
+  - libreoffice-impress
+  - xfce-display-settings
+  - xfce4-screenshooter
   - simple-scan
+  - fotowall
+  - org.kde.gwenview
 
 install_fotowall: true
 install_cewe_fotobuch: true
diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml
index 01583a9..efe0866 100644
--- a/tasks/xfce.yaml
+++ b/tasks/xfce.yaml
@@ -37,6 +37,11 @@
     src: xfce4-panel.xml.j2
     dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 
+- name: whiskermenu config
+  template:
+    src: whiskermenu-1.rc.j2
+    dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc
+
 - name: xfwm4 config
   template:
     src: xfwm4.xml.j2
diff --git a/files/xdg/xfce4/panel/whiskermenu-1.rc b/templates/whiskermenu-1.rc.j2
similarity index 93%
rename from files/xdg/xfce4/panel/whiskermenu-1.rc
rename to templates/whiskermenu-1.rc.j2
index 61907b5..299cb44 100644
--- a/files/xdg/xfce4/panel/whiskermenu-1.rc
+++ b/templates/whiskermenu-1.rc.j2
@@ -1,4 +1,4 @@
-favorites=exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop
+favorites={{ application_default_favorites | map('regex_replace', '(.*)', '\\1.desktop')  | join(',') }}
 recent=
 button-title=Anwendungen
 button-icon=applications-other