From e72503268045f62ba47b0a2063603f7b4ca0b7f8 Mon Sep 17 00:00:00 2001 From: Matt Chambers Date: Wed, 3 Jan 2024 13:01:59 -0500 Subject: [PATCH] * resolved resx split conflicts --- .../Skyline/EditUI/AssociateProteinsDlg.cs | 12 +- .../EditUI/EditUIResources.designer.cs | 27 +++ .../Skyline/EditUI/EditUIResources.resx | 9 + .../Model/Proteome/ProteinAssociation.cs | 2 +- .../Proteome/ProteomeResources.designer.cs | 9 + .../Model/Proteome/ProteomeResources.resx | 3 + .../Skyline/Properties/Resources.Designer.cs | 195 ------------------ pwiz_tools/Skyline/Properties/Resources.resx | 12 -- 8 files changed, 55 insertions(+), 214 deletions(-) diff --git a/pwiz_tools/Skyline/EditUI/AssociateProteinsDlg.cs b/pwiz_tools/Skyline/EditUI/AssociateProteinsDlg.cs index ef01459c1e..6cf854520f 100644 --- a/pwiz_tools/Skyline/EditUI/AssociateProteinsDlg.cs +++ b/pwiz_tools/Skyline/EditUI/AssociateProteinsDlg.cs @@ -341,16 +341,16 @@ private void cbGeneLevel_CheckedChanged(object sender, EventArgs e) { cbGroupProteins.Checked = true; cbGroupProteins.Enabled = false; - lblMinimalProteinList.Text = Resources.AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides; - lblRemoveSubsetProteins.Text = Resources.AssociateProteinsDlg_Remove_subset_genes; - lblMinPeptides.Text = Resources.AssociateProteinsDlg_Min_peptides_per_gene; + lblMinimalProteinList.Text = EditUIResources.AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides; + lblRemoveSubsetProteins.Text = EditUIResources.AssociateProteinsDlg_Remove_subset_genes; + lblMinPeptides.Text = EditUIResources.AssociateProteinsDlg_Min_peptides_per_gene; } else { cbGroupProteins.Enabled = true; - lblMinimalProteinList.Text = Resources.AssociateProteinsDlg_Find_minimal_protein_group_list_that_explains_all_peptides; - lblRemoveSubsetProteins.Text = Resources.AssociateProteinsDlg_Remove_subset_protein_groups; - lblMinPeptides.Text = Resources.AssociateProteinsDlg_Min_peptides_per_protein_group; + lblMinimalProteinList.Text = EditUIResources.AssociateProteinsDlg_Find_minimal_protein_group_list_that_explains_all_peptides; + lblRemoveSubsetProteins.Text = EditUIResources.AssociateProteinsDlg_Remove_subset_protein_groups; + lblMinPeptides.Text = EditUIResources.AssociateProteinsDlg_Min_peptides_per_protein_group; } UpdateParsimonyResults(); diff --git a/pwiz_tools/Skyline/EditUI/EditUIResources.designer.cs b/pwiz_tools/Skyline/EditUI/EditUIResources.designer.cs index c5fb4854fd..f2b47bd113 100644 --- a/pwiz_tools/Skyline/EditUI/EditUIResources.designer.cs +++ b/pwiz_tools/Skyline/EditUI/EditUIResources.designer.cs @@ -133,6 +133,15 @@ public static string AssociateProteinsDlg_CellValueNeeded_Shared_Peptides { } } + /// + /// Looks up a localized string similar to Find &minimal gene group list that explains all peptides. + /// + public static string AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides { + get { + return ResourceManager.GetString("AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides", resourceCulture); + } + } + /// /// Looks up a localized string similar to Find &minimal protein group list that explains all peptides. /// @@ -152,6 +161,15 @@ public static string AssociateProteinsDlg_FindProteinMatchesWithFasta_No_matches } } + /// + /// Looks up a localized string similar to Mi&n peptides per gene. + /// + public static string AssociateProteinsDlg_Min_peptides_per_gene { + get { + return ResourceManager.GetString("AssociateProteinsDlg_Min_peptides_per_gene", resourceCulture); + } + } + /// /// Looks up a localized string similar to Mi&n peptides per protein group. /// @@ -180,6 +198,15 @@ public static string AssociateProteinsDlg_OnShown_Organize_all_document_peptides } } + /// + /// Looks up a localized string similar to &Remove subset genes. + /// + public static string AssociateProteinsDlg_Remove_subset_genes { + get { + return ResourceManager.GetString("AssociateProteinsDlg_Remove_subset_genes", resourceCulture); + } + } + /// /// Looks up a localized string similar to &Remove subset protein groups. /// diff --git a/pwiz_tools/Skyline/EditUI/EditUIResources.resx b/pwiz_tools/Skyline/EditUI/EditUIResources.resx index 4ef9d9a51d..9534707311 100644 --- a/pwiz_tools/Skyline/EditUI/EditUIResources.resx +++ b/pwiz_tools/Skyline/EditUI/EditUIResources.resx @@ -462,4 +462,13 @@ Example: Looplink: T [4] These proteins include: + + Find &minimal gene group list that explains all peptides + + + Mi&n peptides per gene + + + &Remove subset genes + \ No newline at end of file diff --git a/pwiz_tools/Skyline/Model/Proteome/ProteinAssociation.cs b/pwiz_tools/Skyline/Model/Proteome/ProteinAssociation.cs index 713bad4fac..2040ffe890 100644 --- a/pwiz_tools/Skyline/Model/Proteome/ProteinAssociation.cs +++ b/pwiz_tools/Skyline/Model/Proteome/ProteinAssociation.cs @@ -669,7 +669,7 @@ IProteinRecord GenerateConcatenatedSequenceIfNecessary(Dictionary(geneLevel ? new GeneLevelEqualityComparer() : EqualityComparer.Default); diff --git a/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.designer.cs b/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.designer.cs index 8007fad011..e36df9671d 100644 --- a/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.designer.cs +++ b/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.designer.cs @@ -136,6 +136,15 @@ public static string ProteinAssociation_CalculateProteinGroups_Calculating_prote } } + /// + /// Looks up a localized string similar to Calculating gene groups. + /// + public static string ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups { + get { + return ResourceManager.GetString("ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups", resourceCulture); + } + } + /// /// Looks up a localized string similar to Calculating protein clusters. /// diff --git a/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.resx b/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.resx index 6fcc939f69..00f15771ae 100644 --- a/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.resx +++ b/pwiz_tools/Skyline/Model/Proteome/ProteomeResources.resx @@ -160,4 +160,7 @@ Resolving protein details + + Calculating gene groups + \ No newline at end of file diff --git a/pwiz_tools/Skyline/Properties/Resources.Designer.cs b/pwiz_tools/Skyline/Properties/Resources.Designer.cs index 5d811574b0..a3ec6aafc6 100644 --- a/pwiz_tools/Skyline/Properties/Resources.Designer.cs +++ b/pwiz_tools/Skyline/Properties/Resources.Designer.cs @@ -633,116 +633,6 @@ public static string AssociateProteinsDlg_ApplyChanges_Associated_proteins { } } - /// - /// Looks up a localized string similar to Shared Peptides. - /// - public static string AssociateProteinsDlg_CellValueNeeded_Shared_Peptides { - get { - return ResourceManager.GetString("AssociateProteinsDlg_CellValueNeeded_Shared_Peptides", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find &minimal gene group list that explains all peptides. - /// - public static string AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides { - get { - return ResourceManager.GetString("AssociateProteinsDlg_Find_minimal_gene_group_list_that_explains_all_peptides", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Find &minimal protein group list that explains all peptides. - /// - public static string AssociateProteinsDlg_Find_minimal_protein_group_list_that_explains_all_peptides { - get { - return ResourceManager.GetString("AssociateProteinsDlg_Find_minimal_protein_group_list_that_explains_all_peptides", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Finding peptides in FASTA file. - /// - public static string AssociateProteinsDlg_FindProteinMatchesWithFasta_Finding_peptides_in_FASTA_file { - get { - return ResourceManager.GetString("AssociateProteinsDlg_FindProteinMatchesWithFasta_Finding_peptides_in_FASTA_file", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to No matches were found using the imported fasta file.. - /// - public static string AssociateProteinsDlg_FindProteinMatchesWithFasta_No_matches_were_found_using_the_imported_fasta_file_ { - get { - return ResourceManager.GetString("AssociateProteinsDlg_FindProteinMatchesWithFasta_No_matches_were_found_using_the_" + - "imported_fasta_file_", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mi&n peptides per gene. - /// - public static string AssociateProteinsDlg_Min_peptides_per_gene { - get { - return ResourceManager.GetString("AssociateProteinsDlg_Min_peptides_per_gene", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Mi&n peptides per protein group. - /// - public static string AssociateProteinsDlg_Min_peptides_per_protein_group { - get { - return ResourceManager.GetString("AssociateProteinsDlg_Min_peptides_per_protein_group", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Existing protein associations will be discarded.. - /// - public static string AssociateProteinsDlg_OnShown_Existing_protein_associations_will_be_discarded_ { - get { - return ResourceManager.GetString("AssociateProteinsDlg_OnShown_Existing_protein_associations_will_be_discarded_", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Organize all document peptides into associated proteins or protein groups.. - /// - public static string AssociateProteinsDlg_OnShown_Organize_all_document_peptides_into_associated_proteins_or_protein_groups { - get { - return ResourceManager.GetString("AssociateProteinsDlg_OnShown_Organize_all_document_peptides_into_associated_prote" + - "ins_or_protein_groups", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Remove subset genes. - /// - public static string AssociateProteinsDlg_Remove_subset_genes { - get { - return ResourceManager.GetString("AssociateProteinsDlg_Remove_subset_genes", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to &Remove subset protein groups. - /// - public static string AssociateProteinsDlg_Remove_subset_protein_groups { - get { - return ResourceManager.GetString("AssociateProteinsDlg_Remove_subset_protein_groups", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Applying parsimony options. - /// - public static string AssociateProteinsDlg_UpdateParsimonyResults_Applying_parsimony_options { - get { - return ResourceManager.GetString("AssociateProteinsDlg_UpdateParsimonyResults_Applying_parsimony_options", resourceCulture); - } - } - /// /// Looks up a localized string similar to No background proteome defined, see the Digestion tab in Peptide Settings for more information.. /// @@ -7864,91 +7754,6 @@ public static System.Drawing.Bitmap Protein { } } - /// - /// Looks up a localized string similar to Are you sure you want to delete the molecule list '{0}'?. - /// - public static string Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_the_molecule_list___0___ { - get { - return ResourceManager.GetString("Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_the_molecule_list__" + - "_0___", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Are you sure you want to delete the protein '{0}'?. - /// - public static string Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_the_protein___0___ { - get { - return ResourceManager.GetString("Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_the_protein___0___", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Are you sure you want to delete these {0} molecule lists?. - /// - public static string Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_these__0__molecule_lists_ { - get { - return ResourceManager.GetString("Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_these__0__molecule_" + - "lists_", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Are you sure you want to delete these {0} proteins?. - /// - public static string Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_these__0__proteins_ { - get { - return ResourceManager.GetString("Protein_GetDeleteConfirmation_Are_you_sure_you_want_to_delete_these__0__proteins_" + - "", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Calculating protein groups. - /// - public static string ProteinAssociation_CalculateProteinGroups_Calculating_protein_groups { - get { - return ResourceManager.GetString("ProteinAssociation_CalculateProteinGroups_Calculating_protein_groups", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Group of {0} proteins. - /// - public static string ProteinAssociation_CalculateProteinGroups_Group_of__0__proteins { - get { - return ResourceManager.GetString("ProteinAssociation_CalculateProteinGroups_Group_of__0__proteins", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Calculating gene groups. - /// - public static string ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups { - get { - return ResourceManager.GetString("ProteinAssociation_CalculateProteinOrGeneGroups_Calculating_gene_groups", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Calculating protein clusters. - /// - public static string ProteinAssociation_Calculating_protein_clusters { - get { - return ResourceManager.GetString("ProteinAssociation_Calculating_protein_clusters", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Creating protein targets and assigning their peptides. - /// - public static string ProteinAssociation_CreateDocTree_Creating_protein_targets_and_assigning_their_peptides { - get { - return ResourceManager.GetString("ProteinAssociation_CreateDocTree_Creating_protein_targets_and_assigning_their_pep" + - "tides", resourceCulture); - } - } - /// /// Looks up a localized string similar to Unmapped Peptides. /// diff --git a/pwiz_tools/Skyline/Properties/Resources.resx b/pwiz_tools/Skyline/Properties/Resources.resx index 1d20a8d5f1..e7b3917e86 100644 --- a/pwiz_tools/Skyline/Properties/Resources.resx +++ b/pwiz_tools/Skyline/Properties/Resources.resx @@ -4357,16 +4357,4 @@ If you choose Disable, you can enable Auto-select later with the "Refine > Ad Error: Could not find background proteome file {0} - - Calculating gene groups - - - Find &minimal gene group list that explains all peptides - - - &Remove subset genes - - - Mi&n peptides per gene - \ No newline at end of file