From f26e56fda2a2191a246f64c067f7395b7de05842 Mon Sep 17 00:00:00 2001 From: VHSgunzo Date: Thu, 18 Apr 2024 19:54:20 +0300 Subject: [PATCH] v0.78.4.4 --- .github/workflows/main.yml | 12 ++--- CHANGELOG.md | 8 ++++ applications/Config.desktop | 22 ++++----- applications/{exit.desktop => Exit.desktop} | 10 ++-- applications/Explorer.desktop | 51 --------------------- applications/LuxWine.desktop | 11 +++-- applications/Openpfx.desktop | 36 +++++++-------- applications/Winemgr.desktop | 2 +- applications/Winetricks.desktop | 46 ++++++++++++++++++- applications/appcfg.desktop | 2 +- applications/backupmnt.desktop | 2 +- applications/backupunmnt.desktop | 2 +- applications/clearpfx.desktop | 2 +- applications/cmd.desktop | 2 +- applications/control.desktop | 2 +- applications/debug.desktop | 2 +- applications/explorer.desktop | 13 ++++++ applications/help.desktop | 2 +- applications/init.desktop | 2 +- applications/killexe.desktop | 2 +- applications/killshell.desktop | 2 +- applications/killtray.desktop | 2 +- applications/killwine.desktop | 2 +- applications/pfxbackup.desktop | 2 +- applications/pfxrestore.desktop | 2 +- applications/regedit.desktop | 2 +- applications/rmapp.desktop | 2 +- applications/shell.desktop | 2 +- applications/shortcut.desktop | 2 +- applications/taskmgr.desktop | 2 +- applications/tray.desktop | 4 +- applications/uninstaller.desktop | 2 +- applications/update.desktop | 2 +- applications/version.desktop | 2 +- applications/winecfg.desktop | 2 +- lux-wine | 37 +++++++++++---- lwrap/PKGBUILD | 2 +- lwrap/lwrap | 2 - 38 files changed, 171 insertions(+), 133 deletions(-) rename applications/{exit.desktop => Exit.desktop} (78%) delete mode 100755 applications/Explorer.desktop create mode 100755 applications/explorer.desktop diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 053f446..de4daef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,11 +1,11 @@ name: CI -# on: -# push: -# branches: -# - action -# tags: -# - '*' +on: + push: + branches: + - action + tags: + - 'stub' # '*' jobs: build_and_release: diff --git a/CHANGELOG.md b/CHANGELOG.md index 33db073..cb5d33e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.78.4.4 + +* Change applications menu shortcuts +* Remove `Don't launch tray` option from `Settings` +* Add `Add tray to autostart` option to`Settings` +* Fix custom `GTK theme` for some LW windows +* Minor fixes + # v0.78.4.3 * Change applications menu shortcuts (it is divided into categories and added to the RMB) diff --git a/applications/Config.desktop b/applications/Config.desktop index 1132c42..bc69580 100755 --- a/applications/Config.desktop +++ b/applications/Config.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -config %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Settings Name[ru_RU]=Настройки @@ -16,48 +16,48 @@ Actions=appcfg;update;init;shell;shortcut;rmapp;help;version [Desktop Action update] Exec="/usr/bin/lux-wine" -update openupdtr -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Update runtime Name[ru_RU]=Обновление рантайм [Desktop Action help] Exec="/usr/bin/lux-wine" -help -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Usage info Name[ru_RU]=Использование [Desktop Action version] Exec="/usr/bin/lux-wine" -version %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Version info Name[ru_RU]=Версия [Desktop Action appcfg] Exec="/usr/bin/lux-wine" -appcfg -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Apps settings Name[ru_RU]=Настройки приложений [Desktop Action init] Exec="/usr/bin/lux-wine" -init %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Forced initialization -Name[ru_RU]=Принудительная инициализация +Icon=lw_default_icon +Name=Forced init +Name[ru_RU]=Инициализация [Desktop Action shell] Exec="/usr/bin/lux-wine" -shell %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Open SHELL Name[ru_RU]=Открыть SHELL [Desktop Action shortcut] Exec="/usr/bin/lux-wine" -shortcut %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Create shortcut Name[ru_RU]=Cоздать ярлык [Desktop Action rmapp] Exec="/usr/bin/lux-wine" -rmapp %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Remove shortcut Name[ru_RU]=Удалить ярлык diff --git a/applications/exit.desktop b/applications/Exit.desktop similarity index 78% rename from applications/exit.desktop rename to applications/Exit.desktop index e003bc9..500da90 100755 --- a/applications/exit.desktop +++ b/applications/Exit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -exit %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Force exit Name[ru_RU]=Закрыть всё @@ -16,24 +16,24 @@ Actions=killexe;killwine;killshell;killtray [Desktop Action killwine] Exec="/usr/bin/lux-wine" -killwine %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Kill Wine processes Name[ru_RU]=Убить процессы Wine [Desktop Action killtray] Exec="/usr/bin/lux-wine" -killtray -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Kill tray Name[ru_RU]=Убить трей [Desktop Action killexe] Exec="/usr/bin/lux-wine" -killexe %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Kill running EXE Name[ru_RU]=Убить запущенные EXE [Desktop Action killshell] Exec="/usr/bin/lux-wine" -killshell -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Kill SHELL Name[ru_RU]=Убить SHELL diff --git a/applications/Explorer.desktop b/applications/Explorer.desktop deleted file mode 100755 index 8dc39e3..0000000 --- a/applications/Explorer.desktop +++ /dev/null @@ -1,51 +0,0 @@ -[Desktop Entry] -Categories=Lux Wine -Exec="/usr/bin/lux-wine" -explorer %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi -Name=Wine explorer -Name[ru_RU]=Рабочий стол -NoDisplay=false -StartupNotify=true -Terminal=0 -TerminalOptions=--hold -Type=Application -X-KDE-SubstituteUID=false -Actions=taskmgr;cmd;control;winecfg;regedit;uninstaller - - -[Desktop Action cmd] -Exec="/usr/bin/lux-wine" -cmd %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=CMD -Name[ru_RU]=Командная строка - -[Desktop Action regedit] -Exec="/usr/bin/lux-wine" -regedit %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Registry editor -Name[ru_RU]=Редактор реестра - -[Desktop Action control] -Exec="/usr/bin/lux-wine" -control %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Control panel -Name[ru_RU]=Панель управления - -[Desktop Action winecfg] -Exec="/usr/bin/lux-wine" -winecfg %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Wine settings -Name[ru_RU]=Настройки Wine - -[Desktop Action taskmgr] -Exec="/usr/bin/lux-wine" -taskmgr %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Task manager -Name[ru_RU]=Диспетчер задач - -[Desktop Action uninstaller] -Exec="/usr/bin/lux-wine" -uninstaller %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Wine uninstaller -Name[ru_RU]=Устан/удал программ diff --git a/applications/LuxWine.desktop b/applications/LuxWine.desktop index 009855c..1fe2e20 100755 --- a/applications/LuxWine.desktop +++ b/applications/LuxWine.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-wine-extension-msp;application/x-msi;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit Name=Lux Wine Name[ru_RU]=Lux Wine @@ -11,12 +11,17 @@ Terminal=0 TerminalOptions=--hold Type=Application X-KDE-SubstituteUID=false -Actions=debug +Actions=debug;tray [Desktop Action debug] Exec="/usr/bin/lux-wine" -debug %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=DEBUG Name[ru_RU]=ДЕБАГ +[Desktop Action tray] +Exec="/usr/bin/lux-wine" -tray noclose +Icon=lw_default_icon +Name=Tray +Name[ru_RU]=Трей diff --git a/applications/Openpfx.desktop b/applications/Openpfx.desktop index 0bd91ba..933bbcd 100755 --- a/applications/Openpfx.desktop +++ b/applications/Openpfx.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -openpfx %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi -Name=Open drive C:\\ -Name[ru_RU]=Открыть диск C:\\ +Name=Drive С: +Name[ru_RU]=Диск С: NoDisplay=false StartupNotify=true Terminal=0 @@ -16,30 +16,30 @@ Actions=pfxbackup;pfxrestore;clearpfx;backupmnt;backupunmnt [Desktop Action clearpfx] Exec="/usr/bin/lux-wine" -clearpfx %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Clear prefix -Name[ru_RU]=Очистить префикс +Icon=lw_default_icon +Name=Clear +Name[ru_RU]=Очистить [Desktop Action pfxbackup] Exec="/usr/bin/lux-wine" -pfxbackup %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Create prefix backup -Name[ru_RU]=Создать бекап префикса +Icon=lw_default_icon +Name=Create backup +Name[ru_RU]=Создать бекап [Desktop Action pfxrestore] Exec="/usr/bin/lux-wine" -pfxrestore %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Restore prefix from backup -Name[ru_RU]=Восстановить префикс +Icon=lw_default_icon +Name=Restore from backup +Name[ru_RU]=Восстановить [Desktop Action backupmnt] Exec="/usr/bin/lux-wine" -backupmnt %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Mount prefix backup -Name[ru_RU]=Монтировать бекап префикса +Icon=lw_default_icon +Name=Mount backup +Name[ru_RU]=Монтировать бекап [Desktop Action backupunmnt] Exec="/usr/bin/lux-wine" -backupunmnt %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png -Name=Unmount prefix backup -Name[ru_RU]=Отмонтировать бекап префикса +Icon=lw_default_icon +Name=Unmount backup +Name[ru_RU]=Отмонтировать бекап diff --git a/applications/Winemgr.desktop b/applications/Winemgr.desktop index 6c4733d..29659e7 100755 --- a/applications/Winemgr.desktop +++ b/applications/Winemgr.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -winemgr -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Wine manager Name[ru_RU]=Wine менеджер NoDisplay=false diff --git a/applications/Winetricks.desktop b/applications/Winetricks.desktop index 7d63d6f..d912423 100755 --- a/applications/Winetricks.desktop +++ b/applications/Winetricks.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -winetricks %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Winetricks NoDisplay=false @@ -10,3 +10,47 @@ Terminal=0 TerminalOptions=--hold Type=Application X-KDE-SubstituteUID=false +Actions=explorer;taskmgr;cmd;control;winecfg;regedit;uninstaller + + +[Desktop Action explorer] +Exec="/usr/bin/lux-wine" -explorer %f +Icon=lw_default_icon +Name=Wine explorer +Name[ru_RU]=Рабочий стол + +[Desktop Action cmd] +Exec="/usr/bin/lux-wine" -cmd %f +Icon=lw_default_icon +Name=CMD +Name[ru_RU]=Командная строка + +[Desktop Action regedit] +Exec="/usr/bin/lux-wine" -regedit %f +Icon=lw_default_icon +Name=Registry editor +Name[ru_RU]=Редактор реестра + +[Desktop Action control] +Exec="/usr/bin/lux-wine" -control %f +Icon=lw_default_icon +Name=Control panel +Name[ru_RU]=Панель управления + +[Desktop Action winecfg] +Exec="/usr/bin/lux-wine" -winecfg %f +Icon=lw_default_icon +Name=Wine settings +Name[ru_RU]=Настройки Wine + +[Desktop Action taskmgr] +Exec="/usr/bin/lux-wine" -taskmgr %f +Icon=lw_default_icon +Name=Task manager +Name[ru_RU]=Диспетчер задач + +[Desktop Action uninstaller] +Exec="/usr/bin/lux-wine" -uninstaller %f +Icon=lw_default_icon +Name=Wine uninstaller +Name[ru_RU]=Устан/удал программ diff --git a/applications/appcfg.desktop b/applications/appcfg.desktop index bf895d3..81ef165 100755 --- a/applications/appcfg.desktop +++ b/applications/appcfg.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -appcfg -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Apps settings Name[ru_RU]=Настройки приложений NoDisplay=true diff --git a/applications/backupmnt.desktop b/applications/backupmnt.desktop index c889398..7bbf18a 100755 --- a/applications/backupmnt.desktop +++ b/applications/backupmnt.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -backupmnt %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/vnd.squashfs Name=Mount prefix backup Name[ru_RU]=Монтировать бекап префикса diff --git a/applications/backupunmnt.desktop b/applications/backupunmnt.desktop index ef46107..398b409 100755 --- a/applications/backupunmnt.desktop +++ b/applications/backupunmnt.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -backupunmnt %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/vnd.squashfs Name=Unmount prefix backup Name[ru_RU]=Отмонтировать бекап префикса diff --git a/applications/clearpfx.desktop b/applications/clearpfx.desktop index 82d12a5..940bded 100755 --- a/applications/clearpfx.desktop +++ b/applications/clearpfx.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -clearpfx %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Clear prefix Name[ru_RU]=Очистить префикс diff --git a/applications/cmd.desktop b/applications/cmd.desktop index 679784c..566fb2f 100755 --- a/applications/cmd.desktop +++ b/applications/cmd.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -cmd %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=CMD Name[ru_RU]=CMD diff --git a/applications/control.desktop b/applications/control.desktop index 40b905a..d968495 100755 --- a/applications/control.desktop +++ b/applications/control.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -control %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Control panel Name[ru_RU]=Панель управления diff --git a/applications/debug.desktop b/applications/debug.desktop index 28fda02..8493933 100755 --- a/applications/debug.desktop +++ b/applications/debug.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -debug %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=DEBUG Name[ru_RU]=ДЕБАГ diff --git a/applications/explorer.desktop b/applications/explorer.desktop new file mode 100755 index 0000000..4af861c --- /dev/null +++ b/applications/explorer.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Categories=Lux Wine +Exec="/usr/bin/lux-wine" -explorer %f +Icon=lw_default_icon +MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi +Name=Wine explorer +Name[ru_RU]=Рабочий стол +NoDisplay=true +StartupNotify=true +Terminal=0 +TerminalOptions=--hold +Type=Application +X-KDE-SubstituteUID=false diff --git a/applications/help.desktop b/applications/help.desktop index 1263579..9aacdd7 100755 --- a/applications/help.desktop +++ b/applications/help.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -help -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Usage info Name[ru_RU]=Использование NoDisplay=true diff --git a/applications/init.desktop b/applications/init.desktop index c09e9e6..ff6810b 100755 --- a/applications/init.desktop +++ b/applications/init.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -init %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Forced initialization Name[ru_RU]=Принудительная инициализация diff --git a/applications/killexe.desktop b/applications/killexe.desktop index 3cdccd7..1c3fe36 100755 --- a/applications/killexe.desktop +++ b/applications/killexe.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -killexe %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Kill running EXE Name[ru_RU]=Убить запущенные EXE diff --git a/applications/killshell.desktop b/applications/killshell.desktop index 0e199a6..f4734f5 100755 --- a/applications/killshell.desktop +++ b/applications/killshell.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -killshell -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Kill SHELL Name[ru_RU]=Убить SHELL NoDisplay=true diff --git a/applications/killtray.desktop b/applications/killtray.desktop index d0f730c..9de8a58 100755 --- a/applications/killtray.desktop +++ b/applications/killtray.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -killtray -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Kill tray Name[ru_RU]=Убить трей NoDisplay=true diff --git a/applications/killwine.desktop b/applications/killwine.desktop index 9ae58e6..fdb13c4 100755 --- a/applications/killwine.desktop +++ b/applications/killwine.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -killwine %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Kill all Wine processes Name[ru_RU]=Убить все процессы Wine diff --git a/applications/pfxbackup.desktop b/applications/pfxbackup.desktop index 5f23fcd..86d9e5c 100755 --- a/applications/pfxbackup.desktop +++ b/applications/pfxbackup.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -pfxbackup %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Create prefix backup Name[ru_RU]=Создать бекап префикса diff --git a/applications/pfxrestore.desktop b/applications/pfxrestore.desktop index 02e214c..a0c231e 100755 --- a/applications/pfxrestore.desktop +++ b/applications/pfxrestore.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -pfxrestore %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/vnd.squashfs;application/x-ms-dos-executable;application/x-msdos-program Name=Restore prefix from backup Name[ru_RU]=Восстановить префикс diff --git a/applications/regedit.desktop b/applications/regedit.desktop index ede5b19..10feeaf 100755 --- a/applications/regedit.desktop +++ b/applications/regedit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -regedit %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Registry editor Name[ru_RU]=Редактор реестра diff --git a/applications/rmapp.desktop b/applications/rmapp.desktop index f9056fd..9ce5ce9 100755 --- a/applications/rmapp.desktop +++ b/applications/rmapp.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -rmapp %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi;application/x-ms-shortcut Name=Remove shortcut Name[ru_RU]=Удалить ярлык diff --git a/applications/shell.desktop b/applications/shell.desktop index e1ed43b..c3196e6 100755 --- a/applications/shell.desktop +++ b/applications/shell.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -shell %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=SHELL Name[ru_RU]=SHELL NoDisplay=true diff --git a/applications/shortcut.desktop b/applications/shortcut.desktop index fb50596..39427e1 100755 --- a/applications/shortcut.desktop +++ b/applications/shortcut.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -shortcut %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-ms-shortcut;application/x-mswinurl Name=Create shortcut Name[ru_RU]=Cоздать ярлык diff --git a/applications/taskmgr.desktop b/applications/taskmgr.desktop index 19aa326..3a4884b 100755 --- a/applications/taskmgr.desktop +++ b/applications/taskmgr.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -taskmgr %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Task manager Name[ru_RU]=Диспетчер задач diff --git a/applications/tray.desktop b/applications/tray.desktop index 66643b2..3a9afc1 100755 --- a/applications/tray.desktop +++ b/applications/tray.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -tray noclose -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Tray Name[ru_RU]=Трей -NoDisplay=false +NoDisplay=true StartupNotify=true Terminal=0 TerminalOptions=--hold diff --git a/applications/uninstaller.desktop b/applications/uninstaller.desktop index 7a488f6..aaf145f 100755 --- a/applications/uninstaller.desktop +++ b/applications/uninstaller.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -uninstaller %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Wine uninstaller Name[ru_RU]=Устан/удал программ diff --git a/applications/update.desktop b/applications/update.desktop index 22ce4a4..b5e3425 100755 --- a/applications/update.desktop +++ b/applications/update.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -update -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Update runtime Name[ru_RU]=Обновление рантайм NoDisplay=true diff --git a/applications/version.desktop b/applications/version.desktop index 7c83806..51e9fe9 100755 --- a/applications/version.desktop +++ b/applications/version.desktop @@ -2,7 +2,7 @@ Categories=Lux Wine Exec="/usr/bin/lux-wine" -version %f MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon Name=Version info Name[ru_RU]=Версия NoDisplay=true diff --git a/applications/winecfg.desktop b/applications/winecfg.desktop index 414f554..c4a8750 100755 --- a/applications/winecfg.desktop +++ b/applications/winecfg.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Lux Wine Exec="/usr/bin/lux-wine" -winecfg %f -Icon=/usr/share/lux-wine/icons/lw_default_icon.png +Icon=lw_default_icon MimeType=application/x-ms-dos-executable;application/x-msdos-program;text/win-bat;application/x-ms-shortcut;text/x-ms-regedit;application/x-msi Name=Wine settings Name[ru_RU]=Настройки Wine diff --git a/lux-wine b/lux-wine index d2aa55a..ce85712 100755 --- a/lux-wine +++ b/lux-wine @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export LW_VERSION="0.78.4.3" +export LW_VERSION="0.78.4.4" export LW_DEVELOPERS="VHSgunzo" export RED='\033[1;91m' @@ -138,6 +138,7 @@ done [ ! -n "$LW_CENV" ] && export LW_CENV="$LW_DEF_CENV" [ ! -n "$LW_APPCFG_DIR" ] && export LW_APPCFG_DIR="$LW_DIR/appcfg" [ ! -n "$VLK_ICD_DIR" ] && export VLK_ICD_DIR="/usr/share/vulkan/icd.d" +[ ! -n "$AUTOSTART_DIR" ] && export AUTOSTART_DIR="$HOME/.config/autostart" [ ! -n "$SYS_WINE" ] && export SYS_WINE="$(which -a wine 2>/dev/null|grep -v "$(basename "$LW_DIR")"|head -1)" [ ! -n "$CMPRSS_METHOD" ] && export CMPRSS_METHOD='zstd' [ ! -n "$ZSTD_CMPRSS_LVL" ] && export ZSTD_CMPRSS_LVL="1" @@ -2780,6 +2781,7 @@ full_init() { check_restore_resol check_virt_desktop check_latencyflex + check_autostart_tray try_rm "$INIPRGRS" &>/dev/null [[ "$1" == "-init" || "$FIRST_RUN" == 1 ]] && \ print_info notify "Lux Wine full initialization completed!" @@ -2788,6 +2790,17 @@ full_init() { fi } +check_autostart_tray() { + AUTOSTART_TRAY_FL="$AUTOSTART_DIR/LuxWine-tray.desktop" + if [[ "$AUTOSTART_TRAY" == 1 && ! -e "$AUTOSTART_TRAY_FL" ]] + then + try_mkdir "$AUTOSTART_DIR" + ln -sfr "$MENU_APPS_DIR/LuxWine/tray.desktop" "$AUTOSTART_TRAY_FL" + elif [[ "$AUTOSTART_TRAY" != 1 && -e "$AUTOSTART_TRAY_FL" ]] + then rm -f "$AUTOSTART_TRAY_FL" + fi +} + lu_start() { check_startfile "$@" if [ -n "$LU_START" ] @@ -2873,7 +2886,7 @@ lu_config() { VIRTUAL_DESKTOP BATTLEYE EAC DXVKASYNC RESIZABLE_BAR LATENCYFLEX DXR EXEARGS CHK_UPDATE EXE_LWDB EXE_LWDBFL \ LOADBAR LOADBARGIF CHKSTEAMAPPS LW_STEAMAPPS_DIR CHECK_LW_APPS GTK_THEME LOG DEBUG SYS_WINETRICKS CPU_LIMIT CMPRSS_METHOD ZSTD_CMPRSS_LVL \ DIS_OTH_DISPL RESTORE_RESOL RESTORE_GAMMA DIS_COPMOSITOR RESET_PULSE PULSE_LTCY TERMINAL HOLD_TERMINAL LW_TERM_APP \ - LW_DOWNLOADER NO_TRAY US_LAYOUT VKBASALT VKBASALT_FFX_CAS VKICDFILES GAMEMODE LWMANGOHUD MANGOHUD_USER_CONF FPS_LIMIT \ + LW_DOWNLOADER AUTOSTART_TRAY US_LAYOUT VKBASALT VKBASALT_FFX_CAS VKICDFILES GAMEMODE LWMANGOHUD MANGOHUD_USER_CONF FPS_LIMIT \ VSYNC LWVKCAPTURE NVPRIME DRIPRIME" WCFGOUT="$(while read CFGVAR <&3 && read CFGPARAM <&4 do @@ -3035,7 +3048,7 @@ lu_config() { --field="Hold terminal:CHK" "$HOLD_TERMINAL" \ --field="Terminal app::CB" "$(cfg_items "$LW_TERM_APP" "$TERMAPPLST")" \ --field="Downloader::CB" "$(cfg_items "$LW_DOWNLOADER" "$DOWNLOADERLST")" \ - --field="Don't launch tray:CHK" "$NO_TRAY" \ + --field="Add tray to autostart:CHK" "$AUTOSTART_TRAY" \ --field="Switch to US keyboard layout:CHK" "$US_LAYOUT" \ --field="VkBasalt:CHK" "$VKBASALT" \ --field="AMD FidelityFX Contrast Adaptive Sharpening::CB" "$(cfg_items "$VKBASALT_FFX_CAS" "$(seq 0.1 0.1 1|tr ',' '.')\n Disabled")" \ @@ -3492,6 +3505,7 @@ winetricks() { lu_openpfx() { $LW_FLMGR "$WINEPREFIX/drive_c/" 2>/dev/null ; } lu_exit() { + check_config_only "$@" check_tray; check_wine_pids; check_exes; check_luwine_sh_pid if [[ -n "$WINE_PIDS" || -n "$EXE_PIDS" || -n "$TRAY_PID" || -n "$LW_SH_PID" \ || -n "$(pgrep -fa 'yad'|grep 'Lux Wine'|awk '{print$1}')" ]] @@ -3516,10 +3530,14 @@ lu_exit() { fi } -lu_killshell() { +check_config_only() { check_exe_wcfg_cenv "$@" check_luwine_wcfg_cenv check_def_config +} + +lu_killshell() { + check_config_only "$@" check_terminal check_luwine_sh_pid if [ -f "/tmp/FORCE_EXIT" ] @@ -3553,6 +3571,7 @@ lu_killshell() { } lu_killtray() { + check_config_only "$@" check_tray if [[ -f "/tmp/FORCE_EXIT" || "$FORCE_EXIT" == 1 ]] then @@ -3568,9 +3587,7 @@ lu_killtray() { } lu_killwine() { - check_exe_wcfg_cenv "$@" - check_luwine_wcfg_cenv - check_def_config + check_config_only "$@" check_wine_pids if [ -f "/tmp/FORCE_EXIT" ] then @@ -3587,6 +3604,7 @@ lu_killwine() { } lu_killexe() { + check_config_only "$@" check_exes if [ -f "/tmp/FORCE_EXIT" ] then @@ -3699,6 +3717,7 @@ is_app_exist() { } lu_rmapp() { + check_config_only "$@" if [ ! -n "$(pgrep -fa yad|grep "Shortcuts Remover"|awk '{print$1}')" ]; then : else print_error yad "Shortcuts Remover" "Lux Wine Shortcuts Remover already runing!" @@ -4058,6 +4077,7 @@ lu_shortcut() { } lu_help() { + check_config_only "$@" if [ ! -n "$(pgrep -fa xterm|grep "Lux Wine usage info"|awk '{print$1}')" ]; then : else print_error yad "Lux Wine usage info" "Lux Wine usage info already runing!" @@ -6184,7 +6204,7 @@ export_all_functions() { check_display check_restore_resol resol_sw check_restore_gamma dis_displ_sw restore_resol check_virt_desktop check_vkbasalt_cfg check_exe_args \ check_wine_nvml check_resizable_bar check_latencyflex get_proton_d3dlib makesquash_zstd makesquash_xz lu_pfxbackup lu_pfxrestore lu_backupmnt lu_backupunmnt \ check_dxvk_async check_vsync get_wine_git_lst try_dl_install_wine exeargs_parse try_add_reg_cdrom shrt_loop shrt_from_url shrt_from_lnk check_shrt \ - get_shrt_data + get_shrt_data check_autostart_tray check_config_only } initbar() { @@ -6680,6 +6700,7 @@ get_app_exe() { } lu_runapp() { + check_config_only "$@" unset LU_EXE EXE_ARGS shift if [ -n "$1" ] diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD index 230a6dd..52019ce 100644 --- a/lwrap/PKGBUILD +++ b/lwrap/PKGBUILD @@ -2,7 +2,7 @@ pkgname='lwrap' pkgver='0.78.4' -pkgrel='3' +pkgrel='4' pkgdesc='Lux Wine wrapper for RunImage container' arch=('x86_64') url='https://github.com/VHSgunzo/lux-wine' diff --git a/lwrap/lwrap b/lwrap/lwrap index c93880c..5daee01 100755 --- a/lwrap/lwrap +++ b/lwrap/lwrap @@ -133,8 +133,6 @@ make_install() { then grep -m1 '^Exec=".*"' -lr ./*|\ xargs -d'\n' sed -i "s|^Exec=\".*\"|Exec=\"$LWRAP\"|g" 2>/dev/null - grep -m1 'Icon=/.*/lux-wine/icons/.*.png$' -lr ./*|\ - xargs -d'\n' sed -i "s|Icon=/.*/lux-wine/icons/|Icon=$LW_DIR/icons/|g" 2>/dev/null if [ -f 'lwrap' ] then local lwrapf='lwrap' elif [ -f 'bin/lwrap' ]