Author: lluis
Date: 2008-02-14 12:34:51 -0500 (Thu, 14 Feb 2008)
New Revision: 95667
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs,
MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs,
MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs,
MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs,
MonoDevelop.Ide.Gui.Pads/FileScout.cs,
MonoDevelop.Ide.Gui/StartupInfo.cs,
MonoDevelop.Ide.Gui/ProjectOperations.cs, MonoDevelop.Ide.mdp: Use
Environment.GetFolderPath to get the home directory. Fixes bug
#361880.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-14
17:30:05 UTC (rev 95666)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-14
17:34:51 UTC (rev 95667)
@@ -1,3 +1,14 @@
+2008-02-14 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs,
+ MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs,
+ MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs,
+ MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs,
+ MonoDevelop.Ide.Gui.Pads/FileScout.cs,
+ MonoDevelop.Ide.Gui/StartupInfo.cs,
+ MonoDevelop.Ide.Gui/ProjectOperations.cs, MonoDevelop.Ide.mdp: Use
+ Environment.GetFolderPath to get the home directory. Fixes bug
#361880.
+
2008-02-13 Mike Krüger <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/ViewCommandHandlers.cs: Allowed to bypass the
delete
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -201,6 +201,15 @@
}
}
+ public string ProjectsDefaultPath {
+ get {
+ return PropertyService.Get
("MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath",
System.IO.Path.Combine (Environment.GetFolderPath
(Environment.SpecialFolder.Personal), "Projects"));
+ }
+ set {
+ PropertyService.Set
("MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath", value);
+ }
+ }
+
public Project GetProjectContaining (string fileName)
{
if (this.openCombine == null)
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StartupInfo.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -61,7 +61,7 @@
string a = arg;
// this does not yet work with relative paths
if (a[0] == '~') {
- a = System.IO.Path.Combine
(Environment.GetEnvironmentVariable ("HOME"), a.Substring (1));
+ a = System.IO.Path.Combine
(Environment.GetFolderPath (Environment.SpecialFolder.Personal), a.Substring
(1));
}
if (System.IO.File.Exists (a)) {
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/DirtyFilesDialog.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -47,7 +47,7 @@
tsFiles.AppendValues (projIter,
viewcontent.PathRelativeToProject, true, viewcontent.WorkbenchWindow);
} else {
if (viewcontent.ContentName == null) {
- viewcontent.ContentName =
System.IO.Path.Combine (Environment.GetEnvironmentVariable ("HOME"),
viewcontent.UntitledName);
+ viewcontent.ContentName =
System.IO.Path.Combine (Environment.GetFolderPath
(Environment.SpecialFolder.Personal), viewcontent.UntitledName);
}
tsFiles.AppendValues
(viewcontent.ContentName, true, viewcontent.WorkbenchWindow);
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -472,7 +472,7 @@
hbox_template.PackStart (TemplateView, true, true, 0);
if (basePath == null)
- basePath = PropertyService.Get
("MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath",
System.IO.Path.Combine (Environment.GetEnvironmentVariable ("HOME"),
"Projects"));
+ basePath =
IdeApp.ProjectOperations.ProjectsDefaultPath;
entry_location.Path = basePath;
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ReplaceInFilesDialog.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -271,11 +271,7 @@
string defaultFolder =
this.directoryTextBox.Text;
if (defaultFolder == string.Empty ||
defaultFolder == null) {
// only use the bew project default
path if there is no path set
- defaultFolder = PropertyService.Get (
-
"MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath",
- System.IO.Path.Combine (
-
System.Environment.GetEnvironmentVariable ("HOME"),
-
"Projects")).ToString ();
+ defaultFolder =
IdeApp.ProjectOperations.ProjectsDefaultPath;
}
fd.SetFilename( defaultFolder );
if (fd.Run() == (int)Gtk.ResponseType.Ok)
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/LoadSavePanel.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -64,10 +64,7 @@
//
// load the internationalized strings.
//
- folderEntry.Path = PropertyService.Get(
-
"MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath",
-
System.IO.Path.Combine(System.Environment.GetEnvironmentVariable ("HOME"),
- "Projects")).ToString();
+ folderEntry.Path =
IdeApp.ProjectOperations.ProjectsDefaultPath;
//
// setup the properties
//
@@ -93,7 +90,7 @@
return false;
}
}
-
PropertyService.Set("MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath",
projectPath);
+ IdeApp.ProjectOperations.ProjectsDefaultPath =
projectPath;
return true;
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
2008-02-14 17:30:05 UTC (rev 95666)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/FileScout.cs
2008-02-14 17:34:51 UTC (rev 95667)
@@ -65,8 +65,7 @@
public FileScout()
{
- string path =
PropertyService.Get("MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.DefaultPath",
-
System.Environment.GetEnvironmentVariable("HOME")).ToString();
+ string path =
IdeApp.ProjectOperations.ProjectsDefaultPath;
if (Directory.Exists(path))
{
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2008-02-14 17:30:05 UTC (rev 95666)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2008-02-14 17:34:51 UTC (rev 95667)
@@ -398,16 +398,16 @@
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects.Gui" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Documentation" />
- <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="glade-sharp,
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="glib-sharp,
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Gui,
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Addins,
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Addins.Setup,
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="True" refto="monodoc,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Gac" localcopy="True" refto="glade-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="glib-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
<GtkDesignInfo isWidgetLibrary="True" gtkVersion="2.8.3">
<ExportedWidgets>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
