Commit ed49998f authored by Mikhail Tergoev's avatar Mikhail Tergoev

added new tray

parent 701b8093
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
* создан новый трей на основе libayatana-appindicator (спасибо Htylol)
###Scripts version 2328### / Дата: 25.07.2024 / Размер скачиваемого обновления: 4 мегабайта ###Scripts version 2328### / Дата: 25.07.2024 / Размер скачиваемого обновления: 4 мегабайта
* обновлена иконка для setup файлов (спасибо Dervart) * обновлена иконка для setup файлов (спасибо Dervart)
* исправлена центровка интерфейса для KDE * исправлена центровка интерфейса для KDE
......
...@@ -992,8 +992,8 @@ stop_portwine () { ...@@ -992,8 +992,8 @@ stop_portwine () {
kill_portwine && kill_portwine &&
try_remove_dir "${PW_WINELIB}/var" try_remove_dir "${PW_WINELIB}/var"
find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete 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 if [[ ! -z "$(pgrep -a tray_pp)" ]] ; then
kill -s SIGUSR1 $(pgrep -a pw_tray) 2>/dev/null kill -s SIGUSR1 $(pgrep -a tray_pp) 2>/dev/null
fi fi
if [[ ! -z "$(pgrep -a yad_gui_pp)" ]] ; then if [[ ! -z "$(pgrep -a yad_gui_pp)" ]] ; then
kill -s SIGUSR1 $(pgrep -a pw_yad_pp) 2>/dev/null kill -s SIGUSR1 $(pgrep -a pw_yad_pp) 2>/dev/null
...@@ -1426,6 +1426,7 @@ create_shortcut_from_link () { ...@@ -1426,6 +1426,7 @@ create_shortcut_from_link () {
fi fi
fi fi
} }
export -f create_shortcut_from_link
pw_auto_create_shortcut () { pw_auto_create_shortcut () {
[[ "${PW_CHECK_AUTOINSTALL}" == 1 ]] && return 0 [[ "${PW_CHECK_AUTOINSTALL}" == 1 ]] && return 0
...@@ -1488,6 +1489,7 @@ pw_auto_create_shortcut () { ...@@ -1488,6 +1489,7 @@ pw_auto_create_shortcut () {
fi fi
done done
} }
export -f pw_auto_create_shortcut
pw_init_db () { pw_init_db () {
if [[ -f "${portwine_exe}" ]] ; then if [[ -f "${portwine_exe}" ]] ; then
...@@ -3465,8 +3467,8 @@ open_changelog () { ...@@ -3465,8 +3467,8 @@ open_changelog () {
export -f open_changelog export -f open_changelog
pw_tray_icon () { pw_tray_icon () {
if [[ ! -z "$(pgrep -a pw_tray)" ]] ; then if [[ ! -z "$(pgrep -a tray_pp)" ]] ; then
kill -s SIGUSR1 $(pgrep -a pw_tray) 2>/dev/null kill -s SIGUSR1 $(pgrep -a tray_pp) 2>/dev/null
fi fi
pw_tray_winefile () { pw_tray_winefile () {
...@@ -3485,9 +3487,9 @@ pw_tray_icon () { ...@@ -3485,9 +3487,9 @@ pw_tray_icon () {
} }
export -f tray_icon_click_exit export -f tray_icon_click_exit
export PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray" PW_GUI_TRAY_PATH="${PW_GUI_THEMES_PATH}/tray"
cd ${PW_GUI_TRAY_PATH} cd "${PW_GUI_TRAY_PATH}"
env LD_LIBRARY_PATH="${PW_GUI_TRAY_PATH}" "${PW_GUI_TRAY_PATH}/pw_tray" & "${PW_GUI_TRAY_PATH}/tray_pp" &
cd - cd -
return 0 return 0
......
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.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 600 600"
version="1.1"
id="svg3"
sodipodi:docname="portproton_tray-blue.svg"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
inkscape:export-filename="portproton_tray3.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview3"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.85"
inkscape:cx="-121.76471"
inkscape:cy="458.82353"
inkscape:window-width="2991"
inkscape:window-height="1194"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3" />
<defs
id="defs2">
<linearGradient
id="a"
x1="300"
x2="300"
y1="44"
y2="556"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.92003363,0,0,0.92003363,43.783997,13.178384)">
<stop
offset="0"
stop-color="#46bac6"
id="stop1" />
<stop
offset="1"
stop-color="#1497a5"
id="stop2" />
</linearGradient>
</defs>
<g
id="g4"
transform="translate(-6.7840858,-19.964294)"
style="fill:#09bec8;fill-opacity:1">
<ellipse
cx="-319.7941"
cy="-289.18845"
id="circle1"
style="fill:#09bec8;stroke-width:11.4589;fill-opacity:1"
transform="scale(-1)"
rx="56.955902"
ry="57.635761" />
<g
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
id="g3"
transform="matrix(20.50461,8.6382238,-8.6348702,20.512573,27.749764,-417.23972)"
style="fill:#09bec8;fill-opacity:1">
<g
fill="#000000"
fill-rule="nonzero"
id="g2"
style="fill:#09bec8;fill-opacity:1">
<path
d="m 31.12853,12.540064 c 1.925619,1.111645 2.585165,3.573996 1.47352,5.498885 -1.111645,1.925619 -3.573509,2.585407 -5.499372,1.473762 -1.301337,-0.751473 -2.023869,-2.120661 -2.012196,-3.523654 -0.22301,-0.01824 -0.446993,-0.02845 -0.671462,-0.02845 -2.789934,0 -5.258121,1.400561 -6.740152,3.535085 -0.709887,-0.404434 -1.519727,-0.652979 -2.384529,-0.695538 1.84269,-3.124085 5.242558,-5.225047 9.124681,-5.225047 0.480554,0 0.958189,0.03283 1.43096,0.09728 1.192143,-1.658833 3.471368,-2.175623 5.27855,-1.132316 z M 11,24.161143 c 0,-2.22329 1.802319,-4.025609 4.025609,-4.025852 2.22329,0 4.026095,1.802562 4.026095,4.025852 0,1.503189 -0.824431,2.813281 -2.045514,3.504442 0.09582,0.202338 0.198933,0.401515 0.31129,0.595584 1.394724,2.416387 3.841996,3.853427 6.431538,4.069628 0.0041,0.817135 0.194556,1.642539 0.589991,2.413225 C 20.71224,34.710461 17.192234,32.816214 15.251537,29.454528 15.011504,29.038178 14.80114,28.607966 14.620203,28.166566 12.587091,27.963499 11,26.247757 11,24.161143 Z m 20.125855,11.61816 c -1.925375,1.112132 -4.387726,0.451857 -5.499857,-1.473519 -1.111402,-1.925132 -0.451857,-4.387483 1.473762,-5.499128 1.301824,-0.75123 2.848545,-0.69262 4.057711,0.01873 0.127434,-0.183612 0.248302,-0.372332 0.360415,-0.567131 1.394724,-2.4159 1.416125,-5.253744 0.308615,-7.604468 0.705509,-0.412459 1.32517,-0.989804 1.795023,-1.717444 1.784322,3.158132 1.903731,7.153341 -0.03769,10.515027 -0.240034,0.415864 -0.507306,0.813002 -0.799383,1.190684 0.840239,1.861901 0.148349,4.09419 -1.658591,5.137253 z"
id="path1"
style="fill:#09bec8;fill-opacity:1" />
</g>
</g>
</g>
</svg>
https://github.com/Castro-Fidel/tray_portproton
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment