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

Inject the saved games path from preferences.

Browse Source 
pydcs can't guess the saved games path accurately for all users, so
inject the path that they've told us is correct to work around that.

It seems pydcs has two problems:

1. Only `DCS` is checked, not `DCS.openbeta`.
2. Only `%USERPROFILE%/Saved Games` is used, so if the user has moved
   their Saved Games directory (but not their whole user profile) pydcs
   cannot find the location.

https://docs.microsoft.com/en-us/windows/win32/shell/knownfolderid would
be the starting place for fixing problem 2 properly. 1 is just a matter
of trying both.
This commit is contained in:
Dan Albert 2021-05-25 13:13:21 -07:00
parent 6fa0a29249
commit e49da6afd6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt_ui/main.py
View File

@ -6,10 +6,10 @@ from datetime import datetime
from pathlib import Path
from typing import Optional
from dcs.payloads import PayloadDirectories
from PySide2 import QtWidgets
from PySide2.QtGui import QPixmap
from PySide2.QtWidgets import QApplication, QSplashScreen
from dcs.payloads import PayloadDirectories
from dcs.weapons_data import weapon_ids
from game import Game, VERSION, persistency
@ -35,11 +35,10 @@ from qt_ui.windows.preferences.QLiberationFirstStartWindow import (
QLiberationFirstStartWindow,
)
THIS_DIR = Path(__file__).parent
def inject_custom_payloads() -> None:
def inject_custom_payloads(user_path: Path) -> None:
dev_payloads = THIS_DIR.parent / "resources/customized_payloads"
# The packaged release rearranges the file locations, so the release has the
# customized payloads in a different location.
@ -55,6 +54,7 @@ def inject_custom_payloads() -> None:
)
# We configure these as fallbacks so that the user's payloads override ours.
PayloadDirectories.set_fallback(payloads)
PayloadDirectories.set_preferred(user_path / "MissionEditor" / "UnitPayloads")
def run_ui(game: Optional[Game], new_map: bool) -> None:
@ -69,8 +69,6 @@ def run_ui(game: Optional[Game], new_map: bool) -> None:
logging.info("Loading stylesheet: %s", liberation_theme.get_theme_css_file())
app.setStyleSheet(stylesheet.read())
inject_custom_payloads()
first_start = liberation_install.init()
if first_start:
window = QLiberationFirstStartWindow()
@ -83,6 +81,8 @@ def run_ui(game: Optional[Game], new_map: bool) -> None:
)
)
inject_custom_payloads(Path(persistency.base_path()))
# Splash screen setup
pixmap = QPixmap("./resources/ui/splash_screen.png")
splash = QSplashScreen(pixmap)