sunrize 1.5.8 → 1.5.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {

package/src/Application/Application.js

@@ -345,7 +345,12 @@ module .exports = class Application
                },
                { type: "separator" },
                {
-                  role: "close",
+                  label: _("Close"),
+                  accelerator: "CmdOrCtrl+W",
+                  click: () =>
+                  {
+                     this .mainWindow .webContents .send ("close");
+                  },
                },
             ],
          },
@@ -373,28 +378,13 @@ module .exports = class Application
                },
                { type: "separator" },
                {
-                  label: _("Cut"),
-                  accelerator: "CmdOrCtrl+X",
-                  click: () =>
-                  {
-                     this .mainWindow .webContents .send ("cut");
-                  },
+                  role: "cut",
                },
                {
-                  label: _("Copy"),
-                  accelerator: "CmdOrCtrl+C",
-                  click: () =>
-                  {
-                     this .mainWindow .webContents .send ("copy");
-                  },
+                  role: "copy",
                },
                {
-                  label: _("Paste"),
-                  accelerator: "CmdOrCtrl+V",
-                  click: () =>
-                  {
-                     this .mainWindow .webContents .send ("paste");
-                  },
+                  role: "paste",
                },
                {
                   label: _("Delete"),
@@ -889,8 +879,6 @@ module .exports = class Application
          { role: "editMenu" },
       ]));
 
-      console .log (filters)
-
       const response = await electron .dialog .showOpenDialog ({
          defaultPath: defaultPath,
          properties: ["openFile", "multiSelections"],

package/src/Application/Document.js

@@ -54,11 +54,14 @@ module .exports = class Document extends Interface
       electron .ipcRenderer .on ("scene-properties", (event)           => require ("../Editors/SceneProperties") .open ());
       electron .ipcRenderer .on ("close",            (event)           => this .close ());
 
-      electron .ipcRenderer .on ("undo",   () => this .undo ());
-      electron .ipcRenderer .on ("redo",   () => this .redo ());
-      electron .ipcRenderer .on ("cut",    () => this .cut ());
-      electron .ipcRenderer .on ("copy",   () => this .copy ());
-      electron .ipcRenderer .on ("paste",  () => this .paste ());
+      electron .ipcRenderer .on ("undo", () => this .undo ());
+      electron .ipcRenderer .on ("redo", () => this .redo ());
+
+      $("body")
+         .on ("cut",   () => this .cut ())
+         .on ("copy",  () => this .copy ())
+         .on ("paste", () => this .paste ());
+
       electron .ipcRenderer .on ("delete", () => this .delete ());
 
       electron .ipcRenderer .on ("primitive-quality",  (event, value) => this .setPrimitiveQuality (value));
@@ -461,17 +464,29 @@ Viewpoint {
 
    cut ()
    {
+      if (this .activeElementIsInputOrOutput ())
+         return;
+
       this .sidebar .outlineEditor .cutNodes ();
+      return false;
    }
 
    copy ()
    {
+      if (this .activeElementIsInputOrOutput ())
+         return;
+
       this .sidebar .outlineEditor .copyNodes ();
+      return false;
    }
 
    paste ()
    {
+      if (this .activeElementIsInputOrOutput ())
+         return;
+
       this .sidebar .outlineEditor .pasteNodes ();
+      return false;
    }
 
    delete ()

package/src/Application/Tabs.js

@@ -54,6 +54,7 @@ module .exports = new class Tabs
       electron .ipcRenderer .on ("save-file",      (event)           => this .saveFile ());
       electron .ipcRenderer .on ("save-file-as",   (event, filePath) => this .saveFileAs (filePath));
       electron .ipcRenderer .on ("save-all-files", (event)           => this .saveAllFiles ());
+      electron .ipcRenderer .on ("close",          (event)           => this .tabs .getActiveTab () ?.close (true));
       electron .ipcRenderer .on ("quit",           (event)           => this .quit ());
 
       electron .ipcRenderer .on ("toggle-developer-tools", (event) => this .tabs .getActiveTab () .webview .openDevTools ());