diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index bd7308a..9aab145 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,10 +2,14 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2084### +* improved function of displaying the icon of the file being launched in the PortProton GUI +* fixed function of changing "CREATE_SHORTCUT" button in PortProton interface + ###Scripts version 2083### * added displaying the icon of the file being launched in the PortProton GUI * fixed creation of multiple .png files in .exe directory during shortcut creation -* in the PortProton interface, the "CREATE_SHORTCUT" button expands to "DELETE_SHORTCUT" when the shortcut is enabled in the menu -> games +* in the PortProton interface, the "CREATE_SHORTCUT" button changes to "DELETE_SHORTCUT" when the shortcut is enabled in the menu -> games ###Scripts version 2082### * HOTFIX - AUTOINSTALL for EGS diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index b35528c..ef97457 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,14 @@ ----------------------------------------- История изменений: +###Scripts version 2084### +* улучшена функция отображения иконки запускаемого файла в графическом интерфейсе PortProton +* исправлена функция изменения в интерфейсе PortProton кнопки "CREATE_SHORTCUT" + ###Scripts version 2083### * добавлено отображение иконки запускаемого файла в графическом интерфейсе PortProton * исправлено создание множества файлов .png в каталоге с .exe во время создания ярлыка -* в интерфейсе PortProton кнопка "CREATE_SHORTCUT" раскрывается на "DELETE_SHORTCUT" при включении ярылыка в меню -> игры +* в интерфейсе PortProton кнопка "CREATE_SHORTCUT" изменяется на "DELETE_SHORTCUT" при включении ярылыка в меню -> игры ###Scripts version 2082### * HOTFIX - AUTOINSTALL для EGS diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b2df435..d650c7a 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -711,13 +711,18 @@ pw_create_gui_png () { try_remove_dir "${PORT_WINE_TMP_PATH}/tmp_img" create_new_dir "${PORT_WINE_TMP_PATH}/tmp_img" wrestool -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" -t14 "${portwine_exe}" - cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".ico" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico" - icotool -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico" - cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.png" + cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".ico" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico" + icotool -x --width=${PW_RESIZE_TO} --height=${PW_RESIZE_TO} --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico" + if [[ ! -f "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | grep "${PW_RESIZE_TO}x${PW_RESIZE_TO}")" ]] ; then + icotool -x --output="${PORT_WINE_TMP_PATH}/tmp_img/" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.ico" + cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.png" + else + cp "$(ls -S -1 "${PORT_WINE_TMP_PATH}/tmp_img/"*".png" | grep "${PW_RESIZE_TO}x${PW_RESIZE_TO}" | head -n 1)" "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.png" + fi cp -f "${PORT_WINE_TMP_PATH}/tmp_img/${PORTPROTON_NAME}.png" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" fi - if [[ -x "`which "convert" 2>/dev/null`" ]] && [[ -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] && \ - [[ -z "`file "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" | grep "${PW_RESIZE_TO} x ${PW_RESIZE_TO}"`" ]] ; then + if [[ -z "`file "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" | grep "${PW_RESIZE_TO} x ${PW_RESIZE_TO}"`" ]] && \ + [[ -x "`which "convert" 2>/dev/null`" ]] && [[ -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] ; then convert "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" -resize ${PW_RESIZE_TO}x${PW_RESIZE_TO} "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" fi if [[ ! -z "`file "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" | grep "${PW_RESIZE_TO} x ${PW_RESIZE_TO}"`" ]] ; then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 99c39d9..8bdb269 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -331,8 +331,8 @@ fi if [ ! -z "${portwine_exe}" ]; then if [[ -z "${PW_GUI_DISABLED_CS}" || "${PW_GUI_DISABLED_CS}" == 0 ]] ; then pw_create_gui_png - grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/* - if [[ "$?" == 1 ]] ; then + grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop + if [[ "$?" != "0" ]] ; then PW_SHORTCUT="CREATE SHORTCUT!!${loc_create_shortcut}:100" else PW_SHORTCUT="DELETE SHORTCUT!!${loc_delete_shortcut}:98" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 082c641..f4fe3d0 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/env bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2083 +#SCRIPTS_NEXT_VERSION=2084 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1