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

Add support for running the build react map.

Browse Source 
https://github.com/dcs-liberation/dcs_liberation/issues/2039
This commit is contained in:
Dan Albert
2022-03-06 00:47:40 -08:00
parent 3c9acea31c
commit 8165d3bd8c
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qt_ui/main.py
View File

@@ -152,7 +152,7 @@ def run_ui(game: Optional[Game], new_map: bool, dev: bool) -> None:
GameUpdateSignal.get_instance().game_loaded.connect(on_game_load)
# Start window
window = QLiberationWindow(game, new_map)
window = QLiberationWindow(game, new_map, dev)
window.showMaximized()
splash.finish(window)
qt_execution_code = app.exec_()

6
qt_ui/widgets/map/QLiberationMap.py
View File

@@ -36,7 +36,7 @@ class LoggingWebPage(QWebEnginePage):
class QLiberationMap(QWebEngineView):
def __init__(self, game_model: GameModel, new_map: bool, parent) -> None:
def __init__(self, game_model: GameModel, new_map: bool, dev: bool, parent) -> None:
super().__init__(parent)
self.game_model = game_model
self.setMinimumSize(800, 600)
@@ -53,8 +53,10 @@ class QLiberationMap(QWebEngineView):
)
self.page.setWebChannel(self.channel)
if new_map:
if new_map and dev:
url = QUrl("http://localhost:3000")
elif new_map:
url = QUrl.fromLocalFile(str(Path("client/build/index.html").resolve()))
else:
url = QUrl.fromLocalFile(
str(Path("resources/ui/map/canvas.html").resolve())

4
qt_ui/windows/QLiberationWindow.py
View File

@@ -54,7 +54,7 @@ class QLiberationWindow(QMainWindow):
tgo_info_signal = Signal(TheaterGroundObject)
control_point_info_signal = Signal(ControlPoint)
def __init__(self, game: Optional[Game], new_map: bool) -> None:
def __init__(self, game: Optional[Game], new_map: bool, dev: bool) -> None:
super().__init__()
self._uncaught_exception_handler = UncaughtExceptionHandler(self)
@@ -79,7 +79,7 @@ class QLiberationWindow(QMainWindow):
Dialog.set_game(self.game_model)
self.ato_panel = QAirTaskingOrderPanel(self.game_model)
self.info_panel = QInfoPanel(self.game)
self.liberation_map = QLiberationMap(self.game_model, new_map, self)
self.liberation_map = QLiberationMap(self.game_model, new_map, dev, self)
self.setGeometry(300, 100, 270, 100)
self.updateWindowTitle()