Combining themes

2d44a0b0 · Vladislav · 4c22d32b · 2d44a0b0 · 2d44a0b0 · 2d44a0b0
Commit 2d44a0b0 authored Sep 11, 2024 by Vladislav
4 changed files
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -3208,7 +3208,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} \
+    --gui-type-layout="${YAD_INFO_GUI_TYPE_LAYOUT}" \
    --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.svg" \
    --text-align=center --fixed \
    --button="$(gettext "OK")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null
@@ -3223,7 +3223,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} \
+    --gui-type-layout="${YAD_INFO_GUI_TYPE_LAYOUT}" \
    --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.svg" \
    --text-align=center --fixed \
    --button="$(gettext "EXIT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null
@@ -3237,7 +3237,7 @@ yad_error_download () {
    fi
    "${pw_yad}" --text "$(gettext "You will need to check internet connection,and\npress Repeat for repeat download")" \
    --width=400 --borders=15 --title "$(gettext "Error")" \
-    --gui-type-layout=${YAD_INFO_GUI_TYPE_LAYOUT} \
+    --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 --text-align=center \
    --button="$(gettext "SKIP")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \
@@ -3253,7 +3253,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} \
+    --gui-type-layout="${YAD_INFO_GUI_TYPE_LAYOUT}" \
    --no-wrap --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
@@ -3561,7 +3561,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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --column "$(gettext "Set")" \
        --column "$(gettext "Select WINE for download:")" \
        $TMP_PROTON_PW_GIT \
@@ -3569,7 +3569,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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --column "$(gettext "Set")" \
        --column "$(gettext "Select WINE for download:")" \
        $TMP_PROTON_KR_GIT \
@@ -3577,7 +3577,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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --column "$(gettext "Set")" \
        --column "$(gettext "Select WINE for download:")" \
        $TMP_PROTON_GE_GIT \
@@ -3585,7 +3585,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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --column "$(gettext "Set")" \
        --column "$(gettext "Select WINE for download:")" \
        $TMP_PROTON_CU_GIT \
@@ -3593,7 +3593,7 @@ 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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --column "$(gettext "Set")" \
        --column "$(gettext "Select installed WINE for delete:")" \
        $TMP_INSTALLED_WINE \
@@ -3864,7 +3864,7 @@ A brief instruction:
    --text "$(gettext "Change settings in database file for") <b>${PORTWINE_DB}</b>\n $(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 \
    --gui-type="settings-base" \
-    --gui-type-text=${SETTINGS_BASE_GUI_TYPE_TEXT} --gui-type-layout=${SETTINGS_BASE_GUI_TYPE_LAYOUT} \
+    --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
    --tab="$(gettext "MAIN")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
    --tab="$(gettext "ADVANCED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
    --button="$(gettext "CANCEL THE CHANGES")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Cancel the current changes and return to the previous menu")":1 \
@@ -4030,12 +4030,12 @@ fi
    IFS="%"
    "${pw_yad}" --plug=$KEY_FX_GUI --tabnum="1" --form --columns=4 --separator=" " \
    --text-align=center --text="$(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} \
+    --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \
    ${ADD_GUI_FX} 1> "${PW_TMPFS_PATH}/tmp_yad_basalt_set" 2>/dev/null &
    IFS="$orig_IFS"
    "${pw_yad}" --plug=$KEY_FX_GUI --tabnum="2" --separator=" " --form \
-    --gui-type-layout=${VKBASALT_GUI_TYPE_LAYOUT_DOWN} \
+    --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_DOWN}" \
    --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> "${PW_TMPFS_PATH}/tmp_yad_cas_set" 2>/dev/null &
@@ -4198,11 +4198,11 @@ fi
    IFS="%"
    "${pw_yad}" --plug=$KEY_MH_GUI --tabnum="1" --form --columns=5 --separator=" " --text-align=center \
        --text="$(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} \
+        --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \
        ${ADD_GUI_MH} 1> "${PW_TMPFS_PATH}/tmp_yad_mh_set" 2>/dev/null &
    "${pw_yad}" --plug=$KEY_MH_GUI --tabnum="2" --form --columns=10 --separator=" " --text-align=center \
        --text="$(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} \
+        --gui-type-text="${PANED_GUI_TYPE_TEXT_DOWN}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_DOWN}" \
        ${ADD_GUI_MH_FPS} 1> "${PW_TMPFS_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null &
    IFS="$orig_IFS"
@@ -4366,7 +4366,7 @@ fi
    IFS="%"
    "${pw_yad}" --plug=$KEY_DGV2_GUI --tabnum="1" --form --separator=" " --columns=4 ${ADD_CHK_BOX_DGV2} --text-align=center \
    --text="$(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}  \
+    --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \
    1> "${PW_TMPFS_PATH}/tmp_yad_dgv2_set" 2>/dev/null &
    IFS="$orig_IFS"
@@ -4382,7 +4382,7 @@ fi
    DGVOODOO2_VIDEOCARD="dgVoodoo2 SVGA 3D!dgVoodoo2 Virtual 3D!Geforce 4 Ti 4800!ATI Radeon 8500!Matrox Parhelia-512!GeForce FX 5700 Ultra!GeForce 9800 GT!Voodoo Graphics!Voodoo Rush!Voodoo 2!Voodoo Banshee"
    "${pw_yad}" --plug=$KEY_DGV2_GUI --tabnum="2" --form --columns=3 --separator="%" \
-    --gui-type-layout=${DGVOODOO2_GUI_TYPE_LAYOUT_DOWN} \
+    --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_DOWN}" \
    --field="${CHKBOX_SPACE}RESOLUTION!$(gettext "Set the resolution used. (Direct3D and Glide settings)") :CBE" "$(combobox_fix --disabled "${PW_DGV2_RESOLUTION}" "4x app resolution!3x app resolution!2x app resolution!${DGVOODOO2_XRANDR_NEW::-1}")" \
    --field="${CHKBOX_SPACE}FPS LIMIT!$(gettext "You can configure fps limit. (Direct3D and Glide settings)") :CBE" "$(combobox_fix --disabled "${PW_DGV2_FPS_LIMIT}" "30!40!45!48!60!75!90!120!144!165!175!240")" \
    --field="${CHKBOX_SPACE}FILTERING!$(gettext "You can select from various texture filtering modes here. Forcing other than the app default can result in glitches or break some rendering effects. (Glide have max filtering bilinear) (Direct3D and Glide settings)") :CB" "$(combobox_fix --disabled "${PW_DGV2_FILTERING}" "${DGVOODOO2_FILTERING}")" \
@@ -4571,7 +4571,7 @@ fi
    IFS="%"
    "${pw_yad}" --plug=$KEY_GS_GUI --tabnum="1" --form --columns=4 --separator=" " --text-align=center --text "$GAMESCOPE_NEED_INSTALL" \
-    --gui-type-text=${GAMESCOPE_GUI_TYPE_TEXT_UP} --gui-type-layout=${GAMESCOPE_GUI_TYPE_LAYOUT_UP} $YAD_TEXT_SELECTION \
+    --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" $YAD_TEXT_SELECTION \
    ${ADD_CHK_BOX_GS} \
    1> "${PW_TMPFS_PATH}/tmp_yad_gs_set" 2>/dev/null &
    IFS="$orig_IFS"
@@ -4584,7 +4584,7 @@ fi
    done
    "${pw_yad}" --plug=$KEY_GS_GUI --tabnum="2" --form --columns=2 --separator="%" --homogeneous-row \
-    --gui-type-text=${GAMESCOPE_GUI_TYPE_TEXT_DOWN} --gui-type-layout=${GAMESCOPE_GUI_TYPE_LAYOUT_DOWN} \
+    --gui-type-text="${PANED_GUI_TYPE_TEXT_DOWN}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_DOWN}" \
    --field="${CHKBOX_SPACE}$(gettext "Show resolution")!$(gettext "Set the resolution used by gamescope. Resizing the gamescope window will update these settings. Defaults to 1280x720.") :${GS_CBE}" "$(combobox_fix --disabled "${PW_GS_SHOW_RESOLUTION}" "${GAMESCOPE_XRANDR_NEW::-1}")" \
    --field="${CHKBOX_SPACE}$(gettext "Internal resolution")!$(gettext "Scale internal resolution (0.0 is unused)") :${GS_NUMN}" "${PW_GS_INTERNAL_RESOLUTION}:!0..2" \
    --field="${CHKBOX_SPACE}$(gettext "Frame limit")!$(gettext "Set a framerate limit. Specified in frames per second") :${GS_CBE}" "$(combobox_fix --disabled "${PW_GS_FRAME_LIMIT}" "30!40!45!48!60!75!90!120!144!165!175!240")" \
@@ -4696,8 +4696,8 @@ gui_userconf () {
    KEY_USERCONF_GUI=$RANDOM
-    "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="1" --form --columns=2 --separator=" " --text-align=center --align-buttons --separator=";" \
+    "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="1" --form --columns=2 --separator=" " --text-align=center --align-buttons --separator=";" --homogeneous-column \
-    --gui-type-text=${GAMESCOPE_GUI_TYPE_TEXT_UP} --gui-type-layout=${GAMESCOPE_GUI_TYPE_LAYOUT_UP} \
+    --gui-type-text="${PANED_GUI_TYPE_TEXT_UP}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_UP}" \
    --field="   $(gettext "Change mirror to") $NEW_MIRROR"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --userconf change_mirror"' \
    --field="   $(gettext "Change branch to") $NEW_BRANCH"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --userconf change_branch"' \
    --field="   $(gettext "Change start gui to") $NEW_START_GUI"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click --userconf change_gui_start"' \
@@ -4721,7 +4721,7 @@ gui_userconf () {
    fi
    "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="2" --form --columns=1 --separator="%" --homogeneous-row \
-    --gui-type-text=${GAMESCOPE_GUI_TYPE_TEXT_DOWN} --gui-type-layout=${GAMESCOPE_GUI_TYPE_LAYOUT_DOWN} \
+    --gui-type-text="${PANED_GUI_TYPE_TEXT_DOWN}" --gui-type-layout="${PANED_GUI_TYPE_LAYOUT_DOWN}" \
    --field="$(gettext "Choose a graphics card to run the game")!$(gettext "Select which video card will be used to run the game (used for all running games and programs in PortProton)") :CB" "$(combobox_fix --disabled "${GPU_VAR}" "${GET_GPU_NAMES}")" \
    --field="$(gettext "Choice wine audio driver")!$(gettext "Fixes sound popling if choice alsa") :CB" "$(combobox_fix --disabled "${SOUND_DRIVER_VAR}" "alsa!oss!pulse")" \
    1> "${PW_TMPFS_PATH}/tmp_yad_userconf_set_cb" 2>/dev/null &
@@ -4834,8 +4834,8 @@ portwine_create_shortcut () {
    if [[ "$1" == "block_name" ]] ; then
        OUTPUT=$("${pw_yad}" --title="$(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-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
-        --gui-type-text=${SETTINGS_SHORTCUT_GUI_TYPE_TEXT} --gui-type-images=${SETTINGS_SHORTCUT_GUI_TYPE_IMAGE} \
+        --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \
        --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
        --image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
        --text-align="center" --text "$(gettext "The shortcut will be created in the PortProton directory.")" \
@@ -4849,8 +4849,8 @@ portwine_create_shortcut () {
    else
        OUTPUT=$("${pw_yad}" --title="$(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-box="${NOTEBOOK_GUI_TYPE_BOX}" --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" \
-        --gui-type-text=${SETTINGS_SHORTCUT_GUI_TYPE_TEXT} --gui-type-images=${SETTINGS_SHORTCUT_GUI_TYPE_IMAGE} \
+        --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" --gui-type-images="${NOTEBOOK_GUI_TYPE_IMAGE}" \
        --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \
        --image "${PORT_WINE_PATH}/data/img/${name_desktop_png}.png" \
        --text-align="center" --text "$(gettext "The shortcut will be created in the PortProton directory.")" \
@@ -5124,19 +5124,19 @@ 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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --text="$(gettext 'Select components to install in prefix:') <b>\"${PW_PREFIX_NAME}\"</b>, $(gettext 'using wine:') <b>\"${PW_WINE_USE}\"</b>" \
        --column="$(gettext "Set")" --column="$(gettext "Libraries")" \
        --column="$(gettext "Information")" < "${PW_TMPFS_PATH}/dll_list_tmp" 1>> "${PW_TMPFS_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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --text="$(gettext 'Select fonts to install in prefix:') <b>\"${PW_PREFIX_NAME}\"</b>, $(gettext 'using wine:') <b>\"${PW_WINE_USE}\"</b>" \
        --column="$(gettext "Set")" --column="$(gettext "Libraries")" \
        --column="$(gettext "Information")" < "${PW_TMPFS_PATH}/fonts_list_tmp" 1>> "${PW_TMPFS_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} \
+        --gui-type-layout="${NOTEBOOK_GUI_TYPE_LAYOUT}" --gui-type-text="${NOTEBOOK_GUI_TYPE_TEXT}" \
        --text="$(gettext 'Change config for prefix:') <b>\"${PW_PREFIX_NAME}\"</b>" \
        --column="$(gettext "Set")" --column="$(gettext "Libraries")" \
        --column="$(gettext "Information")" < "${PW_TMPFS_PATH}/settings_list_tmp" 1>> "${PW_TMPFS_PATH}/to_winetricks" 2>/dev/null &

--- a/data_from_portwine/themes/classic.pptheme
+++ b/data_from_portwine/themes/classic.pptheme
@@ -43,40 +43,17 @@ export START_GUI_TYPE_TEXT=0
 export START_GUI_TYPE_IMAGE=0
 export MAIN_MENU_GUI_TYPE_LAYOUT=0
+export YAD_INFO_GUI_TYPE_LAYOUT=5
-export VKBASALT_GUI_TYPE_LAYOUT_UP=5
+export PANED_GUI_TYPE_LAYOUT_UP=5
-export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export PANED_GUI_TYPE_LAYOUT_DOWN=5
-export VKBASALT_GUI_TYPE_TEXT_UP=0
+export PANED_GUI_TYPE_TEXT_UP=0
+export PANED_GUI_TYPE_TEXT_DOWN=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 GAMESCOPE_GUI_TYPE_LAYOUT_UP=5
-export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=5
-export GAMESCOPE_GUI_TYPE_TEXT_UP=0
-export GAMESCOPE_GUI_TYPE_TEXT_DOWN=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 NOTEBOOK_GUI_TYPE_BOX=5
+export NOTEBOOK_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_TEXT=0
+export NOTEBOOK_GUI_TYPE_IMAGE=0
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/compact.pptheme
+++ b/data_from_portwine/themes/compact.pptheme
@@ -46,40 +46,17 @@ export START_GUI_TYPE_TEXT=2
 export START_GUI_TYPE_IMAGE=2
 export MAIN_MENU_GUI_TYPE_LAYOUT=0
+export YAD_INFO_GUI_TYPE_LAYOUT=2
-export VKBASALT_GUI_TYPE_LAYOUT_UP=10
+export PANED_GUI_TYPE_LAYOUT_UP=10
-export VKBASALT_GUI_TYPE_LAYOUT_DOWN=5
+export PANED_GUI_TYPE_LAYOUT_DOWN=10
-export VKBASALT_GUI_TYPE_TEXT_UP=5
+export PANED_GUI_TYPE_TEXT_UP=5
+export PANED_GUI_TYPE_TEXT_DOWN=5
-export MANGOHUD_GUI_TYPE_LAYOUT_UP=10
-export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=10
-export MANGOHUD_GUI_TYPE_TEXT_UP=5
-export MANGOHUD_GUI_TYPE_TEXT_DOWN=5
-export DGVOODOO2_GUI_TYPE_LAYOUT_UP=10
-export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=10
-export DGVOODOO2_GUI_TYPE_TEXT_UP=5
-export GAMESCOPE_GUI_TYPE_LAYOUT_UP=10
-export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=10
-export GAMESCOPE_GUI_TYPE_TEXT_UP=5
-export GAMESCOPE_GUI_TYPE_TEXT_DOWN=5
-export SETTINGS_BASE_GUI_TYPE_LAYOUT=5
-export SETTINGS_BASE_GUI_TYPE_TEXT=2
-export WINETRICKS_GUI_TYPE_LAYOUT=5
-export WINETRICKS_GUI_TYPE_TEXT=2
-export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=5
-export WINE_DOWNLOAD_GUI_TYPE_TEXT=2
-export SETTINGS_SHORTCUT_GUI_TYPE_BOX=2
-export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
-export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=2
-export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5
-export YAD_INFO_GUI_TYPE_LAYOUT=2
+export NOTEBOOK_GUI_TYPE_BOX=2
+export NOTEBOOK_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_TEXT=2
+export NOTEBOOK_GUI_TYPE_IMAGE=5
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500
--- a/data_from_portwine/themes/default.pptheme
+++ b/data_from_portwine/themes/default.pptheme
@@ -60,50 +60,21 @@ export START_GUI_TYPE_IMAGE=2 # значение для images
 # для основного меню
 export MAIN_MENU_GUI_TYPE_LAYOUT=0
-# для vkbasalt
-export VKBASALT_GUI_TYPE_LAYOUT_UP=20
-export VKBASALT_GUI_TYPE_LAYOUT_DOWN=10
-export VKBASALT_GUI_TYPE_TEXT_UP=10
-# для mangohud
-export MANGOHUD_GUI_TYPE_LAYOUT_UP=20
-export MANGOHUD_GUI_TYPE_LAYOUT_DOWN=20
-export MANGOHUD_GUI_TYPE_TEXT_UP=10
-export MANGOHUD_GUI_TYPE_TEXT_DOWN=10
-# для dgvoodoo2
-export DGVOODOO2_GUI_TYPE_LAYOUT_UP=20
-export DGVOODOO2_GUI_TYPE_LAYOUT_DOWN=20
-export DGVOODOO2_GUI_TYPE_TEXT_UP=10
-# для gamescope
-export GAMESCOPE_GUI_TYPE_LAYOUT_UP=20
-export GAMESCOPE_GUI_TYPE_LAYOUT_DOWN=20
-export GAMESCOPE_GUI_TYPE_TEXT_UP=10
-export GAMESCOPE_GUI_TYPE_TEXT_DOWN=10
-# для основных настроек
-export SETTINGS_BASE_GUI_TYPE_LAYOUT=5
-export SETTINGS_BASE_GUI_TYPE_TEXT=2
-# для окна winetricks
-export WINETRICKS_GUI_TYPE_LAYOUT=5
-export WINETRICKS_GUI_TYPE_TEXT=2
-# для окна скачивания версий wine
-export WINE_DOWNLOAD_GUI_TYPE_LAYOUT=5
-export WINE_DOWNLOAD_GUI_TYPE_TEXT=2
-# для создания ярлыков
-export SETTINGS_SHORTCUT_GUI_TYPE_BOX=2
-export SETTINGS_SHORTCUT_GUI_TYPE_LAYOUT=5
-export SETTINGS_SHORTCUT_GUI_TYPE_TEXT=2
-export SETTINGS_SHORTCUT_GUI_TYPE_IMAGE=5
 # для всплывающих окон по типу error, info, question
 export YAD_INFO_GUI_TYPE_LAYOUT=2
+# для vkbasalt, mangohud, dgvoodoo2, gamescope, userconf
+export PANED_GUI_TYPE_LAYOUT_UP=20
+export PANED_GUI_TYPE_LAYOUT_DOWN=20
+export PANED_GUI_TYPE_TEXT_UP=10
+export PANED_GUI_TYPE_TEXT_DOWN=10
+# для основных настроек, winetricks, для скачивания версий wine, для создания ярлыков
+export NOTEBOOK_GUI_TYPE_BOX=2
+export NOTEBOOK_GUI_TYPE_LAYOUT=5
+export NOTEBOOK_GUI_TYPE_TEXT=2
+export NOTEBOOK_GUI_TYPE_IMAGE=5
 # настройки индикатора прогресса
 export PROGRESS_BAR_BORDERS_SIZE=20
 export PROGRESS_BAR_WIDTH_SIZE=500