wip 0.8.7v0.8.7

2 files changed, 11 insertions, 11 deletions

diff --git a/CrowIDE/src/CrowIDE.cs b/CrowIDE/src/CrowIDE.cs
index 0aa743b2..07827391 100644
--- a/CrowIDE/src/CrowIDE.cs
+++ b/CrowIDE/src/CrowIDE.cs
@@ -46,7 +46,7 @@ namespace Crow.Coding
             CMDCopy = new Command(new Action(() => copy())) { Caption = "Copy", Icon = new SvgPicture("#CrowIDE.icons.copy-file.svg"), CanExecute = false};
             CMDPaste = new Command(new Action(() => paste())) { Caption = "Paste", Icon = new SvgPicture("#CrowIDE.icons.paste-on-document.svg"), CanExecute = false};
             CMDHelp = new Command(new Action(() => System.Diagnostics.Debug.WriteLine("help"))) { Caption = "Help", Icon = new SvgPicture("#CrowIDE.icons.question.svg") };
-			CMDOptions = new Command(new Action(() => loadWindow("#CrowIDE.ui.Options.crow"))) { Caption = "Editor Options", Icon = new SvgPicture("#CrowIDE.icons.tools.svg") };
+			CMDOptions = new Command(new Action(() => loadWindow("#CrowIDE.ui.Options.crow", this))) { Caption = "Editor Options", Icon = new SvgPicture("#CrowIDE.icons.tools.svg") };
 
 			cmdCloseSolution = new Command(new Action(() => closeSolution()))
 			{ Caption = "Close Solution", Icon = new SvgPicture("#CrowIDE.icons.paste-on-document.svg"), CanExecute = false};
@@ -71,7 +71,7 @@ namespace Crow.Coding
 			CMDViewGTExp = new Command(new Action(() => loadWindow ("#CrowIDE.ui.DockWindows.winGTExplorer.crow",this)))
 			{ Caption = "Graphic Tree Explorer", CanExecute = true};
 			CMDCompile = new Command(new Action(() => compileSolution()))
-			{ Caption = "Compile", CanExecute = false};
+			{ Caption = "Compile Solution", CanExecute = false};
 			CMDViewProjProps = new Command(new Action(loadProjProps))
 			{ Caption = "Project Properties", CanExecute = false};
 		}
@@ -81,7 +81,7 @@ namespace Crow.Coding
 		}
 		void openOptionsDialog(){}
 		void newFile() {			
-			currentSolution.OpenedItems.AddElement(new ProjectFile());
+			currentSolution.OpenedItems.Add(new ProjectFile());
 		}
 		void saveFileDialog() {}
 		void undo() {}
@@ -138,7 +138,7 @@ namespace Crow.Coding
 
 		public CrowIDE ()
 			: base(1024, 800)
-		{			
+		{
 		}
 
 		Instantiator instFileDlg;
@@ -160,8 +160,8 @@ namespace Crow.Coding
 
 			if (ReopenLastSolution && !string.IsNullOrEmpty (LastOpenSolution)) {
 				CurrentSolution = new Workspace (LastOpenSolution);
-				//lock(MainIFace.UpdateMutex)
-				//	CurrentSolution.ReopenItemsSavedInUserConfig ();
+				lock(MainIFace.UpdateMutex)
+					CurrentSolution.ReopenItemsSavedInUserConfig ();
 			}
 
 			instFileDlg = Instantiator.CreateFromImlFragment
diff --git a/CrowIDE/src/Workspace.cs b/CrowIDE/src/Workspace.cs
index a28d0fc4..ddbd2d6e 100644
--- a/CrowIDE/src/Workspace.cs
+++ b/CrowIDE/src/Workspace.cs
@@ -117,7 +117,7 @@ namespace Crow.Coding
 					t.GetCustomAttribute<DesignIgnore>(false) == null).ToArray ();
 			ToolboxItems = new ObservableList<GraphicObjectDesignContainer> ();
 			foreach (Type ci in crowItems) {
-				toolboxItems.AddElement(new GraphicObjectDesignContainer(ci));
+				toolboxItems.Add(new GraphicObjectDesignContainer(ci));
 			}
 		}
 		public bool GetProjectFileFromPath (string path, out ProjectFile pi){
@@ -247,21 +247,21 @@ namespace Crow.Coding
 
 		public void OpenItem (ProjectItem pi) {
 			if (!openedItems.Contains (pi)) {
-				openedItems.AddElement (pi);
+				openedItems.Add (pi);
 				saveOpenedItemsInUserConfig ();
 			}
 		}
 		public void CloseItem (ProjectItem pi) {			
-			openedItems.RemoveElement (pi);
+			openedItems.Remove (pi);
 			saveOpenedItemsInUserConfig ();
 		}
 
 		public void CloseSolution () {
 			while (openedItems.Count > 0) {
-				openedItems.RemoveElement (openedItems [0]);
+				openedItems.Remove (openedItems [0]);
 			}
 			while (toolboxItems?.Count > 0) {
-				toolboxItems.RemoveElement (toolboxItems [0]);
+				toolboxItems.Remove (toolboxItems [0]);
 			}
 			NotifyValueChanged ("Projects", null);
 		}