From 92b5e6e2f27bad2d0364058dd736f8c4981e9211 Mon Sep 17 00:00:00 2001 From: Tommy Mikkelsen Date: Fri, 13 May 2022 00:08:07 +0200 Subject: [PATCH] #488 #487 Stupid AlertBox --- CHANGELOG.md | 1 + public/locales/en.json | 1 + src/components/layout/script/menubar.js | 61 +++++++++---------- .../modules/ExportTools/Settings/settings.vue | 11 +++- src/components/modules/General/wtutils.js | 20 +++++- 5 files changed, 58 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4864412..607fcf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ **Changes**: * [#486 ET Modules Year on shows not working](https://github.com/WebTools-NG/WebTools-NG/issues/486) +* [#488 ExportTools Settings cannot input any text at all](https://github.com/WebTools-NG/WebTools-NG/issues/488) ## V0.3.16 (20220511) diff --git a/public/locales/en.json b/public/locales/en.json index c50c077..38a02a2 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -166,6 +166,7 @@ "Name": "ExportTools", "ErrorServer": "No server", "Settings": { + "Name": "@:Modules.ET.Name @:Modules.ET.Settings.Settings", "Settings": "Settings", "Description": "Here you can define the settings for @:Modules.ET.Name", "ArraySep": "Delimiter for multiple info in same field", diff --git a/src/components/layout/script/menubar.js b/src/components/layout/script/menubar.js index d5d9787..b21c87b 100644 --- a/src/components/layout/script/menubar.js +++ b/src/components/layout/script/menubar.js @@ -2,7 +2,7 @@ import i18n from '../../../i18n' import { shell, clipboard } from 'electron' import { wtutils, dialog } from '../../modules/General/wtutils'; -const aboutInformation = +const aboutInformation = (i18n.t("Common.Menu.Help.menuAboutText.menuAboutVersion") +": " + wtutils.AppVersion) + '\n' + (i18n.t('Common.Menu.Help.menuAboutText.menuAboutPlatform') +": " + wtutils.Platform) + '\n' + (i18n.t('Common.Menu.Help.menuAboutText.menuAboutArchitecture') +": " + process.arch) @@ -11,31 +11,31 @@ const aboutInformation = const menuTemplate = [ { // File menu - label: i18n.t("Common.Menu.File.menuFile"), + label: i18n.t("Common.Menu.File.menuFile"), submenu: - [ + [ wtutils.isMac ? - { + { label: i18n.t("Common.Menu.File.menuOpenLogDir"), - click: () => { shell.openPath(wtutils.LogMac) } - } : - { - ...wtutils.isLinux ? - { - label: i18n.t("Common.Menu.File.menuOpenLogDir"), - click: () => { shell.openPath(wtutils.LogLinux) } + click: () => { shell.openPath(wtutils.LogMac) } + } : + { + ...wtutils.isLinux ? + { + label: i18n.t("Common.Menu.File.menuOpenLogDir"), + click: () => { shell.openPath(wtutils.LogLinux) } } : { - ...wtutils.isWindows ? - { + ...wtutils.isWindows ? + { label: i18n.t("Common.Menu.File.menuOpenLogDir"), - click: () => { shell.openPath(wtutils.LogWin) } + click: () => { shell.openPath(wtutils.LogWin) } } : {} }, }, { label: i18n.t("Common.Menu.File.menuQuit"), role: 'quit' - } + } ] }, { @@ -52,7 +52,7 @@ const menuTemplate = [ role: 'redo' }, { - type: 'separator' + type: 'separator' }, { label: i18n.t("Common.Menu.Edit.menuCut"), @@ -90,15 +90,15 @@ const menuTemplate = [ role: 'forceReload' }, wtutils.isDev ? - { + { label: i18n.t("Common.Menu.View.menuToggleDeveloperTools"), role: 'toggleDevTools' }: { label: "nothere", - visible: false + visible: false }, { - type: 'separator' + type: 'separator' }, { label: i18n.t("Common.Menu.View.menuActualSize"), @@ -125,23 +125,23 @@ const menuTemplate = [ [ { label: i18n.t("Common.Menu.Help.menuForum"), - click: () => { shell.openExternal("https://forums.plex.tv/t/598539") } + click: () => { shell.openExternal("https://forums.plex.tv/t/598539") } }, { - label: i18n.t("Common.Menu.Help.menuGithub"), - click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG") } + label: i18n.t("Common.Menu.Help.menuGithub"), + click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG") } }, { label: i18n.t("Common.Menu.Help.menuManual"), - click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG/wiki") } + click: () => { shell.openExternal("https://github.com/WebTools-NG/WebTools-NG/wiki") } }, - { + { label: i18n.t("Common.Menu.Help.menuAbout"), - click: () => { - dialog.AboutWindow( - i18n.t("Common.Menu.Help.menuAbout"), - i18n.t("Common.Ok"), - i18n.t("Common.Copy"), + click: () => { + dialog.AboutWindow( + i18n.t("Common.Menu.Help.menuAbout"), + i18n.t("Common.Ok"), + i18n.t("Common.Copy"), aboutInformation).then( result => { if (result.response === 1) { @@ -150,7 +150,7 @@ const menuTemplate = [ } } ) - } + } } ] } @@ -158,4 +158,3 @@ const menuTemplate = [ export default menuTemplate; - \ No newline at end of file diff --git a/src/components/modules/ExportTools/Settings/settings.vue b/src/components/modules/ExportTools/Settings/settings.vue index 1c2e728..ccab234 100644 --- a/src/components/modules/ExportTools/Settings/settings.vue +++ b/src/components/modules/ExportTools/Settings/settings.vue @@ -1,6 +1,7 @@