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

CHANGELOG.md

@@ -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
 

public/locales/en.json

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

src/components/layout/script/menubar.js

@@ -1,6 +1,6 @@
 import i18n from '../../../i18n'
-import { shell, clipboard } from 'electron'
+import { shell } from 'electron'
-import { wtutils, dialog} from '../../modules/General/wtutils';
+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);
-          }
-          })} 
         }
       ]
     }

src/components/modules/General/wtutils.js

@@ -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;
@@ -339,35 +338,6 @@ const dialog = new class Dialog {
         return dirName
 
     }
-
-    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')