Merge pull request #1 from GeckoEidechse/main

feat: Show own version number in settings view (#11)
R2NorthstarTools · Oct 8, 2022 · e29cf4b · e29cf4b
2 parents d352b40 + ef95fbe
commit e29cf4b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts
@@ -15,6 +15,8 @@ export interface FlightCoreStore {
     game_path: string,
     install_type: InstallType,
 
+    flightcore_version: string,
+
     installed_northstar_version: string,
     northstar_state: NorthstarState,
     release_canal: ReleaseCanal,
@@ -31,6 +33,8 @@ export const store = createStore<FlightCoreStore>({
             game_path: undefined as unknown as string,
             install_type: undefined as unknown as InstallType,
 
+            flightcore_version: "",
+
             installed_northstar_version: "",
             northstar_state: NorthstarState.GAME_NOT_FOUND,
             release_canal: ReleaseCanal.RELEASE,
@@ -139,6 +143,9 @@ async function _initializeApp(state: any) {
         state.developer_mode = true;
     }
 
+    // Get FlightCore version number
+    state.flightcore_version = await invoke("get_version_number");
+
     const result = await invoke("find_game_install_location_caller")
         .catch((err) => {
             // Gamepath not found or other error
@@ -163,13 +170,10 @@ async function _checkForFlightCoreUpdates(state: FlightCoreStore) {
     // Check if FlightCore up-to-date
     let flightcore_is_outdated = await invoke("check_is_flightcore_outdated_caller") as boolean;
 
-    // Get FlightCore version number
-    let flightcore_version_number = await invoke("get_version_number") as string;
-
     if (flightcore_is_outdated) {
         ElNotification({
             title: 'FlightCore outdated!',
-            message: `Please update FlightCore. Running outdated version ${flightcore_version_number}`,
+            message: `Please update FlightCore. Running outdated version ${state.flightcore_version}`,
             type: 'warning',
             position: 'bottom-right',
             duration: 0 // Duration `0` means the notification will not auto-vanish

diff --git a/src-vue/src/views/SettingsView.vue b/src-vue/src/views/SettingsView.vue
@@ -13,6 +13,9 @@
             </template>
         </el-input>
         <h3>About:</h3>
+        FlightCore Version: {{ flightcoreVersion === '' ? 'Unknown version' : `${flightcoreVersion}` }}
+        <br />
+        <br />
         UI design inspired by <el-link :underline="false" target="_blank" href="https://github.com/TFORevive/tforevive_launcher/" type="primary">TFORevive Launcher</el-link> (not yet public)
     </div>
 </template>
@@ -26,6 +29,11 @@ import { ElNotification } from 'element-plus';
 
 export default defineComponent({
     name: "SettingsView",
+    computed: {
+        flightcoreVersion(): string {
+            return this.$store.state.flightcore_version;
+        },
+    },
     methods: {
         async updateGamePath() {
             // Open a selection dialog for directories