Merge pull request #93 from x6herbius/auto-indentation-fix

JulienKluge · web-flow · commit 4c7ed0a47322 · 2017-06-11T21:07:35.000+02:00
Fixed auto-indentation always using tabs
diff --git a/Interop/TranslationProvider.cs b/Interop/TranslationProvider.cs
@@ -757,7 +757,7 @@ private void FillToEnglishDefaults()
 			HardwareAcc = "Use hardware acceleration (if available)";
 			UIAnim = "UI animations";
 			OpenInc = "Auto open includes";
-			OpenIncRec = "Open Includes Recursivly";
+			OpenIncRec = "Open Includes Recursively";
 			AutoUpdate = "Search automatically for updates";
 			ShowToolbar = "Show toolbar";
 			DynamicISAC = "Dynamic Autocompletition/Intellisense";
diff --git a/Resources/lang_0_spedit_entryTemplate.xml b/Resources/lang_0_spedit_entryTemplate.xml
@@ -164,7 +164,7 @@
 	<hardwareacc>Use hardware acceleration (if available)</hardwareacc>
 	<uianim>UI animations</uianim>
 	<openinc>Auto open includes</openinc>
-	<openincrec>Open Includes Recursivly</openincrec>
+	<openincrec>Open Includes Recursively</openincrec>
 	<autoupdate>Search automatically for updates</autoupdate>
 	<showtoolbar>Show toolbar</showtoolbar>
 	<dynamicisac>Dynamic Autocompletition/Intellisense</dynamicisac>
diff --git a/UI/Components/EditorIndetation.cs b/UI/Components/EditorIndetation.cs
@@ -34,7 +34,14 @@ public void IndentLine(TextDocument document, DocumentLine line)
                     }
                     if (lastLineLastNonWhitespaceChar == '{' && currentLineFirstNonWhitespaceChar != '}')
                     {
-                        indentation += "\t";
+                        if (Program.OptionsObject.Editor_ReplaceTabsToWhitespace)
+                        {
+                            indentation += new string(' ', Program.OptionsObject.Editor_IndentationSize);
+                        }
+                        else
+                        {
+                            indentation += "\t";
+                        }
                     }
                     else if (currentLineFirstNonWhitespaceChar == '}')
                     {
diff --git a/UI/Windows/AboutWindow.xaml b/UI/Windows/AboutWindow.xaml
@@ -70,7 +70,7 @@
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Mithat Güner (Turkish translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Reinakumiko (Chinese(simplified) translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- dev-xiamu (Chinese(simplified) translation)" />
-                        <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Pohearts (Chinese(simplified & traditional) translation)" />
+                        <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Pohearts (Chinese(simplified and traditional) translation)" />
                         <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" Text="Proposer: &#013;Powerlord; Wliu; barel31; asherkin; BAILANDO; Arkarr; turtsmcgurts; Tank Missile&#013;Wilczek; Miu; StealthGus; WhiteThunder; ghost" />
                     </StackPanel>
                 </Grid>
diff --git a/UI/Windows/OptionsWindow.xaml b/UI/Windows/OptionsWindow.xaml
@@ -31,7 +31,7 @@
                         <CheckBox Name="HardwareAcc" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0" Content="Use Hardware Acceleration (if available)" Checked="HardwareAcc_Changed" Unchecked="HardwareAcc_Changed" />
                         <CheckBox Name="UIAnimation" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,30,0,0" Content="UI Animations" Checked="UIAnimation_Changed" Unchecked="UIAnimation_Changed" />
                         <CheckBox Name="OpenIncludes" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,55,0,0" Content="Auto Open Includes" Checked="AutoOpenInclude_Changed" Unchecked="AutoOpenInclude_Changed" />
-                        <CheckBox Name="OpenIncludesRecursive" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,80,0,0" Content="Open Includes Recursivly" Checked="OpenIncludeRecursivly_Changed" Unchecked="OpenIncludeRecursivly_Changed" />
+                        <CheckBox Name="OpenIncludesRecursive" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,80,0,0" Content="Open Includes Recursively" Checked="OpenIncludeRecursively_Changed" Unchecked="OpenIncludeRecursively_Changed" />
                         <CheckBox Name="AutoUpdate" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,105,0,0" Content="Search automatically for Updates" Checked="AutoUpdate_Changed" Unchecked="AutoUpdate_Changed" />
                         <CheckBox Name="ShowToolBar" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,130,0,0" Content="Show Toolbar" Checked="ShowToolbar_Changed" Unchecked="ShowToolbar_Changed" />
                         <CheckBox Name="DynamicISAC" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,155,0,0" Content="Dynamic Autocompletition/Intellisense" Checked="DynamicISAC_Changed" Unchecked="DynamicISAC_Changed" />
diff --git a/UI/Windows/OptionsWindow.xaml.cs b/UI/Windows/OptionsWindow.xaml.cs
@@ -61,7 +61,7 @@ private void AutoOpenInclude_Changed(object sender, RoutedEventArgs e)
             Program.OptionsObject.Program_OpenCustomIncludes = OpenIncludes.IsChecked.Value;
             OpenIncludesRecursive.IsEnabled = OpenIncludes.IsChecked.Value;
         }
-        private void OpenIncludeRecursivly_Changed(object sender, RoutedEventArgs e)
+        private void OpenIncludeRecursively_Changed(object sender, RoutedEventArgs e)
         {
             if (!AllowChanging) { return; }
             Program.OptionsObject.Program_OpenIncludesRecursively = OpenIncludesRecursive.IsChecked.Value;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,14 @@ public void IndentLine(TextDocument document, DocumentLine line)`
`34`	`34`	`}`
`35`	`35`	`if (lastLineLastNonWhitespaceChar == '{' && currentLineFirstNonWhitespaceChar != '}')`
`36`	`36`	`{`
`37`		`- indentation += "\t";`
	`37`	`+ if (Program.OptionsObject.Editor_ReplaceTabsToWhitespace)`
	`38`	`+ {`
	`39`	`+ indentation += new string(' ', Program.OptionsObject.Editor_IndentationSize);`
	`40`	`+ }`
	`41`	`+ else`
	`42`	`+ {`
	`43`	`+ indentation += "\t";`
	`44`	`+ }`
`38`	`45`	`}`
`39`	`46`	`else if (currentLineFirstNonWhitespaceChar == '}')`
`40`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private void AutoOpenInclude_Changed(object sender, RoutedEventArgs e)`
`61`	`61`	`Program.OptionsObject.Program_OpenCustomIncludes = OpenIncludes.IsChecked.Value;`
`62`	`62`	`OpenIncludesRecursive.IsEnabled = OpenIncludes.IsChecked.Value;`
`63`	`63`	`}`
`64`		`- private void OpenIncludeRecursivly_Changed(object sender, RoutedEventArgs e)`
	`64`	`+ private void OpenIncludeRecursively_Changed(object sender, RoutedEventArgs e)`
`65`	`65`	`{`
`66`	`66`	`if (!AllowChanging) { return; }`
`67`	`67`	`Program.OptionsObject.Program_OpenIncludesRecursively = OpenIncludesRecursive.IsChecked.Value;`