Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Files View #3334

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

Files View #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8dd1123
Checkpoint FilesTree. This tree shows files associated with a Skyline…
ekoneil Jan 15, 2025
d9eb401
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 15, 2025
20a5405
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 16, 2025
9179fec
Code inspection updates and bug fixes, including support for translat…
ekoneil Jan 16, 2025
b19d125
Minor naming change: "audit log", not "activity log".
ekoneil Jan 16, 2025
495bb18
Add .Designer file for FilesTreeForm and relocate generated code.
ekoneil Jan 16, 2025
680ce88
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 21, 2025
25df472
Updates after review with Brendan:
ekoneil Jan 21, 2025
ffc9ed3
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 21, 2025
cd900fc
Rearrange FilesTree moving context menu and tooltip rendering to the …
ekoneil Jan 21, 2025
ee4784c
* On double click, open explorer / activate replicate
ekoneil Jan 21, 2025
02b7f0b
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 21, 2025
c5e31f8
Code inspection fixes and other updates.
ekoneil Jan 22, 2025
a3cb7a7
Merge branch 'Skyline/work/20250102_FilesView' of github.com:ProteoWi…
ekoneil Jan 22, 2025
519a67f
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 23, 2025
f355cdb
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 27, 2025
2420a14
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 28, 2025
b2ccde2
Checkpoint.
ekoneil Jan 28, 2025
88a71cb
Fix TC code inspection.
ekoneil Jan 29, 2025
f4cd448
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 29, 2025
5784939
* Remove unused item from FilesTree's context menu
ekoneil Jan 29, 2025
d41ecff
* Handle document change events in FilesTree
ekoneil Jan 30, 2025
3d53aee
Make dictionary immutable - better though doesn't solve the problem.
ekoneil Jan 30, 2025
8d35700
* Support for .skyl and .sky.view files by firing a new event back to…
ekoneil Jan 30, 2025
73bc994
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Jan 30, 2025
6ddf456
Point link in SequenceTree at Wayback Machine. Previous link 404s.
ekoneil Jan 30, 2025
9e6d164
* Remove event added in last change - forgot DocumentChangedEventArgs…
ekoneil Feb 3, 2025
6ee3f16
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Feb 3, 2025
770975c
Another attempt to fix code inspection.
ekoneil Feb 3, 2025
4625580
Merge branch 'Skyline/work/20250102_FilesView' of github.com:ProteoWi…
ekoneil Feb 3, 2025
dddc04b
* Add IIdentityContainer to FilesTree's model
ekoneil Feb 3, 2025
fecf495
Merge branch 'master' into Skyline/work/20250102_FilesView
ekoneil Feb 4, 2025
2473dd0
More FilesTree testing:
ekoneil Feb 4, 2025
e00895c
Change how IFileModel implements Identity. Extending IIdentityContain…
ekoneil Feb 5, 2025
ade7802
Expand FilesTree testing
ekoneil Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 128 additions & 2 deletions pwiz_tools/Skyline/Controls/ControlsResources.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions pwiz_tools/Skyline/Controls/ControlsResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,46 @@
<data name="UndoRedoList_GetLabelText_Undo_1_Action" xml:space="preserve">
<value>Undo 1 Action</value>
</data>
<data name="FilesTree_TreeNodeLabel_NewDocument" xml:space="preserve">
<value>New Document</value>
</data>
<data name="FilesTree_TreeNodeLabel_Replicates" xml:space="preserve">
<value>Replicates</value>
</data>
<data name="FilesTree_TreeNodeLabel_None" xml:space="preserve">
<value>None</value>
</data>
<data name="FilesTree_TreeNodeLabel_Libraries" xml:space="preserve">
<value>Libraries</value>
</data>
<data name="FilesTree_TreeNodeLabel_BackgroundProteome" xml:space="preserve">
<value>Background Proteome</value>
</data>
<data name="FilesTree_TreeNode_RenderTip_Path" xml:space="preserve">
<value>Path</value>
</data>
<data name="FilesTree_TreeNode_RenderTip_ActiveDirectory" xml:space="preserve">
<value>Active Directory</value>
</data>
<data name="FilesTree_TreeNode_RenderTip_SampleName" xml:space="preserve">
<value>Sample Name</value>
</data>
<data name="FilesTree_TreeNode_RenderTip_AcquiredTime" xml:space="preserve">
<value>Acquired Time</value>
</data>
<data name="FilesTree_TreeNode_RenderTip_InstrumentModel" xml:space="preserve">
<value>Instrument Model</value>
</data>
<data name="FilesTree_TreeNodeLabel_AuditLog" xml:space="preserve">
<value>Audit Log</value>
</data>
<data name="FilesTree_TreeNode_RenderTip_Name" xml:space="preserve">
<value>Name</value>
</data>
<data name="FilesTree_TreeNodeLabel_ProjectFiles" xml:space="preserve">
<value>Project Files</value>
</data>
<data name="FilesTree_TreeNodeLabel_ViewFile" xml:space="preserve">
<value>View File</value>
</data>
</root>
Loading