master
Daniel Napora 2022-12-06 23:16:02 +01:00
parent f15ee6881a
commit 265d061252
2 changed files with 30 additions and 31 deletions

View File

@ -454,16 +454,15 @@ if [[ ! -f "$THUMB" ]]
then
convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB}
fi
JGWIDTH=$((jgtools_padding + 278 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 158))
JGWIDTH=$((jgtools_padding + 270 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 152))
cat <<EOF > ${RHEAD}
@icon,,$((jgtools_padding)),$((jgtools_padding)),278,158,4,left,top,,,${THUMB}
@icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB}
@rect,,$((jgtools_padding + 0)),$((jgtools_padding + 14)),270,22,0,left,top,#222222 20,#222222 70,
@text,,$((jgtools_padding + 100)),$((jgtools_padding + 10)),200,30,0,left,top,#EEEEEE ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>$OSNAME</b> Linux <b>$OSVERSION</b> <i>$OSCODE</i></span>
@icon,,$((jgtools_padding + 2)),$((jgtools_padding + 2)),48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png
@rect,,$((jgtools_padding + 52)),$((jgtools_padding + 2)),200,76,2,left,top,#222222 50,#222222 80,
@text,,$((jgtools_padding + 58)),$((jgtools_padding + 4)),200,20,4,left,top,#EEEEEE,#EEEEEE,<big>$OSNAME $OSVERSION</big> <sup><i>${OSCODE}</i></sup>
@text,,$((jgtools_padding + 58)),$((jgtools_padding + 24)),200,20,4,left,top,#EEEEEE,#EEEEEE,<small>$USER@$HOSTNAME</small>
@rect,,$((jgtools_padding + 72)),$((jgtools_padding + 130)),160,22,2,left,top,#222222 50,#222222 80,
@search,,$((jgtools_padding + 80)),$((jgtools_padding + 130)),292,20,4,left,top,#EEEEEE,##EEEEEE,"""<big></big> <small><i>$TYPE_TO_SEARCH</i></small>"""
@rect,,$((jgtools_padding + 0)),$((jgtools_padding + 120)),160,22,2,left,top,#222222 50,#222222 80,
@search,,$((jgtools_padding + 8)),$((jgtools_padding + 120)),292,20,4,left,top,#EEEEEE,##EEEEEE,"""<big></big> <span size='10400' font_family='Ubuntu'><i>$TYPE_TO_SEARCH</i></span>"""
EOF
else
cat <<EOF > ${RHEAD}
@ -734,13 +733,13 @@ if [[ ! -f "$THUMB" ]]
then
convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB}
fi
JGWIDTH=$((jgtools_padding + 248 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 148))
JGWIDTH=$((jgtools_padding + 270 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 152))
cat <<EOF > ${LHEAD}
@icon,,$((jgtools_padding)),$((jgtools_padding)),248,148,4,left,top,,,${THUMB}
@icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB}
@icon,,$((jgtools_padding - 6)),$((jgtools_padding - 6)),48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png
@rect,,$((jgtools_padding + 82)),$((jgtools_padding + 109)),160,26,2,left,top,#222222 50,#FFFFFF 80,
@text,,$((jgtools_padding + 90)),$((jgtools_padding + 113)),180,20,4,left,top,#222222,auto,<b>$OSNAME $OSVERSION <sup><i>$OSCODE</i></sup></b>
@rect,,$((jgtools_padding + 0)),$((jgtools_padding + 122)),240,22,0,left,top,#222222 20,#222222 70,
@text,,$((jgtools_padding + 68)),$((jgtools_padding + 118)),180,30,0,left,top,#EEEEEE ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>$OSNAME</b> Linux <b>$OSVERSION</b> <i>$OSCODE</i></span>
#@text,,$((jgtools_padding + 62)),$((jgtools_padding + 30)),180,20,4,left,top,#222222,#444444,<small>$USER@$HOSTNAME</small>
EOF
else
@ -848,7 +847,7 @@ case $LANG in
SCRNREC="Nagrywanie pulpitu"
FULLREC="Pełny ekran"
AREA="Obszar lub okno"
VIDEOSETTINGS="Ustawienia nagrywania"
VIDEOSETTINGS="Ust. nagrywania"
AUDIO="Dźwięk"
FORMAT="Kontener (rozszerzenie)"
FRAMERATE="Klatki na sekundę (fps)"
@ -943,13 +942,13 @@ fi
if [ "$record_audio" == "yes" ];then
case "$LANG" in
pl*) AUD="z dźwiękiem";;
pl*) AUD="dźwięk";;
*) AUD="audio";;
esac
else
case "$LANG" in
pl*) AUD="bez dźwięku";;
*) AUD="noaudio";;
pl*) AUD="cisza";;
*) AUD="noaudio";;
esac
fi
mkconfigfile

View File

@ -3,26 +3,26 @@
SLEEP="5"
DESTDIR=$(xdg-user-dir PICTURES)
COLUMNS="1"
COL=1
EXT="webp"
DATE=$(date +"%Y%m%d-%H%M%S")
eval $(xdotool getdisplaygeometry --shell)
numdesk=$(xdotool get_num_desktops)
desk=0
while [[ "$desk" -lt "$numdesk" ]];
do
xdotool set_desktop $desk;
NUMDESK=$(xdotool get_num_desktops)
DESK=0
while [[ "$DESK" -lt "$NUMDESK" ]];
do
xdotool set_desktop $DESK;
sleep ${SLEEP};
scrot -o "/tmp/desktop$desk.png";
desk=$((desk+1));
done
scrot -o "/tmp/desktop${DESK}.${EXT}";
DESK=$((DESK+1));
done
cd ${DESTDIR}
montage /tmp/desktop*.png -tile ${COLUMNS}x${dnum} \
-geometry ${WIDTH}x${HEIGHT}+4+4 workspaces_${DATE}.png
cd "${DESTDIR}"
montage /tmp/desktop*.${EXT} -tile "${COL}"x -geometry "${WIDTH}"x"${HEIGHT}"+4+4 workspaces_"${DATE}".${EXT}
rm /tmp/desktop*.png
rm /tmp/desktop*.${EXT}
viewnior workspaces${DATE}.png &
viewnior workspaces_${DATE}.${EXT} &