Merge pull request #16 from milutinke/master

Some quick fixes

Author: Hexer10

Resources/lang_0_spedit.xml

@@ -1408,7 +1408,7 @@
     <erroruploadfile>Грешка приликом одпремања датотеке: {0} на {1}</erroruploadfile>
     <errorupload>Грешка приликом одпремања датотека</errorupload>
     <done>готово</done>
-    <file>Датотека</file>
+    <filestr>Датотека</filestr>
     <new>Нова</new>
     <open>Отвори</open>
     <save>Похрани</save>
@@ -1542,7 +1542,7 @@
     <scrollspeed>Брзина скруловања</scrollspeed>
     <wordwrap>Преломи линије у нови ред</wordwrap>
     <aggindentation>Агресивно удубљавање кода</aggindentation>
-    <reformataftersem>Форматирај линију после ;</reformataftersem>
+    <reformataftersem>Форматирај линију после &#59;</reformataftersem>
     <tabstospace>Замени табове размацима (спејсовима)</tabstospace>
     <autoclosebrack>Аутоматски затварај заграде</autoclosebrack>
     <autoclosestrchr>Аутоматски затварај стрингове и карактере</autoclosestrchr>

UI/Windows/ConfigWindow.xaml

@@ -3,7 +3,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             Width="800" Height="500" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}"
+             Width="1085" Height="625" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}"
                       Title="Configurations" ShowTitleBar="False" Closed="MetroWindow_Closed">
     <controls:MetroWindow.Resources>
         <ResourceDictionary>
@@ -35,39 +35,39 @@
             <Grid Margin="0,5,0,5">
                 <TextBlock Name="NameBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,00,0,0" Text="Name: " IsHitTestVisible="False" />
                 <TextBlock Name="ScriptingDirBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,30,0,0" Text="Scripting Directories: " IsHitTestVisible="False" />
-                <TextBlock Name="DelimitWiBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,43,0,0" Text="(Delimit with ; )" IsHitTestVisible="False" Foreground="Gray" />
+                <TextBlock x:Name="DelimitWiBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,43,0,0" IsHitTestVisible="False" Foreground="Gray" Width="150" ><Run Text="(Delimit with "/><Run Text="sem"/><Run Text="icolon"/><Run Text=" )"/></TextBlock>
                 <TextBlock Name="CopyDirBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,65,0,0" Text="Copy Directory: " IsHitTestVisible="False" />
                 <TextBlock Name="ServerExeBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,95,0,0" Text="Server Executable: " IsHitTestVisible="False" />
                 <TextBlock Name="ServerStartArgBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,125,0,0" Text="Server-Start Arguments: " IsHitTestVisible="False" />
-                <TextBlock Name="PreBuildBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,160,0,0" Text="Pre-Build Commandline: " IsHitTestVisible="False" />
+                <TextBlock Name="PreBuildBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,158,0,0" Text="Pre-Build Commandline: " IsHitTestVisible="False" />
                 <TextBlock Name="PostBuildBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,265,0,0" Text="Post-Build Commandline: " IsHitTestVisible="False" />
                 <TextBlock Name="OptimizeBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,370,0,0" Text="Optimization Level: " IsHitTestVisible="False" />
                 <TextBlock Name="VerboseBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,400,0,0" Text="Verbose Level: " IsHitTestVisible="False" />
-                <CheckBox Name="C_AutoCopy" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="270,375,0,0" Content="Auto Copy after Compile" Checked="C_AutoCopy_Changed" Unchecked="C_AutoCopy_Changed" />
-                <CheckBox Name="C_DeleteAfterCopy" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="270,405,0,0" Content="Delete old .smx after copy" Checked="C_DeleteAfterCopy_Changed" Unchecked="C_DeleteAfterCopy_Changed" />
-                <TextBox Name="C_Name" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="145,0,5,0" TextChanged="C_Name_TextChanged" />
-                <TextBox Name="C_SMDir" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="145,30,5,0" TextChanged="C_SMDir_TextChanged"
+                <CheckBox Name="C_AutoCopy" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="321,370,0,0" Content="Auto Copy after Compile" Checked="C_AutoCopy_Changed" Unchecked="C_AutoCopy_Changed" />
+                <CheckBox Name="C_DeleteAfterCopy" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="321,399,0,0" Content="Delete old .smx after copy" Checked="C_DeleteAfterCopy_Changed" Unchecked="C_DeleteAfterCopy_Changed" />
+                <TextBox Name="C_Name" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,0,5,0" TextChanged="C_Name_TextChanged" />
+                <TextBox Name="C_SMDir" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,30,5,0" TextChanged="C_SMDir_TextChanged"
                          Style="{DynamicResource SearchMetroTextBox}"
                          controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonFolderCmd, Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
-                <TextBox Name="C_CopyDir" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="145,60,5,0" TextChanged="C_CopyDir_TextChanged"
+                <TextBox Name="C_CopyDir" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,60,5,0" TextChanged="C_CopyDir_TextChanged"
                          Style="{DynamicResource SearchMetroTextBox}"
                          controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonFolderCmd, Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
-                <TextBox Name="C_ServerFile" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="145,90,5,0" TextChanged="C_ServerFile_TextChanged"
+                <TextBox Name="C_ServerFile" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,90,5,0" TextChanged="C_ServerFile_TextChanged"
                          Style="{StaticResource SearchMetroTextBox}"
                          controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonFileCmd, Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
-                <TextBox Name="C_ServerArgs" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="145,120,5,0" TextChanged="C_ServerArgs_TextChanged" />
+                <TextBox Name="C_ServerArgs" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,120,5,0" TextChanged="C_ServerArgs_TextChanged" />
                 <TextBox Name="C_PreBuildCmd" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,180,5,0" Height="80" AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextChanged="C_PreBuildCmd_TextChanged" />
                 <TextBox Name="C_PostBuildCmd" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5,285,5,0" Height="80" AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextChanged="C_PostBuildCmd_TextChanged" />
-                <Slider Name="C_OptimizationLevel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="140,370,0,0" Width="75" Minimum="0" Maximum="2" TickFrequency="2" IsSnapToTickEnabled="True" TickPlacement="BottomRight" AutoToolTipPlacement="TopLeft" ValueChanged="C_OptimizationLevel_ValueChanged" />
-                <Slider Name="C_VerboseLevel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="140,400,0,0" Width="75" Minimum="0" Maximum="2" TickFrequency="1" IsSnapToTickEnabled="True" TickPlacement="BottomRight" AutoToolTipPlacement="TopLeft" ValueChanged="C_VerboseLevel_ValueChanged" />
+                <Slider Name="C_OptimizationLevel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="195,370,0,0" Width="75" Minimum="0" Maximum="2" TickFrequency="2" IsSnapToTickEnabled="True" TickPlacement="BottomRight" AutoToolTipPlacement="TopLeft" ValueChanged="C_OptimizationLevel_ValueChanged" />
+                <Slider Name="C_VerboseLevel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="195,400,0,0" Width="75" Minimum="0" Maximum="2" TickFrequency="1" IsSnapToTickEnabled="True" TickPlacement="BottomRight" AutoToolTipPlacement="TopLeft" ValueChanged="C_VerboseLevel_ValueChanged" />
                 <TextBlock Name="FTPHostBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,435,0,0" Text="FTP Host:" IsHitTestVisible="False" />
                 <TextBlock Name="FTPUserBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,465,0,0" Text="FTP User:" IsHitTestVisible="False" />
                 <TextBlock Name="FTPPWBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,495,0,0" Text="FTP Password:" IsHitTestVisible="False" />
                 <TextBlock Name="FTPDirBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,525,0,0" Text="FTP Directory:" IsHitTestVisible="False" />
-                <TextBox Name="C_FTPHost" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,430,5,0" TextChanged="C_FTPHost_TextChanged" />
-                <TextBox Name="C_FTPUser" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,460,5,0" TextChanged="C_FTPUser_TextChanged" />
-                <PasswordBox Name="C_FTPPW" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,490,5,0" PasswordChanged="C_FTPPW_TextChanged" />
-                <TextBox Name="C_FTPDir" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,520,5,0" TextChanged="C_FTPDir_TextChanged" />
+                <TextBox Name="C_FTPHost" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,430,5,0" TextChanged="C_FTPHost_TextChanged" />
+                <TextBox Name="C_FTPUser" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,460,5,0" TextChanged="C_FTPUser_TextChanged" />
+                <PasswordBox Name="C_FTPPW" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,490,5,0" PasswordChanged="C_FTPPW_TextChanged" />
+                <TextBox Name="C_FTPDir" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,520,5,0" TextChanged="C_FTPDir_TextChanged" />
                 <ComboBox Name="CMD_ItemC" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,150,5,0" Text="Commandline variables" Width="200" SelectedIndex="0">
                     <ComboBoxItem Name="ItemC_EditorDir" Content="{}{editordir} - Directory of the SPEdit binary" />
                     <ComboBoxItem Name="ItemC_ScriptDir" Content="{}{scriptdir} - Directory of the Compiling script" />
@@ -82,13 +82,13 @@
                 <TextBlock Name="RConPortBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,630,0,0" Text="RCon Server Port:" IsHitTestVisible="False" />
                 <TextBlock Name="RConPWBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,660,0,0" Text="RCon Password:" IsHitTestVisible="False" />
                 <TextBlock Name="RConComBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,690,0,0" Text="RCon Commands:" IsHitTestVisible="False" />
-                <ComboBox Name="C_RConEngine" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,565,5,0" SelectionChanged="C_RConEngine_Changed">
+                <ComboBox Name="C_RConEngine" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,565,5,0" SelectionChanged="C_RConEngine_Changed">
                     <ComboBoxItem Content="Source Engine" IsSelected="True" />
                     <ComboBoxItem Content="Gold Source Engine" />
                 </ComboBox>
-                <TextBox Name="C_RConIP" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,595,5,0" TextChanged="C_RConIP_TextChanged" />
-                <TextBox Name="C_RConPort" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,625,5,0" TextChanged="C_RConPort_TextChanged" />
-                <PasswordBox Name="C_RConPW" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="140,655,5,0" PasswordChanged="C_RConPW_TextChanged" />
+                <TextBox Name="C_RConIP" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,595,5,0" TextChanged="C_RConIP_TextChanged" />
+                <TextBox Name="C_RConPort" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,625,5,0" TextChanged="C_RConPort_TextChanged" />
+                <PasswordBox Name="C_RConPW" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="195,655,5,0" PasswordChanged="C_RConPW_TextChanged" />
                 <ComboBox Name="Rcon_MenuC" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,685,5,0" Text="Rcon commandline variables" Width="200" SelectedIndex="0">
                     <ComboBoxItem Name="MenuC_PluginsReload" Content="{}{plugins_reload} - Reloads all compiled plugins" />
                     <ComboBoxItem Name="MenuC_PluginsLoad" Content="{}{plugins_load} - Loads all compiled plugins" />