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

13
qt_ui/windows/QLiberationWindow.py
View File

@@ -3,9 +3,12 @@ import traceback
import webbrowser
from typing import Optional
from PySide6.QtCore import Qt
from PySide6.QtGui import QAction, QActionGroup, QCloseEvent, QGuiApplication, QIcon
from PySide6.QtWidgets import (
from PySide2.QtCore import Qt
from PySide2.QtGui import QCloseEvent, QIcon
from PySide2.QtWidgets import (
QAction,
QActionGroup,
QDesktopWidget,
QFileDialog,
QMainWindow,
QMessageBox,
@@ -64,7 +67,7 @@ class QLiberationWindow(QMainWindow):
self.initMenuBar()
self.connectSignals()
screen = QGuiApplication.primaryScreen().availableSize()
screen = QDesktopWidget().screenGeometry()
self.setGeometry(0, 0, screen.width(), screen.height())
self.setWindowState(Qt.WindowMaximized)
@@ -97,7 +100,7 @@ class QLiberationWindow(QMainWindow):
vbox.setSizes([600, 100])
vbox = QVBoxLayout()
vbox.setContentsMargins(0, 0, 0, 0)
vbox.setMargin(0)
vbox.addWidget(QTopPanel(self.game_model, self.sim_controller))
vbox.addWidget(hbox)