diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2023-08-06 21:56:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-06 21:56:05 +0200 |
| commit | f17c346919a32e481be2d5ee322f76dae8c03e96 (patch) | |
| tree | 0c14bf144eb67e20c39694bbc580ce06c9f7b5c3 | |
| parent | b7accedbbc99cf383de5b874094eaa583670a165 (diff) | |
| download | FlightCore-f17c346919a32e481be2d5ee322f76dae8c03e96.tar.gz FlightCore-f17c346919a32e481be2d5ee322f76dae8c03e96.zip | |
feat: Move button for killing NS to RepairView (#487)
* feat: Move button for killing NS to RepairView
* i18n: Add German translation
| -rw-r--r-- | src-vue/src/i18n/lang/de.json | 1 | ||||
| -rw-r--r-- | src-vue/src/i18n/lang/en.json | 1 | ||||
| -rw-r--r-- | src-vue/src/views/DeveloperView.vue | 14 | ||||
| -rw-r--r-- | src-vue/src/views/RepairView.vue | 14 |
4 files changed, 16 insertions, 14 deletions
diff --git a/src-vue/src/i18n/lang/de.json b/src-vue/src/i18n/lang/de.json index e66f4545..49950bfb 100644 --- a/src-vue/src/i18n/lang/de.json +++ b/src-vue/src/i18n/lang/de.json @@ -107,6 +107,7 @@ "force_reinstall_ns": "Northstar reinstallieren", "force_delete_temp_dl": "Temporären FlightCore Downloadordner löschen", "delete_persistent_store": "FlightCore Einstellungen zurücksetzen", + "kill_northstar_process": "Laufenden Northstar/Titanfall2 Prozess beenden", "reinstall_title": "Northstar wird neu installiert", "reinstall_text": "Bitte warten", "reinstall_success": "Northstar erfolgreich neu installiert", diff --git a/src-vue/src/i18n/lang/en.json b/src-vue/src/i18n/lang/en.json index 470e98be..238c6c41 100644 --- a/src-vue/src/i18n/lang/en.json +++ b/src-vue/src/i18n/lang/en.json @@ -124,6 +124,7 @@ "force_reinstall_ns": "Force reinstall Northstar", "force_delete_temp_dl": "Force delete temp download folder", "delete_persistent_store": "Delete FlightCore persistent store", + "kill_northstar_process": "Kill running Northstar/Titanfall2 process", "reinstall_title": "Force reinstalling Northstar", "reinstall_text": "Please wait", "reinstall_success": "Successfully reinstalled Northstar" diff --git a/src-vue/src/views/DeveloperView.vue b/src-vue/src/views/DeveloperView.vue index de83c9a8..c87e4236 100644 --- a/src-vue/src/views/DeveloperView.vue +++ b/src-vue/src/views/DeveloperView.vue @@ -74,10 +74,6 @@ Get installed mods </el-button> - <el-button type="primary" @click="killNorthstar"> - Kill Northstar - </el-button> - <h3>Testing</h3> <pull-requests-selector /> @@ -228,16 +224,6 @@ export default defineComponent({ showErrorNotification(error); }); }, - async killNorthstar() { - await invoke("kill_northstar") - .then((message) => { - // Just a visual indicator that it worked - showNotification('Success'); - }) - .catch((error) => { - showErrorNotification(error); - }); - }, async installMod() { let mod_to_install = this.mod_to_install_field_string; await invoke<string>("install_mod_caller", { gameInstall: this.$store.state.game_install, thunderstoreModString: mod_to_install }).then((message) => { diff --git a/src-vue/src/views/RepairView.vue b/src-vue/src/views/RepairView.vue index 65c533d2..ce7e154d 100644 --- a/src-vue/src/views/RepairView.vue +++ b/src-vue/src/views/RepairView.vue @@ -17,6 +17,10 @@ {{ $t('settings.repair.window.force_reinstall_ns') }} </el-button> + <el-button type="primary" @click="killNorthstar"> + {{ $t('settings.repair.window.kill_northstar_process') }} + </el-button> + <el-button type="primary" @click="disableModsettingsMod"> {{ $t('settings.repair.window.disable_modsettings') }} </el-button> @@ -121,6 +125,16 @@ export default defineComponent({ showErrorNotification(error); }); }, + async killNorthstar() { + await invoke("kill_northstar") + .then((message) => { + // Just a visual indicator that it worked + showNotification('Success'); + }) + .catch((error) => { + showErrorNotification(error); + }); + }, }, watch: { // Lang value is propagated to repair view after it's mounted, so we need to watch |