Unified events names

Script/AtomicEditor/editor/Editor.ts

@@ -65,7 +65,7 @@ class Editor extends Atomic.ScriptObject {
             //so cancel exit/project close request and unsubscribe from event to avoid closing all the editors again
             this.exitRequested = false;
             this.projectCloseRequested = false;
-            this.unsubscribeFromEvent("EditorCloseResource");
+            this.unsubscribeFromEvent(EditorEvents.EditorResourceClose);
         });
 
         this.parseArguments();
@@ -99,14 +99,14 @@ class Editor extends Atomic.ScriptObject {
         var editor = EditorUI.getCurrentResourceEditor();
         if (!editor) {
           if (this.exitRequested) {
-              Editor.Exit();
-          } else if(this.projectCloseRequested) {
+              this.exit();
+          } else if (this.projectCloseRequested) {
               this.closeProject();
           }
           return;
         }
         //wait when we close resource editor to check another resource editor for unsaved changes and close it
-        this.subscribeToEvent("EditorCloseResource", (data) => {
+        this.subscribeToEvent(EditorEvents.EditorResourceClose, (data) => {
             this.closeAllResourceEditors();
         });
         editor.requestClose();
@@ -161,7 +161,7 @@ class Editor extends Atomic.ScriptObject {
         this.closeAllResourceEditors();
     }
 
-    static Exit() {
+    exit() {
         Preferences.getInstance().write();
         EditorUI.shutdown();
         Atomic.getEngine().exit();

Script/AtomicEditor/editor/EditorEvents.ts

@@ -60,8 +60,8 @@ export interface SaveResourceEvent {
 
 }
 
-export const CloseResource = "EditorCloseResource";
-export interface CloseResourceEvent {
+export const EditorResourceClose = "EditorResourceClose";
+export interface EditorCloseResourceEvent {
 
   editor:Editor.ResourceEditor;
   navigateToAvailableResource:boolean;

Script/AtomicEditor/ui/frames/ResourceFrame.ts

@@ -135,7 +135,7 @@ class ResourceFrame extends ScriptWidget {
 
     }
 
-    handleCloseResource(ev: EditorEvents.CloseResourceEvent) {
+    handleCloseResource(ev: EditorEvents.EditorCloseResourceEvent) {
         this.wasClosed = false;
         var editor = ev.editor;
         var navigate = ev.navigateToAvailableResource;
@@ -219,7 +219,7 @@ class ResourceFrame extends ScriptWidget {
         // on exit close all open editors
         for (var path in this.editors) {
 
-            this.sendEvent(EditorEvents.CloseResource, { editor: this.editors[path], navigateToAvailableResource: false });
+            this.sendEvent(EditorEvents.EditorResourceClose, { editor: this.editors[path], navigateToAvailableResource: false });
 
         }
 
@@ -251,7 +251,7 @@ class ResourceFrame extends ScriptWidget {
         this.subscribeToEvent(EditorEvents.EditResource, (data) => this.handleEditResource(data));
         this.subscribeToEvent(EditorEvents.SaveResource, (data) => this.handleSaveResource(data));
         this.subscribeToEvent(EditorEvents.SaveAllResources, (data) => this.handleSaveAllResources(data));
-        this.subscribeToEvent(EditorEvents.CloseResource, (ev: EditorEvents.CloseResourceEvent) => this.handleCloseResource(ev));
+        this.subscribeToEvent(EditorEvents.EditorResourceClose, (ev: EditorEvents.EditorCloseResourceEvent) => this.handleCloseResource(ev));
 
         this.subscribeToEvent(UIEvents.ResourceEditorChanged, (data) => this.handleResourceEditorChanged(data));
 

Source/AtomicEditor/Editors/ResourceEditor.cpp

@@ -163,9 +163,9 @@ void ResourceEditor::Close(bool navigateToAvailableResource)
     ((TBTabContainer*)container_->GetInternalWidget())->GetTabLayout()->RemoveChild(editorTabLayout_);
 
     VariantMap data;
-    data[EditorCloseResource::P_EDITOR] = this;
-    data[EditorCloseResource::P_NAVIGATE] = navigateToAvailableResource;
-    SendEvent(E_EDITORCLOSERESOURCE, data);
+    data[EditorResourceClose::P_EDITOR] = this;
+    data[EditorResourceClose::P_NAVIGATE] = navigateToAvailableResource;
+    SendEvent(E_EDITORRESOURCECLOSE, data);
 }
 
 void ResourceEditor::InvokeShortcut(const String& shortcut)

Source/AtomicEditor/Editors/ResourceEditorEvents.h

@@ -12,7 +12,7 @@
 namespace AtomicEditor
 {
 
-EVENT(E_EDITORCLOSERESOURCE, EditorCloseResource)
+EVENT(E_EDITORRESOURCECLOSE, EditorResourceClose)
 {
 PARAM(P_EDITOR, Editor);            // ResourceEditor
 PARAM(P_NAVIGATE, NavigateToAvailableResource); // bool