Merge branch 'master' of https://github.com/Natanel-Shitrit/SPCode into Natanel-Shitrit-master

Author: Hexer10

App/AssemblyInfo1.cs

@@ -5,7 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Spcode")]
+[assembly: AssemblyTitle("SPCode")]
 [assembly: AssemblyDescription("SPCode - a lightweight sourcepawn editor")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

Deploy/Compress.ps1

@@ -1,7 +1,7 @@
 $loc = Get-Location
 Set-Location 'bin\Release\'
 $compress = @{
-LiteralPath= "sourcepawn/", "Spcode.exe", "MahApps.Metro.dll", "ICSharpCode.AvalonEdit.dll", "System.Windows.Interactivity.dll", "Xceed.Wpf.AvalonDock.dll", "Xceed.Wpf.AvalonDock.Themes.Metro.dll", "smxdasm.dll", "LysisForSpedit.dll", "QueryMaster.dll", "Ionic.BZip2.dll", "SourcepawnCondenser.dll", "Renci.SshNet.dll", "Newtonsoft.Json.dll", "DiscordRPC.dll", "ControlzEx.dll", "Octokit.dll", "Microsoft.WindowsAPICodePack.dll", "Microsoft.WindowsAPICodePack.Shell.dll", "lang_0_spcode.xml", "GPLv3.txt"
+LiteralPath= "sourcepawn/", "SPCode.exe", "MahApps.Metro.dll", "ICSharpCode.AvalonEdit.dll", "System.Windows.Interactivity.dll", "Xceed.Wpf.AvalonDock.dll", "Xceed.Wpf.AvalonDock.Themes.Metro.dll", "smxdasm.dll", "LysisForSpedit.dll", "QueryMaster.dll", "Ionic.BZip2.dll", "SourcepawnCondenser.dll", "Renci.SshNet.dll", "Newtonsoft.Json.dll", "DiscordRPC.dll", "ControlzEx.dll", "Octokit.dll", "Microsoft.WindowsAPICodePack.dll", "Microsoft.WindowsAPICodePack.Shell.dll", "lang_0_spcode.xml", "GPLv3.txt"
 #Path= "sourcepawn/"
 #CompressionLevel = "Fastest"
 DestinationPath = "SPCode.Portable.zip"

Deploy/SPCode.nsi

@@ -38,7 +38,7 @@ SetOutPath $INSTDIR
 !insertmacro CheckNetFramework 48
 
 
-File Spcode.exe
+File SPCode.exe
 File MahApps.Metro.dll
 File ICSharpCode.AvalonEdit.dll
 File System.Windows.Interactivity.dll
@@ -77,7 +77,7 @@ File /r ".\sourcepawn"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayName" "SPCode - A lightweight sourcepawn editor"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "UninstallString" "$INSTDIR\uninstall.exe"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "InstallLocation" "$INSTDIR"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayIcon" "$INSTDIR\Spcode.exe"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayIcon" "$INSTDIR\SPCode.exe"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "Publisher" "Hexah"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayVersion" "1.6.x.x"
 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "NoModify" 1
@@ -90,33 +90,33 @@ SectionEnd
 
 Section "File Association (.sp)" prog02
 SectionIn 1
-${registerExtension} "$INSTDIR\Spcode.exe" ".sp" "Sourcepawn Script"
+${registerExtension} "$INSTDIR\SPCode.exe" ".sp" "Sourcepawn Script"
 System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 SectionEnd
 
 
 Section "File Association (.inc)" prog03
 SectionIn 1
-${registerExtension} "$INSTDIR\Spcode.exe" ".inc" "Sourcepawn Include-File"
+${registerExtension} "$INSTDIR\SPCode.exe" ".inc" "Sourcepawn Include-File"
 System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 SectionEnd
 
 
 Section "File Association (.smx)" prog04
 SectionIn 1
-${registerExtension} "$INSTDIR\Spcode.exe" ".smx" "Sourcemod Plugin"
+${registerExtension} "$INSTDIR\SPCode.exe" ".smx" "Sourcemod Plugin"
 System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 SectionEnd
 
 
 Section "Desktop Shortcut" prog05
 SectionIn 1
-CreateShortCut "$DESKTOP\SPCode.lnk" "$INSTDIR\Spcode.exe" ""
+CreateShortCut "$DESKTOP\SPCode.lnk" "$INSTDIR\SPCode.exe" ""
 SectionEnd
 
 Section "Startmenu Shortcut" prog06
 SectionIn 1
-CreateShortCut "$SMPROGRAMS\SPCode.lnk" "$INSTDIR\Spcode.exe" ""
+CreateShortCut "$SMPROGRAMS\SPCode.lnk" "$INSTDIR\SPCode.exe" ""
 SectionEnd
 
 Section "Uninstall"
@@ -125,7 +125,7 @@ Delete $INSTDIR\uninstall.exe
 
 
 
-Delete $INSTDIR\Spcode.exe
+Delete $INSTDIR\SPCode.exe
 Delete $INSTDIR\MahApps.Metro.dll
 Delete $INSTDIR\ICSharpCode.AvalonEdit.dll
 Delete $INSTDIR\System.Windows.Interactivity.dll

Interop/ConfigControl.cs

@@ -5,9 +5,9 @@
 using System.Windows;
 using System.Xml;
 using SourcepawnCondenser.SourcemodDefinition;
-using Spcode.Utils;
+using SPCode.Utils;
 
-namespace Spcode.Interop
+namespace SPCode.Interop
 {
     public static class ConfigLoader
     {

Interop/OptionsControl.cs

@@ -4,7 +4,7 @@
 using System.Security.Cryptography;
 using System.Windows.Media;
 
-namespace Spcode //leave this here instead of .Interop because of reasons...
+namespace SPCode //leave this here instead of .Interop because of reasons...
 {
     [Serializable]
     public class OptionsControl

Interop/PipeInteropClient.cs

@@ -3,7 +3,7 @@
 using System.IO.Pipes;
 using System.Text;
 
-namespace Spcode.Interop
+namespace SPCode.Interop
 {
     public static class PipeInteropClient
     {
@@ -18,7 +18,7 @@ public static void ConnectToMasterPipeAndSendData(string data)
                 stream.Write(stringLengthData, 0, stringLengthData.Length);
                 stream.Write(stringData, 0, stringData.Length);
             }
-			using (NamedPipeClientStream pipeClient = new NamedPipeClientStream(".", "SpcodeNamedPipeServer", PipeDirection.Out, PipeOptions.Asynchronous))
+			using (NamedPipeClientStream pipeClient = new NamedPipeClientStream(".", "SPCodeNamedPipeServer", PipeDirection.Out, PipeOptions.Asynchronous))
 			{
 				pipeClient.Connect(5000);
 				pipeClient.Write(array, 0, array.Length);

Interop/PipeInteropServer.cs

@@ -1,9 +1,9 @@
-using Spcode.UI;
+using SPCode.UI;
 using System;
 using System.IO.Pipes;
 using System.Text;
 
-namespace Spcode.Interop
+namespace SPCode.Interop
 {
     public class PipeInteropServer : IDisposable
     {
@@ -37,7 +37,7 @@ private void StartInteropServer()
                 pipeServer.Close();
                 pipeServer = null;
             }
-            pipeServer = new NamedPipeServerStream("SpcodeNamedPipeServer", PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
+            pipeServer = new NamedPipeServerStream("SPCodeNamedPipeServer", PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
             pipeServer.BeginWaitForConnection(new AsyncCallback(PipeConnection_MessageIn), null);
         }
 

Interop/TranslationProvider.cs

@@ -8,7 +8,7 @@
 using System.Xml;
 using System.Windows;
 
-namespace Spcode.Interop
+namespace SPCode.Interop
 {
 	public class TranslationProvider
 	{

Interop/Updater/UpdateCheck.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Octokit;
 
-namespace Spcode.Interop.Updater
+namespace SPCode.Interop.Updater
 {
     public static class UpdateCheck
     {
@@ -64,7 +64,7 @@ private static bool IsUpToDate(Version currentVer, Version latestVer)
         private static async Task<Release> GetLatest()
         {
             var client = new GitHubClient(new ProductHeaderValue("spcode-client"));
-            var releases = await client.Repository.Release.GetAll("Hexer10", "Spcode");
+            var releases = await client.Repository.Release.GetAll("Hexer10", "SPCode");
             return releases[0];
         }
     }

Interop/Updater/UpdateInfo.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using Octokit;
 
-namespace Spcode.Interop.Updater
+namespace SPCode.Interop.Updater
 {
     public class UpdateInfo
     {
@@ -16,6 +16,6 @@ public class UpdateInfo
         public bool SkipDialog = false;
         public bool WriteAble = true;
 
-        public ReleaseAsset Asset => Release.Assets.FirstOrDefault(e => e.Name == "SpcodeUpdater.exe");
+        public ReleaseAsset Asset => Release.Assets.FirstOrDefault(e => e.Name == "SPCodeUpdater.exe");
     }
 }