CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update create icons

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-08-01 15:33:09 +03:00
parent 0144e2261a
commit 5a861695fb
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data_from_portwine/changelog_ru
View File

@ -4,6 +4,8 @@
* в настройки добавлен выбор аудио драйвера (спасибо Boria138)
* добавлен комментарий для EVE Online (спасибо Boria138)
* улучшены функции создания иконок (спасибо Htylol)
* улучшен режим создания лога (спасибо Htylol)
###Scripts version 2330### / Дата: 30.07.2024 / Размер скачиваемого обновления: 4 мегабайта
* обновлен трей на основе libayatana-appindicator (спасибо Htylol)

25
data_from_portwine/scripts/functions_helper
View File

@ -1661,13 +1661,12 @@ pw_create_gui_png () {
edit_db_from_gui PORTPROTON_NAME
fi
if [[ ! -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] ; then
resize_png "$portwine_exe" "${PORTPROTON_NAME}" "128"
fi
PORTPROTON_NAME_PNG="${PORTPROTON_NAME// /_}.png"
if [[ -z "${PW_ICON_FOR_YAD}" ]] ; then
if [[ ! -z "$(file "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" | grep "${PW_RESIZE_TO} x ${PW_RESIZE_TO}")" ]] ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png"
if [[ ! -z "$(file "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME_PNG}" | grep "${PW_RESIZE_TO} x ${PW_RESIZE_TO}")" ]] ; then
export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME_PNG}"
else
export PW_ICON_FOR_YAD="${PW_GUI_ICON_PATH}/port_proton.png"
fi
@ -4563,10 +4562,12 @@ resize_png () {
return 1
else
local RESIZE_FILE="$1"
local RESIZE_NAME_PNG="$2"
local RESIZE_NAME_PNG="${2// /_}"
local RESIZE_TO="$3"
fi
[[ -f "${PORT_WINE_PATH}/data/img/${RESIZE_NAME_PNG}.png" ]] && return 0
try_remove_file "${PORT_WINE_PATH}/data/img/launcher.png"
try_remove_file "${PORT_WINE_PATH}/data/img/Launcher.png"
@ -4603,37 +4604,37 @@ portwine_create_shortcut () {
[[ -z "${PW_SHORTCUT_DESKTOP}" ]] && PW_SHORTCUT_DESKTOP="TRUE"
[[ -z "${PW_SHORTCUT_STEAM}" ]] && PW_SHORTCUT_STEAM="FALSE"
if [[ "$1" == "block_name" ]] ; then
export name_desktop="${PORTPROTON_NAME}"
name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ "$1" == "block_name" ]] ; then
OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \
--gui-type="settings-shortcut" \
--gui-type-box=${SETTINGS_SHORTCUT_GUI_TYPE_BOX} --gui-type-layout=${SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT} \
--gui-type-text=${SETTINGS_SHORTCUT_GUI_TYPE_TEXT} --gui-type-images=${SETTINGS_SHORTCUT_GUI_TYPE_IMAGE} \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
--image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
--text-align="center" --text "$(gettext "The shortcut will be created in the PortProton directory.")" \
--field=" ${name_desktop}":LBL "" \
--field=" $(gettext "Add shortcut to MENU -> GAMES")":CHK "$PW_SHORTCUT_MENU" \
--field=" $(gettext "Add shortcut to Desktop")":CHK "$PW_SHORTCUT_DESKTOP" \
--field=" $(gettext "Add shortcut to STEAM library")":CHK "$PW_SHORTCUT_STEAM" \
--button="$(gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \
--button="$(gettext "CREATE SHORTCUT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0)
--button="$(gettext "CREATE SHORTCUT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
PW_YAD_OUT=$?
else
export name_desktop="${PORTPROTON_NAME}"
OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \
--gui-type="settings-shortcut" \
--gui-type-box=${SETTINGS_SHORTCUT_GUI_TYPE_BOX} --gui-type-layout=${SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT} \
--gui-type-text=${SETTINGS_SHORTCUT_GUI_TYPE_TEXT} --gui-type-images=${SETTINGS_SHORTCUT_GUI_TYPE_IMAGE} \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
--image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
--text-align="center" --text "$(gettext "The shortcut will be created in the PortProton directory.")" \
--field="$(gettext "Name")" "${name_desktop}" \
--field=" $(gettext "Add shortcut to MENU -> GAMES")":CHK "$PW_SHORTCUT_MENU" \
--field=" $(gettext "Add shortcut to Desktop")":CHK "$PW_SHORTCUT_DESKTOP" \
--field=" $(gettext "Add shortcut to STEAM library")":CHK "$PW_SHORTCUT_STEAM" \
--button="$(gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \
--button="$(gettext "CREATE SHORTCUT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0)
--button="$(gettext "CREATE SHORTCUT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
PW_YAD_OUT=$?
fi
@ -4793,9 +4794,7 @@ pw_auto_create_shortcut () {
print_info "Created link for: $link_name"
PORTPROTON_NAME="$link_name"
export portwine_exe="$exe_path"
if [[ ! -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" ]] ; then
resize_png "$portwine_exe" "${PORTPROTON_NAME}" "128"
fi
export PW_NO_RESTART_PPDB=1
portwine_create_shortcut
fi

11
data_from_portwine/scripts/start.sh
View File

@ -671,13 +671,12 @@ else
sed -e "s|${PORT_SCRIPTS_PATH}/start.sh||" -e 's|"||g' -e 's|^[ \t]*||')"
fi
PW_ICON_PATH="$(grep Icon "${PORT_WINE_PATH}/${PW_DESKTOP_FILES}" | awk -F= '{print $2}')"
PW_NAME_D_ICON_48="${PW_ICON_PATH%.png}_48.png"
PW_NAME_D_ICON_48_HELPER="${PW_ICON_PATH%.png}_48"
if [[ ! -f "${PW_NAME_D_ICON_48}" ]] \
&& [[ -f "${PW_NAME_D_ICON}" ]] ; then
resize_png "${PW_NAME_D_ICON}" "${PW_NAME_D_ICON_48_HELPER//"${PORT_WINE_PATH}/data/img/"/}" "48"
PW_NAME_D_ICON_48="${PW_ICON_PATH%.png}_48"
if [[ -f "${PW_NAME_D_ICON}" ]] ; then
resize_png "${PW_NAME_D_ICON}" "${PW_NAME_D_ICON_48//"${PORT_WINE_PATH}/data/img/"/}" "48"
resize_png "${PW_NAME_D_ICON}" "$(basename "$PW_ICON_PATH" .png)" "128"
fi
PW_GENERATE_BUTTONS+="--field= ${PW_DESKTOP_FILES//".desktop"/""}!${PW_NAME_D_ICON_48}!:FBTN%@bash -c \"run_desktop_b_click "${PW_DESKTOP_FILES// /@_@}"\"%"
PW_GENERATE_BUTTONS+="--field= ${PW_DESKTOP_FILES//".desktop"/""}!${PW_NAME_D_ICON_48}.png!:FBTN%@bash -c \"run_desktop_b_click "${PW_DESKTOP_FILES// /@_@}"\"%"
done
IFS="$orig_IFS"