* MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs: Include the

  "save current file" checkbox in the controls that are made
  insensitive when the is no selected tool. Fix some GTK warnings. 

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

1 files changed, 15 insertions, 8 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 e9fcc42cef..ea7417bdc6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ExternalTools/ExternalToolPanel.cs
@@ -122,7 +122,9 @@ namespace MonoDevelop.Ide.ExternalTools
 				workingDirTextBox, promptArgsCheckBox, useOutputPadCheckBox, 
 				titleLabel, argumentLabel, commandLabel, 
 				workingDirLabel, browseButton, argumentQuickInsertButton, 
-				workingDirQuickInsertButton, moveUpButton, moveDownButton};
+				workingDirQuickInsertButton, moveUpButton, moveDownButton,
+				saveCurrentFileCheckBox
+			};
 			 
 			foreach (ExternalTool tool in ExternalToolService.Tools) {
 				toolListBoxStore.AppendValues (tool.MenuCommand, tool);
@@ -233,13 +235,18 @@ namespace MonoDevelop.Ide.ExternalTools
 			SetEnabledStatus (externalTool != null, dependendControls);
 			lockStoreValues = true;
 			try {
-				titleTextBox.Text              = externalTool != null ? externalTool.MenuCommand : "";
-				browseButton.Path              = externalTool != null ? externalTool.Command : "";
-				argumentTextBox.Text           = externalTool != null ? externalTool.Arguments : "";
-				workingDirTextBox.Text         = externalTool != null ? externalTool.InitialDirectory : "";
-				promptArgsCheckBox.Active      = externalTool != null && externalTool.PromptForArguments ;
-				useOutputPadCheckBox.Active    = externalTool != null && externalTool.UseOutputPad;
-				saveCurrentFileCheckBox.Active = externalTool != null && externalTool.SaveCurrentFile;
+				if (externalTool != null) {
+					titleTextBox.Text              = externalTool.MenuCommand ?? "";
+					browseButton.Path              = externalTool.Command ?? "";
+					argumentTextBox.Text           = externalTool.Arguments ?? "";
+					workingDirTextBox.Text         = externalTool.InitialDirectory ?? "";
+					promptArgsCheckBox.Active      = externalTool.PromptForArguments ;
+					useOutputPadCheckBox.Active    = externalTool.UseOutputPad;
+					saveCurrentFileCheckBox.Active = externalTool.SaveCurrentFile;
+				} else {
+					titleTextBox.Text = browseButton.Path = argumentTextBox.Text = workingDirTextBox.Text = "";
+					promptArgsCheckBox.Active = useOutputPadCheckBox.Active = saveCurrentFileCheckBox.Active = false;
+				}
 			} finally {
 				lockStoreValues = false;
 			}