Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab6629dd9a | ||
|
|
e90c365010 | ||
|
|
4e3ab5fba0 |
No files matched your search
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX CAD Учебная Версия 17"
|
||||
export PROG_ICON="tflexcad17"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX CAD 17"
|
||||
export PROG_ICON="tflexcad17"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="Приложения для T-FLEX CAD 17"
|
||||
export PROG_ICON="tflexcad17"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
check_prefix_var
|
||||
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe" ]]
|
||||
|
||||
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="Ресурсы для T-FLEX CAD 17"
|
||||
export PROG_ICON="tflexcad17"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
check_prefix_var
|
||||
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 17/Program/TFlexCad.exe" ]]
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX CAD 18"
|
||||
export PROG_ICON="tflexcad18"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex18"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="Приложения для T-FLEX CAD 18"
|
||||
export PROG_ICON="tflexcad18"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WINEPREFIX="tflex18"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
check_prefix_var
|
||||
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 18/Program/TFlexCad.exe" ]]
|
||||
|
||||
@@ -5,13 +5,12 @@ export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="Ресурсы для T-FLEX CAD 18"
|
||||
export PROG_ICON="tflexcad18"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WINEPREFIX="tflex18"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
check_prefix_var
|
||||
if [[ ! -f "$WINEPREFIX/drive_c/Program Files/T-FLEX CAD 18/Program/TFlexCad.exe" ]]
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX CAD 2D+ 17"
|
||||
export PROG_ICON="tflexcad17"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX CAD 2D+ 18"
|
||||
export PROG_ICON="tflexcad18"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex18"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX DOCs 17"
|
||||
export PROG_ICON="tflexdoc17"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=gdi"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX Viewer 17"
|
||||
export PROG_ICON="tflexcad17"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex17"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -4,14 +4,13 @@
|
||||
export PROG_URL="https://www.tflexcad.ru"
|
||||
export PROG_NAME="T-FLEX Viewer 18"
|
||||
export PROG_ICON="tflexcad18"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WINEPREFIX="tflex18"
|
||||
export WH_XDG_OPEN="log"
|
||||
export WH_USE_MESA_GL_OVERRIDE="1"
|
||||
export WINE_D3D_CONFIG="renderer=vulkan"
|
||||
|
||||
# используем общий whdb файл для подготовки префикса и сервисов
|
||||
# prepair_wine используется из файла настроек
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# info_ru: Компоненты сервисов поддержки T-FLEX 17 и 18
|
||||
########################################################################
|
||||
export WH_WINDOWS_VER="10"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
|
||||
export WH_WINE_USE="wine-10.18.1-tflex-alt3-wow64"
|
||||
export BASE_PFX="tflex_pfx_x64_v03"
|
||||
export WINEARCH="win64"
|
||||
export PROG_VERSION=""
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
a176e2ee3d60f691538b3c463047ff5eabd0ba2e37c0158783d79e9fa68caa2f wine-11.4.1-emias-alt2-wow64.tar.xz
|
||||
3c7c394658ad993968532e20ae9b591c1a0ec5b7495c8450de09bd4f8947462e wine-11.3.1-alt1-wow64.tar.xz
|
||||
349c707148a23e667970309248bbbf97b4e2a0db59c548e73d9fe9c3f585872c wine-10.18.1-alt1-wow64.tar.xz
|
||||
a862761c432f8619caf8100589678a1cbb523787259120ccd4388089d81e3b17 wine-10.18.1-tflex-alt2-wow64.tar.xz
|
||||
2f36e9d29d87d09c91176e1c89199101f638b7be050d60b2d6603572c44ebf9b wine-10.18.1-tflex-alt3-wow64.tar.xz
|
||||
e9a8b79dfe12cad1304dca573d73aefe109e3d69b6fff739c8dbb8b2d3c271c6 wine-10.12.1-alt1-wow64.tar.xz
|
||||
|
||||
##### WINE AMD64 #####
|
||||
|
||||
+1
-1
@@ -2215,7 +2215,7 @@ class WineHelperGUI(QMainWindow):
|
||||
|
||||
winetricks_path = EnvironmentConfig.WH_WINETRICKS
|
||||
wine_executable = self._get_wine_executable_for_prefix(prefix_name)
|
||||
dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable)
|
||||
dialog = WinetricksManagerDialog(prefix_path, winetricks_path, self, wine_executable=wine_executable, winehelper_path=self.winehelper_path)
|
||||
dialog.installation_complete.connect(lambda: self.update_prefix_info_display(prefix_name))
|
||||
dialog.exec_()
|
||||
|
||||
|
||||
@@ -53,11 +53,12 @@ class WinetricksManagerDialog(QDialog):
|
||||
|
||||
installation_complete = pyqtSignal()
|
||||
|
||||
def __init__(self, prefix_path, winetricks_path, parent=None, wine_executable=None):
|
||||
def __init__(self, prefix_path, winetricks_path, parent=None, wine_executable=None, winehelper_path=None):
|
||||
super().__init__(parent)
|
||||
self.prefix_path = prefix_path
|
||||
self.winetricks_path = winetricks_path
|
||||
self.wine_executable = wine_executable or 'wine'
|
||||
self.winehelper_path = winehelper_path or 'winehelper'
|
||||
self.initial_states = {}
|
||||
self.apply_process = None
|
||||
self.installation_finished = False
|
||||
@@ -229,11 +230,10 @@ class WinetricksManagerDialog(QDialog):
|
||||
|
||||
env = QProcessEnvironment.systemEnvironment()
|
||||
env.insert("WINEPREFIX", self.prefix_path)
|
||||
env.insert("WINE", self.wine_executable)
|
||||
process.setProcessEnvironment(env)
|
||||
|
||||
process.finished.connect(partial(self._on_load_finished, category))
|
||||
process.start(self.winetricks_path, [category, "list"])
|
||||
process.start(self.winehelper_path, ["winetricks", category, "list"])
|
||||
|
||||
def _parse_winetricks_log(self):
|
||||
"""Читает winetricks.log и возвращает множество установленных компонентов."""
|
||||
@@ -423,7 +423,7 @@ class WinetricksManagerDialog(QDialog):
|
||||
|
||||
# Устанавливает новые компоненты (без --force)
|
||||
if verbs_to_install:
|
||||
self._log(f"Выполнение установки: winetricks --unattended {' '.join(verbs_to_install)}")
|
||||
self._log(f"Выполнение установки: winehelper winetricks {' '.join(verbs_to_install)}")
|
||||
self._run_winetricks_process(verbs_to_install, use_force=False)
|
||||
|
||||
# Переустанавливает компоненты (с --force)
|
||||
@@ -431,7 +431,7 @@ class WinetricksManagerDialog(QDialog):
|
||||
if verbs_to_install:
|
||||
# Если уже что-то устанавливается, добавляем небольшую задержку
|
||||
self._log("\n---\n")
|
||||
self._log(f"Выполнение переустановки: winetricks --unattended --force {' '.join(verbs_to_reinstall)}")
|
||||
self._log(f"Выполнение переустановки: winehelper winetricks --force {' '.join(verbs_to_reinstall)}")
|
||||
self._run_winetricks_process(verbs_to_reinstall, use_force=True)
|
||||
|
||||
def _run_winetricks_process(self, verbs, use_force=False):
|
||||
@@ -441,7 +441,7 @@ class WinetricksManagerDialog(QDialog):
|
||||
verbs: Список компонентов для установки
|
||||
use_force: Использовать ли флаг --force
|
||||
"""
|
||||
args = ["--unattended"]
|
||||
args = []
|
||||
if use_force:
|
||||
args.append("--force")
|
||||
args.extend(verbs)
|
||||
@@ -449,9 +449,9 @@ class WinetricksManagerDialog(QDialog):
|
||||
if not self.apply_process:
|
||||
self.apply_process = QProcess(self)
|
||||
self.apply_process.setProcessChannelMode(QProcess.MergedChannels)
|
||||
|
||||
env = QProcessEnvironment.systemEnvironment()
|
||||
env.insert("WINEPREFIX", self.prefix_path)
|
||||
env.insert("WINE", self.wine_executable)
|
||||
self.apply_process.setProcessEnvironment(env)
|
||||
self.apply_process.readyReadStandardOutput.connect(
|
||||
lambda: self.log_output.append(
|
||||
@@ -460,7 +460,7 @@ class WinetricksManagerDialog(QDialog):
|
||||
)
|
||||
self.apply_process.finished.connect(self.on_apply_finished)
|
||||
|
||||
self.apply_process.start(self.winetricks_path, args)
|
||||
self.apply_process.start(self.winehelper_path, ["winetricks"] + args)
|
||||
|
||||
def on_apply_finished(self, exit_code, exit_status):
|
||||
"""Обрабатывает завершение применения изменений."""
|
||||
|
||||
Reference in new issue
Block a user