Skip to content

P
PortWINE
Commit 7433ebf4 authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

make spellcheck happy =)

parent eb6c2f2e
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 59 deletions
data_from_portwine/scripts/functions_helper
View file @ 7433ebf4
...@@ -2695,10 +2695,6 @@ start_portwine () { ...@@ -2695,10 +2695,6 @@ start_portwine () {
|| ! grep "${PW_WINE_USE}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" &>/dev/null || ! grep "${PW_WINE_USE}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" &>/dev/null
then then
pw_update_pfx_cover_gui pw_update_pfx_cover_gui
# # HOTFIX - update prefix for vkPlay
# if echo "$portwine_exe" | grep -i vkplay &>/dev/null
# then pw_kill_autostart GameCe 5 please & :
# fi
pw_wineboot -r pw_wineboot -r
fi fi
fi fi
...@@ -3175,10 +3171,10 @@ start_portwine () { ...@@ -3175,10 +3171,10 @@ start_portwine () {
[[ "${PW_DGV2_FILTERING}" == "Anisotropic 8x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 8/" "$DGV2CONF" [[ "${PW_DGV2_FILTERING}" == "Anisotropic 8x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 8/" "$DGV2CONF"
[[ "${PW_DGV2_FILTERING}" == "Anisotropic 16x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 16/" "$DGV2CONF" [[ "${PW_DGV2_FILTERING}" == "Anisotropic 16x" ]] && sed -i "s/\<Filtering = appdriven\>/Filtering = 16/" "$DGV2CONF"
case "${PW_DGV2_FILTERING}" in case "${PW_DGV2_FILTERING}" in
"Point sampled") "Point sampled")
sed -i "s/TMUFiltering = appdriven/TMUFiltering = pointsampled/" "$DGV2CONF" ;; sed -i "s/TMUFiltering = appdriven/TMUFiltering = pointsampled/" "$DGV2CONF" ;;
"Bilinear"|"Linear mip"|"Trilinear"|"Anisotropic 2x"|"Anisotropic 4x"|"Anisotropic 8x"|"Anisotropic 16x") "Bilinear"|"Linear mip"|"Trilinear"|"Anisotropic 2x"|"Anisotropic 4x"|"Anisotropic 8x"|"Anisotropic 16x")
sed -i "s/TMUFiltering = appdriven/TMUFiltering = bilinear/" "$DGV2CONF" ;; sed -i "s/TMUFiltering = appdriven/TMUFiltering = bilinear/" "$DGV2CONF" ;;
esac esac
fi fi
...@@ -4384,7 +4380,7 @@ gui_proton_downloader () { ...@@ -4384,7 +4380,7 @@ gui_proton_downloader () {
try_remove_file "${PORT_WINE_PATH}/data/tmp/${FILENAME}" try_remove_file "${PORT_WINE_PATH}/data/tmp/${FILENAME}"
try_remove_dir "${PORT_WINE_PATH}/data/dist/${FILENAME}" try_remove_dir "${PORT_WINE_PATH}/data/dist/${FILENAME}"
if yad_error_download if yad_error_download
then gui_proton_downloader $@ then gui_proton_downloader ""
else else
export PW_WINE_VER="$PW_WINE_USE" export PW_WINE_VER="$PW_WINE_USE"
init_wine_ver init_wine_ver
...@@ -4392,7 +4388,7 @@ gui_proton_downloader () { ...@@ -4392,7 +4388,7 @@ gui_proton_downloader () {
fi fi
else else
if yad_error_download if yad_error_download
then gui_proton_downloader $@ then gui_proton_downloader ""
else else
export PW_WINE_VER="$PW_WINE_USE" export PW_WINE_VER="$PW_WINE_USE"
init_wine_ver init_wine_ver
...@@ -4416,7 +4412,7 @@ gui_proton_downloader () { ...@@ -4416,7 +4412,7 @@ gui_proton_downloader () {
export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"
fi fi
done done
pw_download_get_wine pw_download_get_wine ""
done done
edit_db_from_gui edit_db_from_gui
restart_pp restart_pp
...@@ -4427,7 +4423,7 @@ gui_proton_downloader () { ...@@ -4427,7 +4423,7 @@ gui_proton_downloader () {
export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"
fi fi
done done
pw_download_get_wine pw_download_get_wine ""
fi fi
} }
export -f gui_proton_downloader export -f gui_proton_downloader
...@@ -4741,19 +4737,17 @@ gui_vkbasalt () { ...@@ -4741,19 +4737,17 @@ gui_vkbasalt () {
done done
if [[ -n "${PW_VKBASALT_FFX_CAS}" ]] ; then if [[ -n "${PW_VKBASALT_FFX_CAS}" ]] ; then
if [[ "$PW_VKBASALT_FFX_CAS" == "0" ]] \ case "$PW_VKBASALT_FFX_CAS" in
|| [[ "$PW_VKBASALT_FFX_CAS" == "-1" ]] 0|-1) VKBASALT_FFX_CAS_GUI="0" ;;
then export VKBASALT_FFX_CAS_GUI="0" 1) VKBASALT_FFX_CAS_GUI="100" ;;
elif [[ "$PW_VKBASALT_FFX_CAS" == "1" ]] 0.0*) VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.0' '{print $2}')" ;;
then export VKBASALT_FFX_CAS_GUI="100" *) VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.' '{print $2}')" ;;
elif [[ "$PW_VKBASALT_FFX_CAS" == 0.0* ]] esac
then VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.0' '{print $2}')"
else VKBASALT_FFX_CAS_GUI="$(echo "$PW_VKBASALT_FFX_CAS" | awk -F'0.' '{print $2}')"
fi
export VKBASALT_FFX_CAS_GUI export VKBASALT_FFX_CAS_GUI
else else
VKBASALT_FFX_CAS_GUI=66 VKBASALT_FFX_CAS_GUI=50
fi fi
IFS="%" IFS="%"
"${pw_yad}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \ "${pw_yad}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \
--text-align=center --text="${translations[VkBasalt settings for adding effects to games running under Vulkan. (The <b>HOME</b> key disables vkbasalt)\\n<b>NOTE:</b> To display help for each item, simply hover over the text]}" \ --text-align=center --text="${translations[VkBasalt settings for adding effects to games running under Vulkan. (The <b>HOME</b> key disables vkbasalt)\\n<b>NOTE:</b> To display help for each item, simply hover over the text]}" \
...@@ -5545,51 +5539,30 @@ portwine_create_shortcut () { ...@@ -5545,51 +5539,30 @@ portwine_create_shortcut () {
[[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}" [[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ "$1" == "block_name" ]] ; then OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \
OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \ --gui-type="settings-shortcut" \
--gui-type="settings-shortcut" \ --gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
--gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \ --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \
--gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \ --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \ --image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
--image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \ --text-align="center" --text "${translations[The shortcut will be created in the PortProton directory.]}" \
--text-align="center" --text "${translations[The shortcut will be created in the PortProton directory.]}" \ --field="${translations[Name]}" "${name_desktop}" \
--field=" ${name_desktop}":LBL "" \ --field=" ${translations[Add shortcut to MENU -> GAMES]}":CHK "$PW_SHORTCUT_MENU" \
--field=" ${translations[Add shortcut to MENU -> GAMES]}":CHK "$PW_SHORTCUT_MENU" \ --field=" ${translations[Add shortcut to Desktop]}":CHK "$PW_SHORTCUT_DESKTOP" \
--field=" ${translations[Add shortcut to Desktop]}":CHK "$PW_SHORTCUT_DESKTOP" \ --field=" ${translations[Add shortcut to STEAM library]}":CHK "$PW_SHORTCUT_STEAM" \
--field=" ${translations[Add shortcut to STEAM library]}":CHK "$PW_SHORTCUT_STEAM" \ --button="${translations[CANCEL]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \
--button="${translations[CANCEL]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \ --button="${translations[CREATE SHORTCUT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
--button="${translations[CREATE SHORTCUT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null) PW_YAD_OUT=$?
PW_YAD_OUT=$?
else
OUTPUT=$("${pw_yad}" --title="${translations[Choices]}" --form \
--gui-type="settings-shortcut" \
--gui-type-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
--gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \
--window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
--image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
--text-align="center" --text "${translations[The shortcut will be created in the PortProton directory.]}" \
--field="${translations[Name]}" "${name_desktop}" \
--field=" ${translations[Add shortcut to MENU -> GAMES]}":CHK "$PW_SHORTCUT_MENU" \
--field=" ${translations[Add shortcut to Desktop]}":CHK "$PW_SHORTCUT_DESKTOP" \
--field=" ${translations[Add shortcut to STEAM library]}":CHK "$PW_SHORTCUT_STEAM" \
--button="${translations[CANCEL]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":2 \
--button="${translations[CREATE SHORTCUT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null)
PW_YAD_OUT=$?
fi
if [[ "$PW_YAD_OUT" == "0" ]] ; then if [[ "$PW_YAD_OUT" == "0" ]] ; then
if [[ "$1" == "block_name" ]] name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $1}' | sed "s/\`//g" | sed "s/\"//g" | sed "s/'//g" | sed "s/\!//g")
then name_desktop="$PORTWINE_CREATE_SHORTCUT_NAME"
else name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $1}')
fi
name_desktop="$(echo "${name_desktop}" | sed "s/\`//g" | sed "s/\"//g" | sed "s/'//g" | sed "s/\!//g")"
PW_SHORTCUT_MENU=$(echo "$OUTPUT" | awk -F'|' '{print $2}') PW_SHORTCUT_MENU=$(echo "$OUTPUT" | awk -F'|' '{print $2}')
PW_SHORTCUT_DESKTOP=$(echo "$OUTPUT" | awk -F'|' '{print $3}') PW_SHORTCUT_DESKTOP=$(echo "$OUTPUT" | awk -F'|' '{print $3}')
PW_SHORTCUT_STEAM=$(echo "$OUTPUT" | awk -F'|' '{print $4}') PW_SHORTCUT_STEAM=$(echo "$OUTPUT" | awk -F'|' '{print $4}')
edit_user_conf_from_gui PW_SHORTCUT_MENU PW_SHORTCUT_DESKTOP PW_SHORTCUT_STEAM edit_user_conf_from_gui PW_SHORTCUT_MENU PW_SHORTCUT_DESKTOP PW_SHORTCUT_STEAM
if [[ -n ${DESKTOP_FILES_ARRAY[0]} && $name_desktop != $DESKTOP_NAME_FILE ]] || [[ -n ${DESKTOP_FILES_ARRAY[1]} ]] ; then if [[ -n ${DESKTOP_FILES_ARRAY[0]} && $name_desktop != "$DESKTOP_NAME_FILE" ]] || [[ -n ${DESKTOP_FILES_ARRAY[1]} ]] ; then
if yad_question "${translations[A higher number of duplicate desktop files were found for this file.\\nShould I delete the extra ones or not?]}" ; then if yad_question "${translations[A higher number of duplicate desktop files were found for this file.\\nShould I delete the extra ones or not?]}" ; then
for rm in "${DESKTOP_FILES_ARRAY[@]}" ; do for rm in "${DESKTOP_FILES_ARRAY[@]}" ; do
rm -f "$rm" rm -f "$rm"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment