diff --git a/.github/actions/setup-liberation-python/action.yaml b/.github/actions/setup-liberation-python/action.yaml index 6bfbee0e..a2992461 100644 --- a/.github/actions/setup-liberation-python/action.yaml +++ b/.github/actions/setup-liberation-python/action.yaml @@ -19,5 +19,3 @@ runs: run: | ./venv/scripts/activate python -m pip install -r requirements.txt - # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead - Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force diff --git a/game/server/app.py b/game/server/app.py index 4aaa63c3..bb582239 100644 --- a/game/server/app.py +++ b/game/server/app.py @@ -8,13 +8,13 @@ from . import ( flights, frontlines, game, + iadsnetwork, mapzones, navmesh, qt, supplyroutes, tgos, waypoints, - iadsnetwork, ) from .settings import ServerSettings @@ -34,7 +34,7 @@ app.include_router(waypoints.router) app.include_router(iadsnetwork.router) -origins = [] +origins = ["file://"] if ServerSettings.get().cors_allow_debug_server: origins.append("http://localhost:3000") diff --git a/qt_ui/delegates.py b/qt_ui/delegates.py index 050983f9..dbeca273 100644 --- a/qt_ui/delegates.py +++ b/qt_ui/delegates.py @@ -1,9 +1,9 @@ from contextlib import contextmanager from typing import ContextManager, Optional -from PySide2.QtCore import QModelIndex, Qt, QSize -from PySide2.QtGui import QPainter, QFont, QFontMetrics, QIcon -from PySide2.QtWidgets import QStyledItemDelegate, QStyleOptionViewItem, QStyle +from PySide6.QtCore import QModelIndex, Qt, QSize +from PySide6.QtGui import QPainter, QFont, QFontMetrics, QIcon +from PySide6.QtWidgets import QStyledItemDelegate, QStyleOptionViewItem, QStyle @contextmanager diff --git a/qt_ui/errorreporter.py b/qt_ui/errorreporter.py index 8acf8a99..f945179f 100644 --- a/qt_ui/errorreporter.py +++ b/qt_ui/errorreporter.py @@ -3,7 +3,7 @@ from collections.abc import Iterator from contextlib import contextmanager from typing import Type -from PySide2.QtWidgets import QDialog, QMessageBox +from PySide6.QtWidgets import QDialog, QMessageBox @contextmanager diff --git a/qt_ui/main.py b/qt_ui/main.py index e8702464..5b1b2b14 100644 --- a/qt_ui/main.py +++ b/qt_ui/main.py @@ -7,10 +7,10 @@ from datetime import datetime from pathlib import Path from typing import Optional -from PySide2 import QtWidgets -from PySide2.QtCore import Qt -from PySide2.QtGui import QPixmap -from PySide2.QtWidgets import QApplication, QCheckBox, QSplashScreen +from PySide6 import QtWidgets +from PySide6.QtCore import Qt +from PySide6.QtGui import QPixmap +from PySide6.QtWidgets import QApplication, QCheckBox, QSplashScreen from dcs.payloads import PayloadDirectories from game import Game, VERSION, logging_config, persistency @@ -71,10 +71,6 @@ def run_ui(game: Game | None, ui_flags: UiFlags) -> None: app = QApplication(sys.argv) - app.setAttribute(Qt.AA_DisableWindowContextHelpButton) - app.setAttribute(Qt.AA_EnableHighDpiScaling, True) # enable highdpi scaling - app.setAttribute(Qt.AA_UseHighDpiPixmaps, True) # use highdpi icons - # init the theme and load the stylesheet based on the theme index liberation_theme.init() with open( diff --git a/qt_ui/models.py b/qt_ui/models.py index 51c2c87b..b6c5fcc5 100644 --- a/qt_ui/models.py +++ b/qt_ui/models.py @@ -4,13 +4,13 @@ from __future__ import annotations import datetime from typing import Any, Callable, Iterator, Optional, TypeVar -from PySide2.QtCore import ( +from PySide6.QtCore import ( QAbstractListModel, QModelIndex, Qt, Signal, ) -from PySide2.QtGui import QIcon +from PySide6.QtGui import QIcon from game.ato.airtaaskingorder import AirTaskingOrder from game.ato.flight import Flight diff --git a/qt_ui/simcontroller.py b/qt_ui/simcontroller.py index f1cd8909..390baf21 100644 --- a/qt_ui/simcontroller.py +++ b/qt_ui/simcontroller.py @@ -5,7 +5,7 @@ from datetime import datetime, timedelta from pathlib import Path from typing import Callable, Optional, TYPE_CHECKING -from PySide2.QtCore import QObject, Signal +from PySide6.QtCore import QObject, Signal from game.polldebriefingfilethread import PollDebriefingFileThread from game.sim.gameloop import GameLoop diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index c6014f46..a0015297 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -1,7 +1,7 @@ import os from typing import Dict -from PySide2.QtGui import QPixmap +from PySide6.QtGui import QPixmap from .liberation_theme import get_theme_icons diff --git a/qt_ui/uncaughtexceptionhandler.py b/qt_ui/uncaughtexceptionhandler.py index 7895a222..3b32ab9f 100644 --- a/qt_ui/uncaughtexceptionhandler.py +++ b/qt_ui/uncaughtexceptionhandler.py @@ -3,8 +3,8 @@ import logging import sys import traceback -from PySide2.QtCore import Signal, QObject -from PySide2.QtWidgets import QMessageBox, QApplication +from PySide6.QtCore import Signal, QObject +from PySide6.QtWidgets import QMessageBox, QApplication class UncaughtExceptionHandler(QObject): diff --git a/qt_ui/widgets/QBudgetBox.py b/qt_ui/widgets/QBudgetBox.py index 30713c92..ecf75f06 100644 --- a/qt_ui/widgets/QBudgetBox.py +++ b/qt_ui/widgets/QBudgetBox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QLabel, QHBoxLayout, QGroupBox, QPushButton +from PySide6.QtWidgets import QLabel, QHBoxLayout, QGroupBox, QPushButton import qt_ui.uiconstants as CONST from game import Game diff --git a/qt_ui/widgets/QConditionsWidget.py b/qt_ui/widgets/QConditionsWidget.py index 24acd5bd..9493bc1c 100644 --- a/qt_ui/widgets/QConditionsWidget.py +++ b/qt_ui/widgets/QConditionsWidget.py @@ -1,7 +1,7 @@ from datetime import datetime -from PySide2.QtGui import QPixmap -from PySide2.QtWidgets import ( +from PySide6.QtGui import QPixmap +from PySide6.QtWidgets import ( QFrame, QGridLayout, QGroupBox, diff --git a/qt_ui/widgets/QDebriefingInformation.py b/qt_ui/widgets/QDebriefingInformation.py index 9c7ddcef..c397ac66 100644 --- a/qt_ui/widgets/QDebriefingInformation.py +++ b/qt_ui/widgets/QDebriefingInformation.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame +from PySide6.QtWidgets import QFrame class QDebriefingInformation(QFrame): diff --git a/qt_ui/widgets/QFactionsInfos.py b/qt_ui/widgets/QFactionsInfos.py index c0ca25cd..aabc6fc2 100644 --- a/qt_ui/widgets/QFactionsInfos.py +++ b/qt_ui/widgets/QFactionsInfos.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QLabel, QGroupBox, QGridLayout +from PySide6.QtWidgets import QLabel, QGroupBox, QGridLayout from game import Game diff --git a/qt_ui/widgets/QFlightSizeSpinner.py b/qt_ui/widgets/QFlightSizeSpinner.py index 30cb8002..0ec0bd63 100644 --- a/qt_ui/widgets/QFlightSizeSpinner.py +++ b/qt_ui/widgets/QFlightSizeSpinner.py @@ -1,5 +1,5 @@ """Spin box for selecting the number of aircraft in a flight.""" -from PySide2.QtWidgets import QSpinBox +from PySide6.QtWidgets import QSpinBox class QFlightSizeSpinner(QSpinBox): diff --git a/qt_ui/widgets/QIntelBox.py b/qt_ui/widgets/QIntelBox.py index eb50d1a0..5e3deaf5 100644 --- a/qt_ui/widgets/QIntelBox.py +++ b/qt_ui/widgets/QIntelBox.py @@ -1,6 +1,6 @@ from typing import Optional -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QGridLayout, QGroupBox, QHBoxLayout, diff --git a/qt_ui/widgets/QLabeledWidget.py b/qt_ui/widgets/QLabeledWidget.py index 547f8b7b..aa357c0b 100644 --- a/qt_ui/widgets/QLabeledWidget.py +++ b/qt_ui/widgets/QLabeledWidget.py @@ -1,8 +1,8 @@ """A layout containing a widget with an associated label.""" from typing import Optional -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QHBoxLayout, QLabel, QWidget +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QHBoxLayout, QLabel, QWidget class QLabeledWidget(QHBoxLayout): diff --git a/qt_ui/widgets/QLiberationCalendar.py b/qt_ui/widgets/QLiberationCalendar.py index c33d8810..a839a430 100644 --- a/qt_ui/widgets/QLiberationCalendar.py +++ b/qt_ui/widgets/QLiberationCalendar.py @@ -1,5 +1,5 @@ -from PySide2 import QtCore, QtGui -from PySide2.QtWidgets import QCalendarWidget +from PySide6 import QtCore, QtGui +from PySide6.QtWidgets import QCalendarWidget class QLiberationCalendar(QCalendarWidget): diff --git a/qt_ui/widgets/QTopPanel.py b/qt_ui/widgets/QTopPanel.py index 916530b1..c0bd68b8 100644 --- a/qt_ui/widgets/QTopPanel.py +++ b/qt_ui/widgets/QTopPanel.py @@ -1,6 +1,6 @@ from typing import List, Optional -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QDialog, QFrame, QGroupBox, diff --git a/qt_ui/widgets/ato.py b/qt_ui/widgets/ato.py index 638cf758..780659f5 100644 --- a/qt_ui/widgets/ato.py +++ b/qt_ui/widgets/ato.py @@ -3,18 +3,15 @@ import logging from datetime import timedelta from typing import Optional -from PySide2.QtCore import ( +from PySide6.QtCore import ( QItemSelectionModel, QModelIndex, QSize, Qt, ) -from PySide2.QtGui import ( - QContextMenuEvent, -) -from PySide2.QtWidgets import ( +from PySide6.QtGui import QAction, QContextMenuEvent +from PySide6.QtWidgets import ( QAbstractItemView, - QAction, QGroupBox, QHBoxLayout, QLabel, diff --git a/qt_ui/widgets/clientslots.py b/qt_ui/widgets/clientslots.py index 231ed61a..5af9fd10 100644 --- a/qt_ui/widgets/clientslots.py +++ b/qt_ui/widgets/clientslots.py @@ -1,5 +1,5 @@ """Widgets for displaying client slots.""" -from PySide2.QtWidgets import QLabel +from PySide6.QtWidgets import QLabel from qt_ui.models import AtoModel from qt_ui.widgets.QLabeledWidget import QLabeledWidget diff --git a/qt_ui/widgets/combos/QAircraftTypeSelector.py b/qt_ui/widgets/combos/QAircraftTypeSelector.py index f64a55b0..e34b5c2f 100644 --- a/qt_ui/widgets/combos/QAircraftTypeSelector.py +++ b/qt_ui/widgets/combos/QAircraftTypeSelector.py @@ -1,5 +1,5 @@ """Combo box for selecting aircraft types.""" -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.dcs.aircrafttype import AircraftType diff --git a/qt_ui/widgets/combos/QArrivalAirfieldSelector.py b/qt_ui/widgets/combos/QArrivalAirfieldSelector.py index 79a3aa9b..02215603 100644 --- a/qt_ui/widgets/combos/QArrivalAirfieldSelector.py +++ b/qt_ui/widgets/combos/QArrivalAirfieldSelector.py @@ -1,7 +1,7 @@ """Combo box for selecting a departure airfield.""" from typing import Iterable, Optional -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from dcs.unittype import FlyingType from game.dcs.aircrafttype import AircraftType diff --git a/qt_ui/widgets/combos/QFilteredComboBox.py b/qt_ui/widgets/combos/QFilteredComboBox.py index 1fae0cf8..65d7a940 100644 --- a/qt_ui/widgets/combos/QFilteredComboBox.py +++ b/qt_ui/widgets/combos/QFilteredComboBox.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import QSortFilterProxyModel, Qt -from PySide2.QtWidgets import QComboBox, QCompleter +from PySide6.QtCore import QSortFilterProxyModel, Qt +from PySide6.QtWidgets import QComboBox, QCompleter class QFilteredComboBox(QComboBox): diff --git a/qt_ui/widgets/combos/QFlightTypeComboBox.py b/qt_ui/widgets/combos/QFlightTypeComboBox.py index bb214ad3..c8ec3b90 100644 --- a/qt_ui/widgets/combos/QFlightTypeComboBox.py +++ b/qt_ui/widgets/combos/QFlightTypeComboBox.py @@ -1,6 +1,6 @@ """Combo box for selecting a flight's task type.""" -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.ato.flighttype import FlightType from game.settings.settings import Settings diff --git a/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py b/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py index 8b3a2b65..bf7ab100 100644 --- a/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py +++ b/qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py @@ -1,4 +1,4 @@ -from PySide2.QtGui import QStandardItem, QStandardItemModel +from PySide6.QtGui import QStandardItem, QStandardItemModel from game import Game from game.ato.flightwaypoint import FlightWaypoint diff --git a/qt_ui/widgets/floatspinners.py b/qt_ui/widgets/floatspinners.py index a6f13906..95cf468a 100644 --- a/qt_ui/widgets/floatspinners.py +++ b/qt_ui/widgets/floatspinners.py @@ -1,6 +1,6 @@ from typing import Optional -from PySide2.QtWidgets import QSpinBox +from PySide6.QtWidgets import QSpinBox class FloatSpinner(QSpinBox): diff --git a/qt_ui/widgets/map/QLiberationMap.py b/qt_ui/widgets/map/QLiberationMap.py index dcbc1afd..c1e9e616 100644 --- a/qt_ui/widgets/map/QLiberationMap.py +++ b/qt_ui/widgets/map/QLiberationMap.py @@ -3,12 +3,9 @@ from __future__ import annotations import logging from pathlib import Path -from PySide2.QtCore import QUrl -from PySide2.QtWebEngineWidgets import ( - QWebEnginePage, - QWebEngineSettings, - QWebEngineView, -) +from PySide6.QtCore import QUrl +from PySide6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings +from PySide6.QtWebEngineWidgets import QWebEngineView from game.server.settings import ServerSettings from qt_ui.models import GameModel @@ -40,7 +37,7 @@ class QLiberationMap(QWebEngineView): # Required to allow "cross-origin" access from file:// scoped canvas.html to the # localhost HTTP backend. self.page.settings().setAttribute( - QWebEngineSettings.LocalContentCanAccessRemoteUrls, True + QWebEngineSettings.WebAttribute.LocalContentCanAccessRemoteUrls, True ) if dev: diff --git a/qt_ui/widgets/simspeedcontrols.py b/qt_ui/widgets/simspeedcontrols.py index 39cdb937..daa3eea0 100644 --- a/qt_ui/widgets/simspeedcontrols.py +++ b/qt_ui/widgets/simspeedcontrols.py @@ -2,7 +2,7 @@ from __future__ import annotations from typing import Optional -from PySide2.QtWidgets import QButtonGroup, QHBoxLayout, QPushButton, QWidget +from PySide6.QtWidgets import QButtonGroup, QHBoxLayout, QPushButton, QWidget from game.sim.simspeedsetting import SimSpeedSetting from qt_ui.simcontroller import SimController diff --git a/qt_ui/widgets/spinsliders.py b/qt_ui/widgets/spinsliders.py index ebec9dc6..5ca2a9ab 100644 --- a/qt_ui/widgets/spinsliders.py +++ b/qt_ui/widgets/spinsliders.py @@ -1,9 +1,9 @@ from datetime import timedelta from typing import Optional -from PySide2 import QtWidgets -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QSlider, QHBoxLayout +from PySide6 import QtWidgets +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QSlider, QHBoxLayout from qt_ui.widgets.floatspinners import FloatSpinner diff --git a/qt_ui/windows/AirWingConfigurationDialog.py b/qt_ui/windows/AirWingConfigurationDialog.py index f0effcf2..557fe52e 100644 --- a/qt_ui/windows/AirWingConfigurationDialog.py +++ b/qt_ui/windows/AirWingConfigurationDialog.py @@ -1,14 +1,14 @@ from typing import Iterable, Iterator, Optional -from PySide2.QtCore import ( +from PySide6.QtCore import ( QItemSelection, QItemSelectionModel, QSize, Qt, Signal, ) -from PySide2.QtGui import QIcon, QStandardItem, QStandardItemModel -from PySide2.QtWidgets import ( +from PySide6.QtGui import QIcon, QStandardItem, QStandardItemModel +from PySide6.QtWidgets import ( QCheckBox, QComboBox, QDialog, diff --git a/qt_ui/windows/AirWingDialog.py b/qt_ui/windows/AirWingDialog.py index d6a4b930..058ffd9a 100644 --- a/qt_ui/windows/AirWingDialog.py +++ b/qt_ui/windows/AirWingDialog.py @@ -3,8 +3,8 @@ from __future__ import annotations from dataclasses import dataclass from typing import Optional, Iterator -from PySide2.QtCore import QItemSelectionModel, QModelIndex, QSize -from PySide2.QtWidgets import ( +from PySide6.QtCore import QItemSelectionModel, QModelIndex, QSize +from PySide6.QtWidgets import ( QAbstractItemView, QCheckBox, QDialog, diff --git a/qt_ui/windows/BugReportDialog.py b/qt_ui/windows/BugReportDialog.py index 7255dabe..6fa5af54 100644 --- a/qt_ui/windows/BugReportDialog.py +++ b/qt_ui/windows/BugReportDialog.py @@ -1,8 +1,8 @@ import webbrowser -from PySide2.QtCore import Qt -from PySide2.QtGui import QGuiApplication -from PySide2.QtWidgets import QDialog, QLabel, QPushButton, QVBoxLayout, QWidget +from PySide6.QtCore import Qt +from PySide6.QtGui import QGuiApplication +from PySide6.QtWidgets import QDialog, QLabel, QPushButton, QVBoxLayout, QWidget from game.version import BUILD_NUMBER, GIT_SHA, VERSION_NUMBER diff --git a/qt_ui/windows/GameUpdateSignal.py b/qt_ui/windows/GameUpdateSignal.py index bb3c8a71..fdfa2b24 100644 --- a/qt_ui/windows/GameUpdateSignal.py +++ b/qt_ui/windows/GameUpdateSignal.py @@ -2,7 +2,7 @@ from __future__ import annotations from typing import Optional -from PySide2.QtCore import QObject, Signal +from PySide6.QtCore import QObject, Signal from game import Game from game.debriefing import Debriefing diff --git a/qt_ui/windows/PendingTransfersDialog.py b/qt_ui/windows/PendingTransfersDialog.py index 982ae9f8..876d026a 100644 --- a/qt_ui/windows/PendingTransfersDialog.py +++ b/qt_ui/windows/PendingTransfersDialog.py @@ -1,13 +1,12 @@ -from PySide2.QtCore import ( +from PySide6.QtCore import ( QItemSelection, QItemSelectionModel, QModelIndex, Qt, ) -from PySide2.QtGui import QContextMenuEvent -from PySide2.QtWidgets import ( +from PySide6.QtGui import QAction, QContextMenuEvent +from PySide6.QtWidgets import ( QAbstractItemView, - QAction, QDialog, QHBoxLayout, QListView, diff --git a/qt_ui/windows/QDebriefingWindow.py b/qt_ui/windows/QDebriefingWindow.py index e0d5431c..1374a1b1 100644 --- a/qt_ui/windows/QDebriefingWindow.py +++ b/qt_ui/windows/QDebriefingWindow.py @@ -1,8 +1,8 @@ import logging from typing import Callable, Dict, TypeVar -from PySide2.QtGui import QIcon, QPixmap -from PySide2.QtWidgets import ( +from PySide6.QtGui import QIcon, QPixmap +from PySide6.QtWidgets import ( QDialog, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/QLiberationWindow.py b/qt_ui/windows/QLiberationWindow.py index 38afef1b..47a80df5 100644 --- a/qt_ui/windows/QLiberationWindow.py +++ b/qt_ui/windows/QLiberationWindow.py @@ -3,13 +3,10 @@ import traceback import webbrowser from typing import Optional -from PySide2.QtCore import QSettings, Qt, Signal -from PySide2.QtGui import QCloseEvent, QIcon -from PySide2.QtWidgets import ( - QAction, - QActionGroup, +from PySide6.QtCore import QSettings, Qt, Signal +from PySide6.QtGui import QAction, QActionGroup, QCloseEvent, QGuiApplication, QIcon +from PySide6.QtWidgets import ( QApplication, - QDesktopWidget, QFileDialog, QMainWindow, QMessageBox, @@ -97,7 +94,7 @@ class QLiberationWindow(QMainWindow): # Default to maximized on the main display if we don't have any persistent # configuration. - screen = QDesktopWidget().screenGeometry() + screen = QGuiApplication.primaryScreen().availableSize() self.setGeometry(0, 0, screen.width(), screen.height()) self.setWindowState(Qt.WindowMaximized) @@ -133,7 +130,7 @@ class QLiberationWindow(QMainWindow): vbox.setSizes([600, 100]) vbox = QVBoxLayout() - vbox.setMargin(0) + vbox.setContentsMargins(0, 0, 0, 0) vbox.addWidget(QTopPanel(self.game_model, self.sim_controller, ui_flags)) vbox.addWidget(hbox) diff --git a/qt_ui/windows/QUnitInfoWindow.py b/qt_ui/windows/QUnitInfoWindow.py index 577eef00..dcb9aad5 100644 --- a/qt_ui/windows/QUnitInfoWindow.py +++ b/qt_ui/windows/QUnitInfoWindow.py @@ -1,8 +1,8 @@ from __future__ import annotations -from PySide2.QtCore import Qt -from PySide2.QtGui import QIcon -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtGui import QIcon +from PySide6.QtWidgets import ( QDialog, QGridLayout, QLabel, diff --git a/qt_ui/windows/QWaitingForMissionResultWindow.py b/qt_ui/windows/QWaitingForMissionResultWindow.py index 1ef616c1..7bbf3b02 100644 --- a/qt_ui/windows/QWaitingForMissionResultWindow.py +++ b/qt_ui/windows/QWaitingForMissionResultWindow.py @@ -5,10 +5,10 @@ import os from pathlib import Path from typing import Optional -from PySide2 import QtCore -from PySide2.QtCore import QObject, Signal -from PySide2.QtGui import QIcon, QMovie, QPixmap -from PySide2.QtWidgets import ( +from PySide6 import QtCore +from PySide6.QtCore import QObject, Signal +from PySide6.QtGui import QIcon, QMovie, QPixmap +from PySide6.QtWidgets import ( QDialog, QFileDialog, QGridLayout, diff --git a/qt_ui/windows/SquadronDialog.py b/qt_ui/windows/SquadronDialog.py index 4465097a..f8a15595 100644 --- a/qt_ui/windows/SquadronDialog.py +++ b/qt_ui/windows/SquadronDialog.py @@ -1,8 +1,8 @@ import logging from typing import Callable, Iterator, Optional -from PySide2.QtCore import QItemSelection, QItemSelectionModel, QModelIndex, Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import QItemSelection, QItemSelectionModel, QModelIndex, Qt +from PySide6.QtWidgets import ( QAbstractItemView, QCheckBox, QComboBox, diff --git a/qt_ui/windows/basemenu/DepartingConvoysMenu.py b/qt_ui/windows/basemenu/DepartingConvoysMenu.py index c334f0bb..34cd6182 100644 --- a/qt_ui/windows/basemenu/DepartingConvoysMenu.py +++ b/qt_ui/windows/basemenu/DepartingConvoysMenu.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QFrame, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/basemenu/NewUnitTransferDialog.py b/qt_ui/windows/basemenu/NewUnitTransferDialog.py index 30439162..38f90745 100644 --- a/qt_ui/windows/basemenu/NewUnitTransferDialog.py +++ b/qt_ui/windows/basemenu/NewUnitTransferDialog.py @@ -4,8 +4,8 @@ import logging from collections import defaultdict from typing import Callable, Dict, Type -from PySide2.QtCore import Qt, Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt, Signal +from PySide6.QtWidgets import ( QComboBox, QDialog, QFrame, diff --git a/qt_ui/windows/basemenu/QBaseMenu2.py b/qt_ui/windows/basemenu/QBaseMenu2.py index 7eb1f5ae..4b2a1e6c 100644 --- a/qt_ui/windows/basemenu/QBaseMenu2.py +++ b/qt_ui/windows/basemenu/QBaseMenu2.py @@ -1,6 +1,6 @@ -from PySide2.QtCore import Qt -from PySide2.QtGui import QCloseEvent, QPixmap -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtGui import QCloseEvent, QPixmap +from PySide6.QtWidgets import ( QDialog, QHBoxLayout, QLabel, diff --git a/qt_ui/windows/basemenu/QBaseMenuTabs.py b/qt_ui/windows/basemenu/QBaseMenuTabs.py index 3ec0e403..a20cabf9 100644 --- a/qt_ui/windows/basemenu/QBaseMenuTabs.py +++ b/qt_ui/windows/basemenu/QBaseMenuTabs.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QTabWidget +from PySide6.QtWidgets import QTabWidget from game.theater import ControlPoint, Fob from qt_ui.models import GameModel diff --git a/qt_ui/windows/basemenu/UnitTransactionFrame.py b/qt_ui/windows/basemenu/UnitTransactionFrame.py index d1364342..bdf14f28 100644 --- a/qt_ui/windows/basemenu/UnitTransactionFrame.py +++ b/qt_ui/windows/basemenu/UnitTransactionFrame.py @@ -4,8 +4,8 @@ import logging from enum import Enum from typing import Generic, TypeVar -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QApplication, QFrame, QGridLayout, diff --git a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py index c82605b8..44999093 100644 --- a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py +++ b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py @@ -1,7 +1,7 @@ from typing import Set -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QGridLayout, QHBoxLayout, QLabel, diff --git a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py index 61197c9d..78a67961 100644 --- a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py +++ b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QGroupBox, QHBoxLayout, QLabel, QVBoxLayout +from PySide6.QtWidgets import QFrame, QGroupBox, QHBoxLayout, QLabel, QVBoxLayout from game.theater import ControlPoint from qt_ui.models import GameModel diff --git a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py index 77e2af8f..5024d7ab 100644 --- a/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py +++ b/qt_ui/windows/basemenu/ground_forces/QArmorRecruitmentMenu.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QGridLayout, QScrollArea, QVBoxLayout, QWidget +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QGridLayout, QScrollArea, QVBoxLayout, QWidget from game.dcs.groundunittype import GroundUnitType from game.theater import ControlPoint diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py index f6304fcd..ec963c82 100644 --- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py +++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesHQ.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QGridLayout +from PySide6.QtWidgets import QFrame, QGridLayout from game.theater import ControlPoint from qt_ui.models import GameModel diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py index cda39d20..df59c091 100644 --- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py +++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategy.py @@ -1,6 +1,6 @@ from collections.abc import Callable -from PySide2.QtWidgets import QGroupBox, QLabel, QPushButton, QVBoxLayout +from PySide6.QtWidgets import QGroupBox, QLabel, QPushButton, QVBoxLayout from game import Game from game.server import EventStream diff --git a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py index 9cd23eaa..e206ad1b 100644 --- a/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py +++ b/qt_ui/windows/basemenu/ground_forces/QGroundForcesStrategySelector.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.theater import CombatStance, ControlPoint diff --git a/qt_ui/windows/basemenu/intel/QIntelInfo.py b/qt_ui/windows/basemenu/intel/QIntelInfo.py index 91b13efb..d4c39fa4 100644 --- a/qt_ui/windows/basemenu/intel/QIntelInfo.py +++ b/qt_ui/windows/basemenu/intel/QIntelInfo.py @@ -1,7 +1,7 @@ from collections import defaultdict -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QFrame, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/finances/QFinancesMenu.py b/qt_ui/windows/finances/QFinancesMenu.py index b9a531fb..77adcf48 100644 --- a/qt_ui/windows/finances/QFinancesMenu.py +++ b/qt_ui/windows/finances/QFinancesMenu.py @@ -1,7 +1,7 @@ import itertools from typing import Optional -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QDialog, QFrame, QGridLayout, diff --git a/qt_ui/windows/groundobject/QBuildingInfo.py b/qt_ui/windows/groundobject/QBuildingInfo.py index aa4e67ba..e47c7be9 100644 --- a/qt_ui/windows/groundobject/QBuildingInfo.py +++ b/qt_ui/windows/groundobject/QBuildingInfo.py @@ -1,7 +1,7 @@ import os -from PySide2.QtGui import QPixmap -from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout +from PySide6.QtGui import QPixmap +from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout from game.theater import TheaterUnit from game.config import REWARDS diff --git a/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py b/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py index b0dc5505..d6af447e 100644 --- a/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py +++ b/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py @@ -3,9 +3,9 @@ from collections import defaultdict from dataclasses import dataclass, field from typing import Type -from PySide2.QtCore import Signal -from PySide2.QtGui import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +from PySide6.QtGui import Qt +from PySide6.QtWidgets import ( QCheckBox, QComboBox, QDialog, diff --git a/qt_ui/windows/groundobject/QGroundObjectMenu.py b/qt_ui/windows/groundobject/QGroundObjectMenu.py index 4db606bf..b7074421 100644 --- a/qt_ui/windows/groundobject/QGroundObjectMenu.py +++ b/qt_ui/windows/groundobject/QGroundObjectMenu.py @@ -1,7 +1,7 @@ import logging -from PySide2.QtGui import QTransform -from PySide2.QtWidgets import ( +from PySide6.QtGui import QTransform +from PySide6.QtWidgets import ( QDialog, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/infos/QInfoItem.py b/qt_ui/windows/infos/QInfoItem.py index b15c5f1c..4c1c6a8a 100644 --- a/qt_ui/windows/infos/QInfoItem.py +++ b/qt_ui/windows/infos/QInfoItem.py @@ -1,4 +1,4 @@ -from PySide2.QtGui import QStandardItem +from PySide6.QtGui import QStandardItem from game.infos.information import Information diff --git a/qt_ui/windows/infos/QInfoList.py b/qt_ui/windows/infos/QInfoList.py index 7614d21f..ea5fb6cf 100644 --- a/qt_ui/windows/infos/QInfoList.py +++ b/qt_ui/windows/infos/QInfoList.py @@ -1,6 +1,6 @@ -from PySide2.QtCore import QItemSelectionModel, QPoint -from PySide2.QtGui import QStandardItemModel -from PySide2.QtWidgets import QListView +from PySide6.QtCore import QItemSelectionModel, QPoint +from PySide6.QtGui import QStandardItemModel +from PySide6.QtWidgets import QListView from game import Game, game from qt_ui.windows.infos.QInfoItem import QInfoItem diff --git a/qt_ui/windows/infos/QInfoPanel.py b/qt_ui/windows/infos/QInfoPanel.py index 2bb021ab..5c2cb6c2 100644 --- a/qt_ui/windows/infos/QInfoPanel.py +++ b/qt_ui/windows/infos/QInfoPanel.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QVBoxLayout, QLabel, QGroupBox +from PySide6.QtWidgets import QFrame, QVBoxLayout, QLabel, QGroupBox from game import Game from qt_ui.windows.infos.QInfoList import QInfoList diff --git a/qt_ui/windows/infos/QInfoWidget.py b/qt_ui/windows/infos/QInfoWidget.py index 5f76b422..e5518762 100644 --- a/qt_ui/windows/infos/QInfoWidget.py +++ b/qt_ui/windows/infos/QInfoWidget.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QLabel, QGridLayout +from PySide6.QtWidgets import QFrame, QLabel, QGridLayout from game.infos.information import Information diff --git a/qt_ui/windows/intel.py b/qt_ui/windows/intel.py index 8ae11087..ad678246 100644 --- a/qt_ui/windows/intel.py +++ b/qt_ui/windows/intel.py @@ -1,7 +1,7 @@ import itertools from typing import Optional -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QCheckBox, QDialog, QFrame, diff --git a/qt_ui/windows/logs/QLogsWindow.py b/qt_ui/windows/logs/QLogsWindow.py index 47bc872e..ae3358bd 100644 --- a/qt_ui/windows/logs/QLogsWindow.py +++ b/qt_ui/windows/logs/QLogsWindow.py @@ -1,14 +1,14 @@ import logging import typing -from PySide2.QtCore import Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +from PySide6.QtWidgets import ( QDialog, QPlainTextEdit, QVBoxLayout, QPushButton, ) -from PySide2.QtGui import QTextCursor, QIcon +from PySide6.QtGui import QTextCursor, QIcon from qt_ui.logging_handler import HookableInMemoryHandler diff --git a/qt_ui/windows/mission/QEditFlightDialog.py b/qt_ui/windows/mission/QEditFlightDialog.py index 40d43cf7..98f20702 100644 --- a/qt_ui/windows/mission/QEditFlightDialog.py +++ b/qt_ui/windows/mission/QEditFlightDialog.py @@ -1,5 +1,5 @@ """Dialog window for editing flights.""" -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QDialog, QVBoxLayout, ) diff --git a/qt_ui/windows/mission/QFlightItem.py b/qt_ui/windows/mission/QFlightItem.py index 2a5f9a5d..b588096c 100644 --- a/qt_ui/windows/mission/QFlightItem.py +++ b/qt_ui/windows/mission/QFlightItem.py @@ -1,4 +1,4 @@ -from PySide2.QtGui import QIcon, QStandardItem +from PySide6.QtGui import QIcon, QStandardItem from game.ato.flight import Flight from game.ato.package import Package diff --git a/qt_ui/windows/mission/QPackageDialog.py b/qt_ui/windows/mission/QPackageDialog.py index 9d3d7ee2..32c1c86b 100644 --- a/qt_ui/windows/mission/QPackageDialog.py +++ b/qt_ui/windows/mission/QPackageDialog.py @@ -3,8 +3,8 @@ import logging from datetime import timedelta from typing import Optional -from PySide2.QtCore import QItemSelection, QTime, Qt, Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import QItemSelection, QTime, Qt, Signal +from PySide6.QtWidgets import ( QCheckBox, QDialog, QHBoxLayout, diff --git a/qt_ui/windows/mission/QPlannedFlightsView.py b/qt_ui/windows/mission/QPlannedFlightsView.py index f736a5ed..40a47072 100644 --- a/qt_ui/windows/mission/QPlannedFlightsView.py +++ b/qt_ui/windows/mission/QPlannedFlightsView.py @@ -1,8 +1,8 @@ from datetime import timedelta -from PySide2.QtCore import QItemSelectionModel, QSize -from PySide2.QtGui import QStandardItemModel -from PySide2.QtWidgets import QAbstractItemView, QListView +from PySide6.QtCore import QItemSelectionModel, QSize +from PySide6.QtGui import QStandardItemModel +from PySide6.QtWidgets import QAbstractItemView, QListView from game.theater.controlpoint import ControlPoint from qt_ui.models import GameModel diff --git a/qt_ui/windows/mission/flight/QFlightCreator.py b/qt_ui/windows/mission/flight/QFlightCreator.py index 1ffa8f0e..94e4f65c 100644 --- a/qt_ui/windows/mission/flight/QFlightCreator.py +++ b/qt_ui/windows/mission/flight/QFlightCreator.py @@ -1,7 +1,7 @@ from typing import Optional, Type -from PySide2.QtCore import Qt, Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt, Signal +from PySide6.QtWidgets import ( QComboBox, QDialog, QLabel, diff --git a/qt_ui/windows/mission/flight/QFlightPlanner.py b/qt_ui/windows/mission/flight/QFlightPlanner.py index ab86f052..a115e10f 100644 --- a/qt_ui/windows/mission/flight/QFlightPlanner.py +++ b/qt_ui/windows/mission/flight/QFlightPlanner.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QTabWidget +from PySide6.QtWidgets import QTabWidget from game import Game from game.ato.flight import Flight diff --git a/qt_ui/windows/mission/flight/SquadronSelector.py b/qt_ui/windows/mission/flight/SquadronSelector.py index 0813843c..80183b79 100644 --- a/qt_ui/windows/mission/flight/SquadronSelector.py +++ b/qt_ui/windows/mission/flight/SquadronSelector.py @@ -1,7 +1,7 @@ """Combo box for selecting squadrons.""" from typing import Optional -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.dcs.aircrafttype import AircraftType from game.squadrons.airwing import AirWing diff --git a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py index 844ad801..5087ed7a 100644 --- a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py +++ b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QComboBox, QFrame, QLabel, diff --git a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py index a41edb92..31b5b661 100644 --- a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py +++ b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QGridLayout, QGroupBox, QLabel, diff --git a/qt_ui/windows/mission/flight/payload/QPylonEditor.py b/qt_ui/windows/mission/flight/payload/QPylonEditor.py index acb4151e..355404e8 100644 --- a/qt_ui/windows/mission/flight/payload/QPylonEditor.py +++ b/qt_ui/windows/mission/flight/payload/QPylonEditor.py @@ -2,7 +2,7 @@ import logging import operator from typing import Optional -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game import Game from game.data.weapons import Pylon, Weapon diff --git a/qt_ui/windows/mission/flight/payload/propertyeditor.py b/qt_ui/windows/mission/flight/payload/propertyeditor.py index 0b3beed9..68982bde 100644 --- a/qt_ui/windows/mission/flight/payload/propertyeditor.py +++ b/qt_ui/windows/mission/flight/payload/propertyeditor.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QGridLayout, QLabel +from PySide6.QtWidgets import QGridLayout, QLabel from game.ato import Flight from .propertyselector import PropertySelector diff --git a/qt_ui/windows/mission/flight/payload/propertyselector.py b/qt_ui/windows/mission/flight/payload/propertyselector.py index c9e785c6..8b1ac499 100644 --- a/qt_ui/windows/mission/flight/payload/propertyselector.py +++ b/qt_ui/windows/mission/flight/payload/propertyselector.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.ato import Flight from game.dcs.unitproperty import UnitProperty diff --git a/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py b/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py index a0a41586..7cac0eea 100644 --- a/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py +++ b/qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py @@ -1,6 +1,6 @@ import logging -from PySide2.QtWidgets import QGroupBox, QLabel, QMessageBox, QVBoxLayout +from PySide6.QtWidgets import QGroupBox, QLabel, QMessageBox, QVBoxLayout from game import Game from game.ato.flight import Flight diff --git a/qt_ui/windows/mission/flight/settings/QCustomName.py b/qt_ui/windows/mission/flight/settings/QCustomName.py index 86da83f0..67cf1cfd 100644 --- a/qt_ui/windows/mission/flight/settings/QCustomName.py +++ b/qt_ui/windows/mission/flight/settings/QCustomName.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel +from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QLabel from game.ato.flight import Flight diff --git a/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py b/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py index 8ff93f73..7aa07c6c 100644 --- a/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py +++ b/qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py @@ -1,8 +1,8 @@ import logging from typing import Optional, Callable -from PySide2.QtCore import Signal, QModelIndex -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal, QModelIndex +from PySide6.QtWidgets import ( QLabel, QGroupBox, QSpinBox, diff --git a/qt_ui/windows/mission/flight/settings/QFlightStartType.py b/qt_ui/windows/mission/flight/settings/QFlightStartType.py index 5b207e34..82c73cf0 100644 --- a/qt_ui/windows/mission/flight/settings/QFlightStartType.py +++ b/qt_ui/windows/mission/flight/settings/QFlightStartType.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QComboBox, QGroupBox, QHBoxLayout, diff --git a/qt_ui/windows/mission/flight/settings/QFlightTypeTaskInfo.py b/qt_ui/windows/mission/flight/settings/QFlightTypeTaskInfo.py index 32324676..4aa1fbe9 100644 --- a/qt_ui/windows/mission/flight/settings/QFlightTypeTaskInfo.py +++ b/qt_ui/windows/mission/flight/settings/QFlightTypeTaskInfo.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QLabel, QGroupBox, QGridLayout +from PySide6.QtWidgets import QLabel, QGroupBox, QGridLayout from qt_ui.uiconstants import AIRCRAFT_ICONS diff --git a/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py b/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py index d52d438e..c239de36 100644 --- a/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py +++ b/qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Signal -from PySide2.QtWidgets import QFrame, QGridLayout, QVBoxLayout +from PySide6.QtCore import Signal +from PySide6.QtWidgets import QFrame, QGridLayout, QVBoxLayout from game import Game from game.ato.flight import Flight diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py index 4af48d55..d26fa330 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout +from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout from game.ato.flightwaypoint import FlightWaypoint diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py index 545c3a5d..17512095 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py @@ -1,6 +1,6 @@ from typing import List -from PySide2.QtGui import QStandardItem +from PySide6.QtGui import QStandardItem from game.ato.flightwaypoint import FlightWaypoint diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py index 5044315e..1817c3a2 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py @@ -1,8 +1,8 @@ from datetime import timedelta -from PySide2.QtCore import QItemSelectionModel, QPoint -from PySide2.QtGui import QStandardItem, QStandardItemModel -from PySide2.QtWidgets import QHeaderView, QTableView +from PySide6.QtCore import QItemSelectionModel, QPoint +from PySide6.QtGui import QStandardItem, QStandardItemModel +from PySide6.QtWidgets import QHeaderView, QTableView from game.ato.package import Package from game.ato.flightwaypointtype import FlightWaypointType diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py index 04f07d51..38395dad 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py @@ -1,8 +1,8 @@ import logging from typing import Iterable, List, Optional -from PySide2.QtCore import Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +from PySide6.QtWidgets import ( QFrame, QGridLayout, QLabel, diff --git a/qt_ui/windows/mission/flight/waypoints/QPredefinedWaypointSelectionWindow.py b/qt_ui/windows/mission/flight/waypoints/QPredefinedWaypointSelectionWindow.py index 63dd4386..904c3064 100644 --- a/qt_ui/windows/mission/flight/waypoints/QPredefinedWaypointSelectionWindow.py +++ b/qt_ui/windows/mission/flight/waypoints/QPredefinedWaypointSelectionWindow.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Qt, Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt, Signal +from PySide6.QtWidgets import ( QCheckBox, QDialog, QHBoxLayout, diff --git a/qt_ui/windows/newgame/QCampaignList.py b/qt_ui/windows/newgame/QCampaignList.py index d21d33b7..a5a3cb7e 100644 --- a/qt_ui/windows/newgame/QCampaignList.py +++ b/qt_ui/windows/newgame/QCampaignList.py @@ -2,10 +2,10 @@ from __future__ import annotations from typing import Optional -from PySide2 import QtGui -from PySide2.QtCore import QItemSelectionModel, QModelIndex, Qt -from PySide2.QtGui import QPixmap, QStandardItem, QStandardItemModel -from PySide2.QtWidgets import QAbstractItemView, QListView +from PySide6 import QtGui +from PySide6.QtCore import QItemSelectionModel, QModelIndex, Qt +from PySide6.QtGui import QPixmap, QStandardItem, QStandardItemModel +from PySide6.QtWidgets import QAbstractItemView, QListView from game.campaignloader.campaign import Campaign from qt_ui.liberation_install import get_dcs_install_directory diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index b82f4a4d..1d08c4a9 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -4,9 +4,9 @@ import logging from datetime import datetime, timedelta from typing import List -from PySide2 import QtGui, QtWidgets -from PySide2.QtCore import QDate, QItemSelectionModel, QPoint, Qt, Signal -from PySide2.QtWidgets import QCheckBox, QLabel, QTextEdit, QVBoxLayout +from PySide6 import QtGui, QtWidgets +from PySide6.QtCore import QDate, QItemSelectionModel, QPoint, Qt, Signal +from PySide6.QtWidgets import QCheckBox, QLabel, QTextEdit, QVBoxLayout from jinja2 import Environment, FileSystemLoader, select_autoescape from game.campaignloader.campaign import Campaign, DEFAULT_BUDGET diff --git a/qt_ui/windows/notes/QNotesWindow.py b/qt_ui/windows/notes/QNotesWindow.py index cb1419b5..4fa7e08c 100644 --- a/qt_ui/windows/notes/QNotesWindow.py +++ b/qt_ui/windows/notes/QNotesWindow.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QDialog, QPlainTextEdit, QVBoxLayout, @@ -6,8 +6,8 @@ from PySide2.QtWidgets import ( QPushButton, QLabel, ) -from PySide2.QtGui import QTextCursor -from PySide2.QtCore import QTimer +from PySide6.QtGui import QTextCursor +from PySide6.QtCore import QTimer import qt_ui.uiconstants as CONST from game.game import Game diff --git a/qt_ui/windows/preferences/QLiberationFirstStartWindow.py b/qt_ui/windows/preferences/QLiberationFirstStartWindow.py index 78b898a1..58b255ce 100644 --- a/qt_ui/windows/preferences/QLiberationFirstStartWindow.py +++ b/qt_ui/windows/preferences/QLiberationFirstStartWindow.py @@ -1,5 +1,5 @@ -from PySide2.QtGui import QIcon, Qt -from PySide2.QtWidgets import ( +from PySide6.QtGui import QIcon, Qt +from PySide6.QtWidgets import ( QDialog, QVBoxLayout, QPushButton, diff --git a/qt_ui/windows/preferences/QLiberationPreferences.py b/qt_ui/windows/preferences/QLiberationPreferences.py index fbfa6770..f2486834 100644 --- a/qt_ui/windows/preferences/QLiberationPreferences.py +++ b/qt_ui/windows/preferences/QLiberationPreferences.py @@ -1,7 +1,7 @@ import os -from PySide2.QtGui import Qt -from PySide2.QtWidgets import ( +from PySide6.QtGui import Qt +from PySide6.QtWidgets import ( QComboBox, QFileDialog, QFrame, diff --git a/qt_ui/windows/preferences/QLiberationPreferencesWindow.py b/qt_ui/windows/preferences/QLiberationPreferencesWindow.py index e23a3c08..7363a190 100644 --- a/qt_ui/windows/preferences/QLiberationPreferencesWindow.py +++ b/qt_ui/windows/preferences/QLiberationPreferencesWindow.py @@ -1,5 +1,5 @@ -from PySide2.QtGui import QIcon, Qt -from PySide2.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout +from PySide6.QtGui import QIcon, Qt +from PySide6.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout from qt_ui.windows.preferences.QLiberationPreferences import QLiberationPreferences diff --git a/qt_ui/windows/settings/QSettingsWindow.py b/qt_ui/windows/settings/QSettingsWindow.py index 817b54d1..7a488ac5 100644 --- a/qt_ui/windows/settings/QSettingsWindow.py +++ b/qt_ui/windows/settings/QSettingsWindow.py @@ -2,9 +2,9 @@ import logging import textwrap from typing import Callable -from PySide2.QtCore import QItemSelectionModel, QPoint, QSize, Qt -from PySide2.QtGui import QStandardItem, QStandardItemModel -from PySide2.QtWidgets import ( +from PySide6.QtCore import QItemSelectionModel, QPoint, QSize, Qt +from PySide6.QtGui import QStandardItem, QStandardItemModel +from PySide6.QtWidgets import ( QAbstractItemView, QCheckBox, QComboBox, diff --git a/qt_ui/windows/settings/plugins.py b/qt_ui/windows/settings/plugins.py index f4973f77..5e0fb597 100644 --- a/qt_ui/windows/settings/plugins.py +++ b/qt_ui/windows/settings/plugins.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QCheckBox, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/stats/QAircraftChart.py b/qt_ui/windows/stats/QAircraftChart.py index 6516ec58..c162f48e 100644 --- a/qt_ui/windows/stats/QAircraftChart.py +++ b/qt_ui/windows/stats/QAircraftChart.py @@ -1,7 +1,8 @@ -from PySide2.QtCharts import QtCharts -from PySide2.QtCore import QPoint, Qt -from PySide2.QtGui import QPainter -from PySide2.QtWidgets import QFrame, QGridLayout +from PySide6 import QtCharts +from PySide6.QtCore import QPoint, Qt +from PySide6.QtGui import QPainter +from PySide6.QtWidgets import QFrame, QGridLayout + from game import Game diff --git a/qt_ui/windows/stats/QArmorChart.py b/qt_ui/windows/stats/QArmorChart.py index e952c717..fd9f9553 100644 --- a/qt_ui/windows/stats/QArmorChart.py +++ b/qt_ui/windows/stats/QArmorChart.py @@ -1,7 +1,8 @@ -from PySide2.QtCharts import QtCharts -from PySide2.QtCore import QPoint, Qt -from PySide2.QtGui import QPainter -from PySide2.QtWidgets import QFrame, QGridLayout +from PySide6 import QtCharts +from PySide6.QtCore import QPoint, Qt +from PySide6.QtGui import QPainter +from PySide6.QtWidgets import QFrame, QGridLayout + from game import Game diff --git a/qt_ui/windows/stats/QStatsWindow.py b/qt_ui/windows/stats/QStatsWindow.py index 14817d18..b3a2edbb 100644 --- a/qt_ui/windows/stats/QStatsWindow.py +++ b/qt_ui/windows/stats/QStatsWindow.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QDialog, QGridLayout, QTabWidget +from PySide6.QtWidgets import QDialog, QGridLayout, QTabWidget import qt_ui.uiconstants as CONST from game.game import Game diff --git a/requirements.txt b/requirements.txt index 056eb8cf..d5aedfe8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -altgraph==0.17.2 +altgraph==0.17.2 anyio==3.6.1 asgiref==3.5.2 atomicwrites==1.4.1 @@ -38,14 +38,16 @@ pyinstaller-hooks-contrib==2022.8 pyparsing==3.0.9 pyproj==3.3.1 pyshp==2.3.1 -PySide2==5.15.2.1 +PySide6==6.4.1 +PySide6-Addons==6.4.1 +PySide6-Essentials==6.4.1 pytest==7.1.2 python-dateutil==2.8.2 python-dotenv==0.20.0 pywin32-ctypes==0.2.0 PyYAML==6.0 Shapely==1.8.2 -shiboken2==5.15.2.1 +shiboken6==6.4.1 six==1.16.0 sniffio==1.2.0 starlette==0.19.1