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

Commit 9f19c17

Browse files
Hexer10Hexer10
committed
Update installer
1 parent 9a74f51 commit 9f19c17

File tree

5 files changed

+307
-435
lines changed

5 files changed

+307
-435
lines changed

‎Deploy/SPEdit.nsi‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RequestExecutionLevel admin
1818
!insertmacro MUI_PAGE_WELCOME
1919
!insertmacro MUI_PAGE_LICENSE "GPLv3.txt"
2020
!insertmacro MUI_PAGE_COMPONENTS
21+
!insertmacro MUI_PAGE_DIRECTORY
2122
!insertmacro MUI_PAGE_INSTFILES
2223
!insertmacro MUI_PAGE_FINISH
2324

@@ -35,21 +36,21 @@ SetOutPath $INSTDIR
3536

3637
!insertmacro CheckNetFramework 45
3738

39+
3840
File Spedit.exe
3941
File MahApps.Metro.dll
4042
File ICSharpCode.AvalonEdit.dll
4143
File System.Windows.Interactivity.dll
4244
File Xceed.Wpf.AvalonDock.dll
4345
File Xceed.Wpf.AvalonDock.Themes.Metro.dll
44-
File Xceed.Wpf.AvalonDock.Themes.Aero.dll
45-
File Xceed.Wpf.AvalonDock.Themes.VS2010.dll
46-
File Xceed.Wpf.Toolkit.dll
4746
File smxdasm.dll
4847
File LysisForSpedit.dll
4948
File QueryMaster.dll
5049
File Ionic.BZip2.dll
5150
File SourcepawnCondenser.dll
52-
File ControlzEx.dll
51+
File Renci.SshNet.dll
52+
File Newtonsoft.Json.dll
53+
File DiscordRPC.dll
5354

5455
File lang_0_spedit.xml
5556
File GPLv3.txt
@@ -72,8 +73,8 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "D
7273
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "UninstallString" "$INSTDIR\uninstall.exe"
7374
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "InstallLocation" "$INSTDIR"
7475
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "DisplayIcon" "$INSTDIR\Spedit.exe"
75-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "Publisher" "Julien Kluge"
76-
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "DisplayVersion" "0.40.0-beta"
76+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "Publisher" "Hexah"
77+
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "DisplayVersion" "1.3.4.6"
7778
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "NoModify" 1
7879
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit" "NoRepair" 1
7980

@@ -82,64 +83,68 @@ SectionEnd
8283

8384

8485

85-
8686
Section "File Association (.sp)" prog02
8787
SectionIn 1
8888
${registerExtension} "$INSTDIR\Spedit.exe" ".sp" "Sourcepawn Script"
8989
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
9090
SectionEnd
9191

9292

93-
94-
9593
Section "File Association (.inc)" prog03
9694
SectionIn 1
9795
${registerExtension} "$INSTDIR\Spedit.exe" ".inc" "Sourcepawn Include-File"
9896
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
9997
SectionEnd
10098

10199

102-
103100
Section "File Association (.smx)" prog04
104101
SectionIn 1
105102
${registerExtension} "$INSTDIR\Spedit.exe" ".smx" "Sourcemod Plugin"
106103
System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
107104
SectionEnd
108105

109106

110-
111107
Section "Desktop Shortcut" prog05
112108
SectionIn 1
113109
CreateShortCut "$DESKTOP\SPEdit.lnk" "$INSTDIR\Spedit.exe" ""
114110
SectionEnd
115111

116-
112+
Section "Startmenu Shortcut" prog06
113+
SectionIn 1
114+
CreateShortCut "$SMPROGRAMS\SPEdit.lnk" "$INSTDIR\Spedit.exe" ""
115+
SectionEnd
117116

118117
Section "Uninstall"
119118

120119
Delete $INSTDIR\uninstall.exe
121120

121+
122+
122123
Delete $INSTDIR\Spedit.exe
123124
Delete $INSTDIR\MahApps.Metro.dll
124125
Delete $INSTDIR\ICSharpCode.AvalonEdit.dll
125126
Delete $INSTDIR\System.Windows.Interactivity.dll
126127
Delete $INSTDIR\Xceed.Wpf.AvalonDock.dll
127128
Delete $INSTDIR\Xceed.Wpf.AvalonDock.Themes.Metro.dll
128-
Delete $INSTDIR\Xceed.Wpf.AvalonDock.Themes.Aero.dll
129-
Delete $INSTDIR\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
130-
Delete $INSTDIR\Xceed.Wpf.Toolkit.dll
131129
Delete $INSTDIR\smxdasm.dll
132130
Delete $INSTDIR\LysisForSpedit.dll
133131
Delete $INSTDIR\QueryMaster.dll
134132
Delete $INSTDIR\Ionic.BZip2.dll
135-
Delete $INSTDIR\ControlzEx.dll
133+
Delete $INSTDIR\SourcepawnCondenser.dll
134+
Delete $INSTDIR\Renci.SshNet.dll
135+
Delete $INSTDIR\Newtonsoft.Json.dll
136+
Delete $INSTDIR\DiscordRPC.dll
137+
138+
136139
Delete $INSTDIR\lang_0_spedit.xml
137140
Delete $INSTDIR\GPLv3.txt
138141
Delete $INSTDIR\*.dat
139142
RMDir /r $INSTDIR\sourcepawn
140143
RMDir $INSTDIR
141144

142145
Delete "$DESKTOP\SPEdit.lnk"
146+
Delete "$SMPROGRAMS\SPEdit.lnk"
147+
143148

144149
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\spedit"
145150

‎Deploy/SpeditUpdater/UpdateMarquee.Designer.cs‎

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

‎Deploy/SpeditUpdater/UpdateMarquee.resx‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,13 @@
123123
</data>
124124
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
125125
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
126-
<value>51, 22</value>
126+
<value>84, 42</value>
127+
</data>
128+
<data name="progressBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
129+
<value>4, 6, 4, 6</value>
127130
</data>
128131
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
129-
<value>161, 23</value>
132+
<value>269, 44</value>
130133
</data>
131134
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
132135
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
@@ -151,10 +154,13 @@
151154
<value>NoControl</value>
152155
</data>
153156
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
154-
<value>51, 0</value>
157+
<value>84, 0</value>
158+
</data>
159+
<data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
160+
<value>4, 0, 4, 0</value>
155161
</data>
156162
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
157-
<value>77, 13</value>
163+
<value>125, 25</value>
158164
</data>
159165
<data name="label1.TabIndex" type="System.Int32, mscorlib">
160166
<value>2</value>
@@ -180,8 +186,11 @@
180186
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
181187
<value>0, 0</value>
182188
</data>
189+
<data name="pictureBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
190+
<value>4, 6, 4, 6</value>
191+
</data>
183192
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
184-
<value>45, 45</value>
193+
<value>76, 86</value>
185194
</data>
186195
<data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
187196
<value>StretchImage</value>
@@ -202,10 +211,13 @@
202211
<value>3</value>
203212
</data>
204213
<data name="button1.Location" type="System.Drawing.Point, System.Drawing">
205-
<value>218, 22</value>
214+
<value>363, 42</value>
215+
</data>
216+
<data name="button1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
217+
<value>4, 6, 4, 6</value>
206218
</data>
207219
<data name="button1.Size" type="System.Drawing.Size, System.Drawing">
208-
<value>75, 23</value>
220+
<value>124, 44</value>
209221
</data>
210222
<data name="button1.TabIndex" type="System.Int32, mscorlib">
211223
<value>3</value>
@@ -232,10 +244,10 @@
232244
<value>True</value>
233245
</metadata>
234246
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
235-
<value>6, 13</value>
247+
<value>10, 25</value>
236248
</data>
237249
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
238-
<value>300, 45</value>
250+
<value>500, 86</value>
239251
</data>
240252
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
241253
<value>
@@ -1944,6 +1956,9 @@
19441956
AACAPwAAgD8AAP//AAA=
19451957
</value>
19461958
</data>
1959+
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
1960+
<value>4, 6, 4, 6</value>
1961+
</data>
19471962
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
19481963
<value>CenterScreen</value>
19491964
</data>

0 commit comments

Comments
 (0)