master
Daniel Napora 2020-09-21 14:43:15 +02:00
parent 6d05f1bfde
commit 5e18ff6b57
3 changed files with 41 additions and 32 deletions

View File

@ -10,10 +10,16 @@ case $LANG in
TERMINAL="Terminal" TERMINAL="Terminal"
EDITOR="Edytor tekstu" EDITOR="Edytor tekstu"
FSEARCH="Wyszukiwanie plików" FSEARCH="Wyszukiwanie plików"
VOLUME="Kontrola głośności"
COMPOSITOR="wł/wył Picom"
WINDOWS="Okna"
HALF="połowa ekranu"
SHOW_DESKTOP="pokaż pulpit"
PANELS="Menu/Panele boczne" PANELS="Menu/Panele boczne"
M_MAIN="Główne menu" M_MAIN="Główne menu"
M_SETTINGS="Menu ustawień" M_SETTINGS="Menu ustawień"
M_HELP="Menu pomocy (to menu)"
PLACES="Lewy (miejsca)" PLACES="Lewy (miejsca)"
RIGHT="Prawy (ustawienia/pomoc)" RIGHT="Prawy (ustawienia/pomoc)"
LOCK="Blokada ekranu" LOCK="Blokada ekranu"
@ -28,10 +34,17 @@ case $LANG in
TERMINAL="Terminal" TERMINAL="Terminal"
EDITOR="Editor de textos" EDITOR="Editor de textos"
FSEARCH="FSearch" FSEARCH="FSearch"
VOLUME="control volumen "
COMPOSITOR="activa/desact compositor"
WINDOWS="VENTANAS"
HALF="1/2 pantalla"
SHOW_DESKTOP="mostrar escritorio"
PANELS="Paneles Laterales" PANELS="Paneles Laterales"
M_MAIN="Menú principal" M_MAIN="Menú principal"
M_SETTINGS="Menú de configuración" M_SETTINGS="Menú de configuración"
M_HELP="Menú de ayuda"
PLACES="Lugares (izquierda)" PLACES="Lugares (izquierda)"
RIGHT="Ajustes (derecha)" RIGHT="Ajustes (derecha)"
LOCK="Bloquear pantalla" LOCK="Bloquear pantalla"
@ -46,10 +59,16 @@ case $LANG in
TERMINAL="Terminal" TERMINAL="Terminal"
EDITOR="Text Editor" EDITOR="Text Editor"
FSEARCH="FSearch" FSEARCH="FSearch"
VOLUME="Volume Control"
COMPOSITOR="toggle Picom (Compositor)"
WINDOWS="Windows"
HALF="Half screen"
SHOW_DESKTOP="Show desktop"
PANELS="Menu/SidePanels" PANELS="Menu/SidePanels"
M_MAIN="Main Menu" M_MAIN="Main Menu"
M_SETTINGS="Settings Menu" M_SETTINGS="Settings Menu"
M_HELP="Help (this) Menu"
PLACES="Places Sidepanel (Left)" PLACES="Places Sidepanel (Left)"
RIGHT="Help/Settings Sidepanel (Right)" RIGHT="Help/Settings Sidepanel (Right)"
LOCK="Lock screen" LOCK="Lock screen"
@ -59,35 +78,6 @@ case $LANG in
;; ;;
esac esac
if [ $1 == "-s" ]; then
. $HOME/.config/mabox/mabox.conf
jgmenu_theme=${jgmenu_theme:-obtheme}
case $jgmenu_theme in
default)
export color_norm_fg="#FFFFFF "
;;
obtheme)
export color_title_fg="#FFFFFF "
ob_file=$HOME/.config/openbox/rc.xml
[[ -f $ob_file ]] && wm_theme=$(awk '/<theme>/ {while (getline n) {if (match(n, /<name>/)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")
while read -r a b c
do
[[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c"
done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc
;;
*)
export color_norm_fg="#FFFFFF "
while read -r a b c
do
[[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c"
done < $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc
;;
esac
menu_font_size=${menu_font_size:-9}
menu_font_family=${menu_font_family:-Noto Sans Medium}
jgmenu_font="${menu_font_family} ${menu_font_size}"
fi
out+=("^sep($APPS)") out+=("^sep($APPS)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-f" "$FILEMNGR" "exo-open --launch FileManager")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-f" "$FILEMNGR" "exo-open --launch FileManager")")
@ -95,6 +85,8 @@ out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-w" "$BROWSER" "exo-open --launch WebBr
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-t" "$TERMINAL" "exo-open --launch TerminalEmulator")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-t" "$TERMINAL" "exo-open --launch TerminalEmulator")")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-e" "$EDITOR" geany)") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-e" "$EDITOR" geany)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-/" "$FSEARCH" fsearch)") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-/" "$FSEARCH" fsearch)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-v" "$VOLUME" pavucontrol)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-c" "$COMPOSITOR" compton_toggle)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-l" "$LOCK" "betterlockscreen -l")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-l" "$LOCK" "betterlockscreen -l")")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-x" "$EXIT" "mb-jgtools mblogout")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-x" "$EXIT" "mb-jgtools mblogout")")
@ -102,9 +94,14 @@ out+=("^sep($PANELS)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W" "$M_MAIN" "mb-jgtools main")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W" "$M_MAIN" "mb-jgtools main")")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-s" "$M_SETTINGS" "mb-jgtools settings")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-s" "$M_SETTINGS" "mb-jgtools settings")")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-h" "$M_HELP" "jgkeys-pipe -s")")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "C-tab" "$PLACES" "mb-jgtools places")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "C-tab" "$PLACES" "mb-jgtools places")")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-tab" "$RIGHT" "mb-jgtools right")") out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-tab" "$RIGHT" "mb-jgtools right")")
out+=("^sep($WINDOWS)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-d" "$SHOW_DESKTOP" show_desktop)")
out+=("$(printf "<tt>%-10s</tt> %s,%s" "W-Arrows" "$HALF")")
### RUN ### RUN
if [ $1 == "-s" ]; then if [ $1 == "-s" ]; then
. /usr/bin/pipemenu-standalone.cfg . /usr/bin/pipemenu-standalone.cfg
@ -125,6 +122,8 @@ exit 0
fi fi
printf '%s\n' "${out[@]}" printf '%s\n' "${out[@]}"
if [ $1 == "-r" ]; then
printf '%s\n' "^sep()" printf '%s\n' "^sep()"
printf '%s\n' "$REMOVE,mb-setvar places_keyspipe=false" printf '%s\n' "$REMOVE,mb-setvar places_keyspipe=false"
fi

View File

@ -56,7 +56,7 @@ esac
menus+=("^sep($TITLE)") menus+=("^sep($TITLE)")
# Printing # Printing
if type 'system-config-printer' &> /dev/null; then if type 'system-config-printer' &> /dev/null; then
menus+=("$CONFIGURE_PRINT,zensu system-config-printer") menus+=("$CONFIGURE_PRINT,gksu system-config-printer")
else else
menus+=("$INSTALL_PRINT,pamac-installer manjaro-printing") menus+=("$INSTALL_PRINT,pamac-installer manjaro-printing")
fi fi
@ -79,7 +79,9 @@ done
menus+=("^sep()") menus+=("^sep()")
printf '%s\n' "${menus[@]}" printf '%s\n' "${menus[@]}"
if [ $1 == "-s" ]; then
printf '%s\n' "$REMOVE,mb-setvar places_softwarepipe=false" printf '%s\n' "$REMOVE,mb-setvar places_softwarepipe=false"
fi
printf '%s\n' "${lines[@]}" printf '%s\n' "${lines[@]}"
#echo "grafika,^checkout(grafika)" #echo "grafika,^checkout(grafika)"
#echo -e "^tag(grafika)\ngimp,czy\nblender\ninkscap" #echo -e "^tag(grafika)\ngimp,czy\nblender\ninkscap"

View File

@ -10,6 +10,8 @@ case $LANG in
DF_HEADER="System plików ~~ Typ ~~ Rozmiar ~ Użyte ~ Wolne ~ % ~ Punkt mont." DF_HEADER="System plików ~~ Typ ~~ Rozmiar ~ Użyte ~ Wolne ~ % ~ Punkt mont."
CPU_RAM="CPU ~ RAM ~ Swap | Użyte/Całość" CPU_RAM="CPU ~ RAM ~ Swap | Użyte/Całość"
NETWORK="Sieć" NETWORK="Sieć"
DOWNLOADED="pobrano"
UPLOADED="wysłano"
DATETIME="Data ~ Godzina" DATETIME="Data ~ Godzina"
DATE="Data:" DATE="Data:"
WEEK="Tydzień:" WEEK="Tydzień:"
@ -24,6 +26,8 @@ case $LANG in
DF_HEADER="S.ficheros ~ Tipo ~ Tamaño ~ Usados ~ Disp ~ % ~ Montado en" DF_HEADER="S.ficheros ~ Tipo ~ Tamaño ~ Usados ~ Disp ~ % ~ Montado en"
CPU_RAM="CPU ~ RAM ~ Swap | Usados/Tamaño" CPU_RAM="CPU ~ RAM ~ Swap | Usados/Tamaño"
NETWORK="Red" NETWORK="Red"
DOWNLOADED="downloaded"
UPLOADED="uploaded"
DATETIME="Fecha ~ Hora" DATETIME="Fecha ~ Hora"
DATE="Fecha:" DATE="Fecha:"
WEEK="Semana:" WEEK="Semana:"
@ -38,6 +42,8 @@ case $LANG in
DF_HEADER="Filesystem ~~ Type ~~ Total ~ Used ~ Free ~ % ~ Mount" DF_HEADER="Filesystem ~~ Type ~~ Total ~ Used ~ Free ~ % ~ Mount"
CPU_RAM="CPU ~ RAM ~ Swap | Used/Total " CPU_RAM="CPU ~ RAM ~ Swap | Used/Total "
NETWORK="Network" NETWORK="Network"
DOWNLOADED="downloaded"
UPLOADED="uploaded"
DATETIME="Date ~ Time" DATETIME="Date ~ Time"
DATE="Data:" DATE="Data:"
WEEK="Week:" WEEK="Week:"
@ -109,8 +115,8 @@ out2+=("CPU ~ $CPUmodel")
out2+=("CPU @ $CPUfreq MHz ~ CPU Cache: $CPUcache") out2+=("CPU @ $CPUfreq MHz ~ CPU Cache: $CPUcache")
out2+=("^sep($NETWORK ~ "$NetworkDevice1" ") out2+=("^sep($NETWORK ~ "$NetworkDevice1" ")
out2+=("$NetworkDevice1 ~ ip: $NetDev1ip") out2+=("$NetworkDevice1 ~ ip: $NetDev1ip")
out2+=("$NetworkDevice1 ~ downloaded: ${NetDev1down:1:-1}") out2+=("$NetworkDevice1 ~ $DOWNLOADED: ${NetDev1down:1:-1}")
out2+=("$NetworkDevice1 ~ uploaded: ${NetDev1up:1:-1}") out2+=("$NetworkDevice1 ~ $UPLOADED: ${NetDev1up:1:-1}")
out2+=("^sep($DATETIME)") out2+=("^sep($DATETIME)")
out2+=("$(printf "<tt>%+29s</tt> %s" $DATE "$(date '+%Y.%m.%d (%a)')")") out2+=("$(printf "<tt>%+29s</tt> %s" $DATE "$(date '+%Y.%m.%d (%a)')")")
out2+=("$(printf "<tt>%+30s</tt> %s" $WEEK "$(date '+%W')")") out2+=("$(printf "<tt>%+30s</tt> %s" $WEEK "$(date '+%W')")")
@ -146,5 +152,7 @@ fi
printf '%s\n' "${out[@]}" printf '%s\n' "${out[@]}"
df -HlT | grep -E '^/'|awk '{print "\"\"\"<tt>"$0"</tt>\"\"\",pcmanfm "$7}' df -HlT | grep -E '^/'|awk '{print "\"\"\"<tt>"$0"</tt>\"\"\",pcmanfm "$7}'
printf '%s\n' "${out2[@]}" printf '%s\n' "${out2[@]}"
if [ $1 == "-r" ]; then
printf '%s\n' "^sep()" printf '%s\n' "^sep()"
printf '%s\n' "$REMOVE,mb-setvar places_sysinfopipe=false" printf '%s\n' "$REMOVE,mb-setvar places_sysinfopipe=false"
fi