diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 66be9e41..298df8e1 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1694,7 +1694,7 @@ init_wine_ver () { if ! check_flatpak ; then WINE_LIBRARY_PATH="${WINEDIR}/lib" - [[ ! -L "${WINEDIR}/lib64/wine" ]] && WINE_LIBRARY_PATH+=":${WINEDIR}/lib64" + [[ -d "${WINEDIR}/lib64/gstreamer-1.0" ]] && WINE_LIBRARY_PATH+=":${WINEDIR}/lib64" export WINE_LIBRARY_PATH fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index eff81b16..7f52de59 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -578,7 +578,6 @@ if [[ -f "$portwine_exe" ]] ; then "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="$START_GUI_NOTEBOOK_COLUMNS" --align-buttons --homogeneous-column \ --gui-type-layout="$START_GUI_TYPE_LAYOUT_NOTEBOOK" \ --field=" ${translations[Base settings]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Edit database file for]} ${PORTWINE_DB}":"FBTN" '@bash -c "button_click --start 118"' \ - --field=" ${translations[Global settings]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Settings for user.conf]}":"FBTN" '@bash -c "button_click --start 128"' \ --field=" ${translations[Open directory]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Open directory with .ppdb file]}":"FBTN" '@bash -c "button_click --start open_game_folder"' \ --field=" vkBasalt!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)]}":"FBTN" '@bash -c "button_click --start 120"' \ --field=" MangoHud!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)]}":"FBTN" '@bash -c "button_click --start 122"' \ @@ -623,7 +622,6 @@ if [[ -f "$portwine_exe" ]] ; then --gui-type-layout="$START_GUI_TYPE_LAYOUT_PANED" \ --align-buttons --homogeneous-row --homogeneous-column \ --field=" ${translations[Base settings]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Edit database file for]} ${PORTWINE_DB}":"FBTN" '@bash -c "button_click --start 118"' \ - --field=" ${translations[Global settings]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Settings for user.conf]}":"FBTN" '@bash -c "button_click --start 128"' \ --field=" ${translations[Open directory]}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Open directory with .ppdb file]}":"FBTN" '@bash -c "button_click --start open_game_folder"' \ --field=" vkBasalt!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)]}":"FBTN" '@bash -c "button_click --start 120"' \ --field=" MangoHud!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${translations[Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)]}":"FBTN" '@bash -c "button_click --start 122"' \ diff --git a/data_from_portwine/themes/classic.pptheme b/data_from_portwine/themes/classic.pptheme index 461773db..f1e327d8 100755 --- a/data_from_portwine/themes/classic.pptheme +++ b/data_from_portwine/themes/classic.pptheme @@ -29,7 +29,7 @@ export PW_TAB_POSITON=top export MAIN_GUI_COLUMNS=3 -export START_GUI_NOTEBOOK_COLUMNS=3 +export START_GUI_NOTEBOOK_COLUMNS=2 export START_GUI_PANED_COLUMNS=3 export START_GUI_TYPE="--gui-type=start-old \ --image-halign=center \ diff --git a/data_from_portwine/themes/compact.pptheme b/data_from_portwine/themes/compact.pptheme index a6996c41..6a30c805 100755 --- a/data_from_portwine/themes/compact.pptheme +++ b/data_from_portwine/themes/compact.pptheme @@ -32,7 +32,7 @@ export PW_TAB_POSITON=top export MAIN_GUI_COLUMNS=3 -export START_GUI_NOTEBOOK_COLUMNS=3 +export START_GUI_NOTEBOOK_COLUMNS=2 export START_GUI_PANED_COLUMNS=3 export START_GUI_TYPE="--gui-type=start \ --homogeneous-row \ diff --git a/data_from_portwine/themes/default.pptheme b/data_from_portwine/themes/default.pptheme index 7bfcbd6b..6db8953b 100755 --- a/data_from_portwine/themes/default.pptheme +++ b/data_from_portwine/themes/default.pptheme @@ -42,7 +42,7 @@ export PW_TAB_POSITON=top # количество столбцов в главном меню export MAIN_GUI_COLUMNS=3 -export START_GUI_NOTEBOOK_COLUMNS=3 # количество столбцов для настроек в notebook +export START_GUI_NOTEBOOK_COLUMNS=2 # количество столбцов для настроек в notebook export START_GUI_PANED_COLUMNS=3 # количество столбцов для настроек в paned # это нужно export START_GUI_TYPE="--gui-type=start \