mirror of
https://github.com/dcs-retribution/dcs-retribution.git
synced 2025-11-10 15:41:24 +00:00
Revert upgrade to pyside6.
This appears to be incompatible with pyinstaller. I get the following when trying to run the executable generated with pyside6: ``` Traceback (most recent call last): File "qt_ui\main.py", line 29, in <module> File "PyInstaller\loader\pyimod03_importers.py", line 476, in exec_module File "qt_ui\windows\QLiberationWindow.py", line 28, in <module> File "PyInstaller\loader\pyimod03_importers.py", line 476, in exec_module File "qt_ui\widgets\map\QLiberationMap.py", line 11, in <module> ImportError: could not import module 'PySide6.QtPrintSupport' ```
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from typing import Callable, Iterable, Optional
|
||||
|
||||
from PySide6.QtCore import (
|
||||
from PySide2.QtCore import (
|
||||
QItemSelection,
|
||||
QItemSelectionModel,
|
||||
QModelIndex,
|
||||
@@ -8,9 +8,8 @@ from PySide6.QtCore import (
|
||||
Qt,
|
||||
Signal,
|
||||
)
|
||||
from PySide6.QtGui import QIcon, QStandardItem, QStandardItemModel
|
||||
from PySide6.QtWidgets import (
|
||||
QCheckBox,
|
||||
from PySide2.QtGui import QIcon, QStandardItem, QStandardItemModel
|
||||
from PySide2.QtWidgets import (
|
||||
QComboBox,
|
||||
QDialog,
|
||||
QGroupBox,
|
||||
|
||||
@@ -3,8 +3,8 @@ from __future__ import annotations
|
||||
from dataclasses import dataclass
|
||||
from typing import Optional, Iterator
|
||||
|
||||
from PySide6.QtCore import QItemSelectionModel, QModelIndex, QSize
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import QItemSelectionModel, QModelIndex, QSize
|
||||
from PySide2.QtWidgets import (
|
||||
QAbstractItemView,
|
||||
QCheckBox,
|
||||
QDialog,
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import annotations
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtCore import QObject, Signal
|
||||
from PySide2.QtCore import QObject, Signal
|
||||
|
||||
from game import Game
|
||||
from game.debriefing import Debriefing
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
from PySide6.QtCore import (
|
||||
from PySide2.QtCore import (
|
||||
QItemSelection,
|
||||
QItemSelectionModel,
|
||||
QModelIndex,
|
||||
Qt,
|
||||
)
|
||||
from PySide6.QtGui import QAction, QContextMenuEvent
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtGui import QContextMenuEvent
|
||||
from PySide2.QtWidgets import (
|
||||
QAbstractItemView,
|
||||
QAction,
|
||||
QDialog,
|
||||
QHBoxLayout,
|
||||
QListView,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import logging
|
||||
from typing import Callable, Dict, TypeVar
|
||||
|
||||
from PySide6.QtGui import QIcon, QPixmap
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtGui import QIcon, QPixmap
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QGridLayout,
|
||||
QGroupBox,
|
||||
|
||||
@@ -3,9 +3,12 @@ import traceback
|
||||
import webbrowser
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtGui import QAction, QActionGroup, QCloseEvent, QGuiApplication, QIcon
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtGui import QCloseEvent, QIcon
|
||||
from PySide2.QtWidgets import (
|
||||
QAction,
|
||||
QActionGroup,
|
||||
QDesktopWidget,
|
||||
QFileDialog,
|
||||
QMainWindow,
|
||||
QMessageBox,
|
||||
@@ -64,7 +67,7 @@ class QLiberationWindow(QMainWindow):
|
||||
self.initMenuBar()
|
||||
self.connectSignals()
|
||||
|
||||
screen = QGuiApplication.primaryScreen().availableSize()
|
||||
screen = QDesktopWidget().screenGeometry()
|
||||
self.setGeometry(0, 0, screen.width(), screen.height())
|
||||
self.setWindowState(Qt.WindowMaximized)
|
||||
|
||||
@@ -97,7 +100,7 @@ class QLiberationWindow(QMainWindow):
|
||||
vbox.setSizes([600, 100])
|
||||
|
||||
vbox = QVBoxLayout()
|
||||
vbox.setContentsMargins(0, 0, 0, 0)
|
||||
vbox.setMargin(0)
|
||||
vbox.addWidget(QTopPanel(self.game_model, self.sim_controller))
|
||||
vbox.addWidget(hbox)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtGui import QIcon
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtGui import QIcon
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QGridLayout,
|
||||
QLabel,
|
||||
|
||||
@@ -5,10 +5,10 @@ import os
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from PySide6 import QtCore
|
||||
from PySide6.QtCore import QObject, Signal
|
||||
from PySide6.QtGui import QIcon, QMovie, QPixmap
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2 import QtCore
|
||||
from PySide2.QtCore import QObject, Signal
|
||||
from PySide2.QtGui import QIcon, QMovie, QPixmap
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QFileDialog,
|
||||
QGridLayout,
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import logging
|
||||
from typing import Callable, Iterator, Optional
|
||||
|
||||
from PySide6.QtCore import (
|
||||
from PySide2.QtCore import (
|
||||
QItemSelectionModel,
|
||||
QModelIndex,
|
||||
Qt,
|
||||
QItemSelection,
|
||||
)
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QAbstractItemView,
|
||||
QDialog,
|
||||
QListView,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QFrame,
|
||||
QGridLayout,
|
||||
QGroupBox,
|
||||
|
||||
@@ -4,8 +4,8 @@ import logging
|
||||
from collections import defaultdict
|
||||
from typing import Callable, Dict, Type
|
||||
|
||||
from PySide6.QtCore import Qt, Signal
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt, Signal
|
||||
from PySide2.QtWidgets import (
|
||||
QComboBox,
|
||||
QDialog,
|
||||
QFrame,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtGui import QCloseEvent, QPixmap
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtGui import QCloseEvent, QPixmap
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QHBoxLayout,
|
||||
QLabel,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QTabWidget
|
||||
from PySide2.QtWidgets import QTabWidget
|
||||
|
||||
from game.theater import ControlPoint, Fob
|
||||
from qt_ui.models import GameModel
|
||||
|
||||
@@ -4,8 +4,8 @@ import logging
|
||||
from enum import Enum
|
||||
from typing import Generic, TypeVar
|
||||
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QApplication,
|
||||
QFrame,
|
||||
QGridLayout,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from typing import Set
|
||||
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QGridLayout,
|
||||
QHBoxLayout,
|
||||
QLabel,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QFrame, QGroupBox, QHBoxLayout, QVBoxLayout
|
||||
from PySide2.QtWidgets import QFrame, QGroupBox, QHBoxLayout, QVBoxLayout
|
||||
|
||||
from game.theater import ControlPoint
|
||||
from qt_ui.models import GameModel
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import QGridLayout, QScrollArea, QVBoxLayout, QWidget
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import QGridLayout, QScrollArea, QVBoxLayout, QWidget
|
||||
|
||||
from game.dcs.groundunittype import GroundUnitType
|
||||
from game.theater import ControlPoint
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QFrame, QGridLayout
|
||||
from PySide2.QtWidgets import QFrame, QGridLayout
|
||||
|
||||
from game.theater import ControlPoint
|
||||
from qt_ui.models import GameModel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from collections.abc import Callable
|
||||
|
||||
from PySide6.QtWidgets import QGroupBox, QLabel, QPushButton, QVBoxLayout
|
||||
from PySide2.QtWidgets import QGroupBox, QLabel, QPushButton, QVBoxLayout
|
||||
|
||||
from game import Game
|
||||
from game.theater import ControlPoint
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QComboBox
|
||||
from PySide2.QtWidgets import QComboBox
|
||||
|
||||
from game.theater import CombatStance, ControlPoint
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from collections import defaultdict
|
||||
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QFrame,
|
||||
QGridLayout,
|
||||
QGroupBox,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import itertools
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QFrame,
|
||||
QGridLayout,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import os
|
||||
|
||||
from PySide6.QtGui import QPixmap
|
||||
from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QVBoxLayout, QLabel
|
||||
from PySide2.QtGui import QPixmap
|
||||
from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QVBoxLayout, QLabel
|
||||
from game.db import REWARDS
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import logging
|
||||
from typing import List, Optional
|
||||
|
||||
from PySide6.QtGui import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtGui import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QComboBox,
|
||||
QDialog,
|
||||
QGridLayout,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtGui import QStandardItem
|
||||
from PySide2.QtGui import QStandardItem
|
||||
|
||||
from game.infos.information import Information
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from PySide6.QtCore import QItemSelectionModel, QPoint
|
||||
from PySide6.QtGui import QStandardItemModel
|
||||
from PySide6.QtWidgets import QListView
|
||||
from PySide2.QtCore import QItemSelectionModel, QPoint
|
||||
from PySide2.QtGui import QStandardItemModel
|
||||
from PySide2.QtWidgets import QListView
|
||||
|
||||
from game import Game, game
|
||||
from qt_ui.windows.infos.QInfoItem import QInfoItem
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QFrame, QVBoxLayout, QLabel, QGroupBox
|
||||
from PySide2.QtWidgets import QFrame, QVBoxLayout, QLabel, QGroupBox
|
||||
|
||||
from game import Game
|
||||
from qt_ui.windows.infos.QInfoList import QInfoList
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QFrame, QLabel, QGridLayout
|
||||
from PySide2.QtWidgets import QFrame, QLabel, QGridLayout
|
||||
|
||||
from game.infos.information import Information
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import itertools
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QCheckBox,
|
||||
QDialog,
|
||||
QFrame,
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import logging
|
||||
import typing
|
||||
|
||||
from PySide6.QtCore import Signal
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Signal
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QPlainTextEdit,
|
||||
QVBoxLayout,
|
||||
QPushButton,
|
||||
)
|
||||
from PySide6.QtGui import QTextCursor, QIcon
|
||||
from PySide2.QtGui import QTextCursor, QIcon
|
||||
|
||||
from qt_ui.logging_handler import HookableInMemoryHandler
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
"""Dialog window for editing flights."""
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QVBoxLayout,
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtGui import QStandardItem, QIcon
|
||||
from PySide2.QtGui import QStandardItem, QIcon
|
||||
|
||||
from game.ato.package import Package
|
||||
from game.ato.flight import Flight
|
||||
|
||||
@@ -3,8 +3,8 @@ import logging
|
||||
from datetime import timedelta
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtCore import QItemSelection, QTime, Qt, Signal
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import QItemSelection, QTime, Qt, Signal
|
||||
from PySide2.QtWidgets import (
|
||||
QCheckBox,
|
||||
QDialog,
|
||||
QHBoxLayout,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from datetime import timedelta
|
||||
|
||||
from PySide6.QtCore import QItemSelectionModel, QSize
|
||||
from PySide6.QtGui import QStandardItemModel
|
||||
from PySide6.QtWidgets import QAbstractItemView, QListView
|
||||
from PySide2.QtCore import QItemSelectionModel, QSize
|
||||
from PySide2.QtGui import QStandardItemModel
|
||||
from PySide2.QtWidgets import QAbstractItemView, QListView
|
||||
|
||||
from qt_ui.models import GameModel
|
||||
from qt_ui.windows.mission.QFlightItem import QFlightItem
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from typing import Optional, Type
|
||||
|
||||
from PySide6.QtCore import Qt, Signal
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt, Signal
|
||||
from PySide2.QtWidgets import (
|
||||
QComboBox,
|
||||
QDialog,
|
||||
QLabel,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QTabWidget
|
||||
from PySide2.QtWidgets import QTabWidget
|
||||
|
||||
from game import Game
|
||||
from game.ato.flight import Flight
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""Combo box for selecting squadrons."""
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtWidgets import QComboBox
|
||||
from PySide2.QtWidgets import QComboBox
|
||||
|
||||
from game.dcs.aircrafttype import AircraftType
|
||||
from game.squadrons.airwing import AirWing
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import QFrame, QLabel, QComboBox, QVBoxLayout
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import QFrame, QLabel, QComboBox, QVBoxLayout
|
||||
|
||||
from game import Game
|
||||
from game.ato.flight import Flight
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QGridLayout,
|
||||
QGroupBox,
|
||||
QLabel,
|
||||
|
||||
@@ -2,7 +2,7 @@ import logging
|
||||
import operator
|
||||
from typing import Optional
|
||||
|
||||
from PySide6.QtWidgets import QComboBox
|
||||
from PySide2.QtWidgets import QComboBox
|
||||
|
||||
from game import Game
|
||||
from game.data.weapons import Pylon, Weapon
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import logging
|
||||
|
||||
from PySide6.QtWidgets import QGroupBox, QLabel, QMessageBox, QVBoxLayout
|
||||
from PySide2.QtWidgets import QGroupBox, QLabel, QMessageBox, QVBoxLayout
|
||||
|
||||
from game import Game
|
||||
from game.ato.flight import Flight
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QLabel
|
||||
from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel
|
||||
|
||||
from game.ato.flight import Flight
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import logging
|
||||
from typing import Optional, Callable
|
||||
|
||||
from PySide6.QtCore import Signal, QModelIndex
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Signal, QModelIndex
|
||||
from PySide2.QtWidgets import (
|
||||
QLabel,
|
||||
QGroupBox,
|
||||
QSpinBox,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QComboBox,
|
||||
QGroupBox,
|
||||
QHBoxLayout,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QLabel, QGroupBox, QGridLayout
|
||||
from PySide2.QtWidgets import QLabel, QGroupBox, QGridLayout
|
||||
|
||||
from qt_ui.uiconstants import AIRCRAFT_ICONS
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtCore import Signal
|
||||
from PySide6.QtWidgets import QFrame, QGridLayout, QVBoxLayout
|
||||
from PySide2.QtCore import Signal
|
||||
from PySide2.QtWidgets import QFrame, QGridLayout, QVBoxLayout
|
||||
|
||||
from game import Game
|
||||
from game.ato.flight import Flight
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout
|
||||
from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout
|
||||
|
||||
from game.ato.flightwaypoint import FlightWaypoint
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from typing import List
|
||||
|
||||
from PySide6.QtGui import QStandardItem
|
||||
from PySide2.QtGui import QStandardItem
|
||||
|
||||
from game.ato.flightwaypoint import FlightWaypoint
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from datetime import timedelta
|
||||
|
||||
from PySide6.QtCore import QItemSelectionModel, QPoint
|
||||
from PySide6.QtGui import QStandardItem, QStandardItemModel
|
||||
from PySide6.QtWidgets import QHeaderView, QTableView
|
||||
from PySide2.QtCore import QItemSelectionModel, QPoint
|
||||
from PySide2.QtGui import QStandardItem, QStandardItemModel
|
||||
from PySide2.QtWidgets import QHeaderView, QTableView
|
||||
|
||||
from game.ato.package import Package
|
||||
from game.ato.flightwaypointtype import FlightWaypointType
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import logging
|
||||
from typing import Iterable, List, Optional
|
||||
|
||||
from PySide6.QtCore import Signal
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Signal
|
||||
from PySide2.QtWidgets import (
|
||||
QFrame,
|
||||
QGridLayout,
|
||||
QLabel,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtCore import Qt, Signal
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt, Signal
|
||||
from PySide2.QtWidgets import (
|
||||
QCheckBox,
|
||||
QDialog,
|
||||
QHBoxLayout,
|
||||
|
||||
@@ -2,10 +2,10 @@ from __future__ import annotations
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from PySide6 import QtGui
|
||||
from PySide6.QtCore import QItemSelectionModel, QModelIndex, Qt
|
||||
from PySide6.QtGui import QStandardItem, QStandardItemModel
|
||||
from PySide6.QtWidgets import QAbstractItemView, QListView
|
||||
from PySide2 import QtGui
|
||||
from PySide2.QtCore import QItemSelectionModel, QModelIndex, Qt
|
||||
from PySide2.QtGui import QStandardItem, QStandardItemModel
|
||||
from PySide2.QtWidgets import QAbstractItemView, QListView
|
||||
|
||||
import qt_ui.uiconstants as CONST
|
||||
from game.campaignloader.campaign import Campaign
|
||||
|
||||
@@ -4,9 +4,9 @@ import logging
|
||||
from datetime import timedelta
|
||||
from typing import List
|
||||
|
||||
from PySide6 import QtGui, QtWidgets
|
||||
from PySide6.QtCore import QDate, QItemSelectionModel, QPoint, Qt
|
||||
from PySide6.QtWidgets import QCheckBox, QLabel, QTextEdit, QVBoxLayout
|
||||
from PySide2 import QtGui, QtWidgets
|
||||
from PySide2.QtCore import QDate, QItemSelectionModel, QPoint, Qt
|
||||
from PySide2.QtWidgets import QCheckBox, QLabel, QTextEdit, QVBoxLayout
|
||||
from jinja2 import Environment, FileSystemLoader, select_autoescape
|
||||
|
||||
from game import db
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QPlainTextEdit,
|
||||
QVBoxLayout,
|
||||
@@ -6,8 +6,8 @@ from PySide6.QtWidgets import (
|
||||
QPushButton,
|
||||
QLabel,
|
||||
)
|
||||
from PySide6.QtGui import QTextCursor
|
||||
from PySide6.QtCore import QTimer
|
||||
from PySide2.QtGui import QTextCursor
|
||||
from PySide2.QtCore import QTimer
|
||||
|
||||
import qt_ui.uiconstants as CONST
|
||||
from game.game import Game
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtGui import QIcon, Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtGui import QIcon, Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QDialog,
|
||||
QVBoxLayout,
|
||||
QPushButton,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import os
|
||||
|
||||
from PySide6.QtGui import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtGui import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QComboBox,
|
||||
QFileDialog,
|
||||
QFrame,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtGui import QIcon, Qt
|
||||
from PySide6.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout
|
||||
from PySide2.QtGui import QIcon, Qt
|
||||
from PySide2.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout
|
||||
|
||||
from qt_ui.windows.preferences.QLiberationPreferences import QLiberationPreferences
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@ import logging
|
||||
import textwrap
|
||||
from typing import Callable
|
||||
|
||||
from PySide6.QtCore import QItemSelectionModel, QPoint, QSize, Qt
|
||||
from PySide6.QtGui import QStandardItem, QStandardItemModel
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import QItemSelectionModel, QPoint, QSize, Qt
|
||||
from PySide2.QtGui import QStandardItem, QStandardItemModel
|
||||
from PySide2.QtWidgets import (
|
||||
QAbstractItemView,
|
||||
QCheckBox,
|
||||
QComboBox,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from PySide6.QtCore import Qt
|
||||
from PySide6.QtWidgets import (
|
||||
from PySide2.QtCore import Qt
|
||||
from PySide2.QtWidgets import (
|
||||
QCheckBox,
|
||||
QGridLayout,
|
||||
QGroupBox,
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
from PySide6 import QtCharts
|
||||
from PySide6.QtCore import QPoint, Qt
|
||||
from PySide6.QtGui import QPainter
|
||||
from PySide6.QtWidgets import QFrame, QGridLayout
|
||||
|
||||
from PySide2.QtCharts import QtCharts
|
||||
from PySide2.QtCore import QPoint, Qt
|
||||
from PySide2.QtGui import QPainter
|
||||
from PySide2.QtWidgets import QFrame, QGridLayout
|
||||
from game import Game
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
from PySide6 import QtCharts
|
||||
from PySide6.QtCore import QPoint, Qt
|
||||
from PySide6.QtGui import QPainter
|
||||
from PySide6.QtWidgets import QFrame, QGridLayout
|
||||
|
||||
from PySide2.QtCharts import QtCharts
|
||||
from PySide2.QtCore import QPoint, Qt
|
||||
from PySide2.QtGui import QPainter
|
||||
from PySide2.QtWidgets import QFrame, QGridLayout
|
||||
from game import Game
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide6.QtWidgets import QDialog, QGridLayout, QTabWidget
|
||||
from PySide2.QtWidgets import QDialog, QGridLayout, QTabWidget
|
||||
|
||||
import qt_ui.uiconstants as CONST
|
||||
from game.game import Game
|
||||
|
||||
Reference in New Issue
Block a user