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

Commit f422037

Browse files
maxijabasemaxijabase
committed
last details before release
1 parent 01e7d36 commit f422037

File tree

13 files changed

+96
-40
lines changed

13 files changed

+96
-40
lines changed

‎App/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
[assembly: AssemblyTitle("SPCode")]
99
[assembly: AssemblyDescription("SPCode - A lightweight SourcePawn editor")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
11+
[assembly: AssemblyCompany("SPCode Organization")]
1212
[assembly: AssemblyProduct("SPCode")]
13-
[assembly: AssemblyCopyright("Copyright © Julien Kluge 2015 - Hexah 2021")]
13+
[assembly: AssemblyCopyright("Copyright © Julien Kluge 2015")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616
[assembly: NeutralResourcesLanguage("en-US")]

‎Deploy/Compress.ps1‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
11
$loc = Get-Location
22
Set-Location 'bin\Release\'
33
$compress = @{
4-
LiteralPath= "sourcepawn/", "lysis/", "SPCode.exe", "MdXaml.dll", "MahApps.Metro.dll", "ICSharpCode.AvalonEdit.dll", "ByteSize.dll", "System.Windows.Interactivity.dll", "Xceed.Wpf.AvalonDock.dll", "Xceed.Wpf.AvalonDock.Themes.Metro.dll", "smxdasm.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=
5+
"sourcepawn/",
6+
"lysis/",
7+
"SPCode.exe",
8+
"MdXaml.dll",
9+
"MahApps.Metro.dll",
10+
"ICSharpCode.AvalonEdit.dll",
11+
"ByteSize.dll",
12+
"System.Windows.Interactivity.dll",
13+
"Xceed.Wpf.AvalonDock.dll",
14+
"Xceed.Wpf.AvalonDock.Themes.Metro.dll",
15+
"smxdasm.dll",
16+
"QueryMaster.dll",
17+
"Ionic.BZip2.dll",
18+
"SourcepawnCondenser.dll",
19+
"Renci.SshNet.dll",
20+
"Newtonsoft.Json.dll",
21+
"DiscordRPC.dll",
22+
"ControlzEx.dll",
23+
"Octokit.dll",
24+
"Microsoft.WindowsAPICodePack.dll",
25+
"Microsoft.WindowsAPICodePack.Shell.dll",
26+
"lang_0_spcode.xml",
27+
"GPLv3.txt",
28+
"License.txt"
529
DestinationPath = "SPCode.Portable.zip"
630

731
}

‎Deploy/SPCode.nsi‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ File Microsoft.WindowsAPICodePack.dll
5555
File Microsoft.WindowsAPICodePack.Shell.dll
5656

5757
File lang_0_spcode.xml
58+
File License.txt
5859
File GPLv3.txt
5960

6061
CreateDirectory "$APPDATA\spcode\crashlogs"
@@ -79,8 +80,8 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "D
7980
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "UninstallString" "$INSTDIR\uninstall.exe"
8081
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "InstallLocation" "$INSTDIR"
8182
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayIcon" "$INSTDIR\SPCode.exe"
82-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "Publisher" "Hexah"
83-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayVersion" "1.7"
83+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "Publisher" "SPCode Organization"
84+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "DisplayVersion" "1.8.0.0"
8485
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "NoModify" 1
8586
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spcode" "NoRepair" 1
8687

@@ -90,21 +91,21 @@ SectionEnd
9091

9192
Section "File Association (.sp)" prog02
9293
SectionIn 1
93-
${registerExtension} "$INSTDIR\SPCode.exe" ".sp" "Sourcepawn Script"
94+
${registerExtension} "$INSTDIR\SPCode.exe" ".sp" "SourcePawn Script"
9495
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
9596
SectionEnd
9697

9798

9899
Section "File Association (.inc)" prog03
99100
SectionIn 1
100-
${registerExtension} "$INSTDIR\SPCode.exe" ".inc" "Sourcepawn Include-File"
101+
${registerExtension} "$INSTDIR\SPCode.exe" ".inc" "SourcePawn Include"
101102
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
102103
SectionEnd
103104

104105

105106
Section "File Association (.smx)" prog04
106107
SectionIn 1
107-
${registerExtension} "$INSTDIR\SPCode.exe" ".smx" "Sourcemod Plugin"
108+
${registerExtension} "$INSTDIR\SPCode.exe" ".smx" "SourceMod Plugin"
108109
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
109110
SectionEnd
110111

@@ -144,6 +145,7 @@ Delete $INSTDIR\Microsoft.WindowsAPICodePack.dll
144145
Delete $INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll
145146

146147
Delete $INSTDIR\lang_0_spcode.xml
148+
Delete $INSTDIR\License.txt
147149
Delete $INSTDIR\GPLv3.txt
148150
Delete $INSTDIR\*.dat
149151
RMDir /r $APPDATA\spcode

‎Interop/TranslationProvider.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.IO;
44
using System.Windows;
55
using System.Xml;
6+
using SPCode.Utils;
67

78
namespace SPCode.Interop
89
{
@@ -40,7 +41,7 @@ public void LoadLanguage(string lang, bool Initial = false)
4041
languageIDList.Add("");
4142
lang = lang.Trim().ToLowerInvariant();
4243
IsDefault = (string.IsNullOrEmpty(lang) || lang.ToLowerInvariant() == "en") && Initial;
43-
if (File.Exists("lang_0_spcode.xml"))
44+
if (File.Exists(Constants.LanguagesFile))
4445
{
4546
try
4647
{
@@ -205,7 +206,7 @@ private void FillToEnglishDefaults()
205206
language.Add("ColAbb", "Col");
206207
language.Add("LnAbb", "Ln");
207208
language.Add("LenAbb", "Len");
208-
language.Add("SPEditCap", "a lightweight sourcepawn editor");
209+
language.Add("SPEditCap", "a lightweight SourcePawn editor");
209210
language.Add("WrittenBy", "written by: {0}");
210211
language.Add("License", "License");
211212
language.Add("PeopleInv", "People involved");

‎Resources/License.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---------------------
22
7th march 2015
3-
SPEdit - A lightweight Sourcepawn Editor
3+
SPEdit - A lightweight SourcePawn editor
44
Copyright (C) 2015 Julien Kluge
55

66
This program is free software: you can redistribute it and/or modify

‎Spcode.csproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@
439439
<ClInclude Include="Resources\Misc\Templates\Template_Generic.sp" />
440440
<ClInclude Include="Resources\Misc\Templates\Template_TF2.sp" />
441441
<Content Include="Deploy\nsis-plugins\DotNetChecker.dll" />
442+
<Content Include="Resources\License.txt" />
442443
<Content Include="Resources\Misc\Configurations\sm_1_10_0_6509\include\admin.inc" />
443444
<Content Include="Resources\Misc\Configurations\sm_1_10_0_6509\include\adminmenu.inc" />
444445
<Content Include="Resources\Misc\Configurations\sm_1_10_0_6509\include\adt.inc" />
@@ -567,26 +568,25 @@
567568
</PreBuildEvent>
568569
</PropertyGroup>
569570
<PropertyGroup>
570-
<PostBuildEvent>
571-
md ".\sourcepawn"
572-
md ".\sourcepawn\templates"
573-
md ".\sourcepawn\configs"
574-
md ".\sourcepawn\temp"
575-
md ".\sourcepawn\errorfiles"
576-
md ".\nsis-plugins"
577-
md ".\lysis"
578-
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Templates\*.*" ".\sourcepawn\templates\*.*" /e /y /q
579-
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Configurations" ".\sourcepawn\configs" /e /y /q /d
580-
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Lysis\*.*" ".\lysis" /e /y /q
581-
copy ".\..\..\Resources\Translations\lang_0_spcode.xml" ".\lang_0_spcode.xml" /y
582-
copy ".\..\..\Deploy\SPCode.nsi" ".\SPCode.nsi" /y
583-
copy ".\..\..\Deploy\Compress.ps1" ".\Compress.ps1" /y
584-
copy ".\..\..\Deploy\DotNetChecker.nsh" ".\DotNetChecker.nsh" /y
585-
copy ".\..\..\Deploy\FileAssociation.nsh" ".\FileAssociation.nsh" /y
586-
copy ".\..\..\Deploy\GPLv3.txt" ".\GPLv3.txt" /y
587-
copy ".\..\..\Deploy\icon.ico" ".\icon.ico" /y
588-
copy ".\..\..\Deploy\nsis-plugins\DotNetChecker.dll" ".\nsis-plugins\DotNetChecker.dll" /y
589-
</PostBuildEvent>
571+
<PostBuildEvent>md ".\sourcepawn"
572+
md ".\sourcepawn\templates"
573+
md ".\sourcepawn\configs"
574+
md ".\sourcepawn\temp"
575+
md ".\sourcepawn\errorfiles"
576+
md ".\nsis-plugins"
577+
md ".\lysis"
578+
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Templates\*.*" ".\sourcepawn\templates\*.*" /e /y /q
579+
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Configurations" ".\sourcepawn\configs" /e /y /q /d
580+
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Lysis\*.*" ".\lysis" /e /y /q
581+
copy ".\..\..\Resources\Translations\lang_0_spcode.xml" ".\lang_0_spcode.xml" /y
582+
copy ".\..\..\Resources\License.txt" ".\License.txt" /y
583+
copy ".\..\..\Deploy\SPCode.nsi" ".\SPCode.nsi" /y
584+
copy ".\..\..\Deploy\Compress.ps1" ".\Compress.ps1" /y
585+
copy ".\..\..\Deploy\DotNetChecker.nsh" ".\DotNetChecker.nsh" /y
586+
copy ".\..\..\Deploy\FileAssociation.nsh" ".\FileAssociation.nsh" /y
587+
copy ".\..\..\Deploy\GPLv3.txt" ".\GPLv3.txt" /y
588+
copy ".\..\..\Deploy\icon.ico" ".\icon.ico" /y
589+
copy ".\..\..\Deploy\nsis-plugins\DotNetChecker.dll" ".\nsis-plugins\DotNetChecker.dll" /y</PostBuildEvent>
590590
</PropertyGroup>
591591
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
592592
Other similar extension points exist, see Microsoft.Common.targets.

‎UI/MainWindow/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public MainWindow(SplashScreen sc)
141141
#region Events
142142
private void DockingManager_ActiveContentChanged(object sender, EventArgs e)
143143
{
144-
if (OBTabFile.IsSelected)
144+
if (OBTabFile.IsSelected && !SearchMode)
145145
{
146146
ListViewOBItem_SelectFile(OBTabFile, null);
147147
OBTabFile.IsSelected = true;

‎UI/Windows/AboutWindow.xaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
Width="800" Height="500" ResizeMode="CanResize" Topmost="True" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}" ShowTitleBar="False" Title="About">
5+
Width="800" Height="500" ResizeMode="CanResize" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}" ShowTitleBar="False" Title="About" ShowInTaskbar="True">
76
<controls:MetroWindow.Resources>
87
<ResourceDictionary>
98
<ResourceDictionary.MergedDictionaries>
@@ -47,11 +46,11 @@
4746
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="Auto" Margin="0,2,0,2" IsHitTestVisible="False">
4847
<TextBlock Name="PeopleInvolvedBlock" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="45,0,0,0" Text="People involved:" FontSize="30" FontWeight="Thin" />
4948
<StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="325,15,0,15">
50-
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Julien 'Aeon' Kluge (Original creator of SPEdit)" FontWeight="Bold" FontSize="15" />
51-
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Bara (Tester, Proposer, Contributor, Update Server, Domain)" FontWeight="Bold" FontSize="14" />
49+
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Julien 'Aeon' Kluge (Original creator of SPEdit)" FontWeight="Bold" FontSize="16" />
5250
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Hexah (Maintainer, Italian translation)" FontWeight="Bold" FontSize="14" />
5351
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Natanel-Shitrit (Maintainer)" FontWeight="Bold" FontSize="14" />
5452
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- ampere (Maintainer, Spanish translation)" FontWeight="Bold" FontSize="14"/>
53+
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- Bara (Tester, Proposer, Contributor, Update Server, Domain)" FontWeight="Bold" />
5554
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- mev (Proposer, Contributor, Color Scheme Designer)" FontWeight="Bold" />
5655
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- BAILOPAN (Proposer, Help)" />
5756
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Text="- necavi (Tester, Proposer, Contributor)" />

‎UI/Windows/AboutWindow.xaml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Windows.Media;
77
using System.Windows.Navigation;
88
using MahApps.Metro;
9+
using SPCode.Utils;
910

1011
namespace SPCode.UI.Windows
1112
{
@@ -30,7 +31,7 @@ public AboutWindow()
3031
}
3132
}
3233
TitleBox.Text = $"SPCode ({Assembly.GetEntryAssembly()?.GetName().Version}) - {Program.Translations.GetLanguage("SPEditCap")}";
33-
LicenseField.Text = File.ReadAllText(@"..\..\Resources\License.txt");
34+
LicenseField.Text = File.ReadAllText(Constants.LicenseFile);
3435
}
3536

3637
private void OpenLicenseFlyout(object sender, RoutedEventArgs e)

‎UI/Windows/FindReplaceWindow.xaml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,22 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
x:Class="SPCode.UI.Windows.FindReplaceWindow"
6-
WindowStartupLocation="CenterScreen" GlowBrush="{DynamicResource AccentColorBrush}" Background="{DynamicResource WhiteBrush}" ResizeMode="NoResize" ShowInTaskbar="False" Height="263" Width="536" HorizontalAlignment="Center" VerticalAlignment="Center" UseNoneWindowStyle="False" Topmost="True" TitlebarHeight="20" KeyDown="MetroWindow_KeyDown" Closed="MetroWindow_Closed">
6+
WindowStartupLocation="CenterScreen"
7+
GlowBrush="{DynamicResource AccentColorBrush}"
8+
Background="{DynamicResource WhiteBrush}"
9+
ResizeMode="NoResize"
10+
ShowTitleBar="True"
11+
ShowInTaskbar="True"
12+
Height="263"
13+
Width="536"
14+
Topmost="True"
15+
HorizontalAlignment="Center"
16+
VerticalAlignment="Center"
17+
UseNoneWindowStyle="False"
18+
TitlebarHeight="20"
19+
KeyDown="MetroWindow_KeyDown"
20+
Closed="MetroWindow_Closed">
21+
722
<controls:MetroWindow.Resources>
823
<ResourceDictionary>
924
<ResourceDictionary.MergedDictionaries>

0 commit comments

Comments
 (0)