Skip to content

Commit

Permalink
- Fixed SubmitButton behaviour when switching between mzml and text m…
Browse files Browse the repository at this point in the history 
…ass list

- ClickOnce and Portable versions updated for version 0.5 release
  • Loading branch information
@chrashwood
chrashwood committed Jun 25, 2024
1 parent f5fae89 commit 4a0686b
Show file tree
Hide file tree
Showing 13 changed files with 166 additions and 6 deletions.
2 changes: 1 addition & 1 deletion GlyCombo/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:glycombo"
mc:Ignorable="d"
Title="GlyCombo 0.4 - Protea Glycosciences" Height="648" Width="800" Icon="/GlyCombo_Logo_Final.png" MinHeight="655" MinWidth="800">
Title="GlyCombo 0.5 - Protea Glycosciences" Height="648" Width="800" Icon="/GlyCombo_Logo_Final.png" MinHeight="655" MinWidth="800">


<Grid Margin="3,3,7,3" RenderTransformOrigin="0.43,0.449">
Expand Down
10 changes: 10 additions & 0 deletions GlyCombo/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2275,6 +2275,16 @@ private void PresetCombo_SelectionChanged(object sender, SelectionChangedEventAr
private void TextRadioButton_Checked(object sender, RoutedEventArgs e)
{
TextChecked = true;
submitbutton = (Button)FindName("submitbutton");
if (submitbutton != null)
{
submitbutton.IsEnabled = true;
}
else
{
// Handle the null case
Console.WriteLine("submitbutton is null");
}
}
}
}
Binary file modified GlyCombo_Portable.exe
View file
Binary file not shown.
75 changes: 75 additions & 0 deletions published/Application Files/GlyCombo_0_4_0_2/GlyCombo.dll.manifest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="GlyCombo.exe" version="0.4.0.2" publicKeyToken="c255d772058593a1" language="neutral" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="GlyCombo_Logo_Final.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
<assemblyIdentity name="Launcher" version="8.0.0.0" language="neutral" processorArchitecture="msil" />
<commandLine file="Launcher.exe" parameters="" />
</entryPoint>
<trustInfo>
<security>
<applicationRequestMinimum>
<PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
<defaultAssemblyRequest permissionSetReference="Custom" />
</applicationRequestMinimum>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!--
UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
If you want to utilize File and Registry Virtualization for backward
compatibility then delete the requestedExecutionLevel node.
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentOS>
<osVersionInfo>
<os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
</osVersionInfo>
</dependentOS>
</dependency>
<dependency>
<dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
<assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Launcher.exe" size="17376">
<assemblyIdentity name="Launcher" version="8.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>WJI89SzFFM4XO7jB8ED0dneyUxyYR5m5mjXVxk5DmLg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<file name="GlyCombo.exe" size="31470816">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>mRdimabom2ZCG7qJgUONjW8acTqSyJ80irwlIJjT57Q=</dsig:DigestValue>
</hash>
</file>
<file name="GlyCombo_Logo_Final.ico" size="170840">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>QcGsgSj2P4BNXo9XZ9hNtVD2W5AnrU28KzIg05bZ/wA=</dsig:DigestValue>
</hash>
</file>
<publisherIdentity name="CN=LAPTOP-3INUDJKU\chras" issuerKeyHash="7a14a156401bb8ae1414ac67cd126af35c92e214" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>e9MXefF/34NCNZexPodktE3w1owo4KijQk42sKL52no=</DigestValue></Reference></SignedInfo><SignatureValue>mTIaYOPBQM9TLuttAN/CzZwXI6ZdL9RMbAN5TkuT/kOZIm/ZrCjSFA8iRFqlXVKE9u4oGWibvAHeb4HPRaKRh1KsNbT//FuJvZ0krCjWlq3QIQOrh/7X59ymair8aDn3TunKi7JCNgQ+xENeIISQm5+209LapV34gJGN0UnE410=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>v6bPddwsHCqjIOn9KdXJf91Tue5x3AOyZfZU6QpiCCtT82RRB2a3CRNu1xa3kp5YRQISLAM2OTAJ2dLCnjjLWTWLanfid3ws4rZZoelW2c7YQQBHVGYQTno/KieslLBqr+xmxbGE2+N3ANAAqXI4aRwaeEuxw7ol+4XuEtg4SOk=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="7adaf9a2b0364e42a3a8e0288cd6f04db464873eb197354283df7ff17917d37b" Description="" Url=""><as:assemblyIdentity name="GlyCombo.exe" version="0.4.0.2" publicKeyToken="c255d772058593a1" language="neutral" processorArchitecture="msil" type="win32" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=LAPTOP-3INUDJKU\chras</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>l6+/NlFu1sQCVOIZLDfB5P37sy0Oa+z6Ivaj6XeWtDs=</DigestValue></Reference></SignedInfo><SignatureValue>a7xO1lOw2XCkuhfDd6Y3DZZjPrxj7MxNiVrJLeXalMYLvOr3ZKFeFvq9nIRG7K1GGfkCSJV5cuIMvp6IR2IR2LyeJnIlH+zwBwUE1nYYLMv4sN+f5zzXFRDCQQHM42PUYzAjQNeq6UDtcs4MJdFB00+wkNtK8bzqOR8E+jMxDVE=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>v6bPddwsHCqjIOn9KdXJf91Tue5x3AOyZfZU6QpiCCtT82RRB2a3CRNu1xa3kp5YRQISLAM2OTAJ2dLCnjjLWTWLanfid3ws4rZZoelW2c7YQQBHVGYQTno/KieslLBqr+xmxbGE2+N3ANAAqXI4aRwaeEuxw7ol+4XuEtg4SOk=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIB7TCCAVagAwIBAgIQcmAzkX+sRZlKasSd8fWpkTANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDHioATABBAFAAVABPAFAALQAzAEkATgBVAEQASgBLAFUAXABjAGgAcgBhAHMwHhcNMjQwNDI5MDQxOTM1WhcNMjUwNDI5MTAxOTM1WjA1MTMwMQYDVQQDHioATABBAFAAVABPAFAALQAzAEkATgBVAEQASgBLAFUAXABjAGgAcgBhAHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL+mz3XcLBwqoyDp/SnVyX/dU7nucdwDsmX2VOkKYggrU/NkUQdmtwkTbtcWt5KeWEUCEiwDNjkwCdnSwp44y1k1i2p34nd8LOK2WaHpVtnO2EEAR1RmEE56PyonrJSwaq/sZsWxhNvjdwDQAKlyOGkcGnhLscO6JfuF7hLYOEjpAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAn+kem4wZSuKZEcNaOB785+DNy7osuv9erJKYypSvmermYgwVUgnNAWGLp1biMzjxI6diTsNxt/LBWAja/YJghDO1dQK2k35uNxJQWbSgijD77BAR1X5KrOgwwSi++HxIzo95dsYd8wlueD7ohUC0snlQFAKxA3hr1bJw1Pkbdis=</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
Binary file added published/Application Files/GlyCombo_0_4_0_2/GlyCombo.exe.deploy
View file
Binary file not shown.
Binary file added published/Application Files/GlyCombo_0_4_0_2/GlyCombo_Logo_Final.ico.deploy
View file
Binary file not shown.
Binary file added published/Application Files/GlyCombo_0_4_0_2/Launcher.exe.deploy
View file
Binary file not shown.
75 changes: 75 additions & 0 deletions published/Application Files/GlyCombo_0_5_0_0/GlyCombo.dll.manifest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="GlyCombo.exe" version="0.5.0.0" publicKeyToken="c255d772058593a1" language="neutral" processorArchitecture="msil" type="win32" />
<description asmv2:iconFile="GlyCombo_Logo_Final.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
<application />
<entryPoint>
<assemblyIdentity name="Launcher" version="8.0.0.0" language="neutral" processorArchitecture="msil" />
<commandLine file="Launcher.exe" parameters="" />
</entryPoint>
<trustInfo>
<security>
<applicationRequestMinimum>
<PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
<defaultAssemblyRequest permissionSetReference="Custom" />
</applicationRequestMinimum>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!--
UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
If you want to utilize File and Registry Virtualization for backward
compatibility then delete the requestedExecutionLevel node.
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentOS>
<osVersionInfo>
<os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
</osVersionInfo>
</dependentOS>
</dependency>
<dependency>
<dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
<assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Launcher.exe" size="17376">
<assemblyIdentity name="Launcher" version="8.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>WJI89SzFFM4XO7jB8ED0dneyUxyYR5m5mjXVxk5DmLg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<file name="GlyCombo.exe" size="31470816">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>mRdimabom2ZCG7qJgUONjW8acTqSyJ80irwlIJjT57Q=</dsig:DigestValue>
</hash>
</file>
<file name="GlyCombo_Logo_Final.ico" size="170840">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>QcGsgSj2P4BNXo9XZ9hNtVD2W5AnrU28KzIg05bZ/wA=</dsig:DigestValue>
</hash>
</file>
<publisherIdentity name="CN=LAPTOP-3INUDJKU\chras" issuerKeyHash="7a14a156401bb8ae1414ac67cd126af35c92e214" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>zqZ3QmaG+AVYH0CTd5mgOC8aYco91VKGXLjJLnoI6GI=</DigestValue></Reference></SignedInfo><SignatureValue>qnWCzgUMOsKQ6JnZRprOJ6Ia9vj+hQZ4JmUo//arHSYapX62SEGSRK73hdS+3Xss1gJUDogWzTkm/Ww5qPXqGUilAu6Fr1zYox/zxW+ghzooGLBY4bCy6myBUe9L+7ex53mJvpA4lHQx4l6udGs8RY2VCv7EyJIzzh56M6CAmZg=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>v6bPddwsHCqjIOn9KdXJf91Tue5x3AOyZfZU6QpiCCtT82RRB2a3CRNu1xa3kp5YRQISLAM2OTAJ2dLCnjjLWTWLanfid3ws4rZZoelW2c7YQQBHVGYQTno/KieslLBqr+xmxbGE2+N3ANAAqXI4aRwaeEuxw7ol+4XuEtg4SOk=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="62e8087a2ec9b85c8652d53dca611a2f38a0997793401f5805f886664277a6ce" Description="" Url=""><as:assemblyIdentity name="GlyCombo.exe" version="0.5.0.0" publicKeyToken="c255d772058593a1" language="neutral" processorArchitecture="msil" type="win32" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=LAPTOP-3INUDJKU\chras</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>dR654vtniO82rE1oTNpwPP8GnZ36kq+PSlOVGYdZLAE=</DigestValue></Reference></SignedInfo><SignatureValue>ZhtDSiebQvwSUqPxORdmdEB1BP39rdHza5pq8gQzfH338/qza/s07riitki7I6ysIly3CIzfBOQ9SDWjfCUxFDzLCYbkWbnCmY3m7Vzg2I2afiylNUJ//7iX3haDX14ATF6eCTeDCtDO5jVa00NDY/tHMNZ66oCG4J5EJFhPNVs=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>v6bPddwsHCqjIOn9KdXJf91Tue5x3AOyZfZU6QpiCCtT82RRB2a3CRNu1xa3kp5YRQISLAM2OTAJ2dLCnjjLWTWLanfid3ws4rZZoelW2c7YQQBHVGYQTno/KieslLBqr+xmxbGE2+N3ANAAqXI4aRwaeEuxw7ol+4XuEtg4SOk=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIB7TCCAVagAwIBAgIQcmAzkX+sRZlKasSd8fWpkTANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDHioATABBAFAAVABPAFAALQAzAEkATgBVAEQASgBLAFUAXABjAGgAcgBhAHMwHhcNMjQwNDI5MDQxOTM1WhcNMjUwNDI5MTAxOTM1WjA1MTMwMQYDVQQDHioATABBAFAAVABPAFAALQAzAEkATgBVAEQASgBLAFUAXABjAGgAcgBhAHMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL+mz3XcLBwqoyDp/SnVyX/dU7nucdwDsmX2VOkKYggrU/NkUQdmtwkTbtcWt5KeWEUCEiwDNjkwCdnSwp44y1k1i2p34nd8LOK2WaHpVtnO2EEAR1RmEE56PyonrJSwaq/sZsWxhNvjdwDQAKlyOGkcGnhLscO6JfuF7hLYOEjpAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAn+kem4wZSuKZEcNaOB785+DNy7osuv9erJKYypSvmermYgwVUgnNAWGLp1biMzjxI6diTsNxt/LBWAja/YJghDO1dQK2k35uNxJQWbSgijD77BAR1X5KrOgwwSi++HxIzo95dsYd8wlueD7ohUC0snlQFAKxA3hr1bJw1Pkbdis=</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
Binary file added published/Application Files/GlyCombo_0_5_0_0/GlyCombo.exe.deploy
View file
Binary file not shown.
Binary file added published/Application Files/GlyCombo_0_5_0_0/GlyCombo_Logo_Final.ico.deploy
View file
Binary file not shown.
Binary file added published/Application Files/GlyCombo_0_5_0_0/Launcher.exe.deploy
View file
Binary file not shown.
Loading

0 comments on commit 4a0686b

Please sign in to comment.