diff --git a/qt_ui/main.py b/qt_ui/main.py index 4ee3862c..e019d32c 100644 --- a/qt_ui/main.py +++ b/qt_ui/main.py @@ -1,9 +1,5 @@ from userdata import logging_config -# Logging setup -VERSION_STRING = "2.1.0" -logging_config.init_logging(VERSION_STRING) - import logging import os import sys @@ -19,6 +15,9 @@ from qt_ui.windows.QLiberationWindow import QLiberationWindow from qt_ui.windows.preferences.QLiberationFirstStartWindow import QLiberationFirstStartWindow from userdata import liberation_install, persistency, liberation_theme +# Logging setup +logging_config.init_logging(uiconstants.VERSION_STRING) + if __name__ == "__main__": os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "1" # Potential fix for 4K screens diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index c0f13eac..ba9b5bf2 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -8,6 +8,8 @@ from game.event import UnitsDeliveryEvent, FrontlineAttackEvent from theater.theatergroundobject import CATEGORY_MAP from userdata.liberation_theme import get_theme_icons +VERSION_STRING = "2.1.0" + URLS : Dict[str, str] = { "Manual": "https://github.com/khopa/dcs_liberation/wiki", "Repository": "https://github.com/khopa/dcs_liberation", diff --git a/qt_ui/windows/QLiberationWindow.py b/qt_ui/windows/QLiberationWindow.py index 37e6823c..9bb041c1 100644 --- a/qt_ui/windows/QLiberationWindow.py +++ b/qt_ui/windows/QLiberationWindow.py @@ -211,17 +211,16 @@ class QLiberationWindow(QMainWindow): self.info_panel.setGame(game) def showAboutDialog(self): - text = "

DCS Liberation

" + \ + text = "

DCS Liberation " + CONST.VERSION_STRING + "

" + \ "Source code : https://github.com/khopa/dcs_liberation" + \ "

Authors

" + \ "

DCS Liberation was originally developed by shdwp, DCS Liberation 2.0 is a partial rewrite based on this work by Khopa." \ "

Contributors

" + \ - "shdwp, Khopa, Wrycu, calvinmorrow, JohanAberg, Deus" + \ + "shdwp, Khopa, Wrycu, calvinmorrow, JohanAberg, Deus, root0fall" + \ "

Special Thanks :

" \ "rp- for the pydcs framework
"\ "Grimes (mrSkortch) & Speed for the MIST framework
"\ "Ciribob for the JTACAutoLase.lua script
" - about = QMessageBox() about.setWindowTitle("About DCS Liberation") about.setIcon(QMessageBox.Icon.Information) diff --git a/qt_ui/windows/newgame/QNewGameWizard.py b/qt_ui/windows/newgame/QNewGameWizard.py index 9d9cea3a..cb88fc21 100644 --- a/qt_ui/windows/newgame/QNewGameWizard.py +++ b/qt_ui/windows/newgame/QNewGameWizard.py @@ -95,7 +95,7 @@ class NewGameWizard(QtWidgets.QWizard): game.budget = int(game.budget * multiplier) game.settings.multiplier = multiplier game.settings.sams = True - game.settings.version = "2.1.0" + game.settings.version = CONST.VERSION_STRING if midgame: game.budget = game.budget * 4 * len(list(conflictTheater.conflicts()))