diff --git a/game/server/app.py b/game/server/app.py index 4aaa63c3..5de42ded 100644 --- a/game/server/app.py +++ b/game/server/app.py @@ -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/blocksignals.py b/qt_ui/blocksignals.py index 0dff148d..8019946a 100644 --- a/qt_ui/blocksignals.py +++ b/qt_ui/blocksignals.py @@ -1,7 +1,7 @@ from collections.abc import Iterator from contextlib import contextmanager -from PySide2.QtWidgets import QWidget +from PySide6.QtWidgets import QWidget @contextmanager 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 3a1eec93..452ffbb3 100644 --- a/qt_ui/main.py +++ b/qt_ui/main.py @@ -8,10 +8,10 @@ from pathlib import Path from typing import Optional import yaml -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.liveries.liverycache import LiveryCache from dcs.payloads import PayloadDirectories @@ -87,10 +87,6 @@ def run_ui(game: Optional[Game], 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( @@ -162,7 +158,7 @@ def run_ui(game: Optional[Game], ui_flags: UiFlags) -> None: "Unable to modify Mission Scripting file. Possible issues with rights. " "Try running as admin, or please perform the modification of the MissionScripting file manually." ) - error_dialog.exec_() + error_dialog.exec() # Apply CSS (need works) GameUpdateSignal() diff --git a/qt_ui/models.py b/qt_ui/models.py index ce0e23ca..4c76f185 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 98607330..a7cc163e 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 44ae11b3..efeb4277 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 cff1cbf5..35cdf71a 100644 --- a/qt_ui/widgets/QBudgetBox.py +++ b/qt_ui/widgets/QBudgetBox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QHBoxLayout, QGroupBox, QPushButton +from PySide6.QtWidgets import 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 86803607..37c26d65 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 a0244227..84ac620b 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/QFrequencyWidget.py b/qt_ui/widgets/QFrequencyWidget.py index 0e57dddc..fcfc3f1e 100644 --- a/qt_ui/widgets/QFrequencyWidget.py +++ b/qt_ui/widgets/QFrequencyWidget.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +from PySide6.QtWidgets import ( QHBoxLayout, QLabel, QPushButton, diff --git a/qt_ui/widgets/QICLSWidget.py b/qt_ui/widgets/QICLSWidget.py index ffcb08ea..2c7b14a6 100644 --- a/qt_ui/widgets/QICLSWidget.py +++ b/qt_ui/widgets/QICLSWidget.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QHBoxLayout, QLabel, QPushButton, 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/QLink4Widget.py b/qt_ui/widgets/QLink4Widget.py index bbced2c2..701e2ad0 100644 --- a/qt_ui/widgets/QLink4Widget.py +++ b/qt_ui/widgets/QLink4Widget.py @@ -1,5 +1,5 @@ -from PySide2.QtCore import Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +from PySide6.QtWidgets import ( QHBoxLayout, QLabel, QPushButton, diff --git a/qt_ui/widgets/QTacanWidget.py b/qt_ui/widgets/QTacanWidget.py index bb227f44..6382ba25 100644 --- a/qt_ui/widgets/QTacanWidget.py +++ b/qt_ui/widgets/QTacanWidget.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QHBoxLayout, QLabel, QPushButton, diff --git a/qt_ui/widgets/QTopPanel.py b/qt_ui/widgets/QTopPanel.py index c1c0a4c0..71ee3356 100644 --- a/qt_ui/widgets/QTopPanel.py +++ b/qt_ui/widgets/QTopPanel.py @@ -1,7 +1,7 @@ from datetime import datetime 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 36d2c9a7..0fe0d8f7 100644 --- a/qt_ui/widgets/ato.py +++ b/qt_ui/widgets/ato.py @@ -2,18 +2,17 @@ import logging from typing import Optional -from PySide2.QtCore import ( +from PySide6.QtCore import ( QItemSelectionModel, QModelIndex, QSize, Qt, ) -from PySide2.QtGui import ( - QContextMenuEvent, +from PySide6.QtGui import ( + QContextMenuEvent, QAction, ) -from PySide2.QtWidgets import ( +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 7fe8f0c2..41afa1f7 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 @@ -11,7 +11,7 @@ class QAircraftTypeSelector(QComboBox): super().__init__() self.model().sort(0) - self.setSizeAdjustPolicy(self.AdjustToContents) + self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) self.update_items(aircraft_types) def update_items(self, aircraft_types: list[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 235049f8..f6f7e28a 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 6947817a..adb97f4e 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/combos/QSquadronLiverySelector.py b/qt_ui/widgets/combos/QSquadronLiverySelector.py index 0bd11e47..8ec8b0df 100644 --- a/qt_ui/widgets/combos/QSquadronLiverySelector.py +++ b/qt_ui/widgets/combos/QSquadronLiverySelector.py @@ -1,6 +1,6 @@ import logging -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.squadrons import Squadron @@ -13,7 +13,7 @@ class SquadronLiverySelector(QComboBox): def __init__(self, squadron: Squadron) -> None: super().__init__() - self.setSizeAdjustPolicy(self.AdjustToContents) + self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) self.aircraft_type = squadron.aircraft selected_livery = squadron.livery diff --git a/qt_ui/widgets/combos/primarytaskselector.py b/qt_ui/widgets/combos/primarytaskselector.py index bfe8d07c..2f39b0cb 100644 --- a/qt_ui/widgets/combos/primarytaskselector.py +++ b/qt_ui/widgets/combos/primarytaskselector.py @@ -1,6 +1,6 @@ from __future__ import annotations -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from game.ato import FlightType from game.dcs.aircrafttype import AircraftType 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..164ae9b9 100644 --- a/qt_ui/widgets/map/QLiberationMap.py +++ b/qt_ui/widgets/map/QLiberationMap.py @@ -3,10 +3,9 @@ from __future__ import annotations import logging from pathlib import Path -from PySide2.QtCore import QUrl -from PySide2.QtWebEngineWidgets import ( - QWebEnginePage, - QWebEngineSettings, +from PySide6.QtCore import QUrl +from PySide6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings +from PySide6.QtWebEngineWidgets import ( QWebEngineView, ) diff --git a/qt_ui/widgets/simspeedcontrols.py b/qt_ui/widgets/simspeedcontrols.py index ccf4196f..a6ad4672 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 3afa106a..f94ac9b6 100644 --- a/qt_ui/windows/AirWingConfigurationDialog.py +++ b/qt_ui/windows/AirWingConfigurationDialog.py @@ -1,15 +1,15 @@ from collections import defaultdict 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 ( QComboBox, QDialog, QGroupBox, @@ -109,7 +109,7 @@ class SquadronBaseSelector(QComboBox): aircraft_type: Optional[AircraftType], ) -> None: super().__init__() - self.setSizeAdjustPolicy(self.AdjustToContents) + self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) self.bases = list(bases) self.set_aircraft_type(aircraft_type) @@ -812,7 +812,7 @@ class SquadronAircraftTypeSelector(QComboBox): self, types: set[AircraftType], selected_aircraft: Optional[str] ) -> None: super().__init__() - self.setSizeAdjustPolicy(self.AdjustToContents) + self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) for type in sorted(types, key=lambda type: type.display_name): self.addItem(type.display_name, type) @@ -829,7 +829,7 @@ class SquadronDefSelector(QComboBox): allow_random: bool = True, ) -> None: super().__init__() - self.setSizeAdjustPolicy(self.AdjustToContents) + self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) self.squadron_defs = squadron_defs self.allow_random = allow_random self.set_aircraft_type(aircraft) diff --git a/qt_ui/windows/AirWingDialog.py b/qt_ui/windows/AirWingDialog.py index 7f7655aa..c62f26f7 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 Iterator, Optional -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/GameUpdateSignal.py b/qt_ui/windows/GameUpdateSignal.py index 0ce7f89b..daeb0725 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..0cb0c375 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 QContextMenuEvent, QAction +from PySide6.QtWidgets import ( QAbstractItemView, - QAction, QDialog, QHBoxLayout, QListView, diff --git a/qt_ui/windows/QDebriefingWindow.py b/qt_ui/windows/QDebriefingWindow.py index 1c51c083..8d153eb6 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, QCloseEvent -from PySide2.QtWidgets import ( +from PySide6.QtGui import QIcon, QPixmap, QCloseEvent +from PySide6.QtWidgets import ( QDialog, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/QICLSDialog.py b/qt_ui/windows/QICLSDialog.py index d69d0fe1..087ff452 100644 --- a/qt_ui/windows/QICLSDialog.py +++ b/qt_ui/windows/QICLSDialog.py @@ -1,7 +1,7 @@ from typing import Optional -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QDialog, QPushButton, QLabel, diff --git a/qt_ui/windows/QLiberationWindow.py b/qt_ui/windows/QLiberationWindow.py index b657c00f..68c35ec6 100644 --- a/qt_ui/windows/QLiberationWindow.py +++ b/qt_ui/windows/QLiberationWindow.py @@ -4,13 +4,10 @@ import webbrowser from pathlib import Path 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 QCloseEvent, QIcon, QAction, QGuiApplication, QActionGroup +from PySide6.QtWidgets import ( QApplication, - QDesktopWidget, QFileDialog, QMainWindow, QMessageBox, @@ -99,7 +96,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) @@ -134,7 +131,7 @@ class QLiberationWindow(QMainWindow): self.top_panel = QTopPanel(self.game_model, self.sim_controller, ui_flags) vbox = QVBoxLayout() - vbox.setMargin(0) + vbox.setContentsMargins(0, 0, 0, 0) vbox.addWidget(self.top_panel) vbox.addWidget(hbox) diff --git a/qt_ui/windows/QRadioFrequencyDialog.py b/qt_ui/windows/QRadioFrequencyDialog.py index c35c274a..8102b0b6 100644 --- a/qt_ui/windows/QRadioFrequencyDialog.py +++ b/qt_ui/windows/QRadioFrequencyDialog.py @@ -1,8 +1,8 @@ from typing import Optional, Iterable -from PySide2.QtCore import Qt, QLocale -from PySide2.QtGui import QIcon -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt, QLocale +from PySide6.QtGui import QIcon +from PySide6.QtWidgets import ( QDialog, QPushButton, QLabel, diff --git a/qt_ui/windows/QTacanDialog.py b/qt_ui/windows/QTacanDialog.py index b5042a0e..c86fc8ee 100644 --- a/qt_ui/windows/QTacanDialog.py +++ b/qt_ui/windows/QTacanDialog.py @@ -1,7 +1,7 @@ from typing import Optional -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QDialog, QPushButton, QLabel, diff --git a/qt_ui/windows/QUnitInfoWindow.py b/qt_ui/windows/QUnitInfoWindow.py index 412679d7..c92b0523 100644 --- a/qt_ui/windows/QUnitInfoWindow.py +++ b/qt_ui/windows/QUnitInfoWindow.py @@ -2,9 +2,9 @@ from __future__ import annotations from pathlib import Path -from PySide2.QtCore import Qt -from PySide2.QtGui import QIcon, QPixmap -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt +from PySide6.QtGui import QIcon, QPixmap +from PySide6.QtWidgets import ( QDialog, QGridLayout, QLabel, @@ -90,7 +90,7 @@ class QUnitInfoWindow(QDialog): # Build the topmost details grid. self.details_grid = QFrame() self.details_grid_layout = QGridLayout() - self.details_grid_layout.setMargin(0) + self.details_grid_layout.setContentsMargins(0, 0, 0, 0) self.name_box = QLabel( f"Name: {unit_type.manufacturer} {unit_type.display_name}" diff --git a/qt_ui/windows/QWaitingForMissionResultWindow.py b/qt_ui/windows/QWaitingForMissionResultWindow.py index 0397dc29..96e326d4 100644 --- a/qt_ui/windows/QWaitingForMissionResultWindow.py +++ b/qt_ui/windows/QWaitingForMissionResultWindow.py @@ -4,10 +4,10 @@ import logging 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 808aa626..23b42ee1 100644 --- a/qt_ui/windows/SquadronDialog.py +++ b/qt_ui/windows/SquadronDialog.py @@ -2,8 +2,8 @@ import logging from copy import deepcopy from typing import Callable, Iterator, Optional, Type -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 b2ee9c5b..f6963ce8 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 c1187470..834d74fe 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 1236a09a..311a4381 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 ad6e17ec..9b4cc583 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 eb8c8219..08608ef8 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 2dd74174..07ef03d9 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.purchaseadapter import GroundUnitPurchaseAdapter 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 ed639e5e..41faf90a 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 8a762a31..e9c4c7a2 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.config import REWARDS from game.theater import TheaterUnit diff --git a/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py b/qt_ui/windows/groundobject/QGroundObjectBuyMenu.py index db125074..647ac060 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 e62750c5..09cc9251 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 f6f02cfb..877a977a 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 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 1bfbc204..90a3d6ab 100644 --- a/qt_ui/windows/infos/QInfoPanel.py +++ b/qt_ui/windows/infos/QInfoPanel.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QVBoxLayout, QGroupBox +from PySide6.QtWidgets import QVBoxLayout, 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 fd6bde8a..75ee147c 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 bc15d6ad..bdde7787 100644 --- a/qt_ui/windows/logs/QLogsWindow.py +++ b/qt_ui/windows/logs/QLogsWindow.py @@ -1,9 +1,9 @@ import logging import typing -from PySide2.QtCore import Signal -from PySide2.QtGui import QTextCursor, QIcon -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +from PySide6.QtGui import QTextCursor, QIcon +from PySide6.QtWidgets import ( QDialog, QPlainTextEdit, QVBoxLayout, diff --git a/qt_ui/windows/mission/QAutoCreateDialog.py b/qt_ui/windows/mission/QAutoCreateDialog.py index e6c08ef5..350c1d59 100644 --- a/qt_ui/windows/mission/QAutoCreateDialog.py +++ b/qt_ui/windows/mission/QAutoCreateDialog.py @@ -1,6 +1,6 @@ from typing import List -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QDialog, QVBoxLayout, QComboBox, diff --git a/qt_ui/windows/mission/QEditFlightDialog.py b/qt_ui/windows/mission/QEditFlightDialog.py index 0faca3c0..ab191a85 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 8b1c63f9..ac1c4054 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 6f5d8422..39aaa945 100644 --- a/qt_ui/windows/mission/QPackageDialog.py +++ b/qt_ui/windows/mission/QPackageDialog.py @@ -2,8 +2,8 @@ import logging 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 fd875ac6..2839d14b 100644 --- a/qt_ui/windows/mission/QPlannedFlightsView.py +++ b/qt_ui/windows/mission/QPlannedFlightsView.py @@ -1,8 +1,8 @@ from datetime import datetime -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 309f58d6..bf791473 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 2b878458..7ca1f127 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.ato.flight import Flight from qt_ui.models import PackageModel, GameModel diff --git a/qt_ui/windows/mission/flight/SquadronSelector.py b/qt_ui/windows/mission/flight/SquadronSelector.py index dc495e0b..906ae1c4 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.ato.flighttype import FlightType from game.dcs.aircrafttype import AircraftType @@ -21,7 +21,7 @@ class SquadronSelector(QComboBox): self.air_wing = air_wing self.model().sort(0) - self.setSizeAdjustPolicy(self.AdjustToContents) + self.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents) self.update_items(task, aircraft) @property diff --git a/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py b/qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py index 159c99a8..808e957b 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 7b9367a4..156d175e 100644 --- a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py +++ b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py @@ -3,8 +3,8 @@ from dataclasses import dataclass from shutil import copyfile from typing import Dict, Union -from PySide2.QtCore import Signal -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal +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 b548f85d..5e3d013c 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.ato.flight import Flight diff --git a/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py b/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py index 50a09c89..6a950abc 100644 --- a/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py +++ b/qt_ui/windows/mission/flight/payload/ownlasercodeinfo.py @@ -1,7 +1,7 @@ from typing import Optional -from PySide2.QtCore import Signal -from PySide2.QtWidgets import QWidget, QHBoxLayout, QLabel, QPushButton +from PySide6.QtCore import Signal +from PySide6.QtWidgets import QWidget, QHBoxLayout, QLabel, QPushButton from game import Game from game.ato.flightmember import FlightMember diff --git a/qt_ui/windows/mission/flight/payload/propertycheckbox.py b/qt_ui/windows/mission/flight/payload/propertycheckbox.py index f2599db2..f5d1caee 100644 --- a/qt_ui/windows/mission/flight/payload/propertycheckbox.py +++ b/qt_ui/windows/mission/flight/payload/propertycheckbox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QCheckBox +from PySide6.QtWidgets import QCheckBox from dcs.unitpropertydescription import UnitPropertyDescription from game.ato.flightmember import FlightMember diff --git a/qt_ui/windows/mission/flight/payload/propertycombobox.py b/qt_ui/windows/mission/flight/payload/propertycombobox.py index 08471b48..0d407982 100644 --- a/qt_ui/windows/mission/flight/payload/propertycombobox.py +++ b/qt_ui/windows/mission/flight/payload/propertycombobox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QComboBox +from PySide6.QtWidgets import QComboBox from dcs.unitpropertydescription import UnitPropertyDescription from game.ato.flightmember import FlightMember diff --git a/qt_ui/windows/mission/flight/payload/propertyeditor.py b/qt_ui/windows/mission/flight/payload/propertyeditor.py index 4ccbcd32..f4aa3d06 100644 --- a/qt_ui/windows/mission/flight/payload/propertyeditor.py +++ b/qt_ui/windows/mission/flight/payload/propertyeditor.py @@ -2,8 +2,8 @@ import itertools import logging from typing import Callable, Optional -from PySide2.QtCore import QRect -from PySide2.QtWidgets import QGridLayout, QLabel, QWidget +from PySide6.QtCore import QRect +from PySide6.QtWidgets import QGridLayout, QLabel, QWidget from dcs.unitpropertydescription import UnitPropertyDescription from game.ato import Flight 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/payload/propertyspinbox.py b/qt_ui/windows/mission/flight/payload/propertyspinbox.py index cd059608..f9a52913 100644 --- a/qt_ui/windows/mission/flight/payload/propertyspinbox.py +++ b/qt_ui/windows/mission/flight/payload/propertyspinbox.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QSpinBox +from PySide6.QtWidgets import QSpinBox from dcs.unitpropertydescription import UnitPropertyDescription from game.ato.flightmember import FlightMember diff --git a/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py b/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py index 31bc14db..6b3b3f59 100644 --- a/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py +++ b/qt_ui/windows/mission/flight/payload/weaponlasercodeselector.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QComboBox, QWidget +from PySide6.QtWidgets import QComboBox, QWidget from game import Game from game.ato.flightmember import FlightMember diff --git a/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py b/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py index 0f6e73c0..f3595222 100644 --- a/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py +++ b/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py @@ -1,8 +1,8 @@ import logging from datetime import timedelta -from PySide2.QtCore import QTime -from PySide2.QtWidgets import ( +from PySide6.QtCore import QTime +from PySide6.QtWidgets import ( QGroupBox, QLabel, QMessageBox, diff --git a/qt_ui/windows/mission/flight/settings/QCommsEditor.py b/qt_ui/windows/mission/flight/settings/QCommsEditor.py index 8c738561..8f06135b 100644 --- a/qt_ui/windows/mission/flight/settings/QCommsEditor.py +++ b/qt_ui/windows/mission/flight/settings/QCommsEditor.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QGroupBox, QVBoxLayout +from PySide6.QtWidgets import QGroupBox, QVBoxLayout from game.ato import Flight, FlightType from qt_ui.models import GameModel diff --git a/qt_ui/windows/mission/flight/settings/QCustomName.py b/qt_ui/windows/mission/flight/settings/QCustomName.py index bd614d0c..c90c7a5d 100644 --- a/qt_ui/windows/mission/flight/settings/QCustomName.py +++ b/qt_ui/windows/mission/flight/settings/QCustomName.py @@ -1,6 +1,7 @@ from typing import Optional -from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLineEdit, QLabel, QMessageBox +from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QLineEdit, QLabel, QMessageBox + 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 a2473e39..bd7f4426 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 658e51cc..81c42996 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 1c0187da..5d2484fa 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.ato.flight import Flight from qt_ui.models import PackageModel, GameModel diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py index 70b1b6d4..73435db2 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 228fb9d2..815e6197 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py @@ -1,4 +1,4 @@ -from PySide2.QtGui import QStandardItem, Qt +from PySide6.QtGui import QStandardItem, Qt 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 aee4e77d..167667b2 100644 --- a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py +++ b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py @@ -1,6 +1,6 @@ -from PySide2.QtCore import QItemSelectionModel, QPoint, QModelIndex -from PySide2.QtGui import QStandardItem, QStandardItemModel -from PySide2.QtWidgets import ( +from PySide6.QtCore import QItemSelectionModel, QPoint, QModelIndex +from PySide6.QtGui import QStandardItem, QStandardItemModel +from PySide6.QtWidgets import ( QHeaderView, QTableView, QStyledItemDelegate, @@ -76,7 +76,7 @@ class QFlightWaypointList(QTableView): finally: # stop ignoring signals self.model.blockSignals(False) - self.update() + self.update(self.currentIndex()) def _add_waypoint_row( self, row: int, flight: Flight, waypoint: FlightWaypoint diff --git a/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py b/qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py index f668dd06..78b76993 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, Qt, QModelIndex -from PySide2.QtWidgets import ( +from PySide6.QtCore import Signal, Qt, QModelIndex +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 33cb50a7..fd2740ba 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/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index cc8f2fc9..56e36418 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import logging -from PySide2 import QtGui, QtWidgets +from PySide6 import QtGui, QtWidgets from game.campaignloader.campaign import Campaign from game.dcs.aircrafttype import AircraftType diff --git a/qt_ui/windows/newgame/WizardPages/QFactionSelection.py b/qt_ui/windows/newgame/WizardPages/QFactionSelection.py index 4511a58f..dfe61cb7 100644 --- a/qt_ui/windows/newgame/WizardPages/QFactionSelection.py +++ b/qt_ui/windows/newgame/WizardPages/QFactionSelection.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from copy import deepcopy from typing import Union -from PySide2 import QtWidgets, QtGui -from PySide2.QtCore import Qt -from PySide2.QtWidgets import ( +from PySide6 import QtWidgets, QtGui +from PySide6.QtCore import Qt +from PySide6.QtWidgets import ( QScrollArea, QWidget, QGridLayout, diff --git a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py index 00b9c490..e7155a8f 100644 --- a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py +++ b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from datetime import timedelta -from PySide2 import QtWidgets, QtGui -from PySide2.QtCore import Qt -from PySide2.QtWidgets import QLabel, QVBoxLayout +from PySide6 import QtWidgets, QtGui +from PySide6.QtCore import Qt +from PySide6.QtWidgets import QLabel, QVBoxLayout from game.campaignloader import Campaign from game.campaignloader.campaign import DEFAULT_BUDGET diff --git a/qt_ui/windows/newgame/WizardPages/QNewGameSettings.py b/qt_ui/windows/newgame/WizardPages/QNewGameSettings.py index c5a5727f..ed2b8ee1 100644 --- a/qt_ui/windows/newgame/WizardPages/QNewGameSettings.py +++ b/qt_ui/windows/newgame/WizardPages/QNewGameSettings.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from PySide2 import QtWidgets, QtGui +from PySide6 import QtWidgets, QtGui from game.campaignloader import Campaign from game.settings import Settings diff --git a/qt_ui/windows/newgame/WizardPages/QTheaterConfiguration.py b/qt_ui/windows/newgame/WizardPages/QTheaterConfiguration.py index 8ebd2d6e..b4456700 100644 --- a/qt_ui/windows/newgame/WizardPages/QTheaterConfiguration.py +++ b/qt_ui/windows/newgame/WizardPages/QTheaterConfiguration.py @@ -3,10 +3,10 @@ from __future__ import unicode_literals, annotations from datetime import datetime from typing import List, Optional -from PySide2 import QtWidgets, QtGui -from PySide2.QtCore import Signal, QDate, QPoint, QItemSelectionModel, Qt, QModelIndex -from PySide2.QtGui import QStandardItem, QPixmap, QStandardItemModel -from PySide2.QtWidgets import ( +from PySide6 import QtWidgets, QtGui +from PySide6.QtCore import Signal, QDate, QPoint, QItemSelectionModel, Qt, QModelIndex +from PySide6.QtGui import QStandardItem, QPixmap, QStandardItemModel +from PySide6.QtWidgets import ( QCheckBox, QTextBrowser, QTextEdit, diff --git a/qt_ui/windows/notes/QNotesWindow.py b/qt_ui/windows/notes/QNotesWindow.py index 4726f5e9..d8d5bb3e 100644 --- a/qt_ui/windows/notes/QNotesWindow.py +++ b/qt_ui/windows/notes/QNotesWindow.py @@ -1,6 +1,6 @@ -from PySide2.QtCore import QTimer -from PySide2.QtGui import QTextCursor -from PySide2.QtWidgets import ( +from PySide6.QtCore import QTimer +from PySide6.QtGui import QTextCursor +from PySide6.QtWidgets import ( QDialog, QPlainTextEdit, QVBoxLayout, diff --git a/qt_ui/windows/preferences/QLiberationFirstStartWindow.py b/qt_ui/windows/preferences/QLiberationFirstStartWindow.py index 1077c0a8..844531a7 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 41edec47..2afa4a3c 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 1a2d2aa8..709e70df 100644 --- a/qt_ui/windows/preferences/QLiberationPreferencesWindow.py +++ b/qt_ui/windows/preferences/QLiberationPreferencesWindow.py @@ -1,5 +1,5 @@ -from PySide2.QtGui import QIcon -from PySide2.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout +from PySide6.QtGui import QIcon +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 42e0a31b..7e4e691f 100644 --- a/qt_ui/windows/settings/QSettingsWindow.py +++ b/qt_ui/windows/settings/QSettingsWindow.py @@ -4,10 +4,10 @@ import textwrap import zipfile from typing import Callable, Optional, Dict -from PySide2 import QtWidgets -from PySide2.QtCore import QItemSelectionModel, QPoint, QSize, Qt -from PySide2.QtGui import QStandardItem, QStandardItemModel -from PySide2.QtWidgets import ( +from PySide6 import QtWidgets +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 eccec28c..49868373 100644 --- a/qt_ui/windows/settings/plugins.py +++ b/qt_ui/windows/settings/plugins.py @@ -1,7 +1,7 @@ from typing import Dict, List -from PySide2.QtCore import Qt, QLocale -from PySide2.QtWidgets import ( +from PySide6.QtCore import Qt, QLocale +from PySide6.QtWidgets import ( QCheckBox, QGridLayout, QGroupBox, diff --git a/qt_ui/windows/stats/QAircraftChart.py b/qt_ui/windows/stats/QAircraftChart.py index 2da34020..0ec67d71 100644 --- a/qt_ui/windows/stats/QAircraftChart.py +++ b/qt_ui/windows/stats/QAircraftChart.py @@ -1,7 +1,7 @@ -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 e5b7763a..5f8b280c 100644 --- a/qt_ui/windows/stats/QArmorChart.py +++ b/qt_ui/windows/stats/QArmorChart.py @@ -1,7 +1,7 @@ -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 4a74bf9a..37c8b4fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,7 +38,9 @@ pyinstaller-hooks-contrib==2023.5 pyparsing==3.1.0 pyproj==3.6.0 pyshp==2.3.1 -PySide2==5.15.2.1 +PySide6==6.5.3 +PySide6-Addons==6.5.3 +PySide6-Essentials==6.5.3 pytest==7.4.0 pytest-cov==4.1.0 python-dateutil==2.8.2 @@ -46,7 +48,7 @@ python-dotenv==1.0.0 pywin32-ctypes==0.2.2 PyYAML==6.0 Shapely==2.0.1 -shiboken2==5.15.2.1 +shiboken6==6.5.3 six==1.16.0 sniffio==1.3.0 starlette==0.27.0