Fixed auto-indentation always using tabs

When pressing enter after inserting an opening brace, the editor would
ignore the "Replace tabs with spaces" option and would always indent
with tabs. This has now been fixed.

Additionally, a compilation error resulting from the text string
"Simplified & traditional" has been fixed, and the option text "Open
includes recursivly" has been corrected to "Open includes recursively".

Author: x6herbius

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";

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>

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 == '}')
                     {

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>

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" />

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;