diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 33576589..1df44ae6 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,7 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: -###Scripts version 2273### Date: 04.04.2024 / Download update size: 15 megabytes +###Scripts version 2274### Date: 07.04.2024 / Download update size: 15 megabytes +* added the previous theme for PortProton, enabled by adding "export GUI_THEME=classic" to "data/user.conf" + +###Scripts version 2273### Date: 06.04.2024 / Download update size: 15 megabytes * the PortProton interface has been updated * improved the quality of the tray icon * added the CatsLauncher (the Front Edge game) to the AUTOINSTALL diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 23c2cb28..f7227123 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2274### Дата: 07.04.2024 / Размер скачиваемого обновления: 15 мегабайт +* добавлена предыдущая тема для PortProton, включается добавлением "export GUI_THEME=classic" в "data/user.conf" + ###Scripts version 2273### Дата: 06.04.2024 / Размер скачиваемого обновления: 15 мегабайт * обновлён интерфейс PortProton * улучшено качество иконки в трее diff --git a/data_from_portwine/img/gui/24.png b/data_from_portwine/img/gui/24.png new file mode 100755 index 00000000..6a2739e6 Binary files /dev/null and b/data_from_portwine/img/gui/24.png differ diff --git a/data_from_portwine/img/gui/separator.png b/data_from_portwine/img/gui/28.png similarity index 100% rename from data_from_portwine/img/gui/separator.png rename to data_from_portwine/img/gui/28.png diff --git a/data_from_portwine/img/gui/32.png b/data_from_portwine/img/gui/32.png new file mode 100755 index 00000000..30a9544b Binary files /dev/null and b/data_from_portwine/img/gui/32.png differ diff --git a/data_from_portwine/img/gui/36.png b/data_from_portwine/img/gui/36.png new file mode 100755 index 00000000..30a9544b Binary files /dev/null and b/data_from_portwine/img/gui/36.png differ diff --git a/data_from_portwine/img/gui/40.png b/data_from_portwine/img/gui/40.png new file mode 100755 index 00000000..020d3257 Binary files /dev/null and b/data_from_portwine/img/gui/40.png differ diff --git a/data_from_portwine/img/gui/close.png b/data_from_portwine/img/gui/close.png new file mode 100644 index 00000000..de254cac Binary files /dev/null and b/data_from_portwine/img/gui/close.png differ diff --git a/data_from_portwine/img/gui/history.png b/data_from_portwine/img/gui/history.png new file mode 100644 index 00000000..c6b424d2 Binary files /dev/null and b/data_from_portwine/img/gui/history.png differ diff --git a/data_from_portwine/img/gui/history_from_web.png b/data_from_portwine/img/gui/history_from_web.png new file mode 100644 index 00000000..28195a2e Binary files /dev/null and b/data_from_portwine/img/gui/history_from_web.png differ diff --git a/data_from_portwine/img/gui/wine_file.png b/data_from_portwine/img/gui/wine_file.png new file mode 100644 index 00000000..350d466e Binary files /dev/null and b/data_from_portwine/img/gui/wine_file.png differ diff --git a/data_from_portwine/img/gui/wine_file.svg b/data_from_portwine/img/gui/wine_file.svg new file mode 100644 index 00000000..5d09ea80 --- /dev/null +++ b/data_from_portwine/img/gui/wine_file.svg @@ -0,0 +1,602 @@ + + + + diff --git a/data_from_portwine/img/gui/wine_system.png b/data_from_portwine/img/gui/wine_system.png new file mode 100644 index 00000000..daca8c20 Binary files /dev/null and b/data_from_portwine/img/gui/wine_system.png differ diff --git a/data_from_portwine/img/gui/wine_system.svg b/data_from_portwine/img/gui/wine_system.svg new file mode 100644 index 00000000..6abe6180 --- /dev/null +++ b/data_from_portwine/img/gui/wine_system.svg @@ -0,0 +1,866 @@ + + + + diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 9fa1d048..56cb23b3 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2290,7 +2290,8 @@ yad_info () { fi "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --height=50 --borders=15 --title "INFO" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/info.png" \ - --center --text-align=center --button=OK 2>/dev/null + --center --text-align=center \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } export -f yad_info @@ -2302,7 +2303,8 @@ yad_error () { fi "${pw_yad_v13_0}" --no-wrap --text "$@" --width=400 --borders=15 --title "ERROR" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/error.png" \ - --center --text-align=center --button=EXIT 2>/dev/null + --center --text-align=center \ + --button="EXIT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png" 2>/dev/null } export -f yad_error @@ -2313,7 +2315,9 @@ yad_error_download () { fi "${pw_yad_v13_0}" --text "$loc_gui_error_download" --width=400 --borders=15 --title "$loc_gui_error" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/download.png" \ - --no-wrap --center --text-align=center --button=SKIP:1 --button=REPEAT:0 2>/dev/null + --no-wrap --center --text-align=center\ + --button="SKIP"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ + --button="REPEAT"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null [[ "$?" != 0 ]] && return 1 || return 0 } @@ -2324,7 +2328,9 @@ yad_question () { fi "${pw_yad_v13_0}" --text "${1}" --width=400 --borders=15 --title "${inst_set}." \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --image="$PW_GUI_ICON_PATH/question.png" \ - --no-wrap --center --text-align=center 2>/dev/null + --no-wrap --center --text-align=center \ + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 2>/dev/null [[ "$?" != 0 ]] && return 1 || return 0 } @@ -2355,17 +2361,17 @@ pw_start_progress_bar_cover_block () { pw_update_pfx_cover_gui () { if [[ "$1" == "winetricks" ]] ; then - TAB_PLACE="--tab=$loc_gui_terminal --tab=$loc_gui_logo" + TAB_PLACE="--tab=$loc_gui_terminal!$PW_GUI_ICON_PATH/$TAB_SIZE.png --tab=$loc_gui_logo!$PW_GUI_ICON_PATH/$TAB_SIZE.png" TAB_N1=2 TAB_N2=1 YAD_UNDECORATED="" else - TAB_PLACE="--tab=$loc_gui_logo --tab=$loc_gui_terminal" + TAB_PLACE="--tab=$loc_gui_logo!$PW_GUI_ICON_PATH/$TAB_SIZE.png --tab=$loc_gui_terminal!$PW_GUI_ICON_PATH/$TAB_SIZE.png" TAB_N1=1 TAB_N2=2 YAD_UNDECORATED="--undecorated --center" - fi + if ! check_start_from_steam && ! pgrep -a yad | grep "yad_v13_0 --notebook --key=$PW_KEY_PROGRESS_BAR_UP" &>/dev/null ; then PW_KEY_PROGRESS_BAR_UP=$RANDOM PW_GIF_FILE="${PW_GUI_ICON_PATH}/covers/update_prefix_${update_loc}.gif" @@ -2399,8 +2405,10 @@ pw_update_pfx_cover_gui () { pw_start_progress_bar_cs () { if ! check_start_from_steam ; then "${pw_yad}" --progress --progress-text="$@ - " --pulsate --close-on-unfocus --borders=20 \ - --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 \ + " --pulsate --close-on-unfocus --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + --no-buttons --undecorated --center --skip-taskbar \ + --width="$PROGRESS_BAR_WIDTH_SIZE" \ + --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null & export PW_YAD_PID_PROGRESS_BAR_CS="$!" return 0 @@ -2410,8 +2418,10 @@ pw_start_progress_bar_cs () { pw_start_progress_bar_block () { if ! check_start_from_steam ; then "${pw_yad}" --progress --progress-text="$@ - " --pulsate --borders=20 \ - --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 \ + " --pulsate --borders="$PROGRESS_BAR_BORDERS_SIZE" \ + --no-buttons --undecorated --center --skip-taskbar \ + --width="$PROGRESS_BAR_WIDTH_SIZE" \ + --wrap-width="$PROGRESS_BAR_WIDTH_SIZE" \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" &>/dev/null & export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!" return 0 @@ -2480,10 +2490,10 @@ pw_tray_icon () { --command="bash -c tray_icon_click" \ --tooltip="PortProton" \ --icon-size=32 --menu="| \ - ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ - ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/port_winefile.png"|| \ - ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/port_changelog.png"|| \ - ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/port_exit.png"||" 2>/dev/null & + ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.png"|| \ + ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.png"|| \ + ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.png"|| \ + ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.png"||" 2>/dev/null & return 0 } @@ -2525,7 +2535,7 @@ pw_gui_for_edit_db () { fi TMP_HELP_FOR_GUI="${int_to_boole}_INFO" int_to_boole_non_pw="`echo ${int_to_boole} | sed 's/^PW_//' | sed 's/_/ /g' `" - ADD_CHK_BOX_EDIT_DB+="--field= ${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:SW%${!int_to_boole}%" + ADD_CHK_BOX_EDIT_DB+="--field=${CHKBOX_SPACE}${int_to_boole_non_pw}!${!TMP_HELP_FOR_GUI}:${THEME_CHKBOX}%${!int_to_boole}%" done } edit_db_field_add $@ @@ -2554,13 +2564,13 @@ pw_gui_for_edit_db () { --field="${loc_gui_gpu_select}!${loc_gui_gpu_select_help} :CB" "${GPU_VAR}!disabled!${GET_GPU_NAMES}" \ --field="${loc_gui_arg_gamescope}!${loc_gui_arg_gamescope_help} :CBE" "\\${GAMESCOPE_ARGS}!-r 60 -F fsr!" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & - "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="675" \ + "${pw_yad_v13_0}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="700" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --button="${loc_gui_cancel}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_cancel_help}":1 \ - --button="${loc_gui_reset_db}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_reset_db_help}":2 \ - --button="${loc_gui_open_db}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_open_db_help}":150 \ - --button="${loc_gui_save_changes}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_gui_save_changes_help}":0 2>/dev/null + --button="${loc_gui_cancel}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_cancel_help}":1 \ + --button="${loc_gui_reset_db}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_reset_db_help}":2 \ + --button="${loc_gui_open_db}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_open_db_help}":150 \ + --button="${loc_gui_save_changes}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_gui_save_changes_help}":0 2>/dev/null YAD_STATUS="$?" export SKIP_CHECK_UPDATES=1 case "$YAD_STATUS" in @@ -2716,9 +2726,14 @@ gui_proton_downloader () { --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" 2>/dev/null` & `"${pw_yad_v13_0}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --no-button \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "WINE MANAGER" --separator="" --expand \ - --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" \ - --button="$loc_cancel"!"$PW_GUI_ICON_PATH/separator.png"!"":1 \ - --button="OK"!"$PW_GUI_ICON_PATH/separator.png"!"":0 2>/dev/null` + --tab-pos=top \ + --tab="PROTON-LG"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="WINE-KRON4EK"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="PROTON-GE"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="WINE-GE-CUSTOM"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_gui_installed_wine"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":1 \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 2>/dev/null` YAD_WINE_STATUS="$?" if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then export SKIP_CHECK_UPDATES=1 @@ -2810,9 +2825,9 @@ gui_vkBasalt () { for add_list_fx in ${LIST_FX[@]} ; do PW_VKBASALT_GUI_HELP="PW_${add_list_fx}_INFO" if [[ ! -z `echo " ${GET_FX_IN_FILE[@]} " | grep " ${add_list_fx} "` ]] ; then - ADD_GUI_FX+="--field= $add_list_fx!${!PW_VKBASALT_GUI_HELP}:SW%TRUE%" + ADD_GUI_FX+="--field=${CHKBOX_SPACE}${add_list_fx}!${!PW_VKBASALT_GUI_HELP}:${THEME_CHKBOX}%TRUE%" else - ADD_GUI_FX+="--field= $add_list_fx!${!PW_VKBASALT_GUI_HELP}:SW%FALSE%" + ADD_GUI_FX+="--field=${CHKBOX_SPACE}${add_list_fx}!${!PW_VKBASALT_GUI_HELP}:${THEME_CHKBOX}%FALSE%" fi done if [[ ! -z "${PW_VKBASALT_FFX_CAS}" ]] ; then @@ -2838,11 +2853,11 @@ gui_vkBasalt () { --field="AMD FidelityFX - Contrast Adaptive Sharpening"!"$loc_gui_ffx_cas":SCL "${VKBASALT_FFX_CAS_GUI}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_cas_set" 2>/dev/null & - "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="600" --title="vkBasalt" --center \ + "${pw_yad_v13_0}" --paned --key="$KEY_FX_GUI" --height="625" --title="vkBasalt" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ - --button="$loc_gui_disabled_vkbas"!!"$loc_gui_disabled_vkbas_help":180 \ - --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":182 2>/dev/null + --button="$loc_gui_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_cancel_help":1 \ + --button="$loc_gui_disabled_vkbas"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_disabled_vkbas_help":180 \ + --button="$loc_gui_save_changes"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_save_changes_help":182 2>/dev/null YAD_VKBASALT_STATUS="$?" case "${YAD_VKBASALT_STATUS}" in 1|252) @@ -2917,9 +2932,9 @@ gui_MangoHud () { for add_list_mh in "${LIST_MH[@]}"; do PW_MH_GUI_HELP="PW_MH_${add_list_mh}_INFO" if [[ -n "$(grep -wo "$add_list_mh" <<<"${PW_MANGOHUD_CONFIG[@]}")" ]] ; then - ADD_GUI_MH+="--field= $(echo $add_list_mh | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:SW%TRUE%" + ADD_GUI_MH+="--field=${CHKBOX_SPACE}$(echo ${add_list_mh} | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:${THEME_CHKBOX}%TRUE%" else - ADD_GUI_MH+="--field= $(echo $add_list_mh | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:SW%FALSE%" + ADD_GUI_MH+="--field=${CHKBOX_SPACE}$(echo ${add_list_mh} | sed 's/_/ /g' | tr [[:lower:]] [[:upper:]])!${!PW_MH_GUI_HELP}:${THEME_CHKBOX}%FALSE%" fi done @@ -2934,11 +2949,11 @@ gui_MangoHud () { --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRESH_RATE}" \ 1> "${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit" 2>/dev/null & - "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="550" --title="MangoHud" --center \ + "${pw_yad_v13_0}" --paned --key="$KEY_MH_GUI" --height="575" --title="MangoHud" --center \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ - --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ - --button="$loc_gui_disabled_mh"!!"$loc_gui_disabled_mh_help":182 \ - --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":184 2>/dev/null + --button="$loc_gui_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_cancel_help":1 \ + --button="$loc_gui_disabled_mh"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_disabled_mh_help":182 \ + --button="$loc_gui_save_changes"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$loc_gui_save_changes_help":184 2>/dev/null YAD_MANGOHUD_STATUS="$?" case "${YAD_MANGOHUD_STATUS}" in @@ -3014,7 +3029,7 @@ portwine_create_shortcut () { --field=" ${sc_menu_desktop}":CHK "TRUE" \ --field=" ${sc_desktop_desktop}":CHK "TRUE" \ --field=" ${sc_add_in_steam}":CHK "FALSE" \ - --button="$loc_gui_create_shortcut":0) + --button="$loc_gui_create_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0) PW_YAD_OUT=$? else export name_desktop="${PORTPROTON_NAME}" @@ -3026,7 +3041,7 @@ portwine_create_shortcut () { --field=" ${sc_menu_desktop}":CHK "TRUE" \ --field=" ${sc_desktop_desktop}":CHK "TRUE" \ --field=" ${sc_add_in_steam}":CHK "FALSE" \ - --button="$loc_gui_create_shortcut":0) + --button="$loc_gui_create_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0) PW_YAD_OUT=$? fi @@ -3128,8 +3143,8 @@ portwine_missing_shortcut () { --window-icon "$PW_GUI_ICON_PATH/portproton.svg" \ --image "$PW_GUI_ICON_PATH/error_file.png" \ --text "$loc_gui_missing_shortcut" \ - --button="$loc_gui_delete_shortcut":0 \ - --button="$loc_cancel":1 + --button="$loc_gui_delete_shortcut"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 \ + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":1 if [ $? -eq "0" ] ; then portwine_delete_shortcut fi @@ -3200,9 +3215,12 @@ pw_prefix_manager () { "${pw_yad_v13_0}" --key=$KEY_EDIT_MANAGER_GUI --notebook \ --width=900 --height=800 --expand \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "$loc_pm" \ - --button="$loc_cancel"!"$PW_GUI_ICON_PATH/separator.png"!"":1 \ - --button="OK"!"$PW_GUI_ICON_PATH/separator.png"!"":0 \ - --tab-pos=bottom --tab="$loc_pm_dlls" --tab="$loc_pm_fonts" --tab="$loc_pm_settings" 2>/dev/null + --button="$loc_cancel"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":1 \ + --button="OK"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":0 \ + --tab-pos=bottom \ + --tab="$loc_pm_dlls"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_pm_fonts"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_pm_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null YAD_STATUS="$?" if [[ "$YAD_STATUS" == "1" || "$YAD_STATUS" == "252" ]] ; then print_info "Nothing to do. Restarting PortProton..." @@ -3386,7 +3404,7 @@ portwine_start_debug () { sleep 3 pw_stop_progress_bar_cover unset PW_TIMER - while read -r line || [[ ! -z $(pgrep -a yad | grep "yad_v13_0 --text-info --tail --button="STOP":0 --title="DEBUG"" | awk '{print $1}') ]] ; do + while read -r line || [[ ! -z $(pgrep -a yad | grep "yad_v13_0 --text-info --tail --button="STOP"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 --title="DEBUG"" | awk '{print $1}') ]] ; do sleep 0.005 if [[ ! -z "${line}" ]] && [[ -z "$(echo "${line}" | grep -i "kerberos")" ]] \ && [[ -z "$(echo "${line}" | grep -i "ntlm")" ]] @@ -3397,7 +3415,7 @@ portwine_start_debug () { sleep 3 PW_TIMER=1 fi - done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v13_0}" --text-info --tail --button="STOP":0 --title="DEBUG" \ + done < "${PORT_WINE_PATH}/${portname}.log" | "${pw_yad_v13_0}" --text-info --tail --button="STOP"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png":0 --title="DEBUG" \ --skip-taskbar --width=800 --height=400 --text "${port_debug}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" 2>/dev/null && kill_portwine sed -i '/.fx$/d' "${PORT_WINE_PATH}/${portname}.log" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 40d89161..2e333c24 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -22,7 +22,6 @@ fi export PW_START_PID="$$" export NO_AT_BRIDGE=1 export pw_full_command_line=("$0" $*) -export YAD_OPTIONS="--borders=3 --tab-borders=0 --keep-icon-size" MISSING_DESKTOP_FILE=0 @@ -128,9 +127,7 @@ cd "${PORT_SCRIPTS_PATH}" export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts" export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" - export PW_GUI_THEMES_PATH="${PORT_WINE_PATH}/data/themes" -export YAD_OPTIONS+=" --css=$PW_GUI_THEMES_PATH/default.css" . "${PORT_SCRIPTS_PATH}"/lang @@ -148,12 +145,24 @@ try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" # TODO: remove this later... try_remove_file "${PORT_SCRIPTS_PATH}/runlib" try_remove_file "${PORT_SCRIPTS_PATH}/yad_gui" +try_remove_file "${PW_GUI_THEMES_PATH}/default.css" if [[ "${INSTALLING_PORT}" == 1 ]] ; then return 0 fi . "${USER_CONF}" + +# подключаем тему: +if [[ ! -z "$GUI_THEME" ]] \ +&& [[ -f "$PW_GUI_THEMES_PATH/$GUI_THEME.pptheme" ]] +then +. "$PW_GUI_THEMES_PATH/$GUI_THEME.pptheme" +else +. "$PW_GUI_THEMES_PATH/default.pptheme" +echo 'export GUI_THEME="default"' >> "$USER_CONF" +fi + if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \ && [[ ! -f "/tmp/portproton.lock" ]] then @@ -202,14 +211,6 @@ fi [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut -if [[ -f "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" ]] && [[ ! -z "$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size)" ]] ; then - export PW_MAIN_SIZE_W="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $1}')" - export PW_MAIN_SIZE_H="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $2}')" -else - export PW_MAIN_SIZE_W="1100" - export PW_MAIN_SIZE_H="350" -fi - if [[ ! -z $(basename "${portwine_exe}" | grep .ppack) ]] ; then export PW_ADD_TO_ARGS_IN_RUNTIME="--xterm" unset PW_SANDBOX_HOME_PATH @@ -339,9 +340,9 @@ if [[ -f "${portwine_exe}" ]] ; then pw_create_gui_png grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop if [[ "$?" != "0" ]] ; then - PW_SHORTCUT="${loc_gui_create_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_create_shortcut}:100" + PW_SHORTCUT="${loc_gui_create_shortcut}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${loc_create_shortcut}:100" else - PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/separator.png!${loc_delete_shortcut}:98" + PW_SHORTCUT="${loc_gui_delete_shortcut}!$PW_GUI_ICON_PATH/$BUTTON_SIZE.png!${loc_delete_shortcut}:98" fi OUTPUT_START=$("${pw_yad}" --text-align=center --text "$PW_COMMENT_DB" --form \ --title "${portname}-${install_ver} (${scripts_install_ver})" \ @@ -351,12 +352,12 @@ if [[ -f "${portwine_exe}" ]] ; then --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ --field="PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=":LBL" "" \ - --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_VKBASALT_INFO}":120 \ - --button="${loc_gui_mh_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_MANGOHUD_INFO}":122 \ - --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ + --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${ENABLE_VKBASALT_INFO}":120 \ + --button="${loc_gui_mh_start}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${ENABLE_MANGOHUD_INFO}":122 \ + --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ --button="${PW_SHORTCUT}" \ - --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_debug}":102 \ - --button="${loc_gui_launch}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_launch}":106 2>/dev/null) + --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_debug}":102 \ + --button="${loc_gui_launch}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"${loc_launch}":106 2>/dev/null) export PW_YAD_SET="$?" if [[ "$PW_YAD_SET" == "1" || "$PW_YAD_SET" == "252" ]] ; then exit 0 ; fi export VULKAN_MOD=$(echo "${OUTPUT_START}" | grep \;\; | awk -F";" '{print $1}') @@ -391,35 +392,36 @@ else IFS="$orig_IFS" old_IFS=$IFS && IFS="%" - "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns=3 --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[4]} --form --columns="$MAIN_GUI_COLUMNS" \ + --align-buttons --scroll --separator=" " ${PW_GENERATE_BUTTONS} 2>/dev/null & IFS="$orig_IFS" "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[3]} --form --columns=3 --align-buttons --separator=";" \ - --field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ - --field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ - --field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ - --field=" $loc_gui_changelog"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \ - --field=" $loc_gui_change_loc"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click change_loc"' \ - --field=" $loc_gui_edit_usc"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \ - --field=" $loc_gui_scripts_fb"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \ - --field=" Xterm"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ - --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & + --field=" $loc_gui_pw_reinstall_pp"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_reinstall_pp"' \ + --field=" $loc_gui_rm_pp"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_rm_portproton"' \ + --field=" $loc_gui_upd_pp"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_pw_update"' \ + --field=" $loc_gui_changelog"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click open_changelog"' \ + --field=" $loc_gui_change_loc"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click change_loc"' \ + --field=" $loc_gui_edit_usc"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_user_conf"' \ + --field=" $loc_gui_scripts_fb"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_open_scripts_from_backup"' \ + --field=" Xterm"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_start_cont_xterm"' \ + --field=" $loc_gui_credits"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click gui_credits"' 2>/dev/null & "${pw_yad_v13_0}" --plug=${KEY} --tabnum=${PW_GUI_SORT_TABS[2]} --form --columns=3 --align-buttons --separator=";" \ --field=" 3D API : :CB" "${PW_DEFAULT_VULKAN_USE}" \ --field=" PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=" WINE : :CB" "${PW_DEFAULT_WINE_USE}" \ - --field=" $loc_gui_create_pfx_backup"!"$PW_GUI_ICON_PATH/separator.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \ - --field=" WINETRICKS"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ - --field=" $loc_gui_clear_pfx"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_clear_pfx}":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ - --field=" $loc_gui_download_other_wine"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ - --field=" $loc_gui_wine_uninstaller"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_wineuninstaller}":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ - --field=" $loc_gui_wine_cfg "!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ - --field=" $loc_gui_wine_file"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ - --field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ - --field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & + --field=" $loc_gui_create_pfx_backup"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"":"FBTN" '@bash -c "button_click pw_create_prefix_backup"' \ + --field=" WINETRICKS"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winetricks}":"FBTN" '@bash -c "button_click WINETRICKS"' \ + --field=" $loc_gui_clear_pfx"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_clear_pfx}":"FBTN" '@bash -c "button_click gui_clear_pfx"' \ + --field=" $loc_gui_download_other_wine"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_download_other_wine}":"FBTN" '@bash -c "button_click gui_proton_downloader"' \ + --field=" $loc_gui_wine_uninstaller"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_wineuninstaller}":"FBTN" '@bash -c "button_click gui_wine_uninstaller"' \ + --field=" $loc_gui_wine_cfg "!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winecfg}":"FBTN" '@bash -c "button_click WINECFG"' \ + --field=" $loc_gui_wine_file"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winefile}":"FBTN" '@bash -c "button_click WINEFILE"' \ + --field=" $loc_gui_wine_cmd"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winecmd}":"FBTN" '@bash -c "button_click WINECMD"' \ + --field=" $loc_gui_wine_reg"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE_MM.png"!"${loc_winereg}":"FBTN" '@bash -c "button_click WINEREG"' 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_yad_form_vulkan" & - "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns=3 --align-buttons --scroll \ + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[1]} --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \ --field=" Dolphin 5.0"!"$PW_GUI_ICON_PATH/dolphin.png"!"${loc_dolphin}":"FBTN" '@bash -c "button_click PW_DOLPHIN"' \ --field=" MAME"!"$PW_GUI_ICON_PATH/mame.png"!"${loc_mame}":"FBTN" '@bash -c "button_click PW_MAME"' \ --field=" RetroArch"!"$PW_GUI_ICON_PATH/retroarch.png"!"${loc_retroarch}":"FBTN" '@bash -c "button_click PW_RETROARCH"' \ @@ -435,7 +437,7 @@ else --field=" xemu"!"$PW_GUI_ICON_PATH/xemu.png"!"${loc_xemu}":"FBTN" '@bash -c "button_click PW_XEMU"' \ --field=" Demul"!"$PW_GUI_ICON_PATH/demul.png"!"${loc_demul}":"FBTN" '@bash -c "button_click PW_DEMUL"' 2>/dev/null & - "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns=3 --align-buttons --scroll \ + "${pw_yad_v13_0}" --plug=$KEY --tabnum=${PW_GUI_SORT_TABS[0]} --form --columns="$MAIN_GUI_COLUMNS" --align-buttons --scroll \ --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"' \ @@ -476,17 +478,6 @@ else # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' # --field=" ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"' - # if command -v wmctrl &>/dev/null ; then - # sleep 2 - # while [[ -n $(pgrep -a yad_v13_0 | head -n 1 | awk '{print $1}' 2>/dev/null) ]] ; do - # sleep 2 - # PW_MAIN_GUI_SIZE_TMP="$(wmctrl -lG | grep "PortProton-${install_ver}" | awk '{print $5" "$6}' 2>/dev/null)" - # if [[ ! -z "${PW_MAIN_GUI_SIZE_TMP}" ]] ; then - # echo "${PW_MAIN_GUI_SIZE_TMP}" > "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" - # fi - # done - # fi & - export START_FROM_PP_GUI=1 if [[ -z "${PW_ALL_DF}" ]] ; then @@ -495,11 +486,11 @@ else --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom \ - --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null + --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null YAD_STATUS="$?" else "${pw_yad_v13_0}" --key=$KEY --notebook --expand \ @@ -507,11 +498,11 @@ else --auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ --title "${portname}-${install_ver} (${scripts_install_ver})" \ --tab-pos=bottom \ - --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" \ - --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/separator.png"!"" 2>/dev/null + --tab="$loc_mg_installed"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_autoinstall"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_emulators"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_wine_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \ + --tab="$loc_mg_portproton_settings"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" 2>/dev/null YAD_STATUS="$?" fi diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 9571f9ca..304b58cb 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2273 +#SCRIPTS_NEXT_VERSION=2274 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine" diff --git a/data_from_portwine/themes/classic.pptheme b/data_from_portwine/themes/classic.pptheme new file mode 100755 index 00000000..ba2779be --- /dev/null +++ b/data_from_portwine/themes/classic.pptheme @@ -0,0 +1,22 @@ +export THEME_NAME="$(basename .pptheme)" +export THEME_PATH="$PW_GUI_THEMES_PATH/$THEME_NAME" +export YAD_OPTIONS="--css=$THEME_PATH/style.css \ +--borders=5 \ +--tab-borders=3 \ +--keep-icon-size \ +" + +export THEME_CHKBOX=CHK +export CHKBOX_SPACE=" " + +export BUTTON_SIZE_MM=32 +export BUTTON_SIZE=24 +export TAB_SIZE=28 + +export PW_MAIN_SIZE_W=1100 +export PW_MAIN_SIZE_H=350 + +export MAIN_GUI_COLUMNS=3 + +export PROGRESS_BAR_BORDERS_SIZE=20 +export PROGRESS_BAR_WIDTH_SIZE=500 diff --git a/data_from_portwine/themes/default.css b/data_from_portwine/themes/classic/style.css similarity index 100% rename from data_from_portwine/themes/default.css rename to data_from_portwine/themes/classic/style.css diff --git a/data_from_portwine/themes/default.pptheme b/data_from_portwine/themes/default.pptheme new file mode 100755 index 00000000..aa6b06b6 --- /dev/null +++ b/data_from_portwine/themes/default.pptheme @@ -0,0 +1,34 @@ +# определение названия и пути темы +export THEME_NAME="$(basename .pptheme)" +export THEME_PATH="$PW_GUI_THEMES_PATH/$THEME_NAME" + +# глобальные настройки YAD +export YAD_OPTIONS="--css=$THEME_PATH/style.css \ +--borders=3 \ +--tab-borders=0 \ +--keep-icon-size \ +" + +# настройка переключателей +export THEME_CHKBOX=SW # CHK - галки, SW - слайдер +export CHKBOX_SPACE=" " # растояние перед текстом + +# размер кнопок в главном меню +export BUTTON_SIZE_MM=36 # 24, 28, 32, 36, 40 + +# размер остальных кнопок +export BUTTON_SIZE=28 # 24, 28, 32, 36, 40 + +# размер вкладок +export TAB_SIZE=32 # 24, 28, 32, 36, 40 + +# размер главного меню +export PW_MAIN_SIZE_W=1100 +export PW_MAIN_SIZE_H=350 + +# количество столбцов в главном меню +export MAIN_GUI_COLUMNS=4 + +# настройки индикатора прогресса +export PROGRESS_BAR_BORDERS_SIZE=20 +export PROGRESS_BAR_WIDTH_SIZE=500 diff --git a/data_from_portwine/themes/default/style.css b/data_from_portwine/themes/default/style.css new file mode 100644 index 00000000..e69de29b