From df1ecd0842ab42bb9129226ce08c4d4899bb1151 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sun, 31 Jan 2021 22:00:55 +0100 Subject: [PATCH] tint2 launchers, keyspipe --- usr/bin/jgkeys-pipe | 45 ++++++++++++++++++++++------------------- usr/bin/jgtint2launcher | 10 ++++----- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/usr/bin/jgkeys-pipe b/usr/bin/jgkeys-pipe index 794267a..e68ead2 100755 --- a/usr/bin/jgkeys-pipe +++ b/usr/bin/jgkeys-pipe @@ -101,35 +101,36 @@ esac out+=("^sep($APPS)") -out+=("$(printf "%-10s %s,%s" "W-f" "$FILEMNGR" "exo-open --launch FileManager")") -out+=("$(printf "%-10s %s,%s" "W-w" "$BROWSER" "exo-open --launch WebBrowser")") -out+=("$(printf "%-10s %s,%s" "W-t" "$TERMINAL" "exo-open --launch TerminalEmulator")") -out+=("$(printf "%-10s %s,%s" "W-e" "$EDITOR" geany)") -out+=("$(printf "%-10s %s,%s" "W-g" "Galculator" galculator)") -out+=("$(printf "%-10s %s,%s" "W-h" "$RESMON" "^term(bpytop)")") -out+=("$(printf "%-10s %s,%s" "W-/" "$FSEARCH" fsearch)") -out+=("$(printf "%-10s %s,%s" "W-v" "$VOLUME" pavucontrol)") -out+=("$(printf "%-10s %s,%s" "W-c" "$COMPOSITOR" compton_toggle)") -out+=("$(printf "%-10s %s,%s" "W-l" "$LOCK" "betterlockscreen -l")") -out+=("$(printf "%-10s %s,%s" "W-x" "$EXIT" "mb-jgtools mblogout")") +out+=("$(printf "%10s %s,%s" "W-f" "$FILEMNGR" "exo-open --launch FileManager")") +out+=("$(printf "%10s %s,%s" "W-w" "$BROWSER" "exo-open --launch WebBrowser")") +out+=("$(printf "%10s %s,%s" "W-t" "$TERMINAL" "exo-open --launch TerminalEmulator")") +out+=("$(printf "%10s %s,%s" "W-grave" "Quake-like $TERMINAL" "mabox-terminal")") +out+=("$(printf "%10s %s,%s" "W-e" "$EDITOR" geany)") +out+=("$(printf "%10s %s,%s" "W-g" "Galculator" galculator)") +out+=("$(printf "%10s %s,%s" "W-h" "$RESMON" "^term(bpytop)")") +out+=("$(printf "%10s %s,%s" "W-/" "$FSEARCH" fsearch)") +out+=("$(printf "%10s %s,%s" "W-v" "$VOLUME" pavucontrol)") +out+=("$(printf "%10s %s,%s" "W-c" "$COMPOSITOR" compton_toggle)") +out+=("$(printf "%10s %s,%s" "W-l" "$LOCK" "betterlockscreen -l")") +out+=("$(printf "%10s %s,%s" "W-x" "$EXIT" "mb-jgtools mblogout")") out+=("^sep($PANELS)") -out+=("$(printf "%-10s %s,%s" "W" "$M_MAIN" "mb-jgtools main")") -out+=("$(printf "%-10s %s,%s" "W-s" "$M_SETTINGS" "mb-jgtools settings")") -out+=("$(printf "%-10s %s,%s" "W-A-k" "$M_HELP" "jgkeys-pipe -s")") -out+=("$(printf "%-10s %s,%s" "C-tab" "$PLACES" "mb-jgtools places")") -out+=("$(printf "%-10s %s,%s" "W-tab" "$RIGHT" "mb-jgtools right")") +out+=("$(printf "%10s %s,%s" "W" "$M_MAIN" "mb-jgtools main")") +out+=("$(printf "%10s %s,%s" "W-s" "$M_SETTINGS" "mb-jgtools settings")") +out+=("$(printf "%10s %s,%s" "W-A-k" "$M_HELP" "jgkeys-pipe -s")") +out+=("$(printf "%10s %s,%s" "C-tab" "$PLACES" "mb-jgtools places")") +out+=("$(printf "%10s %s,%s" "W-tab" "$RIGHT" "mb-jgtools right")") out+=("^sep($WINDOWS)") -out+=("$(printf "%-10s %s,%s" "W-d" "$SHOW_DESKTOP" show_desktop)") -out+=("$(printf "%-10s %s,%s" "W-$ARROWS" "$HALF")") +out+=("$(printf "%10s %s,%s" "W-d" "$SHOW_DESKTOP" show_desktop)") +out+=("$(printf "%10s %s,%s" "W-$ARROWS" "$HALF")") out+=("^sep($HELPERS)") -out+=("$(printf "%-10s %s,%s" "W-A-t" "$JGTILE" "jgtile")") -out+=("$(printf "%-10s %s,%s" "W-A-h" "$HISTORY" "jghistory-pipe -s")") -out+=("$(printf "%-10s %s,%s" "W-A-e" "$ESPANSO" "jgespanso-pipe -s")") +out+=("$(printf "%10s %s,%s" "W-A-t" "$JGTILE" "jgtile")") +out+=("$(printf "%10s %s,%s" "W-A-h" "$HISTORY" "jghistory-pipe -s")") +out+=("$(printf "%10s %s,%s" "W-A-e" "$ESPANSO" "jgespanso-pipe -s")") out+=("^sep()") out+=("$(printf "%s,%s" "$SHORTCUTS" "mb-kb --gui &>/dev/null")") @@ -158,6 +159,8 @@ exit 0 fi printf '%s\n' "${out[@]}" +#printf '%s\n' "${out[@]}" > $HOME/.config/mabox/shortkeys.csv + if [ $1 == "-r" ]; then printf '%s\n' "^sep()" printf '%s\n' "$REMOVE,mb-setvar places_keyspipe=false" diff --git a/usr/bin/jgtint2launcher b/usr/bin/jgtint2launcher index 02ba08c..560c421 100755 --- a/usr/bin/jgtint2launcher +++ b/usr/bin/jgtint2launcher @@ -7,7 +7,7 @@ case $LANG in TITLE="Dodaj/usuń programy do panelu Tint2" TYPE_TO_SEARCH="Pisz aby Wyszukać" CURRENT="Wyzwalacze" - OPENDIR="Otwórz w menadżerze plików" + OPENDIR="Otwórz" ADD="dodaj" DEL="usuń" ALL="wszystkie";; @@ -15,7 +15,7 @@ case $LANG in TITLE="Add/Remove Tint2 panel launchers" TYPE_TO_SEARCH="Buscar" CURRENT="Launchers" - OPENDIR="Abrir Gestor de archivos aquí" + OPENDIR="Abrir" ADD="add" DEL="remove" ALL="all";; @@ -23,7 +23,7 @@ case $LANG in TITLE="Add/Remove Tint2 panel launchers" TYPE_TO_SEARCH="Type to Search" CURRENT="Launchers" - OPENDIR="Open filemanager here" + OPENDIR="Open" ADD="add" DEL="remove" ALL="all";; @@ -37,7 +37,7 @@ APPSDIR="/usr/share/applications" out+=("@text,,$(expr $jgtools_padding + 10),$(expr $jgtools_padding + 10),300,20,4,left,top,auto,#111111,$TITLE") out+=("@search,,34,29,292,20,4,left,top,auto,#262626,\"\"\" $TYPE_TO_SEARCH\"\"\"") out+=("^sep($CURRENT)") -out+=(" $OPENDIR,${JGMENU_RESOURCE_OPENER} $LAUNCHERDIR") +out+=(" $OPENDIR (~/.config/tint2/launcherapps),${JGMENU_RESOURCE_OPENER} $LAUNCHERDIR") out+=("^sep()") a=0 for item in "$LAUNCHERDIR"/*.desktop; do @@ -53,7 +53,7 @@ out+=("$DEL $ALL: ($a),rm -f $LAUNCHERDIR/*.desktop;killall -SIGUSR1 tint2;jgtin fi out+=("^sep($ADD...)") -out+=(" $OPENDIR,${JGMENU_RESOURCE_OPENER} $APPSDIR") +out+=(" $OPENDIR (/usr/share/applications),${JGMENU_RESOURCE_OPENER} $APPSDIR") out+=("^sep()") for item in "$APPSDIR"/*.desktop; do filename=${item##*/}