Merge pull request 'Remove unnecessary & symbols' (#1) from rokosun-patch-1 into master

Reviewed-on: #1
This commit is contained in:
Tio TROM 2022-09-27 23:49:29 +02:00
commit 6e2f094c75

View File

@ -10,11 +10,11 @@ enable-top-bar-integration() {
pacman -Qq vala-panel-appmenu-registrar || exit
# Hide window borders when maximized
xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true
# Hide top bar of windows when maximized
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
# Put window buttons on left side
xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "CMH|" &
xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "CMH|"
}
disable-top-bar-integration() {
# Disable global menus
@ -22,17 +22,17 @@ disable-top-bar-integration() {
zensu SKIP_AUTOSNAP= pacman -R --noconfirm vala-panel-appmenu-registrar ||
{ notify-send 'Error' 'failed removing vala-panel-appmenu-registrar !\nmake sure you type the correct password'; exit; }
pacman -Qq vala-panel-appmenu-registrar && exit
killall appmenu-registrar &
killall appmenu-registrar
# Hide window borders when maximized
xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true
# Don't hide top bar of windows when maximized
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
# Put window buttons on right side
xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" &
xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC"
}
choice=$(
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 \
yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title 'TROMjaro 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'" \
@ -43,23 +43,23 @@ yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title '
case "$choice" in
'Windows-Like')
disable-top-bar-integration
xfce4-panel-profiles load "$profiles"/Windows-Like.tar.bz2 & ;;
xfce4-panel-profiles load "$profiles"/Windows-Like.tar.bz2 ;;
'Unity-Like (default)')
enable-top-bar-integration
xfce4-panel-profiles load "$profiles"/Unity-Like.tar.bz2 & ;;
xfce4-panel-profiles load "$profiles"/Unity-Like.tar.bz2 ;;
'MX-Like')
disable-top-bar-integration
xfce4-panel-profiles load "$profiles"/MX-Like.tar.bz2 & ;;
xfce4-panel-profiles load "$profiles"/MX-Like.tar.bz2 ;;
'MacOS-Like')
enable-top-bar-integration
xfce4-panel-profiles load "$profiles"/MacOS-Like.tar.bz2 & ;;
xfce4-panel-profiles load "$profiles"/MacOS-Like.tar.bz2 ;;
'Gnome-Like')
disable-top-bar-integration
xfce4-panel-profiles load "$profiles"/Gnome-Like.tar.bz2 & ;;
xfce4-panel-profiles load "$profiles"/Gnome-Like.tar.bz2 ;;
'TopX-Like')
disable-top-bar-integration
xfce4-panel-profiles load "$profiles"/TopX-Like.tar.bz2 & ;;
xfce4-panel-profiles load "$profiles"/TopX-Like.tar.bz2 ;;
*) exit ;;
esac
sleep 5 && notify-send "$choice layout was enabled"
sleep 2.5 && notify-send "$choice layout was enabled"