Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 8a46806

Browse files
Hexer10Hexer10
committed
Merge branch 'Natanel-Shitrit-master' into master
2 parents eb9a29d + 66b5f20 commit 8a46806

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+216
-196
lines changed

‎App/AssemblyInfo1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("Spcode")]
8+
[assembly: AssemblyTitle("SPCode")]
99
[assembly: AssemblyDescription("SPCode - a lightweight sourcepawn editor")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]

‎Deploy/Compress.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$loc = Get-Location
22
Set-Location 'bin\Release\'
33
$compress = @{
4-
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"
4+
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"
55
#Path= "sourcepawn/"
66
#CompressionLevel = "Fastest"
77
DestinationPath = "SPCode.Portable.zip"

‎Deploy/SPCode.nsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SetOutPath $INSTDIR
3838
!insertmacro CheckNetFramework 48
3939

4040

41-
File Spcode.exe
41+
File SPCode.exe
4242
File MahApps.Metro.dll
4343
File ICSharpCode.AvalonEdit.dll
4444
File System.Windows.Interactivity.dll
@@ -77,7 +77,7 @@ File /r ".\sourcepawn"
7777
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayName" "SPCode - A lightweight sourcepawn editor"
7878
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "UninstallString" "$INSTDIR\uninstall.exe"
7979
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "InstallLocation" "$INSTDIR"
80-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayIcon" "$INSTDIR\Spcode.exe"
80+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayIcon" "$INSTDIR\SPCode.exe"
8181
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "Publisher" "Hexah"
8282
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayVersion" "1.6.x.x"
8383
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "NoModify" 1
@@ -90,33 +90,33 @@ SectionEnd
9090

9191
Section "File Association (.sp)" prog02
9292
SectionIn 1
93-
${registerExtension} "$INSTDIR\Spcode.exe" ".sp" "Sourcepawn Script"
93+
${registerExtension} "$INSTDIR\SPCode.exe" ".sp" "Sourcepawn Script"
9494
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
9595
SectionEnd
9696

9797

9898
Section "File Association (.inc)" prog03
9999
SectionIn 1
100-
${registerExtension} "$INSTDIR\Spcode.exe" ".inc" "Sourcepawn Include-File"
100+
${registerExtension} "$INSTDIR\SPCode.exe" ".inc" "Sourcepawn Include-File"
101101
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
102102
SectionEnd
103103

104104

105105
Section "File Association (.smx)" prog04
106106
SectionIn 1
107-
${registerExtension} "$INSTDIR\Spcode.exe" ".smx" "Sourcemod Plugin"
107+
${registerExtension} "$INSTDIR\SPCode.exe" ".smx" "Sourcemod Plugin"
108108
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
109109
SectionEnd
110110

111111

112112
Section "Desktop Shortcut" prog05
113113
SectionIn 1
114-
CreateShortCut "$DESKTOP\SPCode.lnk" "$INSTDIR\Spcode.exe" ""
114+
CreateShortCut "$DESKTOP\SPCode.lnk" "$INSTDIR\SPCode.exe" ""
115115
SectionEnd
116116

117117
Section "Startmenu Shortcut" prog06
118118
SectionIn 1
119-
CreateShortCut "$SMPROGRAMS\SPCode.lnk" "$INSTDIR\Spcode.exe" ""
119+
CreateShortCut "$SMPROGRAMS\SPCode.lnk" "$INSTDIR\SPCode.exe" ""
120120
SectionEnd
121121

122122
Section "Uninstall"
@@ -125,7 +125,7 @@ Delete $INSTDIR\uninstall.exe
125125

126126

127127

128-
Delete $INSTDIR\Spcode.exe
128+
Delete $INSTDIR\SPCode.exe
129129
Delete $INSTDIR\MahApps.Metro.dll
130130
Delete $INSTDIR\ICSharpCode.AvalonEdit.dll
131131
Delete $INSTDIR\System.Windows.Interactivity.dll

‎Interop/ConfigControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using System.Windows;
66
using System.Xml;
77
using SourcepawnCondenser.SourcemodDefinition;
8-
using Spcode.Utils;
8+
using SPCode.Utils;
99

10-
namespace Spcode.Interop
10+
namespace SPCode.Interop
1111
{
1212
public static class ConfigLoader
1313
{

‎Interop/OptionsControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Security.Cryptography;
55
using System.Windows.Media;
66

7-
namespace Spcode //leave this here instead of .Interop because of reasons...
7+
namespace SPCode //leave this here instead of .Interop because of reasons...
88
{
99
[Serializable]
1010
public class OptionsControl

‎Interop/PipeInteropClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO.Pipes;
44
using System.Text;
55

6-
namespace Spcode.Interop
6+
namespace SPCode.Interop
77
{
88
public static class PipeInteropClient
99
{
@@ -18,7 +18,7 @@ public static void ConnectToMasterPipeAndSendData(string data)
1818
stream.Write(stringLengthData, 0, stringLengthData.Length);
1919
stream.Write(stringData, 0, stringData.Length);
2020
}
21-
using (NamedPipeClientStream pipeClient = new NamedPipeClientStream(".", "SpcodeNamedPipeServer", PipeDirection.Out, PipeOptions.Asynchronous))
21+
using (NamedPipeClientStream pipeClient = new NamedPipeClientStream(".", "SPCodeNamedPipeServer", PipeDirection.Out, PipeOptions.Asynchronous))
2222
{
2323
pipeClient.Connect(5000);
2424
pipeClient.Write(array, 0, array.Length);

‎Interop/PipeInteropServer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Spcode.UI;
1+
using SPCode.UI;
22
using System;
33
using System.IO.Pipes;
44
using System.Text;
55

6-
namespace Spcode.Interop
6+
namespace SPCode.Interop
77
{
88
public class PipeInteropServer : IDisposable
99
{
@@ -37,7 +37,7 @@ private void StartInteropServer()
3737
pipeServer.Close();
3838
pipeServer = null;
3939
}
40-
pipeServer = new NamedPipeServerStream("SpcodeNamedPipeServer", PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
40+
pipeServer = new NamedPipeServerStream("SPCodeNamedPipeServer", PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
4141
pipeServer.BeginWaitForConnection(new AsyncCallback(PipeConnection_MessageIn), null);
4242
}
4343

‎Interop/TranslationProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Xml;
99
using System.Windows;
1010

11-
namespace Spcode.Interop
11+
namespace SPCode.Interop
1212
{
1313
public class TranslationProvider
1414
{

‎Interop/Updater/UpdateCheck.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Threading.Tasks;
55
using Octokit;
66

7-
namespace Spcode.Interop.Updater
7+
namespace SPCode.Interop.Updater
88
{
99
public static class UpdateCheck
1010
{
@@ -64,7 +64,7 @@ private static bool IsUpToDate(Version currentVer, Version latestVer)
6464
private static async Task<Release> GetLatest()
6565
{
6666
var client = new GitHubClient(new ProductHeaderValue("spcode-client"));
67-
var releases = await client.Repository.Release.GetAll("Hexer10", "Spcode");
67+
var releases = await client.Repository.Release.GetAll("Hexer10", "SPCode");
6868
return releases[0];
6969
}
7070
}

‎Interop/Updater/UpdateInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Linq;
22
using Octokit;
33

4-
namespace Spcode.Interop.Updater
4+
namespace SPCode.Interop.Updater
55
{
66
public class UpdateInfo
77
{
@@ -16,6 +16,6 @@ public class UpdateInfo
1616
public bool SkipDialog = false;
1717
public bool WriteAble = true;
1818

19-
public ReleaseAsset Asset => Release.Assets.FirstOrDefault(e => e.Name == "SpcodeUpdater.exe");
19+
public ReleaseAsset Asset => Release.Assets.FirstOrDefault(e => e.Name == "SPCodeUpdater.exe");
2020
}
2121
}

‎Interop/Updater/UpdateWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<mahapps:MetroWindow x:Class="Spcode.Interop.Updater.UpdateWindow"
1+
<mahapps:MetroWindow x:Class="SPCode.Interop.Updater.UpdateWindow"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

‎Interop/Updater/UpdateWindow.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Windows;
77
using Octokit;
88

9-
namespace Spcode.Interop.Updater
9+
namespace SPCode.Interop.Updater
1010
{
1111
/// <summary>
1212
/// Interaction logic for UpdateWindow.xaml
@@ -59,8 +59,8 @@ private void StartUpdate()
5959
private void UpdateDownloadWorker()
6060
{
6161
#if DEBUG
62-
var asset = new ReleaseAsset("", 0, "", "SpcodeUpdater.exe", "", "", "", 0, 0, DateTimeOffset.Now,
63-
DateTimeOffset.Now, "https://hexah.net/SpcodeUpdater.exe", null);
62+
var asset = new ReleaseAsset("", 0, "", "SPCodeUpdater.exe", "", "", "", 0, 0, DateTimeOffset.Now,
63+
DateTimeOffset.Now, "https://hexah.net/SPCodeUpdater.exe", null);
6464
#else
6565
var asset = updateInfo.Asset;
6666
#endif
@@ -93,7 +93,7 @@ private void FinalizeUpdate()
9393
try
9494
{
9595
Process.Start(new ProcessStartInfo
96-
{Arguments = "/C SpcodeUpdater.exe", FileName = "cmd", WindowStyle = ProcessWindowStyle.Hidden});
96+
{Arguments = "/C SPCodeUpdater.exe", FileName = "cmd", WindowStyle = ProcessWindowStyle.Hidden});
9797
Succeeded = true;
9898
}
9999
catch (Exception e)

‎Program.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
using System.Windows.Media;
1212
using DiscordRPC;
1313
using MahApps.Metro;
14-
using Spcode.Interop;
15-
using Spcode.Interop.Updater;
16-
using Spcode.UI;
17-
using Spcode.UI.Interop;
14+
using SPCode.Interop;
15+
using SPCode.Interop.Updater;
16+
using SPCode.UI;
17+
using SPCode.UI.Interop;
1818

19-
namespace Spcode
19+
namespace SPCode
2020
{
2121
public static class Program
2222
{
@@ -45,7 +45,7 @@ public static void Main(string[] args)
4545
#endif
4646

4747
bool mutexReserved;
48-
using (new Mutex(true, "SpcodeGlobalMutex", out mutexReserved))
48+
using (new Mutex(true, "SPCodeGlobalMutex", out mutexReserved))
4949
{
5050
if (mutexReserved)
5151
{

‎Properties/Resources.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Properties/Settings.Designer.cs

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Properties/Settings.settings

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Spcode.Properties" GeneratedClassName="Settings">
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="SPCode.Properties" GeneratedClassName="Settings">
33
<Profiles />
44
<Settings>
5-
<Setting Name="Height" Type="System.Double" Scope="User">
6-
<Value Profile="(Default)">1500</Value>
5+
<Setting Name="Height" Type="System.String" Scope="User">
6+
<Value Profile="(Default)">Auto</Value>
77
</Setting>
8-
<Setting Name="Width" Type="System.Double" Scope="User">
9-
<Value Profile="(Default)">1500</Value>
8+
<Setting Name="Width" Type="System.String" Scope="User">
9+
<Value Profile="(Default)">Auto</Value>
1010
</Setting>
11-
<Setting Name="Top" Type="System.Double" Scope="User">
12-
<Value Profile="(Default)">700</Value>
11+
<Setting Name="Top" Type="System.String" Scope="User">
12+
<Value Profile="(Default)">Auto</Value>
1313
</Setting>
14-
<Setting Name="Left" Type="System.Double" Scope="User">
15-
<Value Profile="(Default)">700</Value>
14+
<Setting Name="Left" Type="System.String" Scope="User">
15+
<Value Profile="(Default)">Auto</Value>
1616
</Setting>
1717
</Settings>
1818
</SettingsFile>

‎Spcode.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
<ProjectGuid>{60D2BA42-B59B-4B49-928E-C0CDDE254917}</ProjectGuid>
88
<OutputType>WinExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Spcode</RootNamespace>
11-
<AssemblyName>Spcode</AssemblyName>
10+
<RootNamespace>SPCode</RootNamespace>
11+
<AssemblyName>SPCode</AssemblyName>
1212
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<IsWebBootstrapper>false</IsWebBootstrapper>
16+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17+
<LangVersion>latest</LangVersion>
1618
<PublishUrl>publish\</PublishUrl>
1719
<Install>true</Install>
1820
<InstallFrom>Disk</InstallFrom>
@@ -27,8 +29,6 @@
2729
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
2830
<UseApplicationTrust>false</UseApplicationTrust>
2931
<BootstrapperEnabled>true</BootstrapperEnabled>
30-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
31-
<LangVersion>latest</LangVersion>
3232
</PropertyGroup>
3333
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3434
<PlatformTarget>AnyCPU</PlatformTarget>

0 commit comments

Comments
 (0)