From a875ad2b06554045a9a3193abe09af94b63d0d13 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 14 Jan 2021 18:55:20 +0100 Subject: [PATCH] update --- usr/bin/jgmenusettings-pipe | 17 ++++++++++++++--- usr/bin/jgsysinfo-pipe | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index e6641a8..f0b5354 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -7,6 +7,7 @@ case $LANG in TITLE="Ustawienia Menu i Paneli" MENU_ITEMS="Elementy Menu" OWN_COMMANDS="własne komendy" + FAVORITES="Ulubione" MAINMENU="Menu główne" LEFTPANEL="Lewy panel" RIGHTPANEL="Prawy panel" @@ -28,6 +29,7 @@ case $LANG in MENUPANELS="Menu / Panele boczne" LOOKANDFEEL="Wygląd" BORDER="Obramowanie" + PADDING="Margines wewnętrzny" RADIUS="Zaokrąglone rogi" TOPMARGIN="Margines Paneli Góra/Dół" SUBSPACING="Odstęp submenu" @@ -54,6 +56,7 @@ case $LANG in TITLE="Menu/Panel lateral" MENU_ITEMS="Menu Items" OWN_COMMANDS="Custom Commands" + FAVORITES="Favoritos" MAINMENU="Main Menu" LEFTPANEL="Left panel" RIGHTPANEL="Right panel" @@ -75,6 +78,7 @@ case $LANG in MENUPANELS="Menu / Paneles laterales" LOOKANDFEEL="Apariencia" BORDER="Menu Border" + PADDING="Padding" RADIUS="Rounded Corners" TOPMARGIN="Panels Top/Bottom Margin" SUBSPACING="Submenu Spacing" @@ -101,6 +105,7 @@ case $LANG in TITLE="Menu/Panels settings" MENU_ITEMS="Menu Items" OWN_COMMANDS="Custom Commands" + FAVORITES="Favorites" MAINMENU="Main Menu" LEFTPANEL="Left Panel " RIGHTPANEL="Right Panel" @@ -122,6 +127,7 @@ case $LANG in MENUPANELS="Menu / Sidepanels" LOOKANDFEEL="Look and Feel" BORDER="Menu Border" + PADDING="Padding" RADIUS="Rounded Corners" TOPMARGIN="Panels Top/Bottom Margin" SUBSPACING="Submenu Spacing" @@ -174,7 +180,7 @@ out+=("^sep($JGBROWSER)") out2+=("^tag(mainmenu_edit)") out2+=("^sep($MAINMENU)") -out2+=("$EDIT $MENU_ITEMS, geany $HOME/.config/jgmenu/prepend.csv, geany") +out2+=("$EDIT $FAVORITES, geany $HOME/.config/mabox/favorites.csv, geany") out2+=("^sep(Reset)") out2+=("$RESET,mb-jgtools reset main") out2+=("^tag(left_edit)") @@ -217,6 +223,7 @@ out2+=("$RESET,mb-jgtools reset logout") out+=("^sep()") out+=("^sep($LOOKANDFEEL)") out+=("$BORDER [ ${jgtools_border:-0} ],^checkout(mborder)") +out+=("$PADDING [ ${jgtools_padding:-0} ],^checkout(mpadding)") out+=("$RADIUS [ ${jgtools_radius:-0} ],^checkout(mradius)") out+=("$TOPMARGIN [ ${panels_topmargin:-0} ],^checkout(topmargin)") out+=("$SUBSPACING [ ${submenu_spacing:-0} ],^checkout(subspacing)") @@ -224,15 +231,19 @@ out2+=("^tag(mborder)") #for i in 0 1 2 3 4; do out2+=("${i},mb-setvar jgtools_border=${i};$me");done for i in 0 1 2 3 4; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_border=${i};$me")");done +out2+=("^tag(mpadding)") +#for i in 0 1 2 3 4; do out2+=("${i},mb-setvar jgtools_border=${i};$me");done +for i in 0 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_padding=${i};$me")");done + out2+=("^tag(mradius)") -for i in 0 1 2 3 4 6 8 12; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_radius=${i};$me")");done +for i in 0 1 2 3 4 6 8 12 14 16 18 20; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_radius=${i};$me")");done out2+=("^tag(topmargin)") for i in 0 20 30 40 50 60 80 100; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar panels_topmargin=${i};$me")");done #for i in 0 20 30 40 50 60 80 100; do out2+=("${i},mb-setvar panels_topmargin=${i};$me");done out2+=("^tag(subspacing)") -for i in -8 -6 -4 -2 0 1 2 3 4 5 6; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done +for i in -8 -6 -4 -2 0 1 2 4 6 8 10; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done #for i in -8 -6 -4 -2 0 1 2 3 4 5 6; do out2+=("${i},mb-setvar submenu_spacing=${i};$me");done diff --git a/usr/bin/jgsysinfo-pipe b/usr/bin/jgsysinfo-pipe index 88ab72b..5083dc1 100755 --- a/usr/bin/jgsysinfo-pipe +++ b/usr/bin/jgsysinfo-pipe @@ -139,7 +139,7 @@ mkconfigfile cat < ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") -$(df -HlT | grep -E '^/'|awk '{print "\"\"\""$0"\"\"\",pcmanfm "$7}') +$(df -HlT | grep -E '^/'|awk '{print "\"\"\""$0"\"\"\",^pipe(jgbrowser "$7")"}') $(printf '%s\n' "${out2[@]}") EOF @@ -150,7 +150,7 @@ exit 0 fi printf '%s\n' "${out[@]}" -df -HlT | grep -E '^/'|awk '{print "\"\"\""$0"\"\"\",pcmanfm "$7}' +df -HlT | grep -E '^/'|awk '{print "\"\"\""$0"\"\"\",^pipe(jgbrowser "$7")"}' printf '%s\n' "${out2[@]}" if [ $1 == "-r" ]; then printf '%s\n' "^sep()"