diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ad2f74c..ffd397b 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -3075,8 +3075,8 @@ pw_update_pfx_cover_gui () { "${pw_yad}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N1 --picture --filename="${PW_GIF_FILE}" 2>/dev/null & "${pw_yad}" --notebook --key="$PW_KEY_PROGRESS_BAR_UP" $TAB_PLACE --no-buttons \ - --auto-close --skip-taskbar --width="$PW_GIF_SIZE_X" --height="$PW_GIF_SIZE_Y" $YAD_UNDECORATED \ - --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "PortProton" --tab-pos=bottom --expand 2>/dev/null & + --skip-taskbar --width="$PW_GIF_SIZE_X" --height="$PW_GIF_SIZE_Y" $YAD_UNDECORATED \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "PortProton" --tab-pos="bottom" --expand 2>/dev/null & export PW_YAD_PID_PFX_COVER_UI="$!" return 0 fi @@ -3331,9 +3331,9 @@ gui_proton_downloader () { 2>/dev/null & "${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center \ - --gui-type=settings-notebook \ + --gui-type="settings-notebook" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$(gettext "WINE MANAGER")" --separator="" --expand \ - --tab-pos=top \ + --tab-pos="top" \ --tab="PROTON-LG"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="WINE-KRON4EK"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="PROTON-GE"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ @@ -3604,7 +3604,7 @@ A brief instruction: "${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "$(gettext "EDIT DB")" --text-align=center \ --text "$(gettext "Change settings in database file for") ${PORTWINE_DB}\n $(gettext "NOTE: To display help for each item, simply hover your mouse over the text")" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --separator=" " --expand --center \ - --gui-type=settings-base \ + --gui-type="settings-base" \ --gui-type-text=${SETTINGS_BASE_GUI_TYPE_TEXT} --gui-type-layout=${SETTINGS_BASE_GUI_TYPE_LAYOUT} \ --tab="$(gettext "MAIN")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext "ADVANCED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ @@ -3788,7 +3788,7 @@ fi 1> "${PW_TMPFS_PATH}/tmp_yad_cas_set" 2>/dev/null & "${pw_yad}" --paned --key="$KEY_FX_GUI" --sensitive --title="vkBasalt" \ - --gui-type=settings-paned \ + --gui-type="settings-paned" \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --center \ --button="$(gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(gettext "DISABLE") VKBASALT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable vkBasalt and go to the previous menu")":180 \ @@ -3954,7 +3954,7 @@ fi "${pw_yad}" --paned --key="$KEY_MH_GUI" --title="MangoHud" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --sensitive \ - --gui-type=settings-paned \ + --gui-type="settings-paned" \ --button="$(gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(gettext "DISABLE") MANGOHUD"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable MangoHud and go to the previous menu")":182 \ --button="$(gettext "PREVIEW CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Start vkcube for preview changes")":184 \ @@ -4152,7 +4152,7 @@ fi "${pw_yad}" --paned --key=$KEY_DGV2_GUI --height="350" --title="dgVoodoo2" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --gui-type=settings-paned \ + --gui-type="settings-paned" \ --button="$(gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(gettext "RESET") DGVOODOO2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Restore default settings for") dgVoodoo2":162 \ --button="$(gettext "DISABLE") DGVOODOO2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable dgVoodoo2 and go to the previous menu")":164 \ @@ -4354,7 +4354,7 @@ relaxed - Same as fifo but allows tearing when below the monitors refresh rate." "${pw_yad}" --paned --key="$KEY_GS_GUI" --title="GameScope" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --gui-type=settings-paned \ + --gui-type="settings-paned" \ --button="$(gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Cancel the current changes and return to the previous menu")":1 \ --button="$(gettext "RESET") GAMESCOPE"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Restore default settings for") GameScope":162 \ --button="$(gettext "DISABLE") GAMESCOPE"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Disable GameScope and go to the previous menu")":164 \ @@ -4436,7 +4436,7 @@ portwine_create_shortcut () { if [[ "$1" == "block_name" ]] ; then export name_desktop="${PORTPROTON_NAME}" OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \ - --gui-type=settings-shortcut \ + --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" \ @@ -4451,7 +4451,7 @@ portwine_create_shortcut () { else export name_desktop="${PORTPROTON_NAME}" OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \ - --gui-type=settings-shortcut \ + --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" \ @@ -4650,11 +4650,11 @@ pw_prefix_manager () { "${pw_yad}" --key=$KEY_EDIT_MANAGER_GUI --notebook \ --width=700 --height=700 --expand \ - --gui-type=settings-notebook \ + --gui-type="settings-notebook" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$(gettext 'PREFIX MANAGER')" \ --button="$(gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":1 \ --button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 \ - --tab-pos=top \ + --tab-pos="top" \ --tab="$(gettext 'DLLS')"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext 'FONTS')"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext 'SETTINGS')"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null @@ -4893,7 +4893,7 @@ portwine_start_debug () { pw_create_prefix_backup () { cd "$HOME" - PW_PREFIX_TO_BACKUP=$("${pw_yad}" --file --directory --width=800 --height=500 --auto-close \ + PW_PREFIX_TO_BACKUP=$("${pw_yad}" --file --directory --width=800 --height=500 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$(gettext "BACKUP PREFIX TO...")" \ --button="$(gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ --button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null) @@ -5097,7 +5097,7 @@ export -f gui_open_user_conf gui_open_scripts_from_backup () { cd "${PORT_WINE_TMP_PATH}/scripts_backup/" || fatal - PW_SCRIPT_FROM_BACKUP=$("${pw_yad}" --file --width=650 --height=500 --auto-close \ + PW_SCRIPT_FROM_BACKUP=$("${pw_yad}" --file --width=650 --height=500 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "SCRIPTS FROM BACKUP" --file-filter="backup_scripts|scripts_v*.tar.gz" 2>/dev/null ) YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then exit 0 ; fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 808e272..425706c 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -510,7 +510,7 @@ if [[ -f "${portwine_exe}" ]] ; then fi "${pw_yad}" --key=$KEY_START --notebook --active-tab=${TAB_START} \ - --gui-type=settings-notebook \ + --gui-type="settings-notebook" \ --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" --center \ --title "PortProton-${install_ver} (${scripts_install_ver}${BRANCH_VERSION})" --expand \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ @@ -550,7 +550,7 @@ if [[ -f "${portwine_exe}" ]] ; then 2>/dev/null & "${pw_yad}" --key=$KEY_START --paned --center \ - --gui-type=settings-paned \ + --gui-type="settings-paned" \ --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" \ --title "PortProton-${install_ver} (${scripts_install_ver}${BRANCH_VERSION})" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ @@ -704,11 +704,11 @@ else if [[ -z "${PW_ALL_DF}" ]] ; then "${pw_yad}" --key=$KEY --notebook --expand \ - --gui-type=settings-notebook \ + --gui-type="settings-notebook" \ --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \ - --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --title "PortProton-${install_ver} (${scripts_install_ver}${BRANCH_VERSION})" \ - --tab-pos=bottom \ + --tab-pos="bottom" \ --tab="$(gettext "AUTOINSTALLS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext "EMULATORS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext "WINE SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ @@ -717,11 +717,11 @@ else YAD_STATUS="$?" else "${pw_yad}" --key=$KEY --notebook --expand \ - --gui-type=settings-notebook \ + --gui-type="settings-notebook" \ --width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \ - --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ + --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --title "PortProton-${install_ver} (${scripts_install_ver}${BRANCH_VERSION})" \ - --tab-pos=bottom \ + --tab-pos="bottom" \ --tab="$(gettext "INSTALLED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext "AUTOINSTALLS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ --tab="$(gettext "EMULATORS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \