Browse Source

[Obsolete("Use SD.FileService.BrowseForFolder() instead.")]

Remove obsolete call to CreateFolderBrowserDialog
newNRvisualizers
Peter Forstmeier 13 years ago
parent
commit
12e00303ad
  1. 19
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs

19
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ProjectOptionPanel.cs

@ -399,9 +399,10 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -399,9 +399,10 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
/// </summary>
public void BrowseForFolder(ProjectProperty<string> property, string description)
{
string newValue = BrowseForFolder(description, BaseDirectory, property.TextBoxEditMode);
if (newValue != null)
property.Value = newValue;
string path = BrowseForFolder(description, BaseDirectory, property.TextBoxEditMode);
if (!String.IsNullOrEmpty(path)) {
property.Value = path;
}
}
/// <summary>
@ -411,13 +412,13 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -411,13 +412,13 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
/// <param name="startLocation">Start location, relative to the <see cref="BaseDirectory"/></param>
/// <param name="textBoxEditMode">The TextBoxEditMode used for the text box containing the file name</param>
/// <returns>Returns the location of the folder; or null if the dialog was cancelled.</returns>
protected string BrowseForFolder(string description, string startLocation, TextBoxEditMode textBoxEditMode)
private string BrowseForFolder(string description, string startLocation, TextBoxEditMode textBoxEditMode)
{
string startAt = GetInitialDirectory(startLocation, textBoxEditMode, false);
using (var fdiag = FileService.CreateFolderBrowserDialog(description, startAt))
{
if (fdiag.ShowDialog() == System.Windows.Forms.DialogResult.OK) {
string path = fdiag.SelectedPath;
string path = SD.FileService.BrowseForFolder(description,startAt);
if (String.IsNullOrEmpty(path)) {
return null;
} else {
if (!String.IsNullOrEmpty(startLocation)) {
path = FileUtility.GetRelativePath(startLocation, path);
}
@ -430,8 +431,6 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -430,8 +431,6 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
}
}
}
return null;
}
/// <summary>
/// Shows an 'Open File' dialog.

Loading…
Cancel
Save