From 1dd63c21481cd348104a8fb6ae63cb6ce93117d7 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sat, 15 Jan 2022 02:48:58 +0100 Subject: [PATCH] changes to xfce-customization --- defaults/main.yaml | 17 ------------- .../xdg/xfce4/panel/datetime-10.rc | 4 +-- .../xdg/xfce4/panel/whiskermenu-1.rc | 25 ++++++++++++++----- .../xfce4-power-manager.xml | 9 +++++++ tasks/xfce-customization.yaml | 5 ---- .../xfce-customization/xfce4-panel.xml.j2 | 18 +++---------- templates/xfce-customization/xfwm4.xml.j2 | 2 +- 7 files changed, 35 insertions(+), 45 deletions(-) rename templates/xfce-customization/whiskermenu-1.rc.j2 => files/xfce-customization/xdg/xfce4/panel/whiskermenu-1.rc (57%) create mode 100644 files/xfce-customization/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml diff --git a/defaults/main.yaml b/defaults/main.yaml index 4a92952..e760c04 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -16,20 +16,3 @@ application_starters: - firefox-esr - chromium - xfce4-terminal - - xfce-display-settings - -application_default_favorites: - - exo-file-manager - - gnome-search-tool - - firefox-esr - - chromium - - thunderbird - - libreoffice-writer - - libreoffice-calc - - libreoffice-impress - - libreoffice-draw - - xfce-display-settings - - xfce4-screenshooter - - fotowall - - org.gnome.gThumb - - simple-scan diff --git a/files/xfce-customization/xdg/xfce4/panel/datetime-10.rc b/files/xfce-customization/xdg/xfce4/panel/datetime-10.rc index 44b58e4..451cab2 100644 --- a/files/xfce-customization/xdg/xfce4/panel/datetime-10.rc +++ b/files/xfce-customization/xdg/xfce4/panel/datetime-10.rc @@ -1,5 +1,5 @@ layout=1 -date_font=Sans 16 -time_font=Sans Bold 28 +date_font=Sans 12 +time_font=Sans Bold 20 date_format=%a, %d.%m. time_format=%H:%M diff --git a/templates/xfce-customization/whiskermenu-1.rc.j2 b/files/xfce-customization/xdg/xfce4/panel/whiskermenu-1.rc similarity index 57% rename from templates/xfce-customization/whiskermenu-1.rc.j2 rename to files/xfce-customization/xdg/xfce4/panel/whiskermenu-1.rc index 9f8bd92..8513b77 100644 --- a/templates/xfce-customization/whiskermenu-1.rc.j2 +++ b/files/xfce-customization/xdg/xfce4/panel/whiskermenu-1.rc @@ -1,6 +1,5 @@ -favorites={{ application_default_favorites | map('regex_replace', '(.*)', '\\1.desktop') | join(',') }} -recent= -button-title=Anwendungen +favorites=thunar.desktop,gnome-search-tool.desktop,firefox-esr.desktop,chromium.desktop,thunderbird.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,libreoffice-draw.desktop,org.gnome.gThumb.desktop,simple-scan.desktop,xfce4-screenshooter.desktop,xfce-display-settings.desktop +recent=xfce-wmtweaks-settings.desktop,groovyConsole.desktop,mousepad.desktop button-icon=applications-other button-single-row=false show-button-title=false @@ -10,14 +9,18 @@ launcher-show-description=true launcher-show-tooltip=true item-icon-size=3 hover-switch-category=false +category-show-name=true category-icon-size=1 load-hierarchy=false +view-as-icons=false +default-category=0 recent-items-max=10 favorites-in-recent=true -display-recent-default=false position-search-alternate=false position-commands-alternate=false position-categories-alternate=false +stay-on-focus-out=false +confirm-session-command=true menu-width=600 menu-height=800 menu-opacity=90 @@ -25,8 +28,18 @@ command-settings=xfce4-settings-manager show-command-settings=true command-lockscreen=xflock4 show-command-lockscreen=true -command-switchuser=gdmflexiserver -show-command-switchuser=false +command-switchuser=dm-tool switch-to-greeter +show-command-switchuser=true +command-logoutuser=xfce4-session-logout --logout --fast +show-command-logoutuser=false +command-restart=xfce4-session-logout --reboot --fast +show-command-restart=false +command-shutdown=xfce4-session-logout --halt --fast +show-command-shutdown=false +command-suspend=xfce4-session-logout --suspend +show-command-suspend=false +command-hibernate=xfce4-session-logout --hibernate +show-command-hibernate=false command-logout=xfce4-session-logout show-command-logout=true command-menueditor=menulibre diff --git a/files/xfce-customization/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/files/xfce-customization/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new file mode 100644 index 0000000..5511d16 --- /dev/null +++ b/files/xfce-customization/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tasks/xfce-customization.yaml b/tasks/xfce-customization.yaml index f5182fc..24b3790 100644 --- a/tasks/xfce-customization.yaml +++ b/tasks/xfce-customization.yaml @@ -10,11 +10,6 @@ src: xfce-customization/xfce4-panel.xml.j2 dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml -- name: whiskermenu config - template: - src: xfce-customization/whiskermenu-1.rc.j2 - dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc - - name: xfwm4 config template: src: xfce-customization/xfwm4.xml.j2 diff --git a/templates/xfce-customization/xfce4-panel.xml.j2 b/templates/xfce-customization/xfce4-panel.xml.j2 index 16b8dc1..28d127e 100644 --- a/templates/xfce-customization/xfce4-panel.xml.j2 +++ b/templates/xfce-customization/xfce4-panel.xml.j2 @@ -7,10 +7,10 @@ - + - + @@ -34,15 +34,7 @@ - - - - - - - - - + @@ -119,9 +111,7 @@ - - - + diff --git a/templates/xfce-customization/xfwm4.xml.j2 b/templates/xfce-customization/xfwm4.xml.j2 index 1bee490..67ec665 100644 --- a/templates/xfce-customization/xfwm4.xml.j2 +++ b/templates/xfce-customization/xfwm4.xml.j2 @@ -56,7 +56,7 @@ - +