master
Daniel Napora 2020-09-17 12:16:41 +02:00
parent 367df8d1ae
commit 81117628c2
6 changed files with 32 additions and 36 deletions

View File

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

View File

@ -1,3 +0,0 @@
jgmenu_font="Noto Sans Medium 10"
jgmenu_item_height=20
jgmenu_icon_size=18

View File

@ -1,3 +0,0 @@
jgmenu_font="Noto Sans Medium 11"
jgmenu_item_height=22
jgmenu_icon_size=20

View File

@ -1,3 +0,0 @@
jgmenu_font="Noto Sans Medium 9"
jgmenu_item_height=18
jgmenu_icon_size=16

View File

@ -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

View File

@ -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