Browse Source

Fixed SD2-1090. Spaces are now trimmed from the project name when creating a new project.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1849 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 19 years ago
parent
commit
6622110ccf
  1. 10
      src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs

10
src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs

@ -196,7 +196,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
void NameTextChanged(object sender, EventArgs e) void NameTextChanged(object sender, EventArgs e)
{ {
if (!((CheckBox)ControlDictionary["createSeparateDirCheckBox"]).Checked) { if (!((CheckBox)ControlDictionary["createSeparateDirCheckBox"]).Checked) {
((TextBox)ControlDictionary["solutionNameTextBox"]).Text = ((TextBox)ControlDictionary["nameTextBox"]).Text; ((TextBox)ControlDictionary["solutionNameTextBox"]).Text = ((TextBox)ControlDictionary["nameTextBox"]).Text.Trim();
} }
} }
@ -204,7 +204,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
get { get {
string name = String.Empty; string name = String.Empty;
if (((CheckBox)ControlDictionary["createSeparateDirCheckBox"]).Checked) { if (((CheckBox)ControlDictionary["createSeparateDirCheckBox"]).Checked) {
name += Path.DirectorySeparatorChar + ((TextBox)ControlDictionary["solutionNameTextBox"]).Text; name += Path.DirectorySeparatorChar + ((TextBox)ControlDictionary["solutionNameTextBox"]).Text.Trim();
} }
return ProjectLocation + name; return ProjectLocation + name;
} }
@ -213,8 +213,8 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
string ProjectLocation { string ProjectLocation {
get { get {
string location = ((TextBox)ControlDictionary["locationTextBox"]).Text.TrimEnd('\\', '/', Path.DirectorySeparatorChar); string location = ((TextBox)ControlDictionary["locationTextBox"]).Text.TrimEnd('\\', '/', Path.DirectorySeparatorChar);
string name = ((TextBox)ControlDictionary["nameTextBox"]).Text; string name = ((TextBox)ControlDictionary["nameTextBox"]).Text.Trim();
return location + (((CheckBox)ControlDictionary["autoCreateSubDirCheckBox"]).Checked ? Path.DirectorySeparatorChar + name : ""); return location.Trim() + (((CheckBox)ControlDictionary["autoCreateSubDirCheckBox"]).Checked ? Path.DirectorySeparatorChar + name : String.Empty);
} }
} }
@ -302,7 +302,7 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
cinfo.CombinePath = ProjectLocation; cinfo.CombinePath = ProjectLocation;
cinfo.ProjectBasePath = ProjectSolution; cinfo.ProjectBasePath = ProjectSolution;
cinfo.ProjectName = ((TextBox)ControlDictionary["nameTextBox"]).Text; cinfo.ProjectName = name;
NewCombineLocation = item.Template.CreateProject(cinfo); NewCombineLocation = item.Template.CreateProject(cinfo);
if (NewCombineLocation == null || NewCombineLocation.Length == 0) { if (NewCombineLocation == null || NewCombineLocation.Length == 0) {

Loading…
Cancel
Save