From baebd4aed1a08f7912b822b542b604d8eaa1ae0c Mon Sep 17 00:00:00 2001 From: AdAstra-LD <76622070+AdAstra-LD@users.noreply.github.com> Date: Fri, 6 Aug 2021 02:09:14 +0200 Subject: [PATCH] Migrated scriptEditor to ScintillaNET --- DS_Map/DSPRE.csproj | 8 + DS_Map/Main Window.Designer.cs | 1769 +++++++++-------- DS_Map/Main Window.cs | 629 ++++-- DS_Map/Main Window.resx | 1451 +++++++++++++- DS_Map/Properties/Resources.Designer.cs | 30 + DS_Map/Properties/Resources.resx | 9 + DS_Map/ROMFiles/ScriptCommand.cs | 4 +- DS_Map/ROMFiles/ScriptFile.cs | 39 +- .../Graphics/Program Icons/compressArrow.png | Bin 0 -> 247 bytes .../Graphics/Program Icons/expandArrow.png | Bin 0 -> 197 bytes .../Resources/Graphics/Program Icons/lens.png | Bin 0 -> 485 bytes DS_Map/Resources/PokeDatabase.cs | 12 +- DS_Map/ScintillaUtils/HotKeyManager.cs | 24 + DS_Map/ScintillaUtils/SearchManager.cs | 135 ++ DS_Map/packages.config | 1 + 15 files changed, 3033 insertions(+), 1078 deletions(-) create mode 100644 DS_Map/Resources/Graphics/Program Icons/compressArrow.png create mode 100644 DS_Map/Resources/Graphics/Program Icons/expandArrow.png create mode 100644 DS_Map/Resources/Graphics/Program Icons/lens.png create mode 100644 DS_Map/ScintillaUtils/HotKeyManager.cs create mode 100644 DS_Map/ScintillaUtils/SearchManager.cs diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index 16a6c3c..2998b10 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -76,6 +76,9 @@ + + ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll + ..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll @@ -166,6 +169,8 @@ + + Form @@ -1279,6 +1284,9 @@ + + + diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 0f29c05..d3cc8bd 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -32,21 +32,6 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); this.removeLastHeaderBTN = new System.Windows.Forms.Button(); @@ -179,22 +164,19 @@ this.removeHeadersButton = new System.Windows.Forms.Button(); this.addHeightsButton = new System.Windows.Forms.Button(); this.addHeadersButton = new System.Windows.Forms.Button(); - this.saveMatrixButton = new System.Windows.Forms.Button(); this.labelMatrices = new System.Windows.Forms.Label(); this.matrixNameLabel = new System.Windows.Forms.Label(); this.matrixTabControl = new System.Windows.Forms.TabControl(); this.headersTabPage = new System.Windows.Forms.TabPage(); - this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); this.heightsTabPage = new System.Windows.Forms.TabPage(); - this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mapFilesTabPage = new System.Windows.Forms.TabPage(); - this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.matrixNameTextBox = new System.Windows.Forms.TextBox(); this.heightUpDown = new System.Windows.Forms.NumericUpDown(); this.widthUpDown = new System.Windows.Forms.NumericUpDown(); this.heightLabel = new System.Windows.Forms.Label(); this.widthLabel = new System.Windows.Forms.Label(); this.selectMatrixComboBox = new System.Windows.Forms.ComboBox(); + this.saveMatrixButton = new System.Windows.Forms.Button(); this.mapEditorTabPage = new System.Windows.Forms.TabPage(); this.mapScreenshotButton = new System.Windows.Forms.Button(); this.exportCurrentMapBinButton = new System.Windows.Forms.Button(); @@ -204,7 +186,6 @@ this.mapRenderPanel = new System.Windows.Forms.Panel(); this.mapOpenGlControl = new Tao.Platform.Windows.SimpleOpenGlControl(); this.movPictureBox = new System.Windows.Forms.PictureBox(); - this.saveMapButton = new System.Windows.Forms.Button(); this.label26 = new System.Windows.Forms.Label(); this.buildTextureComboBox = new System.Windows.Forms.ComboBox(); this.mapFileLabel = new System.Windows.Forms.Label(); @@ -261,12 +242,12 @@ this.collisionGroupBox = new System.Windows.Forms.GroupBox(); this.collisionPainterComboBox = new System.Windows.Forms.ComboBox(); this.collisionPainterPictureBox = new System.Windows.Forms.PictureBox(); - this.ImportMovButton = new System.Windows.Forms.Button(); - this.exportMovButton = new System.Windows.Forms.Button(); this.selectCollisionPanel = new System.Windows.Forms.Panel(); this.collisionPictureBox = new System.Windows.Forms.PictureBox(); this.selectTypePanel = new System.Windows.Forms.Panel(); this.typePictureBox = new System.Windows.Forms.PictureBox(); + this.ImportMovButton = new System.Windows.Forms.Button(); + this.exportMovButton = new System.Windows.Forms.Button(); this.modelTabPage = new System.Windows.Forms.TabPage(); this.embedTexturesInMapModelCheckBox = new System.Windows.Forms.CheckBox(); this.ModelSizeTXT = new System.Windows.Forms.TextBox(); @@ -290,6 +271,7 @@ this.radio3D = new System.Windows.Forms.RadioButton(); this.radio2D = new System.Windows.Forms.RadioButton(); this.wireframeCheckBox = new System.Windows.Forms.CheckBox(); + this.saveMapButton = new System.Windows.Forms.Button(); this.nsbtxEditorTabPage = new System.Windows.Forms.TabPage(); this.groupBox7 = new System.Windows.Forms.GroupBox(); this.removeNSBTXButton = new System.Windows.Forms.Button(); @@ -331,13 +313,8 @@ this.eventAreaDataUpDown = new System.Windows.Forms.NumericUpDown(); this.eventMapTextureLabel = new System.Windows.Forms.Label(); this.RightClickLabel = new System.Windows.Forms.Label(); - this.rightClickPicture = new System.Windows.Forms.PictureBox(); this.WheelClickLabel = new System.Windows.Forms.Label(); this.LeftClickLabel = new System.Windows.Forms.Label(); - this.wheelClickPicture = new System.Windows.Forms.PictureBox(); - this.LeftClickPicture = new System.Windows.Forms.PictureBox(); - this.removeEventFileButton = new System.Windows.Forms.Button(); - this.addEventFileButton = new System.Windows.Forms.Button(); this.eventMatrixYUpDown = new System.Windows.Forms.NumericUpDown(); this.eventMatrixXUpDown = new System.Windows.Forms.NumericUpDown(); this.eventMatrixYLabel = new System.Windows.Forms.Label(); @@ -345,14 +322,7 @@ this.matrixNavigatorLabel = new System.Windows.Forms.Label(); this.eventMatrixPanel = new System.Windows.Forms.Panel(); this.eventMatrixPictureBox = new System.Windows.Forms.PictureBox(); - this.eventShiftRightButton = new System.Windows.Forms.Button(); - this.eventShiftLeftButton = new System.Windows.Forms.Button(); - this.eventShiftUpButton = new System.Windows.Forms.Button(); - this.eventShiftDownButton = new System.Windows.Forms.Button(); this.selectEventComboBox = new System.Windows.Forms.ComboBox(); - this.exportEventFileButton = new System.Windows.Forms.Button(); - this.importEventFileButton = new System.Windows.Forms.Button(); - this.saveEventsButton = new System.Windows.Forms.Button(); this.backgroundMapLabel = new System.Windows.Forms.Label(); this.eventMatrixUpDown = new System.Windows.Forms.NumericUpDown(); this.eventsTabControl = new System.Windows.Forms.TabControl(); @@ -385,14 +355,12 @@ this.isTrainerRadioButton = new System.Windows.Forms.RadioButton(); this.isItemRadioButton = new System.Windows.Forms.RadioButton(); this.spriteIDlabel = new System.Windows.Forms.Label(); - this.duplicateOverworldsButton = new System.Windows.Forms.Button(); this.groupBox17 = new System.Windows.Forms.GroupBox(); this.button14 = new System.Windows.Forms.Button(); this.owYMatrixUpDown = new System.Windows.Forms.NumericUpDown(); this.label12 = new System.Windows.Forms.Label(); this.owXMatrixUpDown = new System.Windows.Forms.NumericUpDown(); this.label11 = new System.Windows.Forms.Label(); - this.owSpritePictureBox = new System.Windows.Forms.PictureBox(); this.owMovementGroupBox = new System.Windows.Forms.GroupBox(); this.groupBox23 = new System.Windows.Forms.GroupBox(); this.label39 = new System.Windows.Forms.Label(); @@ -425,6 +393,8 @@ this.owSpriteComboBox = new System.Windows.Forms.ComboBox(); this.owIDLabel = new System.Windows.Forms.Label(); this.owIDNumericUpDown = new System.Windows.Forms.NumericUpDown(); + this.duplicateOverworldsButton = new System.Windows.Forms.Button(); + this.owSpritePictureBox = new System.Windows.Forms.PictureBox(); this.removeOverworldButton = new System.Windows.Forms.Button(); this.addOverworldButton = new System.Windows.Forms.Button(); this.overworldsListBox = new System.Windows.Forms.ListBox(); @@ -461,7 +431,6 @@ this.label28 = new System.Windows.Forms.Label(); this.triggerScriptUpDown = new System.Windows.Forms.NumericUpDown(); this.label27 = new System.Windows.Forms.Label(); - this.duplicateTriggersButton = new System.Windows.Forms.Button(); this.groupBox16 = new System.Windows.Forms.GroupBox(); this.triggerLengthLabel = new System.Windows.Forms.Label(); this.triggerLengthUpDown = new System.Windows.Forms.NumericUpDown(); @@ -480,13 +449,31 @@ this.triggerXMatrixUpDown = new System.Windows.Forms.NumericUpDown(); this.triggerXMatrixLabel = new System.Windows.Forms.Label(); this.triggerYMatrixUpDown = new System.Windows.Forms.NumericUpDown(); + this.duplicateTriggersButton = new System.Windows.Forms.Button(); this.removeTriggerButton = new System.Windows.Forms.Button(); this.addTriggerButton = new System.Windows.Forms.Button(); this.triggersListBox = new System.Windows.Forms.ListBox(); this.eventPanel = new System.Windows.Forms.Panel(); this.eventPictureBox = new System.Windows.Forms.PictureBox(); this.eventOpenGlControl = new Tao.Platform.Windows.SimpleOpenGlControl(); - this.scriptEditorTabPage = new System.Windows.Forms.TabPage(); + this.rightClickPicture = new System.Windows.Forms.PictureBox(); + this.wheelClickPicture = new System.Windows.Forms.PictureBox(); + this.LeftClickPicture = new System.Windows.Forms.PictureBox(); + this.removeEventFileButton = new System.Windows.Forms.Button(); + this.addEventFileButton = new System.Windows.Forms.Button(); + this.eventShiftRightButton = new System.Windows.Forms.Button(); + this.eventShiftLeftButton = new System.Windows.Forms.Button(); + this.eventShiftUpButton = new System.Windows.Forms.Button(); + this.eventShiftDownButton = new System.Windows.Forms.Button(); + this.exportEventFileButton = new System.Windows.Forms.Button(); + this.importEventFileButton = new System.Windows.Forms.Button(); + this.saveEventsButton = new System.Windows.Forms.Button(); + this.scriptTabPage = new System.Windows.Forms.TabPage(); + this.compressScriptTextButton = new System.Windows.Forms.Button(); + this.expandScriptTextButton = new System.Windows.Forms.Button(); + this.findScriptTextButton = new System.Windows.Forms.Button(); + this.scriptEditorWhitespacesCheckbox = new System.Windows.Forms.CheckBox(); + this.scriptEditorWordWrapCheckbox = new System.Windows.Forms.CheckBox(); this.groupBox24 = new System.Windows.Forms.GroupBox(); this.SyncNavigatorCB = new System.Windows.Forms.CheckBox(); this.ScriptNavigatorTabControl = new System.Windows.Forms.TabControl(); @@ -514,14 +501,26 @@ this.addScriptFileButton = new System.Windows.Forms.Button(); this.scriptEditorTabControl = new System.Windows.Forms.TabControl(); this.scriptsTabPage = new System.Windows.Forms.TabPage(); - this.scriptTextBox = new System.Windows.Forms.RichTextBox(); - this.LineNumberTextBoxScript = new System.Windows.Forms.RichTextBox(); + this.PanelSearchScripts = new System.Windows.Forms.Panel(); + this.BtnNextSearchScript = new System.Windows.Forms.Button(); + this.BtnPrevSearchScript = new System.Windows.Forms.Button(); + this.BtnCloseSearchScript = new System.Windows.Forms.Button(); + this.panelSearchScriptTextBox = new System.Windows.Forms.TextBox(); + this.scintillaScriptsPanel = new System.Windows.Forms.Panel(); this.functionTabPage = new System.Windows.Forms.TabPage(); - this.functionTextBox = new System.Windows.Forms.RichTextBox(); - this.LineNumberTextBoxFunc = new System.Windows.Forms.RichTextBox(); + this.PanelSearchFunctions = new System.Windows.Forms.Panel(); + this.BtnNextSearchFunc = new System.Windows.Forms.Button(); + this.BtnPrevSearchFunc = new System.Windows.Forms.Button(); + this.BtnCloseSearchFunc = new System.Windows.Forms.Button(); + this.panelSearchFunctionTextBox = new System.Windows.Forms.TextBox(); + this.scintillaFunctionsPanel = new System.Windows.Forms.Panel(); this.movementTabPage = new System.Windows.Forms.TabPage(); - this.actionsTextBox = new System.Windows.Forms.RichTextBox(); - this.LineNumberTextBoxMov = new System.Windows.Forms.RichTextBox(); + this.PanelSearchActions = new System.Windows.Forms.Panel(); + this.BtnNextSearchActions = new System.Windows.Forms.Button(); + this.BtnPrevSearchActions = new System.Windows.Forms.Button(); + this.BtnCloseSearchActions = new System.Windows.Forms.Button(); + this.panelSearchActionTextBox = new System.Windows.Forms.TextBox(); + this.scintillaActionsPanel = new System.Windows.Forms.Panel(); this.label5 = new System.Windows.Forms.Label(); this.selectScriptFileComboBox = new System.Windows.Forms.ComboBox(); this.textEditorTabPage = new System.Windows.Forms.TabPage(); @@ -542,17 +541,17 @@ this.searchMessageTextBox = new System.Windows.Forms.TextBox(); this.searchMessageButton = new System.Windows.Forms.Button(); this.replaceMessageButton = new System.Windows.Forms.Button(); - this.removeStringButton = new System.Windows.Forms.Button(); - this.addStringButton = new System.Windows.Forms.Button(); this.textEditorDataGridView = new System.Windows.Forms.DataGridView(); this.messageColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label6 = new System.Windows.Forms.Label(); + this.selectTextFileComboBox = new System.Windows.Forms.ComboBox(); + this.removeStringButton = new System.Windows.Forms.Button(); + this.addStringButton = new System.Windows.Forms.Button(); this.exportTextFileButton = new System.Windows.Forms.Button(); this.importTextFileButton = new System.Windows.Forms.Button(); this.saveTextArchiveButton = new System.Windows.Forms.Button(); this.removeMessageFileButton = new System.Windows.Forms.Button(); this.addTextArchiveButton = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); - this.selectTextFileComboBox = new System.Windows.Forms.ComboBox(); this.cameraEditorTabPage = new System.Windows.Forms.TabPage(); this.exportCameraTableButton = new System.Windows.Forms.Button(); this.importCameraTableButton = new System.Windows.Forms.Button(); @@ -670,7 +669,6 @@ this.partyItem1ComboBox = new System.Windows.Forms.ComboBox(); this.partyPokemon1PictureBox = new System.Windows.Forms.PictureBox(); this.partyPokemon1ComboBox = new System.Windows.Forms.ComboBox(); - this.trainerSaveCurrentButton = new System.Windows.Forms.Button(); this.groupBox27 = new System.Windows.Forms.GroupBox(); this.label73 = new System.Windows.Forms.Label(); this.encounterSSEQAltUpDown = new System.Windows.Forms.NumericUpDown(); @@ -712,6 +710,7 @@ this.trainerClassListBox = new System.Windows.Forms.ListBox(); this.label42 = new System.Windows.Forms.Label(); this.trainerComboBox = new System.Windows.Forms.ComboBox(); + this.trainerSaveCurrentButton = new System.Windows.Forms.Button(); this.tableEditorTabPage = new System.Windows.Forms.TabPage(); this.pbEffectsGroupBox = new System.Windows.Forms.GroupBox(); this.HOWpbEffectsTableButton = new System.Windows.Forms.Button(); @@ -774,10 +773,10 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripProgressBar = new System.Windows.Forms.ToolStripProgressBar(); - this.loadRomButton = new System.Windows.Forms.ToolStripButton(); - this.saveRomButton = new System.Windows.Forms.ToolStripButton(); this.mainToolStrip = new System.Windows.Forms.ToolStrip(); + this.loadRomButton = new System.Windows.Forms.ToolStripButton(); this.readDataFromFolderButton = new System.Windows.Forms.ToolStripButton(); + this.saveRomButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.unpackAllButton = new System.Windows.Forms.ToolStripButton(); this.updateMapNarcsButton = new System.Windows.Forms.ToolStripButton(); @@ -826,12 +825,6 @@ ((System.ComponentModel.ISupportInitialize)(this.weatherPictureBox)).BeginInit(); this.matrixEditorTabPage.SuspendLayout(); this.matrixTabControl.SuspendLayout(); - this.headersTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); - this.heightsTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); - this.mapFilesTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).BeginInit(); this.mapEditorTabPage.SuspendLayout(); @@ -874,9 +867,6 @@ this.eventEditorTabPage.SuspendLayout(); this.groupBox21.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.eventAreaDataUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.eventMatrixYUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.eventMatrixXUpDown)).BeginInit(); this.eventMatrixPanel.SuspendLayout(); @@ -896,7 +886,6 @@ this.groupBox17.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.owYMatrixUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.owXMatrixUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.owSpritePictureBox)).BeginInit(); this.owMovementGroupBox.SuspendLayout(); this.groupBox23.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.owXRangeUpDown)).BeginInit(); @@ -910,6 +899,7 @@ ((System.ComponentModel.ISupportInitialize)(this.owScriptNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.owFlagNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.owIDNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.owSpritePictureBox)).BeginInit(); this.warpsTabPage.SuspendLayout(); this.groupBox11.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.warpAnchorUpDown)).BeginInit(); @@ -939,7 +929,10 @@ ((System.ComponentModel.ISupportInitialize)(this.triggerYMatrixUpDown)).BeginInit(); this.eventPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.eventPictureBox)).BeginInit(); - this.scriptEditorTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).BeginInit(); + this.scriptTabPage.SuspendLayout(); this.groupBox24.SuspendLayout(); this.ScriptNavigatorTabControl.SuspendLayout(); this.ScriptsNavTab.SuspendLayout(); @@ -948,8 +941,11 @@ this.groupBox8.SuspendLayout(); this.scriptEditorTabControl.SuspendLayout(); this.scriptsTabPage.SuspendLayout(); + this.PanelSearchScripts.SuspendLayout(); this.functionTabPage.SuspendLayout(); + this.PanelSearchFunctions.SuspendLayout(); this.movementTabPage.SuspendLayout(); + this.PanelSearchActions.SuspendLayout(); this.textEditorTabPage.SuspendLayout(); this.LineNumbersFormatgroupBox.SuspendLayout(); this.groupBox13.SuspendLayout(); @@ -1029,7 +1025,7 @@ this.mainTabControl.Controls.Add(this.mapEditorTabPage); this.mainTabControl.Controls.Add(this.nsbtxEditorTabPage); this.mainTabControl.Controls.Add(this.eventEditorTabPage); - this.mainTabControl.Controls.Add(this.scriptEditorTabPage); + this.mainTabControl.Controls.Add(this.scriptTabPage); this.mainTabControl.Controls.Add(this.textEditorTabPage); this.mainTabControl.Controls.Add(this.cameraEditorTabPage); this.mainTabControl.Controls.Add(this.trainerEditorTabPage); @@ -1240,7 +1236,7 @@ // // importHeaderFromFileButton // - this.importHeaderFromFileButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importHeaderFromFileButton.Image = ((System.Drawing.Image)(resources.GetObject("importHeaderFromFileButton.Image"))); this.importHeaderFromFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importHeaderFromFileButton.Location = new System.Drawing.Point(912, 518); this.importHeaderFromFileButton.Name = "importHeaderFromFileButton"; @@ -1254,7 +1250,7 @@ // // exportHeaderToFileButton // - this.exportHeaderToFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportHeaderToFileButton.Image = ((System.Drawing.Image)(resources.GetObject("exportHeaderToFileButton.Image"))); this.exportHeaderToFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportHeaderToFileButton.Location = new System.Drawing.Point(992, 518); this.exportHeaderToFileButton.Name = "exportHeaderToFileButton"; @@ -2277,7 +2273,7 @@ // pasteMapSettingsButton // this.pasteMapSettingsButton.Enabled = false; - this.pasteMapSettingsButton.Image = global::DSPRE.Properties.Resources.pasteIcon; + this.pasteMapSettingsButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteMapSettingsButton.Image"))); this.pasteMapSettingsButton.Location = new System.Drawing.Point(239, 74); this.pasteMapSettingsButton.Name = "pasteMapSettingsButton"; this.pasteMapSettingsButton.Size = new System.Drawing.Size(35, 37); @@ -2444,7 +2440,6 @@ this.matrixEditorTabPage.Controls.Add(this.removeHeadersButton); this.matrixEditorTabPage.Controls.Add(this.addHeightsButton); this.matrixEditorTabPage.Controls.Add(this.addHeadersButton); - this.matrixEditorTabPage.Controls.Add(this.saveMatrixButton); this.matrixEditorTabPage.Controls.Add(this.labelMatrices); this.matrixEditorTabPage.Controls.Add(this.matrixNameLabel); this.matrixEditorTabPage.Controls.Add(this.matrixTabControl); @@ -2454,6 +2449,7 @@ this.matrixEditorTabPage.Controls.Add(this.heightLabel); this.matrixEditorTabPage.Controls.Add(this.widthLabel); this.matrixEditorTabPage.Controls.Add(this.selectMatrixComboBox); + this.matrixEditorTabPage.Controls.Add(this.saveMatrixButton); this.matrixEditorTabPage.ImageIndex = 1; this.matrixEditorTabPage.Location = new System.Drawing.Point(4, 23); this.matrixEditorTabPage.Name = "matrixEditorTabPage"; @@ -2465,7 +2461,7 @@ // setSpawnPointButton // this.setSpawnPointButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.setSpawnPointButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; + this.setSpawnPointButton.Image = ((System.Drawing.Image)(resources.GetObject("setSpawnPointButton.Image"))); this.setSpawnPointButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.setSpawnPointButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.setSpawnPointButton.Location = new System.Drawing.Point(11, 521); @@ -2480,7 +2476,7 @@ // // resetColorTableButton // - this.resetColorTableButton.Image = global::DSPRE.Properties.Resources.resetColorTable; + this.resetColorTableButton.Image = ((System.Drawing.Image)(resources.GetObject("resetColorTableButton.Image"))); this.resetColorTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.resetColorTableButton.Location = new System.Drawing.Point(11, 446); this.resetColorTableButton.Name = "resetColorTableButton"; @@ -2493,7 +2489,7 @@ // // importColorTableButton // - this.importColorTableButton.Image = global::DSPRE.Properties.Resources.loadColorTable; + this.importColorTableButton.Image = ((System.Drawing.Image)(resources.GetObject("importColorTableButton.Image"))); this.importColorTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importColorTableButton.Location = new System.Drawing.Point(11, 479); this.importColorTableButton.Name = "importColorTableButton"; @@ -2506,7 +2502,7 @@ // // importMatrixButton // - this.importMatrixButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("importMatrixButton.Image"))); this.importMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importMatrixButton.Location = new System.Drawing.Point(11, 228); this.importMatrixButton.Name = "importMatrixButton"; @@ -2519,7 +2515,7 @@ // // exportMatrixButton // - this.exportMatrixButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("exportMatrixButton.Image"))); this.exportMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportMatrixButton.Location = new System.Drawing.Point(11, 197); this.exportMatrixButton.Name = "exportMatrixButton"; @@ -2532,7 +2528,7 @@ // // removeMatrixButton // - this.removeMatrixButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("removeMatrixButton.Image"))); this.removeMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeMatrixButton.Location = new System.Drawing.Point(64, 152); this.removeMatrixButton.Name = "removeMatrixButton"; @@ -2545,7 +2541,7 @@ // // addMatrixButton // - this.addMatrixButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("addMatrixButton.Image"))); this.addMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addMatrixButton.Location = new System.Drawing.Point(11, 152); this.addMatrixButton.Name = "addMatrixButton"; @@ -2596,21 +2592,6 @@ this.addHeadersButton.UseVisualStyleBackColor = true; this.addHeadersButton.Click += new System.EventHandler(this.addHeaderSectionButton_Click); // - // saveMatrixButton - // - this.saveMatrixButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.saveMatrixButton.Image = global::DSPRE.Properties.Resources.save_rom; - this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.saveMatrixButton.Location = new System.Drawing.Point(11, 566); - this.saveMatrixButton.Name = "saveMatrixButton"; - this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); - this.saveMatrixButton.TabIndex = 22; - this.saveMatrixButton.Text = "Save Matrix"; - this.saveMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveMatrixButton.UseVisualStyleBackColor = true; - this.saveMatrixButton.Click += new System.EventHandler(this.saveMatrixButton_Click); - // // labelMatrices // this.labelMatrices.AutoSize = true; @@ -2648,7 +2629,6 @@ // // headersTabPage // - this.headersTabPage.Controls.Add(this.headersGridView); this.headersTabPage.Location = new System.Drawing.Point(4, 22); this.headersTabPage.Name = "headersTabPage"; this.headersTabPage.Padding = new System.Windows.Forms.Padding(3); @@ -2657,64 +2637,8 @@ this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; // - // headersGridView - // - this.headersGridView.AllowUserToAddRows = false; - this.headersGridView.AllowUserToDeleteRows = false; - this.headersGridView.AllowUserToResizeColumns = false; - this.headersGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.Format = "D4"; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3; - this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.MultiSelect = false; - this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - this.headersGridView.RowHeadersWidth = 50; - this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; - this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.RowTemplate.Height = 18; - this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1032, 576); - this.headersGridView.TabIndex = 1; - this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); - this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); - this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); - this.headersGridView.SelectionChanged += new System.EventHandler(this.headersGridView_SelectionChanged); - // // heightsTabPage // - this.heightsTabPage.Controls.Add(this.heightsGridView); this.heightsTabPage.Location = new System.Drawing.Point(4, 22); this.heightsTabPage.Name = "heightsTabPage"; this.heightsTabPage.Size = new System.Drawing.Size(1032, 576); @@ -2722,62 +2646,8 @@ this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; // - // heightsGridView - // - this.heightsGridView.AllowUserToAddRows = false; - this.heightsGridView.AllowUserToDeleteRows = false; - this.heightsGridView.AllowUserToResizeColumns = false; - this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; - this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; - this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.Format = "D2"; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8; - this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.MultiSelect = false; - this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; - this.heightsGridView.RowHeadersWidth = 50; - this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10; - this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.RowTemplate.Height = 18; - this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(1032, 576); - this.heightsGridView.TabIndex = 2; - this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); - this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); - this.heightsGridView.SelectionChanged += new System.EventHandler(this.heightsGridView_SelectionChanged); - // // mapFilesTabPage // - this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); this.mapFilesTabPage.Location = new System.Drawing.Point(4, 22); this.mapFilesTabPage.Name = "mapFilesTabPage"; this.mapFilesTabPage.Size = new System.Drawing.Size(1032, 576); @@ -2785,60 +2655,6 @@ this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; // - // mapFilesGridView - // - this.mapFilesGridView.AllowUserToAddRows = false; - this.mapFilesGridView.AllowUserToDeleteRows = false; - this.mapFilesGridView.AllowUserToResizeColumns = false; - this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; - this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; - this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle13.Format = "D4"; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13; - this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.MultiSelect = false; - this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; - this.mapFilesGridView.RowHeadersWidth = 50; - this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; - this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.RowTemplate.Height = 18; - this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); - this.mapFilesGridView.TabIndex = 2; - this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); - this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); - this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); - this.mapFilesGridView.SelectionChanged += new System.EventHandler(this.mapFilesGridView_SelectionChanged); - // // matrixNameTextBox // this.matrixNameTextBox.Location = new System.Drawing.Point(13, 73); @@ -2924,6 +2740,21 @@ this.selectMatrixComboBox.TabIndex = 12; this.selectMatrixComboBox.SelectedIndexChanged += new System.EventHandler(this.selectMatrixComboBox_SelectedIndexChanged); // + // saveMatrixButton + // + this.saveMatrixButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.saveMatrixButton.Image = ((System.Drawing.Image)(resources.GetObject("saveMatrixButton.Image"))); + this.saveMatrixButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveMatrixButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.saveMatrixButton.Location = new System.Drawing.Point(11, 566); + this.saveMatrixButton.Name = "saveMatrixButton"; + this.saveMatrixButton.Size = new System.Drawing.Size(117, 43); + this.saveMatrixButton.TabIndex = 22; + this.saveMatrixButton.Text = "Save Matrix"; + this.saveMatrixButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.saveMatrixButton.UseVisualStyleBackColor = true; + this.saveMatrixButton.Click += new System.EventHandler(this.saveMatrixButton_Click); + // // mapEditorTabPage // this.mapEditorTabPage.BackColor = System.Drawing.SystemColors.Window; @@ -2933,7 +2764,6 @@ this.mapEditorTabPage.Controls.Add(this.addMapFileButton); this.mapEditorTabPage.Controls.Add(this.removeMapFileButton); this.mapEditorTabPage.Controls.Add(this.mapRenderPanel); - this.mapEditorTabPage.Controls.Add(this.saveMapButton); this.mapEditorTabPage.Controls.Add(this.label26); this.mapEditorTabPage.Controls.Add(this.buildTextureComboBox); this.mapEditorTabPage.Controls.Add(this.mapFileLabel); @@ -2944,6 +2774,7 @@ this.mapEditorTabPage.Controls.Add(this.radio3D); this.mapEditorTabPage.Controls.Add(this.radio2D); this.mapEditorTabPage.Controls.Add(this.wireframeCheckBox); + this.mapEditorTabPage.Controls.Add(this.saveMapButton); this.mapEditorTabPage.ImageIndex = 2; this.mapEditorTabPage.Location = new System.Drawing.Point(4, 23); this.mapEditorTabPage.Name = "mapEditorTabPage"; @@ -2955,7 +2786,7 @@ // // mapScreenshotButton // - this.mapScreenshotButton.Image = global::DSPRE.Properties.Resources.cameraIcon; + this.mapScreenshotButton.Image = ((System.Drawing.Image)(resources.GetObject("mapScreenshotButton.Image"))); this.mapScreenshotButton.Location = new System.Drawing.Point(1135, 499); this.mapScreenshotButton.Name = "mapScreenshotButton"; this.mapScreenshotButton.Size = new System.Drawing.Size(41, 40); @@ -2966,7 +2797,7 @@ // // exportCurrentMapBinButton // - this.exportCurrentMapBinButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportCurrentMapBinButton.Image = ((System.Drawing.Image)(resources.GetObject("exportCurrentMapBinButton.Image"))); this.exportCurrentMapBinButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportCurrentMapBinButton.Location = new System.Drawing.Point(337, 530); this.exportCurrentMapBinButton.Name = "exportCurrentMapBinButton"; @@ -2979,7 +2810,7 @@ // // replaceMapBinButton // - this.replaceMapBinButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.replaceMapBinButton.Image = ((System.Drawing.Image)(resources.GetObject("replaceMapBinButton.Image"))); this.replaceMapBinButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.replaceMapBinButton.Location = new System.Drawing.Point(250, 530); this.replaceMapBinButton.Name = "replaceMapBinButton"; @@ -2992,7 +2823,7 @@ // // addMapFileButton // - this.addMapFileButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addMapFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addMapFileButton.Image"))); this.addMapFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addMapFileButton.Location = new System.Drawing.Point(250, 487); this.addMapFileButton.Name = "addMapFileButton"; @@ -3005,7 +2836,7 @@ // // removeMapFileButton // - this.removeMapFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeMapFileButton.Image = ((System.Drawing.Image)(resources.GetObject("removeMapFileButton.Image"))); this.removeMapFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeMapFileButton.Location = new System.Drawing.Point(337, 487); this.removeMapFileButton.Name = "removeMapFileButton"; @@ -3057,19 +2888,6 @@ this.movPictureBox.Click += new System.EventHandler(this.movPictureBox_Click); this.movPictureBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.movPictureBox_MouseMove); // - // saveMapButton - // - this.saveMapButton.Image = global::DSPRE.Properties.Resources.save_rom; - this.saveMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveMapButton.Location = new System.Drawing.Point(250, 573); - this.saveMapButton.Name = "saveMapButton"; - this.saveMapButton.Size = new System.Drawing.Size(171, 40); - this.saveMapButton.TabIndex = 34; - this.saveMapButton.Text = "Save This Map"; - this.saveMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.saveMapButton.UseVisualStyleBackColor = true; - this.saveMapButton.Click += new System.EventHandler(this.saveMapButton_Click); - // // label26 // this.label26.AutoSize = true; @@ -3298,7 +3116,7 @@ // this.bldPlaceWithMouseCheckbox.Appearance = System.Windows.Forms.Appearance.Button; this.bldPlaceWithMouseCheckbox.Enabled = false; - this.bldPlaceWithMouseCheckbox.Image = global::DSPRE.Properties.Resources.selectBldWithMouse; + this.bldPlaceWithMouseCheckbox.Image = ((System.Drawing.Image)(resources.GetObject("bldPlaceWithMouseCheckbox.Image"))); this.bldPlaceWithMouseCheckbox.Location = new System.Drawing.Point(200, 270); this.bldPlaceWithMouseCheckbox.Name = "bldPlaceWithMouseCheckbox"; this.bldPlaceWithMouseCheckbox.Size = new System.Drawing.Size(38, 40); @@ -3429,7 +3247,7 @@ // // duplicateBuildingButton // - this.duplicateBuildingButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; + this.duplicateBuildingButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateBuildingButton.Image"))); this.duplicateBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.duplicateBuildingButton.Location = new System.Drawing.Point(251, 407); this.duplicateBuildingButton.Name = "duplicateBuildingButton"; @@ -3442,7 +3260,7 @@ // // importBuildingsButton // - this.importBuildingsButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importBuildingsButton.Image = ((System.Drawing.Image)(resources.GetObject("importBuildingsButton.Image"))); this.importBuildingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importBuildingsButton.Location = new System.Drawing.Point(300, 13); this.importBuildingsButton.Name = "importBuildingsButton"; @@ -3455,7 +3273,7 @@ // // exportBuildingsButton // - this.exportBuildingsButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportBuildingsButton.Image = ((System.Drawing.Image)(resources.GetObject("exportBuildingsButton.Image"))); this.exportBuildingsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportBuildingsButton.Location = new System.Drawing.Point(194, 13); this.exportBuildingsButton.Name = "exportBuildingsButton"; @@ -3468,7 +3286,7 @@ // // removeBuildingButton // - this.removeBuildingButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeBuildingButton.Image = ((System.Drawing.Image)(resources.GetObject("removeBuildingButton.Image"))); this.removeBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeBuildingButton.Location = new System.Drawing.Point(332, 407); this.removeBuildingButton.Name = "removeBuildingButton"; @@ -3481,7 +3299,7 @@ // // addBuildingButton // - this.addBuildingButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addBuildingButton.Image = ((System.Drawing.Image)(resources.GetObject("addBuildingButton.Image"))); this.addBuildingButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addBuildingButton.Location = new System.Drawing.Point(194, 407); this.addBuildingButton.Name = "addBuildingButton"; @@ -3613,10 +3431,10 @@ this.permissionsTabPage.Controls.Add(this.collisionLabel); this.permissionsTabPage.Controls.Add(this.typeGroupBox); this.permissionsTabPage.Controls.Add(this.collisionGroupBox); - this.permissionsTabPage.Controls.Add(this.ImportMovButton); - this.permissionsTabPage.Controls.Add(this.exportMovButton); this.permissionsTabPage.Controls.Add(this.selectCollisionPanel); this.permissionsTabPage.Controls.Add(this.selectTypePanel); + this.permissionsTabPage.Controls.Add(this.ImportMovButton); + this.permissionsTabPage.Controls.Add(this.exportMovButton); this.permissionsTabPage.Location = new System.Drawing.Point(4, 22); this.permissionsTabPage.Name = "permissionsTabPage"; this.permissionsTabPage.Padding = new System.Windows.Forms.Padding(3); @@ -3762,32 +3580,6 @@ this.collisionPainterPictureBox.TabIndex = 0; this.collisionPainterPictureBox.TabStop = false; // - // ImportMovButton - // - this.ImportMovButton.Image = global::DSPRE.Properties.Resources.importArrow; - this.ImportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.ImportMovButton.Location = new System.Drawing.Point(250, 36); - this.ImportMovButton.Name = "ImportMovButton"; - this.ImportMovButton.Size = new System.Drawing.Size(138, 38); - this.ImportMovButton.TabIndex = 23; - this.ImportMovButton.Text = "Import Permissions"; - this.ImportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.ImportMovButton.UseVisualStyleBackColor = true; - this.ImportMovButton.Click += new System.EventHandler(this.importMovButton_Click); - // - // exportMovButton - // - this.exportMovButton.Image = global::DSPRE.Properties.Resources.exportArrow; - this.exportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportMovButton.Location = new System.Drawing.Point(250, 80); - this.exportMovButton.Name = "exportMovButton"; - this.exportMovButton.Size = new System.Drawing.Size(138, 38); - this.exportMovButton.TabIndex = 22; - this.exportMovButton.Text = "Export Permissions"; - this.exportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.exportMovButton.UseVisualStyleBackColor = true; - this.exportMovButton.Click += new System.EventHandler(this.exportMovButton_Click); - // // selectCollisionPanel // this.selectCollisionPanel.Controls.Add(this.collisionPictureBox); @@ -3826,6 +3618,32 @@ this.typePictureBox.TabStop = false; this.typePictureBox.Click += new System.EventHandler(this.typePictureBox_Click); // + // ImportMovButton + // + this.ImportMovButton.Image = ((System.Drawing.Image)(resources.GetObject("ImportMovButton.Image"))); + this.ImportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.ImportMovButton.Location = new System.Drawing.Point(250, 36); + this.ImportMovButton.Name = "ImportMovButton"; + this.ImportMovButton.Size = new System.Drawing.Size(138, 38); + this.ImportMovButton.TabIndex = 23; + this.ImportMovButton.Text = "Import Permissions"; + this.ImportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.ImportMovButton.UseVisualStyleBackColor = true; + this.ImportMovButton.Click += new System.EventHandler(this.importMovButton_Click); + // + // exportMovButton + // + this.exportMovButton.Image = ((System.Drawing.Image)(resources.GetObject("exportMovButton.Image"))); + this.exportMovButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.exportMovButton.Location = new System.Drawing.Point(250, 80); + this.exportMovButton.Name = "exportMovButton"; + this.exportMovButton.Size = new System.Drawing.Size(138, 38); + this.exportMovButton.TabIndex = 22; + this.exportMovButton.Text = "Export Permissions"; + this.exportMovButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.exportMovButton.UseVisualStyleBackColor = true; + this.exportMovButton.Click += new System.EventHandler(this.exportMovButton_Click); + // // modelTabPage // this.modelTabPage.Controls.Add(this.embedTexturesInMapModelCheckBox); @@ -3906,7 +3724,7 @@ // // importMapButton // - this.importMapButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importMapButton.Image = ((System.Drawing.Image)(resources.GetObject("importMapButton.Image"))); this.importMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importMapButton.Location = new System.Drawing.Point(277, 9); this.importMapButton.Name = "importMapButton"; @@ -3919,7 +3737,7 @@ // // exportMapButton // - this.exportMapButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportMapButton.Image = ((System.Drawing.Image)(resources.GetObject("exportMapButton.Image"))); this.exportMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportMapButton.Location = new System.Drawing.Point(277, 54); this.exportMapButton.Name = "exportMapButton"; @@ -3997,7 +3815,7 @@ // // bdhcImportButton // - this.bdhcImportButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.bdhcImportButton.Image = ((System.Drawing.Image)(resources.GetObject("bdhcImportButton.Image"))); this.bdhcImportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.bdhcImportButton.Location = new System.Drawing.Point(277, 9); this.bdhcImportButton.Name = "bdhcImportButton"; @@ -4010,7 +3828,7 @@ // // bdhcExportButton // - this.bdhcExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.bdhcExportButton.Image = ((System.Drawing.Image)(resources.GetObject("bdhcExportButton.Image"))); this.bdhcExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.bdhcExportButton.Location = new System.Drawing.Point(277, 54); this.bdhcExportButton.Name = "bdhcExportButton"; @@ -4038,7 +3856,7 @@ // // blankBGSButton // - this.blankBGSButton.Image = global::DSPRE.Properties.Resources.destroyLevelScript; + this.blankBGSButton.Image = ((System.Drawing.Image)(resources.GetObject("blankBGSButton.Image"))); this.blankBGSButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.blankBGSButton.Location = new System.Drawing.Point(277, 109); this.blankBGSButton.Name = "blankBGSButton"; @@ -4101,7 +3919,7 @@ // // soundPlatesImportButton // - this.soundPlatesImportButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.soundPlatesImportButton.Image = ((System.Drawing.Image)(resources.GetObject("soundPlatesImportButton.Image"))); this.soundPlatesImportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.soundPlatesImportButton.Location = new System.Drawing.Point(277, 9); this.soundPlatesImportButton.Name = "soundPlatesImportButton"; @@ -4114,7 +3932,7 @@ // // soundPlatesExportButton // - this.soundPlatesExportButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.soundPlatesExportButton.Image = ((System.Drawing.Image)(resources.GetObject("soundPlatesExportButton.Image"))); this.soundPlatesExportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.soundPlatesExportButton.Location = new System.Drawing.Point(277, 54); this.soundPlatesExportButton.Name = "soundPlatesExportButton"; @@ -4170,6 +3988,19 @@ this.wireframeCheckBox.UseVisualStyleBackColor = true; this.wireframeCheckBox.CheckedChanged += new System.EventHandler(this.wireframeCheckBox_CheckedChanged); // + // saveMapButton + // + this.saveMapButton.Image = ((System.Drawing.Image)(resources.GetObject("saveMapButton.Image"))); + this.saveMapButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveMapButton.Location = new System.Drawing.Point(250, 573); + this.saveMapButton.Name = "saveMapButton"; + this.saveMapButton.Size = new System.Drawing.Size(171, 40); + this.saveMapButton.TabIndex = 34; + this.saveMapButton.Text = "Save This Map"; + this.saveMapButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.saveMapButton.UseVisualStyleBackColor = true; + this.saveMapButton.Click += new System.EventHandler(this.saveMapButton_Click); + // // nsbtxEditorTabPage // this.nsbtxEditorTabPage.Controls.Add(this.groupBox7); @@ -4206,7 +4037,7 @@ // // removeNSBTXButton // - this.removeNSBTXButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("removeNSBTXButton.Image"))); this.removeNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeNSBTXButton.Location = new System.Drawing.Point(331, 18); this.removeNSBTXButton.Name = "removeNSBTXButton"; @@ -4243,7 +4074,7 @@ // // exportAreaDataButton // - this.exportAreaDataButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("exportAreaDataButton.Image"))); this.exportAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportAreaDataButton.Location = new System.Drawing.Point(177, 72); this.exportAreaDataButton.Name = "exportAreaDataButton"; @@ -4293,7 +4124,7 @@ // // importAreaDataButton // - this.importAreaDataButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("importAreaDataButton.Image"))); this.importAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importAreaDataButton.Location = new System.Drawing.Point(286, 72); this.importAreaDataButton.Name = "importAreaDataButton"; @@ -4306,7 +4137,7 @@ // // removeAreaDataButton // - this.removeAreaDataButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("removeAreaDataButton.Image"))); this.removeAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeAreaDataButton.Location = new System.Drawing.Point(395, 23); this.removeAreaDataButton.Name = "removeAreaDataButton"; @@ -4319,7 +4150,7 @@ // // addAreaDataButton // - this.addAreaDataButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("addAreaDataButton.Image"))); this.addAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addAreaDataButton.Location = new System.Drawing.Point(286, 23); this.addAreaDataButton.Name = "addAreaDataButton"; @@ -4332,7 +4163,7 @@ // // saveAreaDataButton // - this.saveAreaDataButton.Image = global::DSPRE.Properties.Resources.save_rom; + this.saveAreaDataButton.Image = ((System.Drawing.Image)(resources.GetObject("saveAreaDataButton.Image"))); this.saveAreaDataButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveAreaDataButton.Location = new System.Drawing.Point(177, 23); this.saveAreaDataButton.Name = "saveAreaDataButton"; @@ -4444,7 +4275,7 @@ // // addNSBTXButton // - this.addNSBTXButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("addNSBTXButton.Image"))); this.addNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addNSBTXButton.Location = new System.Drawing.Point(240, 18); this.addNSBTXButton.Name = "addNSBTXButton"; @@ -4457,7 +4288,7 @@ // // exportNSBTXButton // - this.exportNSBTXButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("exportNSBTXButton.Image"))); this.exportNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportNSBTXButton.Location = new System.Drawing.Point(125, 18); this.exportNSBTXButton.Name = "exportNSBTXButton"; @@ -4470,7 +4301,7 @@ // // importNSBTXButton // - this.importNSBTXButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importNSBTXButton.Image = ((System.Drawing.Image)(resources.GetObject("importNSBTXButton.Image"))); this.importNSBTXButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importNSBTXButton.Location = new System.Drawing.Point(21, 18); this.importNSBTXButton.Name = "importNSBTXButton"; @@ -4567,31 +4398,31 @@ this.eventEditorTabPage.BackColor = System.Drawing.SystemColors.Window; this.eventEditorTabPage.Controls.Add(this.groupBox21); this.eventEditorTabPage.Controls.Add(this.RightClickLabel); - this.eventEditorTabPage.Controls.Add(this.rightClickPicture); this.eventEditorTabPage.Controls.Add(this.WheelClickLabel); this.eventEditorTabPage.Controls.Add(this.LeftClickLabel); - this.eventEditorTabPage.Controls.Add(this.wheelClickPicture); - this.eventEditorTabPage.Controls.Add(this.LeftClickPicture); - this.eventEditorTabPage.Controls.Add(this.removeEventFileButton); - this.eventEditorTabPage.Controls.Add(this.addEventFileButton); this.eventEditorTabPage.Controls.Add(this.eventMatrixYUpDown); this.eventEditorTabPage.Controls.Add(this.eventMatrixXUpDown); this.eventEditorTabPage.Controls.Add(this.eventMatrixYLabel); this.eventEditorTabPage.Controls.Add(this.eventMatrixXLabel); this.eventEditorTabPage.Controls.Add(this.matrixNavigatorLabel); this.eventEditorTabPage.Controls.Add(this.eventMatrixPanel); - this.eventEditorTabPage.Controls.Add(this.eventShiftRightButton); - this.eventEditorTabPage.Controls.Add(this.eventShiftLeftButton); - this.eventEditorTabPage.Controls.Add(this.eventShiftUpButton); - this.eventEditorTabPage.Controls.Add(this.eventShiftDownButton); this.eventEditorTabPage.Controls.Add(this.selectEventComboBox); - this.eventEditorTabPage.Controls.Add(this.exportEventFileButton); - this.eventEditorTabPage.Controls.Add(this.importEventFileButton); - this.eventEditorTabPage.Controls.Add(this.saveEventsButton); this.eventEditorTabPage.Controls.Add(this.backgroundMapLabel); this.eventEditorTabPage.Controls.Add(this.eventMatrixUpDown); this.eventEditorTabPage.Controls.Add(this.eventsTabControl); this.eventEditorTabPage.Controls.Add(this.eventPanel); + this.eventEditorTabPage.Controls.Add(this.rightClickPicture); + this.eventEditorTabPage.Controls.Add(this.wheelClickPicture); + this.eventEditorTabPage.Controls.Add(this.LeftClickPicture); + this.eventEditorTabPage.Controls.Add(this.removeEventFileButton); + this.eventEditorTabPage.Controls.Add(this.addEventFileButton); + this.eventEditorTabPage.Controls.Add(this.eventShiftRightButton); + this.eventEditorTabPage.Controls.Add(this.eventShiftLeftButton); + this.eventEditorTabPage.Controls.Add(this.eventShiftUpButton); + this.eventEditorTabPage.Controls.Add(this.eventShiftDownButton); + this.eventEditorTabPage.Controls.Add(this.exportEventFileButton); + this.eventEditorTabPage.Controls.Add(this.importEventFileButton); + this.eventEditorTabPage.Controls.Add(this.saveEventsButton); this.eventEditorTabPage.ImageIndex = 3; this.eventEditorTabPage.Location = new System.Drawing.Point(4, 23); this.eventEditorTabPage.Name = "eventEditorTabPage"; @@ -4699,19 +4530,6 @@ this.RightClickLabel.TabIndex = 60; this.RightClickLabel.Text = "Select"; // - // rightClickPicture - // - this.rightClickPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.rightClickPicture.Image = ((System.Drawing.Image)(resources.GetObject("rightClickPicture.Image"))); - this.rightClickPicture.ImageLocation = ""; - this.rightClickPicture.Location = new System.Drawing.Point(468, 420); - this.rightClickPicture.Name = "rightClickPicture"; - this.rightClickPicture.Size = new System.Drawing.Size(38, 38); - this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.rightClickPicture.TabIndex = 59; - this.rightClickPicture.TabStop = false; - // // WheelClickLabel // this.WheelClickLabel.AutoSize = true; @@ -4730,58 +4548,6 @@ this.LeftClickLabel.TabIndex = 57; this.LeftClickLabel.Text = "Move"; // - // wheelClickPicture - // - this.wheelClickPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.wheelClickPicture.Image = ((System.Drawing.Image)(resources.GetObject("wheelClickPicture.Image"))); - this.wheelClickPicture.ImageLocation = ""; - this.wheelClickPicture.Location = new System.Drawing.Point(552, 420); - this.wheelClickPicture.Name = "wheelClickPicture"; - this.wheelClickPicture.Size = new System.Drawing.Size(38, 38); - this.wheelClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.wheelClickPicture.TabIndex = 56; - this.wheelClickPicture.TabStop = false; - // - // LeftClickPicture - // - this.LeftClickPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.LeftClickPicture.Image = ((System.Drawing.Image)(resources.GetObject("LeftClickPicture.Image"))); - this.LeftClickPicture.ImageLocation = ""; - this.LeftClickPicture.Location = new System.Drawing.Point(510, 420); - this.LeftClickPicture.Name = "LeftClickPicture"; - this.LeftClickPicture.Size = new System.Drawing.Size(38, 38); - this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.LeftClickPicture.TabIndex = 55; - this.LeftClickPicture.TabStop = false; - // - // removeEventFileButton - // - this.removeEventFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; - this.removeEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeEventFileButton.Location = new System.Drawing.Point(354, 36); - this.removeEventFileButton.Name = "removeEventFileButton"; - this.removeEventFileButton.Size = new System.Drawing.Size(98, 25); - this.removeEventFileButton.TabIndex = 54; - this.removeEventFileButton.Text = "Remove Last"; - this.removeEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeEventFileButton.UseVisualStyleBackColor = true; - this.removeEventFileButton.Click += new System.EventHandler(this.removeEventFileButton_Click); - // - // addEventFileButton - // - this.addEventFileButton.Image = global::DSPRE.Properties.Resources.addIcon; - this.addEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addEventFileButton.Location = new System.Drawing.Point(354, 9); - this.addEventFileButton.Name = "addEventFileButton"; - this.addEventFileButton.Size = new System.Drawing.Size(98, 25); - this.addEventFileButton.TabIndex = 53; - this.addEventFileButton.Text = "Add Event"; - this.addEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addEventFileButton.UseVisualStyleBackColor = true; - this.addEventFileButton.Click += new System.EventHandler(this.addEventFileButton_Click); - // // eventMatrixYUpDown // this.eventMatrixYUpDown.Location = new System.Drawing.Point(466, 173); @@ -4850,52 +4616,6 @@ this.eventMatrixPictureBox.TabStop = false; this.eventMatrixPictureBox.Click += new System.EventHandler(this.eventMatrixPictureBox_Click); // - // eventShiftRightButton - // - this.eventShiftRightButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftRightButton.BackgroundImage"))); - this.eventShiftRightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.eventShiftRightButton.Location = new System.Drawing.Point(1152, 233); - this.eventShiftRightButton.Name = "eventShiftRightButton"; - this.eventShiftRightButton.Size = new System.Drawing.Size(25, 156); - this.eventShiftRightButton.TabIndex = 45; - this.eventShiftRightButton.UseVisualStyleBackColor = true; - this.eventShiftRightButton.Click += new System.EventHandler(this.eventShiftRightButton_Click); - // - // eventShiftLeftButton - // - this.eventShiftLeftButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftLeftButton.BackgroundImage"))); - this.eventShiftLeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.eventShiftLeftButton.Location = new System.Drawing.Point(570, 233); - this.eventShiftLeftButton.Name = "eventShiftLeftButton"; - this.eventShiftLeftButton.Size = new System.Drawing.Size(25, 156); - this.eventShiftLeftButton.TabIndex = 44; - this.eventShiftLeftButton.UseVisualStyleBackColor = true; - this.eventShiftLeftButton.Click += new System.EventHandler(this.eventShiftLeftButton_Click); - // - // eventShiftUpButton - // - this.eventShiftUpButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftUpButton.BackgroundImage"))); - this.eventShiftUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.eventShiftUpButton.Location = new System.Drawing.Point(795, 8); - this.eventShiftUpButton.Name = "eventShiftUpButton"; - this.eventShiftUpButton.Size = new System.Drawing.Size(156, 25); - this.eventShiftUpButton.TabIndex = 43; - this.eventShiftUpButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.eventShiftUpButton.UseVisualStyleBackColor = true; - this.eventShiftUpButton.Click += new System.EventHandler(this.eventShiftUpButton_Click); - // - // eventShiftDownButton - // - this.eventShiftDownButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftDownButton.BackgroundImage"))); - this.eventShiftDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.eventShiftDownButton.Location = new System.Drawing.Point(795, 589); - this.eventShiftDownButton.Name = "eventShiftDownButton"; - this.eventShiftDownButton.Size = new System.Drawing.Size(156, 25); - this.eventShiftDownButton.TabIndex = 42; - this.eventShiftDownButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.eventShiftDownButton.UseVisualStyleBackColor = true; - this.eventShiftDownButton.Click += new System.EventHandler(this.eventShiftDownButton_Click); - // // selectEventComboBox // this.selectEventComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -4906,44 +4626,6 @@ this.selectEventComboBox.TabIndex = 41; this.selectEventComboBox.SelectedIndexChanged += new System.EventHandler(this.selectEventComboBox_SelectedIndexChanged); // - // exportEventFileButton - // - this.exportEventFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; - this.exportEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportEventFileButton.Location = new System.Drawing.Point(266, 9); - this.exportEventFileButton.Name = "exportEventFileButton"; - this.exportEventFileButton.Size = new System.Drawing.Size(84, 52); - this.exportEventFileButton.TabIndex = 36; - this.exportEventFileButton.Text = "Export"; - this.exportEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.exportEventFileButton.UseVisualStyleBackColor = true; - this.exportEventFileButton.Click += new System.EventHandler(this.exportEventFileButton_Click); - // - // importEventFileButton - // - this.importEventFileButton.Image = global::DSPRE.Properties.Resources.importArrow; - this.importEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importEventFileButton.Location = new System.Drawing.Point(178, 9); - this.importEventFileButton.Name = "importEventFileButton"; - this.importEventFileButton.Size = new System.Drawing.Size(84, 52); - this.importEventFileButton.TabIndex = 35; - this.importEventFileButton.Text = "Replace\r\nCurrent"; - this.importEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.importEventFileButton.UseVisualStyleBackColor = true; - this.importEventFileButton.Click += new System.EventHandler(this.importEventFileButton_Click); - // - // saveEventsButton - // - this.saveEventsButton.Image = global::DSPRE.Properties.Resources.saveButton; - this.saveEventsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveEventsButton.Location = new System.Drawing.Point(9, 36); - this.saveEventsButton.Name = "saveEventsButton"; - this.saveEventsButton.Size = new System.Drawing.Size(166, 25); - this.saveEventsButton.TabIndex = 34; - this.saveEventsButton.Text = "Save Events"; - this.saveEventsButton.UseVisualStyleBackColor = true; - this.saveEventsButton.Click += new System.EventHandler(this.saveEventsButton_Click); - // // backgroundMapLabel // this.backgroundMapLabel.AutoSize = true; @@ -5021,7 +4703,7 @@ // // duplicateSpawnableButton // - this.duplicateSpawnableButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; + this.duplicateSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateSpawnableButton.Image"))); this.duplicateSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.duplicateSpawnableButton.Location = new System.Drawing.Point(131, 308); this.duplicateSpawnableButton.Name = "duplicateSpawnableButton"; @@ -5187,7 +4869,7 @@ // // removeSpawnableButton // - this.removeSpawnableButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("removeSpawnableButton.Image"))); this.removeSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeSpawnableButton.Location = new System.Drawing.Point(67, 308); this.removeSpawnableButton.Name = "removeSpawnableButton"; @@ -5200,7 +4882,7 @@ // // addSpawnableButton // - this.addSpawnableButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addSpawnableButton.Image = ((System.Drawing.Image)(resources.GetObject("addSpawnableButton.Image"))); this.addSpawnableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addSpawnableButton.Location = new System.Drawing.Point(16, 308); this.addSpawnableButton.Name = "addSpawnableButton"; @@ -5265,9 +4947,7 @@ // this.overworldsTabPage.Controls.Add(this.groupBox22); this.overworldsTabPage.Controls.Add(this.spriteIDlabel); - this.overworldsTabPage.Controls.Add(this.duplicateOverworldsButton); this.overworldsTabPage.Controls.Add(this.groupBox17); - this.overworldsTabPage.Controls.Add(this.owSpritePictureBox); this.overworldsTabPage.Controls.Add(this.owMovementGroupBox); this.overworldsTabPage.Controls.Add(this.positionGroupBox); this.overworldsTabPage.Controls.Add(this.owSpecialGroupBox); @@ -5279,6 +4959,8 @@ this.overworldsTabPage.Controls.Add(this.owSpriteComboBox); this.overworldsTabPage.Controls.Add(this.owIDLabel); this.overworldsTabPage.Controls.Add(this.owIDNumericUpDown); + this.overworldsTabPage.Controls.Add(this.duplicateOverworldsButton); + this.overworldsTabPage.Controls.Add(this.owSpritePictureBox); this.overworldsTabPage.Controls.Add(this.removeOverworldButton); this.overworldsTabPage.Controls.Add(this.addOverworldButton); this.overworldsTabPage.Controls.Add(this.overworldsListBox); @@ -5347,19 +5029,6 @@ this.spriteIDlabel.Size = new System.Drawing.Size(0, 13); this.spriteIDlabel.TabIndex = 27; // - // duplicateOverworldsButton - // - this.duplicateOverworldsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; - this.duplicateOverworldsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateOverworldsButton.Location = new System.Drawing.Point(116, 155); - this.duplicateOverworldsButton.Name = "duplicateOverworldsButton"; - this.duplicateOverworldsButton.Size = new System.Drawing.Size(72, 31); - this.duplicateOverworldsButton.TabIndex = 26; - this.duplicateOverworldsButton.Text = "Duplicate"; - this.duplicateOverworldsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.duplicateOverworldsButton.UseVisualStyleBackColor = true; - this.duplicateOverworldsButton.Click += new System.EventHandler(this.duplicateOverworldsButton_Click); - // // groupBox17 // this.groupBox17.Controls.Add(this.button14); @@ -5431,16 +5100,6 @@ this.label11.TabIndex = 7; this.label11.Text = "Y"; // - // owSpritePictureBox - // - this.owSpritePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.owSpritePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.owSpritePictureBox.Location = new System.Drawing.Point(367, 53); - this.owSpritePictureBox.Name = "owSpritePictureBox"; - this.owSpritePictureBox.Size = new System.Drawing.Size(66, 66); - this.owSpritePictureBox.TabIndex = 20; - this.owSpritePictureBox.TabStop = false; - // // owMovementGroupBox // this.owMovementGroupBox.Controls.Add(this.groupBox23); @@ -5820,9 +5479,32 @@ this.owIDNumericUpDown.TabIndex = 6; this.owIDNumericUpDown.ValueChanged += new System.EventHandler(this.owIDNumericUpDown_ValueChanged); // + // duplicateOverworldsButton + // + this.duplicateOverworldsButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateOverworldsButton.Image"))); + this.duplicateOverworldsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.duplicateOverworldsButton.Location = new System.Drawing.Point(116, 155); + this.duplicateOverworldsButton.Name = "duplicateOverworldsButton"; + this.duplicateOverworldsButton.Size = new System.Drawing.Size(72, 31); + this.duplicateOverworldsButton.TabIndex = 26; + this.duplicateOverworldsButton.Text = "Duplicate"; + this.duplicateOverworldsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.duplicateOverworldsButton.UseVisualStyleBackColor = true; + this.duplicateOverworldsButton.Click += new System.EventHandler(this.duplicateOverworldsButton_Click); + // + // owSpritePictureBox + // + this.owSpritePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.owSpritePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.owSpritePictureBox.Location = new System.Drawing.Point(367, 53); + this.owSpritePictureBox.Name = "owSpritePictureBox"; + this.owSpritePictureBox.Size = new System.Drawing.Size(66, 66); + this.owSpritePictureBox.TabIndex = 20; + this.owSpritePictureBox.TabStop = false; + // // removeOverworldButton // - this.removeOverworldButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeOverworldButton.Image = ((System.Drawing.Image)(resources.GetObject("removeOverworldButton.Image"))); this.removeOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeOverworldButton.Location = new System.Drawing.Point(56, 155); this.removeOverworldButton.Name = "removeOverworldButton"; @@ -5835,7 +5517,7 @@ // // addOverworldButton // - this.addOverworldButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addOverworldButton.Image = ((System.Drawing.Image)(resources.GetObject("addOverworldButton.Image"))); this.addOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addOverworldButton.Location = new System.Drawing.Point(8, 155); this.addOverworldButton.Name = "addOverworldButton"; @@ -5873,7 +5555,7 @@ // // duplicateWarpsButton // - this.duplicateWarpsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; + this.duplicateWarpsButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateWarpsButton.Image"))); this.duplicateWarpsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.duplicateWarpsButton.Location = new System.Drawing.Point(130, 308); this.duplicateWarpsButton.Name = "duplicateWarpsButton"; @@ -6135,7 +5817,7 @@ // // removeWarpButton // - this.removeWarpButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeWarpButton.Image = ((System.Drawing.Image)(resources.GetObject("removeWarpButton.Image"))); this.removeWarpButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeWarpButton.Location = new System.Drawing.Point(66, 308); this.removeWarpButton.Name = "removeWarpButton"; @@ -6148,7 +5830,7 @@ // // addWarpButton // - this.addWarpButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addWarpButton.Image = ((System.Drawing.Image)(resources.GetObject("addWarpButton.Image"))); this.addWarpButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addWarpButton.Location = new System.Drawing.Point(14, 308); this.addWarpButton.Name = "addWarpButton"; @@ -6171,10 +5853,10 @@ // triggersTabPage // this.triggersTabPage.Controls.Add(this.triggerLogicGroupBox); - this.triggersTabPage.Controls.Add(this.duplicateTriggersButton); this.triggersTabPage.Controls.Add(this.groupBox16); this.triggersTabPage.Controls.Add(this.groupBox15); this.triggersTabPage.Controls.Add(this.groupBox6); + this.triggersTabPage.Controls.Add(this.duplicateTriggersButton); this.triggersTabPage.Controls.Add(this.removeTriggerButton); this.triggersTabPage.Controls.Add(this.addTriggerButton); this.triggersTabPage.Controls.Add(this.triggersListBox); @@ -6267,19 +5949,6 @@ this.label27.TabIndex = 24; this.label27.Text = "Script to trigger"; // - // duplicateTriggersButton - // - this.duplicateTriggersButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; - this.duplicateTriggersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateTriggersButton.Location = new System.Drawing.Point(131, 309); - this.duplicateTriggersButton.Name = "duplicateTriggersButton"; - this.duplicateTriggersButton.Size = new System.Drawing.Size(74, 32); - this.duplicateTriggersButton.TabIndex = 36; - this.duplicateTriggersButton.Text = "Duplicate"; - this.duplicateTriggersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.duplicateTriggersButton.UseVisualStyleBackColor = true; - this.duplicateTriggersButton.Click += new System.EventHandler(this.duplicateTriggersButton_Click); - // // groupBox16 // this.groupBox16.Controls.Add(this.triggerLengthLabel); @@ -6499,9 +6168,22 @@ this.triggerYMatrixUpDown.TabIndex = 18; this.triggerYMatrixUpDown.ValueChanged += new System.EventHandler(this.triggerYMatrixUpDown_ValueChanged); // + // duplicateTriggersButton + // + this.duplicateTriggersButton.Image = ((System.Drawing.Image)(resources.GetObject("duplicateTriggersButton.Image"))); + this.duplicateTriggersButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.duplicateTriggersButton.Location = new System.Drawing.Point(131, 309); + this.duplicateTriggersButton.Name = "duplicateTriggersButton"; + this.duplicateTriggersButton.Size = new System.Drawing.Size(74, 32); + this.duplicateTriggersButton.TabIndex = 36; + this.duplicateTriggersButton.Text = "Duplicate"; + this.duplicateTriggersButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.duplicateTriggersButton.UseVisualStyleBackColor = true; + this.duplicateTriggersButton.Click += new System.EventHandler(this.duplicateTriggersButton_Click); + // // removeTriggerButton // - this.removeTriggerButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeTriggerButton.Image = ((System.Drawing.Image)(resources.GetObject("removeTriggerButton.Image"))); this.removeTriggerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeTriggerButton.Location = new System.Drawing.Point(68, 309); this.removeTriggerButton.Name = "removeTriggerButton"; @@ -6514,7 +6196,7 @@ // // addTriggerButton // - this.addTriggerButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addTriggerButton.Image = ((System.Drawing.Image)(resources.GetObject("addTriggerButton.Image"))); this.addTriggerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addTriggerButton.Location = new System.Drawing.Point(16, 309); this.addTriggerButton.Name = "addTriggerButton"; @@ -6572,27 +6254,241 @@ this.eventOpenGlControl.StencilBits = ((byte)(0)); this.eventOpenGlControl.TabIndex = 2; // - // scriptEditorTabPage + // rightClickPicture // - this.scriptEditorTabPage.Controls.Add(this.groupBox24); - this.scriptEditorTabPage.Controls.Add(this.clearCurrentLevelScriptButton); - this.scriptEditorTabPage.Controls.Add(this.groupBox8); - this.scriptEditorTabPage.Controls.Add(this.importScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.exportScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.saveScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.removeScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.addScriptFileButton); - this.scriptEditorTabPage.Controls.Add(this.scriptEditorTabControl); - this.scriptEditorTabPage.Controls.Add(this.label5); - this.scriptEditorTabPage.Controls.Add(this.selectScriptFileComboBox); - this.scriptEditorTabPage.ImageIndex = 5; - this.scriptEditorTabPage.Location = new System.Drawing.Point(4, 23); - this.scriptEditorTabPage.Name = "scriptEditorTabPage"; - this.scriptEditorTabPage.Padding = new System.Windows.Forms.Padding(3); - this.scriptEditorTabPage.Size = new System.Drawing.Size(1185, 619); - this.scriptEditorTabPage.TabIndex = 4; - this.scriptEditorTabPage.Text = "Script Editor"; - this.scriptEditorTabPage.UseVisualStyleBackColor = true; + this.rightClickPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.rightClickPicture.Image = ((System.Drawing.Image)(resources.GetObject("rightClickPicture.Image"))); + this.rightClickPicture.ImageLocation = ""; + this.rightClickPicture.Location = new System.Drawing.Point(468, 420); + this.rightClickPicture.Name = "rightClickPicture"; + this.rightClickPicture.Size = new System.Drawing.Size(38, 38); + this.rightClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.rightClickPicture.TabIndex = 59; + this.rightClickPicture.TabStop = false; + // + // wheelClickPicture + // + this.wheelClickPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.wheelClickPicture.Image = ((System.Drawing.Image)(resources.GetObject("wheelClickPicture.Image"))); + this.wheelClickPicture.ImageLocation = ""; + this.wheelClickPicture.Location = new System.Drawing.Point(552, 420); + this.wheelClickPicture.Name = "wheelClickPicture"; + this.wheelClickPicture.Size = new System.Drawing.Size(38, 38); + this.wheelClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.wheelClickPicture.TabIndex = 56; + this.wheelClickPicture.TabStop = false; + // + // LeftClickPicture + // + this.LeftClickPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.LeftClickPicture.Image = ((System.Drawing.Image)(resources.GetObject("LeftClickPicture.Image"))); + this.LeftClickPicture.ImageLocation = ""; + this.LeftClickPicture.Location = new System.Drawing.Point(510, 420); + this.LeftClickPicture.Name = "LeftClickPicture"; + this.LeftClickPicture.Size = new System.Drawing.Size(38, 38); + this.LeftClickPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.LeftClickPicture.TabIndex = 55; + this.LeftClickPicture.TabStop = false; + // + // removeEventFileButton + // + this.removeEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("removeEventFileButton.Image"))); + this.removeEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeEventFileButton.Location = new System.Drawing.Point(354, 36); + this.removeEventFileButton.Name = "removeEventFileButton"; + this.removeEventFileButton.Size = new System.Drawing.Size(98, 25); + this.removeEventFileButton.TabIndex = 54; + this.removeEventFileButton.Text = "Remove Last"; + this.removeEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeEventFileButton.UseVisualStyleBackColor = true; + this.removeEventFileButton.Click += new System.EventHandler(this.removeEventFileButton_Click); + // + // addEventFileButton + // + this.addEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addEventFileButton.Image"))); + this.addEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addEventFileButton.Location = new System.Drawing.Point(354, 9); + this.addEventFileButton.Name = "addEventFileButton"; + this.addEventFileButton.Size = new System.Drawing.Size(98, 25); + this.addEventFileButton.TabIndex = 53; + this.addEventFileButton.Text = "Add Event"; + this.addEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addEventFileButton.UseVisualStyleBackColor = true; + this.addEventFileButton.Click += new System.EventHandler(this.addEventFileButton_Click); + // + // eventShiftRightButton + // + this.eventShiftRightButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftRightButton.BackgroundImage"))); + this.eventShiftRightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.eventShiftRightButton.Location = new System.Drawing.Point(1152, 233); + this.eventShiftRightButton.Name = "eventShiftRightButton"; + this.eventShiftRightButton.Size = new System.Drawing.Size(25, 156); + this.eventShiftRightButton.TabIndex = 45; + this.eventShiftRightButton.UseVisualStyleBackColor = true; + this.eventShiftRightButton.Click += new System.EventHandler(this.eventShiftRightButton_Click); + // + // eventShiftLeftButton + // + this.eventShiftLeftButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftLeftButton.BackgroundImage"))); + this.eventShiftLeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.eventShiftLeftButton.Location = new System.Drawing.Point(570, 233); + this.eventShiftLeftButton.Name = "eventShiftLeftButton"; + this.eventShiftLeftButton.Size = new System.Drawing.Size(25, 156); + this.eventShiftLeftButton.TabIndex = 44; + this.eventShiftLeftButton.UseVisualStyleBackColor = true; + this.eventShiftLeftButton.Click += new System.EventHandler(this.eventShiftLeftButton_Click); + // + // eventShiftUpButton + // + this.eventShiftUpButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftUpButton.BackgroundImage"))); + this.eventShiftUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.eventShiftUpButton.Location = new System.Drawing.Point(795, 8); + this.eventShiftUpButton.Name = "eventShiftUpButton"; + this.eventShiftUpButton.Size = new System.Drawing.Size(156, 25); + this.eventShiftUpButton.TabIndex = 43; + this.eventShiftUpButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.eventShiftUpButton.UseVisualStyleBackColor = true; + this.eventShiftUpButton.Click += new System.EventHandler(this.eventShiftUpButton_Click); + // + // eventShiftDownButton + // + this.eventShiftDownButton.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("eventShiftDownButton.BackgroundImage"))); + this.eventShiftDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.eventShiftDownButton.Location = new System.Drawing.Point(795, 589); + this.eventShiftDownButton.Name = "eventShiftDownButton"; + this.eventShiftDownButton.Size = new System.Drawing.Size(156, 25); + this.eventShiftDownButton.TabIndex = 42; + this.eventShiftDownButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.eventShiftDownButton.UseVisualStyleBackColor = true; + this.eventShiftDownButton.Click += new System.EventHandler(this.eventShiftDownButton_Click); + // + // exportEventFileButton + // + this.exportEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("exportEventFileButton.Image"))); + this.exportEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.exportEventFileButton.Location = new System.Drawing.Point(266, 9); + this.exportEventFileButton.Name = "exportEventFileButton"; + this.exportEventFileButton.Size = new System.Drawing.Size(84, 52); + this.exportEventFileButton.TabIndex = 36; + this.exportEventFileButton.Text = "Export"; + this.exportEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.exportEventFileButton.UseVisualStyleBackColor = true; + this.exportEventFileButton.Click += new System.EventHandler(this.exportEventFileButton_Click); + // + // importEventFileButton + // + this.importEventFileButton.Image = ((System.Drawing.Image)(resources.GetObject("importEventFileButton.Image"))); + this.importEventFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.importEventFileButton.Location = new System.Drawing.Point(178, 9); + this.importEventFileButton.Name = "importEventFileButton"; + this.importEventFileButton.Size = new System.Drawing.Size(84, 52); + this.importEventFileButton.TabIndex = 35; + this.importEventFileButton.Text = "Replace\r\nCurrent"; + this.importEventFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.importEventFileButton.UseVisualStyleBackColor = true; + this.importEventFileButton.Click += new System.EventHandler(this.importEventFileButton_Click); + // + // saveEventsButton + // + this.saveEventsButton.Image = ((System.Drawing.Image)(resources.GetObject("saveEventsButton.Image"))); + this.saveEventsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveEventsButton.Location = new System.Drawing.Point(9, 36); + this.saveEventsButton.Name = "saveEventsButton"; + this.saveEventsButton.Size = new System.Drawing.Size(166, 25); + this.saveEventsButton.TabIndex = 34; + this.saveEventsButton.Text = "Save Events"; + this.saveEventsButton.UseVisualStyleBackColor = true; + this.saveEventsButton.Click += new System.EventHandler(this.saveEventsButton_Click); + // + // scriptTabPage + // + this.scriptTabPage.Controls.Add(this.compressScriptTextButton); + this.scriptTabPage.Controls.Add(this.expandScriptTextButton); + this.scriptTabPage.Controls.Add(this.findScriptTextButton); + this.scriptTabPage.Controls.Add(this.scriptEditorWhitespacesCheckbox); + this.scriptTabPage.Controls.Add(this.scriptEditorWordWrapCheckbox); + this.scriptTabPage.Controls.Add(this.groupBox24); + this.scriptTabPage.Controls.Add(this.clearCurrentLevelScriptButton); + this.scriptTabPage.Controls.Add(this.groupBox8); + this.scriptTabPage.Controls.Add(this.importScriptFileButton); + this.scriptTabPage.Controls.Add(this.exportScriptFileButton); + this.scriptTabPage.Controls.Add(this.saveScriptFileButton); + this.scriptTabPage.Controls.Add(this.removeScriptFileButton); + this.scriptTabPage.Controls.Add(this.addScriptFileButton); + this.scriptTabPage.Controls.Add(this.scriptEditorTabControl); + this.scriptTabPage.Controls.Add(this.label5); + this.scriptTabPage.Controls.Add(this.selectScriptFileComboBox); + this.scriptTabPage.ImageIndex = 5; + this.scriptTabPage.Location = new System.Drawing.Point(4, 23); + this.scriptTabPage.Name = "scriptTabPage"; + this.scriptTabPage.Padding = new System.Windows.Forms.Padding(3); + this.scriptTabPage.Size = new System.Drawing.Size(1185, 619); + this.scriptTabPage.TabIndex = 4; + this.scriptTabPage.Text = "Script Editor"; + this.scriptTabPage.UseVisualStyleBackColor = true; + // + // compressScriptTextButton + // + this.compressScriptTextButton.Image = global::DSPRE.Properties.Resources.compressArrow; + this.compressScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.compressScriptTextButton.Location = new System.Drawing.Point(1139, 9); + this.compressScriptTextButton.Name = "compressScriptTextButton"; + this.compressScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.compressScriptTextButton.TabIndex = 49; + this.compressScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.compressScriptTextButton.UseVisualStyleBackColor = true; + this.compressScriptTextButton.Click += new System.EventHandler(this.ScriptEditorCollapseButton_Click); + // + // expandScriptTextButton + // + this.expandScriptTextButton.Image = global::DSPRE.Properties.Resources.expandArrow; + this.expandScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.expandScriptTextButton.Location = new System.Drawing.Point(1111, 9); + this.expandScriptTextButton.Name = "expandScriptTextButton"; + this.expandScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.expandScriptTextButton.TabIndex = 48; + this.expandScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.expandScriptTextButton.UseVisualStyleBackColor = true; + this.expandScriptTextButton.Click += new System.EventHandler(this.ScriptEditorExpandButton_Click); + // + // findScriptTextButton + // + this.findScriptTextButton.Image = ((System.Drawing.Image)(resources.GetObject("findScriptTextButton.Image"))); + this.findScriptTextButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.findScriptTextButton.Location = new System.Drawing.Point(1083, 9); + this.findScriptTextButton.Name = "findScriptTextButton"; + this.findScriptTextButton.Size = new System.Drawing.Size(24, 24); + this.findScriptTextButton.TabIndex = 47; + this.findScriptTextButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.findScriptTextButton.UseVisualStyleBackColor = true; + // + // scriptEditorWhitespacesCheckbox + // + this.scriptEditorWhitespacesCheckbox.Appearance = System.Windows.Forms.Appearance.Button; + this.scriptEditorWhitespacesCheckbox.AutoSize = true; + this.scriptEditorWhitespacesCheckbox.Location = new System.Drawing.Point(746, 11); + this.scriptEditorWhitespacesCheckbox.Name = "scriptEditorWhitespacesCheckbox"; + this.scriptEditorWhitespacesCheckbox.Size = new System.Drawing.Size(79, 23); + this.scriptEditorWhitespacesCheckbox.TabIndex = 46; + this.scriptEditorWhitespacesCheckbox.Text = "Whitespaces"; + this.scriptEditorWhitespacesCheckbox.UseVisualStyleBackColor = true; + this.scriptEditorWhitespacesCheckbox.CheckedChanged += new System.EventHandler(this.viewWhiteSpacesButton_Click); + // + // scriptEditorWordWrapCheckbox + // + this.scriptEditorWordWrapCheckbox.Appearance = System.Windows.Forms.Appearance.Button; + this.scriptEditorWordWrapCheckbox.AutoSize = true; + this.scriptEditorWordWrapCheckbox.Checked = true; + this.scriptEditorWordWrapCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; + this.scriptEditorWordWrapCheckbox.Location = new System.Drawing.Point(672, 11); + this.scriptEditorWordWrapCheckbox.Name = "scriptEditorWordWrapCheckbox"; + this.scriptEditorWordWrapCheckbox.Size = new System.Drawing.Size(72, 23); + this.scriptEditorWordWrapCheckbox.TabIndex = 43; + this.scriptEditorWordWrapCheckbox.Text = "Word Wrap"; + this.scriptEditorWordWrapCheckbox.UseVisualStyleBackColor = true; // // groupBox24 // @@ -6697,7 +6593,7 @@ // // clearCurrentLevelScriptButton // - this.clearCurrentLevelScriptButton.Image = global::DSPRE.Properties.Resources.destroyLevelScript; + this.clearCurrentLevelScriptButton.Image = ((System.Drawing.Image)(resources.GetObject("clearCurrentLevelScriptButton.Image"))); this.clearCurrentLevelScriptButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.clearCurrentLevelScriptButton.Location = new System.Drawing.Point(364, 18); this.clearCurrentLevelScriptButton.Name = "clearCurrentLevelScriptButton"; @@ -6811,7 +6707,7 @@ // // importScriptFileButton // - this.importScriptFileButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importScriptFileButton.Image = ((System.Drawing.Image)(resources.GetObject("importScriptFileButton.Image"))); this.importScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importScriptFileButton.Location = new System.Drawing.Point(215, 18); this.importScriptFileButton.Name = "importScriptFileButton"; @@ -6824,7 +6720,7 @@ // // exportScriptFileButton // - this.exportScriptFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportScriptFileButton.Image = ((System.Drawing.Image)(resources.GetObject("exportScriptFileButton.Image"))); this.exportScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportScriptFileButton.Location = new System.Drawing.Point(289, 18); this.exportScriptFileButton.Name = "exportScriptFileButton"; @@ -6837,7 +6733,7 @@ // // saveScriptFileButton // - this.saveScriptFileButton.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveScriptFileButton.Image = ((System.Drawing.Image)(resources.GetObject("saveScriptFileButton.Image"))); this.saveScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveScriptFileButton.Location = new System.Drawing.Point(7, 46); this.saveScriptFileButton.Name = "saveScriptFileButton"; @@ -6849,7 +6745,7 @@ // // removeScriptFileButton // - this.removeScriptFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; + this.removeScriptFileButton.Image = ((System.Drawing.Image)(resources.GetObject("removeScriptFileButton.Image"))); this.removeScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.removeScriptFileButton.Location = new System.Drawing.Point(365, 46); this.removeScriptFileButton.Name = "removeScriptFileButton"; @@ -6862,7 +6758,7 @@ // // addScriptFileButton // - this.addScriptFileButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addScriptFileButton.Image = ((System.Drawing.Image)(resources.GetObject("addScriptFileButton.Image"))); this.addScriptFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addScriptFileButton.Location = new System.Drawing.Point(365, 18); this.addScriptFileButton.Name = "addScriptFileButton"; @@ -6878,159 +6774,297 @@ this.scriptEditorTabControl.Controls.Add(this.scriptsTabPage); this.scriptEditorTabControl.Controls.Add(this.functionTabPage); this.scriptEditorTabControl.Controls.Add(this.movementTabPage); - this.scriptEditorTabControl.Location = new System.Drawing.Point(488, 17); + this.scriptEditorTabControl.Location = new System.Drawing.Point(487, 18); this.scriptEditorTabControl.Name = "scriptEditorTabControl"; this.scriptEditorTabControl.SelectedIndex = 0; - this.scriptEditorTabControl.Size = new System.Drawing.Size(672, 594); + this.scriptEditorTabControl.Size = new System.Drawing.Size(692, 595); this.scriptEditorTabControl.TabIndex = 5; - this.scriptEditorTabControl.SelectedIndexChanged += new System.EventHandler(this.SetCurrentRTBfromSelectedScriptTab); + this.scriptEditorTabControl.TabIndexChanged += new System.EventHandler(this.scriptEditorTabControl_TabIndexChanged); // // scriptsTabPage // - this.scriptsTabPage.Controls.Add(this.scriptTextBox); - this.scriptsTabPage.Controls.Add(this.LineNumberTextBoxScript); + this.scriptsTabPage.Controls.Add(this.PanelSearchScripts); + this.scriptsTabPage.Controls.Add(this.scintillaScriptsPanel); this.scriptsTabPage.Location = new System.Drawing.Point(4, 22); this.scriptsTabPage.Name = "scriptsTabPage"; this.scriptsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.scriptsTabPage.Size = new System.Drawing.Size(664, 568); + this.scriptsTabPage.Size = new System.Drawing.Size(684, 569); this.scriptsTabPage.TabIndex = 0; this.scriptsTabPage.Text = "Scripts"; this.scriptsTabPage.UseVisualStyleBackColor = true; // - // scriptTextBox + // PanelSearchScripts // - this.scriptTextBox.AcceptsTab = true; - this.scriptTextBox.BackColor = System.Drawing.SystemColors.Menu; - this.scriptTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.scriptTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.scriptTextBox.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.scriptTextBox.Location = new System.Drawing.Point(13, 3); - this.scriptTextBox.MaxLength = 1000000; - this.scriptTextBox.Name = "scriptTextBox"; - this.scriptTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; - this.scriptTextBox.Size = new System.Drawing.Size(648, 562); - this.scriptTextBox.TabIndex = 7; - this.scriptTextBox.TabStop = false; - this.scriptTextBox.Text = ""; - this.scriptTextBox.SelectionChanged += new System.EventHandler(this.updateCurrentBoxLineNumbers); - this.scriptTextBox.VScroll += new System.EventHandler(this.updateCurrentBoxLineNumbers); + this.PanelSearchScripts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.PanelSearchScripts.BackColor = System.Drawing.Color.White; + this.PanelSearchScripts.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchScripts.Controls.Add(this.BtnNextSearchScript); + this.PanelSearchScripts.Controls.Add(this.BtnPrevSearchScript); + this.PanelSearchScripts.Controls.Add(this.BtnCloseSearchScript); + this.PanelSearchScripts.Controls.Add(this.panelSearchScriptTextBox); + this.PanelSearchScripts.Location = new System.Drawing.Point(386, 3); + this.PanelSearchScripts.Name = "PanelSearchScripts"; + this.PanelSearchScripts.Size = new System.Drawing.Size(292, 40); + this.PanelSearchScripts.TabIndex = 14; + this.PanelSearchScripts.Visible = false; // - // LineNumberTextBoxScript + // BtnNextSearchScript // - this.LineNumberTextBoxScript.BackColor = System.Drawing.SystemColors.Window; - this.LineNumberTextBoxScript.CausesValidation = false; - this.LineNumberTextBoxScript.Cursor = System.Windows.Forms.Cursors.PanNE; - this.LineNumberTextBoxScript.Dock = System.Windows.Forms.DockStyle.Left; - this.LineNumberTextBoxScript.Enabled = false; - this.LineNumberTextBoxScript.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LineNumberTextBoxScript.ForeColor = System.Drawing.SystemColors.HotTrack; - this.LineNumberTextBoxScript.Location = new System.Drawing.Point(3, 3); - this.LineNumberTextBoxScript.MaxLength = 65535; - this.LineNumberTextBoxScript.Name = "LineNumberTextBoxScript"; - this.LineNumberTextBoxScript.ReadOnly = true; - this.LineNumberTextBoxScript.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; - this.LineNumberTextBoxScript.ShortcutsEnabled = false; - this.LineNumberTextBoxScript.Size = new System.Drawing.Size(10, 562); - this.LineNumberTextBoxScript.TabIndex = 9; - this.LineNumberTextBoxScript.TabStop = false; - this.LineNumberTextBoxScript.Text = ""; - this.LineNumberTextBoxScript.WordWrap = false; + this.BtnNextSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnNextSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextSearchScript.ForeColor = System.Drawing.Color.White; + this.BtnNextSearchScript.Image = ((System.Drawing.Image)(resources.GetObject("BtnNextSearchScript.Image"))); + this.BtnNextSearchScript.Location = new System.Drawing.Point(233, 4); + this.BtnNextSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextSearchScript.Name = "BtnNextSearchScript"; + this.BtnNextSearchScript.Size = new System.Drawing.Size(25, 30); + this.BtnNextSearchScript.TabIndex = 9; + this.BtnNextSearchScript.Tag = "Find next (Enter)"; + this.BtnNextSearchScript.UseVisualStyleBackColor = true; + this.BtnNextSearchScript.Click += new System.EventHandler(this.BtnNextSearchScript_Click); + // + // BtnPrevSearchScript + // + this.BtnPrevSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnPrevSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevSearchScript.ForeColor = System.Drawing.Color.White; + this.BtnPrevSearchScript.Image = ((System.Drawing.Image)(resources.GetObject("BtnPrevSearchScript.Image"))); + this.BtnPrevSearchScript.Location = new System.Drawing.Point(205, 4); + this.BtnPrevSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevSearchScript.Name = "BtnPrevSearchScript"; + this.BtnPrevSearchScript.Size = new System.Drawing.Size(25, 30); + this.BtnPrevSearchScript.TabIndex = 8; + this.BtnPrevSearchScript.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevSearchScript.UseVisualStyleBackColor = true; + this.BtnPrevSearchScript.Click += new System.EventHandler(this.BtnPrevSearchScript_Click); + // + // BtnCloseSearchScript + // + this.BtnCloseSearchScript.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnCloseSearchScript.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseSearchScript.ForeColor = System.Drawing.Color.White; + this.BtnCloseSearchScript.Image = ((System.Drawing.Image)(resources.GetObject("BtnCloseSearchScript.Image"))); + this.BtnCloseSearchScript.Location = new System.Drawing.Point(261, 4); + this.BtnCloseSearchScript.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseSearchScript.Name = "BtnCloseSearchScript"; + this.BtnCloseSearchScript.Size = new System.Drawing.Size(25, 30); + this.BtnCloseSearchScript.TabIndex = 7; + this.BtnCloseSearchScript.Tag = "Close (Esc)"; + this.BtnCloseSearchScript.UseVisualStyleBackColor = true; + this.BtnCloseSearchScript.Click += new System.EventHandler(this.BtnCloseSearchScript_Click); + // + // panelSearchScriptTextBox + // + this.panelSearchScriptTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panelSearchScriptTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelSearchScriptTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelSearchScriptTextBox.Location = new System.Drawing.Point(10, 6); + this.panelSearchScriptTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelSearchScriptTextBox.Name = "panelSearchScriptTextBox"; + this.panelSearchScriptTextBox.Size = new System.Drawing.Size(189, 25); + this.panelSearchScriptTextBox.TabIndex = 6; + this.panelSearchScriptTextBox.TextChanged += new System.EventHandler(this.panelSearchScriptTextBox_TextChanged); + this.panelSearchScriptTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.scriptTxtSearch_KeyDown); + // + // scintillaScriptsPanel + // + this.scintillaScriptsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaScriptsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaScriptsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaScriptsPanel.Name = "scintillaScriptsPanel"; + this.scintillaScriptsPanel.Size = new System.Drawing.Size(678, 563); + this.scintillaScriptsPanel.TabIndex = 13; // // functionTabPage // - this.functionTabPage.Controls.Add(this.functionTextBox); - this.functionTabPage.Controls.Add(this.LineNumberTextBoxFunc); + this.functionTabPage.Controls.Add(this.PanelSearchFunctions); + this.functionTabPage.Controls.Add(this.scintillaFunctionsPanel); this.functionTabPage.Location = new System.Drawing.Point(4, 22); this.functionTabPage.Name = "functionTabPage"; this.functionTabPage.Padding = new System.Windows.Forms.Padding(3); - this.functionTabPage.Size = new System.Drawing.Size(664, 568); + this.functionTabPage.Size = new System.Drawing.Size(684, 569); this.functionTabPage.TabIndex = 1; this.functionTabPage.Text = "Functions"; this.functionTabPage.UseVisualStyleBackColor = true; // - // functionTextBox + // PanelSearchFunctions // - this.functionTextBox.AcceptsTab = true; - this.functionTextBox.BackColor = System.Drawing.SystemColors.Menu; - this.functionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.functionTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.functionTextBox.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.functionTextBox.Location = new System.Drawing.Point(13, 3); - this.functionTextBox.MaxLength = 1000000; - this.functionTextBox.Name = "functionTextBox"; - this.functionTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; - this.functionTextBox.Size = new System.Drawing.Size(648, 562); - this.functionTextBox.TabIndex = 14; - this.functionTextBox.TabStop = false; - this.functionTextBox.Text = ""; - this.functionTextBox.VScroll += new System.EventHandler(this.updateCurrentBoxLineNumbers); - this.functionTextBox.TextChanged += new System.EventHandler(this.updateCurrentBoxLineNumbers); + this.PanelSearchFunctions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.PanelSearchFunctions.BackColor = System.Drawing.Color.White; + this.PanelSearchFunctions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchFunctions.Controls.Add(this.BtnNextSearchFunc); + this.PanelSearchFunctions.Controls.Add(this.BtnPrevSearchFunc); + this.PanelSearchFunctions.Controls.Add(this.BtnCloseSearchFunc); + this.PanelSearchFunctions.Controls.Add(this.panelSearchFunctionTextBox); + this.PanelSearchFunctions.Location = new System.Drawing.Point(386, 3); + this.PanelSearchFunctions.Name = "PanelSearchFunctions"; + this.PanelSearchFunctions.Size = new System.Drawing.Size(292, 40); + this.PanelSearchFunctions.TabIndex = 16; + this.PanelSearchFunctions.Visible = false; // - // LineNumberTextBoxFunc + // BtnNextSearchFunc // - this.LineNumberTextBoxFunc.BackColor = System.Drawing.SystemColors.Window; - this.LineNumberTextBoxFunc.CausesValidation = false; - this.LineNumberTextBoxFunc.Cursor = System.Windows.Forms.Cursors.PanNE; - this.LineNumberTextBoxFunc.Dock = System.Windows.Forms.DockStyle.Left; - this.LineNumberTextBoxFunc.Enabled = false; - this.LineNumberTextBoxFunc.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LineNumberTextBoxFunc.ForeColor = System.Drawing.SystemColors.HotTrack; - this.LineNumberTextBoxFunc.Location = new System.Drawing.Point(3, 3); - this.LineNumberTextBoxFunc.Name = "LineNumberTextBoxFunc"; - this.LineNumberTextBoxFunc.ReadOnly = true; - this.LineNumberTextBoxFunc.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; - this.LineNumberTextBoxFunc.Size = new System.Drawing.Size(10, 562); - this.LineNumberTextBoxFunc.TabIndex = 15; - this.LineNumberTextBoxFunc.Text = ""; - this.LineNumberTextBoxFunc.WordWrap = false; + this.BtnNextSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnNextSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextSearchFunc.ForeColor = System.Drawing.Color.White; + this.BtnNextSearchFunc.Image = ((System.Drawing.Image)(resources.GetObject("BtnNextSearchFunc.Image"))); + this.BtnNextSearchFunc.Location = new System.Drawing.Point(233, 4); + this.BtnNextSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextSearchFunc.Name = "BtnNextSearchFunc"; + this.BtnNextSearchFunc.Size = new System.Drawing.Size(25, 30); + this.BtnNextSearchFunc.TabIndex = 9; + this.BtnNextSearchFunc.Tag = "Find next (Enter)"; + this.BtnNextSearchFunc.UseVisualStyleBackColor = true; + this.BtnNextSearchFunc.Click += new System.EventHandler(this.BtnNextSearchFunc_Click); + // + // BtnPrevSearchFunc + // + this.BtnPrevSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnPrevSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevSearchFunc.ForeColor = System.Drawing.Color.White; + this.BtnPrevSearchFunc.Image = ((System.Drawing.Image)(resources.GetObject("BtnPrevSearchFunc.Image"))); + this.BtnPrevSearchFunc.Location = new System.Drawing.Point(205, 4); + this.BtnPrevSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevSearchFunc.Name = "BtnPrevSearchFunc"; + this.BtnPrevSearchFunc.Size = new System.Drawing.Size(25, 30); + this.BtnPrevSearchFunc.TabIndex = 8; + this.BtnPrevSearchFunc.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevSearchFunc.UseVisualStyleBackColor = true; + this.BtnPrevSearchFunc.Click += new System.EventHandler(this.BtnPrevSearchFunc_Click); + // + // BtnCloseSearchFunc + // + this.BtnCloseSearchFunc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnCloseSearchFunc.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseSearchFunc.ForeColor = System.Drawing.Color.White; + this.BtnCloseSearchFunc.Image = ((System.Drawing.Image)(resources.GetObject("BtnCloseSearchFunc.Image"))); + this.BtnCloseSearchFunc.Location = new System.Drawing.Point(261, 4); + this.BtnCloseSearchFunc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseSearchFunc.Name = "BtnCloseSearchFunc"; + this.BtnCloseSearchFunc.Size = new System.Drawing.Size(25, 30); + this.BtnCloseSearchFunc.TabIndex = 7; + this.BtnCloseSearchFunc.Tag = "Close (Esc)"; + this.BtnCloseSearchFunc.UseVisualStyleBackColor = true; + this.BtnCloseSearchFunc.Click += new System.EventHandler(this.BtnCloseSearchFunc_Click); + // + // panelSearchFunctionTextBox + // + this.panelSearchFunctionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panelSearchFunctionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelSearchFunctionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelSearchFunctionTextBox.Location = new System.Drawing.Point(10, 6); + this.panelSearchFunctionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelSearchFunctionTextBox.Name = "panelSearchFunctionTextBox"; + this.panelSearchFunctionTextBox.Size = new System.Drawing.Size(189, 25); + this.panelSearchFunctionTextBox.TabIndex = 6; + this.panelSearchFunctionTextBox.TextChanged += new System.EventHandler(this.panelSearchFunctionTextBox_TextChanged); + this.panelSearchFunctionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.functionTxtSearch_KeyDown); + // + // scintillaFunctionsPanel + // + this.scintillaFunctionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaFunctionsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaFunctionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaFunctionsPanel.Name = "scintillaFunctionsPanel"; + this.scintillaFunctionsPanel.Size = new System.Drawing.Size(678, 563); + this.scintillaFunctionsPanel.TabIndex = 15; // // movementTabPage // - this.movementTabPage.Controls.Add(this.actionsTextBox); - this.movementTabPage.Controls.Add(this.LineNumberTextBoxMov); + this.movementTabPage.Controls.Add(this.PanelSearchActions); + this.movementTabPage.Controls.Add(this.scintillaActionsPanel); this.movementTabPage.Location = new System.Drawing.Point(4, 22); this.movementTabPage.Name = "movementTabPage"; this.movementTabPage.Padding = new System.Windows.Forms.Padding(3); - this.movementTabPage.Size = new System.Drawing.Size(664, 568); + this.movementTabPage.Size = new System.Drawing.Size(684, 569); this.movementTabPage.TabIndex = 2; this.movementTabPage.Text = "Actions"; this.movementTabPage.UseVisualStyleBackColor = true; // - // actionsTextBox + // PanelSearchActions // - this.actionsTextBox.AcceptsTab = true; - this.actionsTextBox.BackColor = System.Drawing.SystemColors.Menu; - this.actionsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.actionsTextBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.actionsTextBox.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.actionsTextBox.Location = new System.Drawing.Point(13, 3); - this.actionsTextBox.MaxLength = 1000000; - this.actionsTextBox.Name = "actionsTextBox"; - this.actionsTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; - this.actionsTextBox.Size = new System.Drawing.Size(648, 562); - this.actionsTextBox.TabIndex = 17; - this.actionsTextBox.TabStop = false; - this.actionsTextBox.Text = ""; - this.actionsTextBox.SelectionChanged += new System.EventHandler(this.updateCurrentBoxLineNumbers); - this.actionsTextBox.VScroll += new System.EventHandler(this.updateCurrentBoxLineNumbers); + this.PanelSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.PanelSearchActions.BackColor = System.Drawing.Color.White; + this.PanelSearchActions.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.PanelSearchActions.Controls.Add(this.BtnNextSearchActions); + this.PanelSearchActions.Controls.Add(this.BtnPrevSearchActions); + this.PanelSearchActions.Controls.Add(this.BtnCloseSearchActions); + this.PanelSearchActions.Controls.Add(this.panelSearchActionTextBox); + this.PanelSearchActions.Location = new System.Drawing.Point(386, 3); + this.PanelSearchActions.Name = "PanelSearchActions"; + this.PanelSearchActions.Size = new System.Drawing.Size(292, 40); + this.PanelSearchActions.TabIndex = 16; + this.PanelSearchActions.Visible = false; // - // LineNumberTextBoxMov + // BtnNextSearchActions // - this.LineNumberTextBoxMov.BackColor = System.Drawing.SystemColors.Window; - this.LineNumberTextBoxMov.CausesValidation = false; - this.LineNumberTextBoxMov.Cursor = System.Windows.Forms.Cursors.PanNE; - this.LineNumberTextBoxMov.Dock = System.Windows.Forms.DockStyle.Left; - this.LineNumberTextBoxMov.Enabled = false; - this.LineNumberTextBoxMov.Font = new System.Drawing.Font("Consolas", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LineNumberTextBoxMov.ForeColor = System.Drawing.SystemColors.HotTrack; - this.LineNumberTextBoxMov.Location = new System.Drawing.Point(3, 3); - this.LineNumberTextBoxMov.Name = "LineNumberTextBoxMov"; - this.LineNumberTextBoxMov.ReadOnly = true; - this.LineNumberTextBoxMov.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; - this.LineNumberTextBoxMov.Size = new System.Drawing.Size(10, 562); - this.LineNumberTextBoxMov.TabIndex = 18; - this.LineNumberTextBoxMov.Text = ""; - this.LineNumberTextBoxMov.WordWrap = false; + this.BtnNextSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnNextSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnNextSearchActions.ForeColor = System.Drawing.Color.White; + this.BtnNextSearchActions.Image = ((System.Drawing.Image)(resources.GetObject("BtnNextSearchActions.Image"))); + this.BtnNextSearchActions.Location = new System.Drawing.Point(233, 4); + this.BtnNextSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnNextSearchActions.Name = "BtnNextSearchActions"; + this.BtnNextSearchActions.Size = new System.Drawing.Size(25, 30); + this.BtnNextSearchActions.TabIndex = 9; + this.BtnNextSearchActions.Tag = "Find next (Enter)"; + this.BtnNextSearchActions.UseVisualStyleBackColor = true; + this.BtnNextSearchActions.Click += new System.EventHandler(this.BtnNextSearchActions_Click); + // + // BtnPrevSearchActions + // + this.BtnPrevSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnPrevSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnPrevSearchActions.ForeColor = System.Drawing.Color.White; + this.BtnPrevSearchActions.Image = ((System.Drawing.Image)(resources.GetObject("BtnPrevSearchActions.Image"))); + this.BtnPrevSearchActions.Location = new System.Drawing.Point(205, 4); + this.BtnPrevSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnPrevSearchActions.Name = "BtnPrevSearchActions"; + this.BtnPrevSearchActions.Size = new System.Drawing.Size(25, 30); + this.BtnPrevSearchActions.TabIndex = 8; + this.BtnPrevSearchActions.Tag = "Find previous (Shift+Enter)"; + this.BtnPrevSearchActions.UseVisualStyleBackColor = true; + this.BtnPrevSearchActions.Click += new System.EventHandler(this.BtnPrevSearchActions_Click); + // + // BtnCloseSearchActions + // + this.BtnCloseSearchActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.BtnCloseSearchActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.BtnCloseSearchActions.ForeColor = System.Drawing.Color.White; + this.BtnCloseSearchActions.Image = ((System.Drawing.Image)(resources.GetObject("BtnCloseSearchActions.Image"))); + this.BtnCloseSearchActions.Location = new System.Drawing.Point(261, 4); + this.BtnCloseSearchActions.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.BtnCloseSearchActions.Name = "BtnCloseSearchActions"; + this.BtnCloseSearchActions.Size = new System.Drawing.Size(25, 30); + this.BtnCloseSearchActions.TabIndex = 7; + this.BtnCloseSearchActions.Tag = "Close (Esc)"; + this.BtnCloseSearchActions.UseVisualStyleBackColor = true; + this.BtnCloseSearchActions.Click += new System.EventHandler(this.BtnCloseSearchActions_Click); + // + // panelSearchActionTextBox + // + this.panelSearchActionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panelSearchActionTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.panelSearchActionTextBox.Font = new System.Drawing.Font("Segoe UI", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.panelSearchActionTextBox.Location = new System.Drawing.Point(10, 6); + this.panelSearchActionTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelSearchActionTextBox.Name = "panelSearchActionTextBox"; + this.panelSearchActionTextBox.Size = new System.Drawing.Size(189, 25); + this.panelSearchActionTextBox.TabIndex = 6; + this.panelSearchActionTextBox.TextChanged += new System.EventHandler(this.panelSearchActionTextBox_TextChanged); + this.panelSearchActionTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actiontTxtSearch_KeyDown); + // + // scintillaActionsPanel + // + this.scintillaActionsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.scintillaActionsPanel.Location = new System.Drawing.Point(3, 3); + this.scintillaActionsPanel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.scintillaActionsPanel.Name = "scintillaActionsPanel"; + this.scintillaActionsPanel.Size = new System.Drawing.Size(678, 563); + this.scintillaActionsPanel.TabIndex = 15; // // label5 // @@ -7055,16 +7089,16 @@ // this.textEditorTabPage.Controls.Add(this.LineNumbersFormatgroupBox); this.textEditorTabPage.Controls.Add(this.groupBox13); + this.textEditorTabPage.Controls.Add(this.textEditorDataGridView); + this.textEditorTabPage.Controls.Add(this.label6); + this.textEditorTabPage.Controls.Add(this.selectTextFileComboBox); this.textEditorTabPage.Controls.Add(this.removeStringButton); this.textEditorTabPage.Controls.Add(this.addStringButton); - this.textEditorTabPage.Controls.Add(this.textEditorDataGridView); this.textEditorTabPage.Controls.Add(this.exportTextFileButton); this.textEditorTabPage.Controls.Add(this.importTextFileButton); this.textEditorTabPage.Controls.Add(this.saveTextArchiveButton); this.textEditorTabPage.Controls.Add(this.removeMessageFileButton); this.textEditorTabPage.Controls.Add(this.addTextArchiveButton); - this.textEditorTabPage.Controls.Add(this.label6); - this.textEditorTabPage.Controls.Add(this.selectTextFileComboBox); this.textEditorTabPage.ImageIndex = 4; this.textEditorTabPage.Location = new System.Drawing.Point(4, 23); this.textEditorTabPage.Name = "textEditorTabPage"; @@ -7254,32 +7288,6 @@ this.replaceMessageButton.UseVisualStyleBackColor = true; this.replaceMessageButton.Click += new System.EventHandler(this.replaceMessageButton_Click); // - // removeStringButton - // - this.removeStringButton.Image = global::DSPRE.Properties.Resources.deleteIcon; - this.removeStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeStringButton.Location = new System.Drawing.Point(113, 579); - this.removeStringButton.Name = "removeStringButton"; - this.removeStringButton.Size = new System.Drawing.Size(124, 34); - this.removeStringButton.TabIndex = 26; - this.removeStringButton.Text = "Remove Last Line"; - this.removeStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeStringButton.UseVisualStyleBackColor = true; - this.removeStringButton.Click += new System.EventHandler(this.removeStringButton_Click); - // - // addStringButton - // - this.addStringButton.Image = global::DSPRE.Properties.Resources.addIcon; - this.addStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addStringButton.Location = new System.Drawing.Point(12, 579); - this.addStringButton.Name = "addStringButton"; - this.addStringButton.Size = new System.Drawing.Size(95, 34); - this.addStringButton.TabIndex = 25; - this.addStringButton.Text = "&Append Line"; - this.addStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addStringButton.UseVisualStyleBackColor = true; - this.addStringButton.Click += new System.EventHandler(this.addStringButton_Click); - // // textEditorDataGridView // this.textEditorDataGridView.AllowDrop = true; @@ -7297,8 +7305,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle16.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle1; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 496); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7311,70 +7319,6 @@ this.messageColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.messageColumn.Width = 56; // - // exportTextFileButton - // - this.exportTextFileButton.Image = global::DSPRE.Properties.Resources.exportArrow; - this.exportTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.exportTextFileButton.Location = new System.Drawing.Point(297, 21); - this.exportTextFileButton.Name = "exportTextFileButton"; - this.exportTextFileButton.Size = new System.Drawing.Size(94, 50); - this.exportTextFileButton.TabIndex = 23; - this.exportTextFileButton.Text = "&Export File"; - this.exportTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.exportTextFileButton.UseVisualStyleBackColor = true; - this.exportTextFileButton.Click += new System.EventHandler(this.exportTextFileButton_Click); - // - // importTextFileButton - // - this.importTextFileButton.Image = global::DSPRE.Properties.Resources.importArrow; - this.importTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.importTextFileButton.Location = new System.Drawing.Point(200, 21); - this.importTextFileButton.Name = "importTextFileButton"; - this.importTextFileButton.Size = new System.Drawing.Size(94, 50); - this.importTextFileButton.TabIndex = 22; - this.importTextFileButton.Text = "&Import File"; - this.importTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.importTextFileButton.UseVisualStyleBackColor = true; - this.importTextFileButton.Click += new System.EventHandler(this.importTextFileButton_Click); - // - // saveTextArchiveButton - // - this.saveTextArchiveButton.Image = global::DSPRE.Properties.Resources.saveButton; - this.saveTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.saveTextArchiveButton.Location = new System.Drawing.Point(12, 48); - this.saveTextArchiveButton.Name = "saveTextArchiveButton"; - this.saveTextArchiveButton.Size = new System.Drawing.Size(184, 23); - this.saveTextArchiveButton.TabIndex = 21; - this.saveTextArchiveButton.Text = "&Save Current Archive"; - this.saveTextArchiveButton.UseVisualStyleBackColor = true; - this.saveTextArchiveButton.Click += new System.EventHandler(this.saveTextArchiveButton_Click); - // - // removeMessageFileButton - // - this.removeMessageFileButton.Image = global::DSPRE.Properties.Resources.deleteIcon; - this.removeMessageFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeMessageFileButton.Location = new System.Drawing.Point(491, 21); - this.removeMessageFileButton.Name = "removeMessageFileButton"; - this.removeMessageFileButton.Size = new System.Drawing.Size(97, 50); - this.removeMessageFileButton.TabIndex = 20; - this.removeMessageFileButton.Text = "Remove \r\nLast Archive"; - this.removeMessageFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.removeMessageFileButton.UseVisualStyleBackColor = true; - this.removeMessageFileButton.Click += new System.EventHandler(this.removeMessageFileButton_Click); - // - // addTextArchiveButton - // - this.addTextArchiveButton.Image = global::DSPRE.Properties.Resources.addIcon; - this.addTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addTextArchiveButton.Location = new System.Drawing.Point(397, 21); - this.addTextArchiveButton.Name = "addTextArchiveButton"; - this.addTextArchiveButton.Size = new System.Drawing.Size(91, 50); - this.addTextArchiveButton.TabIndex = 19; - this.addTextArchiveButton.Text = "Add Text \r\nArchive"; - this.addTextArchiveButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.addTextArchiveButton.UseVisualStyleBackColor = true; - this.addTextArchiveButton.Click += new System.EventHandler(this.addTextArchiveButton_Click); - // // label6 // this.label6.AutoSize = true; @@ -7394,6 +7338,96 @@ this.selectTextFileComboBox.TabIndex = 17; this.selectTextFileComboBox.SelectedIndexChanged += new System.EventHandler(this.selectTextFileComboBox_SelectedIndexChanged); // + // removeStringButton + // + this.removeStringButton.Image = ((System.Drawing.Image)(resources.GetObject("removeStringButton.Image"))); + this.removeStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeStringButton.Location = new System.Drawing.Point(113, 579); + this.removeStringButton.Name = "removeStringButton"; + this.removeStringButton.Size = new System.Drawing.Size(124, 34); + this.removeStringButton.TabIndex = 26; + this.removeStringButton.Text = "Remove Last Line"; + this.removeStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeStringButton.UseVisualStyleBackColor = true; + this.removeStringButton.Click += new System.EventHandler(this.removeStringButton_Click); + // + // addStringButton + // + this.addStringButton.Image = ((System.Drawing.Image)(resources.GetObject("addStringButton.Image"))); + this.addStringButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addStringButton.Location = new System.Drawing.Point(12, 579); + this.addStringButton.Name = "addStringButton"; + this.addStringButton.Size = new System.Drawing.Size(95, 34); + this.addStringButton.TabIndex = 25; + this.addStringButton.Text = "&Append Line"; + this.addStringButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addStringButton.UseVisualStyleBackColor = true; + this.addStringButton.Click += new System.EventHandler(this.addStringButton_Click); + // + // exportTextFileButton + // + this.exportTextFileButton.Image = ((System.Drawing.Image)(resources.GetObject("exportTextFileButton.Image"))); + this.exportTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.exportTextFileButton.Location = new System.Drawing.Point(297, 21); + this.exportTextFileButton.Name = "exportTextFileButton"; + this.exportTextFileButton.Size = new System.Drawing.Size(94, 50); + this.exportTextFileButton.TabIndex = 23; + this.exportTextFileButton.Text = "&Export File"; + this.exportTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.exportTextFileButton.UseVisualStyleBackColor = true; + this.exportTextFileButton.Click += new System.EventHandler(this.exportTextFileButton_Click); + // + // importTextFileButton + // + this.importTextFileButton.Image = ((System.Drawing.Image)(resources.GetObject("importTextFileButton.Image"))); + this.importTextFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.importTextFileButton.Location = new System.Drawing.Point(200, 21); + this.importTextFileButton.Name = "importTextFileButton"; + this.importTextFileButton.Size = new System.Drawing.Size(94, 50); + this.importTextFileButton.TabIndex = 22; + this.importTextFileButton.Text = "&Import File"; + this.importTextFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.importTextFileButton.UseVisualStyleBackColor = true; + this.importTextFileButton.Click += new System.EventHandler(this.importTextFileButton_Click); + // + // saveTextArchiveButton + // + this.saveTextArchiveButton.Image = ((System.Drawing.Image)(resources.GetObject("saveTextArchiveButton.Image"))); + this.saveTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.saveTextArchiveButton.Location = new System.Drawing.Point(12, 48); + this.saveTextArchiveButton.Name = "saveTextArchiveButton"; + this.saveTextArchiveButton.Size = new System.Drawing.Size(184, 23); + this.saveTextArchiveButton.TabIndex = 21; + this.saveTextArchiveButton.Text = "&Save Current Archive"; + this.saveTextArchiveButton.UseVisualStyleBackColor = true; + this.saveTextArchiveButton.Click += new System.EventHandler(this.saveTextArchiveButton_Click); + // + // removeMessageFileButton + // + this.removeMessageFileButton.Image = ((System.Drawing.Image)(resources.GetObject("removeMessageFileButton.Image"))); + this.removeMessageFileButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.removeMessageFileButton.Location = new System.Drawing.Point(491, 21); + this.removeMessageFileButton.Name = "removeMessageFileButton"; + this.removeMessageFileButton.Size = new System.Drawing.Size(97, 50); + this.removeMessageFileButton.TabIndex = 20; + this.removeMessageFileButton.Text = "Remove \r\nLast Archive"; + this.removeMessageFileButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.removeMessageFileButton.UseVisualStyleBackColor = true; + this.removeMessageFileButton.Click += new System.EventHandler(this.removeMessageFileButton_Click); + // + // addTextArchiveButton + // + this.addTextArchiveButton.Image = ((System.Drawing.Image)(resources.GetObject("addTextArchiveButton.Image"))); + this.addTextArchiveButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.addTextArchiveButton.Location = new System.Drawing.Point(397, 21); + this.addTextArchiveButton.Name = "addTextArchiveButton"; + this.addTextArchiveButton.Size = new System.Drawing.Size(91, 50); + this.addTextArchiveButton.TabIndex = 19; + this.addTextArchiveButton.Text = "Add Text \r\nArchive"; + this.addTextArchiveButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.addTextArchiveButton.UseVisualStyleBackColor = true; + this.addTextArchiveButton.Click += new System.EventHandler(this.addTextArchiveButton_Click); + // // cameraEditorTabPage // this.cameraEditorTabPage.Controls.Add(this.exportCameraTableButton); @@ -7410,7 +7444,7 @@ // // exportCameraTableButton // - this.exportCameraTableButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportCameraTableButton.Image = ((System.Drawing.Image)(resources.GetObject("exportCameraTableButton.Image"))); this.exportCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportCameraTableButton.Location = new System.Drawing.Point(3, 563); this.exportCameraTableButton.Name = "exportCameraTableButton"; @@ -7423,7 +7457,7 @@ // // importCameraTableButton // - this.importCameraTableButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importCameraTableButton.Image = ((System.Drawing.Image)(resources.GetObject("importCameraTableButton.Image"))); this.importCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importCameraTableButton.Location = new System.Drawing.Point(123, 563); this.importCameraTableButton.Name = "importCameraTableButton"; @@ -7436,7 +7470,7 @@ // // saveCameraTableButton // - this.saveCameraTableButton.Image = global::DSPRE.Properties.Resources.save_rom; + this.saveCameraTableButton.Image = ((System.Drawing.Image)(resources.GetObject("saveCameraTableButton.Image"))); this.saveCameraTableButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveCameraTableButton.Location = new System.Drawing.Point(1060, 563); this.saveCameraTableButton.Name = "saveCameraTableButton"; @@ -7457,14 +7491,14 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -7596,11 +7630,11 @@ this.trainerEditorTabPage.Controls.Add(this.exportPartyButton); this.trainerEditorTabPage.Controls.Add(this.addTrainerButton); this.trainerEditorTabPage.Controls.Add(this.groupBox28); - this.trainerEditorTabPage.Controls.Add(this.trainerSaveCurrentButton); this.trainerEditorTabPage.Controls.Add(this.groupBox27); this.trainerEditorTabPage.Controls.Add(this.groupBox25); this.trainerEditorTabPage.Controls.Add(this.label42); this.trainerEditorTabPage.Controls.Add(this.trainerComboBox); + this.trainerEditorTabPage.Controls.Add(this.trainerSaveCurrentButton); this.trainerEditorTabPage.ImageIndex = 8; this.trainerEditorTabPage.Location = new System.Drawing.Point(4, 23); this.trainerEditorTabPage.Name = "trainerEditorTabPage"; @@ -7611,7 +7645,7 @@ // // importTrainerButton // - this.importTrainerButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importTrainerButton.Image = ((System.Drawing.Image)(resources.GetObject("importTrainerButton.Image"))); this.importTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importTrainerButton.Location = new System.Drawing.Point(340, 20); this.importTrainerButton.Name = "importTrainerButton"; @@ -7624,7 +7658,7 @@ // // exportTrainerButton // - this.exportTrainerButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportTrainerButton.Image = ((System.Drawing.Image)(resources.GetObject("exportTrainerButton.Image"))); this.exportTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportTrainerButton.Location = new System.Drawing.Point(265, 20); this.exportTrainerButton.Name = "exportTrainerButton"; @@ -7637,7 +7671,7 @@ // // importReplacePartyButton // - this.importReplacePartyButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importReplacePartyButton.Image = ((System.Drawing.Image)(resources.GetObject("importReplacePartyButton.Image"))); this.importReplacePartyButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importReplacePartyButton.Location = new System.Drawing.Point(890, 20); this.importReplacePartyButton.Name = "importReplacePartyButton"; @@ -7650,7 +7684,7 @@ // // importReplacePropertiesButton // - this.importReplacePropertiesButton.Image = global::DSPRE.Properties.Resources.importArrow; + this.importReplacePropertiesButton.Image = ((System.Drawing.Image)(resources.GetObject("importReplacePropertiesButton.Image"))); this.importReplacePropertiesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.importReplacePropertiesButton.Location = new System.Drawing.Point(522, 20); this.importReplacePropertiesButton.Name = "importReplacePropertiesButton"; @@ -7663,7 +7697,7 @@ // // exportPropertiesButton // - this.exportPropertiesButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportPropertiesButton.Image = ((System.Drawing.Image)(resources.GetObject("exportPropertiesButton.Image"))); this.exportPropertiesButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportPropertiesButton.Location = new System.Drawing.Point(433, 20); this.exportPropertiesButton.Name = "exportPropertiesButton"; @@ -7676,7 +7710,7 @@ // // exportPartyButton // - this.exportPartyButton.Image = global::DSPRE.Properties.Resources.exportArrow; + this.exportPartyButton.Image = ((System.Drawing.Image)(resources.GetObject("exportPartyButton.Image"))); this.exportPartyButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.exportPartyButton.Location = new System.Drawing.Point(804, 20); this.exportPartyButton.Name = "exportPartyButton"; @@ -7689,7 +7723,7 @@ // // addTrainerButton // - this.addTrainerButton.Image = global::DSPRE.Properties.Resources.addIcon; + this.addTrainerButton.Image = ((System.Drawing.Image)(resources.GetObject("addTrainerButton.Image"))); this.addTrainerButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.addTrainerButton.Location = new System.Drawing.Point(190, 20); this.addTrainerButton.Name = "addTrainerButton"; @@ -8681,18 +8715,6 @@ this.partyPokemon1ComboBox.TabIndex = 0; this.partyPokemon1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyPokemon1ComboBox_SelectedIndexChanged); // - // trainerSaveCurrentButton - // - this.trainerSaveCurrentButton.Image = global::DSPRE.Properties.Resources.saveButton; - this.trainerSaveCurrentButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.trainerSaveCurrentButton.Location = new System.Drawing.Point(26, 48); - this.trainerSaveCurrentButton.Name = "trainerSaveCurrentButton"; - this.trainerSaveCurrentButton.Size = new System.Drawing.Size(162, 23); - this.trainerSaveCurrentButton.TabIndex = 31; - this.trainerSaveCurrentButton.Text = "&Save Current Trainer"; - this.trainerSaveCurrentButton.UseVisualStyleBackColor = true; - this.trainerSaveCurrentButton.Click += new System.EventHandler(this.trainerSaveCurrentButton_Click); - // // groupBox27 // this.groupBox27.Controls.Add(this.label73); @@ -8784,7 +8806,7 @@ // // saveTrainerClassButton // - this.saveTrainerClassButton.Image = global::DSPRE.Properties.Resources.save_rom; + this.saveTrainerClassButton.Image = ((System.Drawing.Image)(resources.GetObject("saveTrainerClassButton.Image"))); this.saveTrainerClassButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.saveTrainerClassButton.Location = new System.Drawing.Point(319, 15); this.saveTrainerClassButton.Name = "saveTrainerClassButton"; @@ -9138,6 +9160,18 @@ this.trainerComboBox.TabIndex = 27; this.trainerComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerComboBox_SelectedIndexChanged); // + // trainerSaveCurrentButton + // + this.trainerSaveCurrentButton.Image = ((System.Drawing.Image)(resources.GetObject("trainerSaveCurrentButton.Image"))); + this.trainerSaveCurrentButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.trainerSaveCurrentButton.Location = new System.Drawing.Point(26, 48); + this.trainerSaveCurrentButton.Name = "trainerSaveCurrentButton"; + this.trainerSaveCurrentButton.Size = new System.Drawing.Size(162, 23); + this.trainerSaveCurrentButton.TabIndex = 31; + this.trainerSaveCurrentButton.Text = "&Save Current Trainer"; + this.trainerSaveCurrentButton.UseVisualStyleBackColor = true; + this.trainerSaveCurrentButton.Click += new System.EventHandler(this.trainerSaveCurrentButton_Click); + // // tableEditorTabPage // this.tableEditorTabPage.Controls.Add(this.pbEffectsGroupBox); @@ -9172,7 +9206,7 @@ // // HOWpbEffectsTableButton // - this.HOWpbEffectsTableButton.Image = global::DSPRE.Properties.Resources.questionMark; + this.HOWpbEffectsTableButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWpbEffectsTableButton.Image"))); this.HOWpbEffectsTableButton.Location = new System.Drawing.Point(146, 396); this.HOWpbEffectsTableButton.Name = "HOWpbEffectsTableButton"; this.HOWpbEffectsTableButton.Size = new System.Drawing.Size(28, 29); @@ -9191,7 +9225,7 @@ // // saveEffectCombosTableBTN // - this.saveEffectCombosTableBTN.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveEffectCombosTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveEffectCombosTableBTN.Image"))); this.saveEffectCombosTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.saveEffectCombosTableBTN.Location = new System.Drawing.Point(175, 392); this.saveEffectCombosTableBTN.Name = "saveEffectCombosTableBTN"; @@ -9245,7 +9279,7 @@ this.tbEditorTrClassFramePreviewUpDown.Name = "tbEditorTrClassFramePreviewUpDown"; this.tbEditorTrClassFramePreviewUpDown.Size = new System.Drawing.Size(38, 20); this.tbEditorTrClassFramePreviewUpDown.TabIndex = 44; - this.tbEditorTrClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); + this.tbEditorTrClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.TBLEditortrainerClassPreviewPic_ValueChanged); // // tbEditorTrClassPictureBox // @@ -9276,7 +9310,7 @@ // // HOWVsTrainerButton // - this.HOWVsTrainerButton.Image = global::DSPRE.Properties.Resources.questionMark; + this.HOWVsTrainerButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWVsTrainerButton.Image"))); this.HOWVsTrainerButton.Location = new System.Drawing.Point(304, 209); this.HOWVsTrainerButton.Name = "HOWVsTrainerButton"; this.HOWVsTrainerButton.Size = new System.Drawing.Size(28, 29); @@ -9286,7 +9320,7 @@ // // saveVSTrainerTableBTN // - this.saveVSTrainerTableBTN.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveVSTrainerTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveVSTrainerTableBTN.Image"))); this.saveVSTrainerTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.saveVSTrainerTableBTN.Location = new System.Drawing.Point(337, 205); this.saveVSTrainerTableBTN.Name = "saveVSTrainerTableBTN"; @@ -9370,7 +9404,7 @@ // // HOWvsPokemonButton // - this.HOWvsPokemonButton.Image = global::DSPRE.Properties.Resources.questionMark; + this.HOWvsPokemonButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWvsPokemonButton.Image"))); this.HOWvsPokemonButton.Location = new System.Drawing.Point(304, 127); this.HOWvsPokemonButton.Name = "HOWvsPokemonButton"; this.HOWvsPokemonButton.Size = new System.Drawing.Size(28, 29); @@ -9380,7 +9414,7 @@ // // saveVSPokemonTableBTN // - this.saveVSPokemonTableBTN.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveVSPokemonTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveVSPokemonTableBTN.Image"))); this.saveVSPokemonTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.saveVSPokemonTableBTN.Location = new System.Drawing.Point(337, 123); this.saveVSPokemonTableBTN.Name = "saveVSPokemonTableBTN"; @@ -9492,7 +9526,7 @@ // // HOWconditionalMusicTableButton // - this.HOWconditionalMusicTableButton.Image = global::DSPRE.Properties.Resources.questionMark; + this.HOWconditionalMusicTableButton.Image = ((System.Drawing.Image)(resources.GetObject("HOWconditionalMusicTableButton.Image"))); this.HOWconditionalMusicTableButton.Location = new System.Drawing.Point(353, 93); this.HOWconditionalMusicTableButton.Name = "HOWconditionalMusicTableButton"; this.HOWconditionalMusicTableButton.Size = new System.Drawing.Size(28, 29); @@ -9502,7 +9536,7 @@ // // saveConditionalMusicTableBTN // - this.saveConditionalMusicTableBTN.Image = global::DSPRE.Properties.Resources.saveButton; + this.saveConditionalMusicTableBTN.Image = ((System.Drawing.Image)(resources.GetObject("saveConditionalMusicTableBTN.Image"))); this.saveConditionalMusicTableBTN.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.saveConditionalMusicTableBTN.Location = new System.Drawing.Point(297, 142); this.saveConditionalMusicTableBTN.Name = "saveConditionalMusicTableBTN"; @@ -9793,31 +9827,6 @@ this.toolStripProgressBar.Size = new System.Drawing.Size(180, 18); this.toolStripProgressBar.Visible = false; // - // loadRomButton - // - this.loadRomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.loadRomButton.Image = global::DSPRE.Properties.Resources.open_rom; - this.loadRomButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.loadRomButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.loadRomButton.Margin = new System.Windows.Forms.Padding(13, 6, 0, 2); - this.loadRomButton.Name = "loadRomButton"; - this.loadRomButton.Size = new System.Drawing.Size(36, 36); - this.loadRomButton.Text = "Open ROM"; - this.loadRomButton.Click += new System.EventHandler(this.loadRom_Click); - // - // saveRomButton - // - this.saveRomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveRomButton.Enabled = false; - this.saveRomButton.Image = ((System.Drawing.Image)(resources.GetObject("saveRomButton.Image"))); - this.saveRomButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.saveRomButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveRomButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); - this.saveRomButton.Name = "saveRomButton"; - this.saveRomButton.Size = new System.Drawing.Size(36, 36); - this.saveRomButton.Text = "Save ROM"; - this.saveRomButton.Click += new System.EventHandler(this.saveRom_Click); - // // mainToolStrip // this.mainToolStrip.BackColor = System.Drawing.SystemColors.Menu; @@ -9848,10 +9857,22 @@ this.mainToolStrip.TabIndex = 16; this.mainToolStrip.Text = "mainToolStrip"; // + // loadRomButton + // + this.loadRomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.loadRomButton.Image = ((System.Drawing.Image)(resources.GetObject("loadRomButton.Image"))); + this.loadRomButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.loadRomButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.loadRomButton.Margin = new System.Windows.Forms.Padding(13, 6, 0, 2); + this.loadRomButton.Name = "loadRomButton"; + this.loadRomButton.Size = new System.Drawing.Size(36, 36); + this.loadRomButton.Text = "Open ROM"; + this.loadRomButton.Click += new System.EventHandler(this.loadRom_Click); + // // readDataFromFolderButton // this.readDataFromFolderButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.readDataFromFolderButton.Image = global::DSPRE.Properties.Resources.open_file; + this.readDataFromFolderButton.Image = ((System.Drawing.Image)(resources.GetObject("readDataFromFolderButton.Image"))); this.readDataFromFolderButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.readDataFromFolderButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.readDataFromFolderButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); @@ -9861,6 +9882,19 @@ this.readDataFromFolderButton.ToolTipText = "Open Extracted Data"; this.readDataFromFolderButton.Click += new System.EventHandler(this.readDataFromFolderButton_Click); // + // saveRomButton + // + this.saveRomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveRomButton.Enabled = false; + this.saveRomButton.Image = ((System.Drawing.Image)(resources.GetObject("saveRomButton.Image"))); + this.saveRomButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.saveRomButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveRomButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); + this.saveRomButton.Name = "saveRomButton"; + this.saveRomButton.Size = new System.Drawing.Size(36, 36); + this.saveRomButton.Text = "Save ROM"; + this.saveRomButton.Click += new System.EventHandler(this.saveRom_Click); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; @@ -9870,7 +9904,7 @@ // this.unpackAllButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.unpackAllButton.Enabled = false; - this.unpackAllButton.Image = global::DSPRE.Properties.Resources.unpackAllIcon; + this.unpackAllButton.Image = ((System.Drawing.Image)(resources.GetObject("unpackAllButton.Image"))); this.unpackAllButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.unpackAllButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.unpackAllButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); @@ -9883,7 +9917,7 @@ // this.updateMapNarcsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.updateMapNarcsButton.Enabled = false; - this.updateMapNarcsButton.Image = global::DSPRE.Properties.Resources.unpackBuildingNarcsIcon; + this.updateMapNarcsButton.Image = ((System.Drawing.Image)(resources.GetObject("updateMapNarcsButton.Image"))); this.updateMapNarcsButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.updateMapNarcsButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.updateMapNarcsButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); @@ -9933,7 +9967,7 @@ // nsbmdExportTexButton // this.nsbmdExportTexButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.nsbmdExportTexButton.Image = global::DSPRE.Properties.Resources.saveTextureFromNSBMD; + this.nsbmdExportTexButton.Image = ((System.Drawing.Image)(resources.GetObject("nsbmdExportTexButton.Image"))); this.nsbmdExportTexButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.nsbmdExportTexButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.nsbmdExportTexButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); @@ -9946,7 +9980,7 @@ // nsbmdRemoveTexButton // this.nsbmdRemoveTexButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.nsbmdRemoveTexButton.Image = global::DSPRE.Properties.Resources.removeTextureNSBMD; + this.nsbmdRemoveTexButton.Image = ((System.Drawing.Image)(resources.GetObject("nsbmdRemoveTexButton.Image"))); this.nsbmdRemoveTexButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.nsbmdRemoveTexButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.nsbmdRemoveTexButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); @@ -9959,7 +9993,7 @@ // nsbmdAddTexButton // this.nsbmdAddTexButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.nsbmdAddTexButton.Image = global::DSPRE.Properties.Resources.addTextureToNSBMD; + this.nsbmdAddTexButton.Image = ((System.Drawing.Image)(resources.GetObject("nsbmdAddTexButton.Image"))); this.nsbmdAddTexButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.nsbmdAddTexButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.nsbmdAddTexButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); @@ -9978,7 +10012,7 @@ // this.scriptCommandsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.scriptCommandsButton.Enabled = false; - this.scriptCommandsButton.Image = global::DSPRE.Properties.Resources.scriptDBIcon; + this.scriptCommandsButton.Image = ((System.Drawing.Image)(resources.GetObject("scriptCommandsButton.Image"))); this.scriptCommandsButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.scriptCommandsButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.scriptCommandsButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); @@ -10005,7 +10039,7 @@ // this.headerSearchToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.headerSearchToolStripButton.Enabled = false; - this.headerSearchToolStripButton.Image = global::DSPRE.Properties.Resources.wideLensImage; + this.headerSearchToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("headerSearchToolStripButton.Image"))); this.headerSearchToolStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.headerSearchToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.headerSearchToolStripButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); @@ -10024,7 +10058,7 @@ // this.spawnEditorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.spawnEditorToolStripButton.Enabled = false; - this.spawnEditorToolStripButton.Image = global::DSPRE.Properties.Resources.spawnCoordsMatrixeditorIcon; + this.spawnEditorToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("spawnEditorToolStripButton.Image"))); this.spawnEditorToolStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.spawnEditorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.spawnEditorToolStripButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); @@ -10103,12 +10137,6 @@ this.matrixEditorTabPage.ResumeLayout(false); this.matrixEditorTabPage.PerformLayout(); this.matrixTabControl.ResumeLayout(false); - this.headersTabPage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); - this.heightsTabPage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); - this.mapFilesTabPage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).EndInit(); this.mapEditorTabPage.ResumeLayout(false); @@ -10165,9 +10193,6 @@ this.groupBox21.ResumeLayout(false); this.groupBox21.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.eventAreaDataUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.eventMatrixYUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.eventMatrixXUpDown)).EndInit(); this.eventMatrixPanel.ResumeLayout(false); @@ -10193,7 +10218,6 @@ this.groupBox17.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.owYMatrixUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.owXMatrixUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.owSpritePictureBox)).EndInit(); this.owMovementGroupBox.ResumeLayout(false); this.owMovementGroupBox.PerformLayout(); this.groupBox23.ResumeLayout(false); @@ -10211,6 +10235,7 @@ ((System.ComponentModel.ISupportInitialize)(this.owScriptNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.owFlagNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.owIDNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.owSpritePictureBox)).EndInit(); this.warpsTabPage.ResumeLayout(false); this.groupBox11.ResumeLayout(false); this.groupBox11.PerformLayout(); @@ -10247,8 +10272,11 @@ ((System.ComponentModel.ISupportInitialize)(this.triggerYMatrixUpDown)).EndInit(); this.eventPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.eventPictureBox)).EndInit(); - this.scriptEditorTabPage.ResumeLayout(false); - this.scriptEditorTabPage.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.rightClickPicture)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.wheelClickPicture)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.LeftClickPicture)).EndInit(); + this.scriptTabPage.ResumeLayout(false); + this.scriptTabPage.PerformLayout(); this.groupBox24.ResumeLayout(false); this.groupBox24.PerformLayout(); this.ScriptNavigatorTabControl.ResumeLayout(false); @@ -10259,8 +10287,14 @@ this.groupBox8.PerformLayout(); this.scriptEditorTabControl.ResumeLayout(false); this.scriptsTabPage.ResumeLayout(false); + this.PanelSearchScripts.ResumeLayout(false); + this.PanelSearchScripts.PerformLayout(); this.functionTabPage.ResumeLayout(false); + this.PanelSearchFunctions.ResumeLayout(false); + this.PanelSearchFunctions.PerformLayout(); this.movementTabPage.ResumeLayout(false); + this.PanelSearchActions.ResumeLayout(false); + this.PanelSearchActions.PerformLayout(); this.textEditorTabPage.ResumeLayout(false); this.textEditorTabPage.PerformLayout(); this.LineNumbersFormatgroupBox.ResumeLayout(false); @@ -10472,7 +10506,7 @@ private System.Windows.Forms.ComboBox selectEventComboBox; private System.Windows.Forms.Label signScriptNumberLabel; private System.Windows.Forms.NumericUpDown spawnableScriptUpDown; - private System.Windows.Forms.TabPage scriptEditorTabPage; + private System.Windows.Forms.TabPage scriptTabPage; private System.Windows.Forms.TabPage textEditorTabPage; private System.Windows.Forms.ListBox warpsListBox; private System.Windows.Forms.ListBox triggersListBox; @@ -10523,7 +10557,6 @@ private System.Windows.Forms.TabPage scriptsTabPage; private System.Windows.Forms.TabPage functionTabPage; private System.Windows.Forms.TabPage movementTabPage; - private System.Windows.Forms.RichTextBox scriptTextBox; private System.Windows.Forms.Button addScriptFileButton; private System.Windows.Forms.Button saveScriptFileButton; private System.Windows.Forms.Button removeScriptFileButton; @@ -10535,8 +10568,6 @@ private System.Windows.Forms.Button addMatrixButton; private System.Windows.Forms.Button importMatrixButton; private System.Windows.Forms.Button exportMatrixButton; - private System.Windows.Forms.RichTextBox functionTextBox; - private System.Windows.Forms.RichTextBox actionsTextBox; private System.Windows.Forms.Button exportTextFileButton; private System.Windows.Forms.Button saveTextArchiveButton; private System.Windows.Forms.Button removeMessageFileButton; @@ -10598,9 +10629,6 @@ private System.Windows.Forms.Button addMapFileButton; private System.Windows.Forms.Label replaceTextLabel; private System.Windows.Forms.TextBox replaceMessageTextBox; - private System.Windows.Forms.RichTextBox LineNumberTextBoxScript; - private System.Windows.Forms.RichTextBox LineNumberTextBoxFunc; - private System.Windows.Forms.RichTextBox LineNumberTextBoxMov; private System.Windows.Forms.TextBox searchInScriptsTextBox; private System.Windows.Forms.TabPage headerEditorTabPage; private System.Windows.Forms.GroupBox groupBox10; @@ -11105,6 +11133,29 @@ private System.Windows.Forms.NumericUpDown tbEditorTrClassFramePreviewUpDown; private System.Windows.Forms.PictureBox tbEditorPokeminiPictureBox; private System.Windows.Forms.ToolStripMenuItem openFolderToolStripMenuItem; + private System.Windows.Forms.Panel PanelSearchScripts; + private System.Windows.Forms.Button BtnNextSearchScript; + private System.Windows.Forms.Button BtnPrevSearchScript; + private System.Windows.Forms.Button BtnCloseSearchScript; + private System.Windows.Forms.TextBox panelSearchScriptTextBox; + private System.Windows.Forms.Panel scintillaScriptsPanel; + private System.Windows.Forms.Panel PanelSearchFunctions; + private System.Windows.Forms.Button BtnNextSearchFunc; + private System.Windows.Forms.Button BtnPrevSearchFunc; + private System.Windows.Forms.Button BtnCloseSearchFunc; + private System.Windows.Forms.TextBox panelSearchFunctionTextBox; + private System.Windows.Forms.Panel scintillaFunctionsPanel; + private System.Windows.Forms.Panel PanelSearchActions; + private System.Windows.Forms.Button BtnNextSearchActions; + private System.Windows.Forms.Button BtnPrevSearchActions; + private System.Windows.Forms.Button BtnCloseSearchActions; + private System.Windows.Forms.TextBox panelSearchActionTextBox; + private System.Windows.Forms.Panel scintillaActionsPanel; + private System.Windows.Forms.CheckBox scriptEditorWhitespacesCheckbox; + private System.Windows.Forms.CheckBox scriptEditorWordWrapCheckbox; + private System.Windows.Forms.Button findScriptTextButton; + private System.Windows.Forms.Button compressScriptTextButton; + private System.Windows.Forms.Button expandScriptTextButton; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 8b1feca..90cdff4 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -19,6 +19,8 @@ using Images; using Ekona.Images; using Microsoft.WindowsAPICodePack.Dialogs; using System.Collections.Specialized; +using ScintillaNET; +using ScintillaNET.Utils; namespace DSPRE { public partial class MainProgram : Form { @@ -194,7 +196,12 @@ namespace DSPRE { toolStripProgressBar.Value++; } + public void SetupScriptEditor() { + cmdKeyWords = String.Join(" ", ScriptCommandNamesDict.Values); + cmdKeyWords += String.Join(" ", PokeDatabase.ScriptEditor.movementsDictIDName.Values); + comparisonOperatorsKeyWords = String.Join(" ", PokeDatabase.ScriptEditor.comparisonOperatorsDict.Values); + SetupScriptEditorTabs(); /* Extract essential NARCs sub-archives*/ statusLabel.Text = "Setting up Script Editor..."; Update(); @@ -206,8 +213,6 @@ namespace DSPRE { selectScriptFileComboBox.Items.Add("Script File " + i); } - currentScriptBox = scriptTextBox; - currentLineNumbersBox = LineNumberTextBoxScript; selectScriptFileComboBox.SelectedIndex = 0; statusLabel.Text = "Ready"; } @@ -760,7 +765,7 @@ namespace DSPRE { SetupEventEditor(); eventEditorIsReady = true; } - } else if (mainTabControl.SelectedTab == scriptEditorTabPage) { + } else if (mainTabControl.SelectedTab == scriptTabPage) { if (!scriptEditorIsReady) { SetupScriptEditor(); scriptEditorIsReady = true; @@ -5565,73 +5570,459 @@ namespace DSPRE { #region Script Editor #region Variables - public ScriptFile currentScriptFile; - public RichTextBox currentScriptBox; - public RichTextBox currentLineNumbersBox; + private string cmdKeyWords = ""; + private string comparisonOperatorsKeyWords = ""; + private ScriptFile currentScriptFile; #endregion #region Helper Methods - private void SetCurrentRTBfromSelectedScriptTab(object sender, EventArgs e) { - if (scriptEditorTabControl.SelectedIndex == 0) { - currentScriptBox = scriptTextBox; - currentLineNumbersBox = LineNumberTextBoxScript; - } else if (scriptEditorTabControl.SelectedIndex == 1) { - currentScriptBox = functionTextBox; - currentLineNumbersBox = LineNumberTextBoxFunc; - } else if (scriptEditorTabControl.SelectedIndex == 2) { - currentScriptBox = actionsTextBox; - currentLineNumbersBox = LineNumberTextBoxMov; - } else { - currentScriptBox = null; - currentLineNumbersBox = null; + private ScintillaNET.Scintilla ScriptTextArea; + private ScintillaNET.Scintilla FunctionTextArea; + private ScintillaNET.Scintilla ActionTextArea; + + private SearchManager scriptSearchManager; + private SearchManager functionSearchManager; + private SearchManager actionSearchManager; + + public Scintilla currentScintillaEditor; + public TextBox currentSearchBox; + private void scriptEditorTabControl_TabIndexChanged(object sender, EventArgs e) { + if (scriptEditorTabControl.SelectedTab == scriptTabPage) { + currentSearchBox = panelSearchScriptTextBox; + currentScintillaEditor = ScriptTextArea; + } else if (scriptEditorTabControl.SelectedTab == functionTabPage) { + currentSearchBox = panelSearchFunctionTextBox; + currentScintillaEditor = FunctionTextArea; + } else { //Actions + currentSearchBox = panelSearchActionTextBox; + currentScintillaEditor = ActionTextArea; + } + } + private void SetupScriptEditorTabs() { + // CREATE CONTROLS + ScriptTextArea = new ScintillaNET.Scintilla(); + scriptSearchManager = new SearchManager(this, ScriptTextArea, panelSearchScriptTextBox, PanelSearchScripts); + scintillaScriptsPanel.Controls.Add(ScriptTextArea); + + FunctionTextArea = new ScintillaNET.Scintilla(); + functionSearchManager = new SearchManager(this, FunctionTextArea, panelSearchFunctionTextBox, PanelSearchFunctions); + scintillaFunctionsPanel.Controls.Add(FunctionTextArea); + + ActionTextArea = new ScintillaNET.Scintilla(); + actionSearchManager = new SearchManager(this, ActionTextArea, panelSearchActionTextBox, PanelSearchActions); + scintillaActionsPanel.Controls.Add(ActionTextArea); + + currentScintillaEditor = ScriptTextArea; + currentSearchBox = panelSearchScriptTextBox; + + // BASIC CONFIG + ScriptTextArea.Dock = DockStyle.Fill; + ScriptTextArea.TextChanged += (this.OnTextChangedScript); + + FunctionTextArea.Dock = DockStyle.Fill; + FunctionTextArea.TextChanged += (this.OnTextChangedFunction); + + ActionTextArea.Dock = DockStyle.Fill; + ActionTextArea.TextChanged += (this.OnTextChangedAction); + + + // INITIAL VIEW CONFIG + ScriptTextArea.WrapMode = ScintillaNET.WrapMode.None; + ScriptTextArea.IndentationGuides = IndentView.LookBoth; + ScriptTextArea.CaretPeriod = 500; + ScriptTextArea.CaretForeColor = Color.White; + + FunctionTextArea.WrapMode = ScintillaNET.WrapMode.None; + FunctionTextArea.IndentationGuides = IndentView.LookBoth; + FunctionTextArea.CaretPeriod = 500; + //FunctionTextArea.CaretForeColor = Color.White; + + ActionTextArea.WrapMode = ScintillaNET.WrapMode.None; + ActionTextArea.IndentationGuides = IndentView.LookBoth; + ActionTextArea.CaretPeriod = 500; + ActionTextArea.CaretForeColor = Color.White; + + // STYLING + ScriptTextArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); + FunctionTextArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); + ActionTextArea.SetSelectionBackColor(true, Color.FromArgb(0x114D9C)); + + InitSyntaxColoring(ScriptTextArea); + InitSyntaxColoring(FunctionTextArea); + InitSyntaxColoring(ActionTextArea); + + // NUMBER MARGIN + InitNumberMargin(ScriptTextArea, ScriptTextArea_MarginClick); + InitNumberMargin(FunctionTextArea, FunctionTextArea_MarginClick); + InitNumberMargin(ActionTextArea, ActionTextArea_MarginClick); + + // BOOKMARK MARGIN + InitBookmarkMargin(ScriptTextArea); + InitBookmarkMargin(FunctionTextArea); + InitBookmarkMargin(ActionTextArea); + + // CODE FOLDING MARGIN + InitCodeFolding(ScriptTextArea); + InitCodeFolding(FunctionTextArea); + InitCodeFolding(ActionTextArea); + + // INIT HOTKEYS + InitHotkeys(ScriptTextArea, scriptSearchManager); + InitHotkeys(FunctionTextArea, functionSearchManager); + InitHotkeys(ActionTextArea, actionSearchManager); + } + + private void InitNumberMargin(Scintilla textArea, EventHandler textArea_MarginClick) { + textArea.Styles[Style.LineNumber].BackColor = BACK_COLOR; + textArea.Styles[Style.LineNumber].ForeColor = FORE_COLOR; + textArea.Styles[Style.IndentGuide].ForeColor = FORE_COLOR; + textArea.Styles[Style.IndentGuide].BackColor = BACK_COLOR; + + var nums = textArea.Margins[NUMBER_MARGIN]; + nums.Type = MarginType.Number; + nums.Sensitive = true; + nums.Mask = 0; + + textArea.MarginClick += textArea_MarginClick; + } + + private void InitHotkeys(Scintilla scintillaTb, SearchManager sm) { + // register the hotkeys with the form + HotKeyManager.AddHotKey(scintillaTb, sm.OpenSearch, Keys.F, true); + HotKeyManager.AddHotKey(scintillaTb, () => Uppercase(scintillaTb), Keys.U, true); + HotKeyManager.AddHotKey(scintillaTb, () => Lowercase(scintillaTb), Keys.L, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomIn(scintillaTb), Keys.Oemplus, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomOut(scintillaTb), Keys.OemMinus, true); + HotKeyManager.AddHotKey(scintillaTb, () => ZoomDefault(scintillaTb), Keys.D0, true); + HotKeyManager.AddHotKey(scintillaTb, sm.CloseSearch, Keys.Escape); + + // remove conflicting hotkeys from scintilla + scintillaTb.ClearCmdKey(Keys.Control | Keys.F); + scintillaTb.ClearCmdKey(Keys.Control | Keys.R); + scintillaTb.ClearCmdKey(Keys.Control | Keys.H); + scintillaTb.ClearCmdKey(Keys.Control | Keys.L); + scintillaTb.ClearCmdKey(Keys.Control | Keys.U); + } + + private void InitSyntaxColoring(Scintilla textArea) { + + // Configure the default style + textArea.StyleResetDefault(); + textArea.Styles[Style.Default].Font = "Consolas"; + textArea.Styles[Style.Default].Size = 12; + textArea.Styles[Style.Default].BackColor = Color.FromArgb(0x212121); + textArea.Styles[Style.Default].ForeColor = Color.FromArgb(0xFFFFFF); + textArea.StyleClearAll(); + + // Configure the lexer styles + textArea.Styles[Style.Python.Identifier].ForeColor = Color.FromArgb(0xD0DAE2); + textArea.Styles[Style.Python.CommentLine].ForeColor = Color.FromArgb(0x40BF57); + textArea.Styles[Style.Python.Number].ForeColor = Color.FromArgb(0xFFFF00); + textArea.Styles[Style.Python.String].ForeColor = Color.FromArgb(0xFFFF00); + textArea.Styles[Style.Python.Character].ForeColor = Color.FromArgb(0xE95454); + textArea.Styles[Style.Python.Operator].ForeColor = Color.FromArgb(0xE0E0E0); + textArea.Styles[Style.Python.Word].ForeColor = Color.FromArgb(0x48A8EE); + textArea.Styles[Style.Python.Word2].ForeColor = Color.FromArgb(0xF98906); + + textArea.Lexer = Lexer.Python; + + textArea.SetKeywords(0, cmdKeyWords); + textArea.SetKeywords(1, comparisonOperatorsKeyWords + " Function" + " Script" + " Action"); + } + + private void OnTextChangedScript(object sender, EventArgs e) { + ScriptTextArea.Margins[NUMBER_MARGIN].Width = ScriptTextArea.Lines.Count.ToString().Length * 13; + } + private void OnTextChangedFunction(object sender, EventArgs e) { + FunctionTextArea.Margins[NUMBER_MARGIN].Width = FunctionTextArea.Lines.Count.ToString().Length * 13; + } + private void OnTextChangedAction(object sender, EventArgs e) { + ActionTextArea.Margins[NUMBER_MARGIN].Width = ActionTextArea.Lines.Count.ToString().Length * 13; + } + + + #region Numbers, Bookmarks, Code Folding + + /// + /// the background color of the text area + /// + private readonly Color BACK_COLOR = Color.FromArgb(0x2A211C); + + /// + /// default text color of the text area + /// + private readonly Color FORE_COLOR = Color.FromArgb(0xB7B7B7); + + /// + /// change this to whatever margin you want the line numbers to show in + /// + private const int NUMBER_MARGIN = 1; + + /// + /// change this to whatever margin you want the bookmarks/breakpoints to show in + /// + private const int BOOKMARK_MARGIN = 2; + private const int BOOKMARK_MARKER = 2; + + /// + /// change this to whatever margin you want the code folding tree (+/-) to show in + /// + private const int FOLDING_MARGIN = 3; + + /// + /// set this true to show circular buttons for code folding (the [+] and [-] buttons on the margin) + /// + private const bool CODEFOLDING_CIRCULAR = true; + + + private void InitBookmarkMargin(Scintilla textArea) { + //TextArea.SetFoldMarginColor(true, IntToColor(BACK_COLOR)); + + var margin = textArea.Margins[BOOKMARK_MARGIN]; + margin.Width = 20; + margin.Sensitive = true; + margin.Type = MarginType.Symbol; + margin.Mask = (1 << BOOKMARK_MARKER); + //margin.Cursor = MarginCursor.Arrow; + + var marker = textArea.Markers[BOOKMARK_MARKER]; + marker.Symbol = MarkerSymbol.Circle; + marker.SetBackColor(Color.FromArgb(0xFF003B)); + marker.SetForeColor(Color.FromArgb(0x000000)); + marker.SetAlpha(100); + } + + private void InitCodeFolding(Scintilla textArea) { + textArea.SetFoldMarginColor(true, BACK_COLOR); + textArea.SetFoldMarginHighlightColor(true, BACK_COLOR); + + // Enable code folding + textArea.SetProperty("fold", "1"); + textArea.SetProperty("fold.compact", "1"); + + // Configure a margin to display folding symbols + textArea.Margins[FOLDING_MARGIN].Type = MarginType.Symbol; + textArea.Margins[FOLDING_MARGIN].Mask = Marker.MaskFolders; + textArea.Margins[FOLDING_MARGIN].Sensitive = true; + textArea.Margins[FOLDING_MARGIN].Width = 20; + + // Set colors for all folding markers + for (int i = 25; i <= 31; i++) { + textArea.Markers[i].SetForeColor(BACK_COLOR); // styles for [+] and [-] + textArea.Markers[i].SetBackColor(FORE_COLOR); // styles for [+] and [-] } - if (SyncNavigatorCB.Checked) - ScriptNavigatorTabControl.SelectedIndex = scriptEditorTabControl.SelectedIndex; + // Configure folding markers with respective symbols + textArea.Markers[Marker.Folder].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CirclePlus : MarkerSymbol.BoxPlus; + textArea.Markers[Marker.FolderOpen].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CircleMinus : MarkerSymbol.BoxMinus; + textArea.Markers[Marker.FolderEnd].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CirclePlusConnected : MarkerSymbol.BoxPlusConnected; + textArea.Markers[Marker.FolderMidTail].Symbol = MarkerSymbol.TCorner; + textArea.Markers[Marker.FolderOpenMid].Symbol = CODEFOLDING_CIRCULAR ? MarkerSymbol.CircleMinusConnected : MarkerSymbol.BoxMinusConnected; + textArea.Markers[Marker.FolderSub].Symbol = MarkerSymbol.VLine; + textArea.Markers[Marker.FolderTail].Symbol = MarkerSymbol.LCorner; + + // Enable automatic folding + textArea.AutomaticFold = (AutomaticFold.Show | AutomaticFold.Click | AutomaticFold.Change); + } + + private void ScriptTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(ScriptTextArea, e); + } + + private void FunctionTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(FunctionTextArea, e); + } + + private void ActionTextArea_MarginClick(object sender, MarginClickEventArgs e) { + MarginClick(ActionTextArea, e); + } + + private void MarginClick(Scintilla textArea, MarginClickEventArgs e) { + if (e.Margin == BOOKMARK_MARGIN) { + // Do we have a marker for this line? + const uint mask = (1 << BOOKMARK_MARKER); + var line = textArea.Lines[textArea.LineFromPosition(e.Position)]; + if ((line.MarkerGet() & mask) > 0) { + // Remove existing bookmark + line.MarkerDelete(BOOKMARK_MARKER); + } else { + // Add bookmark + line.MarkerAdd(BOOKMARK_MARKER); + } + } + } + + #endregion + + #region Main Menu Commands + + //private void selectLineToolStripMenuItem_Click(object sender, EventArgs e) { + // Line line = TextArea.Lines[TextArea.CurrentLine]; + // TextArea.SetSelection(line.Position + line.Length, line.Position); + //} + private void wordWrapButton_Click(object sender, EventArgs e) { + ScriptTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; + FunctionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; + ActionTextArea.WrapMode = scriptEditorWordWrapCheckbox.Checked ? ScintillaNET.WrapMode.Word : ScintillaNET.WrapMode.None; + } + + //private void indentGuidesCheckbox_CheckedChanged(object sender, EventArgs e) { + // ScriptTextArea.IndentationGuides = scriptEditorIndentGuidesCheckbox.Checked ? IndentView.LookBoth : IndentView.None; + // FunctionTextArea.IndentationGuides = scriptEditorIndentGuidesCheckbox.Checked ? IndentView.LookBoth : IndentView.None; + // ActionTextArea.IndentationGuides = scriptEditorIndentGuidesCheckbox.Checked ? IndentView.LookBoth : IndentView.None; + //} + + private void viewWhiteSpacesButton_Click(object sender, EventArgs e) { + ScriptTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + FunctionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + ActionTextArea.ViewWhitespace = scriptEditorWhitespacesCheckbox.Checked ? WhitespaceMode.VisibleAlways : WhitespaceMode.Invisible; + } + + private void scriptEditorZoomInButton_Click(object sender, EventArgs e) { + ZoomIn(currentScintillaEditor); + } + + private void scriptEditorZoomOutButton_Click(object sender, EventArgs e) { + ZoomOut(currentScintillaEditor); + } + + private void scriptEditorZoomResetButton_Click(object sender, EventArgs e) { + ZoomDefault(currentScintillaEditor); + } + + private void ScriptEditorCollapseButton_Click(object sender, EventArgs e) { + currentScintillaEditor.FoldAll(FoldAction.Contract); + } + + private void ScriptEditorExpandButton_Click(object sender, EventArgs e) { + currentScintillaEditor.FoldAll(FoldAction.Expand); + } + + + #endregion + + #region Uppercase / Lowercase + + private void Lowercase(Scintilla textArea) { + + // save the selection + int start = textArea.SelectionStart; + int end = textArea.SelectionEnd; + + // modify the selected text + textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToLower()); + + // preserve the original selection + textArea.SetSelection(start, end); + } + + private void Uppercase(Scintilla textArea) { + // save the selection + int start = textArea.SelectionStart; + int end = textArea.SelectionEnd; + + // modify the selected text + textArea.ReplaceSelection(textArea.GetTextRange(start, end - start).ToUpper()); + + // preserve the original selection + textArea.SetSelection(start, end); + } + + #endregion + + #region Indent / Outdent + + private void GenerateKeystrokes(string keys, Scintilla textArea) { + //Example + //GenerateKeystrokes("+{TAB}"); + HotKeyManager.Enable = false; + textArea.Focus(); + SendKeys.Send(keys); + HotKeyManager.Enable = true; + } + + #endregion + + #region Zoom + + private void ZoomIn(Scintilla textArea) { + textArea.ZoomIn(); + } + + private void ZoomOut(Scintilla textArea) { + textArea.ZoomOut(); + } + + private void ZoomDefault(Scintilla textArea) { + textArea.Zoom = 0; } #endregion - #region LineNumbers - public void UpdateLineNumbers(RichTextBox mainbox, RichTextBox numberBox) { - if (disableHandlers) { - return; - } - // get line indices - int indexFirstCharDisplayed = mainbox.GetCharIndexFromPosition(new Point(0, mainbox.Font.Height / 2)); - int firstLine = mainbox.GetLineFromCharIndex(indexFirstCharDisplayed); - int indexLastCharDisplayed = mainbox.GetCharIndexFromPosition(new Point(0, mainbox.Height + mainbox.Font.Height / 2)); - int lastLine = mainbox.GetLineFromCharIndex(indexLastCharDisplayed); - - // align line numbers to center - numberBox.SelectionAlignment = HorizontalAlignment.Center; - - // set LineNumberTextBox text to null & width to GetWidth() function value - numberBox.Text = ""; - numberBox.Width = CalculateLineNumbersWidth(mainbox); - - // now add each line number to LineNumberTextBox upto last line - for (int i = firstLine; i <= lastLine + 1; i++) { - numberBox.Text += i + 1 + "\n"; - } - numberBox.Invalidate(); + #region Quick Search Bar + private void BtnPrevSearchScript_Click(object sender, EventArgs e) { + scriptSearchManager.Find(false, false); } - public int CalculateLineNumbersWidth(RichTextBox mainbox) { - int w = 25; - // get total lines of functionTextBox - int line = mainbox.Lines.Length; - if (line <= 99) { - w = 20 + (int)mainbox.Font.Size; - } else if (line <= 999) { - w = 30 + (int)mainbox.Font.Size; - } else { - w = 50 + (int)mainbox.Font.Size; + private void BtnNextSearchScript_Click(object sender, EventArgs e) { + scriptSearchManager.Find(true, false); + } + + private void BtnPrevSearchFunc_Click(object sender, EventArgs e) { + functionSearchManager.Find(false, false); + } + + private void BtnNextSearchFunc_Click(object sender, EventArgs e) { + functionSearchManager.Find(true, false); + } + + private void BtnPrevSearchActions_Click(object sender, EventArgs e) { + actionSearchManager.Find(false, false); + } + + private void BtnNextSearchActions_Click(object sender, EventArgs e) { + actionSearchManager.Find(true, false); + } + + private void BtnCloseSearchScript_Click(object sender, EventArgs e) { + scriptSearchManager.CloseSearch(); + } + + private void BtnCloseSearchFunc_Click(object sender, EventArgs e) { + functionSearchManager.CloseSearch(); + } + + private void BtnCloseSearchActions_Click(object sender, EventArgs e) { + actionSearchManager.CloseSearch(); + } + + private void scriptTxtSearch_KeyDown(object sender, KeyEventArgs e) { + TxtSearchKeyDown(scriptSearchManager, e); + } + private void functionTxtSearch_KeyDown(object sender, KeyEventArgs e) { + TxtSearchKeyDown(functionSearchManager, e); + } + private void actiontTxtSearch_KeyDown(object sender, KeyEventArgs e) { + TxtSearchKeyDown(actionSearchManager, e); + } + + private void TxtSearchKeyDown(SearchManager sm, KeyEventArgs e) { + if (HotKeyManager.IsHotkey(e, Keys.Enter)) { + sm.Find(true, false); } + if (HotKeyManager.IsHotkey(e, Keys.Enter, true) || HotKeyManager.IsHotkey(e, Keys.Enter, false, true)) { + sm.Find(false, false); + } + } - return w; + private void panelSearchScriptTextBox_TextChanged(object sender, EventArgs e) { + scriptSearchManager.Find(true, true); } - private void updateCurrentBoxLineNumbers(object sender, EventArgs e) { - UpdateLineNumbers(currentScriptBox, currentLineNumbersBox); + private void panelSearchFunctionTextBox_TextChanged(object sender, EventArgs e) { + functionSearchManager.Find(true, true); } + private void panelSearchActionTextBox_TextChanged(object sender, EventArgs e) { + actionSearchManager.Find(true, true); + } + #endregion private void addScriptFileButton_Click(object sender, EventArgs e) { /* Add new event file to event folder */ @@ -5655,7 +6046,7 @@ namespace DSPRE { private void saveScriptFileButton_Click(object sender, EventArgs e) { /* Create new ScriptFile object */ int idToAssign = selectScriptFileComboBox.SelectedIndex; - ScriptFile userEdited = new ScriptFile(scriptTextBox.Lines, functionTextBox.Lines, actionsTextBox.Lines, selectScriptFileComboBox.SelectedIndex); + ScriptFile userEdited = new ScriptFile(scriptLines: ScriptTextArea.Lines, FunctionTextArea.Lines, ActionTextArea.Lines, selectScriptFileComboBox.SelectedIndex); ; /* Write new scripts to file */ if (userEdited.fileID != null) { //check if ScriptFile instance was created succesfully @@ -5697,7 +6088,7 @@ namespace DSPRE { scriptEditorTabControl.SelectedIndex = 0; selectScriptFileComboBox.SelectedIndex = (int)scriptFileUpDown.Value; - mainTabControl.SelectedTab = scriptEditorTabPage; + mainTabControl.SelectedTab = scriptTabPage; } private void openLevelScriptButton_Click(object sender, EventArgs e) { if (!scriptEditorIsReady) { @@ -5706,7 +6097,7 @@ namespace DSPRE { } selectScriptFileComboBox.SelectedIndex = (int)levelScriptUpDown.Value; - mainTabControl.SelectedTab = scriptEditorTabPage; + mainTabControl.SelectedTab = scriptTabPage; } private void removeScriptFileButton_Click(object sender, EventArgs e) { /* Delete script file */ @@ -5746,11 +6137,11 @@ namespace DSPRE { ScriptFile file = new ScriptFile(i); if (scriptSearchCaseSensitiveCheckBox.Checked) { - results.AddRange(SearchInScripts(i, file.allScripts, "Script", (string s) => s.Contains(searchString))); - results.AddRange(SearchInScripts(i, file.allFunctions, "Function", (string s) => s.Contains(searchString))); + results.AddRange(SearchInScripts(i, file.allScripts, ScriptFile.ScriptKW, (string s) => s.Contains(searchString))); + results.AddRange(SearchInScripts(i, file.allFunctions, ScriptFile.FunctionKW, (string s) => s.Contains(searchString))); } else { - results.AddRange(SearchInScripts(i, file.allScripts, "Script", (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); - results.AddRange(SearchInScripts(i, file.allFunctions, "Function", (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); + results.AddRange(SearchInScripts(i, file.allScripts, ScriptFile.ScriptKW, (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); + results.AddRange(SearchInScripts(i, file.allFunctions, ScriptFile.FunctionKW, (string s) => s.IndexOf(searchString, StringComparison.InvariantCultureIgnoreCase) >= 0)); } } catch { } searchProgressBar.Value = i; @@ -5774,8 +6165,9 @@ namespace DSPRE { return results; } private void searchInScripts_GoToEntryResult(object sender, MouseEventArgs e) { - if (searchInScriptsResultListBox.SelectedIndex < 0) + if (searchInScriptsResultListBox.SelectedIndex < 0) { return; + } string[] split = searchInScriptsResultListBox.SelectedItem.ToString().Split(); selectScriptFileComboBox.SelectedIndex = int.Parse(split[1]); @@ -5786,35 +6178,23 @@ namespace DSPRE { } cmdSearched = cmdSearched.TrimEnd(); - if (split[3].StartsWith("Script")) { - if (scriptEditorTabControl.SelectedIndex != 0) - scriptEditorTabControl.SelectedIndex = 0; - int keywordPos = scriptTextBox.Find("Script " + split[4].Replace(":", ""), RichTextBoxFinds.MatchCase); - TXTBoxScrollToResult(scriptTextBox, cmdSearched, keywordPos); - } else if (split[3].StartsWith("Function")) { - if (scriptEditorTabControl.SelectedIndex != 1) - scriptEditorTabControl.SelectedIndex = 1; - int keywordPos = functionTextBox.Find("Function " + split[4].Replace(":", ""), RichTextBoxFinds.MatchCase); - TXTBoxScrollToResult(functionTextBox, cmdSearched, keywordPos); + if (split[3].StartsWith(ScriptFile.ScriptKW)) { + if (scriptEditorTabControl.SelectedTab != scriptsTabPage) { + scriptEditorTabControl.SelectedTab = scriptsTabPage; + } + scriptSearchManager.Find(true, false, ScriptFile.ScriptKW + split[4].Replace(":", "")); + } else if (split[3].StartsWith(ScriptFile.FunctionKW)) { + if (scriptEditorTabControl.SelectedTab != functionTabPage) { + scriptEditorTabControl.SelectedTab = functionTabPage; + } + functionSearchManager.Find(true, false, ScriptFile.FunctionKW + split[4].Replace(":", "")); + } else { + if (scriptEditorTabControl.SelectedTab != movementTabPage) { + scriptEditorTabControl.SelectedTab = movementTabPage; + } + actionSearchManager.Find(true, false, ScriptFile.ActionKW + split[4].Replace(":", "")); } } - private void TXTBoxScrollToResult(RichTextBox tb, string cmdSearched, int searchFrom) { - int cmdPos = tb.Find(cmdSearched, searchFrom, RichTextBoxFinds.MatchCase); - - if (cmdPos < 0) - return; //not found - - try { - tb.SelectionStart = cmdPos - 120; - } catch (ArgumentOutOfRangeException) { - tb.SelectionStart = 0; - } - tb.ScrollToCaret(); - - tb.SelectionStart = cmdPos; - tb.SelectionLength = cmdSearched.Length; - tb.Focus(); - } private void searchInScriptsResultListBox_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { searchInScripts_GoToEntryResult(null, null); @@ -5829,16 +6209,16 @@ namespace DSPRE { /* clear controls */ currentScriptFile = new ScriptFile(selectScriptFileComboBox.SelectedIndex); // Load script file - scriptTextBox.Clear(); - functionTextBox.Clear(); - actionsTextBox.Clear(); + ScriptTextArea.ClearAll(); + FunctionTextArea.ClearAll(); + ActionTextArea.ClearAll(); scriptsNavListbox.Items.Clear(); functionsNavListbox.Items.Clear(); actionsNavListbox.Items.Clear(); if (currentScriptFile.isLevelScript) { - scriptTextBox.Text += "Level script files are currently not supported.\nYou can use AdAstra's Level Scripts Editor."; + ScriptTextArea.Text += "Level script files are currently not supported.\nYou can use AdAstra's Level Scripts Editor."; addScriptFileButton.Visible = false; removeScriptFileButton.Visible = false; @@ -5862,9 +6242,9 @@ namespace DSPRE { CommandContainer currentScript = currentScriptFile.allScripts[i]; /* Write header */ - string header = "Script " + (i + 1); + string header = ScriptFile.ScriptKW + " " + (i + 1); scriptsNavListbox.Items.Add(header); - scriptTextBox.AppendText(header + ':' + Environment.NewLine, headerTextColor); + ScriptTextArea.AppendText(header + ':' + Environment.NewLine); /* If current script is identical to another, print UseScript instead of commands */ if (currentScript.useScript < 0) { @@ -5878,7 +6258,7 @@ namespace DSPRE { buffer += '\t' + "UseScript_#" + currentScript.useScript + Environment.NewLine; } - scriptTextBox.AppendText(buffer + Environment.NewLine, scriptTextColor); + ScriptTextArea.AppendText(buffer + Environment.NewLine); buffer = ""; } @@ -5888,9 +6268,9 @@ namespace DSPRE { CommandContainer currentFunction = currentScriptFile.allFunctions[i]; /* Write Heaader */ - string header = "Function " + (i + 1); + string header = ScriptFile.FunctionKW + " " + (i + 1); functionsNavListbox.Items.Add(header); - functionTextBox.AppendText(header + ':' + Environment.NewLine, headerTextColor); + FunctionTextArea.AppendText(header + ':' + Environment.NewLine); /* If current function is identical to a script, print UseScript instead of commands */ if (currentFunction.useScript < 0) { @@ -5904,7 +6284,7 @@ namespace DSPRE { buffer += '\t' + "UseScript_#" + currentFunction.useScript + Environment.NewLine; } - functionTextBox.AppendText(buffer + Environment.NewLine, funcTextColor); + FunctionTextArea.AppendText(buffer + Environment.NewLine); buffer = ""; } @@ -5912,9 +6292,9 @@ namespace DSPRE { for (int i = 0; i < currentScriptFile.allActions.Count; i++) { ActionContainer currentAction = currentScriptFile.allActions[i]; - string header = "Action " + (i + 1); + string header = ScriptFile.ActionKW + " " + (i + 1); actionsNavListbox.Items.Add(header); - actionsTextBox.AppendText(header + ':' + Environment.NewLine, headerTextColor); + ActionTextArea.AppendText(header + ':' + Environment.NewLine); for (int j = 0; j < currentAction.actionCommandsList.Count; j++) { if (currentAction.actionCommandsList[j].id != 0x00FE) { @@ -5923,42 +6303,39 @@ namespace DSPRE { buffer += currentAction.actionCommandsList[j].name + Environment.NewLine; } - actionsTextBox.AppendText(buffer + Environment.NewLine, actionTextColor); + ActionTextArea.AppendText(buffer + Environment.NewLine); buffer = ""; } } statusLabel.Text = "Ready"; disableHandlers = false; - UpdateLineNumbers(scriptTextBox, LineNumberTextBoxScript); - UpdateLineNumbers(functionTextBox, LineNumberTextBoxFunc); - UpdateLineNumbers(actionsTextBox, LineNumberTextBoxMov); } private void scriptsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 0, scriptTextBox, "Script"); + NavigatorGoTo((ListBox)sender, 0, scriptSearchManager, ScriptFile.ScriptKW); } private void functionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 1, functionTextBox, "Function"); + NavigatorGoTo((ListBox)sender, 1, functionSearchManager, ScriptFile.FunctionKW); } private void actionsNavListbox_SelectedIndexChanged(object sender, EventArgs e) { - NavigatorGoTo((ListBox)sender, 2, actionsTextBox, "Action"); + NavigatorGoTo((ListBox)sender, 2, actionSearchManager, ScriptFile.ActionKW); } - private void NavigatorGoTo(ListBox currentLB, int indexToSwitchTo, RichTextBox findHere, string keyword) { - int ind = currentLB.SelectedIndex; - if (ind < 0) + private void NavigatorGoTo(ListBox currentLB, int indexToSwitchTo, SearchManager entrusted, string keyword) { + if (currentLB.SelectedIndex < 0) { return; - + } + if (scriptEditorTabControl.SelectedIndex != indexToSwitchTo) { scriptEditorTabControl.SelectedIndex = indexToSwitchTo; } - TXTBoxScrollToResult(findHere, keyword + ' ' + (ind + 1) + ':', 0); + entrusted.Find(true, false, keyword + ' ' + (currentLB.SelectedIndex + 1) + ':'); } #endregion - + #endregion #region Text Editor #region Variables @@ -6087,8 +6464,9 @@ namespace DSPRE { } private void searchMessageTextBox_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Enter) + if (e.KeyCode == Keys.Enter) { searchMessageButton_Click(null, null); + } } private void replaceMessageButton_Click(object sender, EventArgs e) { if (searchMessageTextBox.Text == "") @@ -7709,7 +8087,7 @@ namespace DSPRE { } } - private void numericUpDown1_ValueChanged(object sender, EventArgs e) { + private void TBLEditortrainerClassPreviewPic_ValueChanged(object sender, EventArgs e) { UpdateTrainerClassPic(tbEditorTrClassPictureBox, (int)((NumericUpDown)sender).Value); } @@ -7766,6 +8144,12 @@ namespace DSPRE { tbEditorTrClassFramePreviewUpDown.Maximum = maxFrames; tbEditortrainerClassFrameMaxLabel.Text = "/" + maxFrames; + } + private void pbEffectsPokemonCombobox_SelectedIndexChanged(object sender, EventArgs e) { + ComboBox cb = sender as ComboBox; + Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null; + tbEditorPokeminiPictureBox.Image = pokeIcon; + tbEditorPokeminiPictureBox.Update(); } #endregion @@ -7782,12 +8166,5 @@ namespace DSPRE { disableHandlers = false; } - - private void pbEffectsPokemonCombobox_SelectedIndexChanged(object sender, EventArgs e) { - ComboBox cb = sender as ComboBox; - Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null; - tbEditorPokeminiPictureBox.Image = pokeIcon; - tbEditorPokeminiPictureBox.Update(); - } } } \ No newline at end of file diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 7f1f60a..5b9f30e 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -166,11 +166,28 @@ CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu VRmTF6ps3wAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= 533, 20 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -578,6 +595,18 @@ PAe8lo8SRUWmn3QyHTUmowS3rS3G9es3UXblN/x4pQpvLHj73eRVqxYvSU5ePG/zvl0Xr93ET+VyLojK RFxLBln93GUHysTrCdGAHybDRfeLokSTRVOC6FnReNEDoodEE0QTRcHmhtIkEc159YN/H4rYCd6bYLpX NELEhZx7h2iMKNjcUKIxr3yQ+X80wsL+AOStyFlaRN5ZAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN + fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 + hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC + 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w + 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 + gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i + 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC @@ -591,6 +620,436 @@ CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu VRmTF6ps3wAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAADUAAAAdCAYAAAAKGSQrAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAuBJREFUWEftliF34zAQhPOzDAMLDx4sDDwYePBg4cHC/oTAwMDCwMLCwjLX31qj + bnSSLLlpSW/em2dZ2p3dsSwnm//4Ajzcn0YxTH0uDsPNWGII+RCG2z/j8/NrJPdh6fpQ4+fdvsi15mgc + sjPekMi8YkLKx7HfbrMmSiQ+pC6iZialzIXUPtCUON1eNKzdyNHHkWdiy8gaKJH4Oa0DfldeHw/RWK7x + lN4gJM9EyxhPp3O2+RKJJ29ObwQmaIht5so95qalrJGU5FCcMTkmWsCw/bHKFHlBohkXItz3mIIqTg6C + BVhzxLUaU2wwVdP+Fzq8XM/38xPPNV+iK1yDxVBHzUIzcHd8pzMDra81piaYGZF7nZOcCVExjYWzpo67 + v9V7r83REGfJNliTOmdizRAkj4exUMxiaJBmtSM0ndKvKw9tjsXL7sbYY2y8/XUwUjw1l5J14mCPKd+8 + N+BfPcV47eMw2BHh2mWK4J+/n2KzzCHOvKg5XzDE1hA1OTtc0WAeDVFzinPaZlrkfmIz7GkgRBETn0R8 + 4XSOnDm1CstDmzF5aHDPayVqTnWUxxrz9jBnjS5YkjGIlUjhsHPxX4kplKGGLDenKZqpEIuu5iBziPVi + 1CuYFvLjYMKo+QVjFqsHkOr5MeuY4vy4MySuwogpyFgNiCpAUT4qfDTUFPMIFGDrNMnHgHFJ+5pmNjSp + gox5h/3XSAc5KeYbysFi1CQaXHko+tqJxF3FSIIort3iNdQnnIMsYxa9jItdIB8ylhHMMqfdIWdOvR5i + 094UP7grTQHLVb6uMlQw1aPfhLg7ojfFa0lM4D5wEeTr1ZMBUQb5tzCFdmvXIBEzlePFWvjkurxaA1Eb + Ykx/eTy1xn/AENuiXUQs6k1A5lJiqGAKpvBr8bPNOEcMFUzBLigpZ8iLxrjA3FoKzS81LPZoV6GkpV1o + YQrNt5qqsRtK/IyiWv9SQ0JOrIUtyOW18Dtis3kDKXrs9yi2zh4AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAABGdBTUEAALGPC/xhBQAAABhQTFRFJQ8P + 1NTUoKCgbC0uHTMdVpZWERFQBQUbRhghZAAAAAlwSFlzAAAOwwAADsMBx2+oZAAAACxJREFUGNNjAAFB + JUElBmZjY2M4A0gLojIIqXENDQ1NS0tLJ5PhAgTl5eXlAETLHmywIOvhAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAHFJREFUOE/tkcEKwCAMQ8tOO86/6+/2yzriDKhU58aOi7xDIUlFRWXzGZSZZSih + skn2MUUIHylloBK/L6g3s6C5yUoBgz1LBVAUBih//QaYlwpohOrN1KMCqJ/xDT49AtMIBZU5OmGQ/AUf + Fsy4TAPUT6LXDQobR6cNAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + 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 + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAcBJREFUWEftlctOAjEUhnkIN659DtZAEHTjQCZcE8ItszBxtvMKxicwcaXCPAMJ + MYZ3cOOCm7gw0YVxQXLsKVPSTs+ASEYkmZN8KbSdfn8bpsSi2rs6vLyAILwp21c8HgeB18ULJWdvbiBb + hxA7yeVyS0QfQkn9yPOD8HRq4QC1YBhoIcKSz+dzDTGmhNirANSiMtQzFBsHMG6vSCEFzqXWkFECHJyb + cPRwHYgsHwwG4DgOWJalYNs29Pt9JQS1lgCdnn51gHXydrvNaTQaUK/Xodfr/SjErwLI8larBc1mk0sF + 1WoVSqVSeAFkOe64Vqst5eVyGQqFApimGV4Av7hSqUCxWOSgOJ/Pg2EYUYDwAuz8N7CTtwARITa5B1bJ + kY0CIGJXSNBNKM+h1pBRAuC9fDrrwolE1iM1XXDz9AgfX5+KhALn4Fx8Jjm6hyS2UxeSkw4kJt0l2p+R + X5yddSDDEAHkIM/vr5oY+4RYgFK/ODFxOVoAWSzkGfYdOUamehiS8UKqyVk/l49Yy1ACYC1CEOKXDsOF + NGvTTJBmi6IkxY43NWRHPLzjR71WPGafUc5aTS4KB/4CTxdVVP+hYrFvnRgX2eK8LaIAAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAA2ZJREFUWEfNlM9PU0EQx7cEiICFNFGK5UcKGtQqlFqohVKKQoFKFQFtkNQSCknF + yoEoJyB44Gy4cPCPICScCBe5EAiBAxcCAf6WcWde5/n6g9BnU8Ik3+y+bXe+n52d98RtD8hBOQeIUS+I + yQAUfgsmScQGaV2EexXhnBXqAhFw5gShbJ7o/5dcGhZ8TYYgEK0x/x8Bhl5KeA9D6AJREqAwaeKEmczT + ABgCzVGYo9+uSAeEkuSjLD0mwLlMnMkclQaAwn14er807mnWViKrUMy59LlcAY8IoQuAk411qwCpxqwk + ABYbYyPi6fFZF8BIhyKEyOUKUD6bIt0VSL2C6TfZAXx6lX4FuiuAp8YKyI1kIu8/1Rj7AaUCasVr2IR4 + et1NiNQpd69tQjbnuWrITcggXAFPo04A3MiJpgdARJK/A9q5CsGmXD1sYAbQ/R3ATRmaUHyW9xtsk7+7 + 0oXrIWnKJ9c2oe4KYBKuAI/2WhAP74GoLLtSa2trYO9LfMC4+XjUBYCn7nOQabm5GB6bDTDcVqLqXWcd + DMl3fHTISSM+P60uhMvLS9je3oaR90HaR9D/1YS4UZ6o21YOvyLNWWnAbiaA+fl52NnZgYnwGO2n6mC+ + rAGqjX9aagogHjDDj2BN1vI0lhOAyWSCqakp2N3dhUgkQnkwH+ZNOFwfXOo2azG01BaRxH2zPI0leaww + QavDQbJUVakAqNdd7bC/vw/RaJRyuVyun4n018d4Rymg2huKIeAoIQnrc9mE8tuuHSutcKd3BspGV6DI + 1pMEgHI2NcLBwQHEYjF9ADPDDwDV3WSkEWVw1sIj2ZiGpkoQXX0gWjpBPLKB6e13sH75DcYXg2kAKL/f + D4eHhxCPx7NuQrEy/gRQI04zTPpNJHmH0OAx0KgFCEUjpGcOe0YAlNfrJYjZ2dnsILizEQCvIuQuVQzZ + WAMQ/tBKarZZrgRAud1uODo6grm5uawg+LXRaiOT6ixVgKow3k0C8Pl89Dqenp7SOuv4+Bhz5SWWGMAh + 34rz83My3NzcRMMljfIWBFBfXw97e3uwsLAAZ2dnBJH4Pe9BAFtbW7C4uKieGtc2NjZuBILMVldXtWZL + eBUXFxc3A7C8vJxqpFZhfX097xBXNRgBnJycQDgctiTWbjS4+430dPtCiL9XMJCans41OwAAAABJRU5E + rkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAOpJREFUOE9jgIH///8TjTGAqrLCfysLU6wYJEfQAEV56V+vXz74//Nex/8Pz4/8 + f/XqFRxPnTzhf2NjE9ggqHJMADIApPn/5UCwIcgG9Ha3/+/ubCNsAMwFIBqmefXq1f+bm5vBWE1F6QnI + EKwGgQwA29bbC8cN9bX/7Wyt/r948QIFV1VVYRoCMwAZX758+b+DvQ2GAYGBgZiGEDKgp6cHjmEGYTUA + 3QvYXADDJLkAGx6EXrh16xaGCzTVlcGKCbpAREDAHmjINzT8E1s6gGEUA7ABXl5eVW0t9f/WVuYY2BKa + yaBKKQEMDAA6GQw36rFfRQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAxNJREFUWEftVk1oU0EQzj+ESM5CwIsoXkQEQa0/iGgRRKke1IroQcWoT4uXgog/ + xKqIiPXQgxhUEAMeipGihNJTQBClkYQEjBhBgocYhPzgSUn8Zt/sY/veS4wlSRX8YNiZ2Xkz3+7ObuL4 + WzDA44KBCCw4iVYY5rFvMO9EzwnYbX9fV2179qFQaBkGImJHplPfvGBJ5PV6z7GqwhzXFQIiCVa/WFg6 + WiX+XcH5EbIrzsdBILupq92FuQ+W86gWlxiG7xTGdkT+aPWiOK88RjrB6XROYTBswJKUiRDWQ/K6agHl + ILJSWkJrNpuxQCBwggzoAkqRS7wbkkgSsgchK+Lx+CaXyzWN+YP6lAEqHtMzNQUBJZ8VmFyZyWQiUDVI + DPZ2Eny7G/Yu6EMcR0SWRqPRQ/l8PpxOp8+73e5xiqV5hlh5Lpd7S9IRAcZNBG2lnZAJ8W0EV/Ep7NUi + AoBvkaZpQyh8oVwuv8KRzWJ+DU8TxMqpuMfjaUtANuAgYtZhPIagA7pL4Bb8EyjwBf617PsI38ZgMLgT + BCYbjcZjzN/D/F6eJ1BNee6GbkdANuAdsB3x+/0jsLfoMwL7YQ9AjkDkGf/0+XzUE6tAYKJard7FSDun + JlcLticgUSqVPmC7ziBoCbsIF2HLlRuAj/qDjuQw+uY+CM2Yk5PNvs4IIOYhznoUQcY7AESKxSI9xad1 + 04JwNpu9AuJ0C06yz4yOCFAPaEh0FUGb2SdQKBQuwx+Bfxu7VDyr1Wpv0APvMR9mnxkdERDvAAmKjcE2 + HiH4BtEbZ/GxvGbXIc8hk5Bp9MBnEPgKKcG+DSHMeYAIqg2xwLj3fHfHZEGFgGR/rVKpvMPRzCaTyReJ + ROJBKpWaqdfr33B9H3GccQ1JSJfAnP1OyIIAHYVBAHhCuvLRDch3rPgTemYKMo74l/D9gP6a40Qh+MU7 + IG0pSi4By58SLigJiI5mVQD2PshxHjdAdkCOQmTnG7eglYhEgPpj1A7qj1ErvWuQSefsDEgaP82t9G5C + kOhVcjPkSi298B/9Qk86+R+Aw/EL9ftyEYfAOUgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + 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 + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + 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 + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= @@ -627,6 +1086,185 @@ 50GccR7EGedBnHEexBm/+WdhnHEexBnnQZxxHsQZ50GccR7EGedBnHEexPt2+7DhWedBnHEexBnnQZxx HsQZ50GccR7EGedBnPGbfxbGGedBnHEexBnnQZxxHsQZ50GccR7EGedBvG+3DxuedR7EGedBnHEexBnn QZxxHsQZ50GccR7EEX8+38T8gAGeHzYoAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAOpJREFUOE9jgIH///8TjTGAqrLCfysLU6wYJEfQAEV56V+vXz74//Nex/8Pz4/8 + f/XqFRxPnTzhf2NjE9ggqHJMADIApPn/5UCwIcgG9Ha3/+/ubCNsAMwFIBqmefXq1f+bm5vBWE1F6QnI + EKwGgQwA29bbC8cN9bX/7Wyt/r948QIFV1VVYRoCMwAZX758+b+DvQ2GAYGBgZiGEDKgp6cHjmEGYTUA + 3QvYXADDJLkAGx6EXrh16xaGCzTVlcGKCbpAREDAHmjINzT8E1s6gGEUA7ABXl5eVW0t9f/WVuYY2BKa + yaBKKQEMDAA6GQw36rFfRQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAqRJREFUWEetlM9LVFEUx18Z0Q+GorJfq8Q0U5lqBocSG0MwhfI/aRNRCxdShEW5 + 8Ec/7QcMgQ4hKEwJGQQWga2CiiDXBS1qeVbxYPRc3rmee955b94zD3xw7j3nfT93Zu7oraPmoqhWq14a + kpYqi0OTSWqVFszLrFmYnI09RFzxkKgyvYhg+7zWR6LKPmhW0WX6WjAS9A0R/VAlkVLFyolgLnQAWWnE + WInkSDDrHIAXia188NIAxNHUcMDX9jlSjsTJbWlhnLbmvf7UaB6e3joDN6/0qTMk4geQ8pAYSwtDKpPt + AJ+3wkCP51d/eEB8nz8II4M9ziyXB0J7AKrE8uWFeiOV0AHmn7U68xsm//r6kH2Xfz/tgI5sxr93vQhI + eTQHcw+zzjxSS66KsXjI8NXzVrw0c8TspblwnNWyTk1u1vgwCUojBfsd/1zcDeXxHGRb9vjjQ91w43K/ + EfHD0GuS/Zcc6T9b51ww/l3/WdppvgaaTSsPgQGc5ob9frFjm9/bucW/eC586ZCu/HbnGS2XsfaClVnz + dyBfI61H95kLN3P/JPz+mLGfROluId07l038K4VSzteTw51W/upJ2/rlBAVPDBVh+U09LJRarBjh8tlH + WXsXZh+s/eS0XHI6CzlEAe+nG20w/y0fX/3YX06cgi+Vw7aP4M+SZmQmd4U2OBRQHss54Re6N/l9XXXO + RaNe5XG7FW+IHHn3ogn+fdvsHIJLf33YBc/vnHbEiMzkLnWTkEH4zwQ/5relY7A41QiFExl/eiwPt6/1 + OnMcnicdoQZvamEcefs14vKtnA/wvTjSzsp5Z8BspDhAmjlt1lnYzWBYe4CTpE+ofW0TqfUgUqtHaH1E + 3SR4ACH7ci3hfYm6KZGBSdByJOpmHFLC0eajqXor1kb4iUBhySkAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAklJREFUWEedlT1OHEEQhbmBhbRCsixtgkhIvHKEs7VINkFySLhHcMgROAIhoTOn + HMGhQ47irF1feWpc87pmZnFLH11dP+9Ns8tw1lp7E7Z+zFH1L1EmFTU5hUpHKZOBCoLW9azkulImYU1g + //Wmbd6fN3bQ+to81MmFwTA7Phza9urCd6geYknH611iptkWP0YzNQ/oKWZrzclhwVhNQM0fn4++019o + dNpdsWuYMYZsHsbszGSNQafT74pxTvnRQI0wJ85ED3OFVm+uybFYGAcYXX/alsbArOoBPuCxJjK2JoLA + N5obA+agn330MV9o/p95/IkFahp19pPM86FCBbPZ3I0zpm0yU83wHAMtpthFf/968TfabrcbjThnUx4m + TOPtx3zWC/2BVXPqbo749+efo8Htx0vf88NEjZg51Uua/8yXuNps2t2Xzy52ONx5zINgDhgp9GaNGf4G + +mQ5fn365jfHlB24KcbU9LYDE42I4zywbs7+sN+P5hgC5uQxtj5H5zSO80BvPgdGAeY2N6K9S+Dn5IM2 + VRx2N+3p/uhcvDtvnG3WSnW/kr26xBqY3l5fuvH2g73pDGLtmyN7dYklbLXXR/u8DW6M8fH+8Kbb4wMe + V8k5bPmvmz2+/W8xtzXx6Aq5qNgajeLbnnPan7HV6ZcNOZex5UZhFmd27VVsddqTBk+c8ADxOo1/LOS0 + L4MedHlNeHJorgaGuhsGWg9sLetUSVgbhLVaUNWhTAZZINC6npVcV8qkooKnUOkoZXIJNclU/fO0sz+Y + XDFYZS4mWQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAOpJREFUOE9jgIH///8TjTGAqrLCfysLU6wYJEfQAEV56V+vXz74//Nex/8Pz4/8 + f/XqFRxPnTzhf2NjE9ggqHJMADIApPn/5UCwIcgG9Ha3/+/ubCNsAMwFIBqmefXq1f+bm5vBWE1F6QnI + EKwGgQwA29bbC8cN9bX/7Wyt/r948QIFV1VVYRoCMwAZX758+b+DvQ2GAYGBgZiGEDKgp6cHjmEGYTUA + 3QvYXADDJLkAGx6EXrh16xaGCzTVlcGKCbpAREDAHmjINzT8E1s6gGEUA7ABXl5eVW0t9f/WVuYY2BKa + yaBKKQEMDAA6GQw36rFfRQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAOpJREFUOE9jgIH///8TjTGAqrLCfysLU6wYJEfQAEV56V+vXz74//Nex/8Pz4/8 + f/XqFRxPnTzhf2NjE9ggqHJMADIApPn/5UCwIcgG9Ha3/+/ubCNsAMwFIBqmefXq1f+bm5vBWE1F6QnI + EKwGgQwA29bbC8cN9bX/7Wyt/r948QIFV1VVYRoCMwAZX758+b+DvQ2GAYGBgZiGEDKgp6cHjmEGYTUA + 3QvYXADDJLkAGx6EXrh16xaGCzTVlcGKCbpAREDAHmjINzT8E1s6gGEUA7ABXl5eVW0t9f/WVuYY2BKa + yaBKKQEMDAA6GQw36rFfRQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAYRJREFUWEdj+P//P06smVH3HxtWii8BY2xy6JiQWqwWwzA2DSBMdwdIuYf9V0+t + gmuiuwME9Cz+y1i7/VeKzAHzB8QB2w8c/q9k7/Ff0Svyv2JMIXUdALSgAWQJPgwCHz5++p9cXvdf2sr1 + v2xQClYD0TFJDiAWIIcGctrAhmniABAAh0ZF/X85O6//xqUT/jtM2IAV61RMBmNsciBMtgO+//jxv7Sj + H+wAw6IerIaDME0ccOri5f9a7oH/1cPS/9t0rsBqMAyT5AB8GARgvpaxcf+vnFiO1UB0TJQDcGGYIpAD + QL7W9ggC+1qruBevociYag5AjmtChiJjqjhAKSgVJa7p7gB0PPIcoFEx4/+JCRZgrJDRAMfIBuHCFDsA + ZvmPFxlgDGILRBTQzwFwy4FlAIj+sCMA7gh0w7Bh6jkAiunuAIe0RLCFIIuRLaebAxTze8GWgSxGtpxu + acCycyU4IcIshllONweAMMwRMEx3B6BjQoYi41EHjDpg1AGD3AEb/gMAZFASi4n8Mr8AAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAstJREFUWEetkktIFWEUgC/Yg94gBpL5KJSEe1NvF1EiiW4RdekuCopCbBNc0KI2 + vRelkItAihYZ1gV7bXqR0AuKhAosIjHDhVAIkYsWRS3+NjIxeQ7z/505c2buTHbgY+Y/5/zn++cRs207 + EtNx3w+pPwgxyeGSMEhzOGJSwwcCvM7XHFrniEkgzIBCNY1UB+RkiI1AmLpGrHsSAc2cKH1Sr3sRQQxE + 7eX9NLDogLFvvq2CqCjKWlKewuVAkNyENIwSRU4PwOUeMYQ0jBJV7gjNAXT4yu8d6FZfn9ao7uYhMxCk + K+ZusdbFy6y60pRFD9Fe/Et9yG9V7y7umLl84FCXssdjavRKxsiB5537VTYdsyYfJFz5622XsP/zQBLX + heSiGAI2dzaM4DBrbJbKLZ7CgYervmAO5L/Hilzytxd2Ye1WrkeUO1LjlOS4hs3wSicfxXFgYmkTvt6r + rZeNHK7HqidQVDUng4eBXM3CNPZq2T/LHx45iQPX1lbiwJG+rEt+ftMTlDeU1eMa6vo/CCv3AAOA2iUt + FogyLbOtlfM24z2QThXjNVURx74NyRJcx0uacA1Icwl/b0jgWj85XL8NVuKTDnZ14FN/ut2s1pQn8EnH + b65Xp+tHsT5xtxHfgt4X9slpeORDPW3mNQP9e/KqesFGsx7u3Y71/t35GcsxYLPmxt5elAA/X5UaAdzr + /I+Xy0y/hkolOYR4ADrkTOMbI3l26iDmQP6+b5vJPz5+1PRr/MTOPUZBOfD9xXKUJMtXmx8Kvrv+HCdW + fXT1A/9NDj9Vfuc1swZ5btGUen2uVd1pP+vq1YSRQ3gOIA2jgFzKU/zEfnJzAGkYJYp8Osx8k9M3tIHm + gojay/tdDZiIcIAofVKva2GSTrO0gRKmrhHrUhIotBEoVNNIdUBMaugADa/zNYfWOWKSwweGQZrDEZNB + cAlF6vfHjv0BZNjApScyLAgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAidJREFUWEetlb1KA0EUhaez8A1sBFub2CgECxFBLHwHH8AnCFgJ2tjaWKkIgo0p + JCISURCV+BNMIf4UNhY2dtMIgTh3d+/uzd0zk13JhY/duefuObPLkJh/1LGPXq9nylC0YFgIFKYZVMhY + VrQWZno2uIlQSRNfRZrHOH0e6YSv0gejlb8iHRkTiR7h0XNVJJQrGM4kc7kN6CoTTFUonEhm+zYgi4PT + 8LFdY0OMVEwX9SU6nAiFp4XMJGXC5QZ0eC6Yig02z419ezK2eWts/drY3cuYStV06brdNHbDzdQaxq6e + GLtwhMOTwHQDXMHwr2dn8pqxPG+6GqkTkwdDCl+pG3t1Z+x3x+E28uOuvAkdSrRaxd8cBlOxgaZ6GIdQ + +Npp3Bvfy5CzOjwJTTNReLSmh+Wh4vuJ/Sx8/SwLQrMcNrRw4vclDt+5GE54DjLwsTgXH7TpWawzyFeQ + 3YiK1r63IT7a8ZvTQUQ63xd6cy3S1WdIdB7i8Pb9kMMZNkJweOcR6wzy5cy+hR5CZkzTfW4Kf3e/fEhn + tKfMyjUkyIygTzrjDhqFL7mDJz+3RnvKrFxDgsyYxk385p/u4CGd0Z4yCzYZZMbU3C8bhW+5PxSkM9JP + Z+QEKSIzyeiU/3MzIf80XA7IXoiys3q+byBqlNhAmTk027dIm8kwekBSRGegjprEoAeJQRqDdAI2GWnA + aF2vNVLXwKZGGxYB+WhgM4QOkaB5Pz3zB9u0i81Or4XVAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAOpJREFUOE9jgIH///8TjTGAqrLCfysLU6wYJEfQAEV56V+vXz74//Nex/8Pz4/8 + f/XqFRxPnTzhf2NjE9ggqHJMADIApPn/5UCwIcgG9Ha3/+/ubCNsAMwFIBqmefXq1f+bm5vBWE1F6QnI + EKwGgQwA29bbC8cN9bX/7Wyt/r948QIFV1VVYRoCMwAZX758+b+DvQ2GAYGBgZiGEDKgp6cHjmEGYTUA + 3QvYXADDJLkAGx6EXrh16xaGCzTVlcGKCbpAREDAHmjINzT8E1s6gGEUA7ABXl5eVW0t9f/WVuYY2BKa + yaBKKQEMDAA6GQw36rFfRQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC @@ -682,6 +1320,21 @@ MDARBpx/Ss67uMY4I/HMCibDwGQYyvZv8uXNc31q1jk8kjzEhHowmZ6Lvd7DqJSx9sNEJHNtPIAJ9WBC Pf2DwQBf1l6y+fESJtWCCbWEIolpvlxnyeSKAaPjwKQAbLvyS6izN9cHZgIGE7sdejFMOwxcJJ62d+ZW Ml2uuOA7AR+rcCyzD59tELp9/gP4yMA9T2Zz1q6aGofjDxe7/oTN7T8mAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC @@ -724,88 +1377,306 @@ oR0JQwtKLYd2JAwtKFrewdCOhKHn22UpJXkDfpOarffmz1gAAAAASUVORK5CYII= - + - iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAqRJREFUWEetlM9LVFEUx18Z0Q+GorJfq8Q0U5lqBocSG0MwhfI/aRNRCxdShEW5 - 8Ec/7QcMgQ4hKEwJGQQWga2CiiDXBS1qeVbxYPRc3rmee955b94zD3xw7j3nfT93Zu7oraPmoqhWq14a - kpYqi0OTSWqVFszLrFmYnI09RFzxkKgyvYhg+7zWR6LKPmhW0WX6WjAS9A0R/VAlkVLFyolgLnQAWWnE - WInkSDDrHIAXia188NIAxNHUcMDX9jlSjsTJbWlhnLbmvf7UaB6e3joDN6/0qTMk4geQ8pAYSwtDKpPt - AJ+3wkCP51d/eEB8nz8II4M9ziyXB0J7AKrE8uWFeiOV0AHmn7U68xsm//r6kH2Xfz/tgI5sxr93vQhI - eTQHcw+zzjxSS66KsXjI8NXzVrw0c8TspblwnNWyTk1u1vgwCUojBfsd/1zcDeXxHGRb9vjjQ91w43K/ - EfHD0GuS/Zcc6T9b51ww/l3/WdppvgaaTSsPgQGc5ob9frFjm9/bucW/eC586ZCu/HbnGS2XsfaClVnz - dyBfI61H95kLN3P/JPz+mLGfROluId07l038K4VSzteTw51W/upJ2/rlBAVPDBVh+U09LJRarBjh8tlH - WXsXZh+s/eS0XHI6CzlEAe+nG20w/y0fX/3YX06cgi+Vw7aP4M+SZmQmd4U2OBRQHss54Re6N/l9XXXO - RaNe5XG7FW+IHHn3ogn+fdvsHIJLf33YBc/vnHbEiMzkLnWTkEH4zwQ/5relY7A41QiFExl/eiwPt6/1 - OnMcnicdoQZvamEcefs14vKtnA/wvTjSzsp5Z8BspDhAmjlt1lnYzWBYe4CTpE+ofW0TqfUgUqtHaH1E - 3SR4ACH7ci3hfYm6KZGBSdByJOpmHFLC0eajqXor1kb4iUBhySkAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAklJREFUWEedlT1OHEEQhbmBhbRCsixtgkhIvHKEs7VINkFySLhHcMgROAIhoTOn - HMGhQ47irF1feWpc87pmZnFLH11dP+9Ns8tw1lp7E7Z+zFH1L1EmFTU5hUpHKZOBCoLW9azkulImYU1g - //Wmbd6fN3bQ+to81MmFwTA7Phza9urCd6geYknH611iptkWP0YzNQ/oKWZrzclhwVhNQM0fn4++019o - dNpdsWuYMYZsHsbszGSNQafT74pxTvnRQI0wJ85ED3OFVm+uybFYGAcYXX/alsbArOoBPuCxJjK2JoLA - N5obA+agn330MV9o/p95/IkFahp19pPM86FCBbPZ3I0zpm0yU83wHAMtpthFf/968TfabrcbjThnUx4m - TOPtx3zWC/2BVXPqbo749+efo8Htx0vf88NEjZg51Uua/8yXuNps2t2Xzy52ONx5zINgDhgp9GaNGf4G - +mQ5fn365jfHlB24KcbU9LYDE42I4zywbs7+sN+P5hgC5uQxtj5H5zSO80BvPgdGAeY2N6K9S+Dn5IM2 - VRx2N+3p/uhcvDtvnG3WSnW/kr26xBqY3l5fuvH2g73pDGLtmyN7dYklbLXXR/u8DW6M8fH+8Kbb4wMe - V8k5bPmvmz2+/W8xtzXx6Aq5qNgajeLbnnPan7HV6ZcNOZex5UZhFmd27VVsddqTBk+c8ADxOo1/LOS0 - L4MedHlNeHJorgaGuhsGWg9sLetUSVgbhLVaUNWhTAZZINC6npVcV8qkooKnUOkoZXIJNclU/fO0sz+Y - XDFYZS4mWQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAPJJREFUOE9jQAYVfbP+I2OgEAtEBgyQ2agApmHx0WuPFhy6dHve/rNXQWyweP9s + kEH4AUjh+stPn62/+LgcDU+HugQ3AClYc/nx73WXn1xZd+nJUnRDYC6BKscEIMlV5x98BRsAxOsvPlmC + bghBA9ZffvYGZgDEJU8XkmQA3Aso+PF8kOalJ2/ex2sAEASCFGAaAMSXnsyGag6EKMUBQIpAeP3VZz9h + mkFsmHj91IV4XQACIBvALkHGILGQvKr/Oc39/286VxI0BATABiFhMDivkvr/qk0x0YZgA4FUM+SabQkV + DLGjgiEgGsIlD0A1MzAAAC/cGNL0+VnKAAAAAElFTkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAYRJREFUWEdj+P//P06smVH3HxtWii8BY2xy6JiQWqwWwzA2DSBMdwdIuYf9V0+t - gmuiuwME9Cz+y1i7/VeKzAHzB8QB2w8c/q9k7/Ff0Svyv2JMIXUdALSgAWQJPgwCHz5++p9cXvdf2sr1 - v2xQClYD0TFJDiAWIIcGctrAhmniABAAh0ZF/X85O6//xqUT/jtM2IAV61RMBmNsciBMtgO+//jxv7Sj - H+wAw6IerIaDME0ccOri5f9a7oH/1cPS/9t0rsBqMAyT5AB8GARgvpaxcf+vnFiO1UB0TJQDcGGYIpAD - QL7W9ggC+1qruBevociYag5AjmtChiJjqjhAKSgVJa7p7gB0PPIcoFEx4/+JCRZgrJDRAMfIBuHCFDsA - ZvmPFxlgDGILRBTQzwFwy4FlAIj+sCMA7gh0w7Bh6jkAiunuAIe0RLCFIIuRLaebAxTze8GWgSxGtpxu - acCycyU4IcIshllONweAMMwRMEx3B6BjQoYi41EHjDpg1AGD3AEb/gMAZFASi4n8Mr8AAAAASUVORK5C - YII= + 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 - cAlF6vfHjv0BZNjApScyLAgAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= - + - iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAYAAAAfrhY5AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAidJREFUWEetlb1KA0EUhaez8A1sBFub2CgECxFBLHwHH8AnCFgJ2tjaWKkIgo0p - JCISURCV+BNMIf4UNhY2dtMIgTh3d+/uzd0zk13JhY/duefuObPLkJh/1LGPXq9nylC0YFgIFKYZVMhY - VrQWZno2uIlQSRNfRZrHOH0e6YSv0gejlb8iHRkTiR7h0XNVJJQrGM4kc7kN6CoTTFUonEhm+zYgi4PT - 8LFdY0OMVEwX9SU6nAiFp4XMJGXC5QZ0eC6Yig02z419ezK2eWts/drY3cuYStV06brdNHbDzdQaxq6e - GLtwhMOTwHQDXMHwr2dn8pqxPG+6GqkTkwdDCl+pG3t1Z+x3x+E28uOuvAkdSrRaxd8cBlOxgaZ6GIdQ - +Npp3Bvfy5CzOjwJTTNReLSmh+Wh4vuJ/Sx8/SwLQrMcNrRw4vclDt+5GE54DjLwsTgXH7TpWawzyFeQ - 3YiK1r63IT7a8ZvTQUQ63xd6cy3S1WdIdB7i8Pb9kMMZNkJweOcR6wzy5cy+hR5CZkzTfW4Kf3e/fEhn - tKfMyjUkyIygTzrjDhqFL7mDJz+3RnvKrFxDgsyYxk385p/u4CGd0Z4yCzYZZMbU3C8bhW+5PxSkM9JP - Z+QEKSIzyeiU/3MzIf80XA7IXoiys3q+byBqlNhAmTk027dIm8kwekBSRGegjprEoAeJQRqDdAI2GWnA - aF2vNVLXwKZGGxYB+WhgM4QOkaB5Pz3zB9u0i81Or4XVAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + 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 True + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAFFJREFUOE+l0bENgEAMQ1ErG7AR69Ej9rnFMKL/BcbFa750UZST7QrGBMYExgTG + hI7R3tCpuRu6NF7afnnf9gNorUR/RPqaBMYExgTGBMbvrAex4mNXAFOuwQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + 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 + YII= + + True @@ -845,6 +1716,227 @@ True + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAI5JREFUSEtjGAXkAsOQtP8wDBWiHwBZmrbpJhhDHdACkaExgPkYZjkImydXwLFt + YRdODDWCPIDNYmy4/OJ/rBjqANJDiVKLYZgsB1DDYhimeghgswQfJtsBUNDi0TjvPwhjM5wYTKkDYACr + Q2Bi+DC1HAADYIcgOwAkRiSmHkD2IZBLXcNJALTx3QgCDAwAJg2KYP9PC1YAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJ5JREFUSEtjGAWUgDg1q/8wDBWiLwBZfD2uC4yp7ghk3+HCC13T4A4A4RbjQDCG + GkEZAFmAbDg+/L9gCQqmikNADrgd143VQhhGtxgdU+QQfA7AZhk+TJYjsDkAm+H4MFIItEAx8QDZAdgM + x4dn2sWDMdAYmMWkWQ4CtSZ+cIPwYapbjAaQDcLAyA6gtsVEAZiP0SynO6Cvr4cZYGAAAAfPboEh2axl + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAGJJREFUOE9j+P//P1bMMEXuHxD/Z5gm+x/ExqYGhLEKgjDYgAUK/8F41AD8BoAV + gkIbAwNDH24AJCawYhSFpGJQFFPBACzOAmMkg/F5AVvAgDBYEm7AaEIi3wBEwsJhwH8GAOQLbolFp0OS + AAAAAElFTkSuQmCC + + + + + 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 + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAYxJREFUOE/NkztLA0EUhe/ERQwoSPwDqQQLC8FKrG0F/4CdKNoFLKwEKysLQdDa + 0sJC8YFudiYIYhobGwstxAdisLEK7F7PLjf7TJYkIPjBYYe5Zw7zuEvt4BoVWat5dqgC7ca0w5pWPUdN + 4KvEno+nC1Ns6AGhnCOPjTpwHasoy9rjOYVJmD9SizvLqCO+JkuWJ8HOBrCz29SiHxztDXoJZOgTc82E + x6hliUiC+5mGwY2MdOpVVQnj8K4wtjytZvFtxHx1fAtiiWCbFkKTf0cOjUspA0K2Q6+hd76gQSlFIHAJ + xWYgjaOe06iUMsCzFQtsIHBIShF8QhZCRgKd0TAfSiEFWqaMkOcwUFNNSr3BVSpj8V6wo1YYhM5YEUv3 + uNryH+I7HhTIqDu2VX4vpnFtq4RdfaXC/Ma+wu7GxNY9aJONRJghg6A5jLv79dLg3i5jYTdop2yL9AIC + X2OB+zLdP3jdOkKfAtlUkel/BI56DN2LFmW6fxDyCLVeeV2m++cvAtegTdGMTHeA6BdzLXdUY5VUpwAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAYxJREFUOE/NkztLA0EUhe/ERQwoSPwDqQQLC8FKrG0F/4CdKNoFLKwEKysLQdDa + 0sJC8YFudiYIYhobGwstxAdisLEK7F7PLjf7TJYkIPjBYYe5Zw7zuEvt4BoVWat5dqgC7ca0w5pWPUdN + 4KvEno+nC1Ns6AGhnCOPjTpwHasoy9rjOYVJmD9SizvLqCO+JkuWJ8HOBrCz29SiHxztDXoJZOgTc82E + x6hliUiC+5mGwY2MdOpVVQnj8K4wtjytZvFtxHx1fAtiiWCbFkKTf0cOjUspA0K2Q6+hd76gQSlFIHAJ + xWYgjaOe06iUMsCzFQtsIHBIShF8QhZCRgKd0TAfSiEFWqaMkOcwUFNNSr3BVSpj8V6wo1YYhM5YEUv3 + uNryH+I7HhTIqDu2VX4vpnFtq4RdfaXC/Ma+wu7GxNY9aJONRJghg6A5jLv79dLg3i5jYTdop2yL9AIC + X2OB+zLdP3jdOkKfAtlUkel/BI56DN2LFmW6fxDyCLVeeV2m++cvAtegTdGMTHeA6BdzLXdUY5VUpwAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAYxJREFUOE/NkztLA0EUhe/ERQwoSPwDqQQLC8FKrG0F/4CdKNoFLKwEKysLQdDa + 0sJC8YFudiYIYhobGwstxAdisLEK7F7PLjf7TJYkIPjBYYe5Zw7zuEvt4BoVWat5dqgC7ca0w5pWPUdN + 4KvEno+nC1Ns6AGhnCOPjTpwHasoy9rjOYVJmD9SizvLqCO+JkuWJ8HOBrCz29SiHxztDXoJZOgTc82E + x6hliUiC+5mGwY2MdOpVVQnj8K4wtjytZvFtxHx1fAtiiWCbFkKTf0cOjUspA0K2Q6+hd76gQSlFIHAJ + xWYgjaOe06iUMsCzFQtsIHBIShF8QhZCRgKd0TAfSiEFWqaMkOcwUFNNSr3BVSpj8V6wo1YYhM5YEUv3 + uNryH+I7HhTIqDu2VX4vpnFtq4RdfaXC/Ma+wu7GxNY9aJONRJghg6A5jLv79dLg3i5jYTdop2yL9AIC + X2OB+zLdP3jdOkKfAtlUkel/BI56DN2LFmW6fxDyCLVeeV2m++cvAtegTdGMTHeA6BdzLXdUY5VUpwAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAYxJREFUOE/NkztLA0EUhe/ERQwoSPwDqQQLC8FKrG0F/4CdKNoFLKwEKysLQdDa + 0sJC8YFudiYIYhobGwstxAdisLEK7F7PLjf7TJYkIPjBYYe5Zw7zuEvt4BoVWat5dqgC7ca0w5pWPUdN + 4KvEno+nC1Ns6AGhnCOPjTpwHasoy9rjOYVJmD9SizvLqCO+JkuWJ8HOBrCz29SiHxztDXoJZOgTc82E + x6hliUiC+5mGwY2MdOpVVQnj8K4wtjytZvFtxHx1fAtiiWCbFkKTf0cOjUspA0K2Q6+hd76gQSlFIHAJ + xWYgjaOe06iUMsCzFQtsIHBIShF8QhZCRgKd0TAfSiEFWqaMkOcwUFNNSr3BVSpj8V6wo1YYhM5YEUv3 + uNryH+I7HhTIqDu2VX4vpnFtq4RdfaXC/Ma+wu7GxNY9aJONRJghg6A5jLv79dLg3i5jYTdop2yL9AIC + X2OB+zLdP3jdOkKfAtlUkel/BI56DN2LFmW6fxDyCLVeeV2m++cvAtegTdGMTHeA6BdzLXdUY5VUpwAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAhRJREFUOE+tkT1ME2EYx2/QQWMiUcDR0dXFmRgSBwOackiIg4uJo1MB+4HAoAzE + RJCQ6OBEIBHUGK0aY4SKg4NTSUxNSutHr9f2vnq9a68f1/593reA2qObb/LL+7yX//PL874n/JfVPf0a + J6YiODYZwZFwZ44SXbcjOEl5ajvU6haELiaY/KhDVTUkJKUjyYwC4W4cwai2J+GrlwlurX6CVTQhGWWk + C2X81GykjRJ+6SWqrVatFHB8/jvCWwZN3CYIkbVk28jZNY5sVpC1qpCLhOnwOqPbOLWQQGBTPWAC+lhx + HIyIPiwtPsDiwjxxH6rTxOjIFV7nrQpOL+1gfEMF69ntbwkmNhTUanUYNUCrAAXaWc0ErNarVJfqOPNo + B2OU9QjGyOq6Td7EwmadJASX0c6/l5s4+zgFP2V7ZtoE4x8UvEuW0WiiI2z1Lf+An7JeAb3B5XUJA2vp + jlxak+B7KvFpDxBo8D2TAZdmrdPMrgt6lH9Y+SJj9IVMAg297YIJ+o1DzzPYTuoITc/iQv955EwXMTpv + p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS + SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH + 9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII= + + 239, 17 @@ -853,7 +1945,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAXQBFgF0ARYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAewBFgHsARYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -941,6 +2033,59 @@ 132, 17 + + 386, 19 + + + + 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 @@ -975,9 +2120,45 @@ ojmvvv/vQxE7wXsTTveKhoi4kHPvEEWLws2NJBrzyvuZ/0cjKuoPe13ITvp9oGUAAAAASUVORK5CYII= - - 386, 19 - + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVFhH7ZfNTxNBGIf7FxGjd7gYvXg0HtDECl482AAX + aFNtxMiBgoAxheoNMCbGtlpETFX8ABHxYEnYClhiWiChtpaimNqPnXXe6b6wu53OlgomJL7Jk3a7s/N7 + 9t3daWs57NWgvh58xR+210vDDqJuYimUYumtxbIUdBbXg868urk/tTF+dTIy4iDxgEMBpGE7SsArCAAv + IRzHsHE+mwyDaq5IwCZrJ0RifjuG6miurysbC4B84qmrg44xr1TYY4Mz5E2ExAJ2xtqYcyccPwM53jEA + iCzTLrEgY0V9V7a1bTYDJL8+aCvQQ0GA7OVYQPJd3r086ckbDbxBPCAoGuqUVx65SPJ1104H5PCgsjXd + Q2gH8tXKSP4qJWDCiN8mRwMuknhxXUGMAkhmqpskQp2/4InhzQfowrGMEjDB2pPW3Be/PthMANmadpPk + XFfR2BFuOBZIlNp8jbWZF4yYCWjZmnKT1VHHb2E41K5A6TrzgpG9CGRAYMROBQRrA+8SrI+35aJ/cQlS + r7rKbkquRDU3obEjG5TNmZtK0RCcftNNYmPOH6L1RCchCjcCXVl57iriE5GhAtozjvk66BmLFzJEJ1HT + QnS/pbAa6iTJj7cK1YYikt/OXxFhKeYdUInv7/tIXLD86qDjFh+3iJ8CqGx4SAFE6zqQnR9S0rP9JOK9 + wCbnjWHQfdFRmwLj1AhxZee9dHIVKsKbFMJhPwpwJei2NFTah6gR4tIJIFQk/datCwe0AgCTYMFWXTCi + RohLF2yCUcAMNUJcvKBK/BfQCdAbbvFOk1J3vJG91wYjaoS4eEGVQIGJvmbl6IlGxsKglXHqzDnl2Ekq + 8y8Egj1NikRDoQNHaAcgeKD9bFkn1Ajz2vw0kE2+6yW8UC1aAewAewQNwbOe0+YrIK/yC97Wb1M9FUVQ + 4Fl/M+uANnSu10qW7p6HH677U6kZr1xJQMus20ri9y4d3F+2n58923h5tAIfam1zrZVfnbDBt+Hy7Ys5 + 9aPDWBbLH5tgaG31fwr3AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM3SURBVFhH7ZRfSFNRHMf32FPPPRYUdBMijXwVliSMRIyw + WEZzk/5wcTiNdDO7ZcsCJ2p/1Jn0YEpPmyWVIf2BpLIeysBrJushLcKyVSSY1u7p/M7Oud57d3an04Kg + H3y4Z/f8+X7uuXfHkk4JNXYk+F2EzM5KFdr952pbeX48OIkAkFV/eGVFsmsK1TChkgabCGT6RfWa1VG2 + fBk1HFiiAFzpMkuv0V53bKLXtxAOpCEwetWnTN2Wqumy5jU93OqWu7wKBDPUcCANAbYOiIz3Hf9Fo/QV + CdXOwABtMEMNB5YhoEUOlcVotMUSvX8mhzeIoYYDGoH17iK0zm5DBU4b2ujdvyQBQA4vUoInAMG5mAtn + nQRow73FCujCWRkl5C6f8u6mZ04rsOHQLhJUUWJD/ddqUWdAJJws34vqjhWSPsFTrBMwvlpuOCuQgAmR + gVOxN9clZeruaZRxdA9Z+MPzUAKhK9UEXh/MyfCXothwG/o22KBMdvt+mIZDLQjUqQJAwG9PCwgHvmKB + +NO7zZ9et1X4Fby/VTEXCUuKIFqRiJ9I8uQju3UNwZa5igBtqbIY1XoOEqpEJxkrlFrR9IP6+cRXwJEw + +whhgU3idrLouRNFyJG3llCQvZoA7Zbzl5Dffw+JYih+xWON54kWnYRZuBHY1hq7leCyCQRo94Q6SbAk + DRAJ3lwjOgmzg4iHUYC9c95YHnLYyz8R4SjmTTADBHj3Ewh70diNcvN/AdTscDsC3uIJ3IU0RIealdFg + CVmc10/AfZFuN4JxNMK8Zl8GkQoW4S6KgX4mwJXAv+X2eB+DRpiXToCBRaIPG3ThgFYAIBIk2KELZtAI + 89IFp8AokAoaYV68oGT8F9AJ4A9urMOJNufaSVsbzKAR5sULSgYT6G9yoawddsJIm4Ows6gYbc3DMn9D + oC/gRDIOhR3YgncAgluq9iXsBI1IXV9etMx+etSo8EK1aAXYDpC/oCF4qHV36hOQV/MjQc/HwUBSESZw + p9lFdkAb+qzRoby+fOAnXWr5Nf04GEsmoGWowaFM9BzJodNWvr6/ap1hr0cr8DTdbU635if73Z+fNCnj + F0vn6K1/sSyW3yNZLjSWnBobAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1014,6 +2195,102 @@ X7slg+9Xrkqr/pkFIueSCfl8ZdyMYQO7rTVptfciYWIOF9yqg2bAgN5XkrQFjIggpqJhA82aZ0odhR/X b9vywwW36qAZMJCvlaTY6PwN31qQvnzFov9CQk50Tv1AetaOOifm5vYC3GighWbAgItMOmXh+34s3Nxe COsUCoWxfwD3PuPq9HO7GwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQVSURBVFhHvZbJaxRBFMYriZoMLmiiMRmdURMyPQYlaqK4 + JUbN4hBNHIkrGgVR0YAruBxEEfGgCCKCK254MOBBMAcPgv4XHvxjnu+r6ldT1enpxLXhN1U9Ve99X60z + aooP/SZ/9NhEVaO7qPrckEadKJA63BNPcYMB9X1drhEw5ccEdLfqRCIcxTPiCkfpbyPV1jipkVIHOEeg + JDzWp8XcWfCM7OzwBQFyIB5tMLB+qSm7864RoB9Sm1pMByBJZFT7NpcVB2VHDhOdnBfiYgC01hryTGjC + JEFjydmkJBkYyW206PbCamMComIA7yYXf8BtuGk2v7xDPe8f0OD4E9r9+QUd+PZ6AuhXmV+caOD7yF2N + NoGpBzCQm1d6twbgZhtvutBA34dHmh0fn0wQd0dXjje9J60BcLu9qNGzDC2YWFjpGBD3XIcowCyg3Dn+ + TM/E8JeX1oCbPAk6/87DM1Ja8vIGtIkPD624GPgxci9WUIgKR7FGrIHelWbHcr3r7d2SOBsR4akYiBNL + IjTBBrBLwxmQtZfSHX05A3HJk5g4Awl7ACX2QZyBuORJPO06qlFN9QZrwDmGMvq49QfXOwZtoiRihetq + SM2ZRipbF3MMw4sBxxDCEEu6B1TtbKpam9NUtPP+CRaRWsE5GNeAFsb3zQvNqKGDI+gdw9+4CeUiEnBd + y6UkI9biGT7zEIew3AOxN6GczTQHZOYbljVoIaEit0gj766BqAmZDTtqgF9FuYq9JZC7GkexyFcnEsAU + l/JDpIbXk+rIcL8lyaBPLw9EcmBQEJMymzLTX/qJDg0gwL3Xpd6WJlWlO/4aiMGVK9MuMyx1z0BUFCNo + nGGFK5ncHEV71lRqClvZ8LRZvKOzBq7jO2lHX8RYIwt4xOtCYdeM6cMfcgxbF0wYbWezop68T19HPRUH + 1tLBvRs0qOO7aD/Eurl0biwBlsLbA3AYCudrFR3fvpjGrhX+KsiJ3NbI7LDOz1dUapgLQxm6sT/4p0AD + WqE4tPVDZ3an6eKhpv8CtKDZ0tJy08jzi6xbLddnOqAtifkpRZl0Oha0ubmQW3QQ6xmQHdxQoWhdtgTa + DBVOKXVlTkT7AUoVb1myJx/r79Dm5kJu0UGsZwDTApbXKxpY6XdUio/kdD4hUkqd204d3UKp3lFadXVM + M3T/E+XOvtIG0CZ5AHKLDmI9A7I+6OSuF9oUn+vGTTkW5noT/3cEKZhQdPnioDUg4pgFGECbm8vNjVjP + wPMLWzR9wUw63l9nQRuoXmrKqIFzp/tp9MqlWNDm5kJu0UGsZ0DOKzrJEqBEmxYT0YiBvdszeqrjOFJY + ZqcfuZBbdBDrGWjqXkOrC52k5vKfhoZVJWAgCbfvZHBuaEALsZ6BcgRBkEhczFQJgqD7JyzoYfDxEsb3 + AAAAAElFTkSuQmCC + + + + + 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 @@ -1027,10 +2304,48 @@ 1eHA2pT4doEM6xLgXVBisEA2E8drXOO8/eL9J8dYhiN8VsAmfMW45tP7TXdODcFCrwyWTgHDbeCXKwW4 z7giGZgwz34ZfnUB7gNbP0ggz5EAxgwDx51T45lzVaKmiTstbnpmnls+veTT+BLmuovCuioXD6Vp9V9j qcnkDWXJtp9DVaw7AAAAAElFTkSuQmCC + + + + + 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 + QmCC - 25 + 26 diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index d688b09..d8515ec 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -280,6 +280,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap compressArrow { + get { + object obj = ResourceManager.GetObject("compressArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// @@ -690,6 +700,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap expandArrow { + get { + object obj = ResourceManager.GetObject("expandArrow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// @@ -1120,6 +1140,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap lens { + get { + object obj = ResourceManager.GetObject("lens", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// diff --git a/DS_Map/Properties/Resources.resx b/DS_Map/Properties/Resources.resx index 4f290e1..0c325a3 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -661,4 +661,13 @@ ..\Resources\Graphics\Program Icons\wrenchIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\compressArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Graphics\Program Icons\expandArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Graphics\Program Icons\lens.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/DS_Map/ROMFiles/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs index e7ba3a9..405da3f 100644 --- a/DS_Map/ROMFiles/ScriptCommand.cs +++ b/DS_Map/ROMFiles/ScriptCommand.cs @@ -60,8 +60,8 @@ namespace DSPRE.ROMFiles { byte param = parametersList[0][0]; name += " " + param.ToString("X") + " " + "Function_#" + BitConverter.ToInt32(parametersList[1], 0).ToString("D"); break; - case 0x1C: // Jump-If - case 0x1D: // Call-If + case 0x1C: // CondJump + case 0x1D: // CondCall byte opcode = parametersList[0][0]; name += " " + PokeDatabase.ScriptEditor.comparisonOperatorsDict[opcode] + " " + "Function_#" + BitConverter.ToInt32(parametersList[1], 0).ToString("D"); break; diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs index 238fa00..25cdf73 100644 --- a/DS_Map/ROMFiles/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -1,4 +1,5 @@ using DSPRE.Resources; +using ScintillaNET; using System; using System.Collections.Generic; using System.IO; @@ -17,6 +18,10 @@ namespace DSPRE.ROMFiles { public enum containerTypes { FUNCTION, MOVEMENT, SCRIPT }; #endregion #region Fields (3) + public static string ScriptKW = "Script"; + public static string FunctionKW = "Function"; + public static string ActionKW = "Action"; + public List allScripts = new List(); public List allFunctions = new List(); public List allActions = new List(); @@ -139,7 +144,7 @@ namespace DSPRE.ROMFiles { allActions = movements; isLevelScript = false; } - public ScriptFile(string[] scriptLines, string[] functionLines, string[] actionLines, int fileID = -1) { + public ScriptFile(ScintillaNET.LineCollection scriptLines, ScintillaNET.LineCollection functionLines, ScintillaNET.LineCollection actionLines, int fileID = -1) { //TODO: give user the possibility to jump to/call a script //once it's done, this Predicate below will be the only one needed, since there will be no distinction between //a script and a function @@ -187,11 +192,11 @@ namespace DSPRE.ROMFiles { case 0x17: //JumpIfObjID case 0x18: //JumpIfBgID case 0x19: //JumpIfPlayerDir - case 0x1C: //Jump-If - case 0x1D: //Call-If - //in the case of Jump-If and Call-If, the first param is a comparisonOperator - //for JumpIfPlayerDir it's a directionID - //for JumpIfObjID, it's an EventID + case 0x1C: //CondJump + case 0x1D: //CondCall + //in the case of CondJump and CondCall, the first param is a comparisonOperator + //for CondJumpPlayerDir it's a directionID + //for CondJumpObjID, it's an EventID parameterList.Add(new byte[] { dataReader.ReadByte() }); ProcessRelativeJump(dataReader, ref parameterList, ref functionOffsets); break; @@ -323,12 +328,12 @@ namespace DSPRE.ROMFiles { case 0x1A: //Call ProcessRelativeJump(dataReader, ref parameterList, ref functionOffsets); break; - case 0x17: //JumpIfObjID - case 0x18: //JumpIfBgID - case 0x19: //JumpIfPlayerDir - case 0x1C: //Jump-If - case 0x1D: //Call-If - parameterList.Add(new byte[] { dataReader.ReadByte() }); //in the case of Jump-If and Call-If, the first param is a comparisonOperator + case 0x17: //CondJumpObjID + case 0x18: //CondJumpBgID + case 0x19: //CondJumpPlayerDir + case 0x1C: //CondJump + case 0x1D: //CondCall + parameterList.Add(new byte[] { dataReader.ReadByte() }); //in the case of CondJump and CondCall, the first param is a comparisonOperator ProcessRelativeJump(dataReader, ref parameterList, ref functionOffsets); break; case 0x5E: // Movement @@ -453,7 +458,7 @@ namespace DSPRE.ROMFiles { references.Add(new ScriptReference(cont.containerType, cont.manualUserID, containerTypes.FUNCTION, invokedID, pos - 4)); } } - private List ReadCommandsFromLines(string[] lineSource, containerTypes containerType, Func, int, ushort?, bool> endConditions) { + private List ReadCommandsFromLines(ScintillaNET.LineCollection lineSource, containerTypes containerType, Func, int, ushort?, bool> endConditions) { List ls = new List(); List lineSourceL = RemoveEmptyLines(lineSource); @@ -490,7 +495,7 @@ namespace DSPRE.ROMFiles { return ls; } - private List ReadActionsFromLines(string[] lineSource) { + private List ReadActionsFromLines(ScintillaNET.LineCollection lineSource) { List ls = new List(); List lineSourceL = RemoveEmptyLines(lineSource); @@ -519,10 +524,10 @@ namespace DSPRE.ROMFiles { } catch (IndexOutOfRangeException) { } return ls; } - private List RemoveEmptyLines(string[] lineSource) { + private List RemoveEmptyLines(ScintillaNET.LineCollection lineSource) { List result = new List(); - foreach (string x in lineSource) { - string tr = x.Trim(); + foreach (Line x in lineSource) { + string tr = x.Text.Trim(); if (tr.Length > 0) { result.Add(tr); } diff --git a/DS_Map/Resources/Graphics/Program Icons/compressArrow.png b/DS_Map/Resources/Graphics/Program Icons/compressArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..3409550b687f8a2984864be4f35da4c0c3d46d26 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~f<2xtjv*HQXD40cZBXEGIhdhTC}>ugW}YZi ze-zUHslDx+I+Ms@RdkIePObIP{9Xk5*6GC|ce@xU7qTgjMf z<%ZXNM4~k$*GM}@7S%Hu{GKPG#^D@qZ}8VXYCl73h1I^2@JHGXkxGj?pUlZ;v-;}h odzqp4%Y}~Ids{wT*C=JW#v=FN^2^h6f$n1PboFyt=akR{0A|rxM*si- literal 0 HcmV?d00001 diff --git a/DS_Map/Resources/Graphics/Program Icons/expandArrow.png b/DS_Map/Resources/Graphics/Program Icons/expandArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..bf209d9d54f87ca8e0563836259f590ece0524e0 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}c0G|-o{|tKnef)vE_i`VX0x9N_Aiv=M{~4~I;svT@;4JWnEM{QfI}E~% z$MaXD00qrFT^vI+f|C=Rm<<@&ESS9*8KPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0eVS9K~y+TV`M-A z6@9b*Lz!UEQIy6Cr2as73@ktlW5WU10GLK?bDPJ1|Ni;;@9*zltZbaTS5F?1Wng4v z=qOA@u?QJ}Oa%jTSMTQx|Nc#da>2md*;C=<-t8GsE>^$*?sXJRn;&&Z?& z#&E^V^Sac*B7C$j;4|lvFh%rIl4*L&czgQ5uN9oj 0) { + + if (next) { + + // SEARCH FOR THE NEXT OCCURRENCE + + // Search the document at the last search index + textAreaScintilla.TargetStart = LastSearchIndex - 1; + textAreaScintilla.TargetEnd = LastSearchIndex + (lastSearched.Length + 1); + textAreaScintilla.SearchFlags = SearchFlags.None; + + // Search, and if not found.. + if (!incremental || textAreaScintilla.SearchInTarget(lastSearched) == -1) { + + // Search the document from the caret onwards + textAreaScintilla.TargetStart = textAreaScintilla.CurrentPosition; + textAreaScintilla.TargetEnd = textAreaScintilla.TextLength; + textAreaScintilla.SearchFlags = SearchFlags.None; + + // Search, and if not found.. + if (textAreaScintilla.SearchInTarget(lastSearched) == -1) { + + // Search again from top + textAreaScintilla.TargetStart = 0; + textAreaScintilla.TargetEnd = textAreaScintilla.TextLength; + + // Search, and if not found.. + if (textAreaScintilla.SearchInTarget(lastSearched) == -1) { + + // clear selection and exit + textAreaScintilla.ClearSelections(); + return; + } + } + + } + + } else { + + // SEARCH FOR THE PREVIOUS OCCURRENCE + + // Search the document from the beginning to the caret + textAreaScintilla.TargetStart = textAreaScintilla.CurrentPosition-1; + textAreaScintilla.TargetEnd = 0; + textAreaScintilla.SearchFlags = SearchFlags.None; + + // Search, and if not found.. + if (textAreaScintilla.SearchInTarget(lastSearched) == -1) { + + // Search again from the caret onwards + textAreaScintilla.TargetStart = textAreaScintilla.CurrentPosition; + textAreaScintilla.TargetEnd = textAreaScintilla.TextLength; + + // Search, and if not found.. + if (textAreaScintilla.SearchInTarget(lastSearched) == -1) { + + // clear selection and exit + textAreaScintilla.ClearSelections(); + return; + } + } + + } + + // Select the occurance + this.LastSearchIndex = textAreaScintilla.TargetStart; + textAreaScintilla.SetSelection(textAreaScintilla.TargetEnd, textAreaScintilla.TargetStart); + textAreaScintilla.ScrollCaret(); + } + + searchBox.Focus(); + } + + public void OpenSearch() { + if (!SearchIsOpen) { + SearchIsOpen = true; + InvokeIfNeeded(MainProgram, delegate () { + searchPanel.Visible = true; + searchBox.Text = lastSearched; + searchBox.Focus(); + searchBox.SelectAll(); + }); + } else { + InvokeIfNeeded(MainProgram, delegate() { + searchBox.Focus(); + searchBox.SelectAll(); + }); + } + } + + public void CloseSearch() { + if (SearchIsOpen) { + SearchIsOpen = false; + InvokeIfNeeded(MainProgram, delegate() { + searchPanel.Visible = false; + //CurBrowser.GetBrowser().StopFinding(true); + }); + } + } + + public void InvokeIfNeeded(Form MainProgram, Action action) { + if (MainProgram.InvokeRequired) { + MainProgram.BeginInvoke(action); + } else { + action.Invoke(); + } + } + } +} diff --git a/DS_Map/packages.config b/DS_Map/packages.config index d4ff809..88e99f6 100644 --- a/DS_Map/packages.config +++ b/DS_Map/packages.config @@ -1,5 +1,6 @@  +