Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2024-11-26 21:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:WebTools-NG/WebTools-NG

Browse source
This commit is contained in:
UKDTOM 2020-10-18 11:56:25 +02:00
commit 473d40ab13
4 changed files with 4 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -17,8 +17,8 @@
**Note**: This version is an Alhpa version, that is not made public
* [#103 AutoUpdate](https://github.com/WebTools-NG/WebTools-NG/issues/103)
* [#179 BUG: Text fields spotted in the wild, that corrupts export](https://github.com/WebTools-NG/WebTools-NG/issues/179)
* [#103 AutoUpdate](https://github.com/WebTools-NG/WebTools-NG/issues/103)
## V0.1.5

10
public/locales/en.json
View file

@ -70,14 +70,7 @@
"menuHelp": "Help",
"menuForum": "Forums",
"menuGithub": "Github",
"menuManual": "Manual",
"menuAbout": "About WebTools",
"menuAboutText":{
"menuAboutVersion":"Version",
"menuAboutPlatform":"Platform",
"menuAboutArchitecture": "Architecture"
}
"menuManual": "Manual"
},
"Sidebar": {
"NavSections":{
@ -110,7 +103,6 @@
},
"Ok": "OK",
"Reload": "Reload",
"Copy": "Copy",
"Update" : {
"Title": "Update detected",
"Body": "{0} was released on Github on: {1}.",

15
src/components/layout/script/menubar.js
View file

@ -1,6 +1,6 @@
import i18n from '../../../i18n'
import { shell, clipboard } from 'electron'
import { wtutils, dialog} from '../../modules/General/wtutils';
import { shell } from 'electron'
import { wtutils} from '../../modules/General/wtutils';
// Menu template
const menuTemplate = [
@ -129,17 +129,6 @@ const menuTemplate = [
{
label: i18n.t("Common.Menu.Help.menuManual"),
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")).then(result => {
var infoText = dialog.AboutInformation();
if (result.response === 1) {
console.log("copy pressed")
clipboard.writeText(infoText);
}
})}
}
]
}

30
src/components/modules/General/wtutils.js
View file

@ -2,7 +2,6 @@
This file contains different functions and methods
that we use in our solution.
*/
import i18n from '../../../i18n';
const log = require('electron-log');
console.log = log.log;
@ -340,35 +339,6 @@ const dialog = new class Dialog {
}
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)
return aboutInformation
}
AboutWindow(Title, OKLabel, CopyLabel)
{
log.debug('Open AboutWindow Dialog')
const {remote} = require('electron'),
dialog = remote.dialog,
WIN = remote.getCurrentWindow();
let options = {
buttons: [OKLabel, CopyLabel],
title: Title,
message: 'WebTools-NG',
detail: this.AboutInformation(),
type: 'info',
noLink: true,
}
let aboutWindow = dialog.showMessageBox(WIN, options)
return aboutWindow
}
SaveFile(title, defaultPath, OKLabel) {
log.debug('Start SaveFile Dialog')
const {remote} = require('electron'),