From 9031da8eb480992b96e03f85ea984a2e46b12e5a Mon Sep 17 00:00:00 2001 From: rokosun Date: Thu, 9 Jun 2022 14:43:58 +0200 Subject: [PATCH 1/3] Fix indentation in layout-switch script, change /default/ to (default) --- .../etc/skel/.local/bin/layout-switch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch b/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch index 07579471..f8828b24 100755 --- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch +++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch @@ -21,44 +21,44 @@ yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title ' --field=!"$icons/macos.png"!'MacOS-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'MacOS-Like'" \ --field=!"$icons/mx.png"!'MX-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'MX-Like'" \ --field=!"$icons/gnome.png"!'Gnome-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'Gnome-Like'" \ ---field=!"$icons/unity.png"!'Unity-Like /default/':BTN "kill -USR1 \$YAD_PID; echo -n 'Unity-Like /default/'" \ +--field=!"$icons/unity.png"!'Unity-Like (default)':BTN "kill -USR1 \$YAD_PID; echo -n 'Unity-Like (default)'" \ --field=!"$icons/topx.png"!'TopX-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'TopX-Like'" ) case "$choice" in 'Windows-Like') disable-global-menus xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true & - xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & + xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" & xfce4-panel-profiles load "$profiles"/Windows-Like.tar.bz2 & ;; - 'Unity-Like /default/') + 'Unity-Like (default)') enable-global-menus xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true & - xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true & + xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true & xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "CMH|" & xfce4-panel-profiles load "$profiles"/Unity-Like.tar.bz2 & ;; -'MX-Like') + 'MX-Like') disable-global-menus xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true & - xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & + xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" & xfce4-panel-profiles load "$profiles"/MX-Like.tar.bz2 & ;; -'MacOS-Like') + 'MacOS-Like') enable-global-menus xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true & - xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true & + xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true & xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "CMH|" & xfce4-panel-profiles load "$profiles"/MacOS-Like.tar.bz2 & ;; -'Gnome-Like') + 'Gnome-Like') disable-global-menus xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true & - xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & + xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" & xfce4-panel-profiles load "$profiles"/Gnome-Like.tar.bz2 & ;; -'TopX-Like') + 'TopX-Like') disable-global-menus xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true & - xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & + xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false & xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" & xfce4-panel-profiles load "$profiles"/TopX-Like.tar.bz2 & ;; *) exit ;; -- 2.30.2 From 3596c2693332fd29c259d4543431ca60b5e4d8e0 Mon Sep 17 00:00:00 2001 From: rokosun Date: Thu, 9 Jun 2022 14:59:32 +0200 Subject: [PATCH 2/3] Change layout-switch to layout-switcher Co-authored-by: rokosun Co-committed-by: rokosun --- .../etc/skel/.local/bin/{layout-switch => layout-switcher} | 2 +- .../skel/.local/share/applications/layout-switch.desktop | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/{layout-switch => layout-switcher} (95%) diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch b/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switcher similarity index 95% rename from tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch rename to tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switcher index f8828b24..57fb55da 100755 --- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch +++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switcher @@ -16,7 +16,7 @@ disable-global-menus() { killall appmenu-registrar & } choice=$( -yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title 'Layout Switch' --text-align=center --text 'Changing to or from any layout that has global menus, will require your admin password' --form --columns 3 \ +yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title 'Layout Switcher' --text-align=center --text 'Changing to or from any layout that has global menus, will require your admin password' --form --columns 3 \ --field=!"$icons/windows.png"!'Windows-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'Windows-Like'" \ --field=!"$icons/macos.png"!'MacOS-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'MacOS-Like'" \ --field=!"$icons/mx.png"!'MX-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'MX-Like'" \ diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop index 409e17d3..dbeaeed4 100644 --- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop +++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Version=1.1 Type=Application -Name=Layout Switch -GenericName=Layout Switch +Name=Layout Switcher +GenericName=Layout Switcher Comment=Change how TROMjaro looks like. Make it look like Unity, Windows, Gnome, and so forth. Icon=layout-switch -Exec=layout-switch +Exec=layout-switcher Categories=DesktopSettings;GTK;Settings;X-XFCE-PersonalSettings;X-XFCE-SettingsDialog;XFCE; Keywords=settings;layout;toggle;switch; -- 2.30.2 From 4426e55dbb381ddddf3b3907f153c1c0fd307c89 Mon Sep 17 00:00:00 2001 From: rokosun Date: Thu, 9 Jun 2022 15:08:55 +0200 Subject: [PATCH 3/3] change layout-switch.desktop to layout-switcher.desktop --- .../{layout-switch.desktop => layout-switcher.desktop} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/{layout-switch.desktop => layout-switcher.desktop} (100%) diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switcher.desktop similarity index 100% rename from tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop rename to tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switcher.desktop -- 2.30.2