Revert "[core] Allow SelectFileDialog to select files & directories at the same time"

This reverts commit 70e242e33db5d64d51ce6b15ab460b9dc8107cb3.

13 files changed, 39 insertions, 72 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs
index 1451ed1523..9784169415 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Extensions/ISelectFileDialog.cs
@@ -40,19 +40,7 @@ namespace MonoDevelop.Components.Extensions
 	public interface ISelectFileDialogHandler : IDialogHandler<SelectFileDialogData>

 	{

 	}
-
-	[Flags]
-	public enum SelectFileDialogAction
-	{
-		CreateFolder = 1,
-		SelectFolder = 2,
-		Open = 4,
-		Save = 8,
-
-		FolderFlags = CreateFolder | SelectFolder,
-		FileFlags = Open | Save
-	}
-
+	
 	/// <summary>
 	/// Data for the ISelectFileDialogHandler implementation
 	/// </summary>
@@ -62,7 +50,7 @@ namespace MonoDevelop.Components.Extensions
 			FilterSet = new FileFilterSet ();
 		}
 		internal FileFilterSet FilterSet { get; set; } 
-		public SelectFileDialogAction Action { get; set; }
+		public Gtk.FileChooserAction Action { get; set; }
 		public IList<SelectFileDialogFilter> Filters { get { return FilterSet.Filters; } }
 		public FilePath CurrentFolder { get; set; }
 		public bool SelectMultiple { get; set; }
@@ -119,7 +107,7 @@ namespace MonoDevelop.Components.Extensions
 		/// <summary>
 		/// Action to perform with the file dialog.
 		/// </summary>
-		public SelectFileDialogAction Action {
+		public Gtk.FileChooserAction Action {
 			get { return data.Action; }
 			set { data.Action = value; }
 		}
@@ -281,14 +269,7 @@ namespace MonoDevelop.Components.Extensions
 		internal void SetDefaultProperties (FileSelector fdiag)
 		{
 			fdiag.Title = Title;
-			if ((Action & SelectFileDialogAction.CreateFolder) != 0)
-				fdiag.Action = Gtk.FileChooserAction.CreateFolder;
-			else if ((Action & SelectFileDialogAction.SelectFolder) != 0)
-				fdiag.Action = Gtk.FileChooserAction.SelectFolder;
-			else if ((Action & SelectFileDialogAction.Open) != 0)
-				fdiag.Action = Gtk.FileChooserAction.Open;
-			else if ((Action & SelectFileDialogAction.Save) != 0)
-				fdiag.Action = Gtk.FileChooserAction.Save;
+			fdiag.Action = Action;
 			fdiag.LocalOnly = true;
 			fdiag.SelectMultiple = SelectMultiple;
 			fdiag.TransientFor = TransientFor;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs
index 37da6db915..23df98afc8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs
@@ -26,9 +26,8 @@
 
 using System;
 using System.Linq;
-
+using Gtk;
 using MonoDevelop.Core;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 {
@@ -42,17 +41,16 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 		public override void LaunchDialogue ()
 		{
 			var kindAtt = this.Property.Attributes.OfType<FilePathIsFolderAttribute> ().FirstOrDefault ();
-			SelectFileDialogAction action;
-
+			FileChooserAction action;
 			string title;
 			if (kindAtt == null) {
-				action = SelectFileDialogAction.Open;
+				action = FileChooserAction.Open;
 				title = GettextCatalog.GetString ("Select File...");
 			} else {
-				action = SelectFileDialogAction.SelectFolder;
+				action = FileChooserAction.SelectFolder;
 				title = GettextCatalog.GetString ("Select Folder...");
 			}
-			var fs = new SelectFileDialog (title, action);
+			var fs = new MonoDevelop.Components.SelectFileDialog (title, action);
 			if (fs.Run ())
 				Property.SetValue (Instance, fs.SelectedFile);
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs
index 83029b1b73..a47612b712 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs
@@ -28,8 +28,6 @@
 
 using System.ComponentModel;
 
-using MonoDevelop.Components.Extensions;
-
 namespace MonoDevelop.Components
 {
 	[Category ("MonoDevelop.Components")]
@@ -42,7 +40,7 @@ namespace MonoDevelop.Components
 
 		public FileEntry (string name) : base (name)
 		{
-			Action = SelectFileDialogAction.Open;
+			Action = Gtk.FileChooserAction.Open;
 		}
 
 		protected override string ShowBrowseDialog (string name, string startIn)
@@ -59,6 +57,6 @@ namespace MonoDevelop.Components
 			return null;
 		}
 
-		public SelectFileDialogAction Action { get; set; }
+		public Gtk.FileChooserAction Action { get; set; }
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFileDialog.cs
index 58d0b95a2f..45913593b5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFileDialog.cs
@@ -23,9 +23,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
+

+using System;
+using Gtk;
 using MonoDevelop.Components.Extensions;

 

+

 namespace MonoDevelop.Components

 {
 	/// <summary>
@@ -37,11 +40,11 @@ namespace MonoDevelop.Components
 		{
 		}
 		
-		public SelectFileDialog (string title): this (title, SelectFileDialogAction.Open)
+		public SelectFileDialog (string title): this (title, FileChooserAction.Open)
 		{
 		}
 		
-		public SelectFileDialog (string title, SelectFileDialogAction action)
+		public SelectFileDialog (string title, Gtk.FileChooserAction action)
 		{
 			Title = title;
 			Action = action;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFolderDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFolderDialog.cs
index c468bbf9d7..a2a253f162 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFolderDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/SelectFolderDialog.cs
@@ -39,14 +39,14 @@ namespace MonoDevelop.Components
 	{

 		public SelectFolderDialog ()
 		{
-			Action = SelectFileDialogAction.SelectFolder;
+			Action = Gtk.FileChooserAction.SelectFolder;
 		}
 		
-		public SelectFolderDialog (string title): this (title, SelectFileDialogAction.SelectFolder)
+		public SelectFolderDialog (string title): this (title, Gtk.FileChooserAction.SelectFolder)
 		{
 		}
 		
-		public SelectFolderDialog (string title, SelectFileDialogAction action)
+		public SelectFolderDialog (string title, Gtk.FileChooserAction action)
 		{
 			Title = title;
 			Action = action;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
index 5d460002c9..dd95a7feef 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
@@ -34,10 +34,10 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Projects;
 using MonoDevelop.Ide.Gui.Content;
 using System.IO;
+using Gtk;
 using MonoDevelop.Ide.Projects;
 using MonoDevelop.Ide.Desktop;
 using System.Linq;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Ide.Commands
 {
@@ -79,7 +79,7 @@ namespace MonoDevelop.Ide.Commands
 	{
 		protected override void Run ()
 		{
-			var dlg = new OpenFileDialog (GettextCatalog.GetString ("File to Open"), SelectFileDialogAction.Open) {
+			var dlg = new OpenFileDialog (GettextCatalog.GetString ("File to Open"), Gtk.FileChooserAction.Open) {
 				TransientFor = IdeApp.Workbench.RootWindow,
 				ShowEncodingSelector = true,
 				ShowViewerSelector = true,
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs
index 62e39f17a9..430502ff21 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OpenFileDialog.cs
@@ -25,10 +25,12 @@
 // THE SOFTWARE.
 

 using System;
-using System.Text;
-
+using MonoDevelop.Core;
 using MonoDevelop.Ide.Extensions;
 using MonoDevelop.Components.Extensions;
+using System.Collections.Generic;
+using Mono.Addins;
+using System.Text;
 

 namespace MonoDevelop.Ide.Gui.Dialogs

 {
@@ -41,11 +43,11 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 		{
 		}
 		
-		public OpenFileDialog (string title) : this (title, SelectFileDialogAction.Save)
+		public OpenFileDialog (string title) : this (title, Gtk.FileChooserAction.Save)
 		{
 		}
 		
-		public OpenFileDialog (string title, SelectFileDialogAction action)
+		public OpenFileDialog (string title, Gtk.FileChooserAction action)
 		{
 			Title = title;
 			Action = action;
@@ -88,20 +90,10 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 		public FileViewer SelectedViewer {
 			get { return data.SelectedViewer; }
 		}
-
-		Gtk.FileChooserAction GetFileChooserAction ()
-		{
-			switch (Action) {
-			case SelectFileDialogAction.CreateFolder: return Gtk.FileChooserAction.CreateFolder;
-			case SelectFileDialogAction.SelectFolder: return Gtk.FileChooserAction.SelectFolder;
-			case SelectFileDialogAction.Save: return Gtk.FileChooserAction.Save;
-			default: return Gtk.FileChooserAction.Open;
-			}
-		}
 		
 		protected override bool RunDefault ()
 		{
-			var win = new FileSelectorDialog (Title, GetFileChooserAction ());
+			var win = new FileSelectorDialog (Title, Action);
 			win.SelectedEncoding = Encoding != null ? Encoding.CodePage : 0;
 			win.ShowEncodingSelector = ShowEncodingSelector;
 			win.ShowViewerSelector = ShowViewerSelector;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
index d3a12756c6..069845ada8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
@@ -52,7 +52,6 @@ using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.Text;
 using System.Collections.ObjectModel;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Ide.Gui
 {
@@ -415,7 +414,7 @@ namespace MonoDevelop.Ide.Gui
 			}
 				
 			if (filename == null) {
-				var dlg = new OpenFileDialog (GettextCatalog.GetString ("Save as..."), SelectFileDialogAction.Save) {
+				var dlg = new OpenFileDialog (GettextCatalog.GetString ("Save as..."), FileChooserAction.Save) {
 					TransientFor = IdeApp.Workbench.RootWindow,
 					Encoding = encoding,
 					ShowEncodingSelector = (tbuffer != null),
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs
index 512bcf6940..6377843060 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AddFileDialog.cs
@@ -42,7 +42,7 @@ namespace MonoDevelop.Ide.Projects
 		public AddFileDialog (string title)

 		{
 			Title = title;
-			Action = SelectFileDialogAction.Open;
+			Action = FileChooserAction.Open;
 			data.SelectMultiple = true;

 		}
 		

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
index 4bc2a95b56..7c53d25e86 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/AssemblyReferencePanel.cs
@@ -150,7 +150,7 @@ namespace MonoDevelop.Ide.Projects
 
 		void HandleClicked (object sender, EventArgs e)
 		{
-			var dlg = new OpenFileDialog (GettextCatalog.GetString ("Select Assembly"), SelectFileDialogAction.Open);
+			var dlg = new OpenFileDialog (GettextCatalog.GetString ("Select Assembly"), FileChooserAction.Open);
 //			dlg.AddFilter (GettextCatalog.GetString ("Assemblies"), "*.[Dd][Ll][Ll]", "*.[Ee][Xx][Ee]");
 			dlg.AddFilter (GettextCatalog.GetString ("Assemblies"), "*.dll", "*.exe");
 			dlg.CurrentFolder = basePath;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
index c226b12acd..2ac9f2edac 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/DefaultPolicyOptionsDialog.cs
@@ -37,7 +37,6 @@ using MonoDevelop.Components;
 using Gtk;
 using System.Linq;
 using MonoDevelop.Projects;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Ide.Projects
 {
@@ -222,7 +221,7 @@ namespace MonoDevelop.Ide.Projects
 		void HandleFromFile (object sender, EventArgs e)
 		{
 			OpenFileDialog dlg = new OpenFileDialog (GettextCatalog.GetString ("Select Policy File"));
-			dlg.Action = SelectFileDialogAction.Open;
+			dlg.Action = FileChooserAction.Open;
 			dlg.TransientFor = this;
 			dlg.AddFilter (BrandingService.BrandApplicationName (GettextCatalog.GetString ("MonoDevelop policy files")), "*.mdpolicy");
 			dlg.AddAllFilesFilter ();
@@ -281,7 +280,7 @@ namespace MonoDevelop.Ide.Projects
 			OpenFileDialog dlg = new OpenFileDialog (GettextCatalog.GetString ("Select Policy File"));
 			dlg.TransientFor = this;
 			dlg.InitialFileName = currentSet.Name + ".mdpolicy";
-			dlg.Action = SelectFileDialogAction.Save;
+			dlg.Action = FileChooserAction.Save;
 			dlg.AddFilter (BrandingService.BrandApplicationName (GettextCatalog.GetString ("MonoDevelop policy files")), "*.mdpolicy");
 			dlg.AddAllFilesFilter ();
 			dlg.CurrentFolder = ExportProjectPolicyDialog.DefaultFileDialogPolicyDir;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs
index 3c6412b68f..4f51bb1f38 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs
@@ -23,13 +23,11 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 using System;
-
+using Gtk;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 using MonoDevelop.Projects.Policies;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Ide.Projects
 {
@@ -43,7 +41,7 @@ namespace MonoDevelop.Ide.Projects
 			this.Build ();
 			this.policyProvider = policyProvider;
 
-			fileEntry.Action = SelectFileDialogAction.Save;
+			fileEntry.Action = FileChooserAction.Save;
 			fileEntry.DefaultPath = DefaultFileDialogPolicyDir;
 			if (policyProvider is SolutionItem)
 				fileEntry.Path = ((SolutionItem)policyProvider).Name + ".mdpolicy";
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index 748fcccdcd..d964ed1411 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -53,7 +53,6 @@ using ICSharpCode.NRefactory.TypeSystem.Implementation;
 using System.Text;
 using MonoDevelop.Ide.TypeSystem;
 using ICSharpCode.NRefactory.TypeSystem;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Ide
 {
@@ -657,7 +656,7 @@ namespace MonoDevelop.Ide
 			WorkspaceItem res = null;
 			
 			var dlg = new SelectFileDialog () {
-				Action = SelectFileDialogAction.Open,
+				Action = Gtk.FileChooserAction.Open,
 				CurrentFolder = parentWorkspace.BaseDirectory,
 				SelectMultiple = false,
 			};
@@ -720,7 +719,7 @@ namespace MonoDevelop.Ide
 			SolutionItem res = null;
 			
 			var dlg = new SelectFileDialog () {
-				Action = SelectFileDialogAction.Open,
+				Action = Gtk.FileChooserAction.Open,
 				CurrentFolder = parentFolder.BaseDirectory,
 				SelectMultiple = false,
 			};
@@ -1625,7 +1624,7 @@ namespace MonoDevelop.Ide
 		{
 			var dlg = new SelectFileDialog () {
 				SelectMultiple = true,
-				Action = SelectFileDialogAction.Open,
+				Action = Gtk.FileChooserAction.Open,
 				CurrentFolder = folder.BaseDirectory,
 				TransientFor = MessageService.RootWindow,
 			};