From eadaac8a9eec38dc515d90f072374326d4d8d8e3 Mon Sep 17 00:00:00 2001 From: UKDTOM Date: Mon, 15 Feb 2021 23:27:29 +0100 Subject: [PATCH] #242 fixed --- CHANGELOG.md | 22 +++++++----- package.json | 2 +- public/locales/en.json | 7 +++- .../modules/Main/GlobalSettings.vue | 35 ++++++++++++++++--- 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1112df..ca2d973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,23 @@ # ![Logo](https://github.com/WebTools-NG/WebTools-NG/blob/master/src/assets/WebTools-48x48.png) WebTools-ng Change log +## V0.1.15 + +**Note**: This version is an Alpha version, that is not made public + +* [#242 Button or setting to restore WebTools-NG default settings](https://github.com/WebTools-NG/WebTools-NG/issues/242) + ## V0.1.14 **Note**: This version is an Alpha version, that is not made public -* [#229 Bump electron from 7.3.3 to 9.4.0](https://github.com/WebTools-NG/WebTools-NG/pull/229) -* [#227 ET Export filename](https://github.com/WebTools-NG/WebTools-NG/pull/227) -* [#231 Open LogDir folder failes](https://github.com/WebTools-NG/WebTools-NG/pull/231) -* [#226 Exporting episodes](https://github.com/WebTools-NG/WebTools-NG/pull/226) -* [#233 Electron errors after updating](https://github.com/WebTools-NG/WebTools-NG/pull/233) -* [#234 Editing a custom level](https://github.com/WebTools-NG/WebTools-NG/pull/234) -* [#238 We need a Text qualifier](https://github.com/WebTools-NG/WebTools-NG/pull/238) -* [#239 Does not output if the output folder does NOT exist](https://github.com/WebTools-NG/WebTools-NG/pull/239) +* [#229 Bump electron from 7.3.3 to 9.4.0](https://github.com/WebTools-NG/WebTools-NG/issues/242) +* [#227 ET Export filename](https://github.com/WebTools-NG/WebTools-NG/issues/227) +* [#231 Open LogDir folder failes](https://github.com/WebTools-NG/WebTools-NG/issues/231) +* [#226 Exporting episodes](https://github.com/WebTools-NG/WebTools-NG/issues/226) +* [#233 Electron errors after updating](https://github.com/WebTools-NG/WebTools-NG/issues/233) +* [#234 Editing a custom level](https://github.com/WebTools-NG/WebTools-NG/issues/234) +* [#238 We need a Text qualifier](https://github.com/WebTools-NG/WebTools-NG/issues/238) +* [#239 Does not output if the output folder does NOT exist](https://github.com/WebTools-NG/WebTools-NG/issues/239) ## V0.1.13 diff --git a/package.json b/package.json index 582f86e..3d7ab8d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "webtools-ng", "productName": "WebTools-NG", - "version": "0.1.14", + "version": "0.1.15", "description": "WebTools Next Generation 4 Plex", "author": "dane22 & CPSO", "license": "MPL-2.0", diff --git a/public/locales/en.json b/public/locales/en.json index 1987373..225b4d6 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -267,12 +267,17 @@ "RestartNeeded": "When changing this setting, a restart is needed", "FactoryReset": "Factory Reset", "FactoryResetWarning": "Factory Reset will reset this app towards how it was when first installed", + "FactoryResetConfirmTitle": "Confirm Factory Reset", + "FactoryResetConfirmBody": "Doing a Factory Reset will erase all your settings, as it was when first installed", + "FactoryResetConfirmBody2": "After doing a Factory Reset, you must start {0} again", + "FactoryResetBtnCancel": "Cancel", + "FactoryResetBtnOk": "Do a Factory Reset", "BetaTester": "Subscribe to Beta updates", "TTBetaTester": "When selected, you'll be notified when a new beta version is available", "Update": "Subscribe to updates (If false, beta updates will also be disabled)", "TTUpdate": "When selected, you'll be notified when a new update is available", "True": "True", - "False": "False" + "False": "False" } } } \ No newline at end of file diff --git a/src/components/modules/Main/GlobalSettings.vue b/src/components/modules/Main/GlobalSettings.vue index 2f945e4..8ccb13f 100644 --- a/src/components/modules/Main/GlobalSettings.vue +++ b/src/components/modules/Main/GlobalSettings.vue @@ -56,6 +56,23 @@ + + +
+ {{ $t('Modules.GlobalSettings.FactoryResetConfirmBody') }} + {{ $t('Modules.GlobalSettings.FactoryResetConfirmBody2', [$t('Common.AppName')]) }} +
+ {{ $t('Modules.GlobalSettings.FactoryResetBtnCancel') }} + {{ $t('Modules.GlobalSettings.FactoryResetBtnOk') }} + +
+
+
+ + {{ $t('Modules.GlobalSettings.FactoryReset') }} + +
+ @@ -95,11 +112,21 @@ } } }, - factoryReset() { + factoryResetClose() { + this.$refs['confirmFactoryReset'].hide(); + }, + confirmFactoryReset(){ + this.$refs['confirmFactoryReset'].show(); + }, + factoryReset() { // Doing a factory reset - log.warn('Doing a factory reset'); - require('electron').remote.app.relaunch(); - require('electron').remote.app.quit(); + log.warn('Doing a factory reset'); + var fs = require('fs'); + const postfix = '-' + new Date().toISOString().replaceAll('-','').replaceAll(':','').split('.')[0]+"Z"; + fs.copyFileSync(wtutils.ConfigFileName, wtutils.ConfigFileName + postfix); + fs.unlinkSync(wtutils.ConfigFileName); + require('electron').remote.app.relaunch(); + require('electron').remote.app.exit(); }, getUpdate: function(){ if (wtconfig.get('Update.Update', true)){