diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 04face52..844cefb4 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2304### Date: 10.06.2024 / Download update size: 3 megabytes +* HOTFIX for ALT Linux + NVIDIA + ###Scripts version 2303### Date: 06.06.2024 / Download update size: 190 megabytes * updated WINE_LG to version "9-10" * updated the GOG installer diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 57b15c3e..2b920c0f 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,7 +2,6 @@ ----------------------------------------- История изменений: -###Scripts version 2304### Дата: &&&&&&&&&&&&&&&&&&&&&&&&&.06.2024 / Размер скачиваемого обновления: 181 мегабайт * обновлен пакет plugins до v16: * обновлена версия yad 13.0.3 добавлено множество патчей улучшающих интерфейс (спасибо Htylol) * исправлена информация о проекте при наведении курсора на иконку в трее (спасибо Htylol) @@ -20,7 +19,9 @@ * добавлено переключение вида основного интерфейса запуска exe и ярлыков в меню "PortProton -> Настройки PortProton -> Изменить интерфейс запуска" (спасибо Htylol) * настройки GameScope вынесены в отдельное окно (для будущего расширения функционала) * улучшен интерфейс загрузки wine и добавлена возможность выбора нескольких версий одновременно -* HOTFIX - определения драйвера Vulkan на системах Alt Linux с ноутбуками + NVIDIA + +###Scripts version 2304### Дата: 10.06.2024 / Размер скачиваемого обновления: 3 мегабайта +* HOTFIX - определения драйвера Vulkan на системах Alt Linux + NVIDIA ###Scripts version 2303### Дата: 06.06.2024 / Размер скачиваемого обновления: 190 мегабайт * обновлен WINE_LG до версии "9-10" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 9389af08..0c9a6ca9 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2724,8 +2724,8 @@ pw_update_pfx_cover_gui () { pw_start_progress_bar_cs () { if ! check_start_from_steam ; then - "${pw_yad}" --progress --text="$@ - " --pulsate --close-on-unfocus --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + "${pw_yad}" --progress-old --text="$@ + " --pulsate --hide-text --close-on-unfocus --borders="$PROGRESS_BAR_BORDERS_SIZE" \ --no-buttons --undecorated --center --skip-taskbar \ --width="$PROGRESS_BAR_WIDTH_SIZE" \ --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \ @@ -2737,8 +2737,8 @@ pw_start_progress_bar_cs () { pw_start_progress_bar_block () { if ! check_start_from_steam ; then - "${pw_yad}" --progress --text="$@ - " --pulsate --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + "${pw_yad}" --progress-old --text="$@ + " --pulsate --hide-text --borders="$PROGRESS_BAR_BORDERS_SIZE" \ --no-buttons --undecorated --center --skip-taskbar \ --no-escape --text-align="center" --height=90 --fixed \ --width="$PROGRESS_BAR_WIDTH_SIZE" \ @@ -2751,8 +2751,8 @@ pw_start_progress_bar_block () { pw_start_progress_bar_install_game () { if ! check_start_from_steam ; then - "${pw_yad}" --progress --text="$(eval_gettext "Please wait. Installing the") $@ - " --pulsate --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + "${pw_yad}" --progress-old --text="$(eval_gettext "Please wait. Installing the") $@ + " --pulsate --hide-text --borders="$PROGRESS_BAR_BORDERS_SIZE" \ --no-buttons --undecorated --center --skip-taskbar \ --no-escape --text-align="center" --height=90 --fixed \ --width="$PROGRESS_BAR_WIDTH_SIZE" \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 03aff171..73eb38ca 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -452,7 +452,7 @@ if [[ -f "${portwine_exe}" ]] ; then fi "${pw_yad}" --key=$KEY_START --notebook --active-tab=$TAB_START \ - --width="${PW_MAIN_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" --center \ + --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" --center \ --title "PortProton-${install_ver} (${scripts_install_ver})" --expand --buttons-layout=expand \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --tab="$(eval_gettext "GENERAL")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ @@ -487,7 +487,7 @@ if [[ -f "${portwine_exe}" ]] ; then 2>/dev/null & "${pw_yad}" --key=$KEY_START --paned --center \ - --width="${PW_MAIN_START_SIZE_W}" --height="${PW_MAIN_START_SIZE_H}" --tab-pos="${PW_TAB_POSITON}" \ + --width="${PW_START_SIZE_W}" --height="${PW_START_SIZE_H}" --tab-pos="${PW_TAB_POSITON}" \ --title "PortProton-${install_ver} (${scripts_install_ver})" --buttons-layout=expand \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --button="${PW_SHORTCUT}" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 0497636c..1ebc01f8 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2304 +#SCRIPTS_NEXT_VERSION=2305 ######################################################################## export LANGUAGES_LIST="ru es" export PW_MANGOHUD="0" @@ -37,7 +37,7 @@ export PW_GPU_USE="disabled" export PW_LOCALE_SELECT="disabled" export PW_USE_GAMESCOPE="0" export PW_DINPUT_PROTOCOL="0" -export PW_YAD_BIN="yad_v13_0_3" +export PW_YAD_BIN="yad_v13_0_4" ###GTK_CONFIG### # export GTK_DATA_PREFIX= # export GTK_THEME="Adwaita:dark" diff --git a/data_from_portwine/scripts/yad_portable/yad_v13_0_3 b/data_from_portwine/scripts/yad_portable/yad_v13_0_3 deleted file mode 100755 index 82863d4f..00000000 Binary files a/data_from_portwine/scripts/yad_portable/yad_v13_0_3 and /dev/null differ diff --git a/data_from_portwine/scripts/yad_portable/yad_v13_0_4 b/data_from_portwine/scripts/yad_portable/yad_v13_0_4 new file mode 100755 index 00000000..33366a54 Binary files /dev/null and b/data_from_portwine/scripts/yad_portable/yad_v13_0_4 differ diff --git a/data_from_portwine/themes/classic.pptheme b/data_from_portwine/themes/classic.pptheme index 1b20b383..86416b28 100755 --- a/data_from_portwine/themes/classic.pptheme +++ b/data_from_portwine/themes/classic.pptheme @@ -12,6 +12,7 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \ export THEME_CHKBOX=CHK export CHKBOX_SPACE=" " +export PW_YAD_CENTER="" export BUTTON_SIZE_MM=32 export BUTTON_SIZE=24 @@ -20,7 +21,13 @@ export TAB_SIZE=28 export PW_MAIN_SIZE_W=1100 export PW_MAIN_SIZE_H=350 +export PW_START_SIZE_W=600 +export PW_START_SIZE_H=350 +export PW_TAB_POSITON=top + export MAIN_GUI_COLUMNS=3 +export START_NOTEBOOK_GUI_COLUMNS=3 +export START_PANED_GUI_COLUMNS=3 export PROGRESS_BAR_BORDERS_SIZE=20 export PROGRESS_BAR_WIDTH_SIZE=500 diff --git a/data_from_portwine/themes/classic/style.css b/data_from_portwine/themes/classic/style.css index e69de29b..418637f0 100644 --- a/data_from_portwine/themes/classic/style.css +++ b/data_from_portwine/themes/classic/style.css @@ -0,0 +1,8 @@ +arrow {margin: 0px 5px} +window>box>image {margin: 15px 10px 0px 5px} +box>box>label {margin: 1px 0px 0px 0px} +switch {margin: 5px 20px 0px 0px} +box>box>grid>switch>slider {min-height: 0px; min-width: 22px} +scale>contents>trough>slider {min-height: 24px; min-width: 24px} +box>box>grid>label {margin: 0px 10px 0px 0px} +separator {margin-bottom:0px; background-size:0px} diff --git a/data_from_portwine/themes/compact.pptheme b/data_from_portwine/themes/compact.pptheme index 47bed738..c03794a2 100755 --- a/data_from_portwine/themes/compact.pptheme +++ b/data_from_portwine/themes/compact.pptheme @@ -12,6 +12,7 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \ " export THEME_CHKBOX=SW export CHKBOX_SPACE=" " +export PW_YAD_CENTER="--center" export BUTTON_SIZE_MM=32 # 24, 28, 32, 36, 40 @@ -22,11 +23,13 @@ export TAB_SIZE=32 # 24, 28, 32, 36, 40 export PW_MAIN_SIZE_W=1 export PW_MAIN_SIZE_H=350 -export PW_MAIN_START_SIZE_W=1 -export PW_MAIN_START_SIZE_H=350 -export PW_TAB_POSITON=top +export PW_START_SIZE_W=1 +export PW_START_SIZE_H=350 +export PW_START_TAB_POSITON=top export MAIN_GUI_COLUMNS=3 +export START_GUI_NOTEBOOK_COLUMNS=3 +export START_GUI_PANED_COLUMNS=3 export PROGRESS_BAR_BORDERS_SIZE=20 export PROGRESS_BAR_WIDTH_SIZE=500 diff --git a/data_from_portwine/themes/compact/style.css b/data_from_portwine/themes/compact/style.css index a5722bd5..418637f0 100644 --- a/data_from_portwine/themes/compact/style.css +++ b/data_from_portwine/themes/compact/style.css @@ -6,8 +6,3 @@ box>box>grid>switch>slider {min-height: 0px; min-width: 22px} scale>contents>trough>slider {min-height: 24px; min-width: 24px} box>box>grid>label {margin: 0px 10px 0px 0px} separator {margin-bottom:0px; background-size:0px} - - -/*tab:checked {border: 1px solid; border-color: #09bec8; border-radius: 3px;} -tab { border-radius: 3px;} -box>box>grid {margin: 0px 20px 15px 0px*/ diff --git a/data_from_portwine/themes/default.pptheme b/data_from_portwine/themes/default.pptheme index 6c5e68dd..1238141f 100755 --- a/data_from_portwine/themes/default.pptheme +++ b/data_from_portwine/themes/default.pptheme @@ -16,6 +16,7 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \ # настройка переключателей export THEME_CHKBOX=SW # CHK - галки, SW - слайдер export CHKBOX_SPACE=" " # расстояние перед текстом у CHKBOX +export PW_YAD_CENTER="" # окно yad по центру, нужно добавить "--center" # размер кнопок в главном меню export BUTTON_SIZE_MM=36 # 24, 28, 32, 36, 40 @@ -31,12 +32,14 @@ export PW_MAIN_SIZE_W=1 export PW_MAIN_SIZE_H=330 # размер меню запуска и положения табов -export PW_MAIN_START_SIZE_W=800 -export PW_MAIN_START_SIZE_H=350 +export PW_START_SIZE_W=800 +export PW_START_SIZE_H=330 export PW_TAB_POSITON=top # количество столбцов в главном меню export MAIN_GUI_COLUMNS=3 +export START_GUI_NOTEBOOK_COLUMNS=3 +export START_GUI_PANED_COLUMNS=3 # настройки индикатора прогресса export PROGRESS_BAR_BORDERS_SIZE=20 diff --git a/data_from_portwine/themes/default/style.css b/data_from_portwine/themes/default/style.css index a5722bd5..418637f0 100644 --- a/data_from_portwine/themes/default/style.css +++ b/data_from_portwine/themes/default/style.css @@ -6,8 +6,3 @@ box>box>grid>switch>slider {min-height: 0px; min-width: 22px} scale>contents>trough>slider {min-height: 24px; min-width: 24px} box>box>grid>label {margin: 0px 10px 0px 0px} separator {margin-bottom:0px; background-size:0px} - - -/*tab:checked {border: 1px solid; border-color: #09bec8; border-radius: 3px;} -tab { border-radius: 3px;} -box>box>grid {margin: 0px 20px 15px 0px*/