From 00a5fe6a8201dab200aa88204ca3200a06d40ae8 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Tue, 12 Jan 2021 01:30:52 +0100 Subject: [PATCH] menu/panels settings pipemenu improvements --- usr/bin/jgmenusettings-pipe | 275 +++++++++++++++++++++++++++--------- 1 file changed, 205 insertions(+), 70 deletions(-) diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 4a7fca6..708fd97 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -5,6 +5,31 @@ case $LANG in pl*) TITLE="Ustawienia Menu i Paneli" + MENU_ITEMS="Elementy Menu" + OWN_COMMANDS="własne komendy" + MAINMENU="Menu główne" + LEFTPANEL="Lewy panel" + RIGHTPANEL="Prawy panel" + EXITMENU="Dialog wylogowania" + JGBROWSER="Przeglądarka plików/katalogów" + SHOW_HIDDEN="Wyświetlanie ukrytych plików" + EDIT="Edytuj" + TOP="Góra" + BOTTOM="Dół" + MODULES="Moduły" + RESET="Przywróć domyślne ustawienia" + QUICK_NAV="Szybka nawigacja" + BOOKMARKS="Zakładki" + VBOXES="Maszyny Wirtualne" + PIPEMENUS="Dynamiczne (pipe) menu" + POPINSTALL="Instaluj popularne programy" + SYSINFO="Informacje o systemie" + SHORTCUTS="Skróty klawiszowe" + MENUPANELS="Menu / Panele boczne" + LOOKANDFEEL="Wygląd" + BORDER="Obramowanie" + TOPMARGIN="Margines Paneli Góra/Dół" + SUBSPACING="Odstęp submenu" ICONS="Ikony" CIRCLE="Okrągłe ikony (Numix)" SQUARE="Kwadratowe ikony (Numix)" @@ -18,7 +43,7 @@ case $LANG in BIG="duży" HUGE="wielki" FONT_FAMILY="Czcionka" - COLOR_SCHEME="Motyw kolorów" + COLOR_SCHEME="Schemat kolorystyczny" EDIT_CURRENT="Edytuj aktywny" FOLLOW_OB="Zgodny z motywem OpenBox" CHOOSE="Wybierz..." @@ -26,6 +51,31 @@ case $LANG in ;; es*) TITLE="Menu/Panel lateral" + MENU_ITEMS="Menu Items" + OWN_COMMANDS="Custom Commands" + MAINMENU="Main Menu" + LEFTPANEL="Left panel" + RIGHTPANEL="Right panel" + EXITMENU="" + JGBROWSER="" + SHOW_HIDDEN="Show hidden files" + EDIT="Editar" + TOP="TOP" + BOTTOM="BOTTOM" + MODULES="Modules" + RESET="Reset to default" + QUICK_NAV="Navegación rápida" + BOOKMARKS="Marcadores" + VBOXES="" + PIPEMENUS="Menu con extras" + POPINSTALL="Instalar Programas populares" + SYSINFO="System information" + SHORTCUTS="Atajos del teclado" + MENUPANELS="Menu / Paneles laterales" + LOOKANDFEEL="Apariencia" + BORDER="Menu Border" + TOPMARGIN="Panels Top/Bottom Margin" + SUBSPACING="Submenu Spacing" ICONS="Iconos" CIRCLE="Circilo iconos (Numix)" SQUARE="Cuadrado iconos (Numix)" @@ -46,7 +96,32 @@ case $LANG in REMOVE="Eliminar este menú del panel" ;; *) - TITLE="Menu settings" + TITLE="Menu/Panels settings" + MENU_ITEMS="Menu Items" + OWN_COMMANDS="Custom Commands" + MAINMENU="Main Menu" + LEFTPANEL="Left Panel " + RIGHTPANEL="Right Panel" + EXITMENU="Logout Dialog" + JGBROWSER="File/Directory Browser" + SHOW_HIDDEN="Show hidden files" + EDIT="Edit" + TOP="Top" + BOTTOM="Bottom" + MODULES="Modules" + RESET="Reset to default" + QUICK_NAV="Quick Navigation" + BOOKMARKS="Bookmarks" + VBOXES="Virtual Machines" + PIPEMENUS="Pipe (dynamic) menus" + POPINSTALL="Install popular apps" + SYSINFO="System information" + SHORTCUTS="Keyboard shortcuts" + MENUPANELS="Menu / Sidepanels" + LOOKANDFEEL="Look and Feel" + BORDER="Menu Border" + TOPMARGIN="Panels Top/Bottom Margin" + SUBSPACING="Submenu Spacing" ICONS="Icons" CIRCLE="Circle icons (Numix)" SQUARE="Square icons (Numix)" @@ -68,33 +143,102 @@ case $LANG in ;; esac +me="mb-jgtools $jgtools_last" + +L="mb-jgtools places" +R="mb-jgtools right" +M="" #out+=("^sep($TITLE)") case $menu_font_size in - 7) - t="" - ;; - 8) - s="" - ;; - 9) - n="" - ;; - 10) - b="" - ;; - 12) - h="" - ;; - *) - ;; + 7) t="";; + 8) s="";; + 9) n="";; + 10) b="";; + 11) h="";; + *);; esac -out+=("^sep($SIZE)") -out+=(" $t $TINY,mb-setvar menu_font_size=7;mb-setvar jgmenu_item_height=14;mb-setvar jgmenu_icon_size=14;mb-setvar sep_height=1;mb-setvar item_margin_y=1; mb-jgtools settings - $s $SMALL,mb-setvar menu_font_size=8;mb-setvar jgmenu_item_height=16;mb-setvar jgmenu_icon_size=16;mb-setvar sep_height=2;mb-setvar item_margin_y=2;mb-jgtools settings - $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=2;mb-setvar item_margin_y=2;mb-jgtools settings - $b $BIG,mb-setvar menu_font_size=10;mb-setvar jgmenu_item_height=20;mb-setvar jgmenu_icon_size=20;mb-setvar sep_height=4;mb-setvar item_margin_y=3;mb-jgtools settings - $h $HUGE,mb-setvar menu_font_size=12;mb-setvar jgmenu_item_height=24;mb-setvar jgmenu_icon_size=24;mb-setvar sep_height=5;mb-setvar item_margin_y=3;mb-jgtools settings") +## NOWE .... +#out+=("^sep()") +out+=("^sep($MENU_ITEMS)") +out+=("^sep()") +out+=("$MAINMENU,^checkout(mainmenu_edit)") +out+=("$LEFTPANEL,^checkout(left_edit)") +out+=("$RIGHTPANEL,^checkout(right_edit)") +out+=("$EXITMENU,^checkout(exit_edit)") +out+=("^sep($JGBROWSER)") +[[ $jgbrowser_show_hidden = false ]] && out+=("$SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=true;$me") || out+=("$SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=false;$me") + + + + +out2+=("^tag(mainmenu_edit)") +out2+=("^sep($MAINMENU)") +out2+=("$EDIT $MENU_ITEMS, geany $HOME/.config/jgmenu/prepend.csv, geany") +out2+=("^sep()") +out2+=("$RESET,mb-jgtools reset main") +out2+=("^tag(left_edit)") +out2+=("^sep($LEFTPANEL)") +out2+=("$EDIT $OWN_COMMANDS ($TOP), geany $HOME/.config/mabox/places-prepend.csv, geany") + +out2+=("^sep()") +out2+=("^sep($MODULES)") + +out2+=("$QUICK_NAV") +out2+=("$BOOKMARKS") +out2+=("$VBOXES") +out2+=("M..") +out2+=("^sep()") +out2+=("^sep($PIPEMENUS)") +[[ $places_softwarepipe = false ]] && out2+=("$POPINSTALL,mb-setvar places_softwarepipe=true;$L") || out2+=("$POPINSTALL,mb-setvar places_softwarepipe=false;$L") +[[ $places_sysinfopipe = false ]] && out2+=("$SYSINFO,mb-setvar places_sysinfopipe=true;$L") || out2+=("$SYSINFO,mb-setvar places_sysinfopipe=false;$L") +[[ $places_keyspipe = false ]] && out2+=("$SHORTCUTS,mb-setvar places_keyspipe=true;$L") || out2+=("$SHORTCUTS,mb-setvar places_keyspipe=false;$L") +[[ $places_menusettingspipe = false ]] && out2+=("$MENUPANELS,mb-setvar places_menusettingspipe=true;$L") || out2+=("$MENUPANELS,mb-setvar places_menusettingspipe=false;$L") +out2+=("^sep()") +out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), geany $HOME/.config/mabox/places-append.csv, geany") +out2+=("^sep()") +out2+=("$RESET,mb-jgtools reset left") + +out2+=("^tag(right_edit)") +out2+=("^sep($RIGHTPANEL)") +out2+=("$EDIT $OWN_COMMANDS ($TOP), geany $HOME/.config/mabox/right-prepend.csv, geany") +out2+=("$EDIT $OWN_COMMANDS ($BOTTOM), geany $HOME/.config/mabox/right-append.csv, geany") +out2+=("^sep()") +out2+=("$RESET,mb-jgtools reset right") + +out2+=("^tag(exit_edit)") +out2+=("^sep($EXITMENU)") +out2+=("$EDIT $EXITMENU, geany $HOME/.config/mabox/exit.csv, geany") +out2+=("^sep()") +out2+=("$RESET,mb-jgtools reset logout") +out2+=(". $HOME/.config/mabox/exit.csv") + +## +out+=("^sep()") +out+=("^sep($LOOKANDFEEL)") +out+=("$BORDER [ ${jgtools_border:-0} ],^checkout(mborder)") +out+=("$TOPMARGIN [ ${panels_topmargin:-0} ],^checkout(topmargin)") +out+=("$SUBSPACING [ ${submenu_spacing:-0} ],^checkout(subspacing)") +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(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 3 4 5 6; do out2+=("${i},mb-setvar submenu_spacing=${i};$me");done + + + +out+=("^sep($SIZE)") +out+=(" $t $TINY,mb-setvar menu_font_size=7;mb-setvar jgmenu_item_height=14;mb-setvar jgmenu_icon_size=14;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me + $s $SMALL,mb-setvar menu_font_size=8;mb-setvar jgmenu_item_height=16;mb-setvar jgmenu_icon_size=16;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me + $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me + $b $BIG,mb-setvar menu_font_size=10;mb-setvar jgmenu_item_height=20;mb-setvar jgmenu_icon_size=20;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me + $h $HUGE,mb-setvar menu_font_size=11;mb-setvar jgmenu_item_height=22;mb-setvar jgmenu_icon_size=22;mb-setvar sep_height=2;mb-setvar item_margin_y=2;$me") #out+=("^sep($FONT_FAMILY)") @@ -103,86 +247,77 @@ out+=("^sep()") out+=("$FONT_FAMILY,^checkout(fonty)") case $menu_font_family in - "Noto Sans Light") - nol="" - ;; - "Noto Sans Medium") - nom="" - ;; - Jet*) - je="" - ;; - Aut*) - au="" - ;; - Deja*) - de="" - ;; - Robo*) - ro="" - ;; - Inco*) - in="" - ;; - *) - ;; + "Noto Sans Light") nol="";; + "Noto Sans Medium") nom="";; + Jet*) je="";; + Aut*) au="";; + Deja*) de="";; + Robo*) ro="";; + Inco*) in="";; + *);; esac out2+=("^tag(fonty)") out2+=("^sep($FONT_FAMILY)") -out2+=("$nol Noto Sans Light,mb-setvar \"menu_font_family='Noto Sans Light'\";mb-jgtools settings") -out2+=("$nom Noto Sans Medium,mb-setvar \"menu_font_family='Noto Sans Medium'\";mb-jgtools settings") -out2+=("$je JetBrains Mono Regular,mb-setvar \"menu_font_family='JetBrains Mono Regular'\";mb-jgtools settings") -out2+=("$au Autour One,mb-setvar \"menu_font_family='Autour One'\";mb-jgtools settings") -out2+=("$de DejaVu Serif,mb-setvar \"menu_font_family='DejaVu Serif'\";mb-jgtools settings") -out2+=("$ro Roboto Light,mb-setvar \"menu_font_family='Roboto Light'\";mb-jgtools settings") -out2+=("$in Inconsolata,mb-setvar menu_font_family=Inconsolata;mb-jgtools settings") +out2+=("$nol Noto Sans Light,mb-setvar \"menu_font_family='Noto Sans Light'\";$me") +out2+=("$nom Noto Sans Medium,mb-setvar \"menu_font_family='Noto Sans Medium'\";$me") +out2+=("$je JetBrains Mono Regular,mb-setvar \"menu_font_family='JetBrains Mono Regular'\";$me") +out2+=("$au Autour One,mb-setvar \"menu_font_family='Autour One'\";$me") +out2+=("$de DejaVu Serif,mb-setvar \"menu_font_family='DejaVu Serif'\";$me") +out2+=("$ro Roboto Light,mb-setvar \"menu_font_family='Roboto Light'\";$me") +out2+=("$in Inconsolata,mb-setvar menu_font_family=Inconsolata;$me") ########## ICONS -out+=("^sep($ICONS)") +out+=("^sep($ICONS)") if [ $jgmenu_use_icons == true ]; then - out+=("$HIDE_ICONS,mb-setvar jgmenu_use_icons=false;mb-jgtools settings") + out+=("$HIDE_ICONS,mb-setvar jgmenu_use_icons=false;$me") else - out+=("$SHOW_ICONS,mb-setvar jgmenu_use_icons=true;mb-jgtools settings") + out+=("$SHOW_ICONS,mb-setvar jgmenu_use_icons=true;$me") fi out+=("^sep()") -out+=("$SQUARE,mb-setvar jgmenu_icon_theme=Numix-Square;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") -out+=("$CIRCLE,mb-setvar jgmenu_icon_theme=Numix-Circle;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") +out+=("$SQUARE,mb-setvar jgmenu_icon_theme=Numix-Square;mb-setvar jgmenu_use_icons=true;$me") +out+=("$CIRCLE,mb-setvar jgmenu_icon_theme=Numix-Circle;mb-setvar jgmenu_use_icons=true;$me") if [ -d /usr/share/icons/Sardi-Arc ];then out+=("^sep()") -out+=("Sardi,mb-setvar jgmenu_icon_theme=Sardi;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") -out+=("Sardi-Orb-Colora,mb-setvar jgmenu_icon_theme=Sardi-Orb-Colora;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") -out+=("Sardi-Flat,mb-setvar jgmenu_icon_theme=Sardi-Flat;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") -out+=("Sardi-Flexible,mb-setvar jgmenu_icon_theme=Sardi-Flexible;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") -out+=("Sardi-Mono,mb-setvar jgmenu_icon_theme=Sardi-Mono;mb-setvar jgmenu_use_icons=true;mb-jgtools settings") +out+=("Sardi,^checkout(sardi)") +out2+=("^tag(sardi)") +out2+=("Sardi,mb-setvar jgmenu_icon_theme=Sardi;mb-setvar jgmenu_use_icons=true;$me") +out2+=("Sardi-Orb-Colora,mb-setvar jgmenu_icon_theme=Sardi-Orb-Colora;mb-setvar jgmenu_use_icons=true;$me") +out2+=("Sardi-Flat,mb-setvar jgmenu_icon_theme=Sardi-Flat;mb-setvar jgmenu_use_icons=true;$me") +out2+=("Sardi-Flexible,mb-setvar jgmenu_icon_theme=Sardi-Flexible;mb-setvar jgmenu_use_icons=true;$me") +out2+=("Sardi-Mono,mb-setvar jgmenu_icon_theme=Sardi-Mono;mb-setvar jgmenu_use_icons=true;$me") else out+=("^sep()") out+=("$INSTALL_SARDI, pamac-installer sardi-icons") fi ########## THEMES -out+=("^sep($COLOR_SCHEME)") +out+=("^sep($COLOR_SCHEME)") if [ $jgmenu_theme != obtheme ]; then -out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings +out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me +^sep()") +out+=("$CHOOSE,^checkout(motywy) ^sep()") out+=("$EDIT_CURRENT: ($jgmenu_theme),geany $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany") else ob_file=$HOME/.config/openbox/rc.xml [[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") -out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;mb-jgtools settings +out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me +^sep()") +out+=("$CHOOSE,^checkout(motywy) ^sep()") out+=("$EDIT_CURRENT: (${wm_theme// /_}),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany") fi -out+=("$CHOOSE,^checkout(motywy)") + out2+=("^tag(motywy)") for item in "$HOME"/.config/mabox/jgobthemes/*colorrc; do theme="${item##*/}" - out2+=("${theme%.*},mb-setvar jgmenu_theme=${theme%.*};mb-jgtools settings") + out2+=("${theme%.*},mb-setvar jgmenu_theme=${theme%.*};$me") done ### RUN