diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 870693f..d4f05d2 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -1015,13 +1015,14 @@ case $LANG in SEC15="Za 15 sekund" BACK="wróć" OPEN_SCR_DIR="Otwórz katalog ze zrzutami ekranu" + OPTIMIZE_IMG="Optymalizacja obrazków (online)" CANCEL="Anuluj" SCRNREC="Nagrywanie pulpitu" FULLREC="Pełny ekran" AREA="Obszar lub okno" SETTINGS="Ustawienia" SCROTSETTINGS="Zrzuty ekranu" - EXTENSION="Typ obrazka (rozszerzenie)" + EXTENSION="Typ obrazka (rozszerzenie) dla zrzutu ekranu" VIDEOSETTINGS="Ustawienia nagrywania" AUDIO="Dźwięk" FORMAT="Kontener (rozszerzenie)" @@ -1043,13 +1044,14 @@ case $LANG in SEC15="En 15 segundos" BACK="atrás" OPEN_SCR_DIR="Abrir carpeta de capturas" + OPTIMIZE_IMG="Optimize images (online)" CANCEL="Cancelar" SCRNREC="Grabador Captura Pantalla" FULLREC="Pantalla Completa " AREA="Área seleccionada o Ventana" SETTINGS="Ajustes" SCROTSETTINGS="Screenshot settings" - EXTENSION="File type (extension)" + EXTENSION="File type (extension) for screenshot" VIDEOSETTINGS="Ajustes de Grabación" AUDIO="Audio" FORMAT="Formato de archivo (extension)" @@ -1071,14 +1073,15 @@ case $LANG in SEC15="In 15 seconds" BACK="back" OPEN_SCR_DIR="Open screenshot directory" + OPTIMIZE_IMG="Optimize images (online)" CANCEL="Cancel" SCRNREC="Screen recording" FULLREC="Full screen " AREA="Selected Area or Window" SETTINGS="Settings" SCROTSETTINGS="Screenshot settings" - EXTENSION="File type (extension)" - VIDEOSETTINGS="Recording settings" + EXTENSION="File type (extension) for screenshot" + VIDEOSETTINGS="Desktop Recording settings" AUDIO="Audio" FORMAT="Container (file extension)" FRAMERATE="Framerate (fps)" @@ -1143,90 +1146,97 @@ else fi mkconfigfile -cat < ${MENU_ITEMS} -@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),340,100,4,left,top,,,$THUMB -^sep($SCRNSHOTS ($EXT)) -  $FULLSCR,^root(full) -  $ACTIVE_WIN,^root(window) -  $ACTIVE_WIN_NO_DECOR,^root(borderless) -  $SELECTED,^root(selected) +out+=("^sep($SCRNSHOTS [$EXT])") +out+=(" $FULLSCR,^root(full)") +out+=(" $ACTIVE_WIN,^root(window)") +out+=(" $ACTIVE_WIN_NO_DECOR,^root(borderless)") +out+=(" $SELECTED,^root(selected)") #  Multimonitor, scrot -m $IMG -e $VIEW -^sep() -  $OPEN_SCR_DIR,xdg-open $(xdg-user-dir PICTURES)/screenshots -^sep($SCRNREC ($container ${AUD} $framerate fps)) -  $FULLREC,mb-screenrec -f -  $AREA,mb-screenrec -a -^sep() +out+=("^sep()") +out+=(" $OPEN_SCR_DIR,xdg-open $(xdg-user-dir PICTURES)/screenshots") +out+=("^sep()") +out+=(" $OPTIMIZE_IMG ,xdg-open https://squoosh.app") -  $OPEN_REC_DIR,xdg-open $(xdg-user-dir VIDEOS)/Recordings -^sep() -  $SETTINGS,^checkout(settings) -^sep() -  $CANCEL esc,exit 1 -^tag(full) -^sep($FULLSCR ) -  $NOW,scrot $IMG -e $VIEW -  $SEC5,scrot -d 5 $IMG -e $VIEW -  $SEC10,scrot -d 10 $IMG -e $VIEW -  $SEC15,scrot -d 15 $IMG -e $VIEW -^sep() - ${arrow_string_left} $BACK,^back() -^tag(window) -^sep($ACTIVE_WIN ) -  $NOW,scrot -d 1 -u -b $IMG -e $VIEW -  $SEC5,scrot -d 5 -u -b $IMG -e $VIEW -  $SEC10,scrot -d 10 -u -b $IMG -e $VIEW -  $SEC15,scrot -d 15 -u -b $IMG -e $VIEW -^sep() - ${arrow_string_left} $BACK,^back() -^tag(borderless) -^sep($ACTIVE_WIN_NO_DECOR) -  $NOW,scrot -d 1 -u $IMG -e $VIEW -  $SEC5,scrot -d 5 -u $IMG -e $VIEW -  $SEC10,scrot -d 10 -u $IMG -e $VIEW -  $SEC15,scrot -d 15 -u $IMG -e $VIEW -^sep() - ${arrow_string_left} $BACK,^back() -^tag(selected) -^sep($SELECTED) -  $NOW,"""maim -s -l -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}""" -  $SEC5,"""maim -s -l --delay=5 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}""" -  $SEC10,"""maim -s -l --delay=10 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}""" -  $SEC15,"""maim -s -l --delay=15 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}""" -^sep() - ${arrow_string_left} $BACK,^back() -^tag(settings) -^sep($SCROTSETTINGS) -$EXTENSION [ ${EXT} ],^checkout(imgext) -^sep($VIDEOSETTINGS) -$AUDIO [ ${AUD} ],^checkout(audio) -$FORMAT [ ${container} ],^checkout(format) -$FRAMERATE [ ${framerate} ],^checkout(framerate) -^sep() -  $EDIT_CONF_FILE,xdg-open $CNF_FILE -^tag(imgext) -^sep($EXTENSION) -WebP (.webp),mb-setvar image_extension=webp ${CNF_FILE};mb-jgtools screenshot ipc -PNG (.png),mb-setvar image_extension=png ${CNF_FILE};mb-jgtools screenshot ipc -JPG (.jpg),mb-setvar image_extension=jpg ${CNF_FILE};mb-jgtools screenshot ipc -^tag(audio) -^sep($AUDIO) -$REC_AUDIO,mb-setvar record_audio=yes ${CNF_FILE};mb-jgtools screenshot ipc -$NO_AUDIO,mb-setvar record_audio=no ${CNF_FILE};mb-jgtools screenshot ipc -^tag(format) -^sep($FORMAT) -webm,mb-setvar container=webm ${CNF_FILE};mb-jgtools screenshot ipc -mkv,mb-setvar container=mkv ${CNF_FILE};mb-jgtools screenshot ipc -mp4,mb-setvar container=mp4 ${CNF_FILE};mb-jgtools screenshot ipc -^tag(framerate) -^sep($FRAMERATE) -30,mb-setvar framerate=30 ${CNF_FILE};mb-jgtools screenshot ipc -25,mb-setvar framerate=25 ${CNF_FILE};mb-jgtools screenshot ipc -24,mb-setvar framerate=24 ${CNF_FILE};mb-jgtools screenshot ipc -15,mb-setvar framerate=15 ${CNF_FILE};mb-jgtools screenshot ipc -10,mb-setvar framerate=10 ${CNF_FILE};mb-jgtools screenshot ipc +out+=("^sep($SCRNREC [$container ${AUD} $framerate fps])") +out+=(" $FULLREC,mb-screenrec -f") +out+=(" $AREA,mb-screenrec -a") +out+=("^sep()") + +out+=(" $OPEN_REC_DIR,xdg-open $(xdg-user-dir VIDEOS)/Recordings") + +out+=("^sep()") +out+=(" $SETTINGS,^root(settings)") + +#out+=("^sep()") +#out+=("  $CANCEL esc,exit 1") +out+=("^tag(full)") +out+=("^sep($FULLSCR )") +out+=(" $NOW,scrot $IMG -e $VIEW") +out+=(" $SEC5,scrot -d 5 $IMG -e $VIEW") +out+=(" $SEC10,scrot -d 10 $IMG -e $VIEW") +out+=(" $SEC15,scrot -d 15 $IMG -e $VIEW") +out+=("^sep()") +out+=(" ${arrow_string_left} $BACK,^back()") +out+=("^tag(window)") +out+=("^sep($ACTIVE_WIN )") +out+=(" $NOW,scrot -d 1 -u -b $IMG -e $VIEW") +out+=(" $SEC5,scrot -d 5 -u -b $IMG -e $VIEW") +out+=(" $SEC10,scrot -d 10 -u -b $IMG -e $VIEW") +out+=(" $SEC15,scrot -d 15 -u -b $IMG -e $VIEW") +out+=("^sep()") +out+=(" ${arrow_string_left} $BACK,^back()") +out+=("^tag(borderless)") +out+=("^sep($ACTIVE_WIN_NO_DECOR)") +out+=(" $NOW,scrot -d 1 -u $IMG -e $VIEW") +out+=(" $SEC5,scrot -d 5 -u $IMG -e $VIEW") +out+=(" $SEC10,scrot -d 10 -u $IMG -e $VIEW") +out+=(" $SEC15,scrot -d 15 -u $IMG -e $VIEW") +out+=("^sep()") +out+=(" ${arrow_string_left} $BACK,^back()") +out+=("^tag(selected)") +out+=("^sep($SELECTED)") +out+=(" $NOW,\"\"\"maim -s -l -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}\"\"\"") +out+=(" $SEC5,\"\"\"maim -s -l --delay=5 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}\"\"\"") +out+=(" $SEC10,\"\"\"maim -s -l --delay=10 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}\"\"\"") +out+=(" $SEC15,\"\"\"maim -s -l --delay=15 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}\"\"\"") +out+=("^sep()") +out+=(" ${arrow_string_left} $BACK,^back()") + + +out+=("^tag(settings)") +out+=("^sep($EXTENSION)") +[[ "${EXT}" == "webp" ]] && out+=(" WebP (.webp),mb-setvar image_extension=webp ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" WebP (.webp),mb-setvar image_extension=webp ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "${EXT}" == "png" ]] && out+=(" PNG (.png),mb-setvar image_extension=png ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" PNG (.png),mb-setvar image_extension=png ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "${EXT}" == "jpg" ]] && out+=(" JPG (.jpg),mb-setvar image_extension=jpg ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" JPG (.jpg),mb-setvar image_extension=jpg ${CNF_FILE};mb-jgtools screenshot ipc") +out+=("^sep($VIDEOSETTINGS)") +[[ "${AUD}" == "audio" ]] && out+=(" $REC_AUDIO,mb-setvar record_audio=no ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" $REC_AUDIO,mb-setvar record_audio=yes ${CNF_FILE};mb-jgtools screenshot ipc") +out+=("$FORMAT [ ${container} ],^checkout(format)") +out+=("$FRAMERATE [ ${framerate} ],^checkout(framerate)") +out+=("^sep()") +out+=(" $EDIT_CONF_FILE,xdg-open $CNF_FILE") +out+=(" ${arrow_string_left} $BACK,^back()") + +out+=("^tag(format)") +out+=("^sep($FORMAT)") +[[ "$container" == "webm" ]] && out+=(" WebM,mb-setvar container=webm ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" WebM,mb-setvar container=webm ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "$container" == "mkv" ]] && out+=(" MKV,mb-setvar container=mkv ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" MKV,mb-setvar container=mkv ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "$container" == "mp4" ]] && out+=(" MP4,mb-setvar container=mp4 ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" MP4,mb-setvar container=mp4 ${CNF_FILE};mb-jgtools screenshot ipc") +out+=("^tag(framerate)") +out+=("^sep($FRAMERATE)") +[[ "${framerate}" == "30" ]] && out+=(" 30,mb-setvar framerate=30 ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" 30,mb-setvar framerate=30 ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "${framerate}" == "25" ]] && out+=(" 25,mb-setvar framerate=25 ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" 25,mb-setvar framerate=25 ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "${framerate}" == "24" ]] && out+=(" 24,mb-setvar framerate=24 ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" 24,mb-setvar framerate=24 ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "${framerate}" == "15" ]] && out+=(" 15,mb-setvar framerate=15 ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" 15,mb-setvar framerate=15 ${CNF_FILE};mb-jgtools screenshot ipc") +[[ "${framerate}" == "10" ]] && out+=(" 10,mb-setvar framerate=10 ${CNF_FILE};mb-jgtools screenshot ipc") || out+=(" 10,mb-setvar framerate=10 ${CNF_FILE};mb-jgtools screenshot ipc") + + +cat < ${MENU_ITEMS} +@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),340,100,4,left,top,,,$THUMB + +$(printf '%s\n' "${out[@]}") + EOF #cat "${MENU_ITEMS}" jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null diff --git a/bin/mb-screenrec b/bin/mb-screenrec index 0f2e4f8..f667588 100755 --- a/bin/mb-screenrec +++ b/bin/mb-screenrec @@ -15,7 +15,9 @@ RECDIR="$(xdg-user-dir VIDEOS)/Recordings" mkdir -p $RECDIR if [ "$AUDIO" == "yes" ];then -AUDIOCMD="-f pulse -ac 2 -i default" +AUDIODEV="$(pactl list sinks short | grep $(pactl get-default-sink) | cut -f1)" + +AUDIOCMD="-f pulse -ac 2 -i ${AUDIODEV}" else AUDIOCMD="" fi