weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert upgrade to pyside6.

Browse Source 
This appears to be incompatible with pyinstaller. I get the following
when trying to run the executable generated with pyside6:

```
Traceback (most recent call last):
  File "qt_ui\main.py", line 29, in <module>
  File "PyInstaller\loader\pyimod03_importers.py", line 476, in exec_module
  File "qt_ui\windows\QLiberationWindow.py", line 28, in <module>
  File "PyInstaller\loader\pyimod03_importers.py", line 476, in exec_module
  File "qt_ui\widgets\map\QLiberationMap.py", line 11, in <module>
ImportError: could not import module 'PySide6.QtPrintSupport'
```
This commit is contained in:
Dan Albert
2021-11-21 17:34:08 -08:00
parent f3bf9c0c3c
commit 2a75d14e0e
96 changed files with 189 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
qt_ui/widgets/map/QLiberationMap.py
View File

@@ -6,10 +6,10 @@ from typing import (
Optional,
)
from PySide6.QtCore import QUrl
from PySide6.QtWebChannel import QWebChannel
from PySide6.QtWebEngineCore import QWebEnginePage
from PySide6.QtWebEngineWidgets import (
from PySide2.QtCore import QUrl
from PySide2.QtWebChannel import QWebChannel
from PySide2.QtWebEngineWidgets import (
QWebEnginePage,
QWebEngineView,
)
@@ -27,7 +27,6 @@ class LoggingWebPage(QWebEnginePage):
line_number: int,
source: str,
) -> None:
super().javaScriptConsoleMessage(level, message, line_number, source)
if level == QWebEnginePage.JavaScriptConsoleMessageLevel.ErrorMessageLevel:
logging.error(message)
elif level == QWebEnginePage.JavaScriptConsoleMessageLevel.WarningMessageLevel:
@@ -49,11 +48,11 @@ class QLiberationMap(QWebEngineView):
self.channel.registerObject("game", self.map_model)
self.page = LoggingWebPage(self)
self.setPage(self.page)
self.page.setWebChannel(self.channel)
self.page.load(
QUrl.fromLocalFile(str(Path("resources/ui/map/canvas.html").resolve()))
)
self.setPage(self.page)
def set_game(self, game: Optional[Game]) -> None:
if game is None:

4
qt_ui/widgets/map/mapmodel.py
View File

@@ -4,7 +4,7 @@ import logging
from datetime import timedelta
from typing import Iterator, List, Optional, Tuple, Union
from PySide6.QtCore import Property, QObject, Signal, Slot
from PySide2.QtCore import Property, QObject, Signal, Slot
from dcs import Point
from dcs.unit import Unit
from dcs.vehicles import vehicle_map
@@ -59,7 +59,7 @@ ENABLE_EXPENSIVE_DEBUG_TOOLS = False
#
# https://bugreports.qt.io/browse/PYSIDE-1426
#
# PySide6 5.15.2 released 6 days before the fix for this was merged, but presumably we
# PySide2 5.15.2 released 6 days before the fix for this was merged, but presumably we
# can clean up after 5.15.3 (or a future version) is released.
#
# Until then, all properties must use a notify signal. For some reason the error doesn't