From 4571a628955fcff5eb74b797610a4b2323ef5822 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Wed, 3 May 2023 15:58:42 +0200 Subject: [PATCH] search field in mainmenu optional --- bin/mb-jgtools | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/bin/mb-jgtools b/bin/mb-jgtools index cadeb8f..3e99838 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -146,8 +146,7 @@ trap "rm -f ${CONFIG_FILE}" EXIT POSITION_MODE=${1:-pointer} HIDE_BACK_ITEMS=1 -#MENU_PADDING_TOP=24 -MENU_PADDING_TOP=$((jgtools_padding + 24)) + panels_topmargin=0 case $LANG in pl*) TYPE_TO_SEARCH="Pisz aby Wyszukać" @@ -180,14 +179,27 @@ case $LANG in SETTINGS="settings";; esac +# Search field +if [[ $search_field = "false" ]];then +MENU_PADDING_TOP=${jgtools_padding} +SEARCH_TEXT="" +SEARCH_FIELD="" +else +MENU_PADDING_TOP=$((jgtools_padding + 24)) +SEARCH_TEXT="@text,,$((jgtools_padding + 24)),$((jgtools_padding + 4)),150,20,0,left,top,auto,#000000," +SEARCH_FIELD="@search,,$((jgtools_padding + 38)),$((jgtools_padding + 4)),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH" +fi + #apps_in_submenu=true rm -f ~/.config/jgmenu/append.csv if [[ $apps_in_submenu == true ]] then cat < $HOME/.config/jgmenu/prepend.csv -@text,,$((jgtools_padding + 24)),$((jgtools_padding + 4)),150,20,0,left,top,auto,#000000, -@search,,$((jgtools_padding + 38)),$((jgtools_padding + 4)),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH +${SEARCH_TEXT} +${SEARCH_FIELD} +#@text,,$((jgtools_padding + 24)),$((jgtools_padding + 4)),150,20,0,left,top,auto,#000000, +#@search,,$((jgtools_padding + 38)),$((jgtools_padding + 4)),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH ^sep() . ~/.config/mabox/favorites.csv $APPS,^checkout(apps),applications-other @@ -217,8 +229,10 @@ EOF else cat < $HOME/.config/jgmenu/prepend.csv -@text,,$((jgtools_padding + 24)),$((jgtools_padding + 4)),150,20,0,left,top,auto,#000000, -@search,,$((jgtools_padding + 38)),$((jgtools_padding + 4)),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH +${SEARCH_TEXT} +${SEARCH_FIELD} +#@text,,$((jgtools_padding + 24)),$((jgtools_padding + 4)),150,20,0,left,top,auto,#000000, +#@search,,$((jgtools_padding + 38)),$((jgtools_padding + 4)),150,20,2,left,top,auto,#000000 0,$TYPE_TO_SEARCH ^sep() . ~/.config/mabox/favorites.csv EOF @@ -303,6 +317,7 @@ case $LANG in MIRROR_RANK="Ranking mirrorów" SETTINGS="Ustawienia" MCC="Centrum Sterowania Mabox" + SETTINGS_MENU="Konfiguracja Mabox" SYS_AND_HARDWARE="System i sprzęt" LOOK_AND_FEEL="Wygląd i zachowanie" HELP="Pomoc" @@ -351,6 +366,7 @@ case $LANG in MIRROR_RANK="Actualizar repositorios" SETTINGS="Ajustes" MCC="Centro de Control Mabox" + SETTINGS_MENU="Mabox Config" SYS_AND_HARDWARE="Sistema y Hardware" LOOK_AND_FEEL="Apariencia" HELP="Ayuda" @@ -399,6 +415,7 @@ case $LANG in MIRROR_RANK="Mirror ranking" SETTINGS="Settings" MCC="Mabox Control Center" + SETTINGS_MENU="Mabox Config" SYS_AND_HARDWARE="System and Hardware" LOOK_AND_FEEL="Look and Feel" HELP="Help" @@ -487,10 +504,10 @@ cat < ${MENU_ITEMS} . $HOME/.config/mabox/right-prepend.csv ^sep($SETTINGS) -$MCC,mcc,distributor-logo-mabox -^sep() +#$MCC,mcc,mcc,distributor-logo-mabox +#^sep() +$SETTINGS_MENU,^root(msettings),mbcc $SYS_AND_HARDWARE,^root(system),audiocard -$LOOK_AND_FEEL,^root(wyglad),preferences-color ^sep($SOFT_MANAGEMENT) $PAMAC_UPDATE,pamac-manager --updates,system-upgrade @@ -540,9 +557,8 @@ $GEOIP pacman-mirrors -i --geoip,^term(sudo pacman-mirrors -i --g ^sep() ⮜ $BACK,^back() -^tag(wyglad) +^tag(msettings) . ~/.config/mabox/settings.csv - ^sep() ⮜ $BACK,^back() . ~/.config/mabox/settings_tags.csv