diff --git a/bin/mbx b/bin/mbx index a26b83e..59e42ab 100755 --- a/bin/mbx +++ b/bin/mbx @@ -11,13 +11,26 @@ CNF_DIR="$HOME/.config/mbxutils" CNF_FILE="$CNF_DIR/$ME.conf" [ ! -d "$HOME/.config/jgmenu" ] && mkdir -p "$HOME/.config/jgmenu" +defaults() { +mbx setvar apps_in=rootmenu +mbx setvar menu_padding=5 +mbx setvar item_height_factor=200 +mbx setvar "font=\'Noto Sans\'" +mbx setvar font_size=13 +mbx setvar bgcolor=#252525 +mbx ${1} +} + + [ ! -d "$CNF_DIR" ] && mkdir -p "$CNF_DIR" && cp -r /usr/share/mbxutils/* "$CNF_DIR"/ if [ ! -f $CNF_FILE ]; then cat < ${CNF_FILE} +apps_in=rootmenu menu_padding=5 item_height_factor=200 -font="Noto Sans" -font_size=12 +font='Noto Sans' +font_size=13 +bgcolor=#252525 EOF fi source <(grep = $CNF_FILE) @@ -150,6 +163,16 @@ fi jgmenu --config-file=${CONFIG_FILE} --no-append 2>/dev/null } +distrologo() { + case "$distro" in + Manjaro) logo=manjaro;; + Lubuntu|Mabox) logo=lubuntu;; + *) logo=tux;; +esac +} + + + lpanel() { OSNAME=$(lsb_release -d | awk '{print $2}') #Mabox OSVERSION=$(lsb_release -r | awk '{print $2}') #21.10 @@ -158,14 +181,17 @@ lpanel() { CONFIG_FILE=$(mktemp) MENU_ITEMS=$(mktemp) trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT - menu_padding_top=$((menu_padding+item_margin_y+32)) + menu_padding_top=$((menu_padding+item_margin_y+48)) menu_halign="left" + distro="${distro:-$OSNAME}" + distrologo configure #${HOSTNAME:-$(hostname)}@${USER} cat < ${MENU_ITEMS} -@icon,,$((menu_padding+item_margin_x)),${menu_padding},32,32,0,left,top,,,/usr/share/icons/hicolor/scalable/apps/mbx-lpanel.svg -@text,,$((menu_padding+item_margin_x+32)),${menu_padding},180,32,0,left,top,${fgcolor},#DDDDDD,${OSNAME} ${XDG_SESSION_DESKTOP^} ${OSVERSION} +@icon,,$((menu_padding+item_margin_x)),${menu_padding},48,48,0,left,top,,,/usr/share/mbxutils/logos/distributor-logo-${logo}.svg +@text,,$((menu_padding+item_margin_x+50)),${menu_padding},180,32,0,left,top,${fgcolor},#DDDDDD,$distro ${OSVERSION} ${OSCODE} +@text,,$((menu_padding+item_margin_x+50)),$((menu_padding+20)),180,32,0,left,top,${fgcolor},#DDDDDD,${XDG_SESSION_DESKTOP^} . ~/.config/mbxutils/inc/ltop.csv ^sep(File browser) $HOME,^pipe(mbxfiles ~) @@ -181,15 +207,23 @@ EOF } rpanel() { + OSNAME=$(lsb_release -d | awk '{print $2}') #Mabox + OSVERSION=$(lsb_release -r | awk '{print $2}') #21.10 + OSCODE=$(lsb_release -c | awk '{print $2}') # Geralt CONFIG_FILE=$(mktemp) MENU_ITEMS=$(mktemp) trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT - + menu_padding_top=$((menu_padding+item_margin_y+48)) menu_halign="right" icon_size=$((font_size*item_height_factor/100-2)) - + distro="${distro:-$OSNAME}" + distrologo + configure cat < ${MENU_ITEMS} +@icon,,$((menu_padding+item_margin_x)),${menu_padding},48,48,0,left,top,,,/usr/share/mbxutils/logos/distributor-logo-${logo}.svg +@text,,$((menu_padding+item_margin_x+50)),${menu_padding},180,32,0,left,top,${fgcolor},#DDDDDD,$distro ${OSVERSION} ${OSCODE} +@text,,$((menu_padding+item_margin_x+50)),$((menu_padding+20)),180,32,0,left,top,${fgcolor},#DDDDDD,${XDG_SESSION_DESKTOP^} . ~/.config/mbxutils/inc/rtop.csv ^sep(Right Panel) Preferences,^pipe(mbx-preferences rpanel) @@ -237,7 +271,6 @@ EOF jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null } - setvar() { # Może tu niepotrzebnie a tylko w mbx-preferences search="$(echo $1|cut -d= -f1)=" if grep -Rq $search $CNF_FILE @@ -249,6 +282,7 @@ setvar() { # Może tu niepotrzebnie a tylko w mbx-preferences } case "$1" in + reset) defaults "$2";; appsmenu) appsmenu "$2";; lpanel) lpanel;; rpanel) rpanel;; diff --git a/bin/mbx-preferences b/bin/mbx-preferences index 21724bd..02de01f 100755 --- a/bin/mbx-preferences +++ b/bin/mbx-preferences @@ -107,7 +107,7 @@ setvar() { echo $1 >> $CNF_FILE fi } -me() { +main() { # if $1 brak then standalone PAR="mbx ${1:-preferences}" @@ -141,6 +141,8 @@ me() { out+=("$(printf "%-15s %24s" "Line height:" "[$item_height_factor%]"),^checkout(lineheight)") out+=("$(printf "%-15s %24s" "Menu BGcolor:" "[$bgcolor]"),^checkout(bgcolor)") out+=("$(printf "%-15s %24s" "Menu Padding:" "[$menu_padding]"),^checkout(menupadding)") + out+=("^sep()") + out+=("Reset to default,mbx reset ${1}") out+=("^sep(Other)") out+=("$(printf "%-15s %24s" "Terminal:" "[$terminal]"),^checkout(terminal),terminal") @@ -223,7 +225,7 @@ jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null case "$1" in fonts) fonts "$2";; setvar) setvar "$2";; - appsmenu|lpanel|rpanel|about) me "$1" "$2";; - *) me;; + appsmenu|lpanel|rpanel|about) main "$1" "$2";; + *) main;; esac exit 0 diff --git a/share/mbxutils/logos/README.txt b/share/mbxutils/logos/README.txt new file mode 100644 index 0000000..0aebc13 --- /dev/null +++ b/share/mbxutils/logos/README.txt @@ -0,0 +1 @@ +Distro logos from Papirus Icon theme license GPL3 diff --git a/share/mbxutils/logos/distributor-logo-archlinux.svg b/share/mbxutils/logos/distributor-logo-archlinux.svg new file mode 100644 index 0000000..c2ee8cd --- /dev/null +++ b/share/mbxutils/logos/distributor-logo-archlinux.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/share/mbxutils/logos/distributor-logo-bunsenlabs.svg b/share/mbxutils/logos/distributor-logo-bunsenlabs.svg new file mode 100644 index 0000000..6cd7237 --- /dev/null +++ b/share/mbxutils/logos/distributor-logo-bunsenlabs.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/share/mbxutils/logos/distributor-logo-linux-mint.svg b/share/mbxutils/logos/distributor-logo-linux-mint.svg new file mode 100644 index 0000000..09d9df9 --- /dev/null +++ b/share/mbxutils/logos/distributor-logo-linux-mint.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/share/mbxutils/logos/distributor-logo-lubuntu.svg b/share/mbxutils/logos/distributor-logo-lubuntu.svg new file mode 100644 index 0000000..79aa8ed --- /dev/null +++ b/share/mbxutils/logos/distributor-logo-lubuntu.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/share/mbxutils/logos/distributor-logo-manjaro.svg b/share/mbxutils/logos/distributor-logo-manjaro.svg new file mode 100644 index 0000000..37ca263 --- /dev/null +++ b/share/mbxutils/logos/distributor-logo-manjaro.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/share/mbxutils/logos/distributor-logo-tux.svg b/share/mbxutils/logos/distributor-logo-tux.svg new file mode 100644 index 0000000..bb60ad3 --- /dev/null +++ b/share/mbxutils/logos/distributor-logo-tux.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + +