diff --git a/pwiz_tools/Skyline/Skyline.Designer.cs b/pwiz_tools/Skyline/Skyline.Designer.cs index b056de9948..3a8b832989 100644 --- a/pwiz_tools/Skyline/Skyline.Designer.cs +++ b/pwiz_tools/Skyline/Skyline.Designer.cs @@ -369,6 +369,7 @@ private void InitializeComponent() // // contextMenuTreeNode // + this.contextMenuTreeNode.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuTreeNode.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cutContextMenuItem, this.copyContextMenuItem, @@ -576,6 +577,7 @@ private void InitializeComponent() // // contextMenuSpectrum // + this.contextMenuSpectrum.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuSpectrum.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ionTypesContextMenuItem, this.fragmentionsContextMenuItem, @@ -775,6 +777,7 @@ private void InitializeComponent() // contextMenuRetentionTimes // this.contextMenuRetentionTimes.AllowMerge = false; + this.contextMenuRetentionTimes.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuRetentionTimes.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.timeGraphContextMenuItem, this.timePlotContextMenuItem, @@ -1132,6 +1135,7 @@ private void InitializeComponent() // // contextMenuPeakAreas // + this.contextMenuPeakAreas.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuPeakAreas.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.areaGraphContextMenuItem, this.graphTypeToolStripMenuItem, @@ -1534,6 +1538,7 @@ private void InitializeComponent() // statusStrip // resources.ApplyResources(this.statusStrip, "statusStrip"); + this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusGeneral, this.statusProgress, @@ -1591,6 +1596,7 @@ private void InitializeComponent() // mainToolStrip // this.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.mainToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolBarButton, this.openToolBarButton, @@ -1703,6 +1709,8 @@ private void InitializeComponent() // // menuMain // + this.menuMain.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuMain.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.editToolStripMenuItem, @@ -2300,6 +2308,7 @@ private void InitializeComponent() // // contextMenuMassErrors // + this.contextMenuMassErrors.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuMassErrors.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.massErrorGraphContextMenuItem, this.massErrorPropsContextMenuItem, @@ -2492,6 +2501,7 @@ private void InitializeComponent() // // contextMenuDetections // + this.contextMenuDetections.ImageScalingSize = new System.Drawing.Size(24, 24); this.contextMenuDetections.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.detectionsTargetToolStripMenuItem, this.detectionsGraphTypeToolStripMenuItem, diff --git a/pwiz_tools/Skyline/Skyline.csproj b/pwiz_tools/Skyline/Skyline.csproj index 28222167b4..198c3e93bf 100644 --- a/pwiz_tools/Skyline/Skyline.csproj +++ b/pwiz_tools/Skyline/Skyline.csproj @@ -103,6 +103,7 @@ false + False ..\Shared\Lib\DigitalRune.Windows.Docking.dll @@ -151,9 +152,6 @@ ..\Shared\Lib\MathNet.Numerics.dll - - packages\OneOf.3.0.271\lib\net45\OneOf.dll - False ..\Shared\ProteowizardWrapper\obj\$(Platform)\PrmPasefScheduler.dll @@ -4052,7 +4050,6 @@ PreserveNewest - diff --git a/pwiz_tools/Skyline/Skyline.resx b/pwiz_tools/Skyline/Skyline.resx index 6cff999da8..9859daf89c 100644 --- a/pwiz_tools/Skyline/Skyline.resx +++ b/pwiz_tools/Skyline/Skyline.resx @@ -121,14 +121,14 @@ 17, 17 - 556, 17 + 757, 17 Fuchsia - 228, 22 + 321, 32 Cut @@ -137,7 +137,7 @@ Fuchsia - 228, 22 + 321, 32 Copy @@ -146,7 +146,7 @@ Fuchsia - 228, 22 + 321, 32 Paste @@ -155,82 +155,82 @@ Fuchsia - 228, 22 + 321, 32 Delete - 225, 6 + 318, 6 - 228, 22 + 321, 32 Pick Children - 228, 22 + 321, 32 Add Molecule... - 228, 22 + 321, 32 Add Precursor... - 228, 22 + 321, 32 Add Transition... - 228, 22 + 321, 32 Remove Peak - 175, 22 + 268, 34 None - 175, 22 + 268, 34 Global Standard - 175, 22 + 268, 34 Surrogate Standard - 175, 22 + 268, 34 QC - 175, 22 + 268, 34 iRT - 228, 22 + 321, 32 Set Standard Type - 228, 22 + 321, 32 Modify... @@ -240,70 +240,70 @@ False - 228, 22 + 321, 32 Edit Spectrum Filter... - 228, 22 + 321, 32 Quantitative - 228, 22 + 321, 32 Mark Transitions Quantitative - 225, 6 + 318, 6 Fuchsia - 228, 22 + 321, 32 Edit Note - 225, 6 + 318, 6 - 163, 22 + 249, 34 Global Standards - 228, 22 + 321, 32 Ratios To - 106, 22 + 162, 34 Single - 106, 22 + 162, 34 Best - 228, 22 + 321, 32 Replicates - 229, 396 + 322, 566 contextMenuTreeNode @@ -312,151 +312,151 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1304, 17 + 1800, 17 - 193, 22 + 263, 32 Ion Types - 193, 22 + 263, 32 Fragment ions - 193, 22 + 263, 32 Special Ions - 193, 22 + 263, 32 Precursor - 190, 6 + 260, 6 - 193, 22 + 263, 32 Charges - 190, 6 + 260, 6 - 193, 22 + 263, 32 Ranks - 193, 22 + 263, 32 Score - 193, 22 + 263, 32 Show Mass Error - 193, 22 + 263, 32 Ion m/z Values - 193, 22 + 263, 32 Observed m/z Values - 193, 22 + 263, 32 Duplicate Ions - 190, 6 + 260, 6 - 193, 22 + 263, 32 Auto-scale Y-axis - 190, 6 + 260, 6 - 193, 22 + 263, 32 Koina - 193, 22 + 263, 32 Mirror - 190, 6 + 260, 6 - 193, 22 + 263, 32 Graph Properties... - 193, 22 + 263, 32 Spectrum Properties - 193, 22 + 263, 32 Spectrum Properties - 190, 6 + 260, 6 - 193, 22 + 263, 32 Zoom Out - 190, 6 + 260, 6 - 193, 22 + 263, 32 Show Chromatograms - 193, 22 + 263, 32 Synchronize m/z Scale - 194, 486 + 264, 686 contextMenuSpectrum @@ -465,292 +465,292 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 733, 17 + 1002, 17 - 190, 22 + 286, 34 Replicate Comparison - 190, 22 + 286, 34 Peptide Comparison - 142, 22 + 217, 34 Score To Run - 142, 22 + 217, 34 Run To Run - 190, 22 + 286, 34 Regression - 190, 22 + 286, 34 Scheduling - 190, 22 + 256, 32 Graph - 133, 22 + 201, 34 Correlation - 133, 22 + 201, 34 Residuals - 190, 22 + 256, 32 Plot - 167, 22 + 258, 34 Targets - 167, 22 + 258, 34 Targets at 1% FDR - 167, 22 + 258, 34 Standards - 167, 22 + 258, 34 Decoys - 190, 22 + 256, 32 Points - 154, 22 + 232, 34 All - 154, 22 + 232, 34 Retention Time - 154, 22 + 232, 34 FWHM - 154, 22 + 232, 34 FWB - 190, 22 + 256, 32 Value - 190, 22 + 256, 32 Legend - 190, 22 + 256, 32 Selection - 190, 22 + 256, 32 Synchronize Zooming - 190, 22 + 256, 32 Refine - 190, 22 + 256, 32 Prediction - 106, 22 + 162, 34 All - 106, 22 + 162, 34 Single - 106, 22 + 162, 34 Best - 190, 22 + 256, 32 Replicates - 190, 22 + 256, 32 Set Threshold... - 208, 22 + 314, 34 Linear Regression - 208, 22 + 314, 34 Kernel Density Estimation - 208, 22 + 314, 34 Logarithmic Regression - 208, 22 + 314, 34 Loess - 190, 22 + 256, 32 Regression Method - 187, 6 + 253, 6 - 190, 22 + 256, 32 Create Regression... - 152, 22 + 230, 34 <placeholder> - 149, 6 + 227, 6 - 152, 22 + 230, 34 Add... - 152, 22 + 230, 34 Edit Current... - 190, 22 + 256, 32 Calculator - 187, 6 + 253, 6 - 190, 22 + 256, 32 Remove Outliers - 190, 22 + 256, 32 Remove - 187, 6 + 253, 6 - 190, 22 + 256, 32 Properties... - 187, 6 + 253, 6 - 190, 22 + 256, 32 Zoom Out - 187, 6 + 253, 6 - 191, 430 + 257, 610 contextMenuRetentionTimes @@ -759,292 +759,292 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1124, 17 + 1550, 17 - 190, 22 + 286, 34 Replicate Comparison - 190, 22 + 286, 34 Peptide Comparison - 190, 22 + 286, 34 Relative Abundance - 190, 22 + 286, 34 CV Histogram - 190, 22 + 286, 34 CV 2D Histogram - 209, 22 + 287, 32 Graph - 96, 22 + 145, 34 Bar - 96, 22 + 145, 34 Line - 209, 22 + 287, 32 Graph Type - 154, 22 + 232, 34 Document - 154, 22 + 232, 34 Retention Time - 154, 22 + 232, 34 Peak Area - 154, 22 + 232, 34 Mass Error - 209, 22 + 287, 32 Order - 151, 22 + 228, 34 Document - 151, 22 + 228, 34 Acquired Time - 209, 22 + 287, 32 Order - 209, 22 + 287, 32 Normalized To - 130, 22 + 197, 34 Document - 130, 22 + 197, 34 Protein - 209, 22 + 287, 32 Scope - 209, 22 + 287, 32 Targets - 209, 22 + 287, 32 Exclude - 209, 22 + 287, 32 Legend - 209, 22 + 287, 32 Show Library - 209, 22 + 287, 32 Show Dot Product - 209, 22 + 287, 32 Log Scale - 209, 22 + 287, 32 CV Values - 206, 6 + 284, 6 - 209, 22 + 287, 32 Properties... - 122, 22 + 184, 34 Replicate - 209, 22 + 287, 32 Group By - 67, 22 + 102, 34 - 67, 22 + 102, 34 - 67, 22 + 102, 34 - 67, 22 + 102, 34 - 209, 22 + 287, 32 Bin Width - 112, 22 + 172, 34 - 112, 22 + 172, 34 Decoys - 209, 22 + 287, 32 Points - 129, 22 + 196, 34 All - 129, 22 + 196, 34 Count - 129, 22 + 196, 34 Best - 126, 6 + 193, 6 - 129, 22 + 196, 34 Precursors - 129, 22 + 196, 34 Products - 209, 22 + 287, 32 Transitions - 209, 22 + 287, 32 Normalized To - 209, 22 + 287, 32 Log Scale - 209, 22 + 287, 32 Remove Above CV Cutoff - 206, 6 + 284, 6 - 210, 478 + 288, 688 contextMenuPeakAreas @@ -1081,10 +1081,13 @@ Top, Bottom, Left, Right - -1, 0 + -2, 0 + + + 4, 5, 4, 5 - 736, 444 + 1104, 690 0 @@ -1105,10 +1108,13 @@ Fill - 0, 49 + 0, 68 + + + 4, 5, 4, 5 - 734, 443 + 1101, 689 0 @@ -1126,13 +1132,13 @@ 6 - 447, 17 + 607, 17 False - 569, 17 + 840, 27 Ready @@ -1141,7 +1147,7 @@ MiddleLeft - 133, 16 + 200, 26 False @@ -1150,13 +1156,13 @@ Magenta - 21, 20 + 29, 31 False - 38, 17 + 61, 27 0 prot @@ -1165,7 +1171,7 @@ MiddleRight - 36, 17 + 58, 27 0 pep @@ -1174,7 +1180,7 @@ MiddleRight - 39, 17 + 61, 27 0 prec @@ -1183,7 +1189,7 @@ MiddleRight - 37, 17 + 58, 27 0 tran @@ -1192,10 +1198,13 @@ MiddleRight - 0, 492 + 0, 757 + + + 2, 0, 21, 0 - 734, 22 + 1101, 34 3 @@ -1213,13 +1222,13 @@ 7 - 1480, 17 + 2046, 17 Magenta - 23, 22 + 34, 28 New Document @@ -1228,7 +1237,7 @@ Magenta - 23, 22 + 34, 28 Open @@ -1237,7 +1246,7 @@ Magenta - 23, 22 + 34, 28 Save @@ -1246,7 +1255,7 @@ Magenta - 23, 22 + 34, 28 toolStripButton1 @@ -1255,13 +1264,13 @@ Upload to Panorama - 6, 25 + 6, 33 Magenta - 23, 22 + 34, 28 Cut @@ -1270,7 +1279,7 @@ Magenta - 23, 22 + 34, 28 Copy @@ -1279,13 +1288,13 @@ Magenta - 23, 22 + 34, 28 Paste - 6, 25 + 6, 33 False @@ -1294,7 +1303,7 @@ Magenta - 32, 22 + 45, 28 Undo @@ -1306,28 +1315,31 @@ Magenta - 32, 22 + 45, 28 Redo - 6, 25 + 6, 33 White - 29, 22 + 42, 28 User interface selection - 0, 24 + 0, 35 + + + 0, 0, 3, 0 - 734, 25 + 1101, 33 5 @@ -1348,13 +1360,13 @@ 8 - 337, 17 + 456, 17 Fuchsia - 200, 22 + 301, 34 Sta&rt... @@ -1366,7 +1378,7 @@ Ctrl+N - 200, 22 + 301, 34 &New @@ -1378,7 +1390,7 @@ Ctrl+O - 200, 22 + 301, 34 &Open... @@ -1387,19 +1399,19 @@ Magenta - 200, 22 + 301, 34 Open From Panora&ma... - 200, 22 + 301, 34 Open &containing folder - 197, 6 + 298, 6 Fuchsia @@ -1408,19 +1420,19 @@ Ctrl+S - 200, 22 + 301, 34 &Save - 200, 22 + 301, 34 Save &As... - 200, 22 + 301, 34 S&hare... @@ -1429,169 +1441,169 @@ Fuchsia - 200, 22 + 301, 34 &Upload to Panorama... - 197, 6 + 298, 6 - 194, 22 + 292, 34 &Run Peptide Search... - 194, 22 + 292, 34 &EncyclopeDIA Search... - 194, 22 + 292, 34 &Feature Detection... - 200, 22 + 301, 34 &Search - 170, 22 + 255, 34 &Results... - 170, 22 + 255, 34 Peak &Boundaries... - 167, 6 + 252, 6 - 170, 22 + 255, 34 &Peptide Search... - 167, 6 + 252, 6 - 170, 22 + 255, 34 &FASTA... - 170, 22 + 255, 34 &Assay Library... - 170, 22 + 255, 34 &Transition List... - 170, 22 + 255, 34 &Document... - 170, 22 + 255, 34 A&nnotations... - 200, 22 + 301, 34 &Import - 183, 22 + 276, 34 &Transition List... - 183, 22 + 276, 34 &Isolation List... - 183, 22 + 276, 34 &Method... - 180, 6 + 273, 6 - 183, 22 + 276, 34 &Report... - 180, 6 + 273, 6 - 183, 22 + 276, 34 &Spectral Library... - 183, 22 + 276, 34 &Chromatograms... - 183, 22 + 276, 34 m&Prophet Features... - 183, 22 + 276, 34 &Annotations... - 200, 22 + 301, 34 &Export - 197, 6 + 298, 6 - 197, 6 + 298, 6 False - 200, 22 + 301, 34 E&xit @@ -1600,7 +1612,7 @@ Ctrl+N - 37, 20 + 54, 29 &File @@ -1609,106 +1621,106 @@ Fuchsia - 39, 20 + 58, 29 &Edit - 52, 20 + 76, 29 &Refine - 44, 20 + 65, 29 &View - 181, 6 + 275, 6 False - 184, 22 + 278, 34 &Save Current... - 184, 22 + 278, 34 &Edit List... - 181, 6 + 275, 6 - 184, 22 + 278, 34 Sh&are... - 184, 22 + 278, 34 &Import... - 181, 6 + 275, 6 - 184, 22 + 278, 34 &Peptide Settings... - 184, 22 + 278, 34 &Transition Settings... - 184, 22 + 278, 34 &Document Settings... - 181, 6 + 275, 6 - 184, 22 + 278, 34 I&ntegrate All - 61, 20 + 92, 29 &Settings - 178, 22 + 270, 34 <placeholder> - 175, 6 + 267, 6 False - 178, 22 + 270, 34 &Updates... @@ -1717,103 +1729,103 @@ False - 178, 22 + 270, 34 &Tool Store... - 178, 22 + 270, 34 &External Tools... - 175, 6 + 267, 6 - 178, 22 + 270, 34 &Immediate Window - 175, 6 + 267, 6 - 178, 22 + 270, 34 &Options... - 46, 20 + 69, 29 &Tools - 187, 22 + 284, 34 &Home - 187, 22 + 284, 34 &Videos - 187, 22 + 284, 34 &Webinars - 187, 22 + 284, 34 &Tutorials - 156, 22 + 234, 34 &Reports - 156, 22 + 234, 34 &Command Line - 156, 22 + 234, 34 &Other - 187, 22 + 284, 34 &Documentation - 187, 22 + 284, 34 &Support - 187, 22 + 284, 34 &Issues - 187, 22 + 284, 34 Submit Error Report... @@ -1822,31 +1834,31 @@ False - 187, 22 + 284, 34 Crash Skyline... - 184, 6 + 281, 6 - 187, 22 + 284, 34 &Check for Updates - 184, 6 + 281, 6 - 187, 22 + 284, 34 &About - 44, 20 + 65, 29 &Help @@ -1855,7 +1867,7 @@ 0, 0 - 734, 24 + 1101, 35 1 @@ -1885,163 +1897,163 @@ False - 941, 17 + 1293, 17 - 190, 22 + 286, 34 Replicate Comparison - 190, 22 + 286, 34 Peptide Comparison - 190, 22 + 286, 34 Histogram - 190, 22 + 286, 34 2D Histogram - 136, 22 + 176, 32 Graph - 136, 22 + 176, 32 Properties... - 136, 22 + 176, 32 Legend - 167, 22 + 258, 34 Targets - 167, 22 + 258, 34 Targets at 1% FDR - 167, 22 + 258, 34 Decoys - 136, 22 + 176, 32 Points - 117, 22 + 181, 34 0.5 ppm - 117, 22 + 181, 34 1.0 ppm - 117, 22 + 181, 34 1.5 ppm - 117, 22 + 181, 34 2.0 ppm - 136, 22 + 176, 32 Bin Width - 129, 22 + 196, 34 All - 129, 22 + 196, 34 Best - 126, 6 + 193, 6 - 129, 22 + 196, 34 Precursors - 129, 22 + 196, 34 Products - 136, 22 + 176, 32 Transitions - 156, 22 + 238, 34 Retention Time - 156, 22 + 238, 34 Mass to Charge - 136, 22 + 176, 32 X-Axis - 136, 22 + 176, 32 Log Scale - 137, 180 + 177, 260 contextMenuMassErrors @@ -2050,109 +2062,109 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 155, 17 + 202, 17 - 124, 22 + 188, 34 Precursor - 124, 22 + 188, 34 Peptide - 136, 22 + 176, 32 Target - 130, 22 + 198, 34 Replicates - 130, 22 + 198, 34 Histogram - 136, 22 + 176, 32 Graph Type - 133, 6 + 173, 6 - 184, 22 + 278, 34 Selection - 184, 22 + 278, 34 Legend - 184, 22 + 278, 34 Mean and Stddev - 184, 22 + 278, 34 At Least N Replicates - 136, 22 + 176, 32 Show - 150, 22 + 226, 34 Peptide Count - 150, 22 + 226, 34 Percent - 136, 22 + 176, 32 Y Scale - 133, 6 + 173, 6 - 136, 22 + 176, 32 Properties... - 133, 6 + 173, 6 - 137, 132 + 177, 182 contextMenuDetections @@ -2167,10 +2179,13 @@ 89 - 6, 13 + 9, 20 - 734, 514 + 1101, 791 + + + 4, 5, 4, 5 Skyline @@ -2179,7 +2194,7 @@ modeUIHandler - pwiz.Skyline.Util.Helpers+ModeUIExtender, Skyline, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + pwiz.Skyline.Util.Helpers+ModeUIExtender, Skyline-daily, Version=23.1.1.550, Culture=neutral, PublicKeyToken=null cutContextMenuItem @@ -4039,6 +4054,6 @@ SkylineWindow - pwiz.Skyline.Util.FormEx, Skyline, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + pwiz.Skyline.Util.FormEx, Skyline-daily, Version=23.1.1.550, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/pwiz_tools/Skyline/packages.config b/pwiz_tools/Skyline/packages.config deleted file mode 100644 index a0332d51e5..0000000000 --- a/pwiz_tools/Skyline/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file