Author: mhutch
Date: 2006-07-21 13:01:19 -0400 (Fri, 21 Jul 2006)
New Revision: 62872
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
Log:
2006-07-21 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs:
Improve name file generation. Use defaultExtension for filenames
that specify neither a language nor a name pattern.
* MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs:
Make browser preview more robust (missed earlier).
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-07-21
16:34:59 UTC (rev 62871)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-07-21
17:01:19 UTC (rev 62872)
@@ -1,3 +1,11 @@
+2006-07-21 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs:
+ Improve name file generation. Use defaultExtension for filenames
+ that specify neither a language nor a name pattern.
+ * MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs:
+ Make browser preview more robust (missed earlier).
+
2006-07-21 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs: Don't
ctash
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
2006-07-21 16:34:59 UTC (rev 62871)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.BrowserDisplayBinding/BrowserDisplayBinding.cs
2006-07-21 17:01:19 UTC (rev 62872)
@@ -58,7 +58,7 @@
return false;
string mimetype = Gnome.Vfs.MimeType.GetMimeTypeForUri
(filename);
if (mimetype == "text/html")
- return true;
+ return (parent is
MonoDevelop.Ide.Gui.Content.ITextBuffer);
return false;
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2006-07-21 16:34:59 UTC (rev 62871)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
2006-07-21 17:01:19 UTC (rev 62872)
@@ -41,12 +41,14 @@
{
string name;
string defaultName;
+ string defaultExtension;
string generatedFile;
public override void Load (XmlElement filenode)
{
name = filenode.GetAttribute ("name");
- defaultName = filenode.GetAttribute ("DefaultName") +
filenode.GetAttribute ("DefaultExtension");
+ defaultName = filenode.GetAttribute ("DefaultName");
+ defaultExtension = filenode.GetAttribute
("DefaultExtension");
}
public override string Name {
@@ -113,7 +115,7 @@
// All parameters are optional (can be null)
public virtual string GetFileName (Project project, string
language, string baseDirectory, string entryName)
{
- if (((entryName == null) || (entryName.Length < 1)) &&
(defaultName.Length > 0))
+ if (string.IsNullOrEmpty (entryName) &&
!string.IsNullOrEmpty (defaultName))
entryName = defaultName;
string fileName = entryName;
@@ -127,9 +129,14 @@
}
//give it an extension if it didn't get one
(compatibility with pre-substition behaviour)
- if (language != null && language.Length > 0 &&
Path.GetExtension (fileName).Length == 0) {
- IDotNetLanguageBinding languageBinding =
GetDotNetLanguageBinding (language);
- fileName = languageBinding.GetFileName
(fileName);
+ if (Path.GetExtension (fileName).Length == 0) {
+ if (!string.IsNullOrEmpty (defaultExtension)) {
+ fileName = fileName + defaultExtension;
+ }
+ else if (!string.IsNullOrEmpty (language)) {
+ IDotNetLanguageBinding languageBinding
= GetDotNetLanguageBinding (language);
+ fileName = languageBinding.GetFileName
(fileName);
+ }
}
if (baseDirectory != null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
