diff --git a/usr/bin/jgespanso-pipe b/usr/bin/jgespanso-pipe
index 27c1be0..2cd38ef 100755
--- a/usr/bin/jgespanso-pipe
+++ b/usr/bin/jgespanso-pipe
@@ -25,7 +25,15 @@ esac
MENU_ITEMS=/tmp/espanso_list.csv
trap "rm -f $MENU_ITEMS" EXIT
+
echo "^sep(Espanso - text expander)" >/tmp/espanso_list.csv
+
+if [[ $(espanso status) =~ "not" ]]
+then
+ echo "Espanso not running! Run it first by: espanso start" >>/tmp/espanso_list.csv
+
+else
+
while read -r line ; do
IFS='-' read -r id string <<< "$line"
@@ -36,6 +44,12 @@ echo "$EDITCONF, geany ~/.config/espanso/default.yml" >>/tmp/espanso_list.csv
echo "$OPENCONFDIR,pcmanfm ~/.config/espanso/user/" >>/tmp/espanso_list.csv
echo "$DOCU,exo-open --launch WebBrowser https://espanso.org/docs/" >>/tmp/espanso_list.csv
+fi
+
+
+
+
+
### RUN
if [ $1 == "-s" ]; then
. /usr/bin/pipemenu-standalone.cfg
@@ -43,8 +57,7 @@ if [ $1 == "-s" ]; then
MENU_PADDING_TOP=0
MENU_HALIGN="center"
MENU_VALIGN="top"
-MENU_MARGIN_Y=30
-MENU_MARGIN_X=30
+MENU_MARGIN_Y=40
jgmenu_icon_size=0
JGWIDTH=500
#MENU_HEIGHT_MAX=600
diff --git a/usr/bin/jghistory-pipe b/usr/bin/jghistory-pipe
index 0e008ee..3471f1d 100755
--- a/usr/bin/jghistory-pipe
+++ b/usr/bin/jghistory-pipe
@@ -1,15 +1,31 @@
#!/bin/bash
-
+case $LANG in
+ pl*)
+ HISTHELPER="Ściągawka z historii"
+ NOTHING="Niczego tu nie ma... Otwórz terminal (W-t) i wykonaj jakieś polecenie"
+ ;;
+ es*)
+ HISTHELPER="Historia breve"
+ NOTHING="Nada que ver aquí...Abrir la terminal (W-t) y ejecutar algunos comandos"
+ ;;
+ *)
+ HISTHELPER="History helper"
+ NOTHING="Nothing to see here... Open terminal (W-t) and run some commands"
+ ;;
+esac
MENU_ITEMS=/tmp/history_list.csv
trap "rm -f $MENU_ITEMS" EXIT
-echo "^sep(History helper)" >/tmp/history_list.csv
-while read -r line ; do
+echo "^sep($HISTHELPER)" >/tmp/history_list.csv
+if [ -f ~/.bash_history ]; then
+while read -r line ; do
printf "\"\"\"%s\"\"\",xdotool type --delay 0 \"%s\"\n" "$line" "$line" >> $MENU_ITEMS
done < <(cat ~/.bash_history|sort|uniq)
-
+else
+echo "\"\"\"$NOTHING\"\"\",exo-open --launch TerminalEmulator" >>/tmp/history_list.csv
+fi
### RUN
if [ $1 == "-s" ]; then
. /usr/bin/pipemenu-standalone.cfg
@@ -17,11 +33,10 @@ if [ $1 == "-s" ]; then
MENU_PADDING_TOP=0
MENU_HALIGN="center"
MENU_VALIGN="top"
-MENU_MARGIN_Y=30
-MENU_MARGIN_X=30
+MENU_MARGIN_Y=40
jgmenu_icon_size=0
JGWIDTH=500
-#MENU_HEIGHT_MAX=600
+
mkconfigfile
@@ -30,5 +45,5 @@ rm -f /tmp/history_list.csv
exit 0
fi
#cat ${CONFIG_FILE}
-#cat ${MENU_ITEMS}
+cat ${MENU_ITEMS}
diff --git a/usr/bin/jgkeys-pipe b/usr/bin/jgkeys-pipe
index 65e480e..e38610c 100755
--- a/usr/bin/jgkeys-pipe
+++ b/usr/bin/jgkeys-pipe
@@ -10,6 +10,7 @@ case $LANG in
TERMINAL="Terminal"
EDITOR="Edytor tekstu"
FSEARCH="Wyszukiwanie plików"
+ RESMON="Monitor zasobów"
VOLUME="Kontrola głośności"
COMPOSITOR="wł/wył Picom"
WINDOWS="Okna"
@@ -24,6 +25,10 @@ case $LANG in
RIGHT="Prawy (ustawienia/pomoc)"
LOCK="Blokada ekranu"
EXIT="Wyloguj..."
+ HELPERS="Pomocnicy"
+ HISTORY="Ściągawka z historii"
+ ESPANSO="Espanso - text expander"
+
REMOVE="Usuń to menu z panelu"
;;
@@ -34,6 +39,7 @@ case $LANG in
TERMINAL="Terminal"
EDITOR="Editor de textos"
FSEARCH="FSearch"
+ RESMON="Monitor de recursos"
VOLUME="control volumen "
COMPOSITOR="activa/desact compositor"
WINDOWS="VENTANAS"
@@ -49,6 +55,9 @@ case $LANG in
RIGHT="Ajustes (derecha)"
LOCK="Bloquear pantalla"
EXIT="Salir "
+ HELPERS="Helpers"
+ HISTORY="Historia breve"
+ ESPANSO="Espanso - text expander"
REMOVE="Eliminar este menú del panel"
;;
@@ -59,6 +68,7 @@ case $LANG in
TERMINAL="Terminal"
EDITOR="Text Editor"
FSEARCH="FSearch"
+ RESMON="Resource Monitor"
VOLUME="Volume Control"
COMPOSITOR="toggle Picom (Compositor)"
WINDOWS="Windows"
@@ -73,6 +83,9 @@ case $LANG in
RIGHT="Help/Settings Sidepanel (Right)"
LOCK="Lock screen"
EXIT="Exit Dialog"
+ HELPERS="Helpers"
+ HISTORY="History helper"
+ ESPANSO="Espanso - text expander"
REMOVE="Remove this menu from panel"
;;
@@ -84,6 +97,7 @@ out+=("$(printf "%-10s %s,%s" "W-f" "$FILEMNGR" "exo-open --launch File
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-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)")
@@ -94,7 +108,7 @@ 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-h" "$M_HELP" "jgkeys-pipe -s")")
+out+=("$(printf "%-10s %s,%s" "W-F1" "$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")")
@@ -102,6 +116,9 @@ out+=("^sep($WINDOWS)")
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-h" "$HISTORY" "jghistory-pipe -s")")
+out+=("$(printf "%-10s %s,%s" "W-A-e" "$ESPANSO" "jgespanso-pipe -s")")
### RUN
if [ $1 == "-s" ]; then
. /usr/bin/pipemenu-standalone.cfg