From 28a1dce9aa0cf596da62eea721c08c04eceae474 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Wed, 7 Sep 2022 20:40:59 +0300 Subject: [PATCH] =?UTF-8?q?Linux=20=D0=BE=D0=B1=D0=BE=D0=BB=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D0=B0=20-=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D1=81=20=D0=BD=D0=B5=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9=20=D1=83=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B0=20-=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=BD=D0=B0=D1=85=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VisualPascalABCNETLinux/Form1.Designer.cs | 155 +++++++++--------- VisualPascalABCNETLinux/Form1.cs | 36 +++- VisualPascalABCNETLinux/Form1.resx | 32 ++-- .../Workbench/FileOperations.cs | 9 + .../Workbench/WindowOperations.cs | 8 +- 5 files changed, 137 insertions(+), 103 deletions(-) diff --git a/VisualPascalABCNETLinux/Form1.Designer.cs b/VisualPascalABCNETLinux/Form1.Designer.cs index 86e69b4b8..b96c7999b 100644 --- a/VisualPascalABCNETLinux/Form1.Designer.cs +++ b/VisualPascalABCNETLinux/Form1.Designer.cs @@ -134,14 +134,6 @@ namespace VisualPascalABC this.miBringToFront = new System.Windows.Forms.ToolStripMenuItem(); this.miSendToBack = new System.Windows.Forms.ToolStripMenuItem(); this.miTabOrder = new System.Windows.Forms.ToolStripMenuItem(); - this.mrHelp = new System.Windows.Forms.ToolStripMenuItem(); - this.tsHelp = new System.Windows.Forms.ToolStripMenuItem(); - this.mMAINFEATURESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.miCheckUpdates = new System.Windows.Forms.ToolStripMenuItem(); - this.miAbout = new System.Windows.Forms.ToolStripMenuItem(); this.mrService = new System.Windows.Forms.ToolStripMenuItem(); this.mOPTIONSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tssmIntellisence = new System.Windows.Forms.ToolStripSeparator(); @@ -153,6 +145,14 @@ namespace VisualPascalABC this.mFORMATToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mUNITTESTSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.miPlugins = new System.Windows.Forms.ToolStripMenuItem(); + this.mrHelp = new System.Windows.Forms.ToolStripMenuItem(); + this.tsHelp = new System.Windows.Forms.ToolStripMenuItem(); + this.mMAINFEATURESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.miCheckUpdates = new System.Windows.Forms.ToolStripMenuItem(); + this.miAbout = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.tbNew = new System.Windows.Forms.ToolStripButton(); this.tbOpen = new System.Windows.Forms.ToolStripButton(); @@ -1192,68 +1192,6 @@ namespace VisualPascalABC this.miTabOrder.Text = "M_TAB_ORDER"; this.miTabOrder.Click += new System.EventHandler(this.miTabOrder_Click); // - // mrHelp - // - this.mrHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.tsHelp, - this.mMAINFEATURESToolStripMenuItem, - this.toolStripMenuItem1, - this.toolStripMenuItem5, - this.toolStripSeparator6, - this.miCheckUpdates, - this.miAbout}); - this.mrHelp.Name = "mrHelp"; - this.mrHelp.Size = new System.Drawing.Size(70, 20); - this.mrHelp.Text = "MR_HELP"; - // - // tsHelp - // - this.tsHelp.Name = "tsHelp"; - this.tsHelp.ShortcutKeyDisplayString = "F1"; - this.tsHelp.Size = new System.Drawing.Size(179, 22); - this.tsHelp.Text = "M_HELP"; - this.tsHelp.Click += new System.EventHandler(this.tsHelp_Click); - // - // mMAINFEATURESToolStripMenuItem - // - this.mMAINFEATURESToolStripMenuItem.Name = "mMAINFEATURESToolStripMenuItem"; - this.mMAINFEATURESToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.mMAINFEATURESToolStripMenuItem.Text = "M_MAINFEATURES"; - this.mMAINFEATURESToolStripMenuItem.Click += new System.EventHandler(this.mMAINFEATURESToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(179, 22); - this.toolStripMenuItem1.Text = "M_OPENSAMPLES"; - this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click_1); - // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(179, 22); - this.toolStripMenuItem5.Text = "M_OPENTUTORIAL"; - this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(176, 6); - // - // miCheckUpdates - // - this.miCheckUpdates.Name = "miCheckUpdates"; - this.miCheckUpdates.Size = new System.Drawing.Size(179, 22); - this.miCheckUpdates.Text = "M_CHECKUPDATES"; - this.miCheckUpdates.Click += new System.EventHandler(this.miCheckUpdates_Click); - // - // miAbout - // - this.miAbout.Name = "miAbout"; - this.miAbout.Size = new System.Drawing.Size(179, 22); - this.miAbout.Text = "M_ABOUT"; - this.miAbout.Click += new System.EventHandler(this.miAboutToolStripMenuItem_Click); - // // mrService // this.mrService.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1353,6 +1291,68 @@ namespace VisualPascalABC this.miPlugins.Text = "MR_PLUGINS"; this.miPlugins.Visible = false; // + // mrHelp + // + this.mrHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsHelp, + this.mMAINFEATURESToolStripMenuItem, + this.toolStripMenuItem1, + this.toolStripMenuItem5, + this.toolStripSeparator6, + this.miCheckUpdates, + this.miAbout}); + this.mrHelp.Name = "mrHelp"; + this.mrHelp.Size = new System.Drawing.Size(70, 20); + this.mrHelp.Text = "MR_HELP"; + // + // tsHelp + // + this.tsHelp.Name = "tsHelp"; + this.tsHelp.ShortcutKeyDisplayString = "F1"; + this.tsHelp.Size = new System.Drawing.Size(179, 22); + this.tsHelp.Text = "M_HELP"; + this.tsHelp.Click += new System.EventHandler(this.tsHelp_Click); + // + // mMAINFEATURESToolStripMenuItem + // + this.mMAINFEATURESToolStripMenuItem.Name = "mMAINFEATURESToolStripMenuItem"; + this.mMAINFEATURESToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.mMAINFEATURESToolStripMenuItem.Text = "M_MAINFEATURES"; + this.mMAINFEATURESToolStripMenuItem.Click += new System.EventHandler(this.mMAINFEATURESToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(179, 22); + this.toolStripMenuItem1.Text = "M_OPENSAMPLES"; + this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click_1); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(179, 22); + this.toolStripMenuItem5.Text = "M_OPENTUTORIAL"; + this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(176, 6); + // + // miCheckUpdates + // + this.miCheckUpdates.Name = "miCheckUpdates"; + this.miCheckUpdates.Size = new System.Drawing.Size(179, 22); + this.miCheckUpdates.Text = "M_CHECKUPDATES"; + this.miCheckUpdates.Click += new System.EventHandler(this.miCheckUpdates_Click); + // + // miAbout + // + this.miAbout.Name = "miAbout"; + this.miAbout.Size = new System.Drawing.Size(179, 22); + this.miAbout.Text = "M_ABOUT"; + this.miAbout.Click += new System.EventHandler(this.miAboutToolStripMenuItem_Click); + // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -2060,7 +2060,6 @@ namespace VisualPascalABC // this.MainDockPanel.BackColor = System.Drawing.SystemColors.Control; this.MainDockPanel.ContextMenuStrip = this.contextMenuStrip1; - this.MainDockPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.MainDockPanel.DockBottomPortion = 0.35D; this.MainDockPanel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.MainDockPanel.Location = new System.Drawing.Point(0, 0); @@ -2348,38 +2347,38 @@ namespace VisualPascalABC // // BottomDockPanel // - this.BottomDockPanel.AutoSize = true; this.BottomDockPanel.BackColor = System.Drawing.SystemColors.Control; - this.BottomDockPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.BottomDockPanel.DocumentTabStripLocation = WeifenLuo.WinFormsUI.Docking.DocumentTabStripLocation.Bottom; this.BottomDockPanel.Location = new System.Drawing.Point(0, 0); this.BottomDockPanel.Name = "BottomDockPanel"; - this.BottomDockPanel.Size = new System.Drawing.Size(876, 207); + this.BottomDockPanel.Size = new System.Drawing.Size(876, 204); this.BottomDockPanel.TabIndex = 15; // // MPanel // - this.MPanel.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.MPanel.BackColor = System.Drawing.SystemColors.Control; this.MPanel.Controls.Add(this.MainDockPanel); this.MPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.MPanel.Location = new System.Drawing.Point(0, 0); this.MPanel.Name = "MPanel"; this.MPanel.Size = new System.Drawing.Size(876, 279); this.MPanel.TabIndex = 17; + this.MPanel.Resize += new System.EventHandler(this.MPanel_Resize); // // BPanel // - this.BPanel.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.BPanel.BackColor = System.Drawing.SystemColors.Control; this.BPanel.Controls.Add(this.BottomDockPanel); this.BPanel.Dock = System.Windows.Forms.DockStyle.Bottom; this.BPanel.Location = new System.Drawing.Point(0, 284); this.BPanel.Name = "BPanel"; this.BPanel.Size = new System.Drawing.Size(876, 207); this.BPanel.TabIndex = 18; + this.BPanel.Resize += new System.EventHandler(this.BPanel_Resize); // // AllPanel // - this.AllPanel.BackColor = System.Drawing.SystemColors.ActiveCaptionText; + this.AllPanel.BackColor = System.Drawing.SystemColors.Control; this.AllPanel.Controls.Add(this.MPanel); this.AllPanel.Controls.Add(this.splitter1); this.AllPanel.Controls.Add(this.BPanel); @@ -2424,6 +2423,7 @@ namespace VisualPascalABC this.SizeChanged += new System.EventHandler(this.Form1_SizeChanged); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyUp); + this.Resize += new System.EventHandler(this.Form1_Resize); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); this.toolStrip1.ResumeLayout(false); @@ -2438,7 +2438,6 @@ namespace VisualPascalABC this.cm_Designer.ResumeLayout(false); this.MPanel.ResumeLayout(false); this.BPanel.ResumeLayout(false); - this.BPanel.PerformLayout(); this.AllPanel.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); diff --git a/VisualPascalABCNETLinux/Form1.cs b/VisualPascalABCNETLinux/Form1.cs index 5c4a9e477..2f395e4d3 100644 --- a/VisualPascalABCNETLinux/Form1.cs +++ b/VisualPascalABCNETLinux/Form1.cs @@ -351,16 +351,20 @@ namespace VisualPascalABC WorkbenchStorage.StandartDirectories = new Hashtable(StringComparer.InvariantCultureIgnoreCase); WorkbenchStorage.StandartDirectories.Add(Constants.SystemDirectoryIdent, System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().ManifestModule.FullyQualifiedName)); + //--------------------------------------------- + BottomDockPanel.Size = new Size(1920, 1080); RestoreDesktop(); + //--------------------------------------------- + OutputWindow.CloseButton = false; ErrorsListWindow.CloseButton = false; CompilerConsoleWindow.CloseButton = false; - menuStrip1.Font = new Font(menuStrip1.Font.Name, 8.25f); + // menuStrip1.Font = new Font(menuStrip1.Font.Name, 8.25f); // SSM 06.06.22 - это только для Линукса!!! MainDockPanel.AllowEndUserDocking = false; - BottomDockPanel.AllowEndUserDocking = false; + BottomDockPanel.AllowEndUserDocking = false; LoadOptions(); @@ -406,8 +410,11 @@ namespace VisualPascalABC NavigationManager.StateChanged += new NavigationManager.NavigationManagerStateChanged(NavigationManager_StateChanged); string newFileName = InstNameNewProgramm(MainDockPanel); + //--------------------------------------------- + MainDockPanel.Size = new Size(1920, 1080); AddNewProgramToTab(MainDockPanel, newFileName); - + //--------------------------------------------- + AddOptionsContent(); Application.AddMessageFilter(this); @@ -644,8 +651,11 @@ namespace VisualPascalABC private void Form1_Shown(object sender, EventArgs e) { - - if(_mainFormWindowStateMaximized) + MPanel_Resize(null, EventArgs.Empty); + BPanel_Resize(null, EventArgs.Empty); + //MPanel_.OnResize(EventArgs.Empty); + //BPanel.OnResize(EventArgs.Empty); + if (_mainFormWindowStateMaximized) this.WindowState = FormWindowState.Maximized; //PascalABCCompiler.StringResourcesLanguage.CurrentLanguageName = "Russi @@ -1978,6 +1988,22 @@ namespace VisualPascalABC } + private void Form1_Resize(object sender, EventArgs e) + { + //MainDockPanel.Size = new Size(MPanel.Width, MPanel.Height); + //BottomDockPanel.Size = new Size(BPanel.Width, BPanel.Height - 3); + } + + private void MPanel_Resize(object sender, EventArgs e) + { + MainDockPanel.Size = new Size(MPanel.Width, MPanel.Height); + } + + private void BPanel_Resize(object sender, EventArgs e) + { + BottomDockPanel.Size = new Size(BPanel.Width-3, BPanel.Height - 3); + } + private void tsHelp_Click(object sender, EventArgs e) { __showhelpinqueue(); diff --git a/VisualPascalABCNETLinux/Form1.resx b/VisualPascalABCNETLinux/Form1.resx index 5e235e5e3..260faf304 100644 --- a/VisualPascalABCNETLinux/Form1.resx +++ b/VisualPascalABCNETLinux/Form1.resx @@ -913,21 +913,6 @@ 3UYQBqqGs0HYJ74C1YBpS/aAJZA1IWN0A9yiSlANmLRgJ1gC3QCQRnQMEncMywcykUDvnG1YDYBhmEYY tg3MQTWgc8ZmuCTM/8iGoRtg6ZeJakDr1A3gdIALoOcFU+9UVAMaJ679n1za8z8mv/1/GDCOA4HRBApp d2BgOYXmg51s6Zvx3wyoEYSNPZJRDSAPMDAAAHcqa1Aumt/OAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -960,6 +945,21 @@ saeS2rb7UOgXaTuVTHazh+J2K72OKDpTHEBh1SiuGV8sLLYtFmb8JHwex090zigDU8LZCb1Pl+WA/KsG Jj3zsvDoBzC8JxbusgseC5B9pmAzIK+sn7b772judaPudtCktaO5bRO+rJXG1hc0aJ5T12iipnaIGtUw 5y4qNgNEqeo7yM0rl+jiFeNZnIk7fyOCEhJ+AymIZtFIMC8OAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -1025,7 +1025,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK - FQAAAk1TRnQBSQFMAgEBEAEAAZQBAgGUAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + FQAAAk1TRnQBSQFMAgEBEAEAAeQBAgHkAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/VisualPascalABCNETLinux/Workbench/FileOperations.cs b/VisualPascalABCNETLinux/Workbench/FileOperations.cs index c51e3eb7f..67e53b34a 100644 --- a/VisualPascalABCNETLinux/Workbench/FileOperations.cs +++ b/VisualPascalABCNETLinux/Workbench/FileOperations.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; using System.Text; using System.Windows.Forms; +using System.Drawing; //using ICSharpCode.FormsDesigner; using VisualPascalABCPlugins; using WeifenLuo.WinFormsUI.Docking; @@ -27,7 +28,11 @@ namespace VisualPascalABC CodeFileDocumentControl tp = FindTab(FileName); if (tp != null) return tp; + + MainDockPanel.Size = new Size(1920, 1080); tp = AddNewProgramToTab(MainDockPanel, FileName); + MPanel_Resize(null, EventArgs.Empty); + AddLastFile(FileName); tp.LoadFromFile(FileName); tp.DocumentSavedToDisk = true; @@ -56,7 +61,9 @@ namespace VisualPascalABC FileName = InstNameNewProgramm(MainDockPanel); else FileName = PreferedFileName; + MainDockPanel.Size = new Size(1920, 1080); tp = AddNewProgramToTab(MainDockPanel, FileName); + MPanel_Resize(null, EventArgs.Empty); } else @@ -184,7 +191,9 @@ namespace VisualPascalABC { if (IsNewFile) FileName = InstNameNewProgramm(MainDockPanel); + MainDockPanel.Size = new Size(1920, 1080); tp = AddNewProgramToTab(MainDockPanel, FileName); + MPanel_Resize(null, EventArgs.Empty); } else if (!IsNewFile) diff --git a/VisualPascalABCNETLinux/Workbench/WindowOperations.cs b/VisualPascalABCNETLinux/Workbench/WindowOperations.cs index bc0d236ad..ee828cfa0 100644 --- a/VisualPascalABCNETLinux/Workbench/WindowOperations.cs +++ b/VisualPascalABCNETLinux/Workbench/WindowOperations.cs @@ -27,9 +27,9 @@ namespace VisualPascalABC OutputWindow = new OutputWindowForm(this); Form1StringResources.SetTextForAllControls(OutputWindow); } - BottomPane = null; + //BottomPane = null; //AddWindowToDockPanel(OutputWindow, MainDockPanel, DockStyle.Fill, DockState.DockBottom, OutputWindow.IsFloat, BottomPane, -1); - AddWindowToDockPanel(OutputWindow, BottomDockPanel, DockStyle.Fill, DockState.Document, OutputWindow.IsFloat, BottomPane, -1); + AddWindowToDockPanel(OutputWindow, BottomDockPanel, DockStyle.None, DockState.Document, false, null, -1); //BottomPane = OutputWindow.Pane; } @@ -40,7 +40,7 @@ namespace VisualPascalABC ErrorsListWindow = new ErrorsListWindowForm(this); Form1StringResources.SetTextForAllControls(ErrorsListWindow); } - AddWindowToDockPanel(ErrorsListWindow, BottomDockPanel, OutputWindow.Dock, DockState.Document, OutputWindow.IsFloat, null, int.MaxValue); + AddWindowToDockPanel(ErrorsListWindow, BottomDockPanel, OutputWindow.Dock, DockState.Document, false, null, int.MaxValue); } private void AddCompilerConsoleWindow() @@ -50,7 +50,7 @@ namespace VisualPascalABC CompilerConsoleWindow = new CompilerConsoleWindowForm(this); Form1StringResources.SetTextForAllControls(CompilerConsoleWindow); } - AddWindowToDockPanel(CompilerConsoleWindow, BottomDockPanel, OutputWindow.Dock, DockState.Document, OutputWindow.IsFloat, null, int.MaxValue); + AddWindowToDockPanel(CompilerConsoleWindow, BottomDockPanel, OutputWindow.Dock, DockState.Document, false, null, int.MaxValue); } private void AddFindSymbolsResultWindow()