From d058b8db2eb155ec92778fb4de593041190c974c Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Wed, 2 Aug 2023 19:06:02 +0200 Subject: [PATCH] no screenshot in exit dialog --- bin/mb-jgtools | 28 ++++++++++++++++++++++------ bin/mb-reset | 1 - 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 442fc73..c43d49c 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -843,7 +843,6 @@ if [[ -n "$1" ]] else MENU_HALIGN="center" MENU_VALIGN="center" - continue fi CONFIG_FILE=$(mktemp) MENU_ITEMS=$(mktemp) @@ -855,9 +854,11 @@ case $LANG in *) CANCEL="Cancel";; esac jgtools_padding=${jgtools_padding:-0} -JGWIDTH=$((jgtools_padding + 348 + jgtools_padding)) -MENU_PADDING_TOP=$((jgtools_padding + 221)) -TABS="250" +#JGWIDTH=$((jgtools_padding + 348 + jgtools_padding)) +#MENU_PADDING_TOP=$((jgtools_padding + 221)) +JGWIDTH=$((jgtools_padding + 270 + jgtools_padding)) +MENU_PADDING_TOP=$((jgtools_padding + 152)) +TABS="200" icons=1 iconmargin=2 item_height_factor=300 @@ -866,9 +867,24 @@ item_height_factor=300 mkconfigfile #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 < ${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 @text,,$((jgtools_padding + 180)),$((jgtools_padding + 170)),220,20,4,left,top,${color_sel_fg% *},${color_sel_bg% *},$OSNAME $OSVERSION $OSCODE @text,,$((jgtools_padding + 180)),$((jgtools_padding + 190)),200,20,4,left,top,${color_norm_fg% *},#DDDDDD,$USER@$HOSTNAME diff --git a/bin/mb-reset b/bin/mb-reset index 107278d..300682c 100755 --- a/bin/mb-reset +++ b/bin/mb-reset @@ -120,7 +120,6 @@ fc-cache } __tint2() { -rm $HOME/.local/share/fonts/lucide.ttf mkdir -p $HOME/.config/fontconfig/conf.d rsync -a /usr/share/mabox/common/66-symbols.conf $HOME/.config/fontconfig/conf.d/ fc-cache