* MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs,

  MonoDevelop.Ide.Gui.OptionPanels/AddInsOptionsPanel.cs,
  MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs,
  MonoDevelop.Ide.Gui.OptionPanels/IDEStyleOptionsPanel.cs,
  MonoDevelop.Ide.Gui.OptionPanels/BuildPanel.cs,
  MonoDevelop.Ide.Gui.OptionPanels/TasksOptionsPanel.cs,
  MonoDevelop.Ide.Gui.OptionPanels/CodeGenerationPanel.cs,
  MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs,
  MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs,
  MonoDevelop.Ide.StandardHeader/StandardHeaderPanel.cs,
  MonoDevelop.Ide.addin.xml,
  gtk-gui/MonoDevelop.Ide.Gui.Dialogs.EncapsulateFieldDialog.cs,
  gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs,
  gtk-gui/gui.stetic, gtk-gui/objects.xml,
  gtk-gui/MonoDevelop.Ide.Gui.Dialogs.ReplaceInFilesDialog.cs,
  MonoDevelop.Ide.Gui/Workbench.cs: Use the new options dialog
  infrastructure.
* MonoDevelop.Ide.mdp, Makefile.am, icons/text-editor-16.png,
  icons/keyboard-shortcuts-22.png, icons/keyboard-shortcuts-16.png,
  icons/text-editor-22.png: Added new icons.
* gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.TasksPanelWidget.cs: This
  class doesn't need to be public.
* MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs: Remove debug code.

svn path=/trunk/monodevelop/; revision=97667

1 files changed, 25 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
index 40adf982fa..9a5add274c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
@@ -42,19 +42,23 @@ using MonoDevelop.Core.Gui.Dialogs;
 
 namespace MonoDevelop.Ide.ExternalTools
 {
-	internal class ExternalToolPane : AbstractOptionPanel
+	internal class ExternalToolPane : OptionsPanel
 	{
 		ExternalToolPanelWidget widget;
 
-		public override void LoadPanelContents ()
+		public override Widget CreatePanelWidget ()
 		{
-			widget = new ExternalToolPanelWidget ();
-			Add (widget);
+			return widget = new ExternalToolPanelWidget ();
+		}
+		
+		public override bool ValidateChanges ()
+		{
+			return widget.Validate ();
 		}
 
-		public override bool StorePanelContents ()
+		public override void ApplyChanges ()
 		{
-			return widget.Store ();
+			widget.Store ();
 		}
 	}
 	
@@ -321,7 +325,7 @@ namespace MonoDevelop.Ide.ExternalTools
 			}
 		}
 
-		public bool Store ()
+		public bool Validate ()
 		{
 			List<ExternalTool> newlist = new List<ExternalTool> ();
 			TreeIter first;
@@ -339,6 +343,20 @@ namespace MonoDevelop.Ide.ExternalTools
 						MessageService.ShowError (String.Format(GettextCatalog.GetString ("The working directory of tool \"{0}\" is invalid.") ,tool.MenuCommand));
 						return false;
 					}
+				} while (toolListBox.Model.IterNext (ref current));
+			}
+			return true;
+		}
+		
+		public bool Store ()
+		{
+			List<ExternalTool> newlist = new List<ExternalTool> ();
+			TreeIter first;
+			if (toolListBox.Model.GetIterFirst (out first)) {
+				TreeIter current = first;
+				do {
+					// loop through items in the tree
+					ExternalTool tool = toolListBox.Model.GetValue (current, 1) as ExternalTool;
 					newlist.Add (tool);
 				} while (toolListBox.Model.IterNext (ref current));
 			}