weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Print weapons with their pretty name in loadout editor

Browse Source
This commit is contained in:
Khopa 2019-10-20 01:54:33 +02:00
parent 9f319ab99a
commit adf1f8db8c
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt_ui/windows/mission/QMissionPlanning.py
View File

@ -39,7 +39,10 @@ class QMissionPlanning(QDialog):
self.planned_flight_view.selectionModel().setCurrentIndex(self.planned_flight_view.indexAt(QPoint(1, 1)), QItemSelectionModel.Select) self.planned_flight_view.selectionModel().setCurrentIndex(self.planned_flight_view.indexAt(QPoint(1, 1)), QItemSelectionModel.Select)
self.planned_flight_view.selectionModel().selectionChanged.connect(self.on_flight_selection_change) self.planned_flight_view.selectionModel().selectionChanged.connect(self.on_flight_selection_change)
self.flight_planner = QFlightPlanner(self.planned_flight_view.flight_planner.flights[0], self.game) if len(self.planned_flight_view.flight_planner.flights) > 0:
self.flight_planner = QFlightPlanner(self.planned_flight_view.flight_planner.flights[0], self.game)
else:
self.flight_planner = QFlightPlanner(None, self.game)
self.mission_start_button = QPushButton("Take Off") self.mission_start_button = QPushButton("Take Off")
self.mission_start_button.setProperty("style", "start-button") self.mission_start_button.setProperty("style", "start-button")

21
qt_ui/windows/mission/flight/QFlightPlanner.py
View File

@ -1,4 +1,4 @@
from PySide2.QtWidgets import QTabWidget from PySide2.QtWidgets import QTabWidget, QFrame, QGridLayout, QLabel
from gen.flights.flight import Flight from gen.flights.flight import Flight
from game import Game from game import Game
@ -11,9 +11,16 @@ class QFlightPlanner(QTabWidget):
def __init__(self, flight: Flight, game: Game): def __init__(self, flight: Flight, game: Game):
super(QFlightPlanner, self).__init__() super(QFlightPlanner, self).__init__()
self.general_settings_tab = QGeneralFlightSettingsTab(flight, game) if flight:
self.payload_tab = QFlightPayloadTab(flight, game) self.general_settings_tab = QGeneralFlightSettingsTab(flight, game)
self.waypoint_tab = QFlightWaypointTab(flight) self.payload_tab = QFlightPayloadTab(flight, game)
self.addTab(self.general_settings_tab, "General Flight settings") self.waypoint_tab = QFlightWaypointTab(flight)
self.addTab(self.payload_tab, "Payload") self.addTab(self.general_settings_tab, "General Flight settings")
self.addTab(self.waypoint_tab, "Waypoints") self.addTab(self.payload_tab, "Payload")
self.addTab(self.waypoint_tab, "Waypoints")
else:
tabError = QFrame()
l = QGridLayout()
l.addWidget(QLabel("No flight selected"))
tabError.setLayout(l)
self.addTab(tabError, "No flight")

11
qt_ui/windows/mission/flight/payload/QPylonEditor.py
View File

@ -11,14 +11,14 @@ class QPylonEditor(QComboBox):
self.pylon_number = pylon_number self.pylon_number = pylon_number
self.flight = flight self.flight = flight
possible_loadout = [i for i in self.pylon.__dict__.keys() if i[:1] != '_'] self.possible_loadout = [i for i in self.pylon.__dict__.keys() if i[:1] != '_']
if not str(self.pylon_number) in self.flight.loadout.keys(): if not str(self.pylon_number) in self.flight.loadout.keys():
self.flight.loadout[str(self.pylon_number)] = "" self.flight.loadout[str(self.pylon_number)] = ""
self.addItem("None") self.addItem("None")
for i,k in enumerate(possible_loadout): for i,k in enumerate(self.possible_loadout):
self.addItem(str(k)) self.addItem(str(self.pylon.__dict__[k][1]["name"]))
if self.flight.loadout[str(self.pylon_number)] == str(k): if self.flight.loadout[str(self.pylon_number)] == str(k):
self.setCurrentIndex(i + 1) self.setCurrentIndex(i + 1)
@ -31,5 +31,8 @@ class QPylonEditor(QComboBox):
self.flight.loadout[str(self.pylon_number)] = "" self.flight.loadout[str(self.pylon_number)] = ""
else: else:
logging.info("Pylon " + str(self.pylon_number) + " changed to " + selected) logging.info("Pylon " + str(self.pylon_number) + " changed to " + selected)
self.flight.loadout[str(self.pylon_number)] = selected for i, k in enumerate(self.possible_loadout):
if selected == str(self.pylon.__dict__[k][1]["name"]):
self.flight.loadout[str(self.pylon_number)] = str(k)
break