From 22540b708a74b7172c14acd73189dd0cb8bdb463 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Tue, 10 Sep 2024 14:25:26 -0700 Subject: [PATCH 1/8] Add functionality to save screenshots in pause for screenshot form --- .../Skyline/TestPerf/DiaSwathTutorialTest.cs | 2 +- .../Skyline/TestPerf/DiaUmpireTutorialTest.cs | 2 +- .../TestTutorial/AbsoluteQuantTutorialTest.cs | 29 ++++++++++--------- .../TestUtil/PauseAndContinueForm.Designer.cs | 18 +++++++++++- .../Skyline/TestUtil/PauseAndContinueForm.cs | 23 +++++++++++++-- .../Skyline/TestUtil/ScreenshotManager.cs | 2 +- pwiz_tools/Skyline/TestUtil/TestFunctional.cs | 26 +++++++++++------ 7 files changed, 72 insertions(+), 30 deletions(-) diff --git a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs index 1e2088fbfe..4a0b8e4ab5 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs @@ -848,7 +848,7 @@ protected override void DoTest() OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); //PauseTest(); - PauseForScreenShot("Loading chromatograms window", screenshotPage++, 30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", screenshotPage++, null,30*1000); // 30 second timeout to avoid getting stuck WaitForDocumentChangeLoaded(doc, 20 * 60 * 1000); // 20 minutes var peakScoringModelDlg = WaitForOpenForm(); diff --git a/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs index d5fc91f948..fc95edf41a 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs @@ -656,7 +656,7 @@ protected override void DoTest() PauseForScreenShot("Import FASTA summary form", 16); OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); - PauseForScreenShot("Loading chromatograms window", 13, 30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", 13, null, 30*1000); // 30 second timeout to avoid getting stuck WaitForDocumentChangeLoaded(doc, 15 * 60 * 1000); // 15 minutes var peakScoringModelDlg = WaitForOpenForm(); diff --git a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs index 6ab2e348b0..9a2c008a16 100644 --- a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs @@ -89,7 +89,8 @@ protected override void DoTest() transitionSettingsUI.RegressionCEName = "Thermo TSQ Vantage"; transitionSettingsUI.RegressionDPName = Resources.SettingsList_ELEMENT_NONE_None; }); - PauseForScreenShot("Transition Settings - Prediction tab", 5); + + PauseForScreenShot("Transition Settings - Prediction tab", 5, "transition_settings_prediction_tab"); RunUI(() => { @@ -102,7 +103,7 @@ protected override void DoTest() transitionSettingsUI.RangeTo = Resources.TransitionFilter_FragmentEndFinders_last_ion_minus_1; transitionSettingsUI.SpecialIons = new string[0]; }); - PauseForScreenShot("Transition Settings - Filter tab", 6); + PauseForScreenShot("Transition Settings - Filter tab", 6, "transition_settings_filter_tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); WaitForDocumentChange(doc); @@ -116,7 +117,7 @@ protected override void DoTest() LabelAtoms.C13 | LabelAtoms.N15, RelativeRT.Matching, null, null, null); AddHeavyMod(modHeavyK, peptideSettingsUi, "Edit Isotope Modification over Transition Settings", 7); RunUI(() => peptideSettingsUi.PickedHeavyMods = new[] { modHeavyK.Name }); - PauseForScreenShot("Peptide Settings - Modification tab with mod added", 8); + PauseForScreenShot("Peptide Settings - Modification tab with mod added", 8, "peptide_settings_modification_tab_with_mod"); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); @@ -128,7 +129,7 @@ protected override void DoTest() RunUI(pasteDlg.PastePeptides); WaitForProteinMetadataBackgroundLoaderCompletedUI(); RunUI(() => pasteDlg.Size = new Size(700, 210)); - PauseForScreenShot("Insert Peptide List", 9); + PauseForScreenShot("Insert Peptide List", 9, "insert_peptide_list"); OkDialog(pasteDlg, pasteDlg.OkDialog); } @@ -138,7 +139,7 @@ protected override void DoTest() WaitForCondition(() => File.Exists(GetTestPath(folderAbsoluteQuant + @"test_file.sky"))); RunUI( () => SkylineWindow.Size = new Size(840, 410)); - PauseForScreenShot("Main window with Targets view", 9); + PauseForScreenShot("Main window with Targets view", 9, "main_window_with_targets"); // Exporting a transition list p. 10 { @@ -150,7 +151,7 @@ protected override void DoTest() exportMethodDlg.OptimizeType = ExportOptimize.NONE; exportMethodDlg.MethodType = ExportMethodType.Standard; }); - PauseForScreenShot("Export Transition List", 10); + PauseForScreenShot("Export Transition List", 10, "export_transition_list"); OkDialog(exportMethodDlg, () => exportMethodDlg.OkDialog(GetTestPath("Quant_Abs_Thermo_TSQ_Vantage.csv"))); @@ -158,7 +159,7 @@ protected override void DoTest() // Importing RAW files into Skyline p. 11, 12 var importResultsDlg = ShowDialog(SkylineWindow.ImportResults); - PauseForScreenShot("Import Results - click OK to get shot of Import Results Files and then cancel", 11); + PauseForScreenShot("Import Results - click OK to get shot of Import Results Files and then cancel", 11, "import_results"); RunUI(() => { @@ -193,7 +194,7 @@ protected override void DoTest() WaitForCondition(10 * 60 * 1000, // ten minutes () => SkylineWindow.Document.Settings.HasResults && SkylineWindow.Document.Settings.MeasuredResults.IsLoaded); - PauseForScreenShot("Main window with imported data", 13); + PauseForScreenShot("Main window with imported data", 13, "main_window_imported_data"); // Analyzing SRM Data from FOXN1-GST Sample p. 14 RunDlg(SkylineWindow.ImportResults, @@ -239,7 +240,7 @@ protected override void DoTest() }); RunUI(() => SkylineWindow.Size = new Size(1470, 656)); RestoreViewOnScreen(14); - PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for light", 14); + PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for light", 14, "main_window_peak_areas_for_light"); RunUI(() => SkylineWindow.SelectedPath = SkylineWindow.DocumentUI.GetPathTo((int)SrmDocument.Level.TransitionGroups, 1)); WaitForGraphs(); @@ -249,7 +250,7 @@ protected override void DoTest() int transitionCount = SkylineWindow.DocumentUI.PeptideTransitionGroups.ToArray()[1].TransitionCount; CheckGstGraphs(transitionCount, transitionCount); }); - PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for heavy", 14); + PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for heavy", 14, "main_window_peak_areas_for_heavy"); RunUI(() => SkylineWindow.SelectedPath = SkylineWindow.DocumentUI.GetPathTo((int)SrmDocument.Level.Molecules, 0)); WaitForGraphs(); @@ -261,7 +262,7 @@ protected override void DoTest() int transitionGroupCount = SkylineWindow.DocumentUI.Peptides.First().TransitionGroupCount; CheckGstGraphs(transitionGroupCount, transitionGroupCount - 1); }); - PauseForScreenShot("Main window with totals graphs for light and heavy and FOXN1-GST", 15); + PauseForScreenShot("Main window with totals graphs for light and heavy and FOXN1-GST", 15, "main_window_totals_graphs"); // Peptide Quantitification Settings p. 16 peptideSettingsUi = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); @@ -273,7 +274,7 @@ protected override void DoTest() peptideSettingsUi.QuantNormalizationMethod = new NormalizationMethod.RatioToLabel(IsotopeLabelType.heavy); peptideSettingsUi.QuantUnits = quantUnits; }); - PauseForScreenShot("Peptide Settings Quantification Tab", 16); + PauseForScreenShot("Peptide Settings Quantification Tab", 16, "peptide_settings_quantification_tab"); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); // Specify analyte concentrations of external standards @@ -315,7 +316,7 @@ protected override void DoTest() gridFloatingWindow.Top = SkylineWindow.Top; gridFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Document grid with concentrations filled in", 17); + PauseForScreenShot("Document grid with concentrations filled in", 17, "document_grid_with_concentrations_filled_in"); } // View the calibration curve p. 18 @@ -354,7 +355,7 @@ protected override void DoTest() calibrationFloatingWindow.Top = SkylineWindow.Top; calibrationFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("View calibration curve", 18); + PauseForScreenShot("View calibration curve", 18, "view_calibration_curve"); } Assert.AreEqual(CalibrationCurveFitter.AppendUnits(QuantificationStrings.Analyte_Concentration, quantUnits), calibrationForm.ZedGraphControl.GraphPane.XAxis.Title.Text); diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs index 920afc3783..b3433b7ebb 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs @@ -36,6 +36,7 @@ private void InitializeComponent() this.btnCopyToClipBoard = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.btnCopyMetafileToClipboard = new System.Windows.Forms.Button(); + this.btnSaveScreenshot = new System.Windows.Forms.Button(); this.SuspendLayout(); // // btnContinue @@ -96,14 +97,28 @@ private void InitializeComponent() this.btnCopyMetafileToClipboard.Visible = false; this.btnCopyMetafileToClipboard.Click += new System.EventHandler(this.btnCopyMetaFileToClipboard_Click); // + // btnSaveScreenshot + // + this.btnSaveScreenshot.Enabled = false; + this.btnSaveScreenshot.Location = new System.Drawing.Point(93, 61); + this.btnSaveScreenshot.Name = "btnSaveScreenshot"; + this.btnSaveScreenshot.Size = new System.Drawing.Size(99, 23); + this.btnSaveScreenshot.TabIndex = 5; + this.btnSaveScreenshot.Text = "Save Screenshot"; + this.toolTip1.SetToolTip(this.btnSaveScreenshot, "Saves screenshot to tutorial folder."); + this.btnSaveScreenshot.UseVisualStyleBackColor = true; + this.btnSaveScreenshot.Visible = false; + this.btnSaveScreenshot.Click += new System.EventHandler(this.btnSaveScreenshot_Click); + // // PauseAndContinueForm // this.AcceptButton = this.btnContinue; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(174, 128); + this.ClientSize = new System.Drawing.Size(203, 130); this.ControlBox = false; + this.Controls.Add(this.btnSaveScreenshot); this.Controls.Add(this.btnCopyMetafileToClipboard); this.Controls.Add(this.btnCopyToClipBoard); this.Controls.Add(this.lblDescriptionLink); @@ -130,5 +145,6 @@ private void InitializeComponent() private System.Windows.Forms.Button btnCopyToClipBoard; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Button btnCopyMetafileToClipboard; + private System.Windows.Forms.Button btnSaveScreenshot; } } \ No newline at end of file diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs index 338bcd21b0..3643f527b7 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs @@ -23,6 +23,7 @@ using System.Threading; using System.Windows.Forms; using DigitalRune.Windows.Docking; +using Microsoft.VisualStudio.TestTools.UnitTesting; using pwiz.Common.SystemUtil; using pwiz.Skyline; using pwiz.Skyline.Controls.Graphs; @@ -37,14 +38,16 @@ public partial class PauseAndContinueForm : Form { private readonly string _linkUrl; private readonly bool _showMatchingPage; + private readonly string _fileToSave; private Form _screenshotForm; private ScreenshotManager _screenshotManager; - public PauseAndContinueForm(string description = null, string link = null, bool showMatchingPages = false, Form screenshotForm = null, ScreenshotManager screenshotManager = null) + public PauseAndContinueForm(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, Form screenshotForm = null, ScreenshotManager screenshotManager = null) { InitializeComponent(); _screenshotForm = screenshotForm; _screenshotManager = screenshotManager; + _fileToSave = fileToSave; if (_screenshotForm != null && _screenshotManager != null) { @@ -59,6 +62,10 @@ public PauseAndContinueForm(string description = null, string link = null, bool } // Show the copy buttons btnCopyToClipBoard.Visible = btnCopyToClipBoard.Enabled = true; + if (!String.IsNullOrEmpty(fileToSave)) + { + btnSaveScreenshot.Visible = btnSaveScreenshot.Enabled = true; + } if ((_screenshotForm is GraphSummary zgControl) && zgControl.GraphControl != null) { btnCopyMetafileToClipboard.Visible = btnCopyMetafileToClipboard.Enabled = true; // Control is a metafile provider @@ -116,7 +123,7 @@ protected override bool ShowWithoutActivation private static readonly object _pauseLock = new object(); - public static void Show(string description = null, string link = null, bool showMatchingPages = false, int? timeout = null, Form screenshotForm = null, ScreenshotManager screenshotManager = null) + public static void Show(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, int? timeout = null, Form screenshotForm = null, ScreenshotManager screenshotManager = null) { ClipboardEx.UseInternalClipboard(false); @@ -128,7 +135,7 @@ public static void Show(string description = null, string link = null, bool show RunUI(parentWindow, () => { - var dlg = new PauseAndContinueForm(description, link, showMatchingPages, screenshotForm, screenshotManager) { Left = parentWindow.Left }; + var dlg = new PauseAndContinueForm(description, fileToSave, link, showMatchingPages, screenshotForm, screenshotManager) { Left = parentWindow.Left }; const int spacing = 15; var screen = Screen.FromControl(parentWindow); if (parentWindow.Top > screen.WorkingArea.Top + dlg.Height + spacing) @@ -217,6 +224,7 @@ public void GotoLink() [return: MarshalAs(UnmanagedType.Bool)] static extern bool SetForegroundWindow(IntPtr hWnd); + private void btnCopyToClipboard_Click(object sender, EventArgs e) { // Copy current window image to clipboard, with clean edges @@ -232,5 +240,14 @@ private void btnCopyMetaFileToClipboard_Click(object sender, EventArgs e) CopyEmfToolStripMenuItem.CopyEmf(zgControl.GraphControl); } } + + private void btnSaveScreenshot_Click(object sender, EventArgs e) + { + if (!String.IsNullOrEmpty(_fileToSave)) + { + _screenshotForm.Focus(); + _screenshotManager.TakeNextShot(_screenshotForm, _fileToSave); + } + } } } diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs index 92cb334de5..58fc70accb 100644 --- a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs @@ -322,7 +322,7 @@ public Bitmap TakeNextShot(Form activeWindow, string pathToSave = null, Action(string description, int? pageNum = null, int? timeout = null) + public void PauseForScreenShot(string description, int? pageNum = null, string fileName = null, int ? timeout = null) where TView : IFormView { - PauseForScreenShot(description, pageNum, typeof(TView), null, timeout); + PauseForScreenShot(description, pageNum, typeof(TView), null, fileName, timeout); } - private void PauseForScreenShot(string description, int? pageNum, Type formType, Form screenshotForm = null, int? timeout = null) + private void PauseForScreenShot(string description, int? pageNum, Type formType, Form screenshotForm = null, string fileName = null, int ? timeout = null) { if (formType != null) { @@ -1334,8 +1342,8 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, var formSeen = new FormSeen(); formSeen.Saw(formType); bool showMatchingPages = IsShowMatchingTutorialPages || Program.ShowMatchingPages; - - PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager); + var fileToSave = !String.IsNullOrEmpty(fileName) && !String.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, fileName)}.png" : null; + PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager); } else { From 3e787bb8b77e8da548a612a7440b54fb3697b18c Mon Sep 17 00:00:00 2001 From: Eduardo Date: Tue, 10 Sep 2024 14:32:30 -0700 Subject: [PATCH 2/8] Remove uncessary space changes --- pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs | 2 +- pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs index 4a0b8e4ab5..b0be09fb5c 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs @@ -848,7 +848,7 @@ protected override void DoTest() OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); //PauseTest(); - PauseForScreenShot("Loading chromatograms window", screenshotPage++, null,30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", screenshotPage++, null, 30*1000); // 30 second timeout to avoid getting stuck WaitForDocumentChangeLoaded(doc, 20 * 60 * 1000); // 20 minutes var peakScoringModelDlg = WaitForOpenForm(); diff --git a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs index 9a2c008a16..2b52b55b58 100644 --- a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs @@ -89,7 +89,6 @@ protected override void DoTest() transitionSettingsUI.RegressionCEName = "Thermo TSQ Vantage"; transitionSettingsUI.RegressionDPName = Resources.SettingsList_ELEMENT_NONE_None; }); - PauseForScreenShot("Transition Settings - Prediction tab", 5, "transition_settings_prediction_tab"); RunUI(() => From 990fbfd3f26c20e7d94c75406d753bbe78139a6f Mon Sep 17 00:00:00 2001 From: Eduardo Date: Thu, 19 Sep 2024 13:08:45 -0700 Subject: [PATCH 3/8] Add auto screenshot mode --- .../SkylineTesterWindow.Designer.cs | 439 +++++++++--------- .../SkylineTester/SkylineTesterWindow.resx | 39 +- pwiz_tools/Skyline/SkylineTester/TabTests.cs | 2 + pwiz_tools/Skyline/TestUtil/TestFunctional.cs | 33 +- 4 files changed, 262 insertions(+), 251 deletions(-) diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs index 0639444732..6bc071d1f1 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs @@ -69,7 +69,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SkylineTesterWindow)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.mainPanel = new System.Windows.Forms.Panel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -386,14 +386,15 @@ private void InitializeComponent() // // statusStrip1 // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.selectedBuild, this.statusRunTime}); - this.statusStrip1.Location = new System.Drawing.Point(0, 745); + this.statusStrip1.Location = new System.Drawing.Point(0, 735); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 13, 0); - this.statusStrip1.Size = new System.Drawing.Size(709, 22); + this.statusStrip1.Size = new System.Drawing.Size(709, 32); this.statusStrip1.TabIndex = 23; this.statusStrip1.Text = "statusStrip1"; // @@ -402,7 +403,7 @@ private void InitializeComponent() this.statusLabel.BackColor = System.Drawing.Color.Transparent; this.statusLabel.ForeColor = System.Drawing.SystemColors.GrayText; this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(38, 17); + this.statusLabel.Size = new System.Drawing.Size(59, 25); this.statusLabel.Text = "status"; // // selectedBuild @@ -410,7 +411,7 @@ private void InitializeComponent() this.selectedBuild.BackColor = System.Drawing.Color.Transparent; this.selectedBuild.ForeColor = System.Drawing.SystemColors.GrayText; this.selectedBuild.Name = "selectedBuild"; - this.selectedBuild.Size = new System.Drawing.Size(608, 17); + this.selectedBuild.Size = new System.Drawing.Size(560, 25); this.selectedBuild.Spring = true; this.selectedBuild.Text = "selected build"; // @@ -420,7 +421,7 @@ private void InitializeComponent() this.statusRunTime.ForeColor = System.Drawing.SystemColors.GrayText; this.statusRunTime.Margin = new System.Windows.Forms.Padding(0, 3, 6, 2); this.statusRunTime.Name = "statusRunTime"; - this.statusRunTime.Size = new System.Drawing.Size(43, 17); + this.statusRunTime.Size = new System.Drawing.Size(70, 27); this.statusRunTime.Text = "0:00:00"; this.statusRunTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -455,11 +456,11 @@ private void InitializeComponent() this.tabForms.Controls.Add(this.groupBox13); this.tabForms.Controls.Add(this.runForms); this.tabForms.Controls.Add(this.groupBox1); - this.tabForms.Location = new System.Drawing.Point(4, 28); + this.tabForms.Location = new System.Drawing.Point(4, 35); this.tabForms.Margin = new System.Windows.Forms.Padding(4); this.tabForms.Name = "tabForms"; this.tabForms.Padding = new System.Windows.Forms.Padding(4); - this.tabForms.Size = new System.Drawing.Size(709, 689); + this.tabForms.Size = new System.Drawing.Size(709, 682); this.tabForms.TabIndex = 1; this.tabForms.Text = "Forms"; // @@ -468,7 +469,7 @@ private void InitializeComponent() this.showChangedFiles.AutoSize = true; this.showChangedFiles.Location = new System.Drawing.Point(16, 235); this.showChangedFiles.Name = "showChangedFiles"; - this.showChangedFiles.Size = new System.Drawing.Size(126, 17); + this.showChangedFiles.Size = new System.Drawing.Size(185, 24); this.showChangedFiles.TabIndex = 5; this.showChangedFiles.Text = "Show changed forms"; this.showChangedFiles.UseVisualStyleBackColor = true; @@ -495,7 +496,7 @@ private void InitializeComponent() this.showFormNames.Location = new System.Drawing.Point(8, 21); this.showFormNames.Margin = new System.Windows.Forms.Padding(4); this.showFormNames.Name = "showFormNames"; - this.showFormNames.Size = new System.Drawing.Size(110, 17); + this.showFormNames.Size = new System.Drawing.Size(163, 24); this.showFormNames.TabIndex = 0; this.showFormNames.Text = "Show form names"; this.showFormNames.UseVisualStyleBackColor = true; @@ -549,7 +550,7 @@ private void InitializeComponent() this.formsLanguageDiff.Location = new System.Drawing.Point(8, 66); this.formsLanguageDiff.Margin = new System.Windows.Forms.Padding(4); this.formsLanguageDiff.Name = "formsLanguageDiff"; - this.formsLanguageDiff.Size = new System.Drawing.Size(185, 21); + this.formsLanguageDiff.Size = new System.Drawing.Size(185, 28); this.formsLanguageDiff.TabIndex = 1; this.formsLanguageDiff.SelectedIndexChanged += new System.EventHandler(this.formsLanguageDiff_SelectedIndexChanged); // @@ -558,7 +559,7 @@ private void InitializeComponent() this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(5, 49); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(46, 13); + this.label20.Size = new System.Drawing.Size(70, 20); this.label20.TabIndex = 1; this.label20.Text = "Diff from"; // @@ -571,14 +572,14 @@ private void InitializeComponent() this.formsLanguage.Location = new System.Drawing.Point(8, 21); this.formsLanguage.Margin = new System.Windows.Forms.Padding(4); this.formsLanguage.Name = "formsLanguage"; - this.formsLanguage.Size = new System.Drawing.Size(185, 21); + this.formsLanguage.Size = new System.Drawing.Size(185, 28); this.formsLanguage.TabIndex = 0; this.formsLanguage.SelectedIndexChanged += new System.EventHandler(this.formsLanguage_SelectedIndexChanged); // // runForms // this.runForms.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runForms.Location = new System.Drawing.Point(596, 649); + this.runForms.Location = new System.Drawing.Point(596, 642); this.runForms.Margin = new System.Windows.Forms.Padding(4); this.runForms.Name = "runForms"; this.runForms.Size = new System.Drawing.Size(100, 28); @@ -598,7 +599,7 @@ private void InitializeComponent() this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(402, 591); + this.groupBox1.Size = new System.Drawing.Size(402, 584); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Forms"; @@ -611,6 +612,7 @@ private void InitializeComponent() this.toolStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(200)))), ((int)(((byte)(190))))); this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.labelSelectedFormsCount, this.clearSeenButton, @@ -625,7 +627,7 @@ private void InitializeComponent() // this.labelSelectedFormsCount.Margin = new System.Windows.Forms.Padding(8, 1, 0, 2); this.labelSelectedFormsCount.Name = "labelSelectedFormsCount"; - this.labelSelectedFormsCount.Size = new System.Drawing.Size(59, 22); + this.labelSelectedFormsCount.Size = new System.Drawing.Size(91, 22); this.labelSelectedFormsCount.Text = "0 selected"; // // clearSeenButton @@ -636,7 +638,7 @@ private void InitializeComponent() this.clearSeenButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.clearSeenButton.Name = "clearSeenButton"; this.clearSeenButton.Padding = new System.Windows.Forms.Padding(0, 0, 6, 0); - this.clearSeenButton.Size = new System.Drawing.Size(71, 22); + this.clearSeenButton.Size = new System.Drawing.Size(102, 20); this.clearSeenButton.Text = "Clear seen"; this.clearSeenButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.clearSeenButton.Click += new System.EventHandler(this.clearSeenButton_Click); @@ -645,7 +647,7 @@ private void InitializeComponent() // this.labelFormsSeenPercent.Margin = new System.Windows.Forms.Padding(80, 1, 0, 2); this.labelFormsSeenPercent.Name = "labelFormsSeenPercent"; - this.labelFormsSeenPercent.Size = new System.Drawing.Size(107, 22); + this.labelFormsSeenPercent.Size = new System.Drawing.Size(167, 25); this.labelFormsSeenPercent.Text = "0% of 0 forms seen"; this.labelFormsSeenPercent.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -663,8 +665,9 @@ private void InitializeComponent() this.SeenColumn}); this.formsGrid.Location = new System.Drawing.Point(8, 49); this.formsGrid.Name = "formsGrid"; + this.formsGrid.RowHeadersWidth = 62; this.formsGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.formsGrid.Size = new System.Drawing.Size(387, 535); + this.formsGrid.Size = new System.Drawing.Size(387, 528); this.formsGrid.TabIndex = 1; this.formsGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.formsGrid_CellContentClick); this.formsGrid.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.formsGrid_CellEndEdit); @@ -674,6 +677,7 @@ private void InitializeComponent() // this.FormColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.FormColumn.HeaderText = "Form"; + this.FormColumn.MinimumWidth = 8; this.FormColumn.Name = "FormColumn"; this.FormColumn.ReadOnly = true; this.FormColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; @@ -682,6 +686,7 @@ private void InitializeComponent() // this.TestColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.TestColumn.HeaderText = "Test"; + this.TestColumn.MinimumWidth = 8; this.TestColumn.Name = "TestColumn"; this.TestColumn.ReadOnly = true; this.TestColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -690,15 +695,15 @@ private void InitializeComponent() // SeenColumn // this.SeenColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.SeenColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle1.Format = "N0"; + dataGridViewCellStyle1.NullValue = null; + dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + this.SeenColumn.DefaultCellStyle = dataGridViewCellStyle1; this.SeenColumn.HeaderText = "Seen"; this.SeenColumn.MinimumWidth = 40; this.SeenColumn.Name = "SeenColumn"; - this.SeenColumn.Width = 57; + this.SeenColumn.Width = 83; // // tabTutorials // @@ -709,11 +714,11 @@ private void InitializeComponent() this.tabTutorials.Controls.Add(this.groupBox3); this.tabTutorials.Controls.Add(this.groupBox4); this.tabTutorials.Controls.Add(this.runTutorials); - this.tabTutorials.Location = new System.Drawing.Point(4, 28); + this.tabTutorials.Location = new System.Drawing.Point(4, 35); this.tabTutorials.Margin = new System.Windows.Forms.Padding(4); this.tabTutorials.Name = "tabTutorials"; this.tabTutorials.Padding = new System.Windows.Forms.Padding(4); - this.tabTutorials.Size = new System.Drawing.Size(709, 689); + this.tabTutorials.Size = new System.Drawing.Size(709, 682); this.tabTutorials.TabIndex = 2; this.tabTutorials.Text = "Tutorials"; // @@ -736,7 +741,7 @@ private void InitializeComponent() this.showMatchingPagesTutorial.AutoSize = true; this.showMatchingPagesTutorial.Location = new System.Drawing.Point(8, 45); this.showMatchingPagesTutorial.Name = "showMatchingPagesTutorial"; - this.showMatchingPagesTutorial.Size = new System.Drawing.Size(160, 17); + this.showMatchingPagesTutorial.Size = new System.Drawing.Size(236, 24); this.showMatchingPagesTutorial.TabIndex = 6; this.showMatchingPagesTutorial.Text = "Show matching tutorial page"; this.showMatchingPagesTutorial.UseVisualStyleBackColor = true; @@ -747,7 +752,7 @@ private void InitializeComponent() this.showFormNamesTutorial.Location = new System.Drawing.Point(8, 21); this.showFormNamesTutorial.Margin = new System.Windows.Forms.Padding(4); this.showFormNamesTutorial.Name = "showFormNamesTutorial"; - this.showFormNamesTutorial.Size = new System.Drawing.Size(110, 17); + this.showFormNamesTutorial.Size = new System.Drawing.Size(163, 24); this.showFormNamesTutorial.TabIndex = 0; this.showFormNamesTutorial.Text = "Show form names"; this.showFormNamesTutorial.UseVisualStyleBackColor = true; @@ -787,7 +792,7 @@ private void InitializeComponent() this.tutorialsLanguage.Location = new System.Drawing.Point(8, 21); this.tutorialsLanguage.Margin = new System.Windows.Forms.Padding(4); this.tutorialsLanguage.Name = "tutorialsLanguage"; - this.tutorialsLanguage.Size = new System.Drawing.Size(185, 21); + this.tutorialsLanguage.Size = new System.Drawing.Size(185, 28); this.tutorialsLanguage.TabIndex = 0; // // groupBox3 @@ -800,7 +805,7 @@ private void InitializeComponent() this.groupBox3.Margin = new System.Windows.Forms.Padding(4); this.groupBox3.Name = "groupBox3"; this.groupBox3.Padding = new System.Windows.Forms.Padding(4); - this.groupBox3.Size = new System.Drawing.Size(402, 591); + this.groupBox3.Size = new System.Drawing.Size(402, 584); this.groupBox3.TabIndex = 0; this.groupBox3.TabStop = false; this.groupBox3.Text = "Tutorials"; @@ -814,7 +819,7 @@ private void InitializeComponent() this.tutorialsTree.Location = new System.Drawing.Point(8, 23); this.tutorialsTree.Margin = new System.Windows.Forms.Padding(4); this.tutorialsTree.Name = "tutorialsTree"; - this.tutorialsTree.Size = new System.Drawing.Size(384, 559); + this.tutorialsTree.Size = new System.Drawing.Size(384, 552); this.tutorialsTree.TabIndex = 0; this.tutorialsTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.node_AfterCheck); // @@ -841,7 +846,7 @@ private void InitializeComponent() // this.pauseStartingPage.Location = new System.Drawing.Point(99, 45); this.pauseStartingPage.Name = "pauseStartingPage"; - this.pauseStartingPage.Size = new System.Drawing.Size(41, 20); + this.pauseStartingPage.Size = new System.Drawing.Size(41, 26); this.pauseStartingPage.TabIndex = 2; this.pauseStartingPage.Text = "1"; // @@ -850,7 +855,7 @@ private void InitializeComponent() this.labelPauseStartingPage.AutoSize = true; this.labelPauseStartingPage.Location = new System.Drawing.Point(25, 48); this.labelPauseStartingPage.Name = "labelPauseStartingPage"; - this.labelPauseStartingPage.Size = new System.Drawing.Size(73, 13); + this.labelPauseStartingPage.Size = new System.Drawing.Size(109, 20); this.labelPauseStartingPage.TabIndex = 1; this.labelPauseStartingPage.Text = "Starting page:"; // @@ -860,7 +865,7 @@ private void InitializeComponent() this.modeTutorialsCoverShots.Location = new System.Drawing.Point(7, 131); this.modeTutorialsCoverShots.Margin = new System.Windows.Forms.Padding(4); this.modeTutorialsCoverShots.Name = "modeTutorialsCoverShots"; - this.modeTutorialsCoverShots.Size = new System.Drawing.Size(110, 17); + this.modeTutorialsCoverShots.Size = new System.Drawing.Size(162, 24); this.modeTutorialsCoverShots.TabIndex = 7; this.modeTutorialsCoverShots.Text = "Cover shots mode"; this.toolTip1.SetToolTip(this.modeTutorialsCoverShots, "Runs the tutorial until cover shot is reached, saves the image, then exits"); @@ -870,7 +875,7 @@ private void InitializeComponent() // this.pauseTutorialsSeconds.Location = new System.Drawing.Point(99, 82); this.pauseTutorialsSeconds.Name = "pauseTutorialsSeconds"; - this.pauseTutorialsSeconds.Size = new System.Drawing.Size(41, 20); + this.pauseTutorialsSeconds.Size = new System.Drawing.Size(41, 26); this.pauseTutorialsSeconds.TabIndex = 4; // // tutorialsDemoMode @@ -879,7 +884,7 @@ private void InitializeComponent() this.tutorialsDemoMode.Location = new System.Drawing.Point(7, 106); this.tutorialsDemoMode.Margin = new System.Windows.Forms.Padding(4); this.tutorialsDemoMode.Name = "tutorialsDemoMode"; - this.tutorialsDemoMode.Size = new System.Drawing.Size(145, 17); + this.tutorialsDemoMode.Size = new System.Drawing.Size(216, 24); this.tutorialsDemoMode.TabIndex = 6; this.tutorialsDemoMode.Text = "Demo mode (deprecated)"; this.toolTip1.SetToolTip(this.tutorialsDemoMode, "Use the Tests tab\'s \'Tutorials only\', \'Mode\', and \'Run indefinitely\' settings for" + @@ -892,7 +897,7 @@ private void InitializeComponent() this.label5.Location = new System.Drawing.Point(147, 84); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(47, 13); + this.label5.Size = new System.Drawing.Size(69, 20); this.label5.TabIndex = 5; this.label5.Text = "seconds"; // @@ -902,7 +907,7 @@ private void InitializeComponent() this.pauseTutorialsDelay.Location = new System.Drawing.Point(7, 82); this.pauseTutorialsDelay.Margin = new System.Windows.Forms.Padding(4); this.pauseTutorialsDelay.Name = "pauseTutorialsDelay"; - this.pauseTutorialsDelay.Size = new System.Drawing.Size(70, 17); + this.pauseTutorialsDelay.Size = new System.Drawing.Size(102, 24); this.pauseTutorialsDelay.TabIndex = 3; this.pauseTutorialsDelay.Text = "Pause for"; this.pauseTutorialsDelay.UseVisualStyleBackColor = true; @@ -914,7 +919,7 @@ private void InitializeComponent() this.pauseTutorialsScreenShots.Location = new System.Drawing.Point(7, 23); this.pauseTutorialsScreenShots.Margin = new System.Windows.Forms.Padding(4); this.pauseTutorialsScreenShots.Name = "pauseTutorialsScreenShots"; - this.pauseTutorialsScreenShots.Size = new System.Drawing.Size(133, 17); + this.pauseTutorialsScreenShots.Size = new System.Drawing.Size(197, 24); this.pauseTutorialsScreenShots.TabIndex = 0; this.pauseTutorialsScreenShots.TabStop = true; this.pauseTutorialsScreenShots.Text = "Pause for screen shots"; @@ -925,7 +930,7 @@ private void InitializeComponent() // runTutorials // this.runTutorials.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runTutorials.Location = new System.Drawing.Point(596, 649); + this.runTutorials.Location = new System.Drawing.Point(596, 642); this.runTutorials.Margin = new System.Windows.Forms.Padding(4); this.runTutorials.Name = "runTutorials"; this.runTutorials.Size = new System.Drawing.Size(100, 28); @@ -945,11 +950,11 @@ private void InitializeComponent() this.tabTests.Controls.Add(this.windowsGroup); this.tabTests.Controls.Add(this.iterationsGroup); this.tabTests.Controls.Add(this.testsGroup); - this.tabTests.Location = new System.Drawing.Point(4, 28); + this.tabTests.Location = new System.Drawing.Point(4, 35); this.tabTests.Margin = new System.Windows.Forms.Padding(4); this.tabTests.Name = "tabTests"; this.tabTests.Padding = new System.Windows.Forms.Padding(4); - this.tabTests.Size = new System.Drawing.Size(709, 689); + this.tabTests.Size = new System.Drawing.Size(709, 682); this.tabTests.TabIndex = 0; this.tabTests.Text = "Tests"; // @@ -975,7 +980,7 @@ private void InitializeComponent() 0, 0}); this.parallelWorkerCount.Name = "parallelWorkerCount"; - this.parallelWorkerCount.Size = new System.Drawing.Size(41, 20); + this.parallelWorkerCount.Size = new System.Drawing.Size(41, 26); this.parallelWorkerCount.TabIndex = 12; this.parallelWorkerCount.Value = new decimal(new int[] { 2, @@ -990,7 +995,7 @@ private void InitializeComponent() this.runParallel.Location = new System.Drawing.Point(26, 20); this.runParallel.Margin = new System.Windows.Forms.Padding(4); this.runParallel.Name = "runParallel"; - this.runParallel.Size = new System.Drawing.Size(117, 17); + this.runParallel.Size = new System.Drawing.Size(173, 24); this.runParallel.TabIndex = 11; this.runParallel.TabStop = true; this.runParallel.Text = "Run tests in parallel"; @@ -1002,7 +1007,7 @@ private void InitializeComponent() this.label22.Location = new System.Drawing.Point(198, 24); this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(44, 13); + this.label22.Size = new System.Drawing.Size(64, 20); this.label22.TabIndex = 13; this.label22.Text = "workers"; // @@ -1012,7 +1017,7 @@ private void InitializeComponent() this.runSerial.Location = new System.Drawing.Point(26, 45); this.runSerial.Margin = new System.Windows.Forms.Padding(4); this.runSerial.Name = "runSerial"; - this.runSerial.Size = new System.Drawing.Size(104, 17); + this.runSerial.Size = new System.Drawing.Size(154, 24); this.runSerial.TabIndex = 14; this.runSerial.Text = "Run tests serially"; this.runSerial.UseVisualStyleBackColor = true; @@ -1021,7 +1026,7 @@ private void InitializeComponent() // runTests // this.runTests.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runTests.Location = new System.Drawing.Point(596, 649); + this.runTests.Location = new System.Drawing.Point(596, 642); this.runTests.Margin = new System.Windows.Forms.Padding(4); this.runTests.Name = "runTests"; this.runTests.Size = new System.Drawing.Size(100, 28); @@ -1034,7 +1039,7 @@ private void InitializeComponent() // buttonSelectFailedTestsTab // this.buttonSelectFailedTestsTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonSelectFailedTestsTab.Location = new System.Drawing.Point(16, 646); + this.buttonSelectFailedTestsTab.Location = new System.Drawing.Point(16, 639); this.buttonSelectFailedTestsTab.Margin = new System.Windows.Forms.Padding(0); this.buttonSelectFailedTestsTab.Name = "buttonSelectFailedTestsTab"; this.buttonSelectFailedTestsTab.Size = new System.Drawing.Size(152, 28); @@ -1079,7 +1084,7 @@ private void InitializeComponent() this.testsTurkish.Location = new System.Drawing.Point(8, 135); this.testsTurkish.Margin = new System.Windows.Forms.Padding(4); this.testsTurkish.Name = "testsTurkish"; - this.testsTurkish.Size = new System.Drawing.Size(61, 17); + this.testsTurkish.Size = new System.Drawing.Size(86, 24); this.testsTurkish.TabIndex = 4; this.testsTurkish.Text = "Turkish"; this.testsTurkish.UseVisualStyleBackColor = true; @@ -1090,7 +1095,7 @@ private void InitializeComponent() this.testsFrench.Location = new System.Drawing.Point(8, 79); this.testsFrench.Margin = new System.Windows.Forms.Padding(4); this.testsFrench.Name = "testsFrench"; - this.testsFrench.Size = new System.Drawing.Size(59, 17); + this.testsFrench.Size = new System.Drawing.Size(85, 24); this.testsFrench.TabIndex = 2; this.testsFrench.Text = "French"; this.testsFrench.UseVisualStyleBackColor = true; @@ -1101,7 +1106,7 @@ private void InitializeComponent() this.testsJapanese.Location = new System.Drawing.Point(8, 107); this.testsJapanese.Margin = new System.Windows.Forms.Padding(4); this.testsJapanese.Name = "testsJapanese"; - this.testsJapanese.Size = new System.Drawing.Size(72, 17); + this.testsJapanese.Size = new System.Drawing.Size(105, 24); this.testsJapanese.TabIndex = 3; this.testsJapanese.Text = "Japanese"; this.testsJapanese.UseVisualStyleBackColor = true; @@ -1112,7 +1117,7 @@ private void InitializeComponent() this.testsChinese.Location = new System.Drawing.Point(9, 51); this.testsChinese.Margin = new System.Windows.Forms.Padding(4); this.testsChinese.Name = "testsChinese"; - this.testsChinese.Size = new System.Drawing.Size(64, 17); + this.testsChinese.Size = new System.Drawing.Size(93, 24); this.testsChinese.TabIndex = 1; this.testsChinese.Text = "Chinese"; this.testsChinese.UseVisualStyleBackColor = true; @@ -1125,7 +1130,7 @@ private void InitializeComponent() this.testsEnglish.Location = new System.Drawing.Point(9, 23); this.testsEnglish.Margin = new System.Windows.Forms.Padding(4); this.testsEnglish.Name = "testsEnglish"; - this.testsEnglish.Size = new System.Drawing.Size(60, 17); + this.testsEnglish.Size = new System.Drawing.Size(87, 24); this.testsEnglish.TabIndex = 0; this.testsEnglish.Text = "English"; this.testsEnglish.UseVisualStyleBackColor = true; @@ -1148,7 +1153,7 @@ private void InitializeComponent() this.labelParallelOffscreenHint.AutoSize = true; this.labelParallelOffscreenHint.Location = new System.Drawing.Point(9, 44); this.labelParallelOffscreenHint.Name = "labelParallelOffscreenHint"; - this.labelParallelOffscreenHint.Size = new System.Drawing.Size(174, 13); + this.labelParallelOffscreenHint.Size = new System.Drawing.Size(260, 20); this.labelParallelOffscreenHint.TabIndex = 1; this.labelParallelOffscreenHint.Text = "Tests run offscreen in parallel mode"; // @@ -1158,7 +1163,7 @@ private void InitializeComponent() this.offscreen.Location = new System.Drawing.Point(8, 23); this.offscreen.Margin = new System.Windows.Forms.Padding(4); this.offscreen.Name = "offscreen"; - this.offscreen.Size = new System.Drawing.Size(75, 17); + this.offscreen.Size = new System.Drawing.Size(109, 24); this.offscreen.TabIndex = 0; this.offscreen.Text = "Off screen"; this.offscreen.UseVisualStyleBackColor = true; @@ -1190,7 +1195,7 @@ private void InitializeComponent() this.coverageCheckbox.AutoSize = true; this.coverageCheckbox.Location = new System.Drawing.Point(8, 178); this.coverageCheckbox.Name = "coverageCheckbox"; - this.coverageCheckbox.Size = new System.Drawing.Size(132, 17); + this.coverageCheckbox.Size = new System.Drawing.Size(193, 24); this.coverageCheckbox.TabIndex = 11; this.coverageCheckbox.Text = "Run dotCover analysis"; this.toolTip1.SetToolTip(this.coverageCheckbox, "Generate a dotCover coverage snapshot and HTML report. Coverage only works with p" + @@ -1203,7 +1208,7 @@ private void InitializeComponent() this.recordAuditLogs.AutoSize = true; this.recordAuditLogs.Location = new System.Drawing.Point(8, 133); this.recordAuditLogs.Name = "recordAuditLogs"; - this.recordAuditLogs.Size = new System.Drawing.Size(166, 17); + this.recordAuditLogs.Size = new System.Drawing.Size(244, 24); this.recordAuditLogs.TabIndex = 10; this.recordAuditLogs.Text = "Record new tutorial audit logs"; this.toolTip1.SetToolTip(this.recordAuditLogs, "Create new or updated audit logs for tutorial tests"); @@ -1216,7 +1221,7 @@ private void InitializeComponent() this.testsRunSmallMoleculeVersions.CheckState = System.Windows.Forms.CheckState.Checked; this.testsRunSmallMoleculeVersions.Location = new System.Drawing.Point(8, 156); this.testsRunSmallMoleculeVersions.Name = "testsRunSmallMoleculeVersions"; - this.testsRunSmallMoleculeVersions.Size = new System.Drawing.Size(179, 17); + this.testsRunSmallMoleculeVersions.Size = new System.Drawing.Size(265, 24); this.testsRunSmallMoleculeVersions.TabIndex = 9; this.testsRunSmallMoleculeVersions.Text = "Run small molecule test versions"; this.toolTip1.SetToolTip(this.testsRunSmallMoleculeVersions, "Include small molecule versions of test when available"); @@ -1227,7 +1232,7 @@ private void InitializeComponent() this.randomize.AutoSize = true; this.randomize.Location = new System.Drawing.Point(8, 112); this.randomize.Name = "randomize"; - this.randomize.Size = new System.Drawing.Size(126, 17); + this.randomize.Size = new System.Drawing.Size(188, 24); this.randomize.TabIndex = 7; this.randomize.Text = "Randomize test order"; this.randomize.UseVisualStyleBackColor = true; @@ -1245,7 +1250,7 @@ private void InitializeComponent() "100"}); this.repeat.Location = new System.Drawing.Point(83, 75); this.repeat.Name = "repeat"; - this.repeat.Size = new System.Drawing.Size(52, 21); + this.repeat.Size = new System.Drawing.Size(52, 28); this.repeat.TabIndex = 5; this.toolTip1.SetToolTip(this.repeat, "Stress each test by running it multiple times before proceeding to next test. Pe" + "rf tests only run once."); @@ -1255,7 +1260,7 @@ private void InitializeComponent() this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(141, 78); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(120, 13); + this.label6.Size = new System.Drawing.Size(180, 20); this.label6.TabIndex = 6; this.label6.Text = "time(s) in a row per pass"; // @@ -1264,7 +1269,7 @@ private void InitializeComponent() this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(3, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(74, 13); + this.label3.Size = new System.Drawing.Size(109, 20); this.label3.TabIndex = 4; this.label3.Text = "Run each test"; // @@ -1277,7 +1282,7 @@ private void InitializeComponent() 0, 0}); this.runLoopsCount.Name = "runLoopsCount"; - this.runLoopsCount.Size = new System.Drawing.Size(41, 20); + this.runLoopsCount.Size = new System.Drawing.Size(41, 26); this.runLoopsCount.TabIndex = 1; this.runLoopsCount.Value = new decimal(new int[] { 1, @@ -1291,7 +1296,7 @@ private void InitializeComponent() this.label2.Location = new System.Drawing.Point(111, 26); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(40, 13); + this.label2.Size = new System.Drawing.Size(60, 20); this.label2.TabIndex = 2; this.label2.Text = "passes"; // @@ -1302,7 +1307,7 @@ private void InitializeComponent() this.runLoops.Location = new System.Drawing.Point(8, 23); this.runLoops.Margin = new System.Windows.Forms.Padding(4); this.runLoops.Name = "runLoops"; - this.runLoops.Size = new System.Drawing.Size(45, 17); + this.runLoops.Size = new System.Drawing.Size(64, 24); this.runLoops.TabIndex = 0; this.runLoops.TabStop = true; this.runLoops.Text = "Run"; @@ -1314,7 +1319,7 @@ private void InitializeComponent() this.runIndefinitely.Location = new System.Drawing.Point(8, 48); this.runIndefinitely.Margin = new System.Windows.Forms.Padding(4); this.runIndefinitely.Name = "runIndefinitely"; - this.runIndefinitely.Size = new System.Drawing.Size(97, 17); + this.runIndefinitely.Size = new System.Drawing.Size(142, 24); this.runIndefinitely.TabIndex = 3; this.runIndefinitely.Text = "Run indefinitely"; this.runIndefinitely.UseVisualStyleBackColor = true; @@ -1334,7 +1339,7 @@ private void InitializeComponent() this.testsGroup.Margin = new System.Windows.Forms.Padding(4); this.testsGroup.Name = "testsGroup"; this.testsGroup.Padding = new System.Windows.Forms.Padding(4); - this.testsGroup.Size = new System.Drawing.Size(402, 591); + this.testsGroup.Size = new System.Drawing.Size(402, 584); this.testsGroup.TabIndex = 4; this.testsGroup.TabStop = false; this.testsGroup.Text = "Tests"; @@ -1350,7 +1355,7 @@ private void InitializeComponent() "Audit log tests"}); this.testSet.Location = new System.Drawing.Point(274, 1); this.testSet.Name = "testSet"; - this.testSet.Size = new System.Drawing.Size(121, 21); + this.testSet.Size = new System.Drawing.Size(121, 28); this.testSet.TabIndex = 34; this.testSet.SelectedValueChanged += new System.EventHandler(this.comboTestSet_SelectedValueChanged); // @@ -1363,19 +1368,20 @@ private void InitializeComponent() "Quality", "Demo", "Screenshots", + "Auto-Screenshots", "Covershot"}); - this.runMode.Location = new System.Drawing.Point(276, 553); + this.runMode.Location = new System.Drawing.Point(276, 546); this.runMode.Name = "runMode"; - this.runMode.Size = new System.Drawing.Size(121, 21); + this.runMode.Size = new System.Drawing.Size(121, 28); this.runMode.TabIndex = 0; // // label21 // this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(273, 536); + this.label21.Location = new System.Drawing.Point(273, 529); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(37, 13); + this.label21.Size = new System.Drawing.Size(53, 20); this.label21.TabIndex = 35; this.label21.Text = "Mode:"; // @@ -1388,7 +1394,7 @@ private void InitializeComponent() this.testsTree.Location = new System.Drawing.Point(8, 23); this.testsTree.Margin = new System.Windows.Forms.Padding(4); this.testsTree.Name = "testsTree"; - this.testsTree.Size = new System.Drawing.Size(387, 503); + this.testsTree.Size = new System.Drawing.Size(387, 496); this.testsTree.TabIndex = 15; this.testsTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.node_AfterCheck); // @@ -1396,10 +1402,10 @@ private void InitializeComponent() // this.skipCheckedTests.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.skipCheckedTests.AutoSize = true; - this.skipCheckedTests.Location = new System.Drawing.Point(8, 560); + this.skipCheckedTests.Location = new System.Drawing.Point(8, 546); this.skipCheckedTests.Margin = new System.Windows.Forms.Padding(4); this.skipCheckedTests.Name = "skipCheckedTests"; - this.skipCheckedTests.Size = new System.Drawing.Size(116, 17); + this.skipCheckedTests.Size = new System.Drawing.Size(168, 24); this.skipCheckedTests.TabIndex = 2; this.skipCheckedTests.Text = "Skip checked tests"; this.skipCheckedTests.UseVisualStyleBackColor = true; @@ -1409,10 +1415,10 @@ private void InitializeComponent() this.runCheckedTests.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.runCheckedTests.AutoSize = true; this.runCheckedTests.Checked = true; - this.runCheckedTests.Location = new System.Drawing.Point(8, 534); + this.runCheckedTests.Location = new System.Drawing.Point(8, 520); this.runCheckedTests.Margin = new System.Windows.Forms.Padding(4); this.runCheckedTests.Name = "runCheckedTests"; - this.runCheckedTests.Size = new System.Drawing.Size(115, 17); + this.runCheckedTests.Size = new System.Drawing.Size(167, 24); this.runCheckedTests.TabIndex = 1; this.runCheckedTests.TabStop = true; this.runCheckedTests.Text = "Run checked tests"; @@ -1428,11 +1434,11 @@ private void InitializeComponent() this.tabBuild.Controls.Add(this.runBuild); this.tabBuild.Controls.Add(this.groupBox6); this.tabBuild.Controls.Add(this.groupBox5); - this.tabBuild.Location = new System.Drawing.Point(4, 28); + this.tabBuild.Location = new System.Drawing.Point(4, 35); this.tabBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabBuild.Name = "tabBuild"; this.tabBuild.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabBuild.Size = new System.Drawing.Size(709, 689); + this.tabBuild.Size = new System.Drawing.Size(709, 682); this.tabBuild.TabIndex = 3; this.tabBuild.Text = "Build"; // @@ -1457,7 +1463,7 @@ private void InitializeComponent() this.startSln.Location = new System.Drawing.Point(7, 42); this.startSln.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.startSln.Name = "startSln"; - this.startSln.Size = new System.Drawing.Size(213, 17); + this.startSln.Size = new System.Drawing.Size(315, 24); this.startSln.TabIndex = 27; this.startSln.Text = "Open Skyline in Visual Studio after build"; this.startSln.UseVisualStyleBackColor = true; @@ -1470,7 +1476,7 @@ private void InitializeComponent() this.runBuildVerificationTests.Location = new System.Drawing.Point(7, 21); this.runBuildVerificationTests.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.runBuildVerificationTests.Name = "runBuildVerificationTests"; - this.runBuildVerificationTests.Size = new System.Drawing.Size(150, 17); + this.runBuildVerificationTests.Size = new System.Drawing.Size(220, 24); this.runBuildVerificationTests.TabIndex = 26; this.runBuildVerificationTests.Text = "Run build verification tests"; this.runBuildVerificationTests.UseVisualStyleBackColor = true; @@ -1535,7 +1541,7 @@ private void InitializeComponent() this.buildRoot.Location = new System.Drawing.Point(9, 21); this.buildRoot.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buildRoot.Name = "buildRoot"; - this.buildRoot.Size = new System.Drawing.Size(484, 20); + this.buildRoot.Size = new System.Drawing.Size(484, 26); this.buildRoot.TabIndex = 3; this.buildRoot.Text = "Documents\\SkylineBuild"; // @@ -1573,7 +1579,7 @@ private void InitializeComponent() this.incrementalBuild.Location = new System.Drawing.Point(7, 71); this.incrementalBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.incrementalBuild.Name = "incrementalBuild"; - this.incrementalBuild.Size = new System.Drawing.Size(117, 17); + this.incrementalBuild.Size = new System.Drawing.Size(174, 24); this.incrementalBuild.TabIndex = 6; this.incrementalBuild.Text = "Incremental re-build"; this.incrementalBuild.UseVisualStyleBackColor = true; @@ -1584,7 +1590,7 @@ private void InitializeComponent() this.updateBuild.Location = new System.Drawing.Point(7, 46); this.updateBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.updateBuild.Name = "updateBuild"; - this.updateBuild.Size = new System.Drawing.Size(165, 17); + this.updateBuild.Size = new System.Drawing.Size(244, 24); this.updateBuild.TabIndex = 5; this.updateBuild.Text = "Update (Sync before building)"; this.updateBuild.UseVisualStyleBackColor = true; @@ -1596,7 +1602,7 @@ private void InitializeComponent() this.nukeBuild.Location = new System.Drawing.Point(7, 21); this.nukeBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nukeBuild.Name = "nukeBuild"; - this.nukeBuild.Size = new System.Drawing.Size(178, 17); + this.nukeBuild.Size = new System.Drawing.Size(261, 24); this.nukeBuild.TabIndex = 4; this.nukeBuild.TabStop = true; this.nukeBuild.Text = "Nuke (Checkout before building)"; @@ -1605,7 +1611,7 @@ private void InitializeComponent() // runBuild // this.runBuild.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runBuild.Location = new System.Drawing.Point(596, 649); + this.runBuild.Location = new System.Drawing.Point(596, 642); this.runBuild.Margin = new System.Windows.Forms.Padding(4); this.runBuild.Name = "runBuild"; this.runBuild.Size = new System.Drawing.Size(100, 28); @@ -1636,7 +1642,7 @@ private void InitializeComponent() this.buildBranch.Location = new System.Drawing.Point(9, 50); this.buildBranch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buildBranch.Name = "buildBranch"; - this.buildBranch.Size = new System.Drawing.Size(59, 17); + this.buildBranch.Size = new System.Drawing.Size(85, 24); this.buildBranch.TabIndex = 4; this.buildBranch.Text = "Branch"; this.buildBranch.UseVisualStyleBackColor = true; @@ -1648,7 +1654,7 @@ private void InitializeComponent() this.buildTrunk.Location = new System.Drawing.Point(9, 23); this.buildTrunk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buildTrunk.Name = "buildTrunk"; - this.buildTrunk.Size = new System.Drawing.Size(53, 17); + this.buildTrunk.Size = new System.Drawing.Size(74, 24); this.buildTrunk.TabIndex = 3; this.buildTrunk.TabStop = true; this.buildTrunk.Text = "Trunk"; @@ -1661,7 +1667,7 @@ private void InitializeComponent() this.branchUrl.Location = new System.Drawing.Point(81, 49); this.branchUrl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.branchUrl.Name = "branchUrl"; - this.branchUrl.Size = new System.Drawing.Size(595, 20); + this.branchUrl.Size = new System.Drawing.Size(595, 26); this.branchUrl.TabIndex = 2; this.branchUrl.Text = "https://github.com/ProteoWizard/pwiz/tree/BRANCHNAME"; // @@ -1684,7 +1690,7 @@ private void InitializeComponent() this.build64.Location = new System.Drawing.Point(9, 46); this.build64.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.build64.Name = "build64"; - this.build64.Size = new System.Drawing.Size(52, 17); + this.build64.Size = new System.Drawing.Size(74, 24); this.build64.TabIndex = 27; this.build64.Text = "64 bit"; this.build64.UseVisualStyleBackColor = true; @@ -1697,7 +1703,7 @@ private void InitializeComponent() this.build32.Location = new System.Drawing.Point(9, 21); this.build32.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.build32.Name = "build32"; - this.build32.Size = new System.Drawing.Size(52, 17); + this.build32.Size = new System.Drawing.Size(74, 24); this.build32.TabIndex = 26; this.build32.Text = "32 bit"; this.build32.UseVisualStyleBackColor = true; @@ -1709,11 +1715,11 @@ private void InitializeComponent() this.tabQuality.Controls.Add(this.qualityTableLayout); this.tabQuality.Controls.Add(this.label18); this.tabQuality.Controls.Add(this.runQuality); - this.tabQuality.Location = new System.Drawing.Point(4, 28); + this.tabQuality.Location = new System.Drawing.Point(4, 35); this.tabQuality.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabQuality.Name = "tabQuality"; this.tabQuality.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabQuality.Size = new System.Drawing.Size(709, 689); + this.tabQuality.Size = new System.Drawing.Size(709, 682); this.tabQuality.TabIndex = 4; this.tabQuality.Text = "Quality"; // @@ -1722,7 +1728,7 @@ private void InitializeComponent() this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panel2.Controls.Add(this.radioQualityHandles); this.panel2.Controls.Add(this.radioQualityMemory); - this.panel2.Location = new System.Drawing.Point(9, 648); + this.panel2.Location = new System.Drawing.Point(9, 641); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(137, 20); this.panel2.TabIndex = 38; @@ -1731,9 +1737,9 @@ private void InitializeComponent() // this.radioQualityHandles.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioQualityHandles.AutoSize = true; - this.radioQualityHandles.Location = new System.Drawing.Point(70, 0); + this.radioQualityHandles.Location = new System.Drawing.Point(70, -7); this.radioQualityHandles.Name = "radioQualityHandles"; - this.radioQualityHandles.Size = new System.Drawing.Size(64, 17); + this.radioQualityHandles.Size = new System.Drawing.Size(93, 24); this.radioQualityHandles.TabIndex = 37; this.radioQualityHandles.Text = "Handles"; this.radioQualityHandles.UseVisualStyleBackColor = true; @@ -1744,9 +1750,9 @@ private void InitializeComponent() this.radioQualityMemory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioQualityMemory.AutoSize = true; this.radioQualityMemory.Checked = true; - this.radioQualityMemory.Location = new System.Drawing.Point(2, 0); + this.radioQualityMemory.Location = new System.Drawing.Point(2, -7); this.radioQualityMemory.Name = "radioQualityMemory"; - this.radioQualityMemory.Size = new System.Drawing.Size(62, 17); + this.radioQualityMemory.Size = new System.Drawing.Size(90, 24); this.radioQualityMemory.TabIndex = 36; this.radioQualityMemory.TabStop = true; this.radioQualityMemory.Text = "Memory"; @@ -1768,7 +1774,7 @@ private void InitializeComponent() this.qualityTableLayout.RowCount = 2; this.qualityTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 46.80412F)); this.qualityTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 53.19588F)); - this.qualityTableLayout.Size = new System.Drawing.Size(691, 594); + this.qualityTableLayout.Size = new System.Drawing.Size(691, 587); this.qualityTableLayout.TabIndex = 32; // // panel1 @@ -1781,7 +1787,7 @@ private void InitializeComponent() this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(691, 278); + this.panel1.Size = new System.Drawing.Size(691, 274); this.panel1.TabIndex = 0; // // groupBox7 @@ -1793,7 +1799,7 @@ private void InitializeComponent() this.groupBox7.Controls.Add(this.qualityThumbnail); this.groupBox7.Location = new System.Drawing.Point(376, 0); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(315, 274); + this.groupBox7.Size = new System.Drawing.Size(315, 270); this.groupBox7.TabIndex = 35; this.groupBox7.TabStop = false; this.groupBox7.Text = "Skyline windows"; @@ -1804,7 +1810,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.qualityTestName.AutoEllipsis = true; this.qualityTestName.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.qualityTestName.Location = new System.Drawing.Point(6, 251); + this.qualityTestName.Location = new System.Drawing.Point(6, 247); this.qualityTestName.Name = "qualityTestName"; this.qualityTestName.Size = new System.Drawing.Size(303, 20); this.qualityTestName.TabIndex = 35; @@ -1818,7 +1824,7 @@ private void InitializeComponent() this.qualityThumbnail.Location = new System.Drawing.Point(8, 19); this.qualityThumbnail.Name = "qualityThumbnail"; this.qualityThumbnail.ProcessId = 0; - this.qualityThumbnail.Size = new System.Drawing.Size(301, 229); + this.qualityThumbnail.Size = new System.Drawing.Size(301, 225); this.qualityThumbnail.TabIndex = 34; // // groupBox11 @@ -1838,7 +1844,7 @@ private void InitializeComponent() this.groupBox11.Margin = new System.Windows.Forms.Padding(4); this.groupBox11.Name = "groupBox11"; this.groupBox11.Padding = new System.Windows.Forms.Padding(4); - this.groupBox11.Size = new System.Drawing.Size(137, 274); + this.groupBox11.Size = new System.Drawing.Size(137, 270); this.groupBox11.TabIndex = 32; this.groupBox11.TabStop = false; this.groupBox11.Text = "Run results"; @@ -1860,7 +1866,7 @@ private void InitializeComponent() this.labelLeaks.Location = new System.Drawing.Point(76, 74); this.labelLeaks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelLeaks.Name = "labelLeaks"; - this.labelLeaks.Size = new System.Drawing.Size(13, 13); + this.labelLeaks.Size = new System.Drawing.Size(18, 20); this.labelLeaks.TabIndex = 12; this.labelLeaks.Text = "0"; // @@ -1870,7 +1876,7 @@ private void InitializeComponent() this.labelFailures.Location = new System.Drawing.Point(76, 58); this.labelFailures.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelFailures.Name = "labelFailures"; - this.labelFailures.Size = new System.Drawing.Size(13, 13); + this.labelFailures.Size = new System.Drawing.Size(18, 20); this.labelFailures.TabIndex = 11; this.labelFailures.Text = "0"; // @@ -1880,7 +1886,7 @@ private void InitializeComponent() this.labelTestsRun.Location = new System.Drawing.Point(76, 42); this.labelTestsRun.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelTestsRun.Name = "labelTestsRun"; - this.labelTestsRun.Size = new System.Drawing.Size(13, 13); + this.labelTestsRun.Size = new System.Drawing.Size(18, 20); this.labelTestsRun.TabIndex = 9; this.labelTestsRun.Text = "0"; // @@ -1890,7 +1896,7 @@ private void InitializeComponent() this.labelDuration.Location = new System.Drawing.Point(76, 25); this.labelDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDuration.Name = "labelDuration"; - this.labelDuration.Size = new System.Drawing.Size(28, 13); + this.labelDuration.Size = new System.Drawing.Size(40, 20); this.labelDuration.TabIndex = 8; this.labelDuration.Text = "0:00"; // @@ -1900,7 +1906,7 @@ private void InitializeComponent() this.label12.Location = new System.Drawing.Point(8, 74); this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(39, 13); + this.label12.Size = new System.Drawing.Size(56, 20); this.label12.TabIndex = 6; this.label12.Text = "Leaks:"; // @@ -1910,7 +1916,7 @@ private void InitializeComponent() this.label13.Location = new System.Drawing.Point(8, 58); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(46, 13); + this.label13.Size = new System.Drawing.Size(69, 20); this.label13.TabIndex = 5; this.label13.Text = "Failures:"; // @@ -1920,7 +1926,7 @@ private void InitializeComponent() this.label10.Location = new System.Drawing.Point(8, 42); this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(54, 13); + this.label10.Size = new System.Drawing.Size(79, 20); this.label10.TabIndex = 3; this.label10.Text = "Tests run:"; // @@ -1930,7 +1936,7 @@ private void InitializeComponent() this.label9.Location = new System.Drawing.Point(8, 25); this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(50, 13); + this.label9.Size = new System.Drawing.Size(74, 20); this.label9.TabIndex = 2; this.label9.Text = "Duration:"; // @@ -1954,7 +1960,7 @@ private void InitializeComponent() this.qualityAllTests.Location = new System.Drawing.Point(7, 19); this.qualityAllTests.Margin = new System.Windows.Forms.Padding(4); this.qualityAllTests.Name = "qualityAllTests"; - this.qualityAllTests.Size = new System.Drawing.Size(61, 17); + this.qualityAllTests.Size = new System.Drawing.Size(90, 24); this.qualityAllTests.TabIndex = 1; this.qualityAllTests.TabStop = true; this.qualityAllTests.Text = "All tests"; @@ -1966,7 +1972,7 @@ private void InitializeComponent() this.qualityChooseTests.Location = new System.Drawing.Point(7, 38); this.qualityChooseTests.Margin = new System.Windows.Forms.Padding(4); this.qualityChooseTests.Name = "qualityChooseTests"; - this.qualityChooseTests.Size = new System.Drawing.Size(159, 17); + this.qualityChooseTests.Size = new System.Drawing.Size(238, 24); this.qualityChooseTests.TabIndex = 0; this.qualityChooseTests.Text = "Choose tests (see Tests tab)"; this.qualityChooseTests.UseVisualStyleBackColor = true; @@ -1996,7 +2002,7 @@ private void InitializeComponent() this.qualityRunSmallMoleculeVersions.CheckState = System.Windows.Forms.CheckState.Checked; this.qualityRunSmallMoleculeVersions.Location = new System.Drawing.Point(7, 118); this.qualityRunSmallMoleculeVersions.Name = "qualityRunSmallMoleculeVersions"; - this.qualityRunSmallMoleculeVersions.Size = new System.Drawing.Size(179, 17); + this.qualityRunSmallMoleculeVersions.Size = new System.Drawing.Size(265, 24); this.qualityRunSmallMoleculeVersions.TabIndex = 14; this.qualityRunSmallMoleculeVersions.Text = "Run small molecule test versions"; this.toolTip1.SetToolTip(this.qualityRunSmallMoleculeVersions, "Include small molecule versions of tests when available"); @@ -2008,7 +2014,7 @@ private void InitializeComponent() this.qualityPassIndefinite.Location = new System.Drawing.Point(8, 48); this.qualityPassIndefinite.Margin = new System.Windows.Forms.Padding(4); this.qualityPassIndefinite.Name = "qualityPassIndefinite"; - this.qualityPassIndefinite.Size = new System.Drawing.Size(97, 17); + this.qualityPassIndefinite.Size = new System.Drawing.Size(142, 24); this.qualityPassIndefinite.TabIndex = 12; this.qualityPassIndefinite.Text = "Run indefinitely"; this.qualityPassIndefinite.UseVisualStyleBackColor = true; @@ -2022,7 +2028,7 @@ private void InitializeComponent() 0, 0}); this.qualityPassCount.Name = "qualityPassCount"; - this.qualityPassCount.Size = new System.Drawing.Size(41, 20); + this.qualityPassCount.Size = new System.Drawing.Size(41, 26); this.qualityPassCount.TabIndex = 11; this.qualityPassCount.Value = new decimal(new int[] { 1, @@ -2037,7 +2043,7 @@ private void InitializeComponent() this.pass1.CheckState = System.Windows.Forms.CheckState.Checked; this.pass1.Location = new System.Drawing.Point(8, 95); this.pass1.Name = "pass1"; - this.pass1.Size = new System.Drawing.Size(163, 17); + this.pass1.Size = new System.Drawing.Size(240, 24); this.pass1.TabIndex = 10; this.pass1.Text = "Pass 1: Detect memory leaks"; this.pass1.UseVisualStyleBackColor = true; @@ -2049,7 +2055,7 @@ private void InitializeComponent() this.pass0.CheckState = System.Windows.Forms.CheckState.Checked; this.pass0.Location = new System.Drawing.Point(8, 72); this.pass0.Name = "pass0"; - this.pass0.Size = new System.Drawing.Size(161, 17); + this.pass0.Size = new System.Drawing.Size(231, 24); this.pass0.TabIndex = 9; this.pass0.Text = "Pass 0: French / no vendors"; this.pass0.UseVisualStyleBackColor = true; @@ -2060,7 +2066,7 @@ private void InitializeComponent() this.label7.Location = new System.Drawing.Point(108, 25); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(40, 13); + this.label7.Size = new System.Drawing.Size(60, 20); this.label7.TabIndex = 8; this.label7.Text = "passes"; // @@ -2071,7 +2077,7 @@ private void InitializeComponent() this.qualityPassDefinite.Location = new System.Drawing.Point(8, 23); this.qualityPassDefinite.Margin = new System.Windows.Forms.Padding(4); this.qualityPassDefinite.Name = "qualityPassDefinite"; - this.qualityPassDefinite.Size = new System.Drawing.Size(45, 17); + this.qualityPassDefinite.Size = new System.Drawing.Size(64, 24); this.qualityPassDefinite.TabIndex = 1; this.qualityPassDefinite.TabStop = true; this.qualityPassDefinite.Text = "Run"; @@ -2082,10 +2088,10 @@ private void InitializeComponent() this.panelMemoryGraph.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.panelMemoryGraph.Location = new System.Drawing.Point(0, 284); + this.panelMemoryGraph.Location = new System.Drawing.Point(0, 280); this.panelMemoryGraph.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0); this.panelMemoryGraph.Name = "panelMemoryGraph"; - this.panelMemoryGraph.Size = new System.Drawing.Size(691, 310); + this.panelMemoryGraph.Size = new System.Drawing.Size(691, 307); this.panelMemoryGraph.TabIndex = 32; // // label18 @@ -2103,7 +2109,7 @@ private void InitializeComponent() // runQuality // this.runQuality.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runQuality.Location = new System.Drawing.Point(596, 649); + this.runQuality.Location = new System.Drawing.Point(596, 642); this.runQuality.Margin = new System.Windows.Forms.Padding(4); this.runQuality.Name = "runQuality"; this.runQuality.Size = new System.Drawing.Size(100, 28); @@ -2120,10 +2126,10 @@ private void InitializeComponent() this.tabNightly.Controls.Add(this.nightlyTableLayout); this.tabNightly.Controls.Add(this.label33); this.tabNightly.Controls.Add(this.runNightly); - this.tabNightly.Location = new System.Drawing.Point(4, 28); + this.tabNightly.Location = new System.Drawing.Point(4, 35); this.tabNightly.Name = "tabNightly"; this.tabNightly.Padding = new System.Windows.Forms.Padding(3); - this.tabNightly.Size = new System.Drawing.Size(709, 689); + this.tabNightly.Size = new System.Drawing.Size(709, 682); this.tabNightly.TabIndex = 7; this.tabNightly.Text = "Nightly"; // @@ -2131,9 +2137,9 @@ private void InitializeComponent() // this.nightlyExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.nightlyExit.AutoSize = true; - this.nightlyExit.Location = new System.Drawing.Point(200, 656); + this.nightlyExit.Location = new System.Drawing.Point(200, 642); this.nightlyExit.Name = "nightlyExit"; - this.nightlyExit.Size = new System.Drawing.Size(73, 17); + this.nightlyExit.Size = new System.Drawing.Size(106, 24); this.nightlyExit.TabIndex = 37; this.nightlyExit.Text = "nightlyExit"; this.nightlyExit.UseVisualStyleBackColor = true; @@ -2143,7 +2149,7 @@ private void InitializeComponent() // this.buttonDeleteNightlyTask.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonDeleteNightlyTask.Enabled = false; - this.buttonDeleteNightlyTask.Location = new System.Drawing.Point(11, 649); + this.buttonDeleteNightlyTask.Location = new System.Drawing.Point(11, 642); this.buttonDeleteNightlyTask.Margin = new System.Windows.Forms.Padding(4); this.buttonDeleteNightlyTask.Name = "buttonDeleteNightlyTask"; this.buttonDeleteNightlyTask.Size = new System.Drawing.Size(180, 28); @@ -2167,7 +2173,7 @@ private void InitializeComponent() this.nightlyTableLayout.RowCount = 2; this.nightlyTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 76.53277F)); this.nightlyTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23.46723F)); - this.nightlyTableLayout.Size = new System.Drawing.Size(687, 594); + this.nightlyTableLayout.Size = new System.Drawing.Size(687, 587); this.nightlyTableLayout.TabIndex = 35; // // groupBox17 @@ -2176,11 +2182,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox17.Controls.Add(this.nightlyTrendsTable); - this.groupBox17.Location = new System.Drawing.Point(0, 454); + this.groupBox17.Location = new System.Drawing.Point(0, 449); this.groupBox17.Margin = new System.Windows.Forms.Padding(0); this.groupBox17.Name = "groupBox17"; this.groupBox17.Padding = new System.Windows.Forms.Padding(4); - this.groupBox17.Size = new System.Drawing.Size(687, 140); + this.groupBox17.Size = new System.Drawing.Size(687, 138); this.groupBox17.TabIndex = 31; this.groupBox17.TabStop = false; this.groupBox17.Text = "Trends"; @@ -2201,7 +2207,7 @@ private void InitializeComponent() this.nightlyTrendsTable.Name = "nightlyTrendsTable"; this.nightlyTrendsTable.RowCount = 1; this.nightlyTrendsTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.nightlyTrendsTable.Size = new System.Drawing.Size(679, 119); + this.nightlyTrendsTable.Size = new System.Drawing.Size(679, 117); this.nightlyTrendsTable.TabIndex = 4; // // panel3 @@ -2214,7 +2220,7 @@ private void InitializeComponent() this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(0); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(687, 454); + this.panel3.Size = new System.Drawing.Size(687, 449); this.panel3.TabIndex = 0; // // groupBox19 @@ -2228,7 +2234,7 @@ private void InitializeComponent() this.groupBox19.Margin = new System.Windows.Forms.Padding(4); this.groupBox19.Name = "groupBox19"; this.groupBox19.Padding = new System.Windows.Forms.Padding(4); - this.groupBox19.Size = new System.Drawing.Size(240, 121); + this.groupBox19.Size = new System.Drawing.Size(240, 116); this.groupBox19.TabIndex = 36; this.groupBox19.TabStop = false; this.groupBox19.Text = "Nightly directory"; @@ -2284,7 +2290,7 @@ private void InitializeComponent() this.nightlyBranch.Location = new System.Drawing.Point(9, 50); this.nightlyBranch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nightlyBranch.Name = "nightlyBranch"; - this.nightlyBranch.Size = new System.Drawing.Size(59, 17); + this.nightlyBranch.Size = new System.Drawing.Size(85, 24); this.nightlyBranch.TabIndex = 4; this.nightlyBranch.Text = "Branch"; this.nightlyBranch.UseVisualStyleBackColor = true; @@ -2296,7 +2302,7 @@ private void InitializeComponent() this.nightlyBuildTrunk.Location = new System.Drawing.Point(9, 23); this.nightlyBuildTrunk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nightlyBuildTrunk.Name = "nightlyBuildTrunk"; - this.nightlyBuildTrunk.Size = new System.Drawing.Size(53, 17); + this.nightlyBuildTrunk.Size = new System.Drawing.Size(74, 24); this.nightlyBuildTrunk.TabIndex = 3; this.nightlyBuildTrunk.TabStop = true; this.nightlyBuildTrunk.Text = "Trunk"; @@ -2309,7 +2315,7 @@ private void InitializeComponent() this.nightlyBranchUrl.Location = new System.Drawing.Point(74, 49); this.nightlyBranchUrl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nightlyBranchUrl.Name = "nightlyBranchUrl"; - this.nightlyBranchUrl.Size = new System.Drawing.Size(159, 20); + this.nightlyBranchUrl.Size = new System.Drawing.Size(159, 26); this.nightlyBranchUrl.TabIndex = 2; this.nightlyBranchUrl.Text = "https://github.com/ProteoWizard/pwiz/tree/BRANCHNAME"; // @@ -2338,7 +2344,7 @@ private void InitializeComponent() this.groupBox18.Margin = new System.Windows.Forms.Padding(4); this.groupBox18.Name = "groupBox18"; this.groupBox18.Padding = new System.Windows.Forms.Padding(4); - this.groupBox18.Size = new System.Drawing.Size(439, 450); + this.groupBox18.Size = new System.Drawing.Size(439, 445); this.groupBox18.TabIndex = 32; this.groupBox18.TabStop = false; this.groupBox18.Text = "Run results"; @@ -2348,7 +2354,7 @@ private void InitializeComponent() this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panel4.Controls.Add(this.radioNightlyHandles); this.panel4.Controls.Add(this.radioNightlyMemory); - this.panel4.Location = new System.Drawing.Point(8, 427); + this.panel4.Location = new System.Drawing.Point(8, 422); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(136, 21); this.panel4.TabIndex = 38; @@ -2357,9 +2363,9 @@ private void InitializeComponent() // this.radioNightlyHandles.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioNightlyHandles.AutoSize = true; - this.radioNightlyHandles.Location = new System.Drawing.Point(68, 0); + this.radioNightlyHandles.Location = new System.Drawing.Point(68, -7); this.radioNightlyHandles.Name = "radioNightlyHandles"; - this.radioNightlyHandles.Size = new System.Drawing.Size(64, 17); + this.radioNightlyHandles.Size = new System.Drawing.Size(93, 24); this.radioNightlyHandles.TabIndex = 37; this.radioNightlyHandles.Text = "Handles"; this.radioNightlyHandles.UseVisualStyleBackColor = true; @@ -2370,9 +2376,9 @@ private void InitializeComponent() this.radioNightlyMemory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioNightlyMemory.AutoSize = true; this.radioNightlyMemory.Checked = true; - this.radioNightlyMemory.Location = new System.Drawing.Point(0, 0); + this.radioNightlyMemory.Location = new System.Drawing.Point(0, -7); this.radioNightlyMemory.Name = "radioNightlyMemory"; - this.radioNightlyMemory.Size = new System.Drawing.Size(62, 17); + this.radioNightlyMemory.Size = new System.Drawing.Size(90, 24); this.radioNightlyMemory.TabIndex = 36; this.radioNightlyMemory.TabStop = true; this.radioNightlyMemory.Text = "Memory"; @@ -2408,7 +2414,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.nightlyGraphPanel.Location = new System.Drawing.Point(11, 126); this.nightlyGraphPanel.Name = "nightlyGraphPanel"; - this.nightlyGraphPanel.Size = new System.Drawing.Size(421, 298); + this.nightlyGraphPanel.Size = new System.Drawing.Size(421, 293); this.nightlyGraphPanel.TabIndex = 32; // // nightlyDeleteRun @@ -2439,7 +2445,7 @@ private void InitializeComponent() this.nightlyLabelLeaks.Location = new System.Drawing.Point(87, 103); this.nightlyLabelLeaks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelLeaks.Name = "nightlyLabelLeaks"; - this.nightlyLabelLeaks.Size = new System.Drawing.Size(13, 13); + this.nightlyLabelLeaks.Size = new System.Drawing.Size(18, 20); this.nightlyLabelLeaks.TabIndex = 12; this.nightlyLabelLeaks.Text = "0"; // @@ -2449,7 +2455,7 @@ private void InitializeComponent() this.nightlyLabelFailures.Location = new System.Drawing.Point(87, 87); this.nightlyLabelFailures.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelFailures.Name = "nightlyLabelFailures"; - this.nightlyLabelFailures.Size = new System.Drawing.Size(13, 13); + this.nightlyLabelFailures.Size = new System.Drawing.Size(18, 20); this.nightlyLabelFailures.TabIndex = 11; this.nightlyLabelFailures.Text = "0"; // @@ -2459,7 +2465,7 @@ private void InitializeComponent() this.nightlyLabelTestsRun.Location = new System.Drawing.Point(87, 71); this.nightlyLabelTestsRun.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelTestsRun.Name = "nightlyLabelTestsRun"; - this.nightlyLabelTestsRun.Size = new System.Drawing.Size(13, 13); + this.nightlyLabelTestsRun.Size = new System.Drawing.Size(18, 20); this.nightlyLabelTestsRun.TabIndex = 9; this.nightlyLabelTestsRun.Text = "0"; // @@ -2469,7 +2475,7 @@ private void InitializeComponent() this.nightlyLabelDuration.Location = new System.Drawing.Point(87, 54); this.nightlyLabelDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelDuration.Name = "nightlyLabelDuration"; - this.nightlyLabelDuration.Size = new System.Drawing.Size(28, 13); + this.nightlyLabelDuration.Size = new System.Drawing.Size(40, 20); this.nightlyLabelDuration.TabIndex = 8; this.nightlyLabelDuration.Text = "0:00"; // @@ -2479,7 +2485,7 @@ private void InitializeComponent() this.label25.Location = new System.Drawing.Point(19, 103); this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(39, 13); + this.label25.Size = new System.Drawing.Size(56, 20); this.label25.TabIndex = 6; this.label25.Text = "Leaks:"; // @@ -2489,7 +2495,7 @@ private void InitializeComponent() this.nightlyLabel3.Location = new System.Drawing.Point(19, 87); this.nightlyLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabel3.Name = "nightlyLabel3"; - this.nightlyLabel3.Size = new System.Drawing.Size(46, 13); + this.nightlyLabel3.Size = new System.Drawing.Size(69, 20); this.nightlyLabel3.TabIndex = 5; this.nightlyLabel3.Text = "Failures:"; // @@ -2499,7 +2505,7 @@ private void InitializeComponent() this.nightlyLabel2.Location = new System.Drawing.Point(19, 71); this.nightlyLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabel2.Name = "nightlyLabel2"; - this.nightlyLabel2.Size = new System.Drawing.Size(54, 13); + this.nightlyLabel2.Size = new System.Drawing.Size(79, 20); this.nightlyLabel2.TabIndex = 3; this.nightlyLabel2.Text = "Tests run:"; // @@ -2509,7 +2515,7 @@ private void InitializeComponent() this.nightlyLabel1.Location = new System.Drawing.Point(19, 54); this.nightlyLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabel1.Name = "nightlyLabel1"; - this.nightlyLabel1.Size = new System.Drawing.Size(50, 13); + this.nightlyLabel1.Size = new System.Drawing.Size(74, 20); this.nightlyLabel1.TabIndex = 2; this.nightlyLabel1.Text = "Duration:"; // @@ -2520,7 +2526,7 @@ private void InitializeComponent() this.nightlyRunDate.Location = new System.Drawing.Point(85, 21); this.nightlyRunDate.Margin = new System.Windows.Forms.Padding(4); this.nightlyRunDate.Name = "nightlyRunDate"; - this.nightlyRunDate.Size = new System.Drawing.Size(192, 21); + this.nightlyRunDate.Size = new System.Drawing.Size(192, 28); this.nightlyRunDate.TabIndex = 1; this.nightlyRunDate.SelectedIndexChanged += new System.EventHandler(this.comboRunDate_SelectedIndexChanged); // @@ -2530,7 +2536,7 @@ private void InitializeComponent() this.label29.Location = new System.Drawing.Point(8, 26); this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(54, 13); + this.label29.Size = new System.Drawing.Size(79, 20); this.label29.TabIndex = 0; this.label29.Text = "Run date:"; // @@ -2564,7 +2570,7 @@ private void InitializeComponent() this.nightlyRunIndefinitely.AutoSize = true; this.nightlyRunIndefinitely.Location = new System.Drawing.Point(10, 199); this.nightlyRunIndefinitely.Name = "nightlyRunIndefinitely"; - this.nightlyRunIndefinitely.Size = new System.Drawing.Size(98, 17); + this.nightlyRunIndefinitely.Size = new System.Drawing.Size(143, 24); this.nightlyRunIndefinitely.TabIndex = 39; this.nightlyRunIndefinitely.Text = "Run indefinitely"; this.nightlyRunIndefinitely.UseVisualStyleBackColor = true; @@ -2574,7 +2580,7 @@ private void InitializeComponent() this.nightlyRandomize.AutoSize = true; this.nightlyRandomize.Location = new System.Drawing.Point(10, 176); this.nightlyRandomize.Name = "nightlyRandomize"; - this.nightlyRandomize.Size = new System.Drawing.Size(126, 17); + this.nightlyRandomize.Size = new System.Drawing.Size(188, 24); this.nightlyRandomize.TabIndex = 38; this.nightlyRandomize.Text = "Randomize test order"; this.nightlyRandomize.UseVisualStyleBackColor = true; @@ -2592,7 +2598,7 @@ private void InitializeComponent() "100"}); this.nightlyRepeat.Location = new System.Drawing.Point(87, 145); this.nightlyRepeat.Name = "nightlyRepeat"; - this.nightlyRepeat.Size = new System.Drawing.Size(52, 21); + this.nightlyRepeat.Size = new System.Drawing.Size(52, 28); this.nightlyRepeat.TabIndex = 36; this.toolTip1.SetToolTip(this.nightlyRepeat, "Stress each test by running it multiple times before proceeding to next test. Pe" + "rf tests only run once."); @@ -2602,7 +2608,7 @@ private void InitializeComponent() this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(145, 148); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(77, 13); + this.label8.Size = new System.Drawing.Size(115, 20); this.label8.TabIndex = 37; this.label8.Text = "time(s) in a row"; // @@ -2611,7 +2617,7 @@ private void InitializeComponent() this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(7, 148); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(74, 13); + this.label11.Size = new System.Drawing.Size(109, 20); this.label11.TabIndex = 35; this.label11.Text = "Run each test"; // @@ -2620,7 +2626,7 @@ private void InitializeComponent() this.nightlyRunPerfTests.AutoSize = true; this.nightlyRunPerfTests.Location = new System.Drawing.Point(9, 95); this.nightlyRunPerfTests.Name = "nightlyRunPerfTests"; - this.nightlyRunPerfTests.Size = new System.Drawing.Size(169, 17); + this.nightlyRunPerfTests.Size = new System.Drawing.Size(250, 24); this.nightlyRunPerfTests.TabIndex = 33; this.nightlyRunPerfTests.Text = "Include perf tests in nightly run"; this.toolTip1.SetToolTip(this.nightlyRunPerfTests, "Perf tests run only once per language, and only in pass 2 (no leak detection or i" + @@ -2644,7 +2650,7 @@ private void InitializeComponent() this.nightlyStartTime.Location = new System.Drawing.Point(85, 19); this.nightlyStartTime.Name = "nightlyStartTime"; this.nightlyStartTime.ShowUpDown = true; - this.nightlyStartTime.Size = new System.Drawing.Size(82, 20); + this.nightlyStartTime.Size = new System.Drawing.Size(82, 26); this.nightlyStartTime.TabIndex = 31; this.nightlyStartTime.Value = new System.DateTime(2014, 1, 14, 18, 0, 0, 0); // @@ -2655,7 +2661,7 @@ private void InitializeComponent() this.nightlyBuildType.Location = new System.Drawing.Point(85, 69); this.nightlyBuildType.Name = "nightlyBuildType"; this.nightlyBuildType.ReadOnly = true; - this.nightlyBuildType.Size = new System.Drawing.Size(82, 20); + this.nightlyBuildType.Size = new System.Drawing.Size(82, 26); this.nightlyBuildType.TabIndex = 30; this.nightlyBuildType.Text = "32 bit"; this.nightlyBuildType.Wrap = true; @@ -2665,7 +2671,7 @@ private void InitializeComponent() this.label31.AutoSize = true; this.label31.Location = new System.Drawing.Point(170, 47); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(33, 13); + this.label31.Size = new System.Drawing.Size(49, 20); this.label31.TabIndex = 6; this.label31.Text = "hours"; // @@ -2674,7 +2680,7 @@ private void InitializeComponent() this.label35.AutoSize = true; this.label35.Location = new System.Drawing.Point(6, 71); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(31, 13); + this.label35.Size = new System.Drawing.Size(43, 20); this.label35.TabIndex = 29; this.label35.Text = "Type"; // @@ -2692,7 +2698,7 @@ private void InitializeComponent() 0, 0}); this.nightlyDuration.Name = "nightlyDuration"; - this.nightlyDuration.Size = new System.Drawing.Size(82, 20); + this.nightlyDuration.Size = new System.Drawing.Size(82, 26); this.nightlyDuration.TabIndex = 5; this.nightlyDuration.Value = new decimal(new int[] { 12, @@ -2705,7 +2711,7 @@ private void InitializeComponent() this.label30.AutoSize = true; this.label30.Location = new System.Drawing.Point(7, 47); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(47, 13); + this.label30.Size = new System.Drawing.Size(70, 20); this.label30.TabIndex = 4; this.label30.Text = "Duration"; // @@ -2714,7 +2720,7 @@ private void InitializeComponent() this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(7, 22); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(51, 13); + this.label32.Size = new System.Drawing.Size(78, 20); this.label32.TabIndex = 3; this.label32.Text = "Start time"; // @@ -2735,7 +2741,7 @@ private void InitializeComponent() // runNightly // this.runNightly.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runNightly.Location = new System.Drawing.Point(596, 649); + this.runNightly.Location = new System.Drawing.Point(596, 642); this.runNightly.Margin = new System.Windows.Forms.Padding(4); this.runNightly.Name = "runNightly"; this.runNightly.Size = new System.Drawing.Size(100, 28); @@ -2754,18 +2760,18 @@ private void InitializeComponent() this.tabOutput.Controls.Add(this.comboBoxOutput); this.tabOutput.Controls.Add(this.label19); this.tabOutput.Controls.Add(this.buttonStop); - this.tabOutput.Location = new System.Drawing.Point(4, 28); + this.tabOutput.Location = new System.Drawing.Point(4, 35); this.tabOutput.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabOutput.Name = "tabOutput"; this.tabOutput.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabOutput.Size = new System.Drawing.Size(709, 689); + this.tabOutput.Size = new System.Drawing.Size(709, 682); this.tabOutput.TabIndex = 5; this.tabOutput.Text = "Output"; // // buttonSelectFailedOutputTab // this.buttonSelectFailedOutputTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonSelectFailedOutputTab.Location = new System.Drawing.Point(16, 649); + this.buttonSelectFailedOutputTab.Location = new System.Drawing.Point(16, 642); this.buttonSelectFailedOutputTab.Margin = new System.Windows.Forms.Padding(0); this.buttonSelectFailedOutputTab.Name = "buttonSelectFailedOutputTab"; this.buttonSelectFailedOutputTab.Size = new System.Drawing.Size(152, 28); @@ -2782,7 +2788,7 @@ private void InitializeComponent() this.outputJumpTo.Location = new System.Drawing.Point(238, 52); this.outputJumpTo.Margin = new System.Windows.Forms.Padding(4); this.outputJumpTo.Name = "outputJumpTo"; - this.outputJumpTo.Size = new System.Drawing.Size(254, 21); + this.outputJumpTo.Size = new System.Drawing.Size(254, 28); this.outputJumpTo.TabIndex = 36; this.outputJumpTo.SelectedIndexChanged += new System.EventHandler(this.outputJumpTo_SelectedIndexChanged); this.outputJumpTo.Click += new System.EventHandler(this.outputJumpTo_Click); @@ -2805,8 +2811,8 @@ private void InitializeComponent() // outputSplitContainer.Panel2 // this.outputSplitContainer.Panel2.Controls.Add(this.errorConsole); - this.outputSplitContainer.Size = new System.Drawing.Size(671, 562); - this.outputSplitContainer.SplitterDistance = 338; + this.outputSplitContainer.Size = new System.Drawing.Size(671, 555); + this.outputSplitContainer.SplitterDistance = 325; this.outputSplitContainer.SplitterWidth = 10; this.outputSplitContainer.TabIndex = 35; // @@ -2828,7 +2834,7 @@ private void InitializeComponent() this.commandShell.NextCommand = 0; this.commandShell.RestartCount = 0; this.commandShell.RunStartTime = new System.DateTime(((long)(0))); - this.commandShell.Size = new System.Drawing.Size(671, 338); + this.commandShell.Size = new System.Drawing.Size(671, 325); this.commandShell.StopButton = null; this.commandShell.TabIndex = 2; this.commandShell.Text = ""; @@ -2846,7 +2852,7 @@ private void InitializeComponent() this.errorConsole.Margin = new System.Windows.Forms.Padding(0); this.errorConsole.Name = "errorConsole"; this.errorConsole.ReadOnly = true; - this.errorConsole.Size = new System.Drawing.Size(671, 214); + this.errorConsole.Size = new System.Drawing.Size(671, 220); this.errorConsole.TabIndex = 3; this.errorConsole.Text = ""; this.errorConsole.SelectionChanged += new System.EventHandler(this.errorConsole_SelectionChanged); @@ -2870,7 +2876,7 @@ private void InitializeComponent() this.comboBoxOutput.Location = new System.Drawing.Point(16, 52); this.comboBoxOutput.Margin = new System.Windows.Forms.Padding(4); this.comboBoxOutput.Name = "comboBoxOutput"; - this.comboBoxOutput.Size = new System.Drawing.Size(214, 21); + this.comboBoxOutput.Size = new System.Drawing.Size(214, 28); this.comboBoxOutput.TabIndex = 32; this.comboBoxOutput.SelectedIndexChanged += new System.EventHandler(this.comboBoxOutput_SelectedIndexChanged); // @@ -2891,7 +2897,7 @@ private void InitializeComponent() // this.buttonStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonStop.Enabled = false; - this.buttonStop.Location = new System.Drawing.Point(596, 649); + this.buttonStop.Location = new System.Drawing.Point(596, 642); this.buttonStop.Margin = new System.Windows.Forms.Padding(4); this.buttonStop.Name = "buttonStop"; this.buttonStop.Size = new System.Drawing.Size(100, 28); @@ -2909,9 +2915,9 @@ private void InitializeComponent() this.tabRunStats.Controls.Add(this.comboBoxRunStats); this.tabRunStats.Controls.Add(this.label1); this.tabRunStats.Controls.Add(this.dataGridRunStats); - this.tabRunStats.Location = new System.Drawing.Point(4, 28); + this.tabRunStats.Location = new System.Drawing.Point(4, 35); this.tabRunStats.Name = "tabRunStats"; - this.tabRunStats.Size = new System.Drawing.Size(709, 689); + this.tabRunStats.Size = new System.Drawing.Size(709, 682); this.tabRunStats.TabIndex = 8; this.tabRunStats.Text = "Run Stats"; // @@ -2932,7 +2938,7 @@ private void InitializeComponent() this.labelCompareTo.AutoSize = true; this.labelCompareTo.Location = new System.Drawing.Point(249, 51); this.labelCompareTo.Name = "labelCompareTo"; - this.labelCompareTo.Size = new System.Drawing.Size(60, 13); + this.labelCompareTo.Size = new System.Drawing.Size(89, 20); this.labelCompareTo.TabIndex = 35; this.labelCompareTo.Text = "compare to"; // @@ -2943,7 +2949,7 @@ private void InitializeComponent() this.comboBoxRunStatsCompare.Location = new System.Drawing.Point(326, 48); this.comboBoxRunStatsCompare.Margin = new System.Windows.Forms.Padding(4); this.comboBoxRunStatsCompare.Name = "comboBoxRunStatsCompare"; - this.comboBoxRunStatsCompare.Size = new System.Drawing.Size(214, 21); + this.comboBoxRunStatsCompare.Size = new System.Drawing.Size(214, 28); this.comboBoxRunStatsCompare.TabIndex = 34; this.comboBoxRunStatsCompare.SelectedIndexChanged += new System.EventHandler(this.comboBoxRunStats_SelectedIndexChanged); // @@ -2954,7 +2960,7 @@ private void InitializeComponent() this.comboBoxRunStats.Location = new System.Drawing.Point(13, 48); this.comboBoxRunStats.Margin = new System.Windows.Forms.Padding(4); this.comboBoxRunStats.Name = "comboBoxRunStats"; - this.comboBoxRunStats.Size = new System.Drawing.Size(214, 21); + this.comboBoxRunStats.Size = new System.Drawing.Size(214, 28); this.comboBoxRunStats.TabIndex = 33; this.comboBoxRunStats.SelectedIndexChanged += new System.EventHandler(this.comboBoxRunStats_SelectedIndexChanged); // @@ -2991,49 +2997,58 @@ private void InitializeComponent() this.dataGridRunStats.Name = "dataGridRunStats"; this.dataGridRunStats.ReadOnly = true; this.dataGridRunStats.RowHeadersVisible = false; + this.dataGridRunStats.RowHeadersWidth = 62; this.dataGridRunStats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridRunStats.Size = new System.Drawing.Size(685, 595); + this.dataGridRunStats.Size = new System.Drawing.Size(685, 588); this.dataGridRunStats.TabIndex = 0; this.dataGridRunStats.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.dataGridRunStats_SortCompare); // // TestName // this.TestName.HeaderText = "Test"; + this.TestName.MinimumWidth = 8; this.TestName.Name = "TestName"; this.TestName.ReadOnly = true; // // Iterations // this.Iterations.HeaderText = "Iterations"; + this.Iterations.MinimumWidth = 8; this.Iterations.Name = "Iterations"; this.Iterations.ReadOnly = true; // // Duration // this.Duration.HeaderText = "Total duration"; + this.Duration.MinimumWidth = 8; this.Duration.Name = "Duration"; this.Duration.ReadOnly = true; // // AverageDuration // this.AverageDuration.HeaderText = "Average duration"; + this.AverageDuration.MinimumWidth = 8; this.AverageDuration.Name = "AverageDuration"; this.AverageDuration.ReadOnly = true; // // RelDuration // this.RelDuration.HeaderText = "Relative duration"; + this.RelDuration.MinimumWidth = 8; this.RelDuration.Name = "RelDuration"; this.RelDuration.ReadOnly = true; // // DeltaTotalDuration // this.DeltaTotalDuration.HeaderText = "Delta total duration"; + this.DeltaTotalDuration.MinimumWidth = 8; this.DeltaTotalDuration.Name = "DeltaTotalDuration"; this.DeltaTotalDuration.ReadOnly = true; // // menuStrip1 // + this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.findToolStripMenuItem, @@ -3043,7 +3058,7 @@ private void InitializeComponent() this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(709, 24); + this.menuStrip1.Size = new System.Drawing.Size(709, 33); this.menuStrip1.TabIndex = 8; this.menuStrip1.Text = "menuStrip1"; // @@ -3057,45 +3072,45 @@ private void InitializeComponent() this.toolStripSeparator1, this.exitToolStripMenuItem2}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(54, 29); this.fileToolStripMenuItem.Text = "&File"; // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(284, 34); this.openToolStripMenuItem.Text = "&Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.open_Click); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(284, 34); this.saveToolStripMenuItem.Text = "Save &as..."; this.saveToolStripMenuItem.Click += new System.EventHandler(this.save_Click); // // exitToolStripMenuItem1 // this.exitToolStripMenuItem1.Name = "exitToolStripMenuItem1"; - this.exitToolStripMenuItem1.Size = new System.Drawing.Size(185, 6); + this.exitToolStripMenuItem1.Size = new System.Drawing.Size(281, 6); // // createInstallerZipFileToolStripMenuItem // this.createInstallerZipFileToolStripMenuItem.Name = "createInstallerZipFileToolStripMenuItem"; - this.createInstallerZipFileToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.createInstallerZipFileToolStripMenuItem.Size = new System.Drawing.Size(284, 34); this.createInstallerZipFileToolStripMenuItem.Text = "Save &zip file installer..."; this.createInstallerZipFileToolStripMenuItem.Click += new System.EventHandler(this.SaveZipFileInstaller); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(185, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(281, 6); // // exitToolStripMenuItem2 // this.exitToolStripMenuItem2.Name = "exitToolStripMenuItem2"; - this.exitToolStripMenuItem2.Size = new System.Drawing.Size(188, 22); + this.exitToolStripMenuItem2.Size = new System.Drawing.Size(284, 34); this.exitToolStripMenuItem2.Text = "E&xit"; this.exitToolStripMenuItem2.Click += new System.EventHandler(this.exit_Click); // @@ -3106,14 +3121,14 @@ private void InitializeComponent() this.findNextToolStripMenuItem}); this.findToolStripMenuItem.Name = "findToolStripMenuItem"; this.findToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findToolStripMenuItem.Size = new System.Drawing.Size(42, 20); + this.findToolStripMenuItem.Size = new System.Drawing.Size(62, 29); this.findToolStripMenuItem.Text = "Fi&nd"; // // findTestToolStripMenuItem // this.findTestToolStripMenuItem.Name = "findTestToolStripMenuItem"; this.findTestToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.findTestToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.findTestToolStripMenuItem.Size = new System.Drawing.Size(220, 34); this.findTestToolStripMenuItem.Text = "&Find..."; this.findTestToolStripMenuItem.Click += new System.EventHandler(this.findTestToolStripMenuItem_Click); // @@ -3121,7 +3136,7 @@ private void InitializeComponent() // this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findNextToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.findNextToolStripMenuItem.Size = new System.Drawing.Size(220, 34); this.findNextToolStripMenuItem.Text = "Find &Next"; this.findNextToolStripMenuItem.Click += new System.EventHandler(this.findNextToolStripMenuItem_Click); // @@ -3137,7 +3152,7 @@ private void InitializeComponent() this.zip32Bit, this.zip64Bit}); this.selectBuildMenuItem.Name = "selectBuildMenuItem"; - this.selectBuildMenuItem.Size = new System.Drawing.Size(80, 20); + this.selectBuildMenuItem.Size = new System.Drawing.Size(118, 29); this.selectBuildMenuItem.Text = "Select &Build"; this.selectBuildMenuItem.DropDownOpening += new System.EventHandler(this.selectBuildMenuOpening); // @@ -3145,7 +3160,7 @@ private void InitializeComponent() // this.bin32Bit.CheckOnClick = true; this.bin32Bit.Name = "bin32Bit"; - this.bin32Bit.Size = new System.Drawing.Size(153, 22); + this.bin32Bit.Size = new System.Drawing.Size(232, 34); this.bin32Bit.Text = "bin (32 bit)"; this.bin32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3153,7 +3168,7 @@ private void InitializeComponent() // this.bin64Bit.CheckOnClick = true; this.bin64Bit.Name = "bin64Bit"; - this.bin64Bit.Size = new System.Drawing.Size(153, 22); + this.bin64Bit.Size = new System.Drawing.Size(232, 34); this.bin64Bit.Text = "bin (64 bit)"; this.bin64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3161,7 +3176,7 @@ private void InitializeComponent() // this.build32Bit.CheckOnClick = true; this.build32Bit.Name = "build32Bit"; - this.build32Bit.Size = new System.Drawing.Size(153, 22); + this.build32Bit.Size = new System.Drawing.Size(232, 34); this.build32Bit.Text = "Build (32 bit)"; this.build32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3169,7 +3184,7 @@ private void InitializeComponent() // this.build64Bit.CheckOnClick = true; this.build64Bit.Name = "build64Bit"; - this.build64Bit.Size = new System.Drawing.Size(153, 22); + this.build64Bit.Size = new System.Drawing.Size(232, 34); this.build64Bit.Text = "Build (64 bit)"; this.build64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3177,7 +3192,7 @@ private void InitializeComponent() // this.nightly32Bit.CheckOnClick = true; this.nightly32Bit.Name = "nightly32Bit"; - this.nightly32Bit.Size = new System.Drawing.Size(153, 22); + this.nightly32Bit.Size = new System.Drawing.Size(232, 34); this.nightly32Bit.Text = "Nightly (32 bit)"; this.nightly32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3185,7 +3200,7 @@ private void InitializeComponent() // this.nightly64Bit.CheckOnClick = true; this.nightly64Bit.Name = "nightly64Bit"; - this.nightly64Bit.Size = new System.Drawing.Size(153, 22); + this.nightly64Bit.Size = new System.Drawing.Size(232, 34); this.nightly64Bit.Text = "Nightly (64 bit)"; this.nightly64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3193,7 +3208,7 @@ private void InitializeComponent() // this.zip32Bit.CheckOnClick = true; this.zip32Bit.Name = "zip32Bit"; - this.zip32Bit.Size = new System.Drawing.Size(153, 22); + this.zip32Bit.Size = new System.Drawing.Size(232, 34); this.zip32Bit.Text = "zip (32 bit)"; this.zip32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3201,7 +3216,7 @@ private void InitializeComponent() // this.zip64Bit.CheckOnClick = true; this.zip64Bit.Name = "zip64Bit"; - this.zip64Bit.Size = new System.Drawing.Size(153, 22); + this.zip64Bit.Size = new System.Drawing.Size(232, 34); this.zip64Bit.Text = "zip (64 bit)"; this.zip64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3210,14 +3225,14 @@ private void InitializeComponent() this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.accessInternet}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(92, 29); this.optionsToolStripMenuItem.Text = "&Options"; // // accessInternet // this.accessInternet.CheckOnClick = true; this.accessInternet.Name = "accessInternet"; - this.accessInternet.Size = new System.Drawing.Size(154, 22); + this.accessInternet.Size = new System.Drawing.Size(233, 34); this.accessInternet.Text = "&Access Internet"; // // helpToolStripMenuItem @@ -3226,20 +3241,20 @@ private void InitializeComponent() this.documentationToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(65, 29); this.helpToolStripMenuItem.Text = "&Help"; // // documentationToolStripMenuItem // this.documentationToolStripMenuItem.Name = "documentationToolStripMenuItem"; - this.documentationToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.documentationToolStripMenuItem.Size = new System.Drawing.Size(249, 34); this.documentationToolStripMenuItem.Text = "&Documentation..."; this.documentationToolStripMenuItem.Click += new System.EventHandler(this.documentationToolStripMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(249, 34); this.aboutToolStripMenuItem.Text = "&About..."; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.about_Click); // @@ -3269,7 +3284,7 @@ private void InitializeComponent() // this.textBox1.Location = new System.Drawing.Point(76, 19); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(32, 20); + this.textBox1.Size = new System.Drawing.Size(32, 26); this.textBox1.TabIndex = 4; // // label4 diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx index 3188a56e87..79f06e0f8a 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx @@ -120,15 +120,6 @@ 281, 17 - - 517, 17 - - - 17, 17 - - - 397, 17 - 397, 17 @@ -136,7 +127,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -157,15 +148,6 @@ True - - True - - - True - - - True - 517, 17 @@ -187,23 +169,8 @@ True - - True - - - True - - - True - - - True - - - True - - - True + + 17, 17 25 diff --git a/pwiz_tools/Skyline/SkylineTester/TabTests.cs b/pwiz_tools/Skyline/SkylineTester/TabTests.cs index 535c5dee46..20d5f2af27 100644 --- a/pwiz_tools/Skyline/SkylineTester/TabTests.cs +++ b/pwiz_tools/Skyline/SkylineTester/TabTests.cs @@ -72,6 +72,8 @@ public override bool Run() args.Append(" pause=-1"); // Magic number that tells TestRunner to pause and show UI for a manual screenshot if (Equals(MainWindow.RunTestMode.SelectedItem.ToString(), "Covershot")) args.Append(" pause=-2"); // Magic number that tells TestRunner to grab tutorial cover shot then move on to next test + if (Equals(MainWindow.RunTestMode.SelectedItem.ToString(), "Auto-Screenshots")) + args.Append(" pause=-3"); // Magic number that tells TestRunner to save the screenshot to the tutorials folder if (MainWindow.TestsRunSmallMoleculeVersions.Checked) args.Append(" runsmallmoleculeversions=on"); diff --git a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs index adc42bf8d5..379a4c926b 100644 --- a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs +++ b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs @@ -1224,6 +1224,21 @@ public bool IsCoverShotMode } } + private static bool _isAutoScreenShotMode; + + public bool IsAutoScreenShotMode + { + get { return _isAutoScreenShotMode || Program.PauseSeconds == -3; } // -3 is the magic number SkylineTester uses to indicate cover shot mode + set + { + _isAutoScreenShotMode = value; + if (_isAutoScreenShotMode) + { + Program.PauseSeconds = -3; // -3 is the magic number SkylineTester uses to indicate cover shot mode + } + } + } + public string CoverShotName { get; set; } private string GetCoverShotPath(string folderPath = null, string suffix = null) @@ -1323,7 +1338,7 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, Thread.Sleep(3 * 1000); else if (Program.PauseSeconds > 0) Thread.Sleep(Program.PauseSeconds * 1000); - else if (IsPauseForScreenShots && Math.Max(PauseStartingPage, Program.PauseStartingPage) <= (pageNum ?? int.MaxValue)) + else if ((IsPauseForScreenShots && Math.Max(PauseStartingPage, Program.PauseStartingPage) <= (pageNum ?? int.MaxValue)) || IsAutoScreenShotMode) { if (screenshotForm == null) { @@ -1341,9 +1356,21 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, var formSeen = new FormSeen(); formSeen.Saw(formType); - bool showMatchingPages = IsShowMatchingTutorialPages || Program.ShowMatchingPages; + var fileToSave = !String.IsNullOrEmpty(fileName) && !String.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, fileName)}.png" : null; - PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager); + + if (IsAutoScreenShotMode) + { + Thread.Sleep(1000); + screenshotForm.Focus(); + _shotManager.TakeNextShot(screenshotForm, fileToSave); + } + else + { + bool showMatchingPages = IsShowMatchingTutorialPages || Program.ShowMatchingPages; + PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager); + } + } else { From d27d2513d55858ba950934eacc42ca9856b95c5d Mon Sep 17 00:00:00 2001 From: Eduardo Date: Thu, 19 Sep 2024 13:23:15 -0700 Subject: [PATCH 4/8] Undo massive changes in form editing --- .../SkylineTesterWindow.Designer.cs | 438 +++++++++--------- .../SkylineTester/SkylineTesterWindow.resx | 39 +- 2 files changed, 248 insertions(+), 229 deletions(-) diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs index 6bc071d1f1..2fcc4accb3 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs @@ -69,7 +69,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SkylineTesterWindow)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.mainPanel = new System.Windows.Forms.Panel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -386,15 +386,14 @@ private void InitializeComponent() // // statusStrip1 // - this.statusStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel, this.selectedBuild, this.statusRunTime}); - this.statusStrip1.Location = new System.Drawing.Point(0, 735); + this.statusStrip1.Location = new System.Drawing.Point(0, 745); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 13, 0); - this.statusStrip1.Size = new System.Drawing.Size(709, 32); + this.statusStrip1.Size = new System.Drawing.Size(709, 22); this.statusStrip1.TabIndex = 23; this.statusStrip1.Text = "statusStrip1"; // @@ -403,7 +402,7 @@ private void InitializeComponent() this.statusLabel.BackColor = System.Drawing.Color.Transparent; this.statusLabel.ForeColor = System.Drawing.SystemColors.GrayText; this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(59, 25); + this.statusLabel.Size = new System.Drawing.Size(38, 17); this.statusLabel.Text = "status"; // // selectedBuild @@ -411,7 +410,7 @@ private void InitializeComponent() this.selectedBuild.BackColor = System.Drawing.Color.Transparent; this.selectedBuild.ForeColor = System.Drawing.SystemColors.GrayText; this.selectedBuild.Name = "selectedBuild"; - this.selectedBuild.Size = new System.Drawing.Size(560, 25); + this.selectedBuild.Size = new System.Drawing.Size(608, 17); this.selectedBuild.Spring = true; this.selectedBuild.Text = "selected build"; // @@ -421,7 +420,7 @@ private void InitializeComponent() this.statusRunTime.ForeColor = System.Drawing.SystemColors.GrayText; this.statusRunTime.Margin = new System.Windows.Forms.Padding(0, 3, 6, 2); this.statusRunTime.Name = "statusRunTime"; - this.statusRunTime.Size = new System.Drawing.Size(70, 27); + this.statusRunTime.Size = new System.Drawing.Size(43, 17); this.statusRunTime.Text = "0:00:00"; this.statusRunTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // @@ -456,11 +455,11 @@ private void InitializeComponent() this.tabForms.Controls.Add(this.groupBox13); this.tabForms.Controls.Add(this.runForms); this.tabForms.Controls.Add(this.groupBox1); - this.tabForms.Location = new System.Drawing.Point(4, 35); + this.tabForms.Location = new System.Drawing.Point(4, 28); this.tabForms.Margin = new System.Windows.Forms.Padding(4); this.tabForms.Name = "tabForms"; this.tabForms.Padding = new System.Windows.Forms.Padding(4); - this.tabForms.Size = new System.Drawing.Size(709, 682); + this.tabForms.Size = new System.Drawing.Size(709, 689); this.tabForms.TabIndex = 1; this.tabForms.Text = "Forms"; // @@ -469,7 +468,7 @@ private void InitializeComponent() this.showChangedFiles.AutoSize = true; this.showChangedFiles.Location = new System.Drawing.Point(16, 235); this.showChangedFiles.Name = "showChangedFiles"; - this.showChangedFiles.Size = new System.Drawing.Size(185, 24); + this.showChangedFiles.Size = new System.Drawing.Size(126, 17); this.showChangedFiles.TabIndex = 5; this.showChangedFiles.Text = "Show changed forms"; this.showChangedFiles.UseVisualStyleBackColor = true; @@ -496,7 +495,7 @@ private void InitializeComponent() this.showFormNames.Location = new System.Drawing.Point(8, 21); this.showFormNames.Margin = new System.Windows.Forms.Padding(4); this.showFormNames.Name = "showFormNames"; - this.showFormNames.Size = new System.Drawing.Size(163, 24); + this.showFormNames.Size = new System.Drawing.Size(110, 17); this.showFormNames.TabIndex = 0; this.showFormNames.Text = "Show form names"; this.showFormNames.UseVisualStyleBackColor = true; @@ -550,7 +549,7 @@ private void InitializeComponent() this.formsLanguageDiff.Location = new System.Drawing.Point(8, 66); this.formsLanguageDiff.Margin = new System.Windows.Forms.Padding(4); this.formsLanguageDiff.Name = "formsLanguageDiff"; - this.formsLanguageDiff.Size = new System.Drawing.Size(185, 28); + this.formsLanguageDiff.Size = new System.Drawing.Size(185, 21); this.formsLanguageDiff.TabIndex = 1; this.formsLanguageDiff.SelectedIndexChanged += new System.EventHandler(this.formsLanguageDiff_SelectedIndexChanged); // @@ -559,7 +558,7 @@ private void InitializeComponent() this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(5, 49); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(70, 20); + this.label20.Size = new System.Drawing.Size(46, 13); this.label20.TabIndex = 1; this.label20.Text = "Diff from"; // @@ -572,14 +571,14 @@ private void InitializeComponent() this.formsLanguage.Location = new System.Drawing.Point(8, 21); this.formsLanguage.Margin = new System.Windows.Forms.Padding(4); this.formsLanguage.Name = "formsLanguage"; - this.formsLanguage.Size = new System.Drawing.Size(185, 28); + this.formsLanguage.Size = new System.Drawing.Size(185, 21); this.formsLanguage.TabIndex = 0; this.formsLanguage.SelectedIndexChanged += new System.EventHandler(this.formsLanguage_SelectedIndexChanged); // // runForms // this.runForms.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runForms.Location = new System.Drawing.Point(596, 642); + this.runForms.Location = new System.Drawing.Point(596, 649); this.runForms.Margin = new System.Windows.Forms.Padding(4); this.runForms.Name = "runForms"; this.runForms.Size = new System.Drawing.Size(100, 28); @@ -599,7 +598,7 @@ private void InitializeComponent() this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(402, 584); + this.groupBox1.Size = new System.Drawing.Size(402, 591); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Forms"; @@ -612,7 +611,6 @@ private void InitializeComponent() this.toolStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(200)))), ((int)(((byte)(190))))); this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.labelSelectedFormsCount, this.clearSeenButton, @@ -627,7 +625,7 @@ private void InitializeComponent() // this.labelSelectedFormsCount.Margin = new System.Windows.Forms.Padding(8, 1, 0, 2); this.labelSelectedFormsCount.Name = "labelSelectedFormsCount"; - this.labelSelectedFormsCount.Size = new System.Drawing.Size(91, 22); + this.labelSelectedFormsCount.Size = new System.Drawing.Size(59, 22); this.labelSelectedFormsCount.Text = "0 selected"; // // clearSeenButton @@ -638,7 +636,7 @@ private void InitializeComponent() this.clearSeenButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.clearSeenButton.Name = "clearSeenButton"; this.clearSeenButton.Padding = new System.Windows.Forms.Padding(0, 0, 6, 0); - this.clearSeenButton.Size = new System.Drawing.Size(102, 20); + this.clearSeenButton.Size = new System.Drawing.Size(71, 22); this.clearSeenButton.Text = "Clear seen"; this.clearSeenButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.clearSeenButton.Click += new System.EventHandler(this.clearSeenButton_Click); @@ -647,7 +645,7 @@ private void InitializeComponent() // this.labelFormsSeenPercent.Margin = new System.Windows.Forms.Padding(80, 1, 0, 2); this.labelFormsSeenPercent.Name = "labelFormsSeenPercent"; - this.labelFormsSeenPercent.Size = new System.Drawing.Size(167, 25); + this.labelFormsSeenPercent.Size = new System.Drawing.Size(107, 22); this.labelFormsSeenPercent.Text = "0% of 0 forms seen"; this.labelFormsSeenPercent.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -665,9 +663,8 @@ private void InitializeComponent() this.SeenColumn}); this.formsGrid.Location = new System.Drawing.Point(8, 49); this.formsGrid.Name = "formsGrid"; - this.formsGrid.RowHeadersWidth = 62; this.formsGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.formsGrid.Size = new System.Drawing.Size(387, 528); + this.formsGrid.Size = new System.Drawing.Size(387, 535); this.formsGrid.TabIndex = 1; this.formsGrid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.formsGrid_CellContentClick); this.formsGrid.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.formsGrid_CellEndEdit); @@ -677,7 +674,6 @@ private void InitializeComponent() // this.FormColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.FormColumn.HeaderText = "Form"; - this.FormColumn.MinimumWidth = 8; this.FormColumn.Name = "FormColumn"; this.FormColumn.ReadOnly = true; this.FormColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; @@ -686,7 +682,6 @@ private void InitializeComponent() // this.TestColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.TestColumn.HeaderText = "Test"; - this.TestColumn.MinimumWidth = 8; this.TestColumn.Name = "TestColumn"; this.TestColumn.ReadOnly = true; this.TestColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -695,15 +690,15 @@ private void InitializeComponent() // SeenColumn // this.SeenColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle1.Format = "N0"; - dataGridViewCellStyle1.NullValue = null; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.SeenColumn.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + this.SeenColumn.DefaultCellStyle = dataGridViewCellStyle2; this.SeenColumn.HeaderText = "Seen"; this.SeenColumn.MinimumWidth = 40; this.SeenColumn.Name = "SeenColumn"; - this.SeenColumn.Width = 83; + this.SeenColumn.Width = 57; // // tabTutorials // @@ -714,11 +709,11 @@ private void InitializeComponent() this.tabTutorials.Controls.Add(this.groupBox3); this.tabTutorials.Controls.Add(this.groupBox4); this.tabTutorials.Controls.Add(this.runTutorials); - this.tabTutorials.Location = new System.Drawing.Point(4, 35); + this.tabTutorials.Location = new System.Drawing.Point(4, 28); this.tabTutorials.Margin = new System.Windows.Forms.Padding(4); this.tabTutorials.Name = "tabTutorials"; this.tabTutorials.Padding = new System.Windows.Forms.Padding(4); - this.tabTutorials.Size = new System.Drawing.Size(709, 682); + this.tabTutorials.Size = new System.Drawing.Size(709, 689); this.tabTutorials.TabIndex = 2; this.tabTutorials.Text = "Tutorials"; // @@ -741,7 +736,7 @@ private void InitializeComponent() this.showMatchingPagesTutorial.AutoSize = true; this.showMatchingPagesTutorial.Location = new System.Drawing.Point(8, 45); this.showMatchingPagesTutorial.Name = "showMatchingPagesTutorial"; - this.showMatchingPagesTutorial.Size = new System.Drawing.Size(236, 24); + this.showMatchingPagesTutorial.Size = new System.Drawing.Size(160, 17); this.showMatchingPagesTutorial.TabIndex = 6; this.showMatchingPagesTutorial.Text = "Show matching tutorial page"; this.showMatchingPagesTutorial.UseVisualStyleBackColor = true; @@ -752,7 +747,7 @@ private void InitializeComponent() this.showFormNamesTutorial.Location = new System.Drawing.Point(8, 21); this.showFormNamesTutorial.Margin = new System.Windows.Forms.Padding(4); this.showFormNamesTutorial.Name = "showFormNamesTutorial"; - this.showFormNamesTutorial.Size = new System.Drawing.Size(163, 24); + this.showFormNamesTutorial.Size = new System.Drawing.Size(110, 17); this.showFormNamesTutorial.TabIndex = 0; this.showFormNamesTutorial.Text = "Show form names"; this.showFormNamesTutorial.UseVisualStyleBackColor = true; @@ -792,7 +787,7 @@ private void InitializeComponent() this.tutorialsLanguage.Location = new System.Drawing.Point(8, 21); this.tutorialsLanguage.Margin = new System.Windows.Forms.Padding(4); this.tutorialsLanguage.Name = "tutorialsLanguage"; - this.tutorialsLanguage.Size = new System.Drawing.Size(185, 28); + this.tutorialsLanguage.Size = new System.Drawing.Size(185, 21); this.tutorialsLanguage.TabIndex = 0; // // groupBox3 @@ -805,7 +800,7 @@ private void InitializeComponent() this.groupBox3.Margin = new System.Windows.Forms.Padding(4); this.groupBox3.Name = "groupBox3"; this.groupBox3.Padding = new System.Windows.Forms.Padding(4); - this.groupBox3.Size = new System.Drawing.Size(402, 584); + this.groupBox3.Size = new System.Drawing.Size(402, 591); this.groupBox3.TabIndex = 0; this.groupBox3.TabStop = false; this.groupBox3.Text = "Tutorials"; @@ -819,7 +814,7 @@ private void InitializeComponent() this.tutorialsTree.Location = new System.Drawing.Point(8, 23); this.tutorialsTree.Margin = new System.Windows.Forms.Padding(4); this.tutorialsTree.Name = "tutorialsTree"; - this.tutorialsTree.Size = new System.Drawing.Size(384, 552); + this.tutorialsTree.Size = new System.Drawing.Size(384, 559); this.tutorialsTree.TabIndex = 0; this.tutorialsTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.node_AfterCheck); // @@ -846,7 +841,7 @@ private void InitializeComponent() // this.pauseStartingPage.Location = new System.Drawing.Point(99, 45); this.pauseStartingPage.Name = "pauseStartingPage"; - this.pauseStartingPage.Size = new System.Drawing.Size(41, 26); + this.pauseStartingPage.Size = new System.Drawing.Size(41, 20); this.pauseStartingPage.TabIndex = 2; this.pauseStartingPage.Text = "1"; // @@ -855,7 +850,7 @@ private void InitializeComponent() this.labelPauseStartingPage.AutoSize = true; this.labelPauseStartingPage.Location = new System.Drawing.Point(25, 48); this.labelPauseStartingPage.Name = "labelPauseStartingPage"; - this.labelPauseStartingPage.Size = new System.Drawing.Size(109, 20); + this.labelPauseStartingPage.Size = new System.Drawing.Size(73, 13); this.labelPauseStartingPage.TabIndex = 1; this.labelPauseStartingPage.Text = "Starting page:"; // @@ -865,7 +860,7 @@ private void InitializeComponent() this.modeTutorialsCoverShots.Location = new System.Drawing.Point(7, 131); this.modeTutorialsCoverShots.Margin = new System.Windows.Forms.Padding(4); this.modeTutorialsCoverShots.Name = "modeTutorialsCoverShots"; - this.modeTutorialsCoverShots.Size = new System.Drawing.Size(162, 24); + this.modeTutorialsCoverShots.Size = new System.Drawing.Size(110, 17); this.modeTutorialsCoverShots.TabIndex = 7; this.modeTutorialsCoverShots.Text = "Cover shots mode"; this.toolTip1.SetToolTip(this.modeTutorialsCoverShots, "Runs the tutorial until cover shot is reached, saves the image, then exits"); @@ -875,7 +870,7 @@ private void InitializeComponent() // this.pauseTutorialsSeconds.Location = new System.Drawing.Point(99, 82); this.pauseTutorialsSeconds.Name = "pauseTutorialsSeconds"; - this.pauseTutorialsSeconds.Size = new System.Drawing.Size(41, 26); + this.pauseTutorialsSeconds.Size = new System.Drawing.Size(41, 20); this.pauseTutorialsSeconds.TabIndex = 4; // // tutorialsDemoMode @@ -884,7 +879,7 @@ private void InitializeComponent() this.tutorialsDemoMode.Location = new System.Drawing.Point(7, 106); this.tutorialsDemoMode.Margin = new System.Windows.Forms.Padding(4); this.tutorialsDemoMode.Name = "tutorialsDemoMode"; - this.tutorialsDemoMode.Size = new System.Drawing.Size(216, 24); + this.tutorialsDemoMode.Size = new System.Drawing.Size(145, 17); this.tutorialsDemoMode.TabIndex = 6; this.tutorialsDemoMode.Text = "Demo mode (deprecated)"; this.toolTip1.SetToolTip(this.tutorialsDemoMode, "Use the Tests tab\'s \'Tutorials only\', \'Mode\', and \'Run indefinitely\' settings for" + @@ -897,7 +892,7 @@ private void InitializeComponent() this.label5.Location = new System.Drawing.Point(147, 84); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(69, 20); + this.label5.Size = new System.Drawing.Size(47, 13); this.label5.TabIndex = 5; this.label5.Text = "seconds"; // @@ -907,7 +902,7 @@ private void InitializeComponent() this.pauseTutorialsDelay.Location = new System.Drawing.Point(7, 82); this.pauseTutorialsDelay.Margin = new System.Windows.Forms.Padding(4); this.pauseTutorialsDelay.Name = "pauseTutorialsDelay"; - this.pauseTutorialsDelay.Size = new System.Drawing.Size(102, 24); + this.pauseTutorialsDelay.Size = new System.Drawing.Size(70, 17); this.pauseTutorialsDelay.TabIndex = 3; this.pauseTutorialsDelay.Text = "Pause for"; this.pauseTutorialsDelay.UseVisualStyleBackColor = true; @@ -919,7 +914,7 @@ private void InitializeComponent() this.pauseTutorialsScreenShots.Location = new System.Drawing.Point(7, 23); this.pauseTutorialsScreenShots.Margin = new System.Windows.Forms.Padding(4); this.pauseTutorialsScreenShots.Name = "pauseTutorialsScreenShots"; - this.pauseTutorialsScreenShots.Size = new System.Drawing.Size(197, 24); + this.pauseTutorialsScreenShots.Size = new System.Drawing.Size(133, 17); this.pauseTutorialsScreenShots.TabIndex = 0; this.pauseTutorialsScreenShots.TabStop = true; this.pauseTutorialsScreenShots.Text = "Pause for screen shots"; @@ -930,7 +925,7 @@ private void InitializeComponent() // runTutorials // this.runTutorials.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runTutorials.Location = new System.Drawing.Point(596, 642); + this.runTutorials.Location = new System.Drawing.Point(596, 649); this.runTutorials.Margin = new System.Windows.Forms.Padding(4); this.runTutorials.Name = "runTutorials"; this.runTutorials.Size = new System.Drawing.Size(100, 28); @@ -950,11 +945,11 @@ private void InitializeComponent() this.tabTests.Controls.Add(this.windowsGroup); this.tabTests.Controls.Add(this.iterationsGroup); this.tabTests.Controls.Add(this.testsGroup); - this.tabTests.Location = new System.Drawing.Point(4, 35); + this.tabTests.Location = new System.Drawing.Point(4, 28); this.tabTests.Margin = new System.Windows.Forms.Padding(4); this.tabTests.Name = "tabTests"; this.tabTests.Padding = new System.Windows.Forms.Padding(4); - this.tabTests.Size = new System.Drawing.Size(709, 682); + this.tabTests.Size = new System.Drawing.Size(709, 689); this.tabTests.TabIndex = 0; this.tabTests.Text = "Tests"; // @@ -980,7 +975,7 @@ private void InitializeComponent() 0, 0}); this.parallelWorkerCount.Name = "parallelWorkerCount"; - this.parallelWorkerCount.Size = new System.Drawing.Size(41, 26); + this.parallelWorkerCount.Size = new System.Drawing.Size(41, 20); this.parallelWorkerCount.TabIndex = 12; this.parallelWorkerCount.Value = new decimal(new int[] { 2, @@ -995,7 +990,7 @@ private void InitializeComponent() this.runParallel.Location = new System.Drawing.Point(26, 20); this.runParallel.Margin = new System.Windows.Forms.Padding(4); this.runParallel.Name = "runParallel"; - this.runParallel.Size = new System.Drawing.Size(173, 24); + this.runParallel.Size = new System.Drawing.Size(117, 17); this.runParallel.TabIndex = 11; this.runParallel.TabStop = true; this.runParallel.Text = "Run tests in parallel"; @@ -1007,7 +1002,7 @@ private void InitializeComponent() this.label22.Location = new System.Drawing.Point(198, 24); this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(64, 20); + this.label22.Size = new System.Drawing.Size(44, 13); this.label22.TabIndex = 13; this.label22.Text = "workers"; // @@ -1017,7 +1012,7 @@ private void InitializeComponent() this.runSerial.Location = new System.Drawing.Point(26, 45); this.runSerial.Margin = new System.Windows.Forms.Padding(4); this.runSerial.Name = "runSerial"; - this.runSerial.Size = new System.Drawing.Size(154, 24); + this.runSerial.Size = new System.Drawing.Size(104, 17); this.runSerial.TabIndex = 14; this.runSerial.Text = "Run tests serially"; this.runSerial.UseVisualStyleBackColor = true; @@ -1026,7 +1021,7 @@ private void InitializeComponent() // runTests // this.runTests.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runTests.Location = new System.Drawing.Point(596, 642); + this.runTests.Location = new System.Drawing.Point(596, 649); this.runTests.Margin = new System.Windows.Forms.Padding(4); this.runTests.Name = "runTests"; this.runTests.Size = new System.Drawing.Size(100, 28); @@ -1039,7 +1034,7 @@ private void InitializeComponent() // buttonSelectFailedTestsTab // this.buttonSelectFailedTestsTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonSelectFailedTestsTab.Location = new System.Drawing.Point(16, 639); + this.buttonSelectFailedTestsTab.Location = new System.Drawing.Point(16, 646); this.buttonSelectFailedTestsTab.Margin = new System.Windows.Forms.Padding(0); this.buttonSelectFailedTestsTab.Name = "buttonSelectFailedTestsTab"; this.buttonSelectFailedTestsTab.Size = new System.Drawing.Size(152, 28); @@ -1084,7 +1079,7 @@ private void InitializeComponent() this.testsTurkish.Location = new System.Drawing.Point(8, 135); this.testsTurkish.Margin = new System.Windows.Forms.Padding(4); this.testsTurkish.Name = "testsTurkish"; - this.testsTurkish.Size = new System.Drawing.Size(86, 24); + this.testsTurkish.Size = new System.Drawing.Size(61, 17); this.testsTurkish.TabIndex = 4; this.testsTurkish.Text = "Turkish"; this.testsTurkish.UseVisualStyleBackColor = true; @@ -1095,7 +1090,7 @@ private void InitializeComponent() this.testsFrench.Location = new System.Drawing.Point(8, 79); this.testsFrench.Margin = new System.Windows.Forms.Padding(4); this.testsFrench.Name = "testsFrench"; - this.testsFrench.Size = new System.Drawing.Size(85, 24); + this.testsFrench.Size = new System.Drawing.Size(59, 17); this.testsFrench.TabIndex = 2; this.testsFrench.Text = "French"; this.testsFrench.UseVisualStyleBackColor = true; @@ -1106,7 +1101,7 @@ private void InitializeComponent() this.testsJapanese.Location = new System.Drawing.Point(8, 107); this.testsJapanese.Margin = new System.Windows.Forms.Padding(4); this.testsJapanese.Name = "testsJapanese"; - this.testsJapanese.Size = new System.Drawing.Size(105, 24); + this.testsJapanese.Size = new System.Drawing.Size(72, 17); this.testsJapanese.TabIndex = 3; this.testsJapanese.Text = "Japanese"; this.testsJapanese.UseVisualStyleBackColor = true; @@ -1117,7 +1112,7 @@ private void InitializeComponent() this.testsChinese.Location = new System.Drawing.Point(9, 51); this.testsChinese.Margin = new System.Windows.Forms.Padding(4); this.testsChinese.Name = "testsChinese"; - this.testsChinese.Size = new System.Drawing.Size(93, 24); + this.testsChinese.Size = new System.Drawing.Size(64, 17); this.testsChinese.TabIndex = 1; this.testsChinese.Text = "Chinese"; this.testsChinese.UseVisualStyleBackColor = true; @@ -1130,7 +1125,7 @@ private void InitializeComponent() this.testsEnglish.Location = new System.Drawing.Point(9, 23); this.testsEnglish.Margin = new System.Windows.Forms.Padding(4); this.testsEnglish.Name = "testsEnglish"; - this.testsEnglish.Size = new System.Drawing.Size(87, 24); + this.testsEnglish.Size = new System.Drawing.Size(60, 17); this.testsEnglish.TabIndex = 0; this.testsEnglish.Text = "English"; this.testsEnglish.UseVisualStyleBackColor = true; @@ -1153,7 +1148,7 @@ private void InitializeComponent() this.labelParallelOffscreenHint.AutoSize = true; this.labelParallelOffscreenHint.Location = new System.Drawing.Point(9, 44); this.labelParallelOffscreenHint.Name = "labelParallelOffscreenHint"; - this.labelParallelOffscreenHint.Size = new System.Drawing.Size(260, 20); + this.labelParallelOffscreenHint.Size = new System.Drawing.Size(174, 13); this.labelParallelOffscreenHint.TabIndex = 1; this.labelParallelOffscreenHint.Text = "Tests run offscreen in parallel mode"; // @@ -1163,7 +1158,7 @@ private void InitializeComponent() this.offscreen.Location = new System.Drawing.Point(8, 23); this.offscreen.Margin = new System.Windows.Forms.Padding(4); this.offscreen.Name = "offscreen"; - this.offscreen.Size = new System.Drawing.Size(109, 24); + this.offscreen.Size = new System.Drawing.Size(75, 17); this.offscreen.TabIndex = 0; this.offscreen.Text = "Off screen"; this.offscreen.UseVisualStyleBackColor = true; @@ -1195,7 +1190,7 @@ private void InitializeComponent() this.coverageCheckbox.AutoSize = true; this.coverageCheckbox.Location = new System.Drawing.Point(8, 178); this.coverageCheckbox.Name = "coverageCheckbox"; - this.coverageCheckbox.Size = new System.Drawing.Size(193, 24); + this.coverageCheckbox.Size = new System.Drawing.Size(132, 17); this.coverageCheckbox.TabIndex = 11; this.coverageCheckbox.Text = "Run dotCover analysis"; this.toolTip1.SetToolTip(this.coverageCheckbox, "Generate a dotCover coverage snapshot and HTML report. Coverage only works with p" + @@ -1208,7 +1203,7 @@ private void InitializeComponent() this.recordAuditLogs.AutoSize = true; this.recordAuditLogs.Location = new System.Drawing.Point(8, 133); this.recordAuditLogs.Name = "recordAuditLogs"; - this.recordAuditLogs.Size = new System.Drawing.Size(244, 24); + this.recordAuditLogs.Size = new System.Drawing.Size(166, 17); this.recordAuditLogs.TabIndex = 10; this.recordAuditLogs.Text = "Record new tutorial audit logs"; this.toolTip1.SetToolTip(this.recordAuditLogs, "Create new or updated audit logs for tutorial tests"); @@ -1221,7 +1216,7 @@ private void InitializeComponent() this.testsRunSmallMoleculeVersions.CheckState = System.Windows.Forms.CheckState.Checked; this.testsRunSmallMoleculeVersions.Location = new System.Drawing.Point(8, 156); this.testsRunSmallMoleculeVersions.Name = "testsRunSmallMoleculeVersions"; - this.testsRunSmallMoleculeVersions.Size = new System.Drawing.Size(265, 24); + this.testsRunSmallMoleculeVersions.Size = new System.Drawing.Size(179, 17); this.testsRunSmallMoleculeVersions.TabIndex = 9; this.testsRunSmallMoleculeVersions.Text = "Run small molecule test versions"; this.toolTip1.SetToolTip(this.testsRunSmallMoleculeVersions, "Include small molecule versions of test when available"); @@ -1232,7 +1227,7 @@ private void InitializeComponent() this.randomize.AutoSize = true; this.randomize.Location = new System.Drawing.Point(8, 112); this.randomize.Name = "randomize"; - this.randomize.Size = new System.Drawing.Size(188, 24); + this.randomize.Size = new System.Drawing.Size(126, 17); this.randomize.TabIndex = 7; this.randomize.Text = "Randomize test order"; this.randomize.UseVisualStyleBackColor = true; @@ -1250,7 +1245,7 @@ private void InitializeComponent() "100"}); this.repeat.Location = new System.Drawing.Point(83, 75); this.repeat.Name = "repeat"; - this.repeat.Size = new System.Drawing.Size(52, 28); + this.repeat.Size = new System.Drawing.Size(52, 21); this.repeat.TabIndex = 5; this.toolTip1.SetToolTip(this.repeat, "Stress each test by running it multiple times before proceeding to next test. Pe" + "rf tests only run once."); @@ -1260,7 +1255,7 @@ private void InitializeComponent() this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(141, 78); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(180, 20); + this.label6.Size = new System.Drawing.Size(120, 13); this.label6.TabIndex = 6; this.label6.Text = "time(s) in a row per pass"; // @@ -1269,7 +1264,7 @@ private void InitializeComponent() this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(3, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(109, 20); + this.label3.Size = new System.Drawing.Size(74, 13); this.label3.TabIndex = 4; this.label3.Text = "Run each test"; // @@ -1282,7 +1277,7 @@ private void InitializeComponent() 0, 0}); this.runLoopsCount.Name = "runLoopsCount"; - this.runLoopsCount.Size = new System.Drawing.Size(41, 26); + this.runLoopsCount.Size = new System.Drawing.Size(41, 20); this.runLoopsCount.TabIndex = 1; this.runLoopsCount.Value = new decimal(new int[] { 1, @@ -1296,7 +1291,7 @@ private void InitializeComponent() this.label2.Location = new System.Drawing.Point(111, 26); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(60, 20); + this.label2.Size = new System.Drawing.Size(40, 13); this.label2.TabIndex = 2; this.label2.Text = "passes"; // @@ -1307,7 +1302,7 @@ private void InitializeComponent() this.runLoops.Location = new System.Drawing.Point(8, 23); this.runLoops.Margin = new System.Windows.Forms.Padding(4); this.runLoops.Name = "runLoops"; - this.runLoops.Size = new System.Drawing.Size(64, 24); + this.runLoops.Size = new System.Drawing.Size(45, 17); this.runLoops.TabIndex = 0; this.runLoops.TabStop = true; this.runLoops.Text = "Run"; @@ -1319,7 +1314,7 @@ private void InitializeComponent() this.runIndefinitely.Location = new System.Drawing.Point(8, 48); this.runIndefinitely.Margin = new System.Windows.Forms.Padding(4); this.runIndefinitely.Name = "runIndefinitely"; - this.runIndefinitely.Size = new System.Drawing.Size(142, 24); + this.runIndefinitely.Size = new System.Drawing.Size(97, 17); this.runIndefinitely.TabIndex = 3; this.runIndefinitely.Text = "Run indefinitely"; this.runIndefinitely.UseVisualStyleBackColor = true; @@ -1339,7 +1334,7 @@ private void InitializeComponent() this.testsGroup.Margin = new System.Windows.Forms.Padding(4); this.testsGroup.Name = "testsGroup"; this.testsGroup.Padding = new System.Windows.Forms.Padding(4); - this.testsGroup.Size = new System.Drawing.Size(402, 584); + this.testsGroup.Size = new System.Drawing.Size(402, 591); this.testsGroup.TabIndex = 4; this.testsGroup.TabStop = false; this.testsGroup.Text = "Tests"; @@ -1355,7 +1350,7 @@ private void InitializeComponent() "Audit log tests"}); this.testSet.Location = new System.Drawing.Point(274, 1); this.testSet.Name = "testSet"; - this.testSet.Size = new System.Drawing.Size(121, 28); + this.testSet.Size = new System.Drawing.Size(121, 21); this.testSet.TabIndex = 34; this.testSet.SelectedValueChanged += new System.EventHandler(this.comboTestSet_SelectedValueChanged); // @@ -1370,18 +1365,18 @@ private void InitializeComponent() "Screenshots", "Auto-Screenshots", "Covershot"}); - this.runMode.Location = new System.Drawing.Point(276, 546); + this.runMode.Location = new System.Drawing.Point(276, 553); this.runMode.Name = "runMode"; - this.runMode.Size = new System.Drawing.Size(121, 28); + this.runMode.Size = new System.Drawing.Size(121, 21); this.runMode.TabIndex = 0; // // label21 // this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(273, 529); + this.label21.Location = new System.Drawing.Point(273, 536); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(53, 20); + this.label21.Size = new System.Drawing.Size(37, 13); this.label21.TabIndex = 35; this.label21.Text = "Mode:"; // @@ -1394,7 +1389,7 @@ private void InitializeComponent() this.testsTree.Location = new System.Drawing.Point(8, 23); this.testsTree.Margin = new System.Windows.Forms.Padding(4); this.testsTree.Name = "testsTree"; - this.testsTree.Size = new System.Drawing.Size(387, 496); + this.testsTree.Size = new System.Drawing.Size(387, 503); this.testsTree.TabIndex = 15; this.testsTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.node_AfterCheck); // @@ -1402,10 +1397,10 @@ private void InitializeComponent() // this.skipCheckedTests.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.skipCheckedTests.AutoSize = true; - this.skipCheckedTests.Location = new System.Drawing.Point(8, 546); + this.skipCheckedTests.Location = new System.Drawing.Point(8, 560); this.skipCheckedTests.Margin = new System.Windows.Forms.Padding(4); this.skipCheckedTests.Name = "skipCheckedTests"; - this.skipCheckedTests.Size = new System.Drawing.Size(168, 24); + this.skipCheckedTests.Size = new System.Drawing.Size(116, 17); this.skipCheckedTests.TabIndex = 2; this.skipCheckedTests.Text = "Skip checked tests"; this.skipCheckedTests.UseVisualStyleBackColor = true; @@ -1415,10 +1410,10 @@ private void InitializeComponent() this.runCheckedTests.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.runCheckedTests.AutoSize = true; this.runCheckedTests.Checked = true; - this.runCheckedTests.Location = new System.Drawing.Point(8, 520); + this.runCheckedTests.Location = new System.Drawing.Point(8, 534); this.runCheckedTests.Margin = new System.Windows.Forms.Padding(4); this.runCheckedTests.Name = "runCheckedTests"; - this.runCheckedTests.Size = new System.Drawing.Size(167, 24); + this.runCheckedTests.Size = new System.Drawing.Size(115, 17); this.runCheckedTests.TabIndex = 1; this.runCheckedTests.TabStop = true; this.runCheckedTests.Text = "Run checked tests"; @@ -1434,11 +1429,11 @@ private void InitializeComponent() this.tabBuild.Controls.Add(this.runBuild); this.tabBuild.Controls.Add(this.groupBox6); this.tabBuild.Controls.Add(this.groupBox5); - this.tabBuild.Location = new System.Drawing.Point(4, 35); + this.tabBuild.Location = new System.Drawing.Point(4, 28); this.tabBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabBuild.Name = "tabBuild"; this.tabBuild.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabBuild.Size = new System.Drawing.Size(709, 682); + this.tabBuild.Size = new System.Drawing.Size(709, 689); this.tabBuild.TabIndex = 3; this.tabBuild.Text = "Build"; // @@ -1463,7 +1458,7 @@ private void InitializeComponent() this.startSln.Location = new System.Drawing.Point(7, 42); this.startSln.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.startSln.Name = "startSln"; - this.startSln.Size = new System.Drawing.Size(315, 24); + this.startSln.Size = new System.Drawing.Size(213, 17); this.startSln.TabIndex = 27; this.startSln.Text = "Open Skyline in Visual Studio after build"; this.startSln.UseVisualStyleBackColor = true; @@ -1476,7 +1471,7 @@ private void InitializeComponent() this.runBuildVerificationTests.Location = new System.Drawing.Point(7, 21); this.runBuildVerificationTests.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.runBuildVerificationTests.Name = "runBuildVerificationTests"; - this.runBuildVerificationTests.Size = new System.Drawing.Size(220, 24); + this.runBuildVerificationTests.Size = new System.Drawing.Size(150, 17); this.runBuildVerificationTests.TabIndex = 26; this.runBuildVerificationTests.Text = "Run build verification tests"; this.runBuildVerificationTests.UseVisualStyleBackColor = true; @@ -1541,7 +1536,7 @@ private void InitializeComponent() this.buildRoot.Location = new System.Drawing.Point(9, 21); this.buildRoot.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buildRoot.Name = "buildRoot"; - this.buildRoot.Size = new System.Drawing.Size(484, 26); + this.buildRoot.Size = new System.Drawing.Size(484, 20); this.buildRoot.TabIndex = 3; this.buildRoot.Text = "Documents\\SkylineBuild"; // @@ -1579,7 +1574,7 @@ private void InitializeComponent() this.incrementalBuild.Location = new System.Drawing.Point(7, 71); this.incrementalBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.incrementalBuild.Name = "incrementalBuild"; - this.incrementalBuild.Size = new System.Drawing.Size(174, 24); + this.incrementalBuild.Size = new System.Drawing.Size(117, 17); this.incrementalBuild.TabIndex = 6; this.incrementalBuild.Text = "Incremental re-build"; this.incrementalBuild.UseVisualStyleBackColor = true; @@ -1590,7 +1585,7 @@ private void InitializeComponent() this.updateBuild.Location = new System.Drawing.Point(7, 46); this.updateBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.updateBuild.Name = "updateBuild"; - this.updateBuild.Size = new System.Drawing.Size(244, 24); + this.updateBuild.Size = new System.Drawing.Size(165, 17); this.updateBuild.TabIndex = 5; this.updateBuild.Text = "Update (Sync before building)"; this.updateBuild.UseVisualStyleBackColor = true; @@ -1602,7 +1597,7 @@ private void InitializeComponent() this.nukeBuild.Location = new System.Drawing.Point(7, 21); this.nukeBuild.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nukeBuild.Name = "nukeBuild"; - this.nukeBuild.Size = new System.Drawing.Size(261, 24); + this.nukeBuild.Size = new System.Drawing.Size(178, 17); this.nukeBuild.TabIndex = 4; this.nukeBuild.TabStop = true; this.nukeBuild.Text = "Nuke (Checkout before building)"; @@ -1611,7 +1606,7 @@ private void InitializeComponent() // runBuild // this.runBuild.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runBuild.Location = new System.Drawing.Point(596, 642); + this.runBuild.Location = new System.Drawing.Point(596, 649); this.runBuild.Margin = new System.Windows.Forms.Padding(4); this.runBuild.Name = "runBuild"; this.runBuild.Size = new System.Drawing.Size(100, 28); @@ -1642,7 +1637,7 @@ private void InitializeComponent() this.buildBranch.Location = new System.Drawing.Point(9, 50); this.buildBranch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buildBranch.Name = "buildBranch"; - this.buildBranch.Size = new System.Drawing.Size(85, 24); + this.buildBranch.Size = new System.Drawing.Size(59, 17); this.buildBranch.TabIndex = 4; this.buildBranch.Text = "Branch"; this.buildBranch.UseVisualStyleBackColor = true; @@ -1654,7 +1649,7 @@ private void InitializeComponent() this.buildTrunk.Location = new System.Drawing.Point(9, 23); this.buildTrunk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buildTrunk.Name = "buildTrunk"; - this.buildTrunk.Size = new System.Drawing.Size(74, 24); + this.buildTrunk.Size = new System.Drawing.Size(53, 17); this.buildTrunk.TabIndex = 3; this.buildTrunk.TabStop = true; this.buildTrunk.Text = "Trunk"; @@ -1667,7 +1662,7 @@ private void InitializeComponent() this.branchUrl.Location = new System.Drawing.Point(81, 49); this.branchUrl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.branchUrl.Name = "branchUrl"; - this.branchUrl.Size = new System.Drawing.Size(595, 26); + this.branchUrl.Size = new System.Drawing.Size(595, 20); this.branchUrl.TabIndex = 2; this.branchUrl.Text = "https://github.com/ProteoWizard/pwiz/tree/BRANCHNAME"; // @@ -1690,7 +1685,7 @@ private void InitializeComponent() this.build64.Location = new System.Drawing.Point(9, 46); this.build64.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.build64.Name = "build64"; - this.build64.Size = new System.Drawing.Size(74, 24); + this.build64.Size = new System.Drawing.Size(52, 17); this.build64.TabIndex = 27; this.build64.Text = "64 bit"; this.build64.UseVisualStyleBackColor = true; @@ -1703,7 +1698,7 @@ private void InitializeComponent() this.build32.Location = new System.Drawing.Point(9, 21); this.build32.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.build32.Name = "build32"; - this.build32.Size = new System.Drawing.Size(74, 24); + this.build32.Size = new System.Drawing.Size(52, 17); this.build32.TabIndex = 26; this.build32.Text = "32 bit"; this.build32.UseVisualStyleBackColor = true; @@ -1715,11 +1710,11 @@ private void InitializeComponent() this.tabQuality.Controls.Add(this.qualityTableLayout); this.tabQuality.Controls.Add(this.label18); this.tabQuality.Controls.Add(this.runQuality); - this.tabQuality.Location = new System.Drawing.Point(4, 35); + this.tabQuality.Location = new System.Drawing.Point(4, 28); this.tabQuality.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabQuality.Name = "tabQuality"; this.tabQuality.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabQuality.Size = new System.Drawing.Size(709, 682); + this.tabQuality.Size = new System.Drawing.Size(709, 689); this.tabQuality.TabIndex = 4; this.tabQuality.Text = "Quality"; // @@ -1728,7 +1723,7 @@ private void InitializeComponent() this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panel2.Controls.Add(this.radioQualityHandles); this.panel2.Controls.Add(this.radioQualityMemory); - this.panel2.Location = new System.Drawing.Point(9, 641); + this.panel2.Location = new System.Drawing.Point(9, 648); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(137, 20); this.panel2.TabIndex = 38; @@ -1737,9 +1732,9 @@ private void InitializeComponent() // this.radioQualityHandles.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioQualityHandles.AutoSize = true; - this.radioQualityHandles.Location = new System.Drawing.Point(70, -7); + this.radioQualityHandles.Location = new System.Drawing.Point(70, 0); this.radioQualityHandles.Name = "radioQualityHandles"; - this.radioQualityHandles.Size = new System.Drawing.Size(93, 24); + this.radioQualityHandles.Size = new System.Drawing.Size(64, 17); this.radioQualityHandles.TabIndex = 37; this.radioQualityHandles.Text = "Handles"; this.radioQualityHandles.UseVisualStyleBackColor = true; @@ -1750,9 +1745,9 @@ private void InitializeComponent() this.radioQualityMemory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioQualityMemory.AutoSize = true; this.radioQualityMemory.Checked = true; - this.radioQualityMemory.Location = new System.Drawing.Point(2, -7); + this.radioQualityMemory.Location = new System.Drawing.Point(2, 0); this.radioQualityMemory.Name = "radioQualityMemory"; - this.radioQualityMemory.Size = new System.Drawing.Size(90, 24); + this.radioQualityMemory.Size = new System.Drawing.Size(62, 17); this.radioQualityMemory.TabIndex = 36; this.radioQualityMemory.TabStop = true; this.radioQualityMemory.Text = "Memory"; @@ -1774,7 +1769,7 @@ private void InitializeComponent() this.qualityTableLayout.RowCount = 2; this.qualityTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 46.80412F)); this.qualityTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 53.19588F)); - this.qualityTableLayout.Size = new System.Drawing.Size(691, 587); + this.qualityTableLayout.Size = new System.Drawing.Size(691, 594); this.qualityTableLayout.TabIndex = 32; // // panel1 @@ -1787,7 +1782,7 @@ private void InitializeComponent() this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(691, 274); + this.panel1.Size = new System.Drawing.Size(691, 278); this.panel1.TabIndex = 0; // // groupBox7 @@ -1799,7 +1794,7 @@ private void InitializeComponent() this.groupBox7.Controls.Add(this.qualityThumbnail); this.groupBox7.Location = new System.Drawing.Point(376, 0); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(315, 270); + this.groupBox7.Size = new System.Drawing.Size(315, 274); this.groupBox7.TabIndex = 35; this.groupBox7.TabStop = false; this.groupBox7.Text = "Skyline windows"; @@ -1810,7 +1805,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.qualityTestName.AutoEllipsis = true; this.qualityTestName.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.qualityTestName.Location = new System.Drawing.Point(6, 247); + this.qualityTestName.Location = new System.Drawing.Point(6, 251); this.qualityTestName.Name = "qualityTestName"; this.qualityTestName.Size = new System.Drawing.Size(303, 20); this.qualityTestName.TabIndex = 35; @@ -1824,7 +1819,7 @@ private void InitializeComponent() this.qualityThumbnail.Location = new System.Drawing.Point(8, 19); this.qualityThumbnail.Name = "qualityThumbnail"; this.qualityThumbnail.ProcessId = 0; - this.qualityThumbnail.Size = new System.Drawing.Size(301, 225); + this.qualityThumbnail.Size = new System.Drawing.Size(301, 229); this.qualityThumbnail.TabIndex = 34; // // groupBox11 @@ -1844,7 +1839,7 @@ private void InitializeComponent() this.groupBox11.Margin = new System.Windows.Forms.Padding(4); this.groupBox11.Name = "groupBox11"; this.groupBox11.Padding = new System.Windows.Forms.Padding(4); - this.groupBox11.Size = new System.Drawing.Size(137, 270); + this.groupBox11.Size = new System.Drawing.Size(137, 274); this.groupBox11.TabIndex = 32; this.groupBox11.TabStop = false; this.groupBox11.Text = "Run results"; @@ -1866,7 +1861,7 @@ private void InitializeComponent() this.labelLeaks.Location = new System.Drawing.Point(76, 74); this.labelLeaks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelLeaks.Name = "labelLeaks"; - this.labelLeaks.Size = new System.Drawing.Size(18, 20); + this.labelLeaks.Size = new System.Drawing.Size(13, 13); this.labelLeaks.TabIndex = 12; this.labelLeaks.Text = "0"; // @@ -1876,7 +1871,7 @@ private void InitializeComponent() this.labelFailures.Location = new System.Drawing.Point(76, 58); this.labelFailures.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelFailures.Name = "labelFailures"; - this.labelFailures.Size = new System.Drawing.Size(18, 20); + this.labelFailures.Size = new System.Drawing.Size(13, 13); this.labelFailures.TabIndex = 11; this.labelFailures.Text = "0"; // @@ -1886,7 +1881,7 @@ private void InitializeComponent() this.labelTestsRun.Location = new System.Drawing.Point(76, 42); this.labelTestsRun.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelTestsRun.Name = "labelTestsRun"; - this.labelTestsRun.Size = new System.Drawing.Size(18, 20); + this.labelTestsRun.Size = new System.Drawing.Size(13, 13); this.labelTestsRun.TabIndex = 9; this.labelTestsRun.Text = "0"; // @@ -1896,7 +1891,7 @@ private void InitializeComponent() this.labelDuration.Location = new System.Drawing.Point(76, 25); this.labelDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDuration.Name = "labelDuration"; - this.labelDuration.Size = new System.Drawing.Size(40, 20); + this.labelDuration.Size = new System.Drawing.Size(28, 13); this.labelDuration.TabIndex = 8; this.labelDuration.Text = "0:00"; // @@ -1906,7 +1901,7 @@ private void InitializeComponent() this.label12.Location = new System.Drawing.Point(8, 74); this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(56, 20); + this.label12.Size = new System.Drawing.Size(39, 13); this.label12.TabIndex = 6; this.label12.Text = "Leaks:"; // @@ -1916,7 +1911,7 @@ private void InitializeComponent() this.label13.Location = new System.Drawing.Point(8, 58); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(69, 20); + this.label13.Size = new System.Drawing.Size(46, 13); this.label13.TabIndex = 5; this.label13.Text = "Failures:"; // @@ -1926,7 +1921,7 @@ private void InitializeComponent() this.label10.Location = new System.Drawing.Point(8, 42); this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(79, 20); + this.label10.Size = new System.Drawing.Size(54, 13); this.label10.TabIndex = 3; this.label10.Text = "Tests run:"; // @@ -1936,7 +1931,7 @@ private void InitializeComponent() this.label9.Location = new System.Drawing.Point(8, 25); this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(74, 20); + this.label9.Size = new System.Drawing.Size(50, 13); this.label9.TabIndex = 2; this.label9.Text = "Duration:"; // @@ -1960,7 +1955,7 @@ private void InitializeComponent() this.qualityAllTests.Location = new System.Drawing.Point(7, 19); this.qualityAllTests.Margin = new System.Windows.Forms.Padding(4); this.qualityAllTests.Name = "qualityAllTests"; - this.qualityAllTests.Size = new System.Drawing.Size(90, 24); + this.qualityAllTests.Size = new System.Drawing.Size(61, 17); this.qualityAllTests.TabIndex = 1; this.qualityAllTests.TabStop = true; this.qualityAllTests.Text = "All tests"; @@ -1972,7 +1967,7 @@ private void InitializeComponent() this.qualityChooseTests.Location = new System.Drawing.Point(7, 38); this.qualityChooseTests.Margin = new System.Windows.Forms.Padding(4); this.qualityChooseTests.Name = "qualityChooseTests"; - this.qualityChooseTests.Size = new System.Drawing.Size(238, 24); + this.qualityChooseTests.Size = new System.Drawing.Size(159, 17); this.qualityChooseTests.TabIndex = 0; this.qualityChooseTests.Text = "Choose tests (see Tests tab)"; this.qualityChooseTests.UseVisualStyleBackColor = true; @@ -2002,7 +1997,7 @@ private void InitializeComponent() this.qualityRunSmallMoleculeVersions.CheckState = System.Windows.Forms.CheckState.Checked; this.qualityRunSmallMoleculeVersions.Location = new System.Drawing.Point(7, 118); this.qualityRunSmallMoleculeVersions.Name = "qualityRunSmallMoleculeVersions"; - this.qualityRunSmallMoleculeVersions.Size = new System.Drawing.Size(265, 24); + this.qualityRunSmallMoleculeVersions.Size = new System.Drawing.Size(179, 17); this.qualityRunSmallMoleculeVersions.TabIndex = 14; this.qualityRunSmallMoleculeVersions.Text = "Run small molecule test versions"; this.toolTip1.SetToolTip(this.qualityRunSmallMoleculeVersions, "Include small molecule versions of tests when available"); @@ -2014,7 +2009,7 @@ private void InitializeComponent() this.qualityPassIndefinite.Location = new System.Drawing.Point(8, 48); this.qualityPassIndefinite.Margin = new System.Windows.Forms.Padding(4); this.qualityPassIndefinite.Name = "qualityPassIndefinite"; - this.qualityPassIndefinite.Size = new System.Drawing.Size(142, 24); + this.qualityPassIndefinite.Size = new System.Drawing.Size(97, 17); this.qualityPassIndefinite.TabIndex = 12; this.qualityPassIndefinite.Text = "Run indefinitely"; this.qualityPassIndefinite.UseVisualStyleBackColor = true; @@ -2028,7 +2023,7 @@ private void InitializeComponent() 0, 0}); this.qualityPassCount.Name = "qualityPassCount"; - this.qualityPassCount.Size = new System.Drawing.Size(41, 26); + this.qualityPassCount.Size = new System.Drawing.Size(41, 20); this.qualityPassCount.TabIndex = 11; this.qualityPassCount.Value = new decimal(new int[] { 1, @@ -2043,7 +2038,7 @@ private void InitializeComponent() this.pass1.CheckState = System.Windows.Forms.CheckState.Checked; this.pass1.Location = new System.Drawing.Point(8, 95); this.pass1.Name = "pass1"; - this.pass1.Size = new System.Drawing.Size(240, 24); + this.pass1.Size = new System.Drawing.Size(163, 17); this.pass1.TabIndex = 10; this.pass1.Text = "Pass 1: Detect memory leaks"; this.pass1.UseVisualStyleBackColor = true; @@ -2055,7 +2050,7 @@ private void InitializeComponent() this.pass0.CheckState = System.Windows.Forms.CheckState.Checked; this.pass0.Location = new System.Drawing.Point(8, 72); this.pass0.Name = "pass0"; - this.pass0.Size = new System.Drawing.Size(231, 24); + this.pass0.Size = new System.Drawing.Size(161, 17); this.pass0.TabIndex = 9; this.pass0.Text = "Pass 0: French / no vendors"; this.pass0.UseVisualStyleBackColor = true; @@ -2066,7 +2061,7 @@ private void InitializeComponent() this.label7.Location = new System.Drawing.Point(108, 25); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(60, 20); + this.label7.Size = new System.Drawing.Size(40, 13); this.label7.TabIndex = 8; this.label7.Text = "passes"; // @@ -2077,7 +2072,7 @@ private void InitializeComponent() this.qualityPassDefinite.Location = new System.Drawing.Point(8, 23); this.qualityPassDefinite.Margin = new System.Windows.Forms.Padding(4); this.qualityPassDefinite.Name = "qualityPassDefinite"; - this.qualityPassDefinite.Size = new System.Drawing.Size(64, 24); + this.qualityPassDefinite.Size = new System.Drawing.Size(45, 17); this.qualityPassDefinite.TabIndex = 1; this.qualityPassDefinite.TabStop = true; this.qualityPassDefinite.Text = "Run"; @@ -2088,10 +2083,10 @@ private void InitializeComponent() this.panelMemoryGraph.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.panelMemoryGraph.Location = new System.Drawing.Point(0, 280); + this.panelMemoryGraph.Location = new System.Drawing.Point(0, 284); this.panelMemoryGraph.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0); this.panelMemoryGraph.Name = "panelMemoryGraph"; - this.panelMemoryGraph.Size = new System.Drawing.Size(691, 307); + this.panelMemoryGraph.Size = new System.Drawing.Size(691, 310); this.panelMemoryGraph.TabIndex = 32; // // label18 @@ -2109,7 +2104,7 @@ private void InitializeComponent() // runQuality // this.runQuality.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runQuality.Location = new System.Drawing.Point(596, 642); + this.runQuality.Location = new System.Drawing.Point(596, 649); this.runQuality.Margin = new System.Windows.Forms.Padding(4); this.runQuality.Name = "runQuality"; this.runQuality.Size = new System.Drawing.Size(100, 28); @@ -2126,10 +2121,10 @@ private void InitializeComponent() this.tabNightly.Controls.Add(this.nightlyTableLayout); this.tabNightly.Controls.Add(this.label33); this.tabNightly.Controls.Add(this.runNightly); - this.tabNightly.Location = new System.Drawing.Point(4, 35); + this.tabNightly.Location = new System.Drawing.Point(4, 28); this.tabNightly.Name = "tabNightly"; this.tabNightly.Padding = new System.Windows.Forms.Padding(3); - this.tabNightly.Size = new System.Drawing.Size(709, 682); + this.tabNightly.Size = new System.Drawing.Size(709, 689); this.tabNightly.TabIndex = 7; this.tabNightly.Text = "Nightly"; // @@ -2137,9 +2132,9 @@ private void InitializeComponent() // this.nightlyExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.nightlyExit.AutoSize = true; - this.nightlyExit.Location = new System.Drawing.Point(200, 642); + this.nightlyExit.Location = new System.Drawing.Point(200, 656); this.nightlyExit.Name = "nightlyExit"; - this.nightlyExit.Size = new System.Drawing.Size(106, 24); + this.nightlyExit.Size = new System.Drawing.Size(73, 17); this.nightlyExit.TabIndex = 37; this.nightlyExit.Text = "nightlyExit"; this.nightlyExit.UseVisualStyleBackColor = true; @@ -2149,7 +2144,7 @@ private void InitializeComponent() // this.buttonDeleteNightlyTask.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.buttonDeleteNightlyTask.Enabled = false; - this.buttonDeleteNightlyTask.Location = new System.Drawing.Point(11, 642); + this.buttonDeleteNightlyTask.Location = new System.Drawing.Point(11, 649); this.buttonDeleteNightlyTask.Margin = new System.Windows.Forms.Padding(4); this.buttonDeleteNightlyTask.Name = "buttonDeleteNightlyTask"; this.buttonDeleteNightlyTask.Size = new System.Drawing.Size(180, 28); @@ -2173,7 +2168,7 @@ private void InitializeComponent() this.nightlyTableLayout.RowCount = 2; this.nightlyTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 76.53277F)); this.nightlyTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 23.46723F)); - this.nightlyTableLayout.Size = new System.Drawing.Size(687, 587); + this.nightlyTableLayout.Size = new System.Drawing.Size(687, 594); this.nightlyTableLayout.TabIndex = 35; // // groupBox17 @@ -2182,11 +2177,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox17.Controls.Add(this.nightlyTrendsTable); - this.groupBox17.Location = new System.Drawing.Point(0, 449); + this.groupBox17.Location = new System.Drawing.Point(0, 454); this.groupBox17.Margin = new System.Windows.Forms.Padding(0); this.groupBox17.Name = "groupBox17"; this.groupBox17.Padding = new System.Windows.Forms.Padding(4); - this.groupBox17.Size = new System.Drawing.Size(687, 138); + this.groupBox17.Size = new System.Drawing.Size(687, 140); this.groupBox17.TabIndex = 31; this.groupBox17.TabStop = false; this.groupBox17.Text = "Trends"; @@ -2207,7 +2202,7 @@ private void InitializeComponent() this.nightlyTrendsTable.Name = "nightlyTrendsTable"; this.nightlyTrendsTable.RowCount = 1; this.nightlyTrendsTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.nightlyTrendsTable.Size = new System.Drawing.Size(679, 117); + this.nightlyTrendsTable.Size = new System.Drawing.Size(679, 119); this.nightlyTrendsTable.TabIndex = 4; // // panel3 @@ -2220,7 +2215,7 @@ private void InitializeComponent() this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(0); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(687, 449); + this.panel3.Size = new System.Drawing.Size(687, 454); this.panel3.TabIndex = 0; // // groupBox19 @@ -2234,7 +2229,7 @@ private void InitializeComponent() this.groupBox19.Margin = new System.Windows.Forms.Padding(4); this.groupBox19.Name = "groupBox19"; this.groupBox19.Padding = new System.Windows.Forms.Padding(4); - this.groupBox19.Size = new System.Drawing.Size(240, 116); + this.groupBox19.Size = new System.Drawing.Size(240, 121); this.groupBox19.TabIndex = 36; this.groupBox19.TabStop = false; this.groupBox19.Text = "Nightly directory"; @@ -2290,7 +2285,7 @@ private void InitializeComponent() this.nightlyBranch.Location = new System.Drawing.Point(9, 50); this.nightlyBranch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nightlyBranch.Name = "nightlyBranch"; - this.nightlyBranch.Size = new System.Drawing.Size(85, 24); + this.nightlyBranch.Size = new System.Drawing.Size(59, 17); this.nightlyBranch.TabIndex = 4; this.nightlyBranch.Text = "Branch"; this.nightlyBranch.UseVisualStyleBackColor = true; @@ -2302,7 +2297,7 @@ private void InitializeComponent() this.nightlyBuildTrunk.Location = new System.Drawing.Point(9, 23); this.nightlyBuildTrunk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nightlyBuildTrunk.Name = "nightlyBuildTrunk"; - this.nightlyBuildTrunk.Size = new System.Drawing.Size(74, 24); + this.nightlyBuildTrunk.Size = new System.Drawing.Size(53, 17); this.nightlyBuildTrunk.TabIndex = 3; this.nightlyBuildTrunk.TabStop = true; this.nightlyBuildTrunk.Text = "Trunk"; @@ -2315,7 +2310,7 @@ private void InitializeComponent() this.nightlyBranchUrl.Location = new System.Drawing.Point(74, 49); this.nightlyBranchUrl.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nightlyBranchUrl.Name = "nightlyBranchUrl"; - this.nightlyBranchUrl.Size = new System.Drawing.Size(159, 26); + this.nightlyBranchUrl.Size = new System.Drawing.Size(159, 20); this.nightlyBranchUrl.TabIndex = 2; this.nightlyBranchUrl.Text = "https://github.com/ProteoWizard/pwiz/tree/BRANCHNAME"; // @@ -2344,7 +2339,7 @@ private void InitializeComponent() this.groupBox18.Margin = new System.Windows.Forms.Padding(4); this.groupBox18.Name = "groupBox18"; this.groupBox18.Padding = new System.Windows.Forms.Padding(4); - this.groupBox18.Size = new System.Drawing.Size(439, 445); + this.groupBox18.Size = new System.Drawing.Size(439, 450); this.groupBox18.TabIndex = 32; this.groupBox18.TabStop = false; this.groupBox18.Text = "Run results"; @@ -2354,7 +2349,7 @@ private void InitializeComponent() this.panel4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panel4.Controls.Add(this.radioNightlyHandles); this.panel4.Controls.Add(this.radioNightlyMemory); - this.panel4.Location = new System.Drawing.Point(8, 422); + this.panel4.Location = new System.Drawing.Point(8, 427); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(136, 21); this.panel4.TabIndex = 38; @@ -2363,9 +2358,9 @@ private void InitializeComponent() // this.radioNightlyHandles.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioNightlyHandles.AutoSize = true; - this.radioNightlyHandles.Location = new System.Drawing.Point(68, -7); + this.radioNightlyHandles.Location = new System.Drawing.Point(68, 0); this.radioNightlyHandles.Name = "radioNightlyHandles"; - this.radioNightlyHandles.Size = new System.Drawing.Size(93, 24); + this.radioNightlyHandles.Size = new System.Drawing.Size(64, 17); this.radioNightlyHandles.TabIndex = 37; this.radioNightlyHandles.Text = "Handles"; this.radioNightlyHandles.UseVisualStyleBackColor = true; @@ -2376,9 +2371,9 @@ private void InitializeComponent() this.radioNightlyMemory.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.radioNightlyMemory.AutoSize = true; this.radioNightlyMemory.Checked = true; - this.radioNightlyMemory.Location = new System.Drawing.Point(0, -7); + this.radioNightlyMemory.Location = new System.Drawing.Point(0, 0); this.radioNightlyMemory.Name = "radioNightlyMemory"; - this.radioNightlyMemory.Size = new System.Drawing.Size(90, 24); + this.radioNightlyMemory.Size = new System.Drawing.Size(62, 17); this.radioNightlyMemory.TabIndex = 36; this.radioNightlyMemory.TabStop = true; this.radioNightlyMemory.Text = "Memory"; @@ -2414,7 +2409,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.nightlyGraphPanel.Location = new System.Drawing.Point(11, 126); this.nightlyGraphPanel.Name = "nightlyGraphPanel"; - this.nightlyGraphPanel.Size = new System.Drawing.Size(421, 293); + this.nightlyGraphPanel.Size = new System.Drawing.Size(421, 298); this.nightlyGraphPanel.TabIndex = 32; // // nightlyDeleteRun @@ -2445,7 +2440,7 @@ private void InitializeComponent() this.nightlyLabelLeaks.Location = new System.Drawing.Point(87, 103); this.nightlyLabelLeaks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelLeaks.Name = "nightlyLabelLeaks"; - this.nightlyLabelLeaks.Size = new System.Drawing.Size(18, 20); + this.nightlyLabelLeaks.Size = new System.Drawing.Size(13, 13); this.nightlyLabelLeaks.TabIndex = 12; this.nightlyLabelLeaks.Text = "0"; // @@ -2455,7 +2450,7 @@ private void InitializeComponent() this.nightlyLabelFailures.Location = new System.Drawing.Point(87, 87); this.nightlyLabelFailures.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelFailures.Name = "nightlyLabelFailures"; - this.nightlyLabelFailures.Size = new System.Drawing.Size(18, 20); + this.nightlyLabelFailures.Size = new System.Drawing.Size(13, 13); this.nightlyLabelFailures.TabIndex = 11; this.nightlyLabelFailures.Text = "0"; // @@ -2465,7 +2460,7 @@ private void InitializeComponent() this.nightlyLabelTestsRun.Location = new System.Drawing.Point(87, 71); this.nightlyLabelTestsRun.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelTestsRun.Name = "nightlyLabelTestsRun"; - this.nightlyLabelTestsRun.Size = new System.Drawing.Size(18, 20); + this.nightlyLabelTestsRun.Size = new System.Drawing.Size(13, 13); this.nightlyLabelTestsRun.TabIndex = 9; this.nightlyLabelTestsRun.Text = "0"; // @@ -2475,7 +2470,7 @@ private void InitializeComponent() this.nightlyLabelDuration.Location = new System.Drawing.Point(87, 54); this.nightlyLabelDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabelDuration.Name = "nightlyLabelDuration"; - this.nightlyLabelDuration.Size = new System.Drawing.Size(40, 20); + this.nightlyLabelDuration.Size = new System.Drawing.Size(28, 13); this.nightlyLabelDuration.TabIndex = 8; this.nightlyLabelDuration.Text = "0:00"; // @@ -2485,7 +2480,7 @@ private void InitializeComponent() this.label25.Location = new System.Drawing.Point(19, 103); this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(56, 20); + this.label25.Size = new System.Drawing.Size(39, 13); this.label25.TabIndex = 6; this.label25.Text = "Leaks:"; // @@ -2495,7 +2490,7 @@ private void InitializeComponent() this.nightlyLabel3.Location = new System.Drawing.Point(19, 87); this.nightlyLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabel3.Name = "nightlyLabel3"; - this.nightlyLabel3.Size = new System.Drawing.Size(69, 20); + this.nightlyLabel3.Size = new System.Drawing.Size(46, 13); this.nightlyLabel3.TabIndex = 5; this.nightlyLabel3.Text = "Failures:"; // @@ -2505,7 +2500,7 @@ private void InitializeComponent() this.nightlyLabel2.Location = new System.Drawing.Point(19, 71); this.nightlyLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabel2.Name = "nightlyLabel2"; - this.nightlyLabel2.Size = new System.Drawing.Size(79, 20); + this.nightlyLabel2.Size = new System.Drawing.Size(54, 13); this.nightlyLabel2.TabIndex = 3; this.nightlyLabel2.Text = "Tests run:"; // @@ -2515,7 +2510,7 @@ private void InitializeComponent() this.nightlyLabel1.Location = new System.Drawing.Point(19, 54); this.nightlyLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.nightlyLabel1.Name = "nightlyLabel1"; - this.nightlyLabel1.Size = new System.Drawing.Size(74, 20); + this.nightlyLabel1.Size = new System.Drawing.Size(50, 13); this.nightlyLabel1.TabIndex = 2; this.nightlyLabel1.Text = "Duration:"; // @@ -2526,7 +2521,7 @@ private void InitializeComponent() this.nightlyRunDate.Location = new System.Drawing.Point(85, 21); this.nightlyRunDate.Margin = new System.Windows.Forms.Padding(4); this.nightlyRunDate.Name = "nightlyRunDate"; - this.nightlyRunDate.Size = new System.Drawing.Size(192, 28); + this.nightlyRunDate.Size = new System.Drawing.Size(192, 21); this.nightlyRunDate.TabIndex = 1; this.nightlyRunDate.SelectedIndexChanged += new System.EventHandler(this.comboRunDate_SelectedIndexChanged); // @@ -2536,7 +2531,7 @@ private void InitializeComponent() this.label29.Location = new System.Drawing.Point(8, 26); this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(79, 20); + this.label29.Size = new System.Drawing.Size(54, 13); this.label29.TabIndex = 0; this.label29.Text = "Run date:"; // @@ -2570,7 +2565,7 @@ private void InitializeComponent() this.nightlyRunIndefinitely.AutoSize = true; this.nightlyRunIndefinitely.Location = new System.Drawing.Point(10, 199); this.nightlyRunIndefinitely.Name = "nightlyRunIndefinitely"; - this.nightlyRunIndefinitely.Size = new System.Drawing.Size(143, 24); + this.nightlyRunIndefinitely.Size = new System.Drawing.Size(98, 17); this.nightlyRunIndefinitely.TabIndex = 39; this.nightlyRunIndefinitely.Text = "Run indefinitely"; this.nightlyRunIndefinitely.UseVisualStyleBackColor = true; @@ -2580,7 +2575,7 @@ private void InitializeComponent() this.nightlyRandomize.AutoSize = true; this.nightlyRandomize.Location = new System.Drawing.Point(10, 176); this.nightlyRandomize.Name = "nightlyRandomize"; - this.nightlyRandomize.Size = new System.Drawing.Size(188, 24); + this.nightlyRandomize.Size = new System.Drawing.Size(126, 17); this.nightlyRandomize.TabIndex = 38; this.nightlyRandomize.Text = "Randomize test order"; this.nightlyRandomize.UseVisualStyleBackColor = true; @@ -2598,7 +2593,7 @@ private void InitializeComponent() "100"}); this.nightlyRepeat.Location = new System.Drawing.Point(87, 145); this.nightlyRepeat.Name = "nightlyRepeat"; - this.nightlyRepeat.Size = new System.Drawing.Size(52, 28); + this.nightlyRepeat.Size = new System.Drawing.Size(52, 21); this.nightlyRepeat.TabIndex = 36; this.toolTip1.SetToolTip(this.nightlyRepeat, "Stress each test by running it multiple times before proceeding to next test. Pe" + "rf tests only run once."); @@ -2608,7 +2603,7 @@ private void InitializeComponent() this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(145, 148); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(115, 20); + this.label8.Size = new System.Drawing.Size(77, 13); this.label8.TabIndex = 37; this.label8.Text = "time(s) in a row"; // @@ -2617,7 +2612,7 @@ private void InitializeComponent() this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(7, 148); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(109, 20); + this.label11.Size = new System.Drawing.Size(74, 13); this.label11.TabIndex = 35; this.label11.Text = "Run each test"; // @@ -2626,7 +2621,7 @@ private void InitializeComponent() this.nightlyRunPerfTests.AutoSize = true; this.nightlyRunPerfTests.Location = new System.Drawing.Point(9, 95); this.nightlyRunPerfTests.Name = "nightlyRunPerfTests"; - this.nightlyRunPerfTests.Size = new System.Drawing.Size(250, 24); + this.nightlyRunPerfTests.Size = new System.Drawing.Size(169, 17); this.nightlyRunPerfTests.TabIndex = 33; this.nightlyRunPerfTests.Text = "Include perf tests in nightly run"; this.toolTip1.SetToolTip(this.nightlyRunPerfTests, "Perf tests run only once per language, and only in pass 2 (no leak detection or i" + @@ -2650,7 +2645,7 @@ private void InitializeComponent() this.nightlyStartTime.Location = new System.Drawing.Point(85, 19); this.nightlyStartTime.Name = "nightlyStartTime"; this.nightlyStartTime.ShowUpDown = true; - this.nightlyStartTime.Size = new System.Drawing.Size(82, 26); + this.nightlyStartTime.Size = new System.Drawing.Size(82, 20); this.nightlyStartTime.TabIndex = 31; this.nightlyStartTime.Value = new System.DateTime(2014, 1, 14, 18, 0, 0, 0); // @@ -2661,7 +2656,7 @@ private void InitializeComponent() this.nightlyBuildType.Location = new System.Drawing.Point(85, 69); this.nightlyBuildType.Name = "nightlyBuildType"; this.nightlyBuildType.ReadOnly = true; - this.nightlyBuildType.Size = new System.Drawing.Size(82, 26); + this.nightlyBuildType.Size = new System.Drawing.Size(82, 20); this.nightlyBuildType.TabIndex = 30; this.nightlyBuildType.Text = "32 bit"; this.nightlyBuildType.Wrap = true; @@ -2671,7 +2666,7 @@ private void InitializeComponent() this.label31.AutoSize = true; this.label31.Location = new System.Drawing.Point(170, 47); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(49, 20); + this.label31.Size = new System.Drawing.Size(33, 13); this.label31.TabIndex = 6; this.label31.Text = "hours"; // @@ -2680,7 +2675,7 @@ private void InitializeComponent() this.label35.AutoSize = true; this.label35.Location = new System.Drawing.Point(6, 71); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(43, 20); + this.label35.Size = new System.Drawing.Size(31, 13); this.label35.TabIndex = 29; this.label35.Text = "Type"; // @@ -2698,7 +2693,7 @@ private void InitializeComponent() 0, 0}); this.nightlyDuration.Name = "nightlyDuration"; - this.nightlyDuration.Size = new System.Drawing.Size(82, 26); + this.nightlyDuration.Size = new System.Drawing.Size(82, 20); this.nightlyDuration.TabIndex = 5; this.nightlyDuration.Value = new decimal(new int[] { 12, @@ -2711,7 +2706,7 @@ private void InitializeComponent() this.label30.AutoSize = true; this.label30.Location = new System.Drawing.Point(7, 47); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(70, 20); + this.label30.Size = new System.Drawing.Size(47, 13); this.label30.TabIndex = 4; this.label30.Text = "Duration"; // @@ -2720,7 +2715,7 @@ private void InitializeComponent() this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(7, 22); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(78, 20); + this.label32.Size = new System.Drawing.Size(51, 13); this.label32.TabIndex = 3; this.label32.Text = "Start time"; // @@ -2741,7 +2736,7 @@ private void InitializeComponent() // runNightly // this.runNightly.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.runNightly.Location = new System.Drawing.Point(596, 642); + this.runNightly.Location = new System.Drawing.Point(596, 649); this.runNightly.Margin = new System.Windows.Forms.Padding(4); this.runNightly.Name = "runNightly"; this.runNightly.Size = new System.Drawing.Size(100, 28); @@ -2760,18 +2755,18 @@ private void InitializeComponent() this.tabOutput.Controls.Add(this.comboBoxOutput); this.tabOutput.Controls.Add(this.label19); this.tabOutput.Controls.Add(this.buttonStop); - this.tabOutput.Location = new System.Drawing.Point(4, 35); + this.tabOutput.Location = new System.Drawing.Point(4, 28); this.tabOutput.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabOutput.Name = "tabOutput"; this.tabOutput.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabOutput.Size = new System.Drawing.Size(709, 682); + this.tabOutput.Size = new System.Drawing.Size(709, 689); this.tabOutput.TabIndex = 5; this.tabOutput.Text = "Output"; // // buttonSelectFailedOutputTab // this.buttonSelectFailedOutputTab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonSelectFailedOutputTab.Location = new System.Drawing.Point(16, 642); + this.buttonSelectFailedOutputTab.Location = new System.Drawing.Point(16, 649); this.buttonSelectFailedOutputTab.Margin = new System.Windows.Forms.Padding(0); this.buttonSelectFailedOutputTab.Name = "buttonSelectFailedOutputTab"; this.buttonSelectFailedOutputTab.Size = new System.Drawing.Size(152, 28); @@ -2788,7 +2783,7 @@ private void InitializeComponent() this.outputJumpTo.Location = new System.Drawing.Point(238, 52); this.outputJumpTo.Margin = new System.Windows.Forms.Padding(4); this.outputJumpTo.Name = "outputJumpTo"; - this.outputJumpTo.Size = new System.Drawing.Size(254, 28); + this.outputJumpTo.Size = new System.Drawing.Size(254, 21); this.outputJumpTo.TabIndex = 36; this.outputJumpTo.SelectedIndexChanged += new System.EventHandler(this.outputJumpTo_SelectedIndexChanged); this.outputJumpTo.Click += new System.EventHandler(this.outputJumpTo_Click); @@ -2811,8 +2806,8 @@ private void InitializeComponent() // outputSplitContainer.Panel2 // this.outputSplitContainer.Panel2.Controls.Add(this.errorConsole); - this.outputSplitContainer.Size = new System.Drawing.Size(671, 555); - this.outputSplitContainer.SplitterDistance = 325; + this.outputSplitContainer.Size = new System.Drawing.Size(671, 562); + this.outputSplitContainer.SplitterDistance = 338; this.outputSplitContainer.SplitterWidth = 10; this.outputSplitContainer.TabIndex = 35; // @@ -2834,7 +2829,7 @@ private void InitializeComponent() this.commandShell.NextCommand = 0; this.commandShell.RestartCount = 0; this.commandShell.RunStartTime = new System.DateTime(((long)(0))); - this.commandShell.Size = new System.Drawing.Size(671, 325); + this.commandShell.Size = new System.Drawing.Size(671, 338); this.commandShell.StopButton = null; this.commandShell.TabIndex = 2; this.commandShell.Text = ""; @@ -2852,7 +2847,7 @@ private void InitializeComponent() this.errorConsole.Margin = new System.Windows.Forms.Padding(0); this.errorConsole.Name = "errorConsole"; this.errorConsole.ReadOnly = true; - this.errorConsole.Size = new System.Drawing.Size(671, 220); + this.errorConsole.Size = new System.Drawing.Size(671, 214); this.errorConsole.TabIndex = 3; this.errorConsole.Text = ""; this.errorConsole.SelectionChanged += new System.EventHandler(this.errorConsole_SelectionChanged); @@ -2876,7 +2871,7 @@ private void InitializeComponent() this.comboBoxOutput.Location = new System.Drawing.Point(16, 52); this.comboBoxOutput.Margin = new System.Windows.Forms.Padding(4); this.comboBoxOutput.Name = "comboBoxOutput"; - this.comboBoxOutput.Size = new System.Drawing.Size(214, 28); + this.comboBoxOutput.Size = new System.Drawing.Size(214, 21); this.comboBoxOutput.TabIndex = 32; this.comboBoxOutput.SelectedIndexChanged += new System.EventHandler(this.comboBoxOutput_SelectedIndexChanged); // @@ -2897,7 +2892,7 @@ private void InitializeComponent() // this.buttonStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonStop.Enabled = false; - this.buttonStop.Location = new System.Drawing.Point(596, 642); + this.buttonStop.Location = new System.Drawing.Point(596, 649); this.buttonStop.Margin = new System.Windows.Forms.Padding(4); this.buttonStop.Name = "buttonStop"; this.buttonStop.Size = new System.Drawing.Size(100, 28); @@ -2915,9 +2910,9 @@ private void InitializeComponent() this.tabRunStats.Controls.Add(this.comboBoxRunStats); this.tabRunStats.Controls.Add(this.label1); this.tabRunStats.Controls.Add(this.dataGridRunStats); - this.tabRunStats.Location = new System.Drawing.Point(4, 35); + this.tabRunStats.Location = new System.Drawing.Point(4, 28); this.tabRunStats.Name = "tabRunStats"; - this.tabRunStats.Size = new System.Drawing.Size(709, 682); + this.tabRunStats.Size = new System.Drawing.Size(709, 689); this.tabRunStats.TabIndex = 8; this.tabRunStats.Text = "Run Stats"; // @@ -2938,7 +2933,7 @@ private void InitializeComponent() this.labelCompareTo.AutoSize = true; this.labelCompareTo.Location = new System.Drawing.Point(249, 51); this.labelCompareTo.Name = "labelCompareTo"; - this.labelCompareTo.Size = new System.Drawing.Size(89, 20); + this.labelCompareTo.Size = new System.Drawing.Size(60, 13); this.labelCompareTo.TabIndex = 35; this.labelCompareTo.Text = "compare to"; // @@ -2949,7 +2944,7 @@ private void InitializeComponent() this.comboBoxRunStatsCompare.Location = new System.Drawing.Point(326, 48); this.comboBoxRunStatsCompare.Margin = new System.Windows.Forms.Padding(4); this.comboBoxRunStatsCompare.Name = "comboBoxRunStatsCompare"; - this.comboBoxRunStatsCompare.Size = new System.Drawing.Size(214, 28); + this.comboBoxRunStatsCompare.Size = new System.Drawing.Size(214, 21); this.comboBoxRunStatsCompare.TabIndex = 34; this.comboBoxRunStatsCompare.SelectedIndexChanged += new System.EventHandler(this.comboBoxRunStats_SelectedIndexChanged); // @@ -2960,7 +2955,7 @@ private void InitializeComponent() this.comboBoxRunStats.Location = new System.Drawing.Point(13, 48); this.comboBoxRunStats.Margin = new System.Windows.Forms.Padding(4); this.comboBoxRunStats.Name = "comboBoxRunStats"; - this.comboBoxRunStats.Size = new System.Drawing.Size(214, 28); + this.comboBoxRunStats.Size = new System.Drawing.Size(214, 21); this.comboBoxRunStats.TabIndex = 33; this.comboBoxRunStats.SelectedIndexChanged += new System.EventHandler(this.comboBoxRunStats_SelectedIndexChanged); // @@ -2997,58 +2992,49 @@ private void InitializeComponent() this.dataGridRunStats.Name = "dataGridRunStats"; this.dataGridRunStats.ReadOnly = true; this.dataGridRunStats.RowHeadersVisible = false; - this.dataGridRunStats.RowHeadersWidth = 62; this.dataGridRunStats.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridRunStats.Size = new System.Drawing.Size(685, 588); + this.dataGridRunStats.Size = new System.Drawing.Size(685, 595); this.dataGridRunStats.TabIndex = 0; this.dataGridRunStats.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.dataGridRunStats_SortCompare); // // TestName // this.TestName.HeaderText = "Test"; - this.TestName.MinimumWidth = 8; this.TestName.Name = "TestName"; this.TestName.ReadOnly = true; // // Iterations // this.Iterations.HeaderText = "Iterations"; - this.Iterations.MinimumWidth = 8; this.Iterations.Name = "Iterations"; this.Iterations.ReadOnly = true; // // Duration // this.Duration.HeaderText = "Total duration"; - this.Duration.MinimumWidth = 8; this.Duration.Name = "Duration"; this.Duration.ReadOnly = true; // // AverageDuration // this.AverageDuration.HeaderText = "Average duration"; - this.AverageDuration.MinimumWidth = 8; this.AverageDuration.Name = "AverageDuration"; this.AverageDuration.ReadOnly = true; // // RelDuration // this.RelDuration.HeaderText = "Relative duration"; - this.RelDuration.MinimumWidth = 8; this.RelDuration.Name = "RelDuration"; this.RelDuration.ReadOnly = true; // // DeltaTotalDuration // this.DeltaTotalDuration.HeaderText = "Delta total duration"; - this.DeltaTotalDuration.MinimumWidth = 8; this.DeltaTotalDuration.Name = "DeltaTotalDuration"; this.DeltaTotalDuration.ReadOnly = true; // // menuStrip1 // - this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2); - this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.findToolStripMenuItem, @@ -3058,7 +3044,7 @@ private void InitializeComponent() this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(709, 33); + this.menuStrip1.Size = new System.Drawing.Size(709, 24); this.menuStrip1.TabIndex = 8; this.menuStrip1.Text = "menuStrip1"; // @@ -3072,45 +3058,45 @@ private void InitializeComponent() this.toolStripSeparator1, this.exitToolStripMenuItem2}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(54, 29); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "&File"; // // openToolStripMenuItem // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(284, 34); + this.openToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.openToolStripMenuItem.Text = "&Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.open_Click); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(284, 34); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.saveToolStripMenuItem.Text = "Save &as..."; this.saveToolStripMenuItem.Click += new System.EventHandler(this.save_Click); // // exitToolStripMenuItem1 // this.exitToolStripMenuItem1.Name = "exitToolStripMenuItem1"; - this.exitToolStripMenuItem1.Size = new System.Drawing.Size(281, 6); + this.exitToolStripMenuItem1.Size = new System.Drawing.Size(185, 6); // // createInstallerZipFileToolStripMenuItem // this.createInstallerZipFileToolStripMenuItem.Name = "createInstallerZipFileToolStripMenuItem"; - this.createInstallerZipFileToolStripMenuItem.Size = new System.Drawing.Size(284, 34); + this.createInstallerZipFileToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.createInstallerZipFileToolStripMenuItem.Text = "Save &zip file installer..."; this.createInstallerZipFileToolStripMenuItem.Click += new System.EventHandler(this.SaveZipFileInstaller); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(281, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(185, 6); // // exitToolStripMenuItem2 // this.exitToolStripMenuItem2.Name = "exitToolStripMenuItem2"; - this.exitToolStripMenuItem2.Size = new System.Drawing.Size(284, 34); + this.exitToolStripMenuItem2.Size = new System.Drawing.Size(188, 22); this.exitToolStripMenuItem2.Text = "E&xit"; this.exitToolStripMenuItem2.Click += new System.EventHandler(this.exit_Click); // @@ -3121,14 +3107,14 @@ private void InitializeComponent() this.findNextToolStripMenuItem}); this.findToolStripMenuItem.Name = "findToolStripMenuItem"; this.findToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findToolStripMenuItem.Size = new System.Drawing.Size(62, 29); + this.findToolStripMenuItem.Size = new System.Drawing.Size(42, 20); this.findToolStripMenuItem.Text = "Fi&nd"; // // findTestToolStripMenuItem // this.findTestToolStripMenuItem.Name = "findTestToolStripMenuItem"; this.findTestToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.findTestToolStripMenuItem.Size = new System.Drawing.Size(220, 34); + this.findTestToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.findTestToolStripMenuItem.Text = "&Find..."; this.findTestToolStripMenuItem.Click += new System.EventHandler(this.findTestToolStripMenuItem_Click); // @@ -3136,7 +3122,7 @@ private void InitializeComponent() // this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findNextToolStripMenuItem.Size = new System.Drawing.Size(220, 34); + this.findNextToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.findNextToolStripMenuItem.Text = "Find &Next"; this.findNextToolStripMenuItem.Click += new System.EventHandler(this.findNextToolStripMenuItem_Click); // @@ -3152,7 +3138,7 @@ private void InitializeComponent() this.zip32Bit, this.zip64Bit}); this.selectBuildMenuItem.Name = "selectBuildMenuItem"; - this.selectBuildMenuItem.Size = new System.Drawing.Size(118, 29); + this.selectBuildMenuItem.Size = new System.Drawing.Size(80, 20); this.selectBuildMenuItem.Text = "Select &Build"; this.selectBuildMenuItem.DropDownOpening += new System.EventHandler(this.selectBuildMenuOpening); // @@ -3160,7 +3146,7 @@ private void InitializeComponent() // this.bin32Bit.CheckOnClick = true; this.bin32Bit.Name = "bin32Bit"; - this.bin32Bit.Size = new System.Drawing.Size(232, 34); + this.bin32Bit.Size = new System.Drawing.Size(153, 22); this.bin32Bit.Text = "bin (32 bit)"; this.bin32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3168,7 +3154,7 @@ private void InitializeComponent() // this.bin64Bit.CheckOnClick = true; this.bin64Bit.Name = "bin64Bit"; - this.bin64Bit.Size = new System.Drawing.Size(232, 34); + this.bin64Bit.Size = new System.Drawing.Size(153, 22); this.bin64Bit.Text = "bin (64 bit)"; this.bin64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3176,7 +3162,7 @@ private void InitializeComponent() // this.build32Bit.CheckOnClick = true; this.build32Bit.Name = "build32Bit"; - this.build32Bit.Size = new System.Drawing.Size(232, 34); + this.build32Bit.Size = new System.Drawing.Size(153, 22); this.build32Bit.Text = "Build (32 bit)"; this.build32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3184,7 +3170,7 @@ private void InitializeComponent() // this.build64Bit.CheckOnClick = true; this.build64Bit.Name = "build64Bit"; - this.build64Bit.Size = new System.Drawing.Size(232, 34); + this.build64Bit.Size = new System.Drawing.Size(153, 22); this.build64Bit.Text = "Build (64 bit)"; this.build64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3192,7 +3178,7 @@ private void InitializeComponent() // this.nightly32Bit.CheckOnClick = true; this.nightly32Bit.Name = "nightly32Bit"; - this.nightly32Bit.Size = new System.Drawing.Size(232, 34); + this.nightly32Bit.Size = new System.Drawing.Size(153, 22); this.nightly32Bit.Text = "Nightly (32 bit)"; this.nightly32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3200,7 +3186,7 @@ private void InitializeComponent() // this.nightly64Bit.CheckOnClick = true; this.nightly64Bit.Name = "nightly64Bit"; - this.nightly64Bit.Size = new System.Drawing.Size(232, 34); + this.nightly64Bit.Size = new System.Drawing.Size(153, 22); this.nightly64Bit.Text = "Nightly (64 bit)"; this.nightly64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3208,7 +3194,7 @@ private void InitializeComponent() // this.zip32Bit.CheckOnClick = true; this.zip32Bit.Name = "zip32Bit"; - this.zip32Bit.Size = new System.Drawing.Size(232, 34); + this.zip32Bit.Size = new System.Drawing.Size(153, 22); this.zip32Bit.Text = "zip (32 bit)"; this.zip32Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3216,7 +3202,7 @@ private void InitializeComponent() // this.zip64Bit.CheckOnClick = true; this.zip64Bit.Name = "zip64Bit"; - this.zip64Bit.Size = new System.Drawing.Size(232, 34); + this.zip64Bit.Size = new System.Drawing.Size(153, 22); this.zip64Bit.Text = "zip (64 bit)"; this.zip64Bit.Click += new System.EventHandler(this.selectBuild_Click); // @@ -3225,14 +3211,14 @@ private void InitializeComponent() this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.accessInternet}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(92, 29); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.optionsToolStripMenuItem.Text = "&Options"; // // accessInternet // this.accessInternet.CheckOnClick = true; this.accessInternet.Name = "accessInternet"; - this.accessInternet.Size = new System.Drawing.Size(233, 34); + this.accessInternet.Size = new System.Drawing.Size(154, 22); this.accessInternet.Text = "&Access Internet"; // // helpToolStripMenuItem @@ -3241,20 +3227,20 @@ private void InitializeComponent() this.documentationToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(65, 29); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.helpToolStripMenuItem.Text = "&Help"; // // documentationToolStripMenuItem // this.documentationToolStripMenuItem.Name = "documentationToolStripMenuItem"; - this.documentationToolStripMenuItem.Size = new System.Drawing.Size(249, 34); + this.documentationToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.documentationToolStripMenuItem.Text = "&Documentation..."; this.documentationToolStripMenuItem.Click += new System.EventHandler(this.documentationToolStripMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(249, 34); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.aboutToolStripMenuItem.Text = "&About..."; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.about_Click); // @@ -3284,7 +3270,7 @@ private void InitializeComponent() // this.textBox1.Location = new System.Drawing.Point(76, 19); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(32, 26); + this.textBox1.Size = new System.Drawing.Size(32, 20); this.textBox1.TabIndex = 4; // // label4 diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx index 79f06e0f8a..3188a56e87 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx @@ -120,6 +120,15 @@ 281, 17 + + 517, 17 + + + 17, 17 + + + 397, 17 + 397, 17 @@ -127,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -148,6 +157,15 @@ True + + True + + + True + + + True + 517, 17 @@ -169,8 +187,23 @@ True - - 17, 17 + + True + + + True + + + True + + + True + + + True + + + True 25 From 4db74d06a6f4851a7edb54a383db87ab58e6da13 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Mon, 7 Oct 2024 13:46:25 -0700 Subject: [PATCH 5/8] Update save screenshot to use a checkbox --- .../Skyline/TestPerf/DiaSwathTutorialTest.cs | 2 +- .../Skyline/TestPerf/DiaUmpireTutorialTest.cs | 2 +- .../TestTutorial/AbsoluteQuantTutorialTest.cs | 28 +++++++++---------- .../TestUtil/PauseAndContinueForm.Designer.cs | 26 ++++++++--------- .../Skyline/TestUtil/PauseAndContinueForm.cs | 25 +++++++++-------- pwiz_tools/Skyline/TestUtil/TestFunctional.cs | 25 +++++++++-------- 6 files changed, 55 insertions(+), 53 deletions(-) diff --git a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs index b0be09fb5c..1e2088fbfe 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs @@ -848,7 +848,7 @@ protected override void DoTest() OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); //PauseTest(); - PauseForScreenShot("Loading chromatograms window", screenshotPage++, null, 30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", screenshotPage++, 30*1000); // 30 second timeout to avoid getting stuck WaitForDocumentChangeLoaded(doc, 20 * 60 * 1000); // 20 minutes var peakScoringModelDlg = WaitForOpenForm(); diff --git a/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs index fc95edf41a..d5fc91f948 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs @@ -656,7 +656,7 @@ protected override void DoTest() PauseForScreenShot("Import FASTA summary form", 16); OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); - PauseForScreenShot("Loading chromatograms window", 13, null, 30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", 13, 30*1000); // 30 second timeout to avoid getting stuck WaitForDocumentChangeLoaded(doc, 15 * 60 * 1000); // 15 minutes var peakScoringModelDlg = WaitForOpenForm(); diff --git a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs index 2b52b55b58..6ab2e348b0 100644 --- a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs @@ -89,7 +89,7 @@ protected override void DoTest() transitionSettingsUI.RegressionCEName = "Thermo TSQ Vantage"; transitionSettingsUI.RegressionDPName = Resources.SettingsList_ELEMENT_NONE_None; }); - PauseForScreenShot("Transition Settings - Prediction tab", 5, "transition_settings_prediction_tab"); + PauseForScreenShot("Transition Settings - Prediction tab", 5); RunUI(() => { @@ -102,7 +102,7 @@ protected override void DoTest() transitionSettingsUI.RangeTo = Resources.TransitionFilter_FragmentEndFinders_last_ion_minus_1; transitionSettingsUI.SpecialIons = new string[0]; }); - PauseForScreenShot("Transition Settings - Filter tab", 6, "transition_settings_filter_tab"); + PauseForScreenShot("Transition Settings - Filter tab", 6); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); WaitForDocumentChange(doc); @@ -116,7 +116,7 @@ protected override void DoTest() LabelAtoms.C13 | LabelAtoms.N15, RelativeRT.Matching, null, null, null); AddHeavyMod(modHeavyK, peptideSettingsUi, "Edit Isotope Modification over Transition Settings", 7); RunUI(() => peptideSettingsUi.PickedHeavyMods = new[] { modHeavyK.Name }); - PauseForScreenShot("Peptide Settings - Modification tab with mod added", 8, "peptide_settings_modification_tab_with_mod"); + PauseForScreenShot("Peptide Settings - Modification tab with mod added", 8); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); @@ -128,7 +128,7 @@ protected override void DoTest() RunUI(pasteDlg.PastePeptides); WaitForProteinMetadataBackgroundLoaderCompletedUI(); RunUI(() => pasteDlg.Size = new Size(700, 210)); - PauseForScreenShot("Insert Peptide List", 9, "insert_peptide_list"); + PauseForScreenShot("Insert Peptide List", 9); OkDialog(pasteDlg, pasteDlg.OkDialog); } @@ -138,7 +138,7 @@ protected override void DoTest() WaitForCondition(() => File.Exists(GetTestPath(folderAbsoluteQuant + @"test_file.sky"))); RunUI( () => SkylineWindow.Size = new Size(840, 410)); - PauseForScreenShot("Main window with Targets view", 9, "main_window_with_targets"); + PauseForScreenShot("Main window with Targets view", 9); // Exporting a transition list p. 10 { @@ -150,7 +150,7 @@ protected override void DoTest() exportMethodDlg.OptimizeType = ExportOptimize.NONE; exportMethodDlg.MethodType = ExportMethodType.Standard; }); - PauseForScreenShot("Export Transition List", 10, "export_transition_list"); + PauseForScreenShot("Export Transition List", 10); OkDialog(exportMethodDlg, () => exportMethodDlg.OkDialog(GetTestPath("Quant_Abs_Thermo_TSQ_Vantage.csv"))); @@ -158,7 +158,7 @@ protected override void DoTest() // Importing RAW files into Skyline p. 11, 12 var importResultsDlg = ShowDialog(SkylineWindow.ImportResults); - PauseForScreenShot("Import Results - click OK to get shot of Import Results Files and then cancel", 11, "import_results"); + PauseForScreenShot("Import Results - click OK to get shot of Import Results Files and then cancel", 11); RunUI(() => { @@ -193,7 +193,7 @@ protected override void DoTest() WaitForCondition(10 * 60 * 1000, // ten minutes () => SkylineWindow.Document.Settings.HasResults && SkylineWindow.Document.Settings.MeasuredResults.IsLoaded); - PauseForScreenShot("Main window with imported data", 13, "main_window_imported_data"); + PauseForScreenShot("Main window with imported data", 13); // Analyzing SRM Data from FOXN1-GST Sample p. 14 RunDlg(SkylineWindow.ImportResults, @@ -239,7 +239,7 @@ protected override void DoTest() }); RunUI(() => SkylineWindow.Size = new Size(1470, 656)); RestoreViewOnScreen(14); - PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for light", 14, "main_window_peak_areas_for_light"); + PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for light", 14); RunUI(() => SkylineWindow.SelectedPath = SkylineWindow.DocumentUI.GetPathTo((int)SrmDocument.Level.TransitionGroups, 1)); WaitForGraphs(); @@ -249,7 +249,7 @@ protected override void DoTest() int transitionCount = SkylineWindow.DocumentUI.PeptideTransitionGroups.ToArray()[1].TransitionCount; CheckGstGraphs(transitionCount, transitionCount); }); - PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for heavy", 14, "main_window_peak_areas_for_heavy"); + PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for heavy", 14); RunUI(() => SkylineWindow.SelectedPath = SkylineWindow.DocumentUI.GetPathTo((int)SrmDocument.Level.Molecules, 0)); WaitForGraphs(); @@ -261,7 +261,7 @@ protected override void DoTest() int transitionGroupCount = SkylineWindow.DocumentUI.Peptides.First().TransitionGroupCount; CheckGstGraphs(transitionGroupCount, transitionGroupCount - 1); }); - PauseForScreenShot("Main window with totals graphs for light and heavy and FOXN1-GST", 15, "main_window_totals_graphs"); + PauseForScreenShot("Main window with totals graphs for light and heavy and FOXN1-GST", 15); // Peptide Quantitification Settings p. 16 peptideSettingsUi = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); @@ -273,7 +273,7 @@ protected override void DoTest() peptideSettingsUi.QuantNormalizationMethod = new NormalizationMethod.RatioToLabel(IsotopeLabelType.heavy); peptideSettingsUi.QuantUnits = quantUnits; }); - PauseForScreenShot("Peptide Settings Quantification Tab", 16, "peptide_settings_quantification_tab"); + PauseForScreenShot("Peptide Settings Quantification Tab", 16); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); // Specify analyte concentrations of external standards @@ -315,7 +315,7 @@ protected override void DoTest() gridFloatingWindow.Top = SkylineWindow.Top; gridFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Document grid with concentrations filled in", 17, "document_grid_with_concentrations_filled_in"); + PauseForScreenShot("Document grid with concentrations filled in", 17); } // View the calibration curve p. 18 @@ -354,7 +354,7 @@ protected override void DoTest() calibrationFloatingWindow.Top = SkylineWindow.Top; calibrationFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("View calibration curve", 18, "view_calibration_curve"); + PauseForScreenShot("View calibration curve", 18); } Assert.AreEqual(CalibrationCurveFitter.AppendUnits(QuantificationStrings.Analyte_Concentration, quantUnits), calibrationForm.ZedGraphControl.GraphPane.XAxis.Title.Text); diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs index b3433b7ebb..202f21101e 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs @@ -36,7 +36,7 @@ private void InitializeComponent() this.btnCopyToClipBoard = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.btnCopyMetafileToClipboard = new System.Windows.Forms.Button(); - this.btnSaveScreenshot = new System.Windows.Forms.Button(); + this.saveScreenshotCheckbox = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // btnContinue @@ -97,18 +97,16 @@ private void InitializeComponent() this.btnCopyMetafileToClipboard.Visible = false; this.btnCopyMetafileToClipboard.Click += new System.EventHandler(this.btnCopyMetaFileToClipboard_Click); // - // btnSaveScreenshot + // saveScreenshotCheckbox // - this.btnSaveScreenshot.Enabled = false; - this.btnSaveScreenshot.Location = new System.Drawing.Point(93, 61); - this.btnSaveScreenshot.Name = "btnSaveScreenshot"; - this.btnSaveScreenshot.Size = new System.Drawing.Size(99, 23); - this.btnSaveScreenshot.TabIndex = 5; - this.btnSaveScreenshot.Text = "Save Screenshot"; - this.toolTip1.SetToolTip(this.btnSaveScreenshot, "Saves screenshot to tutorial folder."); - this.btnSaveScreenshot.UseVisualStyleBackColor = true; - this.btnSaveScreenshot.Visible = false; - this.btnSaveScreenshot.Click += new System.EventHandler(this.btnSaveScreenshot_Click); + this.saveScreenshotCheckbox.AutoSize = true; + this.saveScreenshotCheckbox.Location = new System.Drawing.Point(139, 99); + this.saveScreenshotCheckbox.Name = "saveScreenshotCheckbox"; + this.saveScreenshotCheckbox.Size = new System.Drawing.Size(157, 24); + this.saveScreenshotCheckbox.TabIndex = 6; + this.saveScreenshotCheckbox.Text = "Save Screenshot"; + this.saveScreenshotCheckbox.UseVisualStyleBackColor = true; + this.saveScreenshotCheckbox.CheckedChanged += new System.EventHandler(this.saveScreenshotCheckbox_CheckedChanged); // // PauseAndContinueForm // @@ -118,7 +116,7 @@ private void InitializeComponent() this.AutoSize = true; this.ClientSize = new System.Drawing.Size(203, 130); this.ControlBox = false; - this.Controls.Add(this.btnSaveScreenshot); + this.Controls.Add(this.saveScreenshotCheckbox); this.Controls.Add(this.btnCopyMetafileToClipboard); this.Controls.Add(this.btnCopyToClipBoard); this.Controls.Add(this.lblDescriptionLink); @@ -145,6 +143,6 @@ private void InitializeComponent() private System.Windows.Forms.Button btnCopyToClipBoard; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Button btnCopyMetafileToClipboard; - private System.Windows.Forms.Button btnSaveScreenshot; + private System.Windows.Forms.CheckBox saveScreenshotCheckbox; } } \ No newline at end of file diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs index 3643f527b7..bdcaae748f 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs @@ -23,7 +23,6 @@ using System.Threading; using System.Windows.Forms; using DigitalRune.Windows.Docking; -using Microsoft.VisualStudio.TestTools.UnitTesting; using pwiz.Common.SystemUtil; using pwiz.Skyline; using pwiz.Skyline.Controls.Graphs; @@ -36,6 +35,7 @@ namespace pwiz.SkylineTestUtil { public partial class PauseAndContinueForm : Form { + private static bool _saveScreenShotChecked = false; private readonly string _linkUrl; private readonly bool _showMatchingPage; private readonly string _fileToSave; @@ -62,15 +62,14 @@ public PauseAndContinueForm(string description = null, string fileToSave = null, } // Show the copy buttons btnCopyToClipBoard.Visible = btnCopyToClipBoard.Enabled = true; - if (!String.IsNullOrEmpty(fileToSave)) - { - btnSaveScreenshot.Visible = btnSaveScreenshot.Enabled = true; - } if ((_screenshotForm is GraphSummary zgControl) && zgControl.GraphControl != null) { btnCopyMetafileToClipboard.Visible = btnCopyMetafileToClipboard.Enabled = true; // Control is a metafile provider } } + + saveScreenshotCheckbox.Checked = _saveScreenShotChecked; + _linkUrl = link; if (!string.IsNullOrEmpty(link)) { @@ -230,6 +229,11 @@ private void btnCopyToClipboard_Click(object sender, EventArgs e) // Copy current window image to clipboard, with clean edges _screenshotForm.Focus(); _screenshotManager.TakeNextShot(_screenshotForm); + if (saveScreenshotCheckbox.Checked) + { + _screenshotManager.TakeNextShot(_screenshotForm, _fileToSave); + } + } private void btnCopyMetaFileToClipboard_Click(object sender, EventArgs e) @@ -239,15 +243,14 @@ private void btnCopyMetaFileToClipboard_Click(object sender, EventArgs e) { CopyEmfToolStripMenuItem.CopyEmf(zgControl.GraphControl); } - } - - private void btnSaveScreenshot_Click(object sender, EventArgs e) - { - if (!String.IsNullOrEmpty(_fileToSave)) + if (saveScreenshotCheckbox.Checked) { - _screenshotForm.Focus(); _screenshotManager.TakeNextShot(_screenshotForm, _fileToSave); } } + private void saveScreenshotCheckbox_CheckedChanged(object sender, EventArgs e) + { + _saveScreenShotChecked = saveScreenshotCheckbox.Checked; + } } } diff --git a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs index 379a4c926b..dd78d911cc 100644 --- a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs +++ b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs @@ -1277,6 +1277,8 @@ private string TutorialPath } } + private int ScreenShotCounter; + public virtual bool AuditLogCompareLogs { get { return IsTutorial && !IsFullData; } // Logs were recorded with partial data and not in Pass0 @@ -1309,22 +1311,22 @@ private string LinkPage(int? pageNum) private static FormLookup _formLookup; - public void PauseForScreenShot(string description = null, int? pageNum = null, string fileName = null, int? timeout = null) + public void PauseForScreenShot(string description = null, int? pageNum = null, int? timeout = null) { - PauseForScreenShot(description, pageNum, null, null, fileName, timeout); + PauseForScreenShot(description, pageNum, null, null, timeout); } - public void PauseForScreenShot(Form screenshotForm, string description = null, int? pageNum = null, string fileName = null, int ? timeout = null) + public void PauseForScreenShot(Form screenshotForm, string description = null, int? pageNum = null, int ? timeout = null) { - PauseForScreenShot(description, pageNum, null, screenshotForm, fileName, timeout); + PauseForScreenShot(description, pageNum, null, screenshotForm, timeout); } - public void PauseForScreenShot(string description, int? pageNum = null, string fileName = null, int ? timeout = null) + public void PauseForScreenShot(string description, int? pageNum = null, int ? timeout = null) where TView : IFormView { - PauseForScreenShot(description, pageNum, typeof(TView), null, fileName, timeout); + PauseForScreenShot(description, pageNum, typeof(TView), null, timeout); } - private void PauseForScreenShot(string description, int? pageNum, Type formType, Form screenshotForm = null, string fileName = null, int ? timeout = null) + private void PauseForScreenShot(string description, int? pageNum, Type formType, Form screenshotForm = null, int ? timeout = null) { if (formType != null) { @@ -1338,7 +1340,7 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, Thread.Sleep(3 * 1000); else if (Program.PauseSeconds > 0) Thread.Sleep(Program.PauseSeconds * 1000); - else if ((IsPauseForScreenShots && Math.Max(PauseStartingPage, Program.PauseStartingPage) <= (pageNum ?? int.MaxValue)) || IsAutoScreenShotMode) + else if ((IsPauseForScreenShots || IsAutoScreenShotMode) && Math.Max(PauseStartingPage, Program.PauseStartingPage) <= (pageNum ?? int.MaxValue)) { if (screenshotForm == null) { @@ -1356,12 +1358,11 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, var formSeen = new FormSeen(); formSeen.Saw(formType); - - var fileToSave = !String.IsNullOrEmpty(fileName) && !String.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, fileName)}.png" : null; + var fileToSave = !String.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, "s-" +ScreenShotCounter++)}.png" : null; if (IsAutoScreenShotMode) { - Thread.Sleep(1000); + Thread.Sleep(3000); screenshotForm.Focus(); _shotManager.TakeNextShot(screenshotForm, fileToSave); } @@ -2464,7 +2465,7 @@ private void AddMod(StaticMod mod, RunUI(() => addStaticModDlg.Modification = mod); if (pauseText != null || pausePage.HasValue) - PauseForScreenShot(pauseText, pausePage, viewType); + PauseForScreenShot(pauseText, pausePage, viewType, null); OkDialog(addStaticModDlg, addStaticModDlg.OkDialog); OkDialog(editModsDlg, editModsDlg.OkDialog); From bc1285cc281c2859efb613e67026db2e28eaf459 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Mon, 7 Oct 2024 13:57:55 -0700 Subject: [PATCH 6/8] Update location of checkbox --- .../TestUtil/PauseAndContinueForm.Designer.cs | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs index 202f21101e..feae4cda3f 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs @@ -41,9 +41,10 @@ private void InitializeComponent() // // btnContinue // - this.btnContinue.Location = new System.Drawing.Point(12, 32); + this.btnContinue.Location = new System.Drawing.Point(18, 49); + this.btnContinue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnContinue.Name = "btnContinue"; - this.btnContinue.Size = new System.Drawing.Size(75, 23); + this.btnContinue.Size = new System.Drawing.Size(112, 35); this.btnContinue.TabIndex = 0; this.btnContinue.Text = "Continue"; this.btnContinue.UseVisualStyleBackColor = true; @@ -53,18 +54,20 @@ private void InitializeComponent() // this.lblDescription.AutoEllipsis = true; this.lblDescription.AutoSize = true; - this.lblDescription.Location = new System.Drawing.Point(13, 13); + this.lblDescription.Location = new System.Drawing.Point(20, 20); + this.lblDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(60, 13); + this.lblDescription.Size = new System.Drawing.Size(89, 20); this.lblDescription.TabIndex = 1; this.lblDescription.Text = "Description"; // // lblDescriptionLink // this.lblDescriptionLink.AutoSize = true; - this.lblDescriptionLink.Location = new System.Drawing.Point(32, 13); + this.lblDescriptionLink.Location = new System.Drawing.Point(48, 20); + this.lblDescriptionLink.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblDescriptionLink.Name = "lblDescriptionLink"; - this.lblDescriptionLink.Size = new System.Drawing.Size(60, 13); + this.lblDescriptionLink.Size = new System.Drawing.Size(89, 20); this.lblDescriptionLink.TabIndex = 2; this.lblDescriptionLink.TabStop = true; this.lblDescriptionLink.Text = "Description"; @@ -74,9 +77,10 @@ private void InitializeComponent() // btnCopyToClipBoard // this.btnCopyToClipBoard.Enabled = false; - this.btnCopyToClipBoard.Location = new System.Drawing.Point(12, 61); + this.btnCopyToClipBoard.Location = new System.Drawing.Point(18, 94); + this.btnCopyToClipBoard.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnCopyToClipBoard.Name = "btnCopyToClipBoard"; - this.btnCopyToClipBoard.Size = new System.Drawing.Size(75, 23); + this.btnCopyToClipBoard.Size = new System.Drawing.Size(112, 35); this.btnCopyToClipBoard.TabIndex = 3; this.btnCopyToClipBoard.Text = "Copy Form"; this.toolTip1.SetToolTip(this.btnCopyToClipBoard, resources.GetString("btnCopyToClipBoard.ToolTip")); @@ -87,9 +91,10 @@ private void InitializeComponent() // btnCopyMetafileToClipboard // this.btnCopyMetafileToClipboard.Enabled = false; - this.btnCopyMetafileToClipboard.Location = new System.Drawing.Point(12, 90); + this.btnCopyMetafileToClipboard.Location = new System.Drawing.Point(18, 138); + this.btnCopyMetafileToClipboard.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.btnCopyMetafileToClipboard.Name = "btnCopyMetafileToClipboard"; - this.btnCopyMetafileToClipboard.Size = new System.Drawing.Size(75, 23); + this.btnCopyMetafileToClipboard.Size = new System.Drawing.Size(112, 35); this.btnCopyMetafileToClipboard.TabIndex = 4; this.btnCopyMetafileToClipboard.Text = "Copy Graph"; this.toolTip1.SetToolTip(this.btnCopyMetafileToClipboard, "Copies metafile to clipboard"); @@ -100,7 +105,8 @@ private void InitializeComponent() // saveScreenshotCheckbox // this.saveScreenshotCheckbox.AutoSize = true; - this.saveScreenshotCheckbox.Location = new System.Drawing.Point(139, 99); + this.saveScreenshotCheckbox.Location = new System.Drawing.Point(139, 100); + this.saveScreenshotCheckbox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.saveScreenshotCheckbox.Name = "saveScreenshotCheckbox"; this.saveScreenshotCheckbox.Size = new System.Drawing.Size(157, 24); this.saveScreenshotCheckbox.TabIndex = 6; @@ -111,10 +117,10 @@ private void InitializeComponent() // PauseAndContinueForm // this.AcceptButton = this.btnContinue; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(203, 130); + this.ClientSize = new System.Drawing.Size(304, 200); this.ControlBox = false; this.Controls.Add(this.saveScreenshotCheckbox); this.Controls.Add(this.btnCopyMetafileToClipboard); @@ -124,6 +130,7 @@ private void InitializeComponent() this.Controls.Add(this.btnContinue); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.KeyPreview = true; + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "PauseAndContinueForm"; From e5af1fbe30a411e4154c732b65ade57b80325e2b Mon Sep 17 00:00:00 2001 From: Eduardo Date: Mon, 21 Oct 2024 20:50:28 -0700 Subject: [PATCH 7/8] Implement graph screenshots, form targetting, dia tutorial, and preview feature --- .../Skyline/TestPerf/DdaTutorialTest.cs | 5 +- .../Skyline/TestPerf/DiaSearchTutorialTest.cs | 5 +- .../Skyline/TestTutorial/DiaTutorialTest.cs | 40 ++- .../ExistingExperimentsTutorialTest.cs | 3 +- .../TestUtil/PauseAndContinueForm.Designer.cs | 83 +++-- .../Skyline/TestUtil/PauseAndContinueForm.cs | 84 ++--- .../TestUtil/PauseAndContinueForm.resx | 2 +- .../Skyline/TestUtil/ScreenshotManager.cs | 336 +++++------------- .../ScreenshotPreviewForm.Designer.cs | 137 +++++++ .../Skyline/TestUtil/ScreenshotPreviewForm.cs | 68 ++++ .../TestUtil/ScreenshotPreviewForm.resx | 120 +++++++ pwiz_tools/Skyline/TestUtil/TestFunctional.cs | 87 ++++- pwiz_tools/Skyline/TestUtil/TestUtil.csproj | 10 + 13 files changed, 612 insertions(+), 368 deletions(-) create mode 100644 pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs create mode 100644 pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs create mode 100644 pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.resx diff --git a/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs index ff349bfc89..05d48af07e 100644 --- a/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs @@ -98,10 +98,11 @@ protected override void DoTest() private Image _searchLogImage; - protected override void ProcessCoverShot(Bitmap bmp) + protected override Bitmap ProcessCoverShot(Bitmap bmp) { var graph = Graphics.FromImage(bmp); graph.DrawImageUnscaled(_searchLogImage, bmp.Width - _searchLogImage.Width - 10, bmp.Height - _searchLogImage.Height - 30); + return bmp; } /// @@ -278,7 +279,7 @@ private void TestMsFraggerSearch() if (IsCoverShotMode) { RunUI(() => importPeptideSearchDlg.Width = 404); - _searchLogImage = ScreenshotManager.TakeNextShot(importPeptideSearchDlg); + _searchLogImage = ScreenshotManager.TakeShot(importPeptideSearchDlg); Assert.IsNotNull(_searchLogImage); } diff --git a/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs index df950042e1..3eacecc8a8 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs @@ -197,10 +197,11 @@ protected override void DoTest() private Image _searchLogImage; - protected override void ProcessCoverShot(Bitmap bmp) + protected override Bitmap ProcessCoverShot(Bitmap bmp) { var graph = Graphics.FromImage(bmp); graph.DrawImageUnscaled(_searchLogImage, bmp.Width - _searchLogImage.Width - 10, bmp.Height - _searchLogImage.Height - 30); + return bmp; } /// @@ -429,7 +430,7 @@ private void TestMsFraggerSearch() if (IsCoverShotMode) { RunUI(() => importPeptideSearchDlg.Width = 404); - _searchLogImage = ScreenshotManager.TakeNextShot(importPeptideSearchDlg); + _searchLogImage = ScreenshotManager.TakeShot(importPeptideSearchDlg); Assert.IsNotNull(_searchLogImage); } diff --git a/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs index 60bbbf8b19..9a001d1237 100644 --- a/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs @@ -17,11 +17,14 @@ * limitations under the License. */ +using System; +using System.Collections.Generic; using System.Drawing; using System.Globalization; using System.IO; using System.Linq; using System.Windows.Forms; +using DigitalRune.Windows.Docking; using Microsoft.VisualStudio.TestTools.UnitTesting; using pwiz.Skyline.Alerts; using pwiz.Skyline.Controls; @@ -48,7 +51,7 @@ public class DiaTutorialTest : AbstractFunctionalTestEx /// to regenerate checkpoint files for non-full-import mode, /// when something changes in the test. /// - private bool IsFullImportMode { get { return IsRecordImported || IsCoverShotMode || IsPauseForScreenShots; } } + private bool IsFullImportMode { get { return IsRecordImported || IsCoverShotMode || IsPauseForScreenShots || IsAutoScreenShotMode; } } private bool IsRecordImported { @@ -59,7 +62,7 @@ private bool IsRecordImported public void TestDiaTutorial() { // Set true to look at tutorial screenshots. -// IsPauseForScreenShots = true; + IsPauseForScreenShots = true; // IsCoverShotMode = true; CoverShotName = "DIA"; // PauseStartPage = 36; @@ -252,7 +255,7 @@ protected override void DoTest() var peptidesPerProteinDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); WaitForCondition(() => peptidesPerProteinDlg.DocumentFinalCalculated); - PauseForScreenShot("Peptides per protein form", 25); + PauseForScreenShot("Peptides per protein form", 25); RunUI(() => { int proteinCount, peptideCount, precursorCount, transitionCount; @@ -317,7 +320,7 @@ protected override void DoTest() }); RestoreViewOnScreen(27); - PauseForScreenShot("Skyline window", 27); + PauseForScreenShot("Skyline window", 27); RunUI(() => { @@ -325,7 +328,7 @@ protected override void DoTest() SkylineWindow.ChangeMassErrorTransition(TransitionMassError.all); }); WaitForGraphs(); - PauseForScreenShot("Mass Errors: Histogram metafile", 28); + PauseForGraphScreenShot("Mass Errors: Histogram metafile", FindGraphSummaryByGraphType(), 28); RunUI(() => { ValidateMassErrorStatistics(2.7, 3.3); @@ -346,7 +349,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.SequenceTree.SelectedNode = SkylineWindow.SelectedNode.Parent); WaitForGraphs(); RunUI(() => SkylineWindow.SequenceTree.SelectedNode = SkylineWindow.SelectedNode.Nodes[0]); - PauseForScreenShot("Skyline window - with manual integration and ID times", 29); + PauseForScreenShot("Skyline window - with manual integration and ID times", 29); RunUI(() => { @@ -355,7 +358,7 @@ protected override void DoTest() }); RestoreViewOnScreen(31); SelectNode(SrmDocument.Level.Molecules, 1); // 2nd peptide - PauseForScreenShot("Chromatogram graph metafile", 31); + PauseForGraphScreenShot("Chromatogram graph metafile", SkylineWindow.GetGraphChrom("Pit01"), 31); RestoreViewOnScreen(27); RunUI(() => @@ -364,7 +367,7 @@ protected override void DoTest() SkylineWindow.Height = 700; }); SelectNode(SrmDocument.Level.TransitionGroups, 1); // 2nd peptide - first precursor - PauseForScreenShot("Skyline window", 32); + PauseForScreenShot("Skyline window", 32); SelectNode(SrmDocument.Level.Transitions, 22); @@ -374,7 +377,8 @@ protected override void DoTest() SkylineWindow.Height = 463; }); - PauseForScreenShot("Product ion chromatogram graph metafiles", 33); + PauseForGraphScreenShot("Product ion chromatogram graph metafile 1", SkylineWindow.GetGraphChrom("Pit01"), 33); + PauseForGraphScreenShot("Product ion chromatogram graph metafile 2", SkylineWindow.GetGraphChrom("Pit02"), 33); RunUI(() => { @@ -386,11 +390,12 @@ protected override void DoTest() ChangePeakBounds("Pit01", 65.36, 66.7); ChangePeakBounds("Pit02", 64.89, 66.2); - PauseForScreenShot("Chromatograms and peak areas", 34); + Func clipChromAndPeakAreas = ClipSkylineWindowShotWithForms(new List() { SkylineWindow.GetGraphChrom("Pit01"), SkylineWindow.GetGraphChrom("Pit02"), FindGraphSummaryByGraphType() }); + PauseForScreenShot("Chromatograms and peak areas", 34, null, clipChromAndPeakAreas); SelectNode(SrmDocument.Level.TransitionGroups, 13); - PauseForScreenShot("Chromatograms and peak areas", 35); + PauseForScreenShot("Chromatograms and peak areas", 35, null, clipChromAndPeakAreas); if (IsCoverShotMode) { @@ -442,15 +447,14 @@ protected override void DoTest() RestoreViewOnScreen(36); ClickChromatogram("Pit01", 70.19, 169.5E+06, PaneKey.PRECURSORS); - PauseForScreenShot("Full-Scan MS1 spectrum metafile", 36); - + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile", SkylineWindow.GraphFullScan, 36); ClickChromatogram("Pit01", 70.79, 4.9E+05, PaneKey.PRODUCTS); - PauseForScreenShot("Full-Scan MS/MS spectrum y10 metafile", 37); + PauseForGraphScreenShot("Full-Scan MS/MS spectrum y10 metafile", SkylineWindow.GraphFullScan, 37); ClickChromatogram("Pit01", 70.79, 3.25E+05, PaneKey.PRODUCTS); - PauseForScreenShot("Full-Scan MS/MS spectrum y10++ metafile", 38); + PauseForGraphScreenShot("Full-Scan MS/MS spectrum y10++ metafile", SkylineWindow.GraphFullScan, 38); FindNode("K.ELVYETVR.V [73, 80]"); WaitForGraphs(); @@ -462,13 +466,13 @@ protected override void DoTest() SkylineWindow.GraphFullScan.SetMzScale(new MzRange(504, 506)); SkylineWindow.GraphFullScan.Parent.Parent.Height -= 15; // Not quite as tall to fit 3 into one page }); - PauseForScreenShot("Full-Scan MS1 spectrum metafile (1/3)", 39); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (1/3)", SkylineWindow.GraphFullScan, 39); MoveNextScan(41.68); - PauseForScreenShot("Full-Scan MS1 spectrum metafile (2/3)", 39); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (2/3)", SkylineWindow.GraphFullScan, 39); MoveNextScan(41.7); - PauseForScreenShot("Full-Scan MS1 spectrum metafile (3/3)", 39); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (3/3)", SkylineWindow.GraphFullScan, 39); } // Clear all the settings lists that were defined in this tutorial diff --git a/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs index 34617db5fa..9655916fd3 100644 --- a/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs @@ -73,11 +73,12 @@ public void TestExistingExperimentsTutorial() RunFunctionalTest(); } - protected override void ProcessCoverShot(Bitmap bmp) + protected override Bitmap ProcessCoverShot(Bitmap bmp) { var excelBmp = new Bitmap(TestContext.GetProjectDirectory(@"TestTutorial\ExistingQuant_excel.png")); var graph = Graphics.FromImage(bmp); graph.DrawImageUnscaled(excelBmp, bmp.Width - excelBmp.Width, bmp.Height - excelBmp.Height); + return bmp; } // Not L10N diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs index feae4cda3f..2d03e95437 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.Designer.cs @@ -33,18 +33,18 @@ private void InitializeComponent() this.btnContinue = new System.Windows.Forms.Button(); this.lblDescription = new System.Windows.Forms.Label(); this.lblDescriptionLink = new System.Windows.Forms.LinkLabel(); - this.btnCopyToClipBoard = new System.Windows.Forms.Button(); + this.btnScreenshot = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.btnCopyMetafileToClipboard = new System.Windows.Forms.Button(); this.saveScreenshotCheckbox = new System.Windows.Forms.CheckBox(); + this.btnScreenshotAndContinue = new System.Windows.Forms.Button(); + this.btnPreview = new System.Windows.Forms.Button(); this.SuspendLayout(); // // btnContinue // - this.btnContinue.Location = new System.Drawing.Point(18, 49); - this.btnContinue.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btnContinue.Location = new System.Drawing.Point(18, 54); this.btnContinue.Name = "btnContinue"; - this.btnContinue.Size = new System.Drawing.Size(112, 35); + this.btnContinue.Size = new System.Drawing.Size(208, 35); this.btnContinue.TabIndex = 0; this.btnContinue.Text = "Continue"; this.btnContinue.UseVisualStyleBackColor = true; @@ -74,38 +74,23 @@ private void InitializeComponent() this.lblDescriptionLink.Visible = false; this.lblDescriptionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lblDescriptionLink_LinkClicked); // - // btnCopyToClipBoard - // - this.btnCopyToClipBoard.Enabled = false; - this.btnCopyToClipBoard.Location = new System.Drawing.Point(18, 94); - this.btnCopyToClipBoard.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.btnCopyToClipBoard.Name = "btnCopyToClipBoard"; - this.btnCopyToClipBoard.Size = new System.Drawing.Size(112, 35); - this.btnCopyToClipBoard.TabIndex = 3; - this.btnCopyToClipBoard.Text = "Copy Form"; - this.toolTip1.SetToolTip(this.btnCopyToClipBoard, resources.GetString("btnCopyToClipBoard.ToolTip")); - this.btnCopyToClipBoard.UseVisualStyleBackColor = true; - this.btnCopyToClipBoard.Visible = false; - this.btnCopyToClipBoard.Click += new System.EventHandler(this.btnCopyToClipboard_Click); - // - // btnCopyMetafileToClipboard - // - this.btnCopyMetafileToClipboard.Enabled = false; - this.btnCopyMetafileToClipboard.Location = new System.Drawing.Point(18, 138); - this.btnCopyMetafileToClipboard.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.btnCopyMetafileToClipboard.Name = "btnCopyMetafileToClipboard"; - this.btnCopyMetafileToClipboard.Size = new System.Drawing.Size(112, 35); - this.btnCopyMetafileToClipboard.TabIndex = 4; - this.btnCopyMetafileToClipboard.Text = "Copy Graph"; - this.toolTip1.SetToolTip(this.btnCopyMetafileToClipboard, "Copies metafile to clipboard"); - this.btnCopyMetafileToClipboard.UseVisualStyleBackColor = true; - this.btnCopyMetafileToClipboard.Visible = false; - this.btnCopyMetafileToClipboard.Click += new System.EventHandler(this.btnCopyMetaFileToClipboard_Click); + // btnScreenshot + // + this.btnScreenshot.Location = new System.Drawing.Point(18, 136); + this.btnScreenshot.Name = "btnScreenshot"; + this.btnScreenshot.Size = new System.Drawing.Size(208, 35); + this.btnScreenshot.TabIndex = 3; + this.btnScreenshot.Text = "Save Screenshot"; + this.toolTip1.SetToolTip(this.btnScreenshot, resources.GetString("btnScreenshot.ToolTip")); + this.btnScreenshot.UseVisualStyleBackColor = true; + this.btnScreenshot.Click += new System.EventHandler(this.btnScreenshot_Click); // // saveScreenshotCheckbox // this.saveScreenshotCheckbox.AutoSize = true; - this.saveScreenshotCheckbox.Location = new System.Drawing.Point(139, 100); + this.saveScreenshotCheckbox.Checked = true; + this.saveScreenshotCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; + this.saveScreenshotCheckbox.Location = new System.Drawing.Point(46, 222); this.saveScreenshotCheckbox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.saveScreenshotCheckbox.Name = "saveScreenshotCheckbox"; this.saveScreenshotCheckbox.Size = new System.Drawing.Size(157, 24); @@ -114,17 +99,38 @@ private void InitializeComponent() this.saveScreenshotCheckbox.UseVisualStyleBackColor = true; this.saveScreenshotCheckbox.CheckedChanged += new System.EventHandler(this.saveScreenshotCheckbox_CheckedChanged); // + // btnScreenshotAndContinue + // + this.btnScreenshotAndContinue.Location = new System.Drawing.Point(18, 177); + this.btnScreenshotAndContinue.Name = "btnScreenshotAndContinue"; + this.btnScreenshotAndContinue.Size = new System.Drawing.Size(208, 35); + this.btnScreenshotAndContinue.TabIndex = 7; + this.btnScreenshotAndContinue.Text = "Save and Continue"; + this.btnScreenshotAndContinue.UseVisualStyleBackColor = true; + this.btnScreenshotAndContinue.Click += new System.EventHandler(this.btnScreenshotAndContinue_Click); + // + // btnPreview + // + this.btnPreview.Location = new System.Drawing.Point(18, 95); + this.btnPreview.Name = "btnPreview"; + this.btnPreview.Size = new System.Drawing.Size(208, 35); + this.btnPreview.TabIndex = 8; + this.btnPreview.Text = "Preview"; + this.btnPreview.UseVisualStyleBackColor = true; + this.btnPreview.Click += new System.EventHandler(this.btnPreview_Click); + // // PauseAndContinueForm // this.AcceptButton = this.btnContinue; this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; - this.ClientSize = new System.Drawing.Size(304, 200); + this.ClientSize = new System.Drawing.Size(304, 273); this.ControlBox = false; + this.Controls.Add(this.btnPreview); + this.Controls.Add(this.btnScreenshotAndContinue); this.Controls.Add(this.saveScreenshotCheckbox); - this.Controls.Add(this.btnCopyMetafileToClipboard); - this.Controls.Add(this.btnCopyToClipBoard); + this.Controls.Add(this.btnScreenshot); this.Controls.Add(this.lblDescriptionLink); this.Controls.Add(this.lblDescription); this.Controls.Add(this.btnContinue); @@ -147,9 +153,10 @@ private void InitializeComponent() private System.Windows.Forms.Button btnContinue; private System.Windows.Forms.Label lblDescription; private System.Windows.Forms.LinkLabel lblDescriptionLink; - private System.Windows.Forms.Button btnCopyToClipBoard; + private System.Windows.Forms.Button btnScreenshot; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.Button btnCopyMetafileToClipboard; private System.Windows.Forms.CheckBox saveScreenshotCheckbox; + private System.Windows.Forms.Button btnScreenshotAndContinue; + private System.Windows.Forms.Button btnPreview; } } \ No newline at end of file diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs index bdcaae748f..f4f8cc628a 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs @@ -18,16 +18,15 @@ */ using System; +using System.Drawing; +using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading; using System.Windows.Forms; -using DigitalRune.Windows.Docking; using pwiz.Common.SystemUtil; using pwiz.Skyline; -using pwiz.Skyline.Controls.Graphs; using pwiz.Skyline.Controls.Startup; -using pwiz.Skyline.EditUI; using pwiz.Skyline.Util; using pwiz.Skyline.Util.Extensions; @@ -35,39 +34,22 @@ namespace pwiz.SkylineTestUtil { public partial class PauseAndContinueForm : Form { - private static bool _saveScreenShotChecked = false; + private static bool _saveScreenShotChecked = true; + private static ScreenshotPreviewForm screenshotPreviewForm = new ScreenshotPreviewForm(); private readonly string _linkUrl; private readonly bool _showMatchingPage; private readonly string _fileToSave; - private Form _screenshotForm; + private Control _screenshotForm; private ScreenshotManager _screenshotManager; + private Func _processShot; - public PauseAndContinueForm(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, Form screenshotForm = null, ScreenshotManager screenshotManager = null) + public PauseAndContinueForm(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, Control screenshotForm = null, ScreenshotManager screenshotManager = null, Func processShot = null) { InitializeComponent(); _screenshotForm = screenshotForm; _screenshotManager = screenshotManager; _fileToSave = fileToSave; - - if (_screenshotForm != null && _screenshotManager != null) - { - if (_screenshotForm is DockableForm dockableForm && dockableForm.DockState != DockState.Floating) - { - // If this dockable window isn't a floating window, then caller meant to screenshot the Skyline window - var parent = _screenshotForm.ParentForm; - if (parent != null) - { - _screenshotForm = parent; - } - } - // Show the copy buttons - btnCopyToClipBoard.Visible = btnCopyToClipBoard.Enabled = true; - if ((_screenshotForm is GraphSummary zgControl) && zgControl.GraphControl != null) - { - btnCopyMetafileToClipboard.Visible = btnCopyMetafileToClipboard.Enabled = true; // Control is a metafile provider - } - } - + _processShot = processShot; saveScreenshotCheckbox.Checked = _saveScreenShotChecked; _linkUrl = link; @@ -102,10 +84,17 @@ public PauseAndContinueForm(string description = null, string fileToSave = null, // Finally make sure the button is fully visible Height += Math.Max(0, (btnContinue.Bottom + btnContinue.Left) - ClientRectangle.Bottom); + + setScreenshotButtonLabels(); } private void btnContinue_Click(object sender, EventArgs e) { + if (screenshotPreviewForm.Visible) + { + screenshotPreviewForm.Hide(); + } + Close(); // Start the tests again @@ -122,7 +111,7 @@ protected override bool ShowWithoutActivation private static readonly object _pauseLock = new object(); - public static void Show(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, int? timeout = null, Form screenshotForm = null, ScreenshotManager screenshotManager = null) + public static void Show(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, int? timeout = null, Control screenshotForm = null, ScreenshotManager screenshotManager = null, Func processShot = null) { ClipboardEx.UseInternalClipboard(false); @@ -134,7 +123,7 @@ public static void Show(string description = null, string fileToSave = null, str RunUI(parentWindow, () => { - var dlg = new PauseAndContinueForm(description, fileToSave, link, showMatchingPages, screenshotForm, screenshotManager) { Left = parentWindow.Left }; + var dlg = new PauseAndContinueForm(description, fileToSave, link, showMatchingPages, screenshotForm, screenshotManager, processShot) { Left = parentWindow.Left }; const int spacing = 15; var screen = Screen.FromControl(parentWindow); if (parentWindow.Top > screen.WorkingArea.Top + dlg.Height + spacing) @@ -224,33 +213,38 @@ public void GotoLink() static extern bool SetForegroundWindow(IntPtr hWnd); - private void btnCopyToClipboard_Click(object sender, EventArgs e) + private void btnScreenshot_Click(object sender, EventArgs e) { // Copy current window image to clipboard, with clean edges _screenshotForm.Focus(); - _screenshotManager.TakeNextShot(_screenshotForm); - if (saveScreenshotCheckbox.Checked) - { - _screenshotManager.TakeNextShot(_screenshotForm, _fileToSave); - } + _screenshotManager.TakeShot(_screenshotForm, saveScreenshotCheckbox.Checked ? _fileToSave : null, _processShot); + } + private void saveScreenshotCheckbox_CheckedChanged(object sender, EventArgs e) + { + _saveScreenShotChecked = saveScreenshotCheckbox.Checked; + setScreenshotButtonLabels(); } - private void btnCopyMetaFileToClipboard_Click(object sender, EventArgs e) + private void btnScreenshotAndContinue_Click(object sender, EventArgs e) + { + btnScreenshot_Click(sender, e); + btnContinue_Click(sender, e); + } + private void btnPreview_Click(object sender, EventArgs e) { _screenshotForm.Focus(); - if (_screenshotForm is GraphSummary zgControl) - { - CopyEmfToolStripMenuItem.CopyEmf(zgControl.GraphControl); - } - if (saveScreenshotCheckbox.Checked) - { - _screenshotManager.TakeNextShot(_screenshotForm, _fileToSave); - } + Bitmap screenshot = _screenshotManager.TakeShot(_screenshotForm, null, _processShot); + + var existingImageBytes = File.ReadAllBytes(_fileToSave); + var existingImageMemoryStream = new MemoryStream(existingImageBytes); + screenshotPreviewForm.ShowScreenshotPreview(screenshot, new Bitmap(existingImageMemoryStream)); } - private void saveScreenshotCheckbox_CheckedChanged(object sender, EventArgs e) + + private void setScreenshotButtonLabels() { - _saveScreenShotChecked = saveScreenshotCheckbox.Checked; + btnScreenshot.Text = saveScreenshotCheckbox.Checked ? "Save Screenshot" : "Take Screenshot"; + btnScreenshotAndContinue.Text = saveScreenshotCheckbox.Checked ? "Save and Continue" : "Take and Continue"; } } } diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.resx b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.resx index 862b8a070d..ca64ac8090 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.resx +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.resx @@ -120,7 +120,7 @@ 17, 17 - + Copies window image to clipboard, and tries to clean up image border by setting all edge pixels to the color most used in the original edge pixels. This may not work well for all system settings, if so you will need to reposition the image so that it is over an empty background (e.g. MSPaint) and use Alt-PrtScn instead. diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs index 58fc70accb..8df61a74c6 100644 --- a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs @@ -4,37 +4,26 @@ using System.Drawing.Imaging; using System.IO; using System.Linq; -using System.Reflection; using System.Runtime.InteropServices; using System.Threading; using System.Windows.Forms; -using System.Xml; using DigitalRune.Windows.Docking; using JetBrains.Annotations; -using Microsoft.VisualStudio.TestTools.UnitTesting; using pwiz.Skyline; +using ZedGraph; namespace pwiz.SkylineTestUtil { public class ScreenshotManager { - protected const string ROOT_ELEMENT = "shot_list"; - - private List _shotSequence = new List(); -// private ShotType _defaultShotType = ShotType.ActiveWindow; private SkylineWindow _skylineWindow; - private int _currentShotIndex; - private TestContext _ctx; - private XmlDocument _storage; - public class PointFactor { private float _factor; public PointFactor(float pFactor) { _factor = pFactor; } - - public float getFloat() { return _factor; } + public static Point operator *(Point pt, PointFactor pFactor) => new Point((int)Math.Round(pt.X * pFactor._factor), (int)Math.Round(pt.Y * pFactor._factor)); public static Size operator *(Size sz, PointFactor pFactor) => new Size((int)Math.Round(sz.Width * pFactor._factor), (int)Math.Round(sz.Height * pFactor._factor)); public static Rectangle operator *(Rectangle rect, PointFactor pFactor) => new Rectangle(rect.Location * pFactor, rect.Size * pFactor); @@ -50,125 +39,87 @@ public class PointAdditive public static implicit operator Point(PointAdditive add) => add._add; } - public enum ShotType{ ActiveWindow, SkylineWindow, SkylineCustomArea} - private abstract class SkylineScreenshot + public static Rectangle GetWindowRectangle(Control ctrl) { -// private readonly ShotType _type; -// private readonly SkylineWindow _skylineWindow; - - protected const string SHOT_ELEMENT = "shot"; - protected const string SHOT_TYPE_ATTRIBUTE = "type"; - protected const string SHOT_TYPE_VAL_ACTIVE_FORM = "active_form"; - protected const string SHOT_TYPE_VAL_CUSTOM_AREA = "skyline_relative_frame"; - protected const string SHOT_FRAME_ELEMENT = "frame"; - protected const string SHOT_FRAME_LEFT_ATTRIBUTE = "left"; - protected const string SHOT_FRAME_TOP_ATTRIBUTE = "top"; - protected const string SHOT_FRAME_RIGHT_ATTRIBUTE = "right"; - protected const string SHOT_FRAME_BOTTOM_ATTRIBUTE = "bottom"; - - - [DllImport("gdi32.dll")] - static extern int GetDeviceCaps(IntPtr hdc, int nIndex); - [DllImport("user32.dll")] - private static extern IntPtr GetForegroundWindow(); - - public enum DeviceCap + Rectangle snapshotBounds = Rectangle.Empty; + + DockState[] dockedStates = new DockState[] { DockState.DockBottom, DockState.DockLeft, DockState.DockRight, DockState.DockTop, DockState.Document }; + var form = ctrl as DockableForm; + if (form != null && dockedStates.Any((state) => form.DockState == state)) { - VERTRES = 10, - DESKTOPVERTRES = 117, + Point origin = Point.Empty; + ctrl.Invoke(new Action(() => { origin = form.Pane.PointToScreen(new Point(0, 0)); })); + snapshotBounds = new Rectangle(origin, form.Pane.Size); } - - /** - * Factory method - */ - public static SkylineScreenshot CreateScreenshot(SkylineWindow pSkylineWindow, [NotNull] XmlNode shotNode) + else { - // ReSharper disable PossibleNullReferenceException - if (shotNode.Attributes[SHOT_TYPE_ATTRIBUTE] == null) - throw new InvalidDataException("Invalid XML. type attribute was expected but was not found."); - - if (shotNode.Attributes[SHOT_TYPE_ATTRIBUTE].Value == SHOT_TYPE_VAL_ACTIVE_FORM) - return new ActiveWindowShot(pSkylineWindow, shotNode); - else if (shotNode.Attributes[SHOT_TYPE_ATTRIBUTE].Value == SHOT_TYPE_VAL_CUSTOM_AREA) - return new CustomAreaShot(pSkylineWindow, shotNode); - else throw new InvalidDataException("Unsupported screenshot type"); - // ReSharper restore PossibleNullReferenceException - } + //TODO BEFORE MERGE: figure out what to do when it is not a form + if (ctrl is Form && (ctrl as Form).ParentForm is FloatingWindow) + ctrl = (ctrl as Form).ParentForm; + int frameWidth = ((ctrl as Form).DesktopBounds.Width - ctrl.ClientRectangle.Width) / 2 - SystemInformation.Border3DSize.Width + SystemInformation.BorderSize.Width; + Size imageSize = ctrl.Size + new PointAdditive(-2 * frameWidth, -frameWidth); + Point sourcePoint = ctrl.Location + new PointAdditive(frameWidth, 0); + snapshotBounds = new Rectangle(sourcePoint, imageSize); - public SkylineScreenshot(ShotType pShotType, SkylineWindow pSkylineWindow) - { -// _type = pShotType; -// _skylineWindow = pSkylineWindow; } + return snapshotBounds * GetScalingFactor(); + } - protected PointFactor GetScalingFactor() - { - Graphics g = Graphics.FromHwnd(IntPtr.Zero); - IntPtr desktop = g.GetHdc(); - int LogicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES); - int PhysicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES); + [DllImport("gdi32.dll")] + static extern int GetDeviceCaps(IntPtr hdc, int nIndex); - float ScreenScalingFactor = PhysicalScreenHeight / (float)LogicalScreenHeight; + private enum DeviceCap + { + VERTRES = 10, + DESKTOPVERTRES = 117, + } - return new PointFactor(ScreenScalingFactor); // 1.25 = 125% - } + public static PointFactor GetScalingFactor() + { + Graphics g = Graphics.FromHwnd(IntPtr.Zero); + IntPtr desktop = g.GetHdc(); + int LogicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.VERTRES); + int PhysicalScreenHeight = GetDeviceCaps(desktop, (int)DeviceCap.DESKTOPVERTRES); + float ScreenScalingFactor = PhysicalScreenHeight / (float)LogicalScreenHeight; - protected Rectangle GetWindowRectangle(Form frm) + return new PointFactor(ScreenScalingFactor); // 1.25 = 125% + } + private abstract class SkylineScreenshot + { + /** + * Factory method + */ + public static SkylineScreenshot CreateScreenshot(Control control) { - Rectangle snapshotBounds = Rectangle.Empty; - - DockState[] dockedStates = new DockState[]{DockState.DockBottom, DockState.DockLeft, DockState.DockBottom, DockState.DockTop, DockState.Document}; - if (frm is DockableForm && dockedStates.Any((state) => ((frm as DockableForm)?.DockState == state) ) ) + SkylineScreenshot newShot; + if (control is ZedGraphControl zedGraphControl) { - Point origin = Point.Empty; - frm.Invoke(new Action(() => { origin = frm.PointToScreen(new Point(0, 0)); })); - PointAdditive frameOffset = new PointAdditive(-((frm as DockableForm).Pane.Width - frm.Width) / 2, - -((frm as DockableForm).Pane.Height - frm.Height)); - snapshotBounds = new Rectangle(origin + frameOffset, (frm as DockableForm).Pane.Size); + newShot = new ZedGraphShot(zedGraphControl); } else { - if (frm.ParentForm is FloatingWindow) - frm = frm.ParentForm; - int frameWidth = (frm.DesktopBounds.Width - frm.ClientRectangle.Width) / 2 - SystemInformation.Border3DSize.Width + SystemInformation.BorderSize.Width; - Size imageSize = frm.Size + new PointAdditive(-2 * frameWidth, -frameWidth); - Point sourcePoint = frm.Location + new PointAdditive(frameWidth, 0); - snapshotBounds = new Rectangle(sourcePoint, imageSize); - + newShot = new ActiveWindowShot(control); } - return snapshotBounds * GetScalingFactor(); - } - /** - * Incapsulates UI actions required to configure the screenshot. In the case of CustomAreaShot it should - * show the framing window and take its coordinates. Nothing to be done for an ActiveWindowShot. - */ - public abstract void SetUp(); - public abstract Bitmap Take(Form activeWindow); - public abstract XmlNode Serialize(XmlDocument pDoc); + return newShot; + } + public abstract Bitmap Take(); } private class ActiveWindowShot : SkylineScreenshot { - public ActiveWindowShot(SkylineWindow pSkylineWindow, XmlNode pNode) : - base(ShotType.ActiveWindow, pSkylineWindow) + private readonly Control _activeWindow; + public ActiveWindowShot(Control activeWindow) { - - } - public ActiveWindowShot(SkylineWindow pSkylineWindow) : - base(ShotType.ActiveWindow, pSkylineWindow) - { - + _activeWindow = activeWindow; } - public override void SetUp() {} - [NotNull] - public override Bitmap Take(Form activeWindow) + public override Bitmap Take() { - Rectangle shotFrame = GetWindowRectangle(activeWindow); + Rectangle shotFrame = GetWindowRectangle(_activeWindow); Bitmap bmCapture = new Bitmap(shotFrame.Width, shotFrame.Height, PixelFormat.Format32bppArgb); Graphics graphCapture = Graphics.FromImage(bmCapture); bool captured = false; @@ -188,161 +139,63 @@ public override Bitmap Take(Form activeWindow) graphCapture.Dispose(); return bmCapture; } - - [NotNull] - public override XmlNode Serialize(XmlDocument pDoc) - { - // ReSharper disable PossibleNullReferenceException - XmlNode node = pDoc.CreateElement(SHOT_ELEMENT); - XmlAttribute typeAttr = pDoc.CreateAttribute(SHOT_TYPE_ATTRIBUTE); - typeAttr.Value = SHOT_TYPE_VAL_ACTIVE_FORM; - node.Attributes.Append(typeAttr); - pDoc.DocumentElement.AppendChild(node); - return node; - // ReSharper restore PossibleNullReferenceException - } - } - private class CustomAreaShot : SkylineScreenshot + private class ZedGraphShot : SkylineScreenshot { - private Rectangle _shotFrame; - public CustomAreaShot(SkylineWindow pSkylineWindow, [NotNull] XmlNode pNode) : base(ShotType.ActiveWindow, pSkylineWindow) - { - if (pNode.FirstChild != null && pNode.FirstChild.LocalName == SHOT_FRAME_ELEMENT) - { - XmlAttributeCollection rAtts = pNode.FirstChild.Attributes ?? - throw new NullReferenceException( - nameof(pNode.FirstChild.Attributes)); - _shotFrame = new Rectangle(Int16.Parse(rAtts[SHOT_FRAME_LEFT_ATTRIBUTE].Value), - Int16.Parse(rAtts[SHOT_FRAME_TOP_ATTRIBUTE].Value), - Int16.Parse(rAtts[SHOT_FRAME_RIGHT_ATTRIBUTE].Value), - Int16.Parse(rAtts[SHOT_FRAME_BOTTOM_ATTRIBUTE].Value) - ); - } - else throw new InvalidDataException("Expected frame coordinates for this type of a screenshot, but it was not found."); - } - public CustomAreaShot(SkylineWindow pSkylineWindow) : base(ShotType.SkylineCustomArea, pSkylineWindow) - { - - } - - [NotNull] - public override XmlNode Serialize(XmlDocument pDoc) + private readonly ZedGraphControl _zedGraphControl; + public ZedGraphShot(ZedGraphControl zedGraphControl) { - throw new NotImplementedException(); + _zedGraphControl = zedGraphControl; } - - /** - * Display the snapshot area selector and return the resulting rectangle - * in display coordinates. - */ - public Rectangle ShowAreaSelector() + public override Bitmap Take() { - throw new NotImplementedException(); - } - - public override void SetUp() - { - } - - public override Bitmap Take(Form activeWindow) - { - Bitmap bmCapture = new Bitmap(_shotFrame.Width, _shotFrame.Height, PixelFormat.Format32bppArgb); - Graphics graphCapture = Graphics.FromImage(bmCapture); - graphCapture.CopyFromScreen(_shotFrame.Location, - new Point(0, 0), _shotFrame.Size); - graphCapture.Dispose(); - return bmCapture; + Metafile emf = (_zedGraphControl.MasterPane.GetMetafile()); + Bitmap bmp = new Bitmap(emf.Width, emf.Height); + bmp.SetResolution(emf.HorizontalResolution, emf.VerticalResolution); + using (Graphics g = Graphics.FromImage(bmp)) + { + g.DrawImage(emf, 0, 0); + } + return bmp; } } - - private string FilePath + public ScreenshotManager([NotNull] SkylineWindow pSkylineWindow) { - get - { - var exeDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - return Path.Combine(exeDir ?? "", _ctx.TestName + "_shots"); - } + _skylineWindow = pSkylineWindow; } - public ScreenshotManager([NotNull] TestContext ctx, [NotNull] SkylineWindow pSkylineWindow) - { - //look up the settings file, read and parse if found - //set up defaults otherwise - _ctx = ctx; + public Bitmap TakeShot(Control activeWindow, string pathToSave = null, Func processShot = null, double? scale = null) + { + if (activeWindow == null) + activeWindow = _skylineWindow; + //check UI and create a blank shot according to the user selection + SkylineScreenshot newShot = SkylineScreenshot.CreateScreenshot(activeWindow); - _storage = new XmlDocument(); + Bitmap shotPic = newShot.Take(); + shotPic = processShot != null ? processShot.Invoke(shotPic) : shotPic; + CleanupBorder(shotPic); // Tidy up annoying variations in screenshot border due to underlying windows - if (File.Exists(FilePath)) + if (scale.HasValue) { - _storage.Load(FilePath); - XmlNode root = _storage.DocumentElement; - // ReSharper disable once PossibleNullReferenceException - if (root.HasChildNodes) - { - foreach (XmlNode shotNode in root.ChildNodes) - { - _shotSequence.Add(SkylineScreenshot.CreateScreenshot(pSkylineWindow, shotNode)); - } - } + shotPic = new Bitmap(shotPic, + (int) Math.Round(shotPic.Width * scale.Value), + (int) Math.Round(shotPic.Height * scale.Value)); } - else - _storage.AppendChild(_storage.CreateElement(ROOT_ELEMENT)); - - _currentShotIndex = -1; - } - - public Bitmap TakeNextShot(Form activeWindow, string pathToSave = null, Action processShot = null, double? scale = null) - { - _skylineWindow = Program.MainWindow; - if (activeWindow == null) - activeWindow = _skylineWindow; - Bitmap shotPic; - if ( ++_currentShotIndex < _shotSequence.Count) - { - shotPic = _shotSequence[_currentShotIndex].Take(activeWindow); - } - else + if (pathToSave != null) { - //check UI and create a blank shot according to the user selection - SkylineScreenshot newShot = new ActiveWindowShot(_skylineWindow); - _shotSequence.Add(newShot); - _currentShotIndex = _shotSequence.Count - 1; - shotPic = _shotSequence.Last().Take(activeWindow); - // ReSharper disable once PossibleNullReferenceException - _storage.DocumentElement.AppendChild(newShot.Serialize(_storage)); - SaveToFile(); + SaveToFile(pathToSave, shotPic); } - if (shotPic != null) - { - processShot?.Invoke(shotPic); - CleanupBorder(shotPic); // Tidy up annoying variations in screenshot border due to underlying windows - - if (scale.HasValue) - { - shotPic = new Bitmap(shotPic, - (int) Math.Round(shotPic.Width * scale.Value), - (int) Math.Round(shotPic.Height * scale.Value)); - } - if (pathToSave != null) - { - SaveToFile(pathToSave, shotPic); - } - else - { - //Have to do it this way because of the limitation on OLE access from background threads. - Thread clipThread = new Thread(() => Clipboard.SetImage(shotPic)); - clipThread.SetApartmentState(ApartmentState.STA); - clipThread.Start(); - clipThread.Join(); - } - } + //Have to do it this way because of the limitation on OLE access from background threads. + Thread clipThread = new Thread(() => Clipboard.SetImage(shotPic)); + clipThread.SetApartmentState(ApartmentState.STA); + clipThread.Start(); + clipThread.Join(); return shotPic; } @@ -395,7 +248,6 @@ void UpdateStats(int x, int y) private void SaveToFile(string filePath, Bitmap bmp) { - filePath = filePath ?? FilePath; if (File.Exists(filePath)) File.Delete(filePath); var dirPath = Path.GetDirectoryName(filePath); @@ -404,14 +256,6 @@ private void SaveToFile(string filePath, Bitmap bmp) bmp.Save(filePath); } - - private void SaveToFile() - { - if (File.Exists(FilePath)) - File.Delete(FilePath); - - _storage.Save(FilePath); - } } } diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs new file mode 100644 index 0000000000..89dc71b279 --- /dev/null +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs @@ -0,0 +1,137 @@ +namespace pwiz.SkylineTestUtil +{ + partial class ScreenshotPreviewForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.newScreenshotPictureBox = new System.Windows.Forms.PictureBox(); + this.oldScreenshotPictureBox = new System.Windows.Forms.PictureBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.newScreenshotLabel = new System.Windows.Forms.Label(); + this.oldScreenshotLabel = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.newScreenshotPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.oldScreenshotPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // newScreenshotPictureBox + // + this.newScreenshotPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.newScreenshotPictureBox.Location = new System.Drawing.Point(0, 0); + this.newScreenshotPictureBox.Name = "newScreenshotPictureBox"; + this.newScreenshotPictureBox.Size = new System.Drawing.Size(308, 226); + this.newScreenshotPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.newScreenshotPictureBox.TabIndex = 0; + this.newScreenshotPictureBox.TabStop = false; + // + // oldScreenshotPictureBox + // + this.oldScreenshotPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.oldScreenshotPictureBox.Location = new System.Drawing.Point(0, 0); + this.oldScreenshotPictureBox.Name = "oldScreenshotPictureBox"; + this.oldScreenshotPictureBox.Size = new System.Drawing.Size(328, 226); + this.oldScreenshotPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.oldScreenshotPictureBox.TabIndex = 1; + this.oldScreenshotPictureBox.TabStop = false; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.IsSplitterFixed = true; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.newScreenshotLabel); + this.splitContainer1.Panel1.Controls.Add(this.newScreenshotPictureBox); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.oldScreenshotLabel); + this.splitContainer1.Panel2.Controls.Add(this.oldScreenshotPictureBox); + this.splitContainer1.Size = new System.Drawing.Size(637, 226); + this.splitContainer1.SplitterDistance = 308; + this.splitContainer1.SplitterWidth = 1; + this.splitContainer1.TabIndex = 2; + // + // newScreenshotLabel + // + this.newScreenshotLabel.AutoSize = true; + this.newScreenshotLabel.BackColor = System.Drawing.SystemColors.ActiveCaptionText; + this.newScreenshotLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F); + this.newScreenshotLabel.ForeColor = System.Drawing.SystemColors.Window; + this.newScreenshotLabel.Location = new System.Drawing.Point(13, 13); + this.newScreenshotLabel.Name = "newScreenshotLabel"; + this.newScreenshotLabel.Size = new System.Drawing.Size(221, 32); + this.newScreenshotLabel.TabIndex = 1; + this.newScreenshotLabel.Text = "New Screenshot"; + // + // oldScreenshotLabel + // + this.oldScreenshotLabel.AutoSize = true; + this.oldScreenshotLabel.BackColor = System.Drawing.SystemColors.ActiveCaptionText; + this.oldScreenshotLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F); + this.oldScreenshotLabel.ForeColor = System.Drawing.SystemColors.Window; + this.oldScreenshotLabel.Location = new System.Drawing.Point(13, 13); + this.oldScreenshotLabel.Name = "oldScreenshotLabel"; + this.oldScreenshotLabel.Size = new System.Drawing.Size(210, 32); + this.oldScreenshotLabel.TabIndex = 2; + this.oldScreenshotLabel.Text = "Old Screenshot"; + // + // ScreenshotPreviewForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(637, 226); + this.Controls.Add(this.splitContainer1); + this.Name = "ScreenshotPreviewForm"; + this.Text = "ScreenshotPreviewForm"; + ((System.ComponentModel.ISupportInitialize)(this.newScreenshotPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.oldScreenshotPictureBox)).EndInit(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel1.PerformLayout(); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.Panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox newScreenshotPictureBox; + private System.Windows.Forms.PictureBox oldScreenshotPictureBox; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.Label newScreenshotLabel; + private System.Windows.Forms.Label oldScreenshotLabel; + } +} \ No newline at end of file diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs new file mode 100644 index 0000000000..c0c3e60a94 --- /dev/null +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs @@ -0,0 +1,68 @@ +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace pwiz.SkylineTestUtil +{ + public partial class ScreenshotPreviewForm : Form + { + private static readonly int SCREENSHOT_MAX_WIDTH = 800; //doubled as side by side + private static readonly int SCREENSHOT_MAX_HEIGHT = 800; + + public ScreenshotPreviewForm() + { + InitializeComponent(); + } + + + public void ShowScreenshotPreview(Bitmap newScreenshot, Bitmap oldScreenShot) + { + var newScreenshotSize = CalculateBitmapSize(newScreenshot); + var oldScreenshotSize = CalculateBitmapSize(oldScreenShot); + var newScreenshotBitmap = new Bitmap(newScreenshot, newScreenshotSize); + var oldScreenshotBitmap = new Bitmap(oldScreenShot, oldScreenshotSize); + SetPreviewImages(newScreenshotBitmap, oldScreenshotBitmap); + this.Show(); + } + + protected override void OnFormClosing(FormClosingEventArgs e) + { + e.Cancel = true; + this.Hide(); + + base.OnFormClosing(e); + } + + private void SetPreviewImages(Bitmap newScreenshot, Bitmap oldScreenShot) + { + newScreenshotPictureBox.Image = newScreenshot; + oldScreenshotPictureBox.Image = oldScreenShot; + + splitContainer1.SplitterDistance = splitContainer1.Width / 2; + + var minFormWidth = newScreenshot.Width + oldScreenShot.Width; + var minFormHeight = Math.Max(newScreenshot.Height, oldScreenShot.Height); + if (ClientSize.Width < minFormWidth || ClientSize.Height < minFormHeight) + { + ClientSize = new Size(minFormWidth, minFormHeight); + } + + } + + private Size CalculateBitmapSize(Bitmap bitmap) + { + var startingSize = bitmap.Size; + var scaledHeight = (double)SCREENSHOT_MAX_HEIGHT / startingSize.Height; + var scaledWidth = (double)SCREENSHOT_MAX_WIDTH / startingSize.Width; + + //If constraints are not breached then use existing size + if (scaledHeight >= 1 && scaledWidth >= 1) + { + return startingSize; + } + + var scale = Math.Min(scaledHeight, scaledWidth); + return new Size((int)(startingSize.Width * scale), (int)(startingSize.Height * scale)); + } + } +} diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.resx b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.resx new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs index dd78d911cc..a56ee0aa18 100644 --- a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs +++ b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs @@ -30,6 +30,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Windows.Forms; +using DigitalRune.Windows.Docking; using Excel; using JetBrains.Annotations; // using Microsoft.Diagnostics.Runtime; only needed for stack dump logic, which is currently disabled @@ -38,6 +39,7 @@ using pwiz.Common.DataBinding; using pwiz.Common.GUI; using pwiz.Common.SystemUtil; +using pwiz.MSGraph; using pwiz.ProteomeDatabase.Fasta; using pwiz.ProteowizardWrapper; using pwiz.Skyline; @@ -52,7 +54,6 @@ using pwiz.Skyline.Model; using pwiz.Skyline.Model.AuditLog; using pwiz.Skyline.Model.DocSettings; -using pwiz.Skyline.Model.DocSettings.AbsoluteQuantification; using pwiz.Skyline.Model.Find; using pwiz.Skyline.Model.Lib.BlibData; using pwiz.Skyline.Model.Proteome; @@ -63,6 +64,9 @@ using pwiz.Skyline.Util; using pwiz.Skyline.Util.Extensions; using TestRunnerLib; +using ZedGraph; +using static alglib; +using SampleType = pwiz.Skyline.Model.DocSettings.AbsoluteQuantification.SampleType; namespace pwiz.SkylineTestUtil { @@ -1277,7 +1281,7 @@ private string TutorialPath } } - private int ScreenShotCounter; + private int ScreenShotCounter = 1; public virtual bool AuditLogCompareLogs { @@ -1310,12 +1314,46 @@ private string LinkPage(int? pageNum) } private static FormLookup _formLookup; + protected Func ClipSkylineWindowShotWithForms(List dockableForms) + { + return (originalShot) => + { + Rectangle cropArea = ComputeDockableFormInclusiveRectangle(dockableForms); + Bitmap croppedShot = new Bitmap(cropArea.Width, cropArea.Height); + using (Graphics g = Graphics.FromImage(croppedShot)) + { + g.DrawImage(originalShot, new Rectangle(0, 0, cropArea.Width, cropArea.Height), cropArea, GraphicsUnit.Pixel); + } + + return croppedShot; + }; + } + private Rectangle ComputeDockableFormInclusiveRectangle(List dockableForms) + { + return dockableForms + .Select(ComputeDockableFormScreenRectangle) + .Aggregate(Rectangle.Union); + } + + private Rectangle ComputeDockableFormScreenRectangle(DockableForm dockableForm) + { + Rectangle formRectangle = ScreenshotManager.GetWindowRectangle(dockableForm); + Point skylineWindowPoint = new Point(SkylineWindow.Location.X, SkylineWindow.Location.Y) * ScreenshotManager.GetScalingFactor(); + Point skylineRelativeOrigin = new Point(formRectangle.X - skylineWindowPoint.X, formRectangle.Y - skylineWindowPoint.Y); + return new Rectangle(skylineRelativeOrigin, formRectangle.Size); + } + + protected GraphSummary FindGraphSummaryByGraphType() where TGraphPane : SummaryGraphPane + { + return FormUtil.OpenForms.OfType() + .FirstOrDefault(graphSummary => graphSummary.TryGetGraphPane(out TGraphPane _)); + } - public void PauseForScreenShot(string description = null, int? pageNum = null, int? timeout = null) + public void PauseForScreenShot(string description = null, int? pageNum = null, int? timeout = null, Func processShot = null) { - PauseForScreenShot(description, pageNum, null, null, timeout); + PauseForScreenShot(description, pageNum, null, null, timeout, processShot); } - public void PauseForScreenShot(Form screenshotForm, string description = null, int? pageNum = null, int ? timeout = null) + public void PauseForScreenShot(Control screenshotForm, string description = null, int? pageNum = null, int ? timeout = null) { PauseForScreenShot(description, pageNum, null, screenshotForm, timeout); } @@ -1326,7 +1364,28 @@ public void PauseForScreenShot(string description, int? pageNum = null, i PauseForScreenShot(description, pageNum, typeof(TView), null, timeout); } - private void PauseForScreenShot(string description, int? pageNum, Type formType, Form screenshotForm = null, int ? timeout = null) + public void PauseForGraphScreenShot(string description, Control graphContainer, int? pageNum = null, int? timeout = null) + { + var zedGraph = FindZedGraph(graphContainer); + Assert.IsNotNull(zedGraph, "Control was not or did not contain graph"); + PauseForScreenShot(description, pageNum, null, zedGraph, timeout); + } + + private ZedGraphControl FindZedGraph(Control graphContainer) + { + var zedGraphControl = graphContainer as ZedGraphControl; + if (zedGraphControl != null) + return zedGraphControl; + foreach (Control childControl in graphContainer.Controls) + { + zedGraphControl = FindZedGraph(childControl); + if (zedGraphControl != null) + return zedGraphControl; + } + + return null; + } + private void PauseForScreenShot(string description, int? pageNum, Type formType = null, Control screenshotForm = null, int ? timeout = null, Func processShot = null) { if (formType != null) { @@ -1353,9 +1412,6 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, RunUI(() => screenshotForm?.Update()); } -// Thread.Sleep(300); -// _shotManager.TakeNextShot(screenshotForm); - var formSeen = new FormSeen(); formSeen.Saw(formType); var fileToSave = !String.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, "s-" +ScreenShotCounter++)}.png" : null; @@ -1364,12 +1420,12 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, { Thread.Sleep(3000); screenshotForm.Focus(); - _shotManager.TakeNextShot(screenshotForm, fileToSave); + _shotManager.TakeShot(screenshotForm, fileToSave, processShot); } else { bool showMatchingPages = IsShowMatchingTutorialPages || Program.ShowMatchingPages; - PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager); + PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager, processShot); } } @@ -1379,9 +1435,10 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType, } } - protected virtual void ProcessCoverShot(Bitmap bmp) + protected virtual Bitmap ProcessCoverShot(Bitmap bmp) { // Override to modify the cover shot before it is saved or put on the clipboard + return bmp; } public void TakeCoverShot() @@ -1394,13 +1451,13 @@ public void TakeCoverShot() "Cover shots must be taken at screen resolution 1920x1080 at scale factor 100% (96DPI)"); }); var coverSavePath = GetCoverShotPath(); - ScreenshotManager.TakeNextShot(SkylineWindow, coverSavePath, ProcessCoverShot); + ScreenshotManager.TakeShot(SkylineWindow, coverSavePath, ProcessCoverShot); string coverSavePath2 = null; if (coverSavePath != null) { // Screenshot for the StartPage coverSavePath2 = GetCoverShotPath(TestContext.GetProjectDirectory(@"Resources\StartPage"), "_start"); - ScreenshotManager.TakeNextShot(SkylineWindow, coverSavePath2, ProcessCoverShot, 0.20); + ScreenshotManager.TakeShot(SkylineWindow, coverSavePath2, ProcessCoverShot, 0.20); } if (coverSavePath == null) { @@ -1550,7 +1607,7 @@ protected void RunFunctionalTestOrThrow(string defaultUiMode) UnzipTestFiles(); - _shotManager = new ScreenshotManager(TestContext, SkylineWindow); + _shotManager = new ScreenshotManager(SkylineWindow); // Run test in new thread (Skyline on main thread). Program.Init(); diff --git a/pwiz_tools/Skyline/TestUtil/TestUtil.csproj b/pwiz_tools/Skyline/TestUtil/TestUtil.csproj index 210ef8817a..cf4dd2cfe7 100644 --- a/pwiz_tools/Skyline/TestUtil/TestUtil.csproj +++ b/pwiz_tools/Skyline/TestUtil/TestUtil.csproj @@ -150,6 +150,12 @@ + + Form + + + ScreenshotPreviewForm.cs + @@ -231,6 +237,10 @@ PauseAndContinueForm.cs + Designer + + + ScreenshotPreviewForm.cs From 7525bbce90caaafb61db953972ef539e618cf465 Mon Sep 17 00:00:00 2001 From: brendanx67 Date: Fri, 25 Oct 2024 09:38:22 -0700 Subject: [PATCH 8/8] - fixes and extensions based automating screenshots for AbsoluteQuantTutorialTest and MethodEditTutorialTest --- pwiz_tools/Skyline/Controls/PopupPickList.cs | 1 + pwiz_tools/Skyline/Controls/SequenceTree.cs | 5 + pwiz_tools/Skyline/EditUI/PasteDlg.cs | 15 +++ .../Skyline/EditUI/UniquePeptidesDlg.cs | 6 + pwiz_tools/Skyline/Skyline.cs | 10 +- .../TestTutorial/AbsoluteQuantTutorialTest.cs | 25 ++-- .../Skyline/TestTutorial/DiaTutorialTest.cs | 10 +- .../TestTutorial/MethodEditTutorialTest.cs | 57 ++++++--- .../Skyline/TestTutorial/MethodEditViews.zip | Bin 875 -> 1794 bytes .../Skyline/TestUtil/PauseAndContinueForm.cs | 74 ++++++++---- .../Skyline/TestUtil/ScreenshotManager.cs | 44 ++++--- pwiz_tools/Skyline/TestUtil/TestFunctional.cs | 108 +++++++++++------- 12 files changed, 249 insertions(+), 106 deletions(-) diff --git a/pwiz_tools/Skyline/Controls/PopupPickList.cs b/pwiz_tools/Skyline/Controls/PopupPickList.cs index 5b63ea2957..fe0259c7bb 100644 --- a/pwiz_tools/Skyline/Controls/PopupPickList.cs +++ b/pwiz_tools/Skyline/Controls/PopupPickList.cs @@ -493,6 +493,7 @@ public void ToggleItem(int iChange) public void SetItemChecked(int i, bool checkItem) { SetItemCheckedInternal(i, checkItem); + pickListMulti.SelectedIndex = i; pickListMulti.Invalidate(pickListMulti.GetItemRectangle(i)); UpdateSelectAll(); diff --git a/pwiz_tools/Skyline/Controls/SequenceTree.cs b/pwiz_tools/Skyline/Controls/SequenceTree.cs index a78311742c..2d849b7d68 100644 --- a/pwiz_tools/Skyline/Controls/SequenceTree.cs +++ b/pwiz_tools/Skyline/Controls/SequenceTree.cs @@ -212,6 +212,11 @@ public bool IsTipVisible get { return _nodeTip.Visible; } } + public Rectangle TipRect + { + get { return _nodeTip.Visible ? _nodeTip.Bounds : Rectangle.Empty; } + } + [Browsable(true)] public event EventHandler PickedChildrenEvent; diff --git a/pwiz_tools/Skyline/EditUI/PasteDlg.cs b/pwiz_tools/Skyline/EditUI/PasteDlg.cs index 0301675576..09906ca2e0 100644 --- a/pwiz_tools/Skyline/EditUI/PasteDlg.cs +++ b/pwiz_tools/Skyline/EditUI/PasteDlg.cs @@ -154,6 +154,21 @@ private DataGridView ActiveGridView } } + public void SelectCell(int row, int column) + { + ActiveGridView.CurrentCell = ActiveGridView.Rows[row].Cells[column]; + } + + public void SetColumnWidths(params int[] columnWidths) + { + for (int i = 0; i < columnWidths.Length; i++) + { + int width = columnWidths[i]; + if (width != -1) + ActiveGridView.Columns[i].Width = width; + } + } + public void ShowError(PasteError pasteError) { _noErrors = false; diff --git a/pwiz_tools/Skyline/EditUI/UniquePeptidesDlg.cs b/pwiz_tools/Skyline/EditUI/UniquePeptidesDlg.cs index 80b5ccbe62..2543d5c0fd 100644 --- a/pwiz_tools/Skyline/EditUI/UniquePeptidesDlg.cs +++ b/pwiz_tools/Skyline/EditUI/UniquePeptidesDlg.cs @@ -708,6 +708,12 @@ public DataGridView GetDataGridView() return dataGridView1; } + public int SplitHeight + { + get { return splitContainer1.SplitterDistance; } + set { splitContainer1.SplitterDistance = value; } + } + public void SelectUnique(UniquenessType uniquenessType) { SelectPeptidesWithNumberOfMatchesAtOrBelowThreshold(1, uniquenessType); diff --git a/pwiz_tools/Skyline/Skyline.cs b/pwiz_tools/Skyline/Skyline.cs index c067f29d51..3fa3600e0b 100644 --- a/pwiz_tools/Skyline/Skyline.cs +++ b/pwiz_tools/Skyline/Skyline.cs @@ -4161,7 +4161,15 @@ public bool StatusContains(string format) return statusGeneral.Text.Contains(start) && statusGeneral.Text.Contains(end); } - public int StatusBarHeight { get { return statusGeneral.Height; } } + public int StatusBarHeight { get { return statusStrip.Height; } } + + public int StatusSelectionWidth + { + get + { + return statusSequences.Width + statusPeptides.Width + statusPrecursors.Width + statusIons.Width + 20; + } + } #endregion diff --git a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs index 6ab2e348b0..736473571b 100644 --- a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs @@ -67,6 +67,8 @@ public void TestAbsoluteQuantificationTutorial() RunFunctionalTest(); } + protected override int[] NonScreenShotFigures => new[] { 1 }; + private string GetTestPath(string relativePath) { var dataFolder = UseRawFiles ? "AbsoluteQuant" : "AbsoluteQuantMzml"; // Not L10N @@ -158,17 +160,20 @@ protected override void DoTest() // Importing RAW files into Skyline p. 11, 12 var importResultsDlg = ShowDialog(SkylineWindow.ImportResults); - PauseForScreenShot("Import Results - click OK to get shot of Import Results Files and then cancel", 11); + PauseForScreenShot("Import Results", 11); + var importResultsFilesDlg = ShowDialog(importResultsDlg.OkDialog); RunUI(() => { var rawFiles = DataSourceUtil.GetDataSources(TestFilesDirs[0].FullPath).First().Value.Skip(1); - var namedPathSets = from rawFile in rawFiles - select new KeyValuePair( - rawFile.GetFileNameWithoutExtension(), new[] { rawFile }); - importResultsDlg.NamedPathSets = namedPathSets.ToArray(); + foreach (var rawFile in rawFiles) + { + importResultsFilesDlg.SelectFile(rawFile.GetFileName()); + } }); - RunDlg(importResultsDlg.OkDialog, + PauseForScreenShot("Import Results Files", 12); + + RunDlg(importResultsFilesDlg.Open, importResultsNameDlg => importResultsNameDlg.NoDialog()); WaitForGraphs(); @@ -265,7 +270,7 @@ protected override void DoTest() // Peptide Quantitification Settings p. 16 peptideSettingsUi = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); - RunUI(() => peptideSettingsUi.SelectedTab = (PeptideSettingsUI.TABS)5); + RunUI(() => peptideSettingsUi.SelectedTab = PeptideSettingsUI.TABS.Quantification); const string quantUnits = "fmol/ul"; RunUI(() => { @@ -273,7 +278,7 @@ protected override void DoTest() peptideSettingsUi.QuantNormalizationMethod = new NormalizationMethod.RatioToLabel(IsotopeLabelType.heavy); peptideSettingsUi.QuantUnits = quantUnits; }); - PauseForScreenShot("Peptide Settings Quantification Tab", 16); + PauseForScreenShot("Peptide Settings Quantification Tab", 16); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); // Specify analyte concentrations of external standards @@ -315,7 +320,7 @@ protected override void DoTest() gridFloatingWindow.Top = SkylineWindow.Top; gridFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Document grid with concentrations filled in", 17); + PauseForScreenShot("Document grid with concentrations filled in", 17); } // View the calibration curve p. 18 @@ -354,7 +359,7 @@ protected override void DoTest() calibrationFloatingWindow.Top = SkylineWindow.Top; calibrationFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("View calibration curve", 18); + PauseForScreenShot("View calibration curve", 18); } Assert.AreEqual(CalibrationCurveFitter.AppendUnits(QuantificationStrings.Analyte_Concentration, quantUnits), calibrationForm.ZedGraphControl.GraphPane.XAxis.Title.Text); diff --git a/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs index 9a001d1237..b562e70130 100644 --- a/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs @@ -18,7 +18,6 @@ */ using System; -using System.Collections.Generic; using System.Drawing; using System.Globalization; using System.IO; @@ -390,7 +389,14 @@ protected override void DoTest() ChangePeakBounds("Pit01", 65.36, 66.7); ChangePeakBounds("Pit02", 64.89, 66.2); - Func clipChromAndPeakAreas = ClipSkylineWindowShotWithForms(new List() { SkylineWindow.GetGraphChrom("Pit01"), SkylineWindow.GetGraphChrom("Pit02"), FindGraphSummaryByGraphType() }); + Func clipChromAndPeakAreas = bmp => + ClipSkylineWindowShotWithForms(bmp, new DockableForm[] + { + SkylineWindow.GetGraphChrom("Pit01"), + SkylineWindow.GetGraphChrom("Pit02"), + FindGraphSummaryByGraphType() + }); + PauseForScreenShot("Chromatograms and peak areas", 34, null, clipChromAndPeakAreas); SelectNode(SrmDocument.Level.TransitionGroups, 13); diff --git a/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs index e0d016dd69..60280edd7c 100644 --- a/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs @@ -29,7 +29,6 @@ using pwiz.Skyline; using pwiz.Skyline.Alerts; using pwiz.Skyline.Controls; -using pwiz.Skyline.Controls.Graphs; using pwiz.Skyline.Controls.SeqNode; using pwiz.Skyline.EditUI; using pwiz.Skyline.FileUI; @@ -204,7 +203,8 @@ protected override void DoTest() PauseForScreenShot("Transition Settings - Library tab", 10); // Not L10N OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); } - PauseForScreenShot("Targets tree clipped from main window", 11); // Not L10N + // TODO: Crop the screenshot to get rid of the title and scrollbars + PauseForScreenShot("Targets tree clipped from main window", 11); // Not L10N if (IsCoverShotMode) { @@ -287,6 +287,11 @@ protected override void DoTest() pasteProteinsDlg.SelectedPath = SkylineWindow.SequenceTree.SelectedPath; pasteProteinsDlg.PasteProteins(); }); + RunUI(() => + { + pasteProteinsDlg.SelectCell(17, 0); + pasteProteinsDlg.SetColumnWidths(-1, 220, 500, 0, 0, 0, 0); + }); PauseForScreenShot("Insert Protein List - For Screenshot, select last (empty) item in list", 14); // Not L10N OkDialog(pasteProteinsDlg, pasteProteinsDlg.OkDialog); } @@ -324,6 +329,11 @@ protected override void DoTest() RunUI(() => SkylineWindow.Undo()); PasteDlg pastePeptidesDlg = ShowDialog(SkylineWindow.ShowPastePeptidesDlg); RunUI(pastePeptidesDlg.PastePeptides); + RunUI(() => + { + pastePeptidesDlg.SelectCell(12, 0); + pastePeptidesDlg.Height = 437; + }); PauseForScreenShot("Insert Peptide List - For screenshot, select last (empty) line in list", 17); // Not L10N OkDialog(pastePeptidesDlg, pastePeptidesDlg.OkDialog); } @@ -336,7 +346,7 @@ protected override void DoTest() findPeptideDlg.FindNext(); findPeptideDlg.Close(); }); - PauseForScreenShot("Library Match graph metafile", 18); // Not L10N + PauseForGraphScreenShot("Library Match graph metafile", SkylineWindow.GraphSpectrum, 18); // Not L10N using (new CheckDocumentState(35, 64, 64, 320, null, true)) { @@ -344,7 +354,8 @@ protected override void DoTest() PauseForForm(typeof(RefineDlg.DocumentTab)); RunUI(() => refineDlg.MinTransitions = 5); OkDialog(refineDlg, refineDlg.OkDialog); - PauseForScreenShot("29/35 prot 50/64 pep 50/64 prec 246/320 tran", 18); // Not L10N + PauseForScreenShot("29/35 prot 50/64 pep 50/64 prec 246/320 tran", 18, null, + ClipSelectionStatus); // Not L10N } // Checking Peptide Uniqueness, p. 18 @@ -362,6 +373,9 @@ protected override void DoTest() { Assert.AreEqual(1, uniquePeptidesDlg.GetDataGridView().RowCount); Assert.AreEqual(7, uniquePeptidesDlg.GetDataGridView().ColumnCount); + + uniquePeptidesDlg.SplitHeight = 58; + uniquePeptidesDlg.Height = 292; }); PauseForScreenShot("Unique Peptides form", 19); // Not L10N var oldDoc = SkylineWindow.Document; @@ -371,14 +385,12 @@ protected override void DoTest() } // Protein Name Auto-Completion - PauseForScreenShot("(fig. 1): For screenshot, click at bottom of document tree, type 'ybl087' and see the autocomplete text. Make sure to undo this new entry before proceeding.", 20); // Not L10N - TestAutoComplete("ybl087", 0); // Not L10N + TestAutoComplete("ybl087", 0, 20); // Not L10N var peptideGroups = new List(Program.ActiveDocument.PeptideGroups); Assert.AreEqual("YBL087C", peptideGroups[peptideGroups.Count - 1].Name); // Not L10N // Protein Description Auto-Completion - PauseForScreenShot("(fig. 2): For screenshot, click at bottom of document tree, type 'eft2' and see the autocomplete text, then down-arrow twice. Make sure to undo this new entry before proceeding.", 20); // Not L10N - TestAutoComplete("eft2", 0); // Sorting logic puts this at the 0th entry in the list - Not L10N + TestAutoComplete("eft2", 0, 20); // Sorting logic puts this at the 0th entry in the list - Not L10N peptideGroups = new List(Program.ActiveDocument.PeptideGroups); Assert.AreEqual("YDR385W", peptideGroups[peptideGroups.Count - 1].Name); // Not L10N @@ -386,7 +398,9 @@ protected override void DoTest() TestAutoComplete("IQGP", 0); // Not L10N var peptides = new List(Program.ActiveDocument.Peptides); Assert.AreEqual("K.AYLPVNESFGFTGELR.Q [770, 785]", peptides[peptides.Count - 1].Peptide.ToString()); // Not L10N - PauseForScreenShot("(fig. 1) - For screenshot, click at the bottom of the document tree", 21); // Not L10N + RestoreViewOnScreen(21); + PauseForScreenShot("(fig. 1) - Added targets", 21, null, + bmp => ClipBitmap(bmp, new Rectangle(5, bmp.Height - 178, 355, 165))); // Not L10N // Pop-up Pick-Lists, p. 21 using (new CheckDocumentState(36, 71, 71, 355, null, true)) @@ -444,10 +458,9 @@ protected override void DoTest() }); FindNode(string.Format("L [b5] - {0:F04}+", 484.3130)); // Not L10N - may be localized " (rank 3)" - ShowNodeTip("YBL087C"); - ShowNodeTip(string.Format("{0:F04}+++", 672.6716)); + ShowNodeTip("YBL087C", 23); + ShowNodeTip(string.Format("{0:F04}+++", 672.6716), 23); ShowNodeTip(null); - PauseForScreenShot("For Screenshots, First hover over YBL087C, then over 672.671+++", 23); // Not L10N // Preparing to Measure, p. 25 RunDlg(() => SkylineWindow.ShowTransitionSettingsUI(TransitionSettingsUI.TABS.Prediction), transitionSettingsUI => @@ -500,7 +513,7 @@ private void VerifyPrecursorLibrary(int indexPrecursor, string libraryName, doub }); } - private void ShowNodeTip(string nodeText) + private void ShowNodeTip(string nodeText, int? pageNumPause = null) { RunUI(() => { @@ -519,6 +532,20 @@ private void ShowNodeTip(string nodeText) SkylineWindow.SequenceTree.MoveMouse(pt); }); WaitForConditionUI(NodeTip.TipDelayMs * 10, () => SkylineWindow.SequenceTree.IsTipVisible); + + if (pageNumPause != null) + { + PauseForScreenShot("Tip for " + nodeText, pageNumPause.Value, null, + bmp => + { + var cropRect = SkylineWindow.SequenceTree.TipRect; + // Remove lower-right shadow + cropRect.Width -= 4; + cropRect.Height -= 4; + return ClipBitmap(bmp, cropRect); + }); + } + SkylineWindow.SequenceTree.IgnoreFocus = false; // If someone is watching let them at least see the tips, if not take screenshots of them int delayMultiplier = IsPauseForScreenShots ? 4 : 1; @@ -548,7 +575,7 @@ private void SetClipboardFileText(string filepath) SetClipboardTextUI(File.ReadAllText(TestFilesDirs[0].GetTestPath(filepath))); } - private static void TestAutoComplete(string text, int index) + private void TestAutoComplete(string text, int index, int? pageNum = null) { var doc = WaitForDocumentLoaded(); RunUI(() => @@ -560,6 +587,8 @@ private static void TestAutoComplete(string text, int index) }); var statementCompletionForm = WaitForOpenForm(); Assert.IsNotNull(statementCompletionForm); + if (pageNum != null) + PauseForScreenShot("Auto-complete " + text, pageNum.Value); RunUI(() => SkylineWindow.SequenceTree.StatementCompletionEditBox.OnSelectionMade( (StatementCompletionItem)statementCompletionForm.ListView.Items[index].Tag)); WaitForDocumentChangeLoaded(doc); diff --git a/pwiz_tools/Skyline/TestTutorial/MethodEditViews.zip b/pwiz_tools/Skyline/TestTutorial/MethodEditViews.zip index 1b67c5c67bbb35daffaf21472a1bcd69ce70a54d..fe20591e0d344785dc43d3627e80d2930c956ea5 100644 GIT binary patch delta 984 zcmaFO*2KpX;LXe;!oa}5!4TZNk>?{*J&b!}L3rd}(-KEI z@~7d^{=$wT|K|Dr;a`2e>8^La=TwEQ9!yI$LzVN7O!L-Ro4388?f$yD=WlX$`$U&< zXsD$b-M=}rcqS0t{rh!uBX7(@8Rv=}2N(?1EDlR3?>SWbBf`D&%Hf83iGQbEidkgr8h*XYJ4KUgY#OrMuYhTi`wCM|zR6Oox-<+KxUFG}sgiFDynIHS)UL^-i zkhh+(WRg<$58b`?YBK3Ux_!rkqSchTgY@SversQ_W&6`(i;k@{wNl_SnVo#{XZ;a# z-o7=rP8M&TRlG(++4lRpv(bKkw5+|eZ|wX1rfUCA{oSuFKa2RgZ|(C5;xEtb-n9K^ z{hdvBiaso!c;e6F2j=$==096k{%Owt6Z1aH-znaCQ(Eft_m7GzkH${fQM~Wmy>P9{ z6Zy>%uML;=PPB`?`|9JiHy*j)!o#m8ElW+`_Pwrs^Ufzzt|dLZ*;G9@_n6T*uvDFF;jYhLEJ;-_$KJ$x?{54 _processShot; - public PauseAndContinueForm(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, Control screenshotForm = null, ScreenshotManager screenshotManager = null, Func processShot = null) + public PauseAndContinueForm(string description, string fileToSave, string link, bool showMatchingPages, + Control screenshotForm, bool fullScreen, ScreenshotManager screenshotManager, Func processShot) { InitializeComponent(); _screenshotForm = screenshotForm; + _fullScreen = fullScreen; _screenshotManager = screenshotManager; _fileToSave = fileToSave; _processShot = processShot; - saveScreenshotCheckbox.Checked = _saveScreenShotChecked; + saveScreenshotCheckbox.Checked = true; _linkUrl = link; if (!string.IsNullOrEmpty(link)) @@ -85,7 +88,7 @@ public PauseAndContinueForm(string description = null, string fileToSave = null, // Finally make sure the button is fully visible Height += Math.Max(0, (btnContinue.Bottom + btnContinue.Left) - ClientRectangle.Bottom); - setScreenshotButtonLabels(); + UpdateScreenshotButtonLabels(); } private void btnContinue_Click(object sender, EventArgs e) @@ -111,7 +114,8 @@ protected override bool ShowWithoutActivation private static readonly object _pauseLock = new object(); - public static void Show(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, int? timeout = null, Control screenshotForm = null, ScreenshotManager screenshotManager = null, Func processShot = null) + public static void Show(string description = null, string fileToSave = null, string link = null, bool showMatchingPages = false, int? timeout = null, + Control screenshotForm = null, bool fullScreen = false, ScreenshotManager screenshotManager = null, Func processShot = null) { ClipboardEx.UseInternalClipboard(false); @@ -123,7 +127,8 @@ public static void Show(string description = null, string fileToSave = null, str RunUI(parentWindow, () => { - var dlg = new PauseAndContinueForm(description, fileToSave, link, showMatchingPages, screenshotForm, screenshotManager, processShot) { Left = parentWindow.Left }; + var dlg = new PauseAndContinueForm(description, fileToSave, link, showMatchingPages, + screenshotForm, fullScreen, screenshotManager, processShot) { Left = parentWindow.Left }; const int spacing = 15; var screen = Screen.FromControl(parentWindow); if (parentWindow.Top > screen.WorkingArea.Top + dlg.Height + spacing) @@ -212,18 +217,9 @@ public void GotoLink() [return: MarshalAs(UnmanagedType.Bool)] static extern bool SetForegroundWindow(IntPtr hWnd); - - private void btnScreenshot_Click(object sender, EventArgs e) - { - // Copy current window image to clipboard, with clean edges - _screenshotForm.Focus(); - _screenshotManager.TakeShot(_screenshotForm, saveScreenshotCheckbox.Checked ? _fileToSave : null, _processShot); - } - - private void saveScreenshotCheckbox_CheckedChanged(object sender, EventArgs e) + private async void btnScreenshot_Click(object sender, EventArgs e) { - _saveScreenShotChecked = saveScreenshotCheckbox.Checked; - setScreenshotButtonLabels(); + await CaptureScreenShot(saveScreenshotCheckbox.Checked); } private void btnScreenshotAndContinue_Click(object sender, EventArgs e) @@ -231,17 +227,47 @@ private void btnScreenshotAndContinue_Click(object sender, EventArgs e) btnScreenshot_Click(sender, e); btnContinue_Click(sender, e); } - private void btnPreview_Click(object sender, EventArgs e) + private async void btnPreview_Click(object sender, EventArgs e) + { + await CaptureScreenShot(false, true); + } + + private async Task CaptureScreenShot(bool save, bool showPreview = false) + { + ActivateScreenshotForm(); + + await Task.Delay(200); + + var screenshot = _screenshotManager.TakeShot(_screenshotForm, _fullScreen, save ? _fileToSave: null, _processShot); + + if (showPreview) + { + var existingImageBytes = File.ReadAllBytes(_fileToSave); + var existingImageMemoryStream = new MemoryStream(existingImageBytes); + screenshotPreviewForm.ShowScreenshotPreview(screenshot, new Bitmap(existingImageMemoryStream)); + } + } + + private void ActivateScreenshotForm() { - _screenshotForm.Focus(); - Bitmap screenshot = _screenshotManager.TakeShot(_screenshotForm, null, _processShot); + // If it is a form, try not to change the focus within the form. + var form = (_screenshotForm as Form)?.ParentForm; + if (form != null) + { + form.Activate(); + } + else + { + _screenshotForm.Focus(); + } + } - var existingImageBytes = File.ReadAllBytes(_fileToSave); - var existingImageMemoryStream = new MemoryStream(existingImageBytes); - screenshotPreviewForm.ShowScreenshotPreview(screenshot, new Bitmap(existingImageMemoryStream)); + private void saveScreenshotCheckbox_CheckedChanged(object sender, EventArgs e) + { + UpdateScreenshotButtonLabels(); } - private void setScreenshotButtonLabels() + private void UpdateScreenshotButtonLabels() { btnScreenshot.Text = saveScreenshotCheckbox.Checked ? "Save Screenshot" : "Take Screenshot"; btnScreenshotAndContinue.Text = saveScreenshotCheckbox.Checked ? "Save and Continue" : "Take and Continue"; diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs index 8df61a74c6..6324251360 100644 --- a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs @@ -40,11 +40,11 @@ public class PointAdditive public static implicit operator Point(PointAdditive add) => add._add; } - public static Rectangle GetWindowRectangle(Control ctrl) + public static Rectangle GetWindowRectangle(Control ctrl, bool fullScreen = false) { - Rectangle snapshotBounds = Rectangle.Empty; + var snapshotBounds = Rectangle.Empty; - DockState[] dockedStates = new DockState[] { DockState.DockBottom, DockState.DockLeft, DockState.DockRight, DockState.DockTop, DockState.Document }; + var dockedStates = new[] { DockState.DockBottom, DockState.DockLeft, DockState.DockRight, DockState.DockTop, DockState.Document }; var form = ctrl as DockableForm; if (form != null && dockedStates.Any((state) => form.DockState == state)) { @@ -52,20 +52,34 @@ public static Rectangle GetWindowRectangle(Control ctrl) ctrl.Invoke(new Action(() => { origin = form.Pane.PointToScreen(new Point(0, 0)); })); snapshotBounds = new Rectangle(origin, form.Pane.Size); } + else if (fullScreen) + { + snapshotBounds = Screen.FromControl(ctrl).Bounds; + } else { - //TODO BEFORE MERGE: figure out what to do when it is not a form - if (ctrl is Form && (ctrl as Form).ParentForm is FloatingWindow) - ctrl = (ctrl as Form).ParentForm; - int frameWidth = ((ctrl as Form).DesktopBounds.Width - ctrl.ClientRectangle.Width) / 2 - SystemInformation.Border3DSize.Width + SystemInformation.BorderSize.Width; + ctrl = FindParent(ctrl) ?? ctrl; + int width = (ctrl as Form)?.DesktopBounds.Width ?? ctrl.Width; + int frameWidth = (width - ctrl.ClientRectangle.Width) / 2 - SystemInformation.Border3DSize.Width + SystemInformation.BorderSize.Width; Size imageSize = ctrl.Size + new PointAdditive(-2 * frameWidth, -frameWidth); Point sourcePoint = ctrl.Location + new PointAdditive(frameWidth, 0); snapshotBounds = new Rectangle(sourcePoint, imageSize); - } return snapshotBounds * GetScalingFactor(); } + public static Control FindParent(Control ctrl) + { + while (ctrl != null) + { + if (ctrl is TParent) + return ctrl; + ctrl = ctrl.Parent; + } + + return null; + } + [DllImport("gdi32.dll")] static extern int GetDeviceCaps(IntPtr hdc, int nIndex); @@ -91,7 +105,7 @@ private abstract class SkylineScreenshot /** * Factory method */ - public static SkylineScreenshot CreateScreenshot(Control control) + public static SkylineScreenshot CreateScreenshot(Control control, bool fullScreen = false) { SkylineScreenshot newShot; if (control is ZedGraphControl zedGraphControl) @@ -100,7 +114,7 @@ public static SkylineScreenshot CreateScreenshot(Control control) } else { - newShot = new ActiveWindowShot(control); + newShot = new ActiveWindowShot(control, fullScreen); } return newShot; @@ -111,15 +125,17 @@ public static SkylineScreenshot CreateScreenshot(Control control) private class ActiveWindowShot : SkylineScreenshot { private readonly Control _activeWindow; - public ActiveWindowShot(Control activeWindow) + private readonly bool _fullscreen; + public ActiveWindowShot(Control activeWindow, bool fullscreen) { _activeWindow = activeWindow; + _fullscreen = fullscreen; } [NotNull] public override Bitmap Take() { - Rectangle shotFrame = GetWindowRectangle(_activeWindow); + Rectangle shotFrame = GetWindowRectangle(_activeWindow, _fullscreen); Bitmap bmCapture = new Bitmap(shotFrame.Width, shotFrame.Height, PixelFormat.Format32bppArgb); Graphics graphCapture = Graphics.FromImage(bmCapture); bool captured = false; @@ -167,13 +183,13 @@ public ScreenshotManager([NotNull] SkylineWindow pSkylineWindow) } - public Bitmap TakeShot(Control activeWindow, string pathToSave = null, Func processShot = null, double? scale = null) + public Bitmap TakeShot(Control activeWindow, bool fullScreen = false, string pathToSave = null, Func processShot = null, double? scale = null) { if (activeWindow == null) activeWindow = _skylineWindow; //check UI and create a blank shot according to the user selection - SkylineScreenshot newShot = SkylineScreenshot.CreateScreenshot(activeWindow); + SkylineScreenshot newShot = SkylineScreenshot.CreateScreenshot(activeWindow, fullScreen); Bitmap shotPic = newShot.Take(); shotPic = processShot != null ? processShot.Invoke(shotPic) : shotPic; diff --git a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs index a56ee0aa18..38bef23d52 100644 --- a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs +++ b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs @@ -39,7 +39,6 @@ using pwiz.Common.DataBinding; using pwiz.Common.GUI; using pwiz.Common.SystemUtil; -using pwiz.MSGraph; using pwiz.ProteomeDatabase.Fasta; using pwiz.ProteowizardWrapper; using pwiz.Skyline; @@ -65,7 +64,6 @@ using pwiz.Skyline.Util.Extensions; using TestRunnerLib; using ZedGraph; -using static alglib; using SampleType = pwiz.Skyline.Model.DocSettings.AbsoluteQuantification.SampleType; namespace pwiz.SkylineTestUtil @@ -696,6 +694,8 @@ public static T GetUIValue(Func act) return result; } + private static FormLookup _formLookup; + public static TDlg TryWaitForOpenForm(int millis = WAIT_TIME, Func stopCondition = null) where TDlg : Form { int waitCycles = GetWaitCycles(millis); @@ -719,8 +719,7 @@ public static TDlg TryWaitForOpenForm(int millis = WAIT_TIME, Func s }); } - if (_formLookup == null) - _formLookup = new FormLookup(); + _formLookup ??= new FormLookup(); Assert.IsNotNull(_formLookup.GetTest(formType), formType + " must be added to TestRunnerLib\\TestRunnerFormLookup.csv"); @@ -765,8 +764,7 @@ public static Form TryWaitForOpenForm(Type formType, int millis = WAIT_TIME, Fun }); } - if (_formLookup == null) - _formLookup = new FormLookup(); + _formLookup ??= new FormLookup(); Assert.IsNotNull(_formLookup.GetTest(formTypeName), formType + " must be added to TestRunnerLib\\TestRunnerFormLookup.csv"); @@ -1283,6 +1281,8 @@ private string TutorialPath private int ScreenShotCounter = 1; + protected virtual int[] NonScreenShotFigures => Array.Empty(); + public virtual bool AuditLogCompareLogs { get { return IsTutorial && !IsFullData; } // Logs were recorded with partial data and not in Pass0 @@ -1310,25 +1310,21 @@ public bool IsRecordAuditLogForTutorials private string LinkPage(int? pageNum) { - return pageNum.HasValue ? LinkPdf + "#page=" + pageNum : null; + if (string.IsNullOrEmpty(TutorialPath)) + return null; + int figureNum = ScreenShotCounter + NonScreenShotFigures.Count(n => n <= ScreenShotCounter); + var fileUri = new Uri(Path.Combine(TutorialPath, "index.html")).AbsoluteUri + "#figure" + figureNum; + const string tutorialSearch = "/Tutorials/"; + int tutorialIndex = fileUri.IndexOf(tutorialSearch, StringComparison.Ordinal); + return "https://skyline.ms/tutorials/24-1/" + fileUri.Substring(tutorialIndex + tutorialSearch.Length); } - private static FormLookup _formLookup; - protected Func ClipSkylineWindowShotWithForms(List dockableForms) + protected Bitmap ClipSkylineWindowShotWithForms(Bitmap skylineWindowBmp, IList dockableForms) { - return (originalShot) => - { - Rectangle cropArea = ComputeDockableFormInclusiveRectangle(dockableForms); - Bitmap croppedShot = new Bitmap(cropArea.Width, cropArea.Height); - using (Graphics g = Graphics.FromImage(croppedShot)) - { - g.DrawImage(originalShot, new Rectangle(0, 0, cropArea.Width, cropArea.Height), cropArea, GraphicsUnit.Pixel); - } - - return croppedShot; - }; + return ClipBitmap(skylineWindowBmp, ComputeDockableFormInclusiveRectangle(dockableForms)); } - private Rectangle ComputeDockableFormInclusiveRectangle(List dockableForms) + + private Rectangle ComputeDockableFormInclusiveRectangle(IList dockableForms) { return dockableForms .Select(ComputeDockableFormScreenRectangle) @@ -1337,12 +1333,30 @@ private Rectangle ComputeDockableFormInclusiveRectangle(List docka private Rectangle ComputeDockableFormScreenRectangle(DockableForm dockableForm) { - Rectangle formRectangle = ScreenshotManager.GetWindowRectangle(dockableForm); - Point skylineWindowPoint = new Point(SkylineWindow.Location.X, SkylineWindow.Location.Y) * ScreenshotManager.GetScalingFactor(); - Point skylineRelativeOrigin = new Point(formRectangle.X - skylineWindowPoint.X, formRectangle.Y - skylineWindowPoint.Y); + var formRectangle = ScreenshotManager.GetWindowRectangle(dockableForm); + var skylineWindowPoint = new Point(SkylineWindow.Location.X, SkylineWindow.Location.Y) * ScreenshotManager.GetScalingFactor(); + var skylineRelativeOrigin = new Point(formRectangle.X - skylineWindowPoint.X, formRectangle.Y - skylineWindowPoint.Y); return new Rectangle(skylineRelativeOrigin, formRectangle.Size); } + protected Bitmap ClipSelectionStatus(Bitmap skylineWindowBmp) + { + int clipWidth = SkylineWindow.StatusSelectionWidth; + int clipHeight = SkylineWindow.StatusBarHeight; + var cropRect = new Rectangle(skylineWindowBmp.Width - clipWidth, skylineWindowBmp.Height - clipHeight, clipWidth, clipHeight); + return ClipBitmap(skylineWindowBmp, cropRect); + } + + protected static Bitmap ClipBitmap(Image bmp, Rectangle rect) + { + var croppedShot = new Bitmap(rect.Width, rect.Height); + using var g = Graphics.FromImage(croppedShot); + + g.DrawImage(bmp, new Rectangle(0, 0, rect.Width, rect.Height), rect, GraphicsUnit.Pixel); + + return croppedShot; + } + protected GraphSummary FindGraphSummaryByGraphType() where TGraphPane : SummaryGraphPane { return FormUtil.OpenForms.OfType() @@ -1358,16 +1372,16 @@ public void PauseForScreenShot(Control screenshotForm, string description = null PauseForScreenShot(description, pageNum, null, screenshotForm, timeout); } - public void PauseForScreenShot(string description, int? pageNum = null, int ? timeout = null) + public void PauseForScreenShot(string description, int? pageNum = null, int ? timeout = null, Func processShot = null) where TView : IFormView { - PauseForScreenShot(description, pageNum, typeof(TView), null, timeout); + PauseForScreenShot(description, pageNum, typeof(TView), null, timeout, processShot); } public void PauseForGraphScreenShot(string description, Control graphContainer, int? pageNum = null, int? timeout = null) { var zedGraph = FindZedGraph(graphContainer); - Assert.IsNotNull(zedGraph, "Control was not or did not contain graph"); + Assert.IsNotNull(zedGraph, "Control was not or did not contain a graph."); PauseForScreenShot(description, pageNum, null, zedGraph, timeout); } @@ -1385,11 +1399,21 @@ private ZedGraphControl FindZedGraph(Control graphContainer) return null; } - private void PauseForScreenShot(string description, int? pageNum, Type formType = null, Control screenshotForm = null, int ? timeout = null, Func processShot = null) + + /// + /// Type that indicates a full-screen screenshot should be taken + /// + public class ScreenForm : IFormView + { + } + + private void PauseForScreenShot(string description, int? pageNum, Type formType = null, Control screenshotForm = null, int? timeout = null, Func processShot = null) { + bool fullScreen = formType == typeof(ScreenForm); + if (formType != null) { - var form = TryWaitForOpenForm(formType); + var form = !fullScreen ? TryWaitForOpenForm(formType) : SkylineWindow; Assert.IsNotNull(form); } if (Program.SkylineOffscreen) @@ -1403,36 +1427,38 @@ private void PauseForScreenShot(string description, int? pageNum, Type formType { if (screenshotForm == null) { - if (formType != null) + if (!fullScreen && formType != null) { - screenshotForm = TryWaitForOpenForm(formType) ?? SkylineWindow; + screenshotForm = TryWaitForOpenForm(formType); } - else - screenshotForm = SkylineWindow; - RunUI(() => screenshotForm?.Update()); + screenshotForm ??= SkylineWindow; + + RunUI(() => screenshotForm.Update()); } var formSeen = new FormSeen(); formSeen.Saw(formType); - var fileToSave = !String.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, "s-" +ScreenShotCounter++)}.png" : null; + var fileToSave = !string.IsNullOrEmpty(TutorialPath) ? $"{Path.Combine(TutorialPath, "s-" + ScreenShotCounter)}.png" : null; if (IsAutoScreenShotMode) { Thread.Sleep(3000); screenshotForm.Focus(); - _shotManager.TakeShot(screenshotForm, fileToSave, processShot); + _shotManager.TakeShot(screenshotForm, fullScreen, fileToSave, processShot); } else { bool showMatchingPages = IsShowMatchingTutorialPages || Program.ShowMatchingPages; - PauseAndContinueForm.Show(description + string.Format(" - p. {0}", pageNum), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, screenshotForm, _shotManager, processShot); + PauseAndContinueForm.Show(description + string.Format(" - fig. {0}", ScreenShotCounter), fileToSave, LinkPage(pageNum), showMatchingPages, timeout, + screenshotForm, fullScreen, _shotManager, processShot); } - } else { PauseForForm(formType); } + + ScreenShotCounter++; } protected virtual Bitmap ProcessCoverShot(Bitmap bmp) @@ -1451,13 +1477,13 @@ public void TakeCoverShot() "Cover shots must be taken at screen resolution 1920x1080 at scale factor 100% (96DPI)"); }); var coverSavePath = GetCoverShotPath(); - ScreenshotManager.TakeShot(SkylineWindow, coverSavePath, ProcessCoverShot); + ScreenshotManager.TakeShot(SkylineWindow, false, coverSavePath, ProcessCoverShot); string coverSavePath2 = null; if (coverSavePath != null) { // Screenshot for the StartPage coverSavePath2 = GetCoverShotPath(TestContext.GetProjectDirectory(@"Resources\StartPage"), "_start"); - ScreenshotManager.TakeShot(SkylineWindow, coverSavePath2, ProcessCoverShot, 0.20); + ScreenshotManager.TakeShot(SkylineWindow, false, coverSavePath2, ProcessCoverShot, 0.20); } if (coverSavePath == null) { @@ -2522,7 +2548,7 @@ private void AddMod(StaticMod mod, RunUI(() => addStaticModDlg.Modification = mod); if (pauseText != null || pausePage.HasValue) - PauseForScreenShot(pauseText, pausePage, viewType, null); + PauseForScreenShot(pauseText, pausePage, viewType); OkDialog(addStaticModDlg, addStaticModDlg.OkDialog); OkDialog(editModsDlg, editModsDlg.OkDialog);