diff --git a/data_from_portwine/themes/tray/portproton_tray.svg b/data_from_portwine/img/gui/portproton_tray.svg similarity index 100% rename from data_from_portwine/themes/tray/portproton_tray.svg rename to data_from_portwine/img/gui/portproton_tray.svg diff --git a/data_from_portwine/themes/tray/es/LC_MESSAGES/tray.mo b/data_from_portwine/locales/es/LC_MESSAGES/tray.mo similarity index 91% rename from data_from_portwine/themes/tray/es/LC_MESSAGES/tray.mo rename to data_from_portwine/locales/es/LC_MESSAGES/tray.mo index c9f15f1..3305dd5 100644 Binary files a/data_from_portwine/themes/tray/es/LC_MESSAGES/tray.mo and b/data_from_portwine/locales/es/LC_MESSAGES/tray.mo differ diff --git a/data_from_portwine/locales/es/LC_MESSAGES/tray.po b/data_from_portwine/locales/es/LC_MESSAGES/tray.po new file mode 100644 index 0000000..0cf752b --- /dev/null +++ b/data_from_portwine/locales/es/LC_MESSAGES/tray.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-07-03 13:04+0500\n" +"PO-Revision-Date: 2024-07-26 23:00+0500\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.4.4\n" + +#: example/example_pp.cpp:19 +msgid "WINEFILE" +msgstr "WINEFILE" + +#: example/example_pp.cpp:21 +msgid "TASKMGR" +msgstr "GESTOR DE TAREAS" + +#: example/example_pp.cpp:23 +msgid "CHANGELOG" +msgstr "LISTA DE CAMBIOS" + +#: example/example_pp.cpp:25 +msgid "FORCE EXIT" +msgstr "SALIDA FORZADA" diff --git a/data_from_portwine/themes/tray/ru/LC_MESSAGES/tray.mo b/data_from_portwine/locales/ru/LC_MESSAGES/tray.mo similarity index 92% rename from data_from_portwine/themes/tray/ru/LC_MESSAGES/tray.mo rename to data_from_portwine/locales/ru/LC_MESSAGES/tray.mo index 36921d4..5b006a3 100644 Binary files a/data_from_portwine/themes/tray/ru/LC_MESSAGES/tray.mo and b/data_from_portwine/locales/ru/LC_MESSAGES/tray.mo differ diff --git a/data_from_portwine/locales/ru/LC_MESSAGES/tray.po b/data_from_portwine/locales/ru/LC_MESSAGES/tray.po new file mode 100644 index 0000000..35b1e56 --- /dev/null +++ b/data_from_portwine/locales/ru/LC_MESSAGES/tray.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-07-03 13:04+0500\n" +"PO-Revision-Date: 2024-07-26 23:02+0500\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.4.4\n" + +#: example/example_pp.cpp:19 +msgid "WINEFILE" +msgstr "ФАЙЛОВЫЙ МЕНЕДЖЕР" + +#: example/example_pp.cpp:21 +msgid "TASKMGR" +msgstr "ДИСПЕТЧЕР ЗАДАЧ" + +#: example/example_pp.cpp:23 +msgid "CHANGELOG" +msgstr "ИЗМЕНЕНИЯ" + +#: example/example_pp.cpp:25 +msgid "FORCE EXIT" +msgstr "ПРИНУДИТЕЛЬНЫЙ ВЫХОД" diff --git a/data_from_portwine/locales/tray.pot b/data_from_portwine/locales/tray.pot new file mode 100644 index 0000000..1d1101a --- /dev/null +++ b/data_from_portwine/locales/tray.pot @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-07-26 23:04+0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: example/example_pp.cpp:19 +msgid "WINEFILE" +msgstr "" + +#: example/example_pp.cpp:21 +msgid "TASKMGR" +msgstr "" + +#: example/example_pp.cpp:23 +msgid "CHANGELOG" +msgstr "" + +#: example/example_pp.cpp:25 +msgid "FORCE EXIT" +msgstr "" diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 409d15c..43b8f88 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -992,11 +992,11 @@ 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 tray_pp)" ]] ; then - kill -s SIGUSR1 $(pgrep -a tray_pp) 2>/dev/null + if [[ ! -z "$(pgrep -a tray_gui_pp)" ]] ; then + kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null fi if [[ ! -z "$(pgrep -a yad_gui_pp)" ]] ; then - kill -s SIGUSR1 $(pgrep -a pw_yad_pp) 2>/dev/null + kill -s SIGUSR1 $(pgrep -a yad_gui_pp) 2>/dev/null fi pw_auto_create_shortcut add_in_stop_portwine @@ -3257,8 +3257,8 @@ open_changelog () { export -f open_changelog pw_tray_icon () { - if [[ ! -z "$(pgrep -a tray_pp)" ]] ; then - kill -s SIGUSR1 $(pgrep -a tray_pp) 2>/dev/null + if [[ ! -z "$(pgrep -a tray_gui_pp)" ]] ; then + kill -s SIGUSR1 $(pgrep -a tray_gui_pp) 2>/dev/null fi pw_tray_winefile () { @@ -3278,9 +3278,7 @@ pw_tray_icon () { export -f tray_icon_click_exit PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray" - cd "${PW_GUI_TRAY_PATH}" - env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${PW_GUI_TRAY_PATH}/tray_pp" & - cd - + env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${PW_GUI_TRAY_PATH}/tray_gui_pp" & return 0 } diff --git a/data_from_portwine/themes/tray/tray_gui_pp b/data_from_portwine/themes/tray/tray_gui_pp new file mode 100755 index 0000000..904af9d Binary files /dev/null and b/data_from_portwine/themes/tray/tray_gui_pp differ diff --git a/data_from_portwine/themes/tray/tray_pp b/data_from_portwine/themes/tray/tray_pp deleted file mode 100755 index 78270fb..0000000 Binary files a/data_from_portwine/themes/tray/tray_pp and /dev/null differ