Move Flight and its related components out of gen.

qt_ui/dialogs.py

@@ -1,7 +1,7 @@
 """Application-wide dialog management."""
 from typing import Optional
 
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from game.theater.missiontarget import MissionTarget
 from .models import GameModel, PackageModel
 from .windows.mission.QEditFlightDialog import QEditFlightDialog

qt_ui/models.py

@@ -16,8 +16,10 @@ from game.game import Game
 from game.squadrons.squadron import Pilot, Squadron
 from game.theater.missiontarget import MissionTarget
 from game.transfers import TransferOrder, PendingTransfers
-from gen.ato import AirTaskingOrder, Package
-from gen.flights.flight import Flight, FlightType
+from game.ato.airtaaskingorder import AirTaskingOrder
+from game.ato.package import Package
+from game.ato.flighttype import FlightType
+from game.ato.flight import Flight
 from gen.flights.traveltime import TotEstimator
 from qt_ui.uiconstants import AIRCRAFT_ICONS
 

qt_ui/widgets/QTopPanel.py

@@ -14,7 +14,7 @@ from game import Game
 from game.event.airwar import AirWarEvent
 from game.profiling import logged_duration
 from game.utils import meters
-from gen.ato import Package
+from game.ato.package import Package
 from gen.flights.traveltime import TotEstimator
 from qt_ui.models import GameModel
 from qt_ui.widgets.QBudgetBox import QBudgetBox

qt_ui/widgets/ato.py

@@ -24,8 +24,8 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
 )
 
-from gen.ato import Package
-from gen.flights.flight import Flight
+from game.ato.package import Package
+from game.ato.flight import Flight
 from gen.flights.traveltime import TotEstimator
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from ..delegates import TwoColumnRowDelegate

qt_ui/widgets/combos/QAircraftTypeSelector.py

@@ -5,7 +5,7 @@ from PySide2.QtWidgets import QComboBox
 from dcs.unittype import FlyingType
 
 from gen.flights.ai_flight_planner_db import aircraft_for_task
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 
 
 class QAircraftTypeSelector(QComboBox):

qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py

@@ -4,7 +4,8 @@ from game import Game
 from game.theater import ControlPointType, BuildingGroundObject
 from game.utils import Distance
 from gen.conflictgen import Conflict
-from gen.flights.flight import FlightWaypoint, FlightWaypointType
+from game.ato.flightwaypointtype import FlightWaypointType
+from game.ato.flightwaypoint import FlightWaypoint
 from qt_ui.widgets.combos.QFilteredComboBox import QFilteredComboBox
 
 

qt_ui/widgets/map/mapmodel.py

@@ -32,8 +32,10 @@ from game.theater import (
 from game.threatzones import ThreatZones
 from game.transfers import MultiGroupTransport, TransportMap
 from game.utils import meters, nautical_miles
-from gen.ato import AirTaskingOrder
-from gen.flights.flight import Flight, FlightWaypoint, FlightWaypointType
+from game.ato.airtaaskingorder import AirTaskingOrder
+from game.ato.flightwaypointtype import FlightWaypointType
+from game.ato.flightwaypoint import FlightWaypoint
+from game.ato.flight import Flight
 from gen.flights.flightplan import (
     FlightPlan,
     PatrollingFlightPlan,

qt_ui/windows/AirWingConfigurationDialog.py

@@ -30,7 +30,7 @@ from game import Game
 from game.dcs.aircrafttype import AircraftType
 from game.squadrons import AirWing, Pilot, Squadron
 from game.theater import ControlPoint, ConflictTheater
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 from qt_ui.uiconstants import AIRCRAFT_ICONS
 
 

qt_ui/windows/AirWingDialog.py

@@ -19,7 +19,7 @@ from PySide2.QtWidgets import (
 
 from game.squadrons import Squadron
 from game.theater import ConflictTheater
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.delegates import TwoColumnRowDelegate
 from qt_ui.models import GameModel, AirWingModel, SquadronModel, AtoModel
 from qt_ui.windows.SquadronDialog import SquadronDialog

qt_ui/windows/QUnitInfoWindow.py

@@ -15,7 +15,7 @@ from game.dcs.aircrafttype import AircraftType
 from game.dcs.groundunittype import GroundUnitType
 from game.dcs.unittype import UnitType
 from game.game import Game
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 from qt_ui.uiconstants import AIRCRAFT_BANNERS, VEHICLE_BANNERS
 
 

qt_ui/windows/SquadronDialog.py

@@ -21,7 +21,7 @@ from PySide2.QtWidgets import (
 
 from game.squadrons import Pilot, Squadron
 from game.theater import ControlPoint, ConflictTheater
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 from qt_ui.delegates import TwoColumnRowDelegate
 from qt_ui.errorreporter import report_errors
 from qt_ui.models import SquadronModel, AtoModel

qt_ui/windows/basemenu/QBaseMenu2.py

@@ -17,7 +17,7 @@ from game.theater import (
     FREE_FRONTLINE_UNIT_SUPPLY,
     AMMO_DEPOT_FRONTLINE_UNIT_CONTRIBUTION,
 )
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 from qt_ui.dialogs import Dialog
 from qt_ui.models import GameModel
 from qt_ui.uiconstants import EVENT_ICONS

qt_ui/windows/mission/QEditFlightDialog.py

@@ -4,7 +4,7 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
 )
 
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.models import GameModel, PackageModel
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal

qt_ui/windows/mission/QFlightItem.py

@@ -1,7 +1,7 @@
 from PySide2.QtGui import QStandardItem, QIcon
 
-from gen.ato import Package
-from gen.flights.flight import Flight
+from game.ato.package import Package
+from game.ato.flight import Flight
 from gen.flights.traveltime import TotEstimator
 from qt_ui.uiconstants import AIRCRAFT_ICONS
 

qt_ui/windows/mission/QPackageDialog.py

@@ -17,8 +17,8 @@ from PySide2.QtWidgets import (
 
 from game.game import Game
 from game.theater.missiontarget import MissionTarget
-from gen.ato import Package
-from gen.flights.flight import Flight
+from game.ato.package import Package
+from game.ato.flight import Flight
 from gen.flights.flightplan import FlightPlanBuilder, PlanningError
 from qt_ui.models import AtoModel, GameModel, PackageModel
 from qt_ui.uiconstants import EVENT_ICONS

qt_ui/windows/mission/flight/QFlightCreator.py

@@ -16,8 +16,9 @@ from dcs.unittype import FlyingType
 from game import Game
 from game.squadrons.squadron import Squadron
 from game.theater import ControlPoint, OffMapSpawn
-from gen.ato import Package
-from gen.flights.flight import Flight, FlightRoster
+from game.ato.package import Package
+from game.ato.flightroster import FlightRoster
+from game.ato.flight import Flight
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.widgets.QFlightSizeSpinner import QFlightSizeSpinner
 from qt_ui.widgets.QLabeledWidget import QLabeledWidget

qt_ui/windows/mission/flight/QFlightPlanner.py

@@ -1,7 +1,7 @@
 from PySide2.QtWidgets import QTabWidget
 
 from game import Game
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.models import PackageModel
 from qt_ui.windows.mission.flight.payload.QFlightPayloadTab import QFlightPayloadTab
 from qt_ui.windows.mission.flight.settings.QGeneralFlightSettingsTab import (

qt_ui/windows/mission/flight/SquadronSelector.py

@@ -5,7 +5,7 @@ from PySide2.QtWidgets import QComboBox
 
 from game.dcs.aircrafttype import AircraftType
 from game.squadrons.airwing import AirWing
-from gen.flights.flight import FlightType
+from game.ato.flighttype import FlightType
 
 
 class SquadronSelector(QComboBox):

qt_ui/windows/mission/flight/payload/QFlightPayloadTab.py

@@ -2,7 +2,7 @@ from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QFrame, QLabel, QComboBox, QVBoxLayout
 
 from game import Game
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from gen.flights.loadouts import Loadout
 from qt_ui.windows.mission.flight.payload.QLoadoutEditor import QLoadoutEditor
 

qt_ui/windows/mission/flight/payload/QLoadoutEditor.py

@@ -8,7 +8,7 @@ from PySide2.QtWidgets import (
 
 from game import Game
 from game.data.weapons import Pylon
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.windows.mission.flight.payload.QPylonEditor import QPylonEditor
 
 

qt_ui/windows/mission/flight/payload/QPylonEditor.py

@@ -6,7 +6,7 @@ from PySide2.QtWidgets import QComboBox
 
 from game import Game
 from game.data.weapons import Pylon, Weapon
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from gen.flights.loadouts import Loadout
 
 

qt_ui/windows/mission/flight/settings/FlightAirfieldDisplay.py

@@ -3,7 +3,7 @@ import logging
 from PySide2.QtWidgets import QGroupBox, QLabel, QMessageBox, QVBoxLayout
 
 from game import Game
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from gen.flights.flightplan import FlightPlanBuilder, PlanningError
 from gen.flights.traveltime import TotEstimator
 from qt_ui.models import PackageModel

qt_ui/windows/mission/flight/settings/QCustomName.py

@@ -1,6 +1,6 @@
 from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel
 
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 
 
 class QFlightCustomName(QGroupBox):

qt_ui/windows/mission/flight/settings/QFlightSlotEditor.py

@@ -15,7 +15,8 @@ from PySide2.QtWidgets import (
 
 from game import Game
 from game.squadrons.pilot import Pilot
-from gen.flights.flight import Flight, FlightRoster
+from game.ato.flightroster import FlightRoster
+from game.ato.flight import Flight
 from qt_ui.models import PackageModel
 
 

qt_ui/windows/mission/flight/settings/QFlightStartType.py

@@ -6,7 +6,7 @@ from PySide2.QtWidgets import (
     QVBoxLayout,
 )
 
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.models import PackageModel
 
 

qt_ui/windows/mission/flight/settings/QGeneralFlightSettingsTab.py

@@ -2,7 +2,7 @@ from PySide2.QtCore import Signal
 from PySide2.QtWidgets import QFrame, QGridLayout, QVBoxLayout
 
 from game import Game
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.models import PackageModel
 from qt_ui.windows.mission.flight.settings.FlightAirfieldDisplay import (
     FlightAirfieldDisplay,

qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py

@@ -1,6 +1,6 @@
 from PySide2.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QVBoxLayout
 
-from gen.flights.flight import FlightWaypoint
+from game.ato.flightwaypoint import FlightWaypoint
 
 
 class QFlightWaypointInfoBox(QGroupBox):

qt_ui/windows/mission/flight/waypoints/QFlightWaypointItem.py

@@ -2,7 +2,7 @@ from typing import List
 
 from PySide2.QtGui import QStandardItem
 
-from gen.flights.flight import FlightWaypoint
+from game.ato.flightwaypoint import FlightWaypoint
 
 
 class QWaypointItem(QStandardItem):

qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py

@@ -4,8 +4,10 @@ from PySide2.QtCore import QItemSelectionModel, QPoint
 from PySide2.QtGui import QStandardItem, QStandardItemModel
 from PySide2.QtWidgets import QHeaderView, QTableView
 
-from gen.ato import Package
-from gen.flights.flight import Flight, FlightWaypoint, FlightWaypointType
+from game.ato.package import Package
+from game.ato.flightwaypointtype import FlightWaypointType
+from game.ato.flightwaypoint import FlightWaypoint
+from game.ato.flight import Flight
 from qt_ui.windows.mission.flight.waypoints.QFlightWaypointItem import QWaypointItem
 
 

qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py

@@ -12,8 +12,10 @@ from PySide2.QtWidgets import (
 )
 
 from game import Game
-from gen.ato import Package
-from gen.flights.flight import Flight, FlightType, FlightWaypoint
+from game.ato.package import Package
+from game.ato.flighttype import FlightType
+from game.ato.flightwaypoint import FlightWaypoint
+from game.ato.flight import Flight
 from gen.flights.flightplan import (
     CustomFlightPlan,
     FlightPlanBuilder,

qt_ui/windows/mission/flight/waypoints/QPredefinedWaypointSelectionWindow.py

@@ -9,7 +9,7 @@ from PySide2.QtWidgets import (
 )
 
 from game import Game
-from gen.flights.flight import Flight
+from game.ato.flight import Flight
 from qt_ui.uiconstants import EVENT_ICONS
 from qt_ui.widgets.combos.QPredefinedWaypointSelectionComboBox import (
     QPredefinedWaypointSelectionComboBox,