Author: mkrueger
Date: 2007-10-05 07:12:11 -0400 (Fri, 05 Oct 2007)
New Revision: 86964

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TextFileDescriptionTemplate.cs
Log:
* MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs,
  MonoDevelop.Ide.Templates/TextFileDescriptionTemplate.cs,
  MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs: fixed
  bug 328817 - New created file use Tab with Convert Tab to spaces
  enabled.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-10-05 
10:46:24 UTC (rev 86963)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-10-05 
11:12:11 UTC (rev 86964)
@@ -1,3 +1,10 @@
+2007-10-05  Mike Krüger <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs,
+         MonoDevelop.Ide.Templates/TextFileDescriptionTemplate.cs,
+         MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs: fixed bug
+         328817 - New created file use Tab with Convert Tab to spaces enabled.
+
 2007-10-05  Ankit Jain  <[EMAIL PROTECTED]>
 
        * MonoDevelop.Ide.Commands/ProjectCommands.cs

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
      2007-10-05 10:46:24 UTC (rev 86963)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Content/TextEditorProperties.cs
      2007-10-05 11:12:11 UTC (rev 86964)
@@ -429,5 +429,11 @@
                                properties.Set ("HighlightNewlines", value);
                        }
                }
+               
+               public static string IndentString {
+                       get { 
+                               return ConvertTabsToSpaces ? new string(' ', 
TabIndent) : "\t"; 
+                       }
+               }
        }
 }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
      2007-10-05 10:46:24 UTC (rev 86963)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeDomFileDescriptionTemplate.cs
      2007-10-05 11:12:11 UTC (rev 86964)
@@ -73,11 +73,7 @@
                        CodeCompileUnit cu = xcd.ReadCompileUnit (domContent);
                        
                        CodeGeneratorOptions options = new 
CodeGeneratorOptions();
-                       if (TextEditorProperties.ConvertTabsToSpaces) {
-                               options.IndentString = new String (' ', 
TextEditorProperties.TabIndent);
-                       } else {
-                               options.IndentString = "\t";
-                       }
+                       options.IndentString = 
TextEditorProperties.IndentString;
                        options.BracingStyle = "C";
                        
                        StringWriter sw = new StringWriter ();

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TextFileDescriptionTemplate.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TextFileDescriptionTemplate.cs
 2007-10-05 10:46:24 UTC (rev 86963)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TextFileDescriptionTemplate.cs
 2007-10-05 11:12:11 UTC (rev 86964)
@@ -43,7 +43,7 @@
                
                public override string CreateContent (string language)
                {
-                       return content;
+                       return content.Replace ("\t", 
MonoDevelop.Ide.Gui.Content.TextEditorProperties.IndentString);
                }
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to