diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 1ebc427d..32af43d0 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,8 @@ ----------------------------------------- История изменений: +* создан новый трей на основе libayatana-appindicator (спасибо Htylol) + ###Scripts version 2328### / Дата: 25.07.2024 / Размер скачиваемого обновления: 4 мегабайта * обновлена иконка для setup файлов (спасибо Dervart) * исправлена центровка интерфейса для KDE diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 20bc7d14..c9e11d9e 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -992,8 +992,8 @@ stop_portwine () { kill_portwine && try_remove_dir "${PW_WINELIB}/var" find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete - if [[ ! -z "$(pgrep -a pw_tray)" ]] ; then - kill -s SIGUSR1 $(pgrep -a pw_tray) 2>/dev/null + if [[ ! -z "$(pgrep -a tray_pp)" ]] ; then + kill -s SIGUSR1 $(pgrep -a tray_pp) 2>/dev/null fi if [[ ! -z "$(pgrep -a yad_gui_pp)" ]] ; then kill -s SIGUSR1 $(pgrep -a pw_yad_pp) 2>/dev/null @@ -1426,6 +1426,7 @@ create_shortcut_from_link () { fi fi } +export -f create_shortcut_from_link pw_auto_create_shortcut () { [[ "${PW_CHECK_AUTOINSTALL}" == 1 ]] && return 0 @@ -1488,6 +1489,7 @@ pw_auto_create_shortcut () { fi done } +export -f pw_auto_create_shortcut pw_init_db () { if [[ -f "${portwine_exe}" ]] ; then @@ -3465,8 +3467,8 @@ open_changelog () { export -f open_changelog pw_tray_icon () { - if [[ ! -z "$(pgrep -a pw_tray)" ]] ; then - kill -s SIGUSR1 $(pgrep -a pw_tray) 2>/dev/null + if [[ ! -z "$(pgrep -a tray_pp)" ]] ; then + kill -s SIGUSR1 $(pgrep -a tray_pp) 2>/dev/null fi pw_tray_winefile () { @@ -3485,9 +3487,9 @@ pw_tray_icon () { } export -f tray_icon_click_exit - export PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray" - cd ${PW_GUI_TRAY_PATH} - env LD_LIBRARY_PATH="${PW_GUI_TRAY_PATH}" "${PW_GUI_TRAY_PATH}/pw_tray" & + PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray" + cd "${PW_GUI_TRAY_PATH}" + "${PW_GUI_TRAY_PATH}/tray_pp" & cd - return 0 diff --git a/data_from_portwine/themes/tray/LICENSE.txt b/data_from_portwine/themes/tray/LICENSE.txt new file mode 100644 index 00000000..b18604bf --- /dev/null +++ b/data_from_portwine/themes/tray/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Serge Zaitsev + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/data_from_portwine/themes/tray/es/LC_MESSAGES/tray.mo b/data_from_portwine/themes/tray/es/LC_MESSAGES/tray.mo new file mode 100644 index 00000000..c9f15f16 Binary files /dev/null and b/data_from_portwine/themes/tray/es/LC_MESSAGES/tray.mo differ diff --git a/data_from_portwine/themes/tray/portproton_tray.svg b/data_from_portwine/themes/tray/portproton_tray.svg new file mode 100644 index 00000000..de3205d5 --- /dev/null +++ b/data_from_portwine/themes/tray/portproton_tray.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + diff --git a/data_from_portwine/themes/tray/ru/LC_MESSAGES/tray.mo b/data_from_portwine/themes/tray/ru/LC_MESSAGES/tray.mo new file mode 100644 index 00000000..36921d41 Binary files /dev/null and b/data_from_portwine/themes/tray/ru/LC_MESSAGES/tray.mo differ diff --git a/data_from_portwine/themes/tray/source b/data_from_portwine/themes/tray/source new file mode 100644 index 00000000..93b82943 --- /dev/null +++ b/data_from_portwine/themes/tray/source @@ -0,0 +1 @@ +https://github.com/Castro-Fidel/tray_portproton diff --git a/data_from_portwine/themes/tray/tray_pp b/data_from_portwine/themes/tray/tray_pp new file mode 100755 index 00000000..78270fb9 Binary files /dev/null and b/data_from_portwine/themes/tray/tray_pp differ