Script editor: fixed a crash when opening the script editor. Fixes #663

This commit is contained in:
biwa 2021-12-10 17:58:03 +01:00
parent 3226e0d5a6
commit 0945875bd6
2 changed files with 2341 additions and 2311 deletions

View file

@ -102,11 +102,7 @@ namespace CodeImp.DoomBuilder.Controls
this.infoicons = new System.Windows.Forms.ImageList(this.components);
this.scriptsplitter = new CodeImp.DoomBuilder.Controls.CollapsibleSplitContainer();
this.tabs = new CodeImp.DoomBuilder.Controls.VSTabControl();
#if !MONO_WINFORMS
this.infotabs = new Dotnetrix.Controls.TabControlEX();
#else
this.infotabs = new System.Windows.Forms.TabControl();
#endif
this.taberrors = new System.Windows.Forms.TabPage();
this.errorlist = new System.Windows.Forms.ListView();
this.colIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@ -774,52 +770,55 @@ namespace CodeImp.DoomBuilder.Controls
this.scripticons.Images.SetKeyName(24, "ScriptKEYCONF.png");
this.scripticons.Images.SetKeyName(25, "ScriptFONTDEFS.png");
this.scripticons.Images.SetKeyName(26, "ScriptZSCRIPT.png");
this.scripticons.Images.SetKeyName(27, "GroupUnknown.png");
this.scripticons.Images.SetKeyName(28, "GroupACS.png");
this.scripticons.Images.SetKeyName(29, "GroupMODELDEF.png");
this.scripticons.Images.SetKeyName(30, "GroupDECORATE.png");
this.scripticons.Images.SetKeyName(31, "GroupGLDEFS.png");
this.scripticons.Images.SetKeyName(32, "GroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(33, "GroupMAPINFO.png");
this.scripticons.Images.SetKeyName(34, "GroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(35, "GroupTEXTURES.png");
this.scripticons.Images.SetKeyName(36, "GroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(37, "GroupREVERBS.png");
this.scripticons.Images.SetKeyName(38, "GroupTERRAIN.png");
this.scripticons.Images.SetKeyName(39, "GroupX11.png");
this.scripticons.Images.SetKeyName(40, "GroupCVARINFO.png");
this.scripticons.Images.SetKeyName(41, "GroupSNDINFO.png");
this.scripticons.Images.SetKeyName(42, "GroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(43, "GroupMENUDEF.png");
this.scripticons.Images.SetKeyName(44, "GroupSBARINFO.png");
this.scripticons.Images.SetKeyName(45, "GroupUSDF.png");
this.scripticons.Images.SetKeyName(46, "GroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(47, "GroupKEYCONF.png");
this.scripticons.Images.SetKeyName(48, "GroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(49, "GroupZSCRIPT.png");
this.scripticons.Images.SetKeyName(50, "GroupOpen.png");
this.scripticons.Images.SetKeyName(51, "OpenGroupACS.png");
this.scripticons.Images.SetKeyName(52, "OpenGroupMODELDEF.png");
this.scripticons.Images.SetKeyName(53, "OpenGroupDECORATE.png");
this.scripticons.Images.SetKeyName(54, "OpenGroupGLDEFS.png");
this.scripticons.Images.SetKeyName(55, "OpenGroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(56, "OpenGroupMAPINFO.png");
this.scripticons.Images.SetKeyName(57, "OpenGroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(58, "OpenGroupTEXTURES.png");
this.scripticons.Images.SetKeyName(59, "OpenGroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(60, "OpenGroupREVERBS.png");
this.scripticons.Images.SetKeyName(61, "OpenGroupTERRAIN.png");
this.scripticons.Images.SetKeyName(62, "OpenGroupX11.png");
this.scripticons.Images.SetKeyName(63, "OpenGroupCVARINFO.png");
this.scripticons.Images.SetKeyName(64, "OpenGroupSNDINFO.png");
this.scripticons.Images.SetKeyName(65, "OpenGroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(66, "OpenGroupMENUDEF.png");
this.scripticons.Images.SetKeyName(67, "OpenGroupSBARINFO.png");
this.scripticons.Images.SetKeyName(68, "OpenGroupUSDF.png");
this.scripticons.Images.SetKeyName(69, "OpenGroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(70, "OpenGroupKEYCONF.png");
this.scripticons.Images.SetKeyName(71, "OpenGroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(72, "OpenGroupZSCRIPT.png");
this.scripticons.Images.SetKeyName(27, "ScriptDECALDEF.png");
this.scripticons.Images.SetKeyName(28, "ScriptDEHACKED.png");
this.scripticons.Images.SetKeyName(29, "ScriptIWADINFO.png");
this.scripticons.Images.SetKeyName(30, "GroupUnknown.png");
this.scripticons.Images.SetKeyName(31, "GroupACS.png");
this.scripticons.Images.SetKeyName(32, "GroupMODELDEF.png");
this.scripticons.Images.SetKeyName(33, "GroupDECORATE.png");
this.scripticons.Images.SetKeyName(34, "GroupGLDEFS.png");
this.scripticons.Images.SetKeyName(35, "GroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(36, "GroupMAPINFO.png");
this.scripticons.Images.SetKeyName(37, "GroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(38, "GroupTEXTURES.png");
this.scripticons.Images.SetKeyName(39, "GroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(40, "GroupREVERBS.png");
this.scripticons.Images.SetKeyName(41, "GroupTERRAIN.png");
this.scripticons.Images.SetKeyName(42, "GroupX11.png");
this.scripticons.Images.SetKeyName(43, "GroupCVARINFO.png");
this.scripticons.Images.SetKeyName(44, "GroupSNDINFO.png");
this.scripticons.Images.SetKeyName(45, "GroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(46, "GroupMENUDEF.png");
this.scripticons.Images.SetKeyName(47, "GroupSBARINFO.png");
this.scripticons.Images.SetKeyName(48, "GroupUSDF.png");
this.scripticons.Images.SetKeyName(49, "GroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(50, "GroupKEYCONF.png");
this.scripticons.Images.SetKeyName(51, "GroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(52, "GroupZSCRIPT.png");
this.scripticons.Images.SetKeyName(53, "GroupOpen.png");
this.scripticons.Images.SetKeyName(54, "OpenGroupACS.png");
this.scripticons.Images.SetKeyName(55, "OpenGroupMODELDEF.png");
this.scripticons.Images.SetKeyName(56, "OpenGroupDECORATE.png");
this.scripticons.Images.SetKeyName(57, "OpenGroupGLDEFS.png");
this.scripticons.Images.SetKeyName(58, "OpenGroupSNDSEQ.png");
this.scripticons.Images.SetKeyName(59, "OpenGroupMAPINFO.png");
this.scripticons.Images.SetKeyName(60, "OpenGroupVOXELDEF.png");
this.scripticons.Images.SetKeyName(61, "OpenGroupTEXTURES.png");
this.scripticons.Images.SetKeyName(62, "OpenGroupANIMDEFS.png");
this.scripticons.Images.SetKeyName(63, "OpenGroupREVERBS.png");
this.scripticons.Images.SetKeyName(64, "OpenGroupTERRAIN.png");
this.scripticons.Images.SetKeyName(65, "OpenGroupX11.png");
this.scripticons.Images.SetKeyName(66, "OpenGroupCVARINFO.png");
this.scripticons.Images.SetKeyName(67, "OpenGroupSNDINFO.png");
this.scripticons.Images.SetKeyName(68, "OpenGroupLOCKDEFS.png");
this.scripticons.Images.SetKeyName(69, "OpenGroupMENUDEF.png");
this.scripticons.Images.SetKeyName(70, "OpenGroupSBARINFO.png");
this.scripticons.Images.SetKeyName(71, "OpenGroupUSDF.png");
this.scripticons.Images.SetKeyName(72, "OpenGroupGAMEINFO.png");
this.scripticons.Images.SetKeyName(73, "OpenGroupKEYCONF.png");
this.scripticons.Images.SetKeyName(74, "OpenGroupFONTDEFS.png");
this.scripticons.Images.SetKeyName(75, "OpenGroupZSCRIPT.png");
//
// projecticons
//
@ -879,7 +878,6 @@ namespace CodeImp.DoomBuilder.Controls
//
// infotabs
//
#if !MONO_WINFORMS
this.infotabs.Alignment = System.Windows.Forms.TabAlignment.Bottom;
this.infotabs.Appearance = Dotnetrix.Controls.TabAppearanceEX.FlatTab;
this.infotabs.Controls.Add(this.taberrors);
@ -895,19 +893,6 @@ namespace CodeImp.DoomBuilder.Controls
this.infotabs.Size = new System.Drawing.Size(928, 187);
this.infotabs.TabIndex = 0;
this.infotabs.UseVisualStyles = false;
#else
this.infotabs.Alignment = System.Windows.Forms.TabAlignment.Bottom;
this.infotabs.Controls.Add(this.taberrors);
this.infotabs.Controls.Add(this.tabsearchresults);
this.infotabs.Dock = System.Windows.Forms.DockStyle.Fill;
this.infotabs.ImageList = this.infoicons;
this.infotabs.ItemSize = new System.Drawing.Size(74, 19);
this.infotabs.Location = new System.Drawing.Point(0, 0);
this.infotabs.Name = "infotabs";
this.infotabs.SelectedIndex = 1;
this.infotabs.Size = new System.Drawing.Size(928, 187);
this.infotabs.TabIndex = 0;
#endif
//
// taberrors
//

File diff suppressed because it is too large Load diff