diff --git a/bin/mb-jgtools b/bin/mb-jgtools index c7db3d9..9f4a31f 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -3,8 +3,6 @@ # mb-jgtools: Menu, Sidepanels, Screenshot Tool and Exit Dialog for Mabox # Copyright (C) 2019-2020 Daniel Napora - - . $HOME/.config/mabox/mabox.conf ## TEMPORARY SETTINGS MENU FIX @@ -25,8 +23,6 @@ mb-setvar menu_font_size=9 fi ## END TEMPORARY SETTINGS MENU FIX - - jgmenu_theme=${jgmenu_theme:-obtheme} case $jgmenu_theme in @@ -50,12 +46,14 @@ case $jgmenu_theme in done < $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc ;; esac -#. $HOME/.config/mabox/jgmenusize.conf + menu_font_size=${menu_font_size:-9} menu_font_family=${menu_font_family:-Noto Sans Medium} jgmenu_font="${menu_font_family} ${menu_font_size}" -echo "${menu_font_family} ${menu_font_size}" +[ -z $jgmenu_use_borders ] && menu_border=0 + + gtkbookmarks() { BOOKMARKS="$HOME/.gtk-bookmarks" if [[ -s "$BOOKMARKS" ]]; then @@ -99,6 +97,7 @@ hide_back_items = ${HIDE_BACK_ITEMS:-0} terminal_exec = terminator terminal_args = -e tabs = ${TABS:-220} +menu_border = ${menu_border:-0} menu_margin_x = 0 menu_margin_y = 0 menu_width = $JGWIDTH @@ -178,6 +177,7 @@ trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT MENU_HALIGN="right" ITEM_HALIGN="left" ARROW_STRING=" ⮜ " +JGWIDTH=250 TABS="100" MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2) @@ -212,6 +212,7 @@ case $LANG in KEYBOARD="Ustawienia klawiatury" HARDWARE="Konfiguracja sprzętowa" ARANDR="Rozdzielczość ekranu" + SYSINFO="Informacje o systemie" LXAPPEARANCE="Wystrój i ikony" NITROGEN="Wybór tapety" OBCONF="Menadżer konfiguracji OpenBox" @@ -257,6 +258,7 @@ case $LANG in KEYBOARD="Ajustes del teclado" HARDWARE="Configuración Hardware" ARANDR="Resolución de pantalla" + SYSINFO="System information" LXAPPEARANCE="Temas e íconos" NITROGEN="Fondos de pantalla" OBCONF="Configuración de Openbox" @@ -302,6 +304,7 @@ case $LANG in KEYBOARD="Keyboard Settings" HARDWARE="Hardware Configuration" ARANDR="Screen resolution" + SYSINFO="System information" LXAPPEARANCE="Themes and icons" NITROGEN="Wallpaper" OBCONF="Openbox Configuration Manager" @@ -326,7 +329,8 @@ cat < ${MENU_ITEMS} @icon,,15,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png @text,,70,10,200,20,4,left,top,${color_title_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,70,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME -#@icon,,60,$(expr $MENU_HEIGHT_MIN - 153),143,143,4,left,top,,,$HOME/.config/mabox/right.png +@icon,,53,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,center,top,,,$HOME/.config/mabox/mabox3Dgreen.png + @text,,20,50,200,20,4,left,top,#666666,#444444, @search,,100,50,292,20,4,left,top,auto,#262626,""" $TYPE_TO_SEARCH""" @@ -376,6 +380,7 @@ $HARDWARE,manjaro-settings-manager -m msm_mhwd,preferences-desktop-peripherals-d ^sep() $ARANDR,arandr,monitor ^sep(System Info) +$SYSINFO,^pipe(jgsysinfo-pipe),distributor-logo-linux CPU-X,cpu-x,cpu-x ⮜ $BACK,^back() @@ -439,39 +444,47 @@ case $LANG in QUICK_NAV="Szybka nawigacja" HOME_DIR="Katalog Domowy" ROOTDIR="Katalog główny" - POP_APPS_PIPE="Instaluj popularne programy" - POPINSTALL="Instaluj..." + PIPEMENUS="Dynamiczne menu" + POPINSTALL="Instaluj popularne programy" + SYSINFO="Informacje o systemie" + SHORTCUTS="Skróty klawiszowe" ;; es*) QUICK_NAV="Navegación rápida" HOME_DIR="Carpeta personal" ROOTDIR="Directorio raíz" - POP_APPS_PIPE="Instalar Programas populares" - POPINSTALL="Instalar..." + PIPEMENUS="Pipemenus" + POPINSTALL="Instalar Programas populares" + SYSINFO="System information" + SHORTCUTS="Atajos del teclado" ;; *) QUICK_NAV="Quick Navigation" HOME_DIR="Home Directory" ROOTDIR="Main Directory" - POP_APPS_PIPE="Install popular apps" - POPINSTALL="Install..." + PIPEMENUS="Pipemenus" + POPINSTALL="Install popular apps" + SYSINFO="System information" + SHORTCUTS="Keyboard shortcuts" ;; esac MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2) -JGWIDTH=220 +JGWIDTH=250 jgmenu_icon_size=0 MENU_PADDING_TOP=70 -[ $places_softwarepipe == true ] && softwarepipe="^sep($POP_APPS_PIPE) +[ $places_softwarepipe == true ] && softwarepipe="^sep($PIPEMENUS) $POPINSTALL,^pipe(jgsoftware-pipe)" - +[ $places_sysinfopipe == true ] && sysinfopipe="$SYSINFO,^pipe(jgsysinfo-pipe)" +[ $places_keyspipe == true ] && keyspipe="$SHORTCUTS,^pipe(jgkeys-pipe)" mkconfigfile cat < ${MENU_ITEMS} @icon,,10,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png -@icon,,40,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,left,top,,,$HOME/.config/mabox/tux.svg +#@icon,,40,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,left,top,,,$HOME/.config/mabox/tux.svg +@icon,,53,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,center,top,,,$HOME/.config/mabox/mabox3Dsilver.png @text,,70,10,200,20,4,left,top,${color_title_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,70,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME @text,,70,50,200,20,4,left,top,#666666,#444444, @@ -491,6 +504,8 @@ $(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)) $(gtkbookmarks) . $HOME/.config/mabox/vboxes.csv $softwarepipe +$sysinfopipe +$keyspipe . $HOME/.config/mabox/places-append.csv EOF diff --git a/mb-jgtools/big b/mb-jgtools/big deleted file mode 100644 index 8e4fd0b..0000000 --- a/mb-jgtools/big +++ /dev/null @@ -1,3 +0,0 @@ -jgmenu_font="Noto Sans Medium 10" -jgmenu_item_height=20 -jgmenu_icon_size=18 diff --git a/mb-jgtools/huge b/mb-jgtools/huge deleted file mode 100644 index f0042e6..0000000 --- a/mb-jgtools/huge +++ /dev/null @@ -1,3 +0,0 @@ -jgmenu_font="Noto Sans Medium 11" -jgmenu_item_height=22 -jgmenu_icon_size=20 diff --git a/mb-jgtools/normal b/mb-jgtools/normal deleted file mode 100644 index 783d622..0000000 --- a/mb-jgtools/normal +++ /dev/null @@ -1,3 +0,0 @@ -jgmenu_font="Noto Sans Medium 9" -jgmenu_item_height=18 -jgmenu_icon_size=16 diff --git a/mb-jgtools/small b/mb-jgtools/small deleted file mode 100644 index 85156fc..0000000 --- a/mb-jgtools/small +++ /dev/null @@ -1,5 +0,0 @@ -jgmenu_font="Noto Sans Medium 8" -jgmenu_item_height=16 -jgmenu_icon_size=12 -sep_height=2 -item_margin_y=2 diff --git a/mb-jgtools/tiny b/mb-jgtools/tiny deleted file mode 100644 index 906f5b8..0000000 --- a/mb-jgtools/tiny +++ /dev/null @@ -1,5 +0,0 @@ -jgmenu_font="Noto Sans Medium 7" -jgmenu_item_height=14 -jgmenu_icon_size=8 -sep_height=1 -item_margin_y=1