Merge branch 'Htylol-yad-updates2'

45dce05f · Mikhail Tergoev · 702c49c7 · 72eaf185 · 45dce05f · 45dce05f
Commit 45dce05f authored Jun 23, 2024 by Mikhail Tergoev
10 changed files
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -57,6 +57,7 @@ change_locale () {
        [[ ! -f "${pw_yad}" ]] && pw_yad="yad"
        SET_LANG=(
            "${pw_yad}" --list
+            --window-icon="$PW_GUI_ICON_PATH/portproton.svg"
            --title="Select language for PortProton"
            --column="Language" --column=""
            --width=400 --height=200
@@ -2612,6 +2613,7 @@ yad_info () {
        command -v "${pw_yad}" &>/dev/null || fatal "yad not found"
    fi
    "${pw_yad}" --no-wrap --text "$@" --width=400 --height=150 --borders=15 --title "INFO" \
+    --gui-type-layout=${YAD_INFO_GUI_TYPE_LAYOUT} \
    --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.svg" \
    --center --text-align=center --fixed \
    --button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null
@@ -2626,6 +2628,7 @@ yad_error () {
        command -v "${pw_yad}" &>/dev/null || fatal "yad not found"
    fi
    "${pw_yad}" --no-wrap --text "$@" --width=400 --height=150 --borders=15 --title "ERROR" \
+    --gui-type-layout=${YAD_INFO_GUI_TYPE_LAYOUT} \
    --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.svg" \
    --center --text-align=center --fixed \
    --button="$(gettext "EXIT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null
@@ -2654,6 +2657,7 @@ yad_question () {
    fi
    "${pw_yad}" --text "${1}" --width=400 --height=150 --borders=15 --title "$(gettext "Choices")" \
    --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.svg" \
+    --gui-type-layout=${YAD_INFO_GUI_TYPE_LAYOUT} \
    --no-wrap --center --text-align=center --fixed \
    --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
@@ -2720,9 +2724,9 @@ pw_update_pfx_cover_gui () {
                    PW_TIMER=1
                fi
        done < "${PORT_WINE_TMP_PATH}/update_pfx_log" | "${pw_yad}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N2 --text-info --tail  2>/dev/null &
-        "${pw_yad}" --plug=$PW_KEY_PROGRESS_BAR_UP --tabnum=$TAB_N1 --picture --filename="${PW_GIF_FILE}" --image-on-top 2>/dev/null &
+        "${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 --expand \
+        "${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 &
        export PW_YAD_PID_PFX_COVER_UI="$!"
@@ -3148,15 +3152,45 @@ if [[ "${SKIP_EDIT_DB_TEXT_INFO}" != 1 ]] ; then
    export SKIP_EDIT_DB_TEXT_INFO=1
 fi

+    case "${PW_VULKAN_USE}" in
+        0)
+            # WineD3D OpenGL
+            VKD3D_CB=DCB
+            DISABLE_EDIT_DB_LIST="PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_USE_OBS_VKCAPTURE
+            "
+            ;;
+        1|2)
+            # Stable or Newest
+            VKD3D_CB=CB
+            ;;
+        3)
+            # Gallium Nine
+            VKD3D_CB=DCB
+            DISABLE_EDIT_DB_LIST="PW_MANGOHUD PW_MANGOHUD_USER_CONF PW_VKBASALT PW_VKBASALT_USER_CONF PW_USE_RAY_TRACING PW_WINE_FULLSCREEN_FSR
+            PW_USE_SYSTEM_VK_LAYERS PW_USE_OBS_VKCAPTURE
+            "
+            ;;
+        4|5|6)
+            # Galliun Zink, Legacy, WineD3D Vulkan
+            VKD3D_CB=DCB
+            DISABLE_EDIT_DB_LIST="PW_USE_RAY_TRACING
+            "
+            ;;
+    esac
+
    unset ADD_CHK_BOX_EDIT_DB
-    for int_to_boole in $PW_EDIT_DB_LIST ; do
+    for int_to_boole in ${PW_EDIT_DB_LIST} ; do
        if [ "${!int_to_boole}" == "1" ]
        then export ${int_to_boole}="TRUE"
        else export ${int_to_boole}="FALSE"
        fi
        TMP_HELP_FOR_GUI="${int_to_boole}_INFO"
        int_to_boole_non_pw="$(echo ${int_to_boole//PW_/} | sed 's/_/ /g')"
-        ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%"
+        if [[ ! "${PW_VULKAN_USE}" == "1" ]] && [[ ! "${PW_VULKAN_USE}" == "2" ]] \
+        && grep -wo "${int_to_boole}" <<<"${DISABLE_EDIT_DB_LIST}" &>/dev/null
+        then ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:D${THEME_CHKBOX}%${!int_to_boole}%"
+        else ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%"
+        fi
    done

    old_IFS=$IFS
@@ -3223,7 +3257,7 @@ A brief instruction:
    export SKIP_CHECK_UPDATES=1

    case "$YAD_STATUS" in
-      1|252)
+        1|252)
                /usr/bin/env bash -c ${pw_full_command_line[*]} &
                exit 0
                ;;
@@ -3236,7 +3270,7 @@ A brief instruction:

    output_yad_edit_db=($(<"${PORT_WINE_TMP_PATH}/tmp_output_yad_edit_db"))
    bool_from_yad=0
-    for boole_to_int in $PW_EDIT_DB_LIST ; do
+    for boole_to_int in ${PW_EDIT_DB_LIST} ; do
        export ${boole_to_int}=${output_yad_edit_db[$bool_from_yad]}
        if [ "${!boole_to_int}" == "TRUE" ]
        then export ${boole_to_int}="1"
@@ -3263,7 +3297,7 @@ A brief instruction:
        export PW_WINE_CPU_TOPOLOGY="disabled"
    fi

-    edit_db_from_gui $PW_EDIT_DB_LIST LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY GAMESCOPE_ARGS \
+    edit_db_from_gui ${PW_EDIT_DB_LIST} LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY GAMESCOPE_ARGS \
    PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PW_LOCALE_SELECT

    if [[ -z "$MANGOHUD_CONFIG" ]] ; then
@@ -3391,7 +3425,8 @@ fi
    --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$(gettext "AMD FidelityFX - CAS is designed to dramatically improve texture sharpness without additional modification settings for games, with minimal loss of performance. (For older games it is recommended to set value = 100)")":SCL "${VKBASALT_FFX_CAS_GUI}" \
    1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null &

-    "${pw_yad}" --paned --key="$KEY_FX_GUI" --sensitive --gui-type=settings --gui-type-height=5 --gui-type-width=5 --title="vkBasalt" \
+    "${pw_yad}" --paned --key="$KEY_FX_GUI" --sensitive --title="vkBasalt" \
+    --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 \
@@ -3664,15 +3699,26 @@ if [[ "${SKIP_DGVOODOO2_TEXT_INFO}" != 1 ]] ; then
    export SKIP_DGVOODOO2_TEXT_INFO=1
 fi

+    case "${PW_VULKAN_USE}" in
+        0|3|4|5|6)
+            DISABLE_DGV2_LIST="PW_DGV2_USE_DX12
+            "
+            ;;
+    esac
+
    unset ADD_CHK_BOX_DGV2
-    for int_to_boole in $PW_DGV2_LIST ; do
+    for int_to_boole in ${PW_DGV2_LIST} ; do
        if [ "${!int_to_boole}" == "1" ]
        then export ${int_to_boole}="TRUE"
        else export ${int_to_boole}="FALSE"
        fi
        TMP_HELP_FOR_GUI="${int_to_boole}_INFO"
-        int_to_boole_non_pw="$(echo ${int_to_boole} | sed 's/^PW_DGV2//' | sed 's/_/ /g' )"
-        ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%"
+        int_to_boole_non_pw="$(echo ${int_to_boole//PW_DGV2/} | sed 's/_/ /g' )"
+        if [[ ! "${PW_VULKAN_USE}" == "1" ]] && [[ ! "${PW_VULKAN_USE}" == "2" ]] \
+        && grep -wo "${int_to_boole}" <<<"${DISABLE_DGV2_LIST}" &>/dev/null
+        then ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:D${THEME_CHKBOX}%${!int_to_boole}%"
+        else ADD_CHK_BOX_DGV2+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%"
+        fi
    done

    old_IFS=$IFS
@@ -3715,7 +3761,7 @@ fi

    output_yad_dgv2=($(<"${PORT_WINE_TMP_PATH}/tmp_yad_dgv2_set"))
    bool_from_yad=0
-    for boole_to_int in $PW_DGV2_LIST ; do
+    for boole_to_int in ${PW_DGV2_LIST} ; do
        export ${boole_to_int}=${output_yad_dgv2[$bool_from_yad]}
        if [ "${!boole_to_int}" == "TRUE" ]
        then export ${boole_to_int}="1"
@@ -3729,7 +3775,7 @@ fi
    PW_DGV2_FILTERING="$(echo ${PW_ADD_SETTINGS_DGV2} | awk -F"%" '{print $1}')"
    PW_DGV2_ANTIALIASING="$(echo ${PW_ADD_SETTINGS_DGV2} | awk -F"%" '{print $2}')"

-    edit_db_from_gui $PW_DGV2_LIST PW_DGVOODOO2 PW_DGV2_FILTERING PW_DGV2_ANTIALIASING
+    edit_db_from_gui ${PW_DGV2_LIST} PW_DGVOODOO2 PW_DGV2_FILTERING PW_DGV2_ANTIALIASING

    export SKIP_CHECK_UPDATES=1
    /usr/bin/env bash -c ${pw_full_command_line[*]} &

--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
-# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord; Boria138; Vano; Akai
+# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord; Boria138; Vano; Akai; Htylol
 # shellcheck disable=SC2140,SC2119,SC2206
 ########################################################################
 echo '
@@ -452,7 +452,9 @@ if [[ -f "${portwine_exe}" ]] ; then

        export KEY_START="$RANDOM"
        if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then
-            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" --gui-type=${START_GUI_TYPE_NOTEBOOK} \
+            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" ${START_GUI_TYPE} \
+            --gui-type-box=${START_GUI_TYPE_BOX} --gui-type-layout=${START_GUI_TYPE_LAYOUT_UP} \
+            --gui-type-text=${START_GUI_TYPE_TEXT} --gui-type-images=${START_GUI_TYPE_IMAGE} \
            --image="${PW_ICON_FOR_YAD}" --text-align="center" --text "$PW_COMMENT_DB" \
            --field="3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
            --field="  WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
@@ -477,6 +479,7 @@ if [[ -f "${portwine_exe}" ]] ; then
            fi

            "${pw_yad}" --key=$KEY_START --notebook --active-tab=${TAB_START} \
+            --gui-type=settings-notebook \
            --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" --center \
            --title "PortProton-${install_ver} (${scripts_install_ver})" --expand \
            --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
@@ -496,7 +499,9 @@ if [[ -f "${portwine_exe}" ]] ; then
            pw_yad_form_vulkan

        elif [[ "${PW_GUI_START}" == "PANED" ]] ; then
-            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" --gui-type=${START_GUI_TYPE_PANED} \
+            "${pw_yad}" --plug=$KEY_START --tabnum=1 --form --separator=";" ${START_GUI_TYPE} \
+            --gui-type-box=${START_GUI_TYPE_BOX} --gui-type-layout=${START_GUI_TYPE_LAYOUT_UP} \
+            --gui-type-text=${START_GUI_TYPE_TEXT} --gui-type-images=${START_GUI_TYPE_IMAGE} \
            --image="${PW_ICON_FOR_YAD}" --text-align="center" --text "$PW_COMMENT_DB" \
            --field="3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
            --field="  WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
@@ -504,6 +509,7 @@ if [[ -f "${portwine_exe}" ]] ; then
            1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &

            "${pw_yad}" --plug=$KEY_START --tabnum=2 --form --columns="${START_GUI_PANED_COLUMNS}" \
+            --gui-type-layout=${START_GUI_TYPE_LAYOUT_PANED} \
            --align-buttons --homogeneous-row --homogeneous-column \
            --field="   $(gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
            --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Enable vkBasalt by default to improve graphics in games running on Vulkan. (The HOME hotkey disables vkbasalt)")":"FBTN" '@bash -c "button_click_start 120"' \
@@ -513,6 +519,7 @@ if [[ -f "${portwine_exe}" ]] ; then
            2>/dev/null &

            "${pw_yad}" --key=$KEY_START --paned --center \
+            --gui-type=settings-paned \
            --width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" \
            --title "PortProton-${install_ver} (${scripts_install_ver})" \
            --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
@@ -564,6 +571,7 @@ else
    IFS="$orig_IFS"
    old_IFS=$IFS && IFS="%"
    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[4]}" --form --columns="$MAIN_GUI_COLUMNS" --homogeneous-column \
+    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
    --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null &
    IFS="$orig_IFS"

@@ -582,6 +590,7 @@ else
    2>/dev/null &

    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[2]}" --form --columns=3 --align-buttons --separator=";" \
+    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
    --field="   3D API  : :CB" "${PW_DEFAULT_VULKAN_USE}" \
    --field="   PREFIX  : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \
    --field="     WINE  : :CB" "${PW_DEFAULT_WINE_USE}" \
@@ -612,6 +621,7 @@ else
    --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"$(gettext "Emulator for the Sega Dreamcast game console")":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null &

    "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[0]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
+    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
    --field="   Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \
    --field="   vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \
    --field="   Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \
@@ -659,6 +669,7 @@ else

    if [[ -z "${PW_ALL_DF}" ]] ; then
        "${pw_yad}" --key=$KEY --notebook --expand \
+        --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" \
        --title "PortProton-${install_ver} (${scripts_install_ver})" \
@@ -671,6 +682,7 @@ else
        YAD_STATUS="$?"
    else
        "${pw_yad}" --key=$KEY --notebook --expand \
+        --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" \
        --title "PortProton-${install_ver} (${scripts_install_ver})" \

--- a/data_from_portwine/themes/classic.pptheme
+++ b/data_from_portwine/themes/classic.pptheme
@@ -9,6 +9,8 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \
 --tab-borders=3 \
 --keep-icon-size \
 --class=PortProton \
+--gui-type-height=0 \
+--gui-type-width=0 \
 "

 export THEME_CHKBOX=CHK
@@ -28,8 +30,48 @@ export PW_START_TAB_POSITON=top
 export MAIN_GUI_COLUMNS=3
 export START_GUI_NOTEBOOK_COLUMNS=3
 export START_GUI_PANED_COLUMNS=3
-export START_GUI_TYPE_NOTEBOOK=start-old
-export START_GUI_TYPE_PANED=start-old
+export START_GUI_TYPE="--gui-type=start-old \
+--image-halign=center \
+--image-valign=start \
+"
+
+export START_GUI_TYPE_BOX=5
+export START_GUI_TYPE_LAYOUT_UP=5
+export START_GUI_TYPE_LAYOUT_PANED=5
+export START_GUI_TYPE_LAYOUT_NOTEBOOK=5
+export START_GUI_TYPE_TEXT=0
+export START_GUI_TYPE_IMAGE=0
+
+export MAIN_MENU_GUI_TYPE_LAYOUT=0
+
+export VKBASALT_GUI_TYPE_LAYOUT_UP=5
+export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export VKBASALT_GUI_TYPE_TEXT_UP=0
+
+export MANGOHUD_GUI_TYPE_LAYOUT_UP=5
+export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=5
+export MANGOHUD_GUI_TYPE_TEXT_UP=0
+export MANGOHUD_GUI_TYPE_TEXT_DOWN=0
+
+export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
+export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
+export DGVOODOO2_GUI_TYPE_TEXT_UP=0
+
+export SETTINGS_BASE_GUI_TYPE_LAYOUT=0
+export SETTINGS_BASE_GUI_TYPE_TEXT=0
+
+export WINETRICKS_GUI_TYPE_LAYOUT=5
+export WINETRICKS_GUI_TYPE_TEXT=0
+
+export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=5
+export WINE_DOWNLOAD_GUI_TYPE_TEXT=0
+
+export SETTINGS_SHORTCUT_GUI_TYPE_BOX=5
+export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
+export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=0
+export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=0
+
+export YAD_INFO_GUI_TYPE_LAYOUT=5

 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/compact-old.pptheme
+++ b/data_from_portwine/themes/compact-old.pptheme
-#!/usr/bin/env bash
-# export GTK_DEBUG=interactive
-
-export THEME_NAME=compact-old
-export THEME_PATH="$PW_GUI_THEMES_PATH/$THEME_NAME"
-export COVERS_PATH="$PW_GUI_THEMES_PATH/classic"
-
-export YAD_OPTIONS="--css=$THEME_PATH/style.css \
--borders=3 \
--tab-borders=0 \
--keep-icon-size \
--buttons-layout=expand \
--class=PortProton \
--center \
-"
-export THEME_CHKBOX=SW
-export CHKBOX_SPACE="     "
-
-export BUTTON_SIZE_MM=32 # 24, 28, 32, 36, 40
-
-export BUTTON_SIZE=32 # 24, 28, 32, 36, 40
-
-export TAB_SIZE=32 # 24, 28, 32, 36, 40
-
-export PW_MAIN_SIZE_W=1
-export PW_MAIN_SIZE_H=350
-
-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 START_GUI_TYPE_NOTEBOOK=start-old
-export START_GUI_TYPE_PANED=start-old
-
-export PROGRESS_BAR_BORDERS_SIZE=20
-export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/compact-old/style.css
+++ b/data_from_portwine/themes/compact-old/style.css
-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 20px}
-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: 0px 0px 0px 0px; background-size:0px}
-window>box>box>box>image {margin: 5px 5px 0px 10px}
-check {min-height: 24px; min-width: 24px}
-box>grid>entry {margin: 0px 10px 0px 0px}
-checkbutton {margin: 0px 10px 0px 0px}
-buttonbox {margin: 10px 0px 0px 0px}
-window>box>grid>label {margin: 0px 0px 0px 10px}
--- a/data_from_portwine/themes/compact.pptheme
+++ b/data_from_portwine/themes/compact.pptheme
@@ -12,9 +12,11 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \
 --buttons-layout=expand \
 --class=PortProton \
 --center \
+--gui-type-height=2 \
+--gui-type-width=2 \
 "
 export THEME_CHKBOX=SW
-export CHKBOX_SPACE="     "
+export CHKBOX_SPACE="   "

 export BUTTON_SIZE_MM=32 # 24, 28, 32, 36, 40

@@ -30,10 +32,61 @@ 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 START_GUI_TYPE_NOTEBOOK=start
-export START_GUI_TYPE_PANED=start
+export START_GUI_TYPE="--gui-type=start \
+--homogeneous-row \
+"
+
+# для окна запуска приложения
+export START_GUI_TYPE_BOX=5 # значение для box
+export START_GUI_TYPE_LAYOUT_UP=3 # значение для layout вверху (для notebook 1 вкладка)
+export START_GUI_TYPE_LAYOUT_PANED=0 # значение для layout внизу для paned
+export START_GUI_TYPE_LAYOUT_NOTEBOOK=0 # значение для layout в notebook 2 вкладка
+export START_GUI_TYPE_TEXT=2 # значение для text
+export START_GUI_TYPE_IMAGE=5 # значение для images
+
+# для основного меню
+export MAIN_MENU_GUI_TYPE_LAYOUT=0
+
+# для vkbasalt
+export VKBASALT_GUI_TYPE_LAYOUT_UP=5
+export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export VKBASALT_GUI_TYPE_TEXT_UP=5
+
+# для mangohud
+export MANGOHUD_GUI_TYPE_LAYOUT_UP=5
+export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=5
+export MANGOHUD_GUI_TYPE_TEXT_UP=5
+export MANGOHUD_GUI_TYPE_TEXT_DOWN=5
+
+# для dgvoodoo2
+export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
+export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
+export DGVOODOO2_GUI_TYPE_TEXT_UP=5
+
+# для основных настроек
+export SETTINGS_BASE_GUI_TYPE_LAYOUT=2
+export SETTINGS_BASE_GUI_TYPE_TEXT=0
+
+# для окна winetricks
+export WINETRICKS_GUI_TYPE_LAYOUT=7
+export WINETRICKS_GUI_TYPE_TEXT=2
+
+# для окна скачивания версий wine
+export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=7
+export WINE_DOWNLOAD_GUI_TYPE_TEXT=2
+
+# для создания ярлыков
+export SETTINGS_SHORTCUT_GUI_TYPE_BOX=5
+export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
+export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=5
+export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5
+
+# для всплывающих окон по типу error, info, question
+export YAD_INFO_GUI_TYPE_LAYOUT=2

+# настройки индикатора прогресса
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/compact/style.css
+++ b/data_from_portwine/themes/compact/style.css
-arrow {margin: 0px 5px}
-window>box>box>box>image {margin: 15px 10px 0px 5px} /*иконка в создании ярлыка*/
-box>box>label {margin: 1px 0px 0px 0px}
-switch {margin: 5px 20px 0px 20px}
-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: 0px 0px 0px 0px; background-size:0px}
-window>box>box>image {margin: -30px 5px 0px 5px} /*иконка запуска ярлыка*/
-window>box>label {margin:5px 0px 10px 0px} /*текст запуска ярлыка*/
-check {min-height: 24px; min-width: 24px}
-box>grid>entry {margin: 0px 10px 0px 0px}
-checkbutton {margin: 0px 10px 0px 0px}
-buttonbox {margin: 10px 0px 0px 0px}
-window>box>grid>label {margin: 0px 0px 0px 10px}
+/*Глобальные правила*/
+arrow {margin: 3px 5px} /*выравнивание стрелок комбобоксов*/
+separator {margin: 0px 0px 0px 0px; background-size:0px; padding-bottom: 0px} /*скрываем сепаратор*/
+check {min-height: 24px; min-width: 24px} /*увеличиваем чекбоксы*/
+cellview,entry {min-height: 26px}  /*высота комбобоксов, т.к. некоторые темы их делают меньше и вёрстка съезжает*/
+switch {margin: 5px 10px 0px 10px}  /*переключатели mangohud и т.д. (в дефолтных темах gtk отступы необходимы. В то время как в некоторых темах выглядит больше, чем нужно. Пример qogir)*/
+
+/*Правила для окон*/
+window>box>grid {padding: 5px} /*отступы в расширенных настройках*/
+window>box>box>image {padding: 0px 0px 5px 0px;} /*иконка запуска ярлыка*/
+window>box>box>box>image {margin-top: 5px} /*иконка в создании ярлыка*/
+window>box>box>grid {padding: 0px 5px 5px 0px} /*комбобоксы в запуске ярлыка*/
+window>box>label {background: @theme_selected_bg_color; color: @theme_text_color; margin:3px 0px 3px 0px; padding: 5px} /*текст запуска ярлыка*/
+
+window>box>box>label {background: @theme_selected_bg_color; color: @theme_text_color; margin:3px 0px 0px 0px; padding: 5px} /*текст при создании ярлыка и в настройках*/
+
+/*window>box>grid>switch>slider {min-width: 10px; min-height: 10px; margin: 5px;} /*размер слайдеров в настройках*/
--- a/data_from_portwine/themes/default.pptheme
+++ b/data_from_portwine/themes/default.pptheme
@@ -13,11 +13,13 @@ export YAD_OPTIONS="--css=$THEME_PATH/style.css \
 --keep-icon-size \
 --buttons-layout=expand \
 --class=PortProton \
+--gui-type-height=2 \
+--gui-type-width=2 \
 "

 # настройка переключателей
 export THEME_CHKBOX=SW           # CHK - галки, SW - слайдер
-export CHKBOX_SPACE="          " # расстояние перед текстом у CHKBOX
+export CHKBOX_SPACE="    " # расстояние перед текстом у CHKBOX

 # размер кнопок в главном меню
 export BUTTON_SIZE_MM=36 # 24, 28, 32, 36, 40
@@ -39,10 +41,62 @@ export PW_TAB_POSITON=top

 # количество столбцов в главном меню
 export MAIN_GUI_COLUMNS=3
-export START_GUI_NOTEBOOK_COLUMNS=3
-export START_GUI_PANED_COLUMNS=3
-export START_GUI_TYPE_NOTEBOOK=start-old
-export START_GUI_TYPE_PANED=start-old
+
+export START_GUI_NOTEBOOK_COLUMNS=3                 # количество слолбцов для настроек в notebook
+export START_GUI_PANED_COLUMNS=3                    # количество слолбцов для настроек в paned
+# это нужно
+export START_GUI_TYPE="--gui-type=start \
+--homogeneous-row \
+"
+
+## отступы
+# для окна запуска приложения
+export START_GUI_TYPE_BOX=5 # значение для box
+export START_GUI_TYPE_LAYOUT_UP=3 # значение для layout вверху (для notebook 1 вкладка)
+export START_GUI_TYPE_LAYOUT_PANED=0 # значение для layout внизу для paned
+export START_GUI_TYPE_LAYOUT_NOTEBOOK=0 # значение для layout в notebook 2 вкладка
+export START_GUI_TYPE_TEXT=2 # значение для text
+export START_GUI_TYPE_IMAGE=5 # значение для images
+
+# для основного меню
+export MAIN_MENU_GUI_TYPE_LAYOUT=0
+
+# для vkbasalt
+export VKBASALT_GUI_TYPE_LAYOUT_UP=5
+export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export VKBASALT_GUI_TYPE_TEXT_UP=5
+
+# для mangohud
+export MANGOHUD_GUI_TYPE_LAYOUT_UP=5
+export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=5
+export MANGOHUD_GUI_TYPE_TEXT_UP=5
+export MANGOHUD_GUI_TYPE_TEXT_DOWN=5
+
+# для dgvoodoo2
+export DGVOODOO2_GUI_TYPE_LAYOUT_UP=5
+export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=5
+export DGVOODOO2_GUI_TYPE_TEXT_UP=5
+
+# для основных настроек
+export SETTINGS_BASE_GUI_TYPE_LAYOUT=2
+export SETTINGS_BASE_GUI_TYPE_TEXT=0
+
+# для окна winetricks
+export WINETRICKS_GUI_TYPE_LAYOUT=7
+export WINETRICKS_GUI_TYPE_TEXT=2
+
+# для окна скачивания версий wine
+export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=7
+export WINE_DOWNLOAD_GUI_TYPE_TEXT=2
+
+# для создания ярлыков
+export SETTINGS_SHORTCUT_GUI_TYPE_BOX=5
+export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
+export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=5
+export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5
+
+# для всплывающих окон по типу error, info, question
+export YAD_INFO_GUI_TYPE_LAYOUT=2

 # настройки индикатора прогресса
 export PROGRESS_BAR_BORDERS_SIZE=20

--- a/data_from_portwine/themes/default/style.css
+++ b/data_from_portwine/themes/default/style.css
-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}
-window>box>box>image {margin: 5px 5px 0px 5px}
-check {padding: 3px}
-box>grid>entry {margin: 0px 10px 0px 0px}
-checkbutton {margin: 0px 10px 0px 0px}
+/*Глобальные правила*/
+arrow {margin: 3px 5px} /*выравнивание стрелок комбобоксов*/
+separator {margin: 0px 0px 0px 0px; background-size:0px; padding-bottom: 0px} /*скрываем сепаратор*/
+check {min-height: 24px; min-width: 24px} /*увеличиваем чекбоксы*/
+cellview,entry {min-height: 26px}  /*высота комбобоксов, т.к. некоторые темы их делают меньше и вёрстка съезжает*/
+switch {margin: 5px 10px 0px 10px}  /*переключатели mangohud и т.д. (в дефолтных темах gtk отступы необходимы. В то время как в некоторых темах выглядит больше, чем нужно. Пример qogir)*/
+
+/*Правила для окон*/
+window>box>grid {padding: 5px} /*отступы в расширенных настройках*/
+window>box>box>image {padding: 0px 0px 5px 0px;} /*иконка запуска ярлыка*/
+window>box>box>box>image {margin-top: 5px} /*иконка в создании ярлыка*/
+window>box>box>grid {padding: 0px 5px 5px 0px} /*комбобоксы в запуске ярлыка*/
--- a/data_from_portwine/themes/gui/yad_gui_pp
+++ b/data_from_portwine/themes/gui/yad_gui_pp