From 1c222be7f1ba0f04782c84a49afd45c63dcb5029 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Mon, 18 May 2020 01:24:37 +0300 Subject: [PATCH] =?UTF-8?q?Project=20Explorer=20-=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BD=D1=83=D0=BB=20=D0=BD=D0=B0=D0=B7=D0=B0=D0=B4.=20foreach?= =?UTF-8?q?=20=D0=BF=D0=BE=20IntRange=20-=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC?= =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=D0=B5=20(=D0=B2=D1=80=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D0=B8=D0=BB=3F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TreeConversion/syntax_tree_visitor.cs | 4 +- .../Projects/ProjectExplorer.Designer.cs | 56 +++++++++---------- .../Projects/ProjectExplorer.resx | 4 +- 3 files changed, 29 insertions(+), 35 deletions(-) diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs index e5cd3cd93..b2b915047 100644 --- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs +++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs @@ -17705,7 +17705,7 @@ namespace PascalABCCompiler.TreeConverter { if (itn is compiled_type_node) // Именно этот кусок отвечает за IEnumerable и мы его закомментировали { - var itnc = (itn as compiled_type_node).compiled_type; /* SSM раскомментировал 15.05 - пришла пора*/ + var itnc = (itn as compiled_type_node).compiled_type; /* SSM раскомментировал 15.05.2020 - пришла пора*/ if (itnc.IsGenericType) { var my = itnc.GetGenericTypeDefinition();// = typeof(System.Collections.Generic.IEnumerable<>) @@ -17716,7 +17716,7 @@ namespace PascalABCCompiler.TreeConverter return true; } } - else /* end SSM раскомментировал 15.05 - пришла пора*/ + else /* end SSM раскомментировал 15.05.2020 - пришла пора*/ if (itn == ctn) { elem_type = SystemLibrary.SystemLibrary.object_type; diff --git a/VisualPascalABCNET/Projects/ProjectExplorer.Designer.cs b/VisualPascalABCNET/Projects/ProjectExplorer.Designer.cs index 6c29b7390..bb8774124 100644 --- a/VisualPascalABCNET/Projects/ProjectExplorer.Designer.cs +++ b/VisualPascalABCNET/Projects/ProjectExplorer.Designer.cs @@ -69,10 +69,9 @@ namespace VisualPascalABC this.tvProjectExplorer.ImageIndex = 0; this.tvProjectExplorer.ImageList = this.imageList1; this.tvProjectExplorer.Location = new System.Drawing.Point(0, 0); - this.tvProjectExplorer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.tvProjectExplorer.Name = "tvProjectExplorer"; this.tvProjectExplorer.SelectedImageIndex = 0; - this.tvProjectExplorer.Size = new System.Drawing.Size(464, 638); + this.tvProjectExplorer.Size = new System.Drawing.Size(209, 332); this.tvProjectExplorer.StateImageList = this.imageList1; this.tvProjectExplorer.TabIndex = 0; this.tvProjectExplorer.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.TvProjectExplorerBeforeSelect); @@ -92,22 +91,20 @@ namespace VisualPascalABC // // AddReferenceMenuStrip // - this.AddReferenceMenuStrip.ImageScalingSize = new System.Drawing.Size(32, 32); this.AddReferenceMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pRJADDREFERENCEToolStripMenuItem}); this.AddReferenceMenuStrip.Name = "AddReferenceMenuStrip"; - this.AddReferenceMenuStrip.Size = new System.Drawing.Size(318, 40); + this.AddReferenceMenuStrip.Size = new System.Drawing.Size(188, 26); // // pRJADDREFERENCEToolStripMenuItem // this.pRJADDREFERENCEToolStripMenuItem.Name = "pRJADDREFERENCEToolStripMenuItem"; - this.pRJADDREFERENCEToolStripMenuItem.Size = new System.Drawing.Size(317, 36); + this.pRJADDREFERENCEToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pRJADDREFERENCEToolStripMenuItem.Text = "PRJ_ADD_REFERENCE"; this.pRJADDREFERENCEToolStripMenuItem.Click += new System.EventHandler(this.PRJADDREFERENCEToolStripMenuItemClick); // // SouceFileMenuStrip // - this.SouceFileMenuStrip.ImageScalingSize = new System.Drawing.Size(32, 32); this.SouceFileMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pRJOPENToolStripMenuItem, this.pRJToolStripMenuItem, @@ -115,19 +112,19 @@ namespace VisualPascalABC this.pRJEXCLUDEToolStripMenuItem, this.pRJRENAMEToolStripMenuItem}); this.SouceFileMenuStrip.Name = "SouceFileMenuStrip"; - this.SouceFileMenuStrip.Size = new System.Drawing.Size(283, 184); + this.SouceFileMenuStrip.Size = new System.Drawing.Size(171, 114); // // pRJOPENToolStripMenuItem // this.pRJOPENToolStripMenuItem.Name = "pRJOPENToolStripMenuItem"; - this.pRJOPENToolStripMenuItem.Size = new System.Drawing.Size(282, 36); + this.pRJOPENToolStripMenuItem.Size = new System.Drawing.Size(170, 22); this.pRJOPENToolStripMenuItem.Text = "PRJ_OPEN_FILE"; this.pRJOPENToolStripMenuItem.Click += new System.EventHandler(this.pRJOPENToolStripMenuItem_Click); // // pRJToolStripMenuItem // this.pRJToolStripMenuItem.Name = "pRJToolStripMenuItem"; - this.pRJToolStripMenuItem.Size = new System.Drawing.Size(282, 36); + this.pRJToolStripMenuItem.Size = new System.Drawing.Size(170, 22); this.pRJToolStripMenuItem.Text = "PRJ_SHOW_FORM"; this.pRJToolStripMenuItem.Visible = false; this.pRJToolStripMenuItem.Click += new System.EventHandler(this.pRJToolStripMenuItem_Click); @@ -135,27 +132,26 @@ namespace VisualPascalABC // pRJVIEWCODEToolStripMenuItem // this.pRJVIEWCODEToolStripMenuItem.Name = "pRJVIEWCODEToolStripMenuItem"; - this.pRJVIEWCODEToolStripMenuItem.Size = new System.Drawing.Size(282, 36); + this.pRJVIEWCODEToolStripMenuItem.Size = new System.Drawing.Size(170, 22); this.pRJVIEWCODEToolStripMenuItem.Text = "PRJ_VIEW_CODE"; this.pRJVIEWCODEToolStripMenuItem.Click += new System.EventHandler(this.pRJVIEWCODEToolStripMenuItem_Click); // // pRJEXCLUDEToolStripMenuItem // this.pRJEXCLUDEToolStripMenuItem.Name = "pRJEXCLUDEToolStripMenuItem"; - this.pRJEXCLUDEToolStripMenuItem.Size = new System.Drawing.Size(282, 36); + this.pRJEXCLUDEToolStripMenuItem.Size = new System.Drawing.Size(170, 22); this.pRJEXCLUDEToolStripMenuItem.Text = "PRJ_EXCLUDE"; this.pRJEXCLUDEToolStripMenuItem.Click += new System.EventHandler(this.pRJEXCLUDEToolStripMenuItem_Click); // // pRJRENAMEToolStripMenuItem // this.pRJRENAMEToolStripMenuItem.Name = "pRJRENAMEToolStripMenuItem"; - this.pRJRENAMEToolStripMenuItem.Size = new System.Drawing.Size(282, 36); + this.pRJRENAMEToolStripMenuItem.Size = new System.Drawing.Size(170, 22); this.pRJRENAMEToolStripMenuItem.Text = "PRJ_RENAME"; this.pRJRENAMEToolStripMenuItem.Click += new System.EventHandler(this.pRJRENAMEToolStripMenuItem_Click); // // ProjectMenuStrip // - this.ProjectMenuStrip.ImageScalingSize = new System.Drawing.Size(32, 32); this.ProjectMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pRJBUILDToolStripMenuItem, this.pRJBUILDALLToolStripMenuItem, @@ -166,33 +162,33 @@ namespace VisualPascalABC this.toolStripMenuItem2, this.pRJPROPERTIESToolStripMenuItem}); this.ProjectMenuStrip.Name = "ProjectMenuStrip"; - this.ProjectMenuStrip.Size = new System.Drawing.Size(318, 232); + this.ProjectMenuStrip.Size = new System.Drawing.Size(188, 148); // // pRJBUILDToolStripMenuItem // this.pRJBUILDToolStripMenuItem.Name = "pRJBUILDToolStripMenuItem"; - this.pRJBUILDToolStripMenuItem.Size = new System.Drawing.Size(317, 36); + this.pRJBUILDToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pRJBUILDToolStripMenuItem.Text = "PRJ_BUILD"; this.pRJBUILDToolStripMenuItem.Click += new System.EventHandler(this.pRJBUILDToolStripMenuItem_Click); // // pRJBUILDALLToolStripMenuItem // this.pRJBUILDALLToolStripMenuItem.Name = "pRJBUILDALLToolStripMenuItem"; - this.pRJBUILDALLToolStripMenuItem.Size = new System.Drawing.Size(317, 36); + this.pRJBUILDALLToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pRJBUILDALLToolStripMenuItem.Text = "PRJ_BUILD_ALL"; this.pRJBUILDALLToolStripMenuItem.Click += new System.EventHandler(this.pRJBUILDALLToolStripMenuItem_Click); // // pRJRUNToolStripMenuItem // this.pRJRUNToolStripMenuItem.Name = "pRJRUNToolStripMenuItem"; - this.pRJRUNToolStripMenuItem.Size = new System.Drawing.Size(317, 36); + this.pRJRUNToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pRJRUNToolStripMenuItem.Text = "PRJ_RUN"; this.pRJRUNToolStripMenuItem.Click += new System.EventHandler(this.pRJRUNToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(314, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(184, 6); // // pRJToolStripMenuItem1 // @@ -201,61 +197,60 @@ namespace VisualPascalABC this.pRJEXISTFILEToolStripMenuItem, this.pRJFORMToolStripMenuItem}); this.pRJToolStripMenuItem1.Name = "pRJToolStripMenuItem1"; - this.pRJToolStripMenuItem1.Size = new System.Drawing.Size(317, 36); + this.pRJToolStripMenuItem1.Size = new System.Drawing.Size(187, 22); this.pRJToolStripMenuItem1.Text = "PRJ_ADD"; // // pRJNEWFILEToolStripMenuItem // this.pRJNEWFILEToolStripMenuItem.Name = "pRJNEWFILEToolStripMenuItem"; - this.pRJNEWFILEToolStripMenuItem.Size = new System.Drawing.Size(270, 38); + this.pRJNEWFILEToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.pRJNEWFILEToolStripMenuItem.Text = "PRJ_NEW_FILE"; this.pRJNEWFILEToolStripMenuItem.Click += new System.EventHandler(this.pRJNEWFILEToolStripMenuItem_Click); // // pRJEXISTFILEToolStripMenuItem // this.pRJEXISTFILEToolStripMenuItem.Name = "pRJEXISTFILEToolStripMenuItem"; - this.pRJEXISTFILEToolStripMenuItem.Size = new System.Drawing.Size(270, 38); + this.pRJEXISTFILEToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.pRJEXISTFILEToolStripMenuItem.Text = "PRJ_EXIST_FILE"; this.pRJEXISTFILEToolStripMenuItem.Click += new System.EventHandler(this.pRJEXISTFILEToolStripMenuItem_Click); // // pRJFORMToolStripMenuItem // this.pRJFORMToolStripMenuItem.Name = "pRJFORMToolStripMenuItem"; - this.pRJFORMToolStripMenuItem.Size = new System.Drawing.Size(270, 38); + this.pRJFORMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.pRJFORMToolStripMenuItem.Text = "PRJ_FORM"; this.pRJFORMToolStripMenuItem.Click += new System.EventHandler(this.pRJFORMToolStripMenuItem_Click); // // pRJToolStripMenuItem2 // this.pRJToolStripMenuItem2.Name = "pRJToolStripMenuItem2"; - this.pRJToolStripMenuItem2.Size = new System.Drawing.Size(317, 36); + this.pRJToolStripMenuItem2.Size = new System.Drawing.Size(187, 22); this.pRJToolStripMenuItem2.Text = "PRJ_ADD_REFERENCE"; this.pRJToolStripMenuItem2.Click += new System.EventHandler(this.pRJToolStripMenuItem2_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(314, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(184, 6); // // pRJPROPERTIESToolStripMenuItem // this.pRJPROPERTIESToolStripMenuItem.Name = "pRJPROPERTIESToolStripMenuItem"; - this.pRJPROPERTIESToolStripMenuItem.Size = new System.Drawing.Size(317, 36); + this.pRJPROPERTIESToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.pRJPROPERTIESToolStripMenuItem.Text = "PRJ_PROPERTIES"; this.pRJPROPERTIESToolStripMenuItem.Click += new System.EventHandler(this.pRJPROPERTIESToolStripMenuItem_Click); // // ReferenceMenuStrip // - this.ReferenceMenuStrip.ImageScalingSize = new System.Drawing.Size(32, 32); this.ReferenceMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pRJREMOVEToolStripMenuItem}); this.ReferenceMenuStrip.Name = "ReferenceMenuStrip"; - this.ReferenceMenuStrip.Size = new System.Drawing.Size(230, 40); + this.ReferenceMenuStrip.Size = new System.Drawing.Size(144, 26); // // pRJREMOVEToolStripMenuItem // this.pRJREMOVEToolStripMenuItem.Name = "pRJREMOVEToolStripMenuItem"; - this.pRJREMOVEToolStripMenuItem.Size = new System.Drawing.Size(229, 36); + this.pRJREMOVEToolStripMenuItem.Size = new System.Drawing.Size(143, 22); this.pRJREMOVEToolStripMenuItem.Text = "PRJ_REMOVE"; this.pRJREMOVEToolStripMenuItem.Click += new System.EventHandler(this.pRJREMOVEToolStripMenuItem_Click); // @@ -272,11 +267,10 @@ namespace VisualPascalABC // // ProjectExplorerForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(464, 638); + this.ClientSize = new System.Drawing.Size(209, 332); this.Controls.Add(this.tvProjectExplorer); - this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6); this.Name = "ProjectExplorerForm"; this.TabText = "PRJ_PROJECT_EXPLORER"; this.Text = "PRJ_PROJECT_EXPLORER"; diff --git a/VisualPascalABCNET/Projects/ProjectExplorer.resx b/VisualPascalABCNET/Projects/ProjectExplorer.resx index fa14097e5..b6023c43d 100644 --- a/VisualPascalABCNET/Projects/ProjectExplorer.resx +++ b/VisualPascalABCNET/Projects/ProjectExplorer.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA8 - DQAAAk1TRnQBSQFMAgEBBgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DQAAAk1TRnQBSQFMAgEBBgEAASQBAAEkAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -197,7 +197,7 @@ 579, 17 - 872, 17 + 741, 17