Commit 477bc807 authored by Vladislav's avatar Vladislav

Use PW_DESKTOP_FILES

parent bb84ba2f
...@@ -1321,6 +1321,7 @@ stop_portwine () { ...@@ -1321,6 +1321,7 @@ stop_portwine () {
add_in_stop_portwine add_in_stop_portwine
debug_timer --end -s "PW_TIME_IN_GAME" debug_timer --end -s "PW_TIME_IN_GAME"
PW_TIME_IN_GAME=$(( (PW_TIME_IN_GAME / 60000) % 60 ))
while IFS= read -r line ; do while IFS= read -r line ; do
if [[ $line =~ ^Time= ]] ; then if [[ $line =~ ^Time= ]] ; then
export SKIP_GAME_TIME="1" export SKIP_GAME_TIME="1"
......
...@@ -90,7 +90,7 @@ unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERR ...@@ -90,7 +90,7 @@ unset MANGOHUD MANGOHUD_DLSYM PW_NO_ESYNC PW_NO_FSYNC PW_VULKAN_USE WINEDLLOVERR
unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE RADV_PERFTEST unset PW_CHECK_AUTOINSTALL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PORTWINE_DB_FILE RADV_PERFTEST
unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PW_PATH unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PW_PATH
unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48 unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT
unset PW_DESKTOP_FILES_REGEX PW_TERM unset PW_DESKTOP_FILES_REGEX PW_TERM
...@@ -616,11 +616,15 @@ else ...@@ -616,11 +616,15 @@ else
while IFS= read -r line ; do while IFS= read -r line ; do
[[ $line =~ ^Exec= ]] && PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]="${line//Exec=/}" [[ $line =~ ^Exec= ]] && PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]="${line//Exec=/}"
[[ $line =~ ^Icon= ]] && PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]="${line//Icon=/}" [[ $line =~ ^Icon= ]] && PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]="${line//Icon=/}"
[[ $line =~ ^Time= ]] && PW_GAME_TIME["${line//Time=/}"]="${desktop_file//"${PORT_WINE_PATH}"\//}" if [[ $line =~ ^Time= ]] ; then
PW_GAME_TIME["${line//Time=/}"]="${desktop_file//"${PORT_WINE_PATH}"\//}"
WITH_TIME="1"
fi
done < "$desktop_file" done < "$desktop_file"
if [[ -z ${PW_GAME_TIME["${line//Time=/}"]} ]] ; then if [[ $WITH_TIME != 1 ]] ; then
PW_ALL_DF["$AMOUNT_GENERATE_BUTTONS"]="${desktop_file//"${PORT_WINE_PATH}"\//}" PW_ALL_DF["$AMOUNT_GENERATE_BUTTONS"]="${desktop_file//"${PORT_WINE_PATH}"\//}"
fi fi
unset WITH_TIME
(( AMOUNT_GENERATE_BUTTONS++ )) (( AMOUNT_GENERATE_BUTTONS++ ))
fi fi
fi fi
...@@ -662,7 +666,7 @@ else ...@@ -662,7 +666,7 @@ else
MAIN_GUI_ROWS="$(( ( AMOUNT_GENERATE_BUTTONS + 1 ) / MAIN_GUI_COLUMNS + 1 ))" MAIN_GUI_ROWS="$(( ( AMOUNT_GENERATE_BUTTONS + 1 ) / MAIN_GUI_COLUMNS + 1 ))"
if [[ -z "${PW_ALL_DF[0]}" ]] if [[ -z $PW_DESKTOP_FILES ]]
then export PW_GUI_SORT_TABS=(1 2 3 4 5) then export PW_GUI_SORT_TABS=(1 2 3 4 5)
else export PW_GUI_SORT_TABS=(2 3 4 5 1) else export PW_GUI_SORT_TABS=(2 3 4 5 1)
fi fi
...@@ -772,7 +776,7 @@ else ...@@ -772,7 +776,7 @@ else
export TAB_MAIN_MENU="1" export TAB_MAIN_MENU="1"
fi fi
if [[ -z "${PW_ALL_DF}" ]] ; then if [[ -z $PW_DESKTOP_FILES ]] ; then
"${pw_yad}" --key=$KEY_MENU --notebook --expand \ "${pw_yad}" --key=$KEY_MENU --notebook --expand \
--gui-type="settings-notebook" --active-tab="${TAB_MAIN_MENU}" \ --gui-type="settings-notebook" --active-tab="${TAB_MAIN_MENU}" \
--width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \ --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \
...@@ -826,7 +830,7 @@ fi ...@@ -826,7 +830,7 @@ fi
128|gui_pw_update|gui_rm_portproton|\ 128|gui_pw_update|gui_rm_portproton|\
change_loc|gui_open_scripts_from_backup|\ change_loc|gui_open_scripts_from_backup|\
gui_credits|pw_start_cont_xterm) gui_credits|pw_start_cont_xterm)
if [[ -z "${PW_ALL_DF}" ]] ; then if [[ -z $PW_DESKTOP_FILES ]] ; then
export TAB_MAIN_MENU="4" export TAB_MAIN_MENU="4"
else else
export TAB_MAIN_MENU="5" export TAB_MAIN_MENU="5"
...@@ -836,14 +840,14 @@ fi ...@@ -836,14 +840,14 @@ fi
116|pw_create_prefix_backup|\ 116|pw_create_prefix_backup|\
gui_clear_pfx|WINEREG|WINECMD|\ gui_clear_pfx|WINEREG|WINECMD|\
WINEFILE|WINECFG|gui_wine_uninstaller) WINEFILE|WINECFG|gui_wine_uninstaller)
if [[ -z "${PW_ALL_DF}" ]] ; then if [[ -z $PW_DESKTOP_FILES ]] ; then
export TAB_MAIN_MENU="3" export TAB_MAIN_MENU="3"
else else
export TAB_MAIN_MENU="4" export TAB_MAIN_MENU="4"
fi fi
;; ;;
pw_find_exe) pw_find_exe)
if [[ -z "${PW_ALL_DF}" ]] ; then if [[ -z $PW_DESKTOP_FILES ]] ; then
export TAB_MAIN_MENU="5" export TAB_MAIN_MENU="5"
else else
export TAB_MAIN_MENU="1" export TAB_MAIN_MENU="1"
......
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