Console Correction

We had a few odds and ends from the old console lying around that needed to be cleaned up.

editor/EditorConsole/EditorConsole.cs

@@ -29,7 +29,7 @@ function EditorConsole::create(%this)
 		HorizSizing="width";
 		VertSizing="top";
 		Position="0 738";
-		Extent="924 30";
+		Extent="1024 30";
 		minExtent="120 20";
 		AltCommand="EditorConsole.eval();";
 		MaxLength="255";
@@ -38,19 +38,6 @@ function EditorConsole::create(%this)
 	ThemeManager.setProfile(%this.consoleEntry, "textEditProfile");
 	%this.guiPage.add(%this.consoleEntry);
 
-	%this.hideLogButton = new GuiButtonCtrl()
-	{
-		Text="Close";
-		command="EditorCore.close();";
-		HorizSizing="left";
-		VertSizing="top";
-		Position="924 738";
-		Extent="100 30";
-		MinExtent="80 20";
-	};
-	ThemeManager.setProfile(%this.hideLogButton, "buttonProfile");
-	%this.guiPage.add(%this.hideLogButton);
-
 	%this.scroller = new GuiScrollCtrl()
 	{
 		HorizSizing="width";

editor/EditorCore/gui/EditorOverlay.gui.taml

@@ -1,12 +0,0 @@
-<GuiControl
-    Name="EditorOverlay"
-    HorizSizing="width"
-    VertSizing="height"
-    Position="0 0"
-    Extent="1024 768"
-    MinExtent="8 8"
-    Visible="1"
-	HelpTag="0">
-
-
-</GuiControl>

editor/main.cs

@@ -29,5 +29,5 @@ EditorManager.scanModules( "./" );
 
 // Load various editors
 EditorManager.LoadExplicit("EditorConsole");
-Editormanager.LoadExplicit("ProjectManager");
+//Editormanager.LoadExplicit("ProjectManager");//Someday...
 EditorManager.LoadExplicit("AssetAdmin");

toybox/Sandbox/1/gui/ConsoleDialog.gui.taml

@@ -1,80 +0,0 @@
-<GuiSpriteCtrl
-    Name="ConsoleDialog"
-    Profile="GuiToolboxProfile"
-    HorizSizing="width"
-    VertSizing="height"
-    Position="0 0"
-    Extent="1024 768"
-    MinExtent="8 8"
-    Visible="1"
-	HelpTag="0"
-	Image="@asset=Sandbox:blueGradient">
-	
-	<!-- Console Command Entry -->
-    <GuiConsoleEditCtrl
-        Name="ConsoleEntry"
-		Profile="GuiConsoleTextEditProfile"
-		HorizSizing="width"
-		VertSizing="top"
-		Position="0 738"
-		Extent="914 30"
-		minExtent="8 8"
-		Visible="1"
-		AltCommand="ConsoleEntry::eval();"
-		HelpTag="0"
-		MaxLength="255"
-		HistorySize="40"
-		password="0"
-		TabComplete="0"
-		SinkAllKeyEvents="1"
-		UseSiblingScroller="1"
-	/>
-	<!-- Hide Log -->
-	<GuiButtonCtrl
-		Profile="BlueButtonProfile"
-		Text="Hide Log"
-		ButtonType="PushButton"
-		command="ToggleConsole(true);"
-		canSaveDynamicFields="0"
-		isContainer="0"
-		HorizSizing="relative"
-		VertSizing="relative"
-		Position="924 738"
-		Extent="100 30"
-		MinExtent="8 2"
-		canSave="1"
-		Visible="1"
-		Active="1"
-		hovertime="1000"
-		groupNum="-1"
-		useMouseEvents="1" />
-		
-    <GuiScrollCtrl
-		Name="ConsoleScrollCtrl"
-        canSaveDynamicFields="0"
-        isContainer="1"
-        Profile="ConsoleScrollProfile"
-        HorizSizing="width"
-        VertSizing="height"
-        Position="0 0"
-        Extent="1024 738"
-        MinExtent="8 8"
-        canSave="1"
-        Visible="1"
-        hovertime="1000"
-        willFirstRespond="1"
-        hScrollBar="alwaysOn"
-        vScrollBar="alwaysOn"
-        constantThumbHeight="0"
-        childMargin="0 0">
-		
-		<!-- Console Log -->
-        <GuiConsole
-            Profile="GuiConsoleProfile"
-            Position="0 0"
-			Extent="1024 738"
-			HorizSizing="width"
-			VertSizing="height"			
-            Visible="1"/>
-    </GuiScrollCtrl>
-</GuiSpriteCtrl>

toybox/Sandbox/1/gui/MainOverlay.gui.taml

@@ -6,8 +6,8 @@
     Position="0 0"
     Extent="1024 30"
     MinExtent="220 30"
-    Visible="1">	
-	
+    Visible="1">
+
 	<!-- Manipulation Mode-->
     <GuiButtonCtrl
         Name="ManipulationModeButton"
@@ -27,7 +27,7 @@
         Active="1"
         hovertime="1000"
         groupNum="-1"
-        useMouseEvents="1" />		
+        useMouseEvents="1" />
 
 	<!-- Pause Scene Mode-->
     <GuiButtonCtrl
@@ -47,14 +47,14 @@
         Active="1"
         hovertime="1000"
         groupNum="-1"
-        useMouseEvents="1" />		
-		
+        useMouseEvents="1" />
+
 	<!-- Reload Toy-->
     <GuiButtonCtrl
 		Name="ReloadToyOverlayButton"
         Profile="BlueButtonProfile"
 		Text="Reload Toy"
-		ButtonType="PushButton"		
+		ButtonType="PushButton"
         canSaveDynamicFields="0"
         isContainer="0"
         HorizSizing="left"
@@ -74,7 +74,7 @@
 		Name="RestartToyOverlayButton"
         Profile="BlueButtonProfile"
 		Text="Restart Toy"
-		ButtonType="PushButton"		
+		ButtonType="PushButton"
         canSaveDynamicFields="0"
         isContainer="0"
         HorizSizing="left"
@@ -92,9 +92,9 @@
 	<!-- Show Log -->
     <GuiButtonCtrl
         Profile="BlueButtonProfile"
-		Text="Show Log"
-		ButtonType="PushButton"	
-		command="ToggleConsole(true);"		
+		Text="Open Console"
+		ButtonType="PushButton"
+		command="EditorCore.toggleEditor();"		
         canSaveDynamicFields="0"
         isContainer="0"
         HorizSizing="left"
@@ -107,8 +107,8 @@
         Active="1"
         hovertime="1000"
         groupNum="-1"
-        useMouseEvents="1" />		
-			
+        useMouseEvents="1" />
+
 	<!-- Show Toolbox -->
     <GuiButtonCtrl
         Profile="BlueButtonProfile"
@@ -128,5 +128,5 @@
         hovertime="1000"
         groupNum="-1"
         useMouseEvents="1" />
-		
+
 </GuiControl>