Added more changes for customisation windows for themes, added disable fields for settings, update yad

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="$(eval_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="$(eval_gettext "EXIT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null
@@ -2639,6 +2642,7 @@ yad_error_download () {
     fi
     "${pw_yad}" --text "$(eval_gettext "You will need to check internet connection,and\npress Repeat for repeat download")" \
     --width=400 --borders=15 --title "$(eval_gettext "Error")" \
+    --gui-type-layout=${YAD_INFO_GUI_TYPE_LAYOUT} \
     --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/download.svg" \
     --no-wrap --center --text-align=center \
     --button="$(eval_gettext "SKIP")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \
@@ -2654,6 +2658,7 @@ yad_question () {
     fi
     "${pw_yad}" --text "${1}" --width=400 --height=150 --borders=15 --title "$(eval_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="$(eval_gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \
     --button="$(eval_gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null
@@ -2720,9 +2725,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="$!"
@@ -2939,6 +2944,7 @@ gui_proton_downloader () {
         export KEY_WINE=$RANDOM
 
         "${pw_yad}" --plug=$KEY_WINE --tabnum=1 --list --checklist --separator="" \
+        --gui-type-layout=${WINE_DOWNLOAD_GUI_TYPE_LAYOUT} --gui-type-text=${WINE_DOWNLOAD_GUI_TYPE_TEXT} \
         --column "$(eval_gettext "Set")" \
         --column "$(eval_gettext "Select WINE for download:")" \
         $TMP_PROTON_PW_GIT \
@@ -2946,6 +2952,7 @@ gui_proton_downloader () {
         2>/dev/null &
 
         "${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --checklist --separator="" \
+        --gui-type-layout=${WINE_DOWNLOAD_GUI_TYPE_LAYOUT} --gui-type-text=${WINE_DOWNLOAD_GUI_TYPE_TEXT} \
         --column "$(eval_gettext "Set")" \
         --column "$(eval_gettext "Select WINE for download:")" \
         $TMP_PROTON_KR_GIT \
@@ -2953,6 +2960,7 @@ gui_proton_downloader () {
         2>/dev/null &
 
         "${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --checklist --separator="" \
+        --gui-type-layout=${WINE_DOWNLOAD_GUI_TYPE_LAYOUT} --gui-type-text=${WINE_DOWNLOAD_GUI_TYPE_TEXT} \
         --column "$(eval_gettext "Set")" \
         --column "$(eval_gettext "Select WINE for download:")" \
         $TMP_PROTON_GE_GIT \
@@ -2960,6 +2968,7 @@ gui_proton_downloader () {
         2>/dev/null &
 
         "${pw_yad}" --plug=$KEY_WINE --tabnum=4 --list --checklist --separator="" \
+        --gui-type-layout=${WINE_DOWNLOAD_GUI_TYPE_LAYOUT} --gui-type-text=${WINE_DOWNLOAD_GUI_TYPE_TEXT} \
         --column "$(eval_gettext "Set")" \
         --column "$(eval_gettext "Select WINE for download:")" \
         $TMP_PROTON_CU_GIT \
@@ -2967,13 +2976,15 @@ gui_proton_downloader () {
         2>/dev/null &
 
         "${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --checklist --separator="" \
+        --gui-type-layout=${WINE_DOWNLOAD_GUI_TYPE_LAYOUT} --gui-type-text=${WINE_DOWNLOAD_GUI_TYPE_TEXT} \
         --column "$(eval_gettext "Set")" \
         --column "$(eval_gettext "Select installed WINE for delete:")" \
         $TMP_INSTALLED_WINE \
         1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" \
         2>/dev/null &
 
-        "${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center  \
+        "${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center \
+        --gui-type=settings-notebook \
         --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$(eval_gettext "WINE MANAGER")" --separator="" --expand \
         --tab-pos=top \
         --tab="PROTON-LG"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
@@ -3148,15 +3159,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
@@ -3206,13 +3247,15 @@ A brief instruction:
     --field="$(eval_gettext "Limit the use of processor cores")!$(eval_gettext "Limiting the number of CPU cores is useful for Unity games (It is recommended to set the value equal to 8)") :CB" "${CPU_LIMIT_VAR}!disabled!${GET_LOGICAL_CORE}" \
     --field="$(eval_gettext "Choose a graphics card to run the game (in user.conf)")!$(eval_gettext "Select which video card will be used to run the game (used for all running games and programs in PortProton)") :CB" "${GPU_VAR}!disabled!${GET_GPU_NAMES}" \
     --field="$(eval_gettext "Forcibly select the OpenGL version for the game")!$(eval_gettext "You can select the required OpenGL version, some games require a forced Compatibility Profile (COMPAT). (Examples are in the drop-down list)") :CB" "${PW_MESA_GL_VERSION_OVERRIDE}!disabled!4.6COMPAT!4.6!4.5COMPAT!4.5!3.3COMPAT!3.3" \
-    --field="$(eval_gettext "Forcibly select the VKD3D feature level")!$(eval_gettext "You can set a forced feature level VKD3D for games on DirectX12") :CB" "${PW_VKD3D_FEATURE_LEVEL}!disabled!12_2!12_1!12_0!11_1!11_0" \
+    --field="$(eval_gettext "Forcibly select the VKD3D feature level")!$(eval_gettext "You can set a forced feature level VKD3D for games on DirectX12") :$VKD3D_CB" "${PW_VKD3D_FEATURE_LEVEL}!disabled!12_2!12_1!12_0!11_1!11_0" \
     --field="$(eval_gettext "Force certain locale for an app:")!$(eval_gettext "Fixes encoding issues in legacy software") :CB" "${PW_LOCALE_SELECT}!disabled!$LOCALE_LIST" \
     1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null &
 
     "${pw_yad}" --notebook --key="$KEY_EDIT_DB_GUI" --title "$(eval_gettext "EDIT DB")" --text-align=center \
     --text "$(eval_gettext "Change settings in database file for") <b>${PORTWINE_DB}</b>\n $(eval_gettext "<b>NOTE:</b> 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-text=${SETTINGS_BASE_GUI_TYPE_TEXT} --gui-type-layout=${SETTINGS_BASE_GUI_TYPE_LAYOUT} \
     --tab="$(eval_gettext "MAIN")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
     --tab="$(eval_gettext "ADVANCED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
     --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \
@@ -3223,7 +3266,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 +3279,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 +3306,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
@@ -3383,15 +3426,18 @@ fi
     export old_IFS=$IFS
     export IFS="%"
     "${pw_yad}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \
-    --text-align=center --text="$(eval_gettext "VkBasalt settings for adding effects to games running under Vulkan. (The <b>HOME</b> key disables vkbasalt)\n<b>NOTE:</b> To display help for each item, simply hover over the text\n")" \
+    --text-align=center --text="$(eval_gettext "VkBasalt settings for adding effects to games running under Vulkan. (The <b>HOME</b> key disables vkbasalt)\n<b>NOTE:</b> To display help for each item, simply hover over the text")" \
+    --gui-type-text=${VKBASALT_GUI_TYPE_TEXT_UP} --gui-type-layout=${VKBASALT_GUI_TYPE_LAYOUT_UP} \
     ${ADD_GUI_FX} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_basalt_set" 2>/dev/null &
     export IFS="${old_IFS}"
 
     "${pw_yad}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \
+    --gui-type-layout=${VKBASALT_GUI_TYPE_LAYOUT_DOWN} \
     --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$(eval_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="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \
     --button="$(eval_gettext "DISABLE") VKBASALT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Disable vkBasalt and go to the previous menu")":180 \
@@ -3543,18 +3589,21 @@ fi
 
     old_IFS=$IFS && IFS="%"
     "${pw_yad}" --plug=$KEY_MH_GUI --tabnum="1" --form --columns=4 --separator=" " --text-align=center \
-        --text="$(eval_gettext "MangoHud settings (Keys <b>R_SHIFT + F12</b> disable MangoHud)\n<b>note:</b> To display help for each item, just hover the mouse cursor over the text.\n")" \
+        --text="$(eval_gettext "MangoHud settings (Keys <b>R_SHIFT + F12</b> disable MangoHud)\n<b>note:</b> To display help for each item, just hover the mouse cursor over the text.")" \
+        --gui-type-text=${MANGOHUD_GUI_TYPE_TEXT_UP} --gui-type-layout=${MANGOHUD_GUI_TYPE_LAYOUT_UP} \
         ${ADD_GUI_MH} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_set" 2>/dev/null &
     IFS=$old_IFS
 
     old_IFS=$IFS && IFS="%"
     "${pw_yad}" --plug=$KEY_MH_GUI --tabnum="2" --form --columns=10 --separator=" " --text-align=center \
-        --text="$(eval_gettext "Enabling fps limitation with MANGOHUD tools built into PortProton (Keys <b>L_SHIFT + F1</b> Toggles fps limitation)\n")" \
+        --text="$(eval_gettext "Enabling fps limitation with MANGOHUD tools built into PortProton (Keys <b>L_SHIFT + F1</b> Toggles fps limitation)")" \
+        --gui-type-text=${MANGOHUD_GUI_TYPE_TEXT_DOWN} --gui-type-layout=${MANGOHUD_GUI_TYPE_LAYOUT_DOWN} \
         ${ADD_GUI_MH_FPS} 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null &
     IFS=$old_IFS
 
     "${pw_yad}" --paned --key="$KEY_MH_GUI" --title="MangoHud" --center \
-        --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --sensitive --gui-type=settings --gui-type-height=5 --gui-type-width=5 \
+        --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --sensitive \
+        --gui-type=settings-paned \
         --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \
         --button="$(eval_gettext "DISABLE") MANGOHUD"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Disable MangoHud and go to the previous menu")":182 \
         --button="$(eval_gettext "PREVIEW CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Start vkcube for preview changes")":184 \
@@ -3664,31 +3713,45 @@ 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' )"
+        int_to_boole_non_pw="$(echo ${int_to_boole//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}%"
+        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
     IFS="%"
     "${pw_yad}" --plug=$KEY_DGV2_GUI --tabnum="1" --form --separator=" " --columns=3 ${ADD_CHK_BOX_DGV2} --text-align=center \
-    --text="$(eval_gettext "dgVoodoo2 settings\n<b>NOTE:</b> To display help for each item, simply hover over the text\n")" \
+    --text="$(eval_gettext "dgVoodoo2 settings\n<b>NOTE:</b> To display help for each item, simply hover over the text")" \
+    --gui-type-text=${DGVOODOO2_GUI_TYPE_TEXT_UP} --gui-type-layout=${DGVOODOO2_GUI_TYPE_LAYOUT_UP}  \
     1> "${PORT_WINE_TMP_PATH}/tmp_yad_dgv2_set" 2>/dev/null &
     IFS=$old_IFS
 
     "${pw_yad}" --plug=$KEY_DGV2_GUI --tabnum="2" --form --columns=2 --separator="%" \
+    --gui-type-layout=${DGVOODOO2_GUI_TYPE_LAYOUT_DOWN} \
     --field="${CHKBOX_SPACE}FILTERING!$(eval_gettext "Forced anisotropic filtering in Direct3D games") :CB" "${PW_DGV2_FILTERING}!disabled!2!4!8!16" \
     --field="${CHKBOX_SPACE}ANTIALIASING!$(eval_gettext "Forced antialiasing in Direct3D and Glide games") :CB" "${PW_DGV2_ANTIALIASING}!disabled!2!4!8" \
     1> "${PORT_WINE_TMP_PATH}/tmp_yad_dgv2_set_cb" 2>/dev/null &
 
     "${pw_yad}" --paned --key=$KEY_DGV2_GUI --height="350" --title="dgVoodoo2" --center \
-    --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --sensitive --gui-type=settings --gui-type-height=5 --gui-type-width=5 \
+    --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --sensitive \
+    --gui-type=settings-paned \
     --button="$(eval_gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Cancel the current changes and return to the previous menu")":1 \
     --button="$(eval_gettext "DISABLE") DGVOODOO2"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Disable dgVoodoo2 and go to the previous menu")":162 \
     --button="$(eval_gettext "SAVE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Save the current changes, and go to the previous menu")":166 \
@@ -3715,7 +3778,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 +3792,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[*]} &
@@ -3808,10 +3871,13 @@ portwine_create_shortcut () {
 
     if [[ "$1" == "block_name" ]] ; then
         export name_desktop="${PORTPROTON_NAME}"
-        OUTPUT=$("${pw_yad}" --title="$(eval_gettext "Choices")" --form --gui-type=start \
+        OUTPUT=$("${pw_yad}" --title="$(eval_gettext "Choices")" --form \
+        --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" \
         --image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
-        --field="$(eval_gettext "The shortcut will be created in the PortProton directory.")":LBL "" \
+        --text-align="center" --text "$(eval_gettext "The shortcut will be created in the PortProton directory.")" \
         --field="  ${name_desktop}":LBL "" \
         --field="  $(eval_gettext "Add shortcut to MENU -> GAMES")":CHK "TRUE" \
         --field="  $(eval_gettext "Add shortcut to Desktop")":CHK "TRUE" \
@@ -3820,10 +3886,13 @@ portwine_create_shortcut () {
         PW_YAD_OUT=$?
     else
         export name_desktop="${PORTPROTON_NAME}"
-        OUTPUT=$("${pw_yad}" --title="$(eval_gettext "Choices")" --form --gui-type=start \
+        OUTPUT=$("${pw_yad}" --title="$(eval_gettext "Choices")" --form \
+        --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" \
         --image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \
-        --field="$(eval_gettext "The shortcut will be created in the PortProton directory.")":LBL "" \
+        --text-align="center" --text "$(eval_gettext "The shortcut will be created in the PortProton directory.")" \
         --field="$(eval_gettext "Name")" "${name_desktop}" \
         --field="  $(eval_gettext "Add shortcut to MENU -> GAMES")":CHK "TRUE" \
         --field="  $(eval_gettext "Add shortcut to Desktop")":CHK "TRUE" \
@@ -3996,23 +4065,27 @@ pw_prefix_manager () {
 
         KEY_EDIT_MANAGER_GUI=$RANDOM
         "${pw_yad}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=1 --list --checklist \
+        --gui-type-layout=${WINETRICKS_GUI_TYPE_LAYOUT} --gui-type-text=${WINETRICKS_GUI_TYPE_TEXT} \
         --text="$(eval_gettext 'Select components to install in prefix:') <b>\"${PW_PREFIX_NAME}\"</b>, $(eval_gettext 'using wine:') <b>\"${PW_WINE_USE}\"</b>" \
         --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/dll_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null &
 
         "${pw_yad}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=2 --list --checklist \
+        --gui-type-layout=${WINETRICKS_GUI_TYPE_LAYOUT} --gui-type-text=${WINETRICKS_GUI_TYPE_TEXT} \
         --text="$(eval_gettext 'Select fonts to install in prefix:') <b>\"${PW_PREFIX_NAME}\"</b>, $(eval_gettext 'using wine:') <b>\"${PW_WINE_USE}\"</b>" \
         --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/fonts_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null &
 
         "${pw_yad}" --plug=$KEY_EDIT_MANAGER_GUI --tabnum=3 --list --checklist \
+        --gui-type-layout=${WINETRICKS_GUI_TYPE_LAYOUT} --gui-type-text=${WINETRICKS_GUI_TYPE_TEXT} \
         --text="$(eval_gettext 'Change config for prefix:') <b>\"${PW_PREFIX_NAME}\"</b>" \
         --column=set --column=dll --column=info < "${PORT_WINE_TMP_PATH}/settings_list_tmp" 1>> "${PORT_WINE_TMP_PATH}/to_winetricks" 2>/dev/null &
 
         "${pw_yad}" --key=$KEY_EDIT_MANAGER_GUI --notebook \
         --width=700 --height=700 --expand \
+        --gui-type=settings-notebook \
         --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$(eval_gettext 'PREFIX MANAGER')" \
         --button="$(eval_gettext "CANCEL")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":1 \
         --button="$(eval_gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 \
-        --tab-pos=bottom \
+        --tab-pos=top \
         --tab="$(eval_gettext 'DLLS')"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
         --tab="$(eval_gettext 'FONTS')"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
         --tab="$(eval_gettext 'SETTINGS')"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null

data_from_portwine/scripts/start.sh

@@ -1,6 +1,6 @@
 #!/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 '
@@ -451,7 +451,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}" \
@@ -459,6 +461,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_NOTEBOOK_COLUMNS}" --align-buttons --homogeneous-column \
+            --gui-type-layout=${START_GUI_TYPE_LAYOUT_NOTEBOOK} \
             --field="   $(eval_gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
             --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_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"' \
             --field="   MangoHud"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Enable Mangohud by default (R_SHIFT + F12 keyboard shortcuts disable Mangohud)")":"FBTN" '@bash -c "button_click_start 122"' \
@@ -476,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" \
@@ -495,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}" \
@@ -503,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="   $(eval_gettext "Base settings")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_gettext "Edit database file for") ${PORTWINE_DB}":"FBTN" '@bash -c "button_click_start 118"' \
             --field="   vkBasalt"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(eval_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"' \
@@ -512,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" \
@@ -563,10 +571,12 @@ 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"
 
     "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[3]}" --form --columns=3 --align-buttons --separator=";" --homogeneous-column \
+    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
     --field="   $(eval_gettext "Reinstall PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \
     --field="   $(eval_gettext "Remove PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \
     --field="   $(eval_gettext "Update PortProton")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \
@@ -581,6 +591,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}" \
@@ -595,6 +606,7 @@ else
     --field="   $(eval_gettext "Regedit")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"$(eval_gettext "Run wine regedit")":"FBTN" '@bash -c "button_click WINEREG"' 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" 2>/dev/null &
 
     "${pw_yad}" --plug=$KEY --tabnum="${PW_GUI_SORT_TABS[1]}" --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll --homogeneous-column \
+    --gui-type-layout=${MAIN_MENU_GUI_TYPE_LAYOUT} \
     --field="   Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"$(eval_gettext "Emulator for Nintendo game consoles with high compatibility")":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \
     --field="   MAME"!"$PW_GUI_ICON_PATH/mame.png"!"$(eval_gettext "Multi-arcade emulator that allows you to play old arcade games")":"FBTN" '@bash -c "button_click PW_MAME"' \
     --field="   RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"$(eval_gettext "Multi-platform frontend for emulators with extensive settings")":"FBTN" '@bash -c "button_click PW_RETROARCH"' \
@@ -611,6 +623,7 @@ else
     --field="   Demul"!"$PW_GUI_ICON_PATH/demul.png"!"$(eval_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"' \
@@ -658,6 +671,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})" \
@@ -670,6 +684,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})" \

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="--gui-type=start-old \
-export START_GUI_TYPE_PANED=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

data_from_portwine/themes/compact-old.pptheme

@@ -1,39 +0,0 @@
-#!/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

data_from_portwine/themes/compact-old/style.css

@@ -1,14 +0,0 @@
-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}

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="--gui-type=start \
-export START_GUI_TYPE_PANED=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

data_from_portwine/themes/compact/style.css

@@ -1,15 +1,17 @@
-arrow {margin: 0px 5px}
+/*Глобальные правила*/
-window>box>box>box>image {margin: 15px 10px 0px 5px} /*иконка в создании ярлыка*/
+arrow {margin: 3px 5px} /*выравнивание стрелок комбобоксов*/
-box>box>label {margin: 1px 0px 0px 0px}
+separator {margin: 0px 0px 0px 0px; background-size:0px; padding-bottom: 0px} /*скрываем сепаратор*/
-switch {margin: 5px 20px 0px 20px}
+check {min-height: 24px; min-width: 24px} /*увеличиваем чекбоксы*/
-box>grid>switch>slider {min-height: 0px; min-width: 22px}
+cellview,entry {min-height: 26px}  /*высота комбобоксов, т.к. некоторые темы их делают меньше и вёрстка съезжает*/
-scale>contents>trough>slider {min-height: 24px; min-width: 24px}
+switch {margin: 5px 10px 0px 10px}  /*переключатели mangohud и т.д. (в дефолтных темах gtk отступы необходимы. В то время как в некоторых темах выглядит больше, чем нужно. Пример qogir)*/
-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>grid {padding: 5px} /*отступы в расширенных настройках*/
-window>box>label {margin:5px 0px 10px 0px} /*текст запуска ярлыка*/
+window>box>box>image {padding: 0px 0px 5px 0px;} /*иконка запуска ярлыка*/
-check {min-height: 24px; min-width: 24px}
+window>box>box>box>image {margin-top: 5px} /*иконка в создании ярлыка*/
-box>grid>entry {margin: 0px 10px 0px 0px}
+window>box>box>grid {padding: 0px 5px 5px 0px} /*комбобоксы в запуске ярлыка*/
-checkbutton {margin: 0px 10px 0px 0px}
+window>box>label {background: @theme_selected_bg_color; color: @theme_text_color; margin:3px 0px 3px 0px; padding: 5px} /*текст запуска ярлыка*/
-buttonbox {margin: 10px 0px 0px 0px}
+
-window>box>grid>label {margin: 0px 0px 0px 10px}
+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;} /*размер слайдеров в настройках*/

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_NOTEBOOK_COLUMNS=3                 # количество слолбцов для настроек в notebook
-export START_GUI_TYPE_NOTEBOOK=start-old
+export START_GUI_PANED_COLUMNS=3                    # количество слолбцов для настроек в paned
-export START_GUI_TYPE_PANED=start-old
+# это нужно
+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

data_from_portwine/themes/default/style.css

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