From 3a3cc8a80d1e256cd6dc476c58851d3ebf1d235b Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Thu, 8 Sep 2022 18:20:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D0=B2=20=D0=9B=D0=B8=D0=BD=D1=83?= =?UTF-8?q?=D0=BA=D1=81=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D1=81=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BF=D0=B5=D1=80=D0=B5=D1=80=D0=B8=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=BE=D0=B9=20=D1=87=D0=B0=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F.=20=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=20=D1=8D?= =?UTF-8?q?=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=201920=20=D0=BD=D0=B0=201080.=20?= =?UTF-8?q?=D0=9F=D0=BE=20=D0=B8=D0=B4=D0=B5=D0=B5=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B1=D0=9E=D0=BB=D1=8C=D1=88=D0=B8=D1=85=20=D1=8D=D0=BA=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=B0=D1=80=D1=82=D0=B5=D1=84=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D1=8B=20=D0=B1=D1=83=D0=B4=D1=83=D1=82=20=D0=9D?= =?UTF-8?q?=D0=BE=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D0=B1=D0=9E=D0=BB=D1=8C=D1=88=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B0=D0=BB=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=BD=D0=B5=D1=85=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D0=BA=D0=B8=20=D0=BF=D0=B0=D0=BC=D1=8F=D1=82=D0=B8=20GDI?= =?UTF-8?q?+.=20=D0=9C=D0=BE=D0=B6=D0=B5=D1=82,=20=D0=BD=D0=B0=20=D0=B1?= =?UTF-8?q?=D0=9E=D0=BB=D1=8C=D1=88=D0=B8=D1=85=20=D1=80=D0=B0=D0=B7=D1=80?= =?UTF-8?q?=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=D1=85=20=D0=B1=D1=83=D0=B4?= =?UTF-8?q?=D1=83=D1=82=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0=20Screen.?= =?UTF-8?q?=20=D0=9D=D0=BE=20-=20=D0=BD=D0=B0=D0=B4=D0=BE=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D1=8F=D1=82=D1=8C=20=D0=BE=D1=82=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VisualPascalABCNETLinux/Form1.cs | 8 +++-- VisualPascalABCNETLinux/Form1.resx | 2 +- .../Workbench/WindowOperations.cs | 31 ++++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/VisualPascalABCNETLinux/Form1.cs b/VisualPascalABCNETLinux/Form1.cs index 2f395e4d3..ae4a1fe29 100644 --- a/VisualPascalABCNETLinux/Form1.cs +++ b/VisualPascalABCNETLinux/Form1.cs @@ -360,7 +360,7 @@ namespace VisualPascalABC ErrorsListWindow.CloseButton = false; CompilerConsoleWindow.CloseButton = false; - // menuStrip1.Font = new Font(menuStrip1.Font.Name, 8.25f); + menuStrip1.Font = new Font(menuStrip1.Font.Name, 9.0f); // SSM 06.06.22 - это только для Линукса!!! MainDockPanel.AllowEndUserDocking = false; @@ -412,7 +412,9 @@ namespace VisualPascalABC string newFileName = InstNameNewProgramm(MainDockPanel); //--------------------------------------------- MainDockPanel.Size = new Size(1920, 1080); + BottomDockPanel.Size = new Size(1920, 1080); AddNewProgramToTab(MainDockPanel, newFileName); + //AddNewProgramToTab(BottomDockPanel, "gdsfj"); //--------------------------------------------- AddOptionsContent(); @@ -1990,8 +1992,8 @@ 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); + 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) diff --git a/VisualPascalABCNETLinux/Form1.resx b/VisualPascalABCNETLinux/Form1.resx index 260faf304..4a95c50d2 100644 --- a/VisualPascalABCNETLinux/Form1.resx +++ b/VisualPascalABCNETLinux/Form1.resx @@ -1025,7 +1025,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK - FQAAAk1TRnQBSQFMAgEBEAEAAeQBAgHkAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + FQAAAk1TRnQBSQFMAgEBEAEAAewBAgHsAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/VisualPascalABCNETLinux/Workbench/WindowOperations.cs b/VisualPascalABCNETLinux/Workbench/WindowOperations.cs index ee828cfa0..17f5d6bbc 100644 --- a/VisualPascalABCNETLinux/Workbench/WindowOperations.cs +++ b/VisualPascalABCNETLinux/Workbench/WindowOperations.cs @@ -91,7 +91,7 @@ namespace VisualPascalABC Form1StringResources.SetTextForAllControls(DisassemblyWindow); } - AddWindowToDockPanel(DisassemblyWindow, BottomDockPanel, OutputWindow.Dock, DockState.Document, OutputWindow.IsFloat, BottomPane, int.MaxValue); + AddWindowToDockPanel(DisassemblyWindow, MainDockPanel, OutputWindow.Dock, DockState.Document, OutputWindow.IsFloat, BottomPane, int.MaxValue); } void AddDebugWatchListWindow() @@ -336,30 +336,33 @@ namespace VisualPascalABC AddOutputWindow(); AddErrorsListWindow(); AddCompilerConsoleWindow(); + AddFindSymbolsResultWindow(); - AddImmediateWindow(); - AddDisassemblyWindow(); - AddDebugVariablesListWindow(); - AddDebugWatchListWindow(); + AddDisassemblyWindow(); // Это нельзя убирать - почему то оболочка закрывается при запуске программы!!! + HideContent(FindSymbolsResultWindow); + HideContent(DisassemblyWindow); + + /*AddImmediateWindow(); + //AddDebugVariablesListWindow(); + //AddDebugWatchListWindow(); if (!Tools.IsUnix()) { AddProjectExplorerWindow(); AddPropertiesWindow(); } - SelectContent(OutputWindow, false); - if (!Tools.IsUnix()) - SelectContent(ProjectExplorerWindow, false); + //SelectContent(OutputWindow, false); + //if (!Tools.IsUnix()) + // SelectContent(ProjectExplorerWindow, false); + + //HideContent(ImmediateWindow); + //HideContent(DebugVariablesListWindow); + //HideContent(DebugWatchListWindow); - HideContent(ImmediateWindow); - HideContent(DebugVariablesListWindow); - HideContent(DebugWatchListWindow); - HideContent(FindSymbolsResultWindow); - HideContent(DisassemblyWindow); if (!Tools.IsUnix()) { //HideContent(PropertiesWindow); HideContent(ProjectExplorerWindow); - } + }*/ OutputWindow.Activate(); }