stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2024-11-10 06:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updater? What updater?

Browse source
This commit is contained in:
MascaraSnake 2016-01-30 01:10:49 +01:00
parent 4952d9120a
commit 677b218ae5
5 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Build/Updater.exe
View file

Binary file not shown.

3
Build/Updater.ini
View file

@ -1,3 +0,0 @@
URL http://devbuilds.drdteam.org/doombuilder2-gzdb/
FileName Builder.exe
UpdateName GZDoom_Builder-r[REVNUM].7z

2
Setup/zonebuilder_setup.iss
View file

@ -39,8 +39,6 @@ Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy
Source: Setup\vcredist_x86.exe; DestDir: {tmp}; Flags: dontcopy Source: Setup\vcredist_x86.exe; DestDir: {tmp}; Flags: dontcopy
Source: Builder.exe; DestDir: {app}; Flags: ignoreversion Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
Source: ZoneBuilder.default.cfg; DestDir: {app}; Flags: ignoreversion Source: ZoneBuilder.default.cfg; DestDir: {app}; Flags: ignoreversion
Source: Updater.exe; DestDir: {app}; Flags: ignoreversion
Source: Updater.ini; DestDir: {app}; Flags: ignoreversion
Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion
Source: DevIL.dll; DestDir: {app}; Flags: ignoreversion Source: DevIL.dll; DestDir: {app}; Flags: ignoreversion
Source: SharpCompress.3.5.dll; DestDir: {app}; Flags: ignoreversion Source: SharpCompress.3.5.dll; DestDir: {app}; Flags: ignoreversion

4
Source/Core/Config/ProgramConfiguration.cs
View file

@ -354,7 +354,7 @@ namespace CodeImp.DoomBuilder.Config
autoClearSideTextures = cfg.ReadSetting("autoclearsidetextures", true); autoClearSideTextures = cfg.ReadSetting("autoclearsidetextures", true);
storeSelectedEditTab = cfg.ReadSetting("storeselectededittab", true); storeSelectedEditTab = cfg.ReadSetting("storeselectededittab", true);
maxbackups = cfg.ReadSetting("maxbackups", 3); maxbackups = cfg.ReadSetting("maxbackups", 3);
checkforupdates = cfg.ReadSetting("checkforupdates", false); //mxd checkforupdates = false; //No update checking for Zone Builder
rendercomments = cfg.ReadSetting("rendercomments", true); //mxd rendercomments = cfg.ReadSetting("rendercomments", true); //mxd
rendergrid = cfg.ReadSetting("rendergrid", true); //mxd rendergrid = cfg.ReadSetting("rendergrid", true); //mxd
rendernightspath = cfg.ReadSetting("rendernightspath", true); rendernightspath = cfg.ReadSetting("rendernightspath", true);
@ -463,7 +463,7 @@ namespace CodeImp.DoomBuilder.Config
cfg.WriteSetting("autoclearsidetextures", autoClearSideTextures); cfg.WriteSetting("autoclearsidetextures", autoClearSideTextures);
cfg.WriteSetting("storeselectededittab", storeSelectedEditTab); cfg.WriteSetting("storeselectededittab", storeSelectedEditTab);
cfg.WriteSetting("maxbackups", maxbackups); cfg.WriteSetting("maxbackups", maxbackups);
cfg.WriteSetting("checkforupdates", checkforupdates); //mxd //cfg.WriteSetting("checkforupdates", checkforupdates); //mxd
cfg.WriteSetting("rendercomments", rendercomments); //mxd cfg.WriteSetting("rendercomments", rendercomments); //mxd
cfg.WriteSetting("rendergrid", rendergrid); //mxd cfg.WriteSetting("rendergrid", rendergrid); //mxd
cfg.WriteSetting("rendernightspath", rendernightspath); //mxd cfg.WriteSetting("rendernightspath", rendernightspath); //mxd

20
Source/Core/Controls/ScriptEditorControl.cs
View file

@ -108,6 +108,7 @@ namespace CodeImp.DoomBuilder.Controls
private bool skiptextinsert; //mxd. Gross hacks private bool skiptextinsert; //mxd. Gross hacks
private bool expandcodeblock; //mxd. More gross hacks private bool expandcodeblock; //mxd. More gross hacks
private string highlightedword; //mxd private string highlightedword; //mxd
private Encoding encoding; //mxd
#endregion #endregion
@ -133,6 +134,9 @@ namespace CodeImp.DoomBuilder.Controls
// Initialize // Initialize
InitializeComponent(); InitializeComponent();
//mxd. ASCII with cyrillic support...
encoding = Encoding.GetEncoding(1251);
// Script editor properties // Script editor properties
//TODO: use ScintillaNET properties instead when they become available //TODO: use ScintillaNET properties instead when they become available
scriptedit.DirectMessage(NativeMethods.SCI_SETBACKSPACEUNINDENTS, new IntPtr(1)); scriptedit.DirectMessage(NativeMethods.SCI_SETBACKSPACEUNINDENTS, new IntPtr(1));
@ -581,12 +585,12 @@ namespace CodeImp.DoomBuilder.Controls
public byte[] GetText() public byte[] GetText()
{ {
return Encoding.ASCII.GetBytes(scriptedit.Text); //mxd TODO: other encodings?.. return encoding.GetBytes(scriptedit.Text); //mxd TODO: other encodings?..
} }
public void SetText(byte[] text) public void SetText(byte[] text)
{ {
scriptedit.Text = Encoding.ASCII.GetString(text); //mxd TODO: other encodings?.. scriptedit.Text = encoding.GetString(text); //mxd TODO: other encodings?..
} }
//mxd //mxd
@ -1300,10 +1304,18 @@ namespace CodeImp.DoomBuilder.Controls
} }
} }
} }
//mxd. Handle screenshot saving else
else if (DelayedForm.ProcessSaveScreenshotAction((int)e.KeyData)) {
//mxd. Skip text insert when "save screenshot" action's keys are pressed
Actions.Action[] actions = General.Actions.GetActionsByKey((int)e.KeyData);
foreach (Actions.Action action in actions)
{
if (action.ShortName == "savescreenshot" || action.ShortName == "saveeditareascreenshot")
{ {
skiptextinsert = true; skiptextinsert = true;
return;
}
}
} }
} }