Skip to content

Commit

Permalink
Merge branch 'master' into Skyline/work/20240905_what_is_up_with_test…
Browse files Browse the repository at this point in the history
…s_on_jason_xps
  • Loading branch information
bspratt authored Jan 7, 2025
2 parents cea04a7 + 3293ad8 commit 628bf4a
Show file tree
Hide file tree
Showing 479 changed files with 1,089 additions and 1,012 deletions.
78 changes: 41 additions & 37 deletions pwiz_tools/Skyline/Controls/SequenceTree.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,44 +142,48 @@ public void InitializeTree(IDocumentUIContainer documentUIContainer)

ImageList = new ImageList
{
TransparentColor = Color.Magenta
TransparentColor = Color.Magenta,
ColorDepth = ColorDepth.Depth24Bit
};
ImageList.Images.Add(Resources.Blank);
ImageList.Images.Add(Resources.Protein);
ImageList.Images.Add(Resources.Peptide);
ImageList.Images.Add(Resources.TransitionGroup);
ImageList.Images.Add(Resources.Fragment);
ImageList.Images.Add(Resources.PeptideLib);
ImageList.Images.Add(Resources.PeptideIrt);
ImageList.Images.Add(Resources.PeptideIrtLib);
ImageList.Images.Add(Resources.PeptideStandard);
ImageList.Images.Add(Resources.PeptideStandardLib);
ImageList.Images.Add(Resources.PeptideQc);
ImageList.Images.Add(Resources.PeptideQcLib);
ImageList.Images.Add(Resources.TransitionGroupLib);
ImageList.Images.Add(Resources.FragmentLib);
ImageList.Images.Add(Resources.PeptideDecoy);
ImageList.Images.Add(Resources.TransitionGroupDecoy);
ImageList.Images.Add(Resources.FragmentDecoy);
ImageList.Images.Add(Resources.ProteinDecoy);
ImageList.Images.Add(Resources.PeptideDecoyLib);
ImageList.Images.Add(Resources.TransitionGroupLibDecoy);
ImageList.Images.Add(Resources.FragmentLibDecoy);
ImageList.Images.Add(Resources.Molecule);
ImageList.Images.Add(Resources.MoleculeLib);
ImageList.Images.Add(Resources.MoleculeIrt);
ImageList.Images.Add(Resources.MoleculeIrtLib);
ImageList.Images.Add(Resources.MoleculeStandard);
ImageList.Images.Add(Resources.MoleculeStandardLib);
ImageList.Images.Add(Resources.MoleculeList);
ImageList.Images.Add(Resources.PeptideList);
ImageList.Images.Add(Resources.EmptyList);

StateImageList = new ImageList();
StateImageList.Images.Add(Resources.Peak);
StateImageList.Images.Add(Resources.Keep);
StateImageList.Images.Add(Resources.NoPeak);
StateImageList.Images.Add(Resources.PeakBlank);
ImageList.Images.Add(Resources.Blank); // 1bpp
ImageList.Images.Add(Resources.Protein); // 16bpp
ImageList.Images.Add(Resources.Peptide); // 4bpp
ImageList.Images.Add(Resources.TransitionGroup); // 8bpp
ImageList.Images.Add(Resources.Fragment); // 8bpp
ImageList.Images.Add(Resources.PeptideLib); // 4bpp
ImageList.Images.Add(Resources.PeptideIrt); // 4bpp
ImageList.Images.Add(Resources.PeptideIrtLib); // 4bpp
ImageList.Images.Add(Resources.PeptideStandard); // 4bpp
ImageList.Images.Add(Resources.PeptideStandardLib); // 4bpp
ImageList.Images.Add(Resources.PeptideQc); // 4bpp
ImageList.Images.Add(Resources.PeptideQcLib); // 4bpp
ImageList.Images.Add(Resources.TransitionGroupLib); // 8bpp
ImageList.Images.Add(Resources.FragmentLib); // 8bpp
ImageList.Images.Add(Resources.PeptideDecoy); // 4bpp
ImageList.Images.Add(Resources.TransitionGroupDecoy); // 8bpp
ImageList.Images.Add(Resources.FragmentDecoy); // 8bpp
ImageList.Images.Add(Resources.ProteinDecoy); // 24bpp
ImageList.Images.Add(Resources.PeptideDecoyLib); // 4bpp
ImageList.Images.Add(Resources.TransitionGroupLibDecoy); // 8bpp
ImageList.Images.Add(Resources.FragmentLibDecoy); // 8bpp
ImageList.Images.Add(Resources.Molecule); // 24bpp
ImageList.Images.Add(Resources.MoleculeLib); // 24bpp
ImageList.Images.Add(Resources.MoleculeIrt); // 24bpp
ImageList.Images.Add(Resources.MoleculeIrtLib); // 24bpp
ImageList.Images.Add(Resources.MoleculeStandard); // 24bpp
ImageList.Images.Add(Resources.MoleculeStandardLib); // 24bpp
ImageList.Images.Add(Resources.MoleculeList); // 16bpp
ImageList.Images.Add(Resources.PeptideList); // 16bpp
ImageList.Images.Add(Resources.EmptyList); // 16bpp

StateImageList = new ImageList
{
ColorDepth = ColorDepth.Depth24Bit
};
StateImageList.Images.Add(Resources.Peak); // 8bpp
StateImageList.Images.Add(Resources.Keep); // 24bpp
StateImageList.Images.Add(Resources.NoPeak); // 24bpp
StateImageList.Images.Add(Resources.PeakBlank); // 8bpp

// Add the editable node at the end
Nodes.Add(new EmptyNode());
Expand Down
12 changes: 8 additions & 4 deletions pwiz_tools/Skyline/Controls/StatementCompletionTextBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ public class StatementCompletionTextBox
private ProteinMatchQuery _proteinMatcher;
private CancellationTokenSource _cancellationTokenSource;
private readonly IDocumentUIContainer _documentUiContainer;
private readonly ImageList _imageList = new ImageList() {TransparentColor = Color.Magenta};
private readonly ImageList _imageList = new ImageList
{
TransparentColor = Color.Magenta,
ColorDepth = ColorDepth.Depth16Bit
};
private ProteomeDb _proteomeDb;
private bool _hideOnLoseFocus;

Expand All @@ -55,8 +59,8 @@ public StatementCompletionTextBox(IDocumentUIContainer documentUiContainer, bool
{
MatchTypes = ProteinMatchTypes.ALL;
_documentUiContainer = documentUiContainer;
_imageList.Images.Add(Resources.Protein);
_imageList.Images.Add(Resources.Peptide);
_imageList.Images.Add(Resources.Protein); // 16bpp
_imageList.Images.Add(Resources.Peptide); // 4bpp
_hideOnLoseFocus = hideOnLoseFocus;
}

Expand Down Expand Up @@ -426,7 +430,7 @@ protected void TextBox_HandleDestroyed(EventArgs e)
_cancellationTokenSource = null;
}
}
public static readonly ImageList IMAGE_LIST = new ImageList();
// public static readonly ImageList IMAGE_LIST = new ImageList();
private enum ImageId
{
protein,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-09.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-11.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-13.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-15.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-20.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-23.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-06.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-07.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-09.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-15.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-06.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-07.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-09.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-15.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-06.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-20.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-20.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-20.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-20.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-20.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-09.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-09.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-09.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-19.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-12.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-13.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-15.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-25.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-12.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-14.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-12.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-14.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-04.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-08.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-11.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-04.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-08.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-11.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-18.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-08.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-10.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-13.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-14.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-08.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-10.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-13.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-14.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-21.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-03.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-05.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-06.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-01.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-15.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-27.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-28.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-29.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-33.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-01.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-27.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-28.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-29.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-33.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-01.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-16.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-27.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-28.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-29.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-33.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-02.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-04.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-17.png
Binary file modified pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-19.png
Loading

0 comments on commit 628bf4a

Please sign in to comment.