Merge pull request #140 from rsredsq/RED-EDITOR-FILES

Editor folders reorganized

Script/AtomicEditor/assets/AssetImport.ts

@@ -1,21 +0,0 @@
-
-class AssetImport extends Atomic.ScriptObject {
-
-  constructor() {
-
-    super();
-
-    this.subscribeToEvent("DragAndDrop", (data) => this.handleDropFile(data));
-
-  }
-
-  handleDropFile(data):void {
-
-    Atomic.print("Dropped: ", data.fileName);
-
-  }
-
-
-}
-
-export = AssetImport;

Script/AtomicEditor/editor/Editor.ts

@@ -1,8 +1,7 @@
 
-import EditorUI = require("../ui/EditorUI");
-import UIEvents = require("../ui/UIEvents");
-import AssetImport = require("../assets/AssetImport");
-import PlayMode = require("../ui/playmode/PlayMode");
+import EditorUI = require("ui/EditorUI");
+import UIEvents = require("ui/UIEvents");
+import PlayMode = require("ui/playmode/PlayMode");
 import EditorLicense = require("./EditorLicense");
 import EditorEvents = require("./EditorEvents");
 import Preferences = require("./Preferences");
@@ -10,7 +9,6 @@ import Preferences = require("./Preferences");
 class Editor extends Atomic.ScriptObject {
 
     project: ToolCore.Project;
-    assetImport: AssetImport;
     editorLicense: EditorLicense;
     playMode: PlayMode;
 
@@ -35,8 +33,6 @@ class Editor extends Atomic.ScriptObject {
 
         Atomic.getResourceCache().autoReloadResources = true;
 
-        this.assetImport = new AssetImport();
-
         this.subscribeToEvent(EditorEvents.LoadProject, (data) => this.handleEditorLoadProject(data));
         this.subscribeToEvent(EditorEvents.CloseProject, (data) => this.handleEditorCloseProject(data));
         this.subscribeToEvent("ProjectUnloaded", (data) => this.handleProjectUnloaded(data));

Script/AtomicEditor/ui/EditorUI.ts

@@ -1,6 +1,6 @@
 
-import EditorEvents = require("../editor/EditorEvents");
-import MainFrame = require("../ui/MainFrame");
+import EditorEvents = require("editor/EditorEvents");
+import MainFrame = require("./frames/MainFrame");
 import ModalOps = require("./modal/ModalOps");
 import Shortcuts = require("./Shortcuts");
 

Script/AtomicEditor/ui/HierarchyFrame.ts → Script/AtomicEditor/ui/frames/HierarchyFrame.ts

@@ -1,7 +1,7 @@
 
-import HierarchyFrameMenu = require("./HierarchyFrameMenu");
+import HierarchyFrameMenu = require("./menus/HierarchyFrameMenu");
 import MenuItemSources = require("./menus/MenuItemSources");
-import EditorEvents = require("../editor/EditorEvents");
+import EditorEvents = require("editor/EditorEvents");
 
 var IconTemporary = "ComponentBitmap";
 

Script/AtomicEditor/ui/MainFrame.ts → Script/AtomicEditor/ui/frames/MainFrame.ts

@@ -3,13 +3,13 @@ import ResourceFrame = require("./ResourceFrame");
 import WelcomeFrame = require("./WelcomeFrame");
 import InspectorFrame = require("./inspector/InspectorFrame");
 import HierarchyFrame = require("./HierarchyFrame");
-import MainToolbar = require("./MainToolbar");
+import MainToolbar = require("ui//MainToolbar");
 
-import MessageModal = require("./modal/MessageModal");
-import UIEvents = require("./UIEvents");
+import MessageModal = require("../modal/MessageModal");
+import UIEvents = require("ui/UIEvents");
 
-import ScriptWidget = require("./ScriptWidget");
-import MainFrameMenu = require("./MainFrameMenu");
+import ScriptWidget = require("ui/ScriptWidget");
+import MainFrameMenu = require("./menus/MainFrameMenu");
 
 import MenuItemSources = require("./menus/MenuItemSources");
 

Script/AtomicEditor/ui/ProjectFrame.ts → Script/AtomicEditor/ui/frames/ProjectFrame.ts

@@ -1,9 +1,9 @@
 
 
-import ScriptWidget = require("./ScriptWidget");
-import Editor = require("../editor/Editor");
-import EditorEvents = require("../editor/EditorEvents");
-import ProjectFrameMenu = require("./ProjectFrameMenu");
+import ScriptWidget = require("ui/ScriptWidget");
+import Editor = require("editor/Editor");
+import EditorEvents = require("editor/EditorEvents");
+import ProjectFrameMenu = require("./menus/ProjectFrameMenu");
 import MenuItemSources = require("./menus/MenuItemSources");
 
 class ProjectFrame extends ScriptWidget {

Script/AtomicEditor/ui/ResourceFrame.ts → Script/AtomicEditor/ui/frames/ResourceFrame.ts

@@ -1,6 +1,6 @@
-import ScriptWidget = require("./ScriptWidget");
-import EditorEvents = require("../editor/EditorEvents");
-import UIEvents = require("./UIEvents");
+import ScriptWidget = require("ui/ScriptWidget");
+import EditorEvents = require("editor/EditorEvents");
+import UIEvents = require("ui/UIEvents");
 
 // the root content of editor widgets (rootContentWidget property) are extended with an editor field
 // so we can access the editor they belong to from the widget itself

Script/AtomicEditor/ui/WelcomeFrame.ts → Script/AtomicEditor/ui/frames/WelcomeFrame.ts

@@ -1,8 +1,8 @@
 
-import EditorEvents = require("../editor/EditorEvents");
-import EditorUI = require("./EditorUI");
-import ScriptWidget = require("./ScriptWidget");
-import Preferences = require("../editor/Preferences");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import ScriptWidget = require("ui/ScriptWidget");
+import Preferences = require("editor/Preferences");
 
 class WelcomeFrame extends ScriptWidget {
 

Script/AtomicEditor/ui/inspector/ComponentInspector.ts → Script/AtomicEditor/ui/frames/inspector/ComponentInspector.ts

@@ -1,8 +1,8 @@
 
-import ScriptWidget = require("../ScriptWidget");
+import ScriptWidget = require("ui/ScriptWidget");
 import DataBinding = require("./DataBinding");
 import InspectorUtils = require("./InspectorUtils");
-import EditorUI = require("../EditorUI");
+import EditorUI = require("ui/EditorUI");
 
 class ComponentInspector extends Atomic.UISection {
 

Script/AtomicEditor/ui/inspector/InspectorFrame.ts → Script/AtomicEditor/ui/frames/inspector/InspectorFrame.ts

@@ -1,6 +1,6 @@
 
-import EditorEvents = require("../../editor/EditorEvents");
-import ScriptWidget = require("../ScriptWidget");
+import EditorEvents = require("editor/EditorEvents");
+import ScriptWidget = require("ui/ScriptWidget");
 import DataBinding = require("./DataBinding");
 
 // inspectors

Script/AtomicEditor/ui/inspector/InspectorWidget.ts → Script/AtomicEditor/ui/frames/inspector/InspectorWidget.ts

@@ -1,4 +1,4 @@
-import ScriptWidget = require("../ScriptWidget");
+import ScriptWidget = require("ui/ScriptWidget");
 
 class InspectorWidget extends ScriptWidget {
 

Script/AtomicEditor/ui/inspector/MaterialInspector.ts → Script/AtomicEditor/ui/frames/inspector/MaterialInspector.ts

@@ -1,7 +1,7 @@
 
-import ScriptWidget = require("../ScriptWidget");
-import UIEvents = require("../UIEvents");
-import EditorUI = require("../EditorUI");
+import ScriptWidget = require("ui/ScriptWidget");
+import UIEvents = require("ui/UIEvents");
+import EditorUI = require("ui/EditorUI");
 
 import TextureSelector = require("./TextureSelector");
 

Script/AtomicEditor/ui/inspector/NodeInspector.ts → Script/AtomicEditor/ui/frames/inspector/NodeInspector.ts

@@ -1,5 +1,5 @@
 
-import ScriptWidget = require("../ScriptWidget");
+import ScriptWidget = require("ui/ScriptWidget");
 import ComponentInspector = require("./ComponentInspector");
 import DataBinding = require("./DataBinding");
 import CreateComponentButton = require("./CreateComponentButton");

Script/AtomicEditor/ui/HierarchyFrameMenu.ts → Script/AtomicEditor/ui/frames/menus/HierarchyFrameMenu.ts

@@ -1,8 +1,8 @@
 
-import strings = require("./EditorStrings");
-import EditorEvents = require("../editor/EditorEvents");
-import EditorUI = require("./EditorUI");
-import MenuItemSources = require("./menus/MenuItemSources");
+import strings = require("ui/EditorStrings");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import MenuItemSources = require("./MenuItemSources");
 
 class HierarchyFrameMenus extends Atomic.ScriptObject {
 

Script/AtomicEditor/ui/MainFrameMenu.ts → Script/AtomicEditor/ui/frames/menus/MainFrameMenu.ts

@@ -1,8 +1,8 @@
 
-import strings = require("./EditorStrings");
-import EditorEvents = require("../editor/EditorEvents");
-import EditorUI = require("./EditorUI");
-import MenuItemSources = require("./menus/MenuItemSources");
+import strings = require("ui/EditorStrings");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import MenuItemSources = require("./MenuItemSources");
 
 class MainFrameMenu extends Atomic.ScriptObject {
 

Script/AtomicEditor/ui/menus/MenuItemSources.ts → Script/AtomicEditor/ui/frames/menus/MenuItemSources.ts

@@ -1,7 +1,7 @@
 
-import strings = require("../EditorStrings");
-import EditorEvents = require("../../editor/EditorEvents");
-import EditorUI = require("../EditorUI");
+import strings = require("ui/EditorStrings");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
 
 var UIMenuItemSource = Atomic.UIMenuItemSource;
 var UIMenuItem = Atomic.UIMenuItem;

Script/AtomicEditor/ui/ProjectFrameMenu.ts → Script/AtomicEditor/ui/frames/menus/ProjectFrameMenu.ts

@@ -1,8 +1,8 @@
 
-import strings = require("./EditorStrings");
-import EditorEvents = require("../editor/EditorEvents");
-import EditorUI = require("./EditorUI");
-import MenuItemSources = require("./menus/MenuItemSources");
+import strings = require("ui/EditorStrings");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import MenuItemSources = require("./MenuItemSources");
 
 class ProjectFrameMenus extends Atomic.ScriptObject {
 

Script/AtomicEditor/ui/modal/ModalOps.ts

@@ -4,10 +4,10 @@ import About = require("./About");
 import NewProject = require("./NewProject");
 import CreateProject = require("./CreateProject");
 
-import EULAWindow = require("../license/EULAWindow");
-import ActivationWindow = require("../license/ActivationWindow");
-import ActivationSuccessWindow = require("../license/ActivationSuccessWindow");
-import ManageLicense = require("../license/ManageLicense");
+import EULAWindow = require("./license/EULAWindow");
+import ActivationWindow = require("./license/ActivationWindow");
+import ActivationSuccessWindow = require("./license/ActivationSuccessWindow");
+import ManageLicense = require("./license/ManageLicense");
 
 import ResourceSelection = require("./ResourceSelection");
 

Script/AtomicEditor/ui/modal/UIResourceOps.ts

@@ -1,7 +1,7 @@
-import EditorEvents = require("../../editor/EditorEvents");
+import EditorEvents = require("editor/EditorEvents");
 import EditorUI = require("../EditorUI");
 import ModalWindow = require("./ModalWindow");
-import ResourceOps = require("../../resources/ResourceOps");
+import ResourceOps = require("resources/ResourceOps");
 
 export class ResourceDelete extends ModalWindow {
 

Script/AtomicEditor/ui/license/ActivationSuccessWindow.ts → Script/AtomicEditor/ui/modal/license/ActivationSuccessWindow.ts

@@ -1,7 +1,7 @@
 
-import EditorEvents = require("../../editor/EditorEvents");
-import EditorUI = require("../EditorUI");
-import ModalWindow = require("../modal/ModalWindow");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import ModalWindow = require("../ModalWindow");
 
 class ActivationSuccessWindow extends ModalWindow {
 

Script/AtomicEditor/ui/license/ActivationWindow.ts → Script/AtomicEditor/ui/modal/license/ActivationWindow.ts

@@ -1,8 +1,8 @@
 
-import EditorEvents = require("../../editor/EditorEvents");
-import EditorUI = require("../EditorUI");
-import ModalWindow = require("../modal/ModalWindow");
-import ProgressModal = require("../modal/ProgressModal");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import ModalWindow = require("../ModalWindow");
+import ProgressModal = require("../ProgressModal");
 
 class ActivationWidow extends ModalWindow {
 

Script/AtomicEditor/ui/license/EULAWindow.ts → Script/AtomicEditor/ui/modal/license/EULAWindow.ts

@@ -1,7 +1,7 @@
 
-import EditorEvents = require("../../editor/EditorEvents");
-import EditorUI = require("../EditorUI");
-import ModalWindow = require("../modal/ModalWindow");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import ModalWindow = require("../ModalWindow");
 
 class EULAWindow extends ModalWindow {
 

Script/AtomicEditor/ui/license/ManageLicense.ts → Script/AtomicEditor/ui/modal/license/ManageLicense.ts

@@ -1,8 +1,8 @@
 
-import EditorEvents = require("../../editor/EditorEvents");
-import EditorUI = require("../EditorUI");
-import ModalWindow = require("../modal/ModalWindow");
-import ProgressModal = require("../modal/ProgressModal");
+import EditorEvents = require("editor/EditorEvents");
+import EditorUI = require("ui/EditorUI");
+import ModalWindow = require("../ModalWindow");
+import ProgressModal = require("../ProgressModal");
 
 class ManageLicense extends ModalWindow {