Mabox
/
mb-jgtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no screenshot in exit dialog

master
Daniel Napora 2023-08-02 19:06:02 +02:00
parent 2629e61d21
commit d058b8db2e
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/mb-jgtools
View File

@ -843,7 +843,6 @@ if [[ -n "$1" ]]
else else
MENU_HALIGN="center" MENU_HALIGN="center"
MENU_VALIGN="center" MENU_VALIGN="center"
continue
fi fi
CONFIG_FILE=$(mktemp) CONFIG_FILE=$(mktemp)
MENU_ITEMS=$(mktemp) MENU_ITEMS=$(mktemp)
@ -855,9 +854,11 @@ case $LANG in
*) CANCEL="Cancel";; *) CANCEL="Cancel";;
esac esac
jgtools_padding=${jgtools_padding:-0} jgtools_padding=${jgtools_padding:-0}
JGWIDTH=$((jgtools_padding + 348 + jgtools_padding)) #JGWIDTH=$((jgtools_padding + 348 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 221)) #MENU_PADDING_TOP=$((jgtools_padding + 221))
TABS="250" JGWIDTH=$((jgtools_padding + 270 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 152))
TABS="200"
icons=1 icons=1
iconmargin=2 iconmargin=2
item_height_factor=300 item_height_factor=300
@ -866,9 +867,24 @@ item_height_factor=300
mkconfigfile mkconfigfile
#wmctrl -k on #wmctrl -k on
THUMB="$(DISPLAY=:0 scrot -t 340x213 -o $HOME/.config/mabox/mblogout.png -e 'echo $m')" read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
THUMBDIR="$HOME/.cache/colorizer/thumbs"
mkdir -p ${THUMBDIR}
NAME=${WALLPATH////_}
if [[ "${NAME}" =~ ^_home_.* ]]; then
n=${#HOME}
((n++))
NAME=${NAME:${n}}
fi
THUMB="${THUMBDIR}/${NAME}.png"
if [[ ! -f "$THUMB" ]]
then
convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB}
fi
cat <<EOF > ${MENU_ITEMS} cat <<EOF > ${MENU_ITEMS}
@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),340,100,4,left,top,,,$THUMB @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,$THUMB
#@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
@text,,$((jgtools_padding + 180)),$((jgtools_padding + 170)),220,20,4,left,top,${color_sel_fg% *},${color_sel_bg% *},$OSNAME $OSVERSION <sup> $OSCODE</sup> @text,,$((jgtools_padding + 180)),$((jgtools_padding + 170)),220,20,4,left,top,${color_sel_fg% *},${color_sel_bg% *},$OSNAME $OSVERSION <sup> $OSCODE</sup>
@text,,$((jgtools_padding + 180)),$((jgtools_padding + 190)),200,20,4,left,top,${color_norm_fg% *},#DDDDDD,<small>$USER@$HOSTNAME</small> @text,,$((jgtools_padding + 180)),$((jgtools_padding + 190)),200,20,4,left,top,${color_norm_fg% *},#DDDDDD,<small>$USER@$HOSTNAME</small>

1
bin/mb-reset
View File

@ -120,7 +120,6 @@ fc-cache
} }
__tint2() { __tint2() {
rm $HOME/.local/share/fonts/lucide.ttf
mkdir -p $HOME/.config/fontconfig/conf.d mkdir -p $HOME/.config/fontconfig/conf.d
rsync -a /usr/share/mabox/common/66-symbols.conf $HOME/.config/fontconfig/conf.d/ rsync -a /usr/share/mabox/common/66-symbols.conf $HOME/.config/fontconfig/conf.d/
fc-cache fc-cache