Skip to content

Commit

Permalink
Adds PhoeniX IsotopX ".TIMSDP" files (#3)
Browse files Browse the repository at this point in the history
* updated for 2017

* update

* new version

* build

* update

* version 4.9 fixes live update and refactors

* version 4.9.0.1

* fix

* fix

* added phoenix

* Updated

* Updated current

* Released
  • Loading branch information
bowring authored Apr 13, 2021
1 parent 3b437b0 commit 5fd0ab5
Show file tree
Hide file tree
Showing 76 changed files with 4,103 additions and 3,702 deletions.
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
*.application
*.exe
*.LIC
*.msi
*.cache
*.force
*.manifest
*.user
*.suo
*.pdb
*.msi
obj/
Tripoli-Installer/Release/
[Dd]ebug*/
[Rr]elease*/
[Rr]elease*/
![Rr]elease*/*.msi
Binary file removed Interop.Microsoft.Office.Core.dll
Binary file not shown.
Binary file removed Microsoft.Office.Interop.Excel.dll
Binary file not shown.
10 changes: 5 additions & 5 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright 2004-2015 James F. Bowring and www.Earth-Time.org
* Copyright 2004-2017 James F. Bowring and www.Earth-Time.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -24,8 +24,8 @@
[assembly: AssemblyDescription("Graphical Data Processor for Mass Spectrometry")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("CIRDLES.org")]
[assembly: AssemblyProduct("Tripoli 4.8")]
[assembly: AssemblyCopyright("James F. Bowring 2004-2015")]
[assembly: AssemblyProduct("Tripoli 4.10")]
[assembly: AssemblyCopyright("James F. Bowring 2004-2021")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -45,5 +45,5 @@
// Revision
//
// Aug 2011 starting with 4.6.4.00, we are using Visual Studio 2010 and dotNet 3.5
[assembly: AssemblyVersion("4.8.0.4")]
[assembly: AssemblyFileVersion("4.8.0.4")]
[assembly: AssemblyVersion("4.10.0.0")]
[assembly: AssemblyFileVersion("4.10.0.0")]
28 changes: 28 additions & 0 deletions Settings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
namespace Tripoli.Properties {


// This class allows you to handle specific events on the settings class:
// The SettingChanging event is raised before a setting's value is changed.
// The PropertyChanged event is raised after a setting's value is changed.
// The SettingsLoaded event is raised after the setting values are loaded.
// The SettingsSaving event is raised before the setting values are saved.
internal sealed partial class Settings {

public Settings() {
// // To add event handlers for saving and changing settings, uncomment the lines below:
//
// this.SettingChanging += this.SettingChangingEventHandler;
//
// this.SettingsSaving += this.SettingsSavingEventHandler;
//
}

private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
// Add code to handle the SettingChangingEvent event here.
}

private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
// Add code to handle the SettingsSaving event here.
}
}
}
4 changes: 2 additions & 2 deletions Tripoli-Installer/.current
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
4.7.0.03
http://earth-time.org/projects/tripoli/winos/currentRelease/Tripoli-4-7-3-Installer.msi
4.10.0.0
https://github.com/bowring/Tripoli/blob/update/Tripoli-Installer/Release/Tripoli-4-10-0-0-Installer.msi
Binary file not shown.
181 changes: 67 additions & 114 deletions Tripoli-Installer/Tripoli-Installer.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
}
"Entry"
{
"MsmKey" = "8:_2C7097541F1C25FB7776693D3AADD77F"
"OwnerKey" = "8:_DDF08BE63BEF458597C30A17C184E891"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_3652B0E961D44A6CB31D8703DDE49974"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand All @@ -51,24 +57,12 @@
}
"Entry"
{
"MsmKey" = "8:_8E2210271B6AD5EA4287264CF5E8DB50"
"OwnerKey" = "8:_DDF08BE63BEF458597C30A17C184E891"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_93C69EAFE4CA495399DDD68182FF0513"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9BDA7C54B9410767E89A64A883DE292A"
"OwnerKey" = "8:_8E2210271B6AD5EA4287264CF5E8DB50"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9C43F3DAB4594B7BA4066F1E61004360"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -99,12 +93,6 @@
}
"Entry"
{
"MsmKey" = "8:_DEE9580297C79D9BD363E20B394AE174"
"OwnerKey" = "8:_DDF08BE63BEF458597C30A17C184E891"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_EEADE1C5CC9C45108C07074CAC410705"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -142,13 +130,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DEE9580297C79D9BD363E20B394AE174"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8E2210271B6AD5EA4287264CF5E8DB50"
"OwnerKey" = "8:_2C7097541F1C25FB7776693D3AADD77F"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -196,7 +178,7 @@
"DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE"
"OutputFilename" = "8:Release\\Tripoli-4-8-4-Installer.msi"
"OutputFilename" = "8:Release\\Tripoli-4-10-0-0-Installer.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
Expand Down Expand Up @@ -350,6 +332,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2C7097541F1C25FB7776693D3AADD77F"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:PowerCollections, Version=1.0.2141.24679, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_2C7097541F1C25FB7776693D3AADD77F"
{
"Name" = "8:PowerCollections.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:PowerCollections.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_35CEFBADB35C4671BF9F534B332F37D5"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3652B0E961D44A6CB31D8703DDE49974"
{
"SourcePath" = "8:..\\docs\\ReleaseNotes.txt"
Expand Down Expand Up @@ -441,37 +454,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E2210271B6AD5EA4287264CF5E8DB50"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Interop.Microsoft.Office.Core, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8E2210271B6AD5EA4287264CF5E8DB50"
{
"Name" = "8:Interop.Microsoft.Office.Core.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Interop.Microsoft.Office.Core.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_35CEFBADB35C4671BF9F534B332F37D5"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_93C69EAFE4CA495399DDD68182FF0513"
{
"SourcePath" = "8:..\\images\\sunchexSPLASH.bmp"
Expand All @@ -492,26 +474,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9BDA7C54B9410767E89A64A883DE292A"
{
"SourcePath" = "8:MSO.DLL"
"TargetName" = "8:MSO.DLL"
"Tag" = "8:"
"Folder" = "8:_35CEFBADB35C4671BF9F534B332F37D5"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9C43F3DAB4594B7BA4066F1E61004360"
{
"SourcePath" = "8:..\\docs\\TripoliCredits.txt"
Expand Down Expand Up @@ -592,37 +554,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DEE9580297C79D9BD363E20B394AE174"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:PowerCollections, Version=1.0.2141.24679, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_DEE9580297C79D9BD363E20B394AE174"
{
"Name" = "8:PowerCollections.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:PowerCollections.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_35CEFBADB35C4671BF9F534B332F37D5"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EEADE1C5CC9C45108C07074CAC410705"
{
"SourcePath" = "8:..\\docs\\ID_TIMS_DataImportTemplate.csv"
Expand Down Expand Up @@ -806,15 +737,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Tripoli"
"ProductCode" = "8:{DD33C807-BA4C-4E82-BB77-1239128BF23F}"
"PackageCode" = "8:{885BB710-6A76-4FD5-9935-DC6F379FF67C}"
"ProductCode" = "8:{93C14649-025B-436C-B063-3640B515B6F8}"
"PackageCode" = "8:{BC7BFD54-1407-4DC3-970E-74AB1EADCE1D}"
"UpgradeCode" = "8:{523FD083-CBAF-4DF5-BE7E-A8841C1AC28D}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:4.8.04"
"ProductVersion" = "8:4.10.0"
"Manufacturer" = "8:Sunchex Systems"
"ARPHELPTELEPHONE" = "8:843-608-1399 (voice or sms)"
"ARPHELPLINK" = "8:https://cirdles.org"
Expand Down Expand Up @@ -875,7 +806,7 @@
"Condition" = "8:"
"Transitive" = "11:TRUE"
"ValueTypes" = "3:1"
"Value" = "8:4.8.0.4"
"Value" = "8:4.10.0.0"
}
}
}
Expand Down Expand Up @@ -988,6 +919,28 @@
}
}
}
"{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_242089FD0ED448C7A84123925B3452CC"
{
"Name" = "8:Recent IsotopxPhoeniX TIMSDP File List"
"Condition" = "8:"
"AlwaysCreate" = "11:FALSE"
"DeleteAtUninstall" = "11:FALSE"
"Transitive" = "11:FALSE"
"Keys"
{
}
"Values"
{
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_D7BCB3A4245F497BB4B35D9972B6911C"
{
"Name" = "8:mruFile1"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
"Value" = "8:"
}
}
}
"{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_42F5EFBDC2114A02B9E28025FC8ACDDA"
{
"Name" = "8:Recent ThermoFinniganTritonExpFile List"
Expand Down Expand Up @@ -1402,7 +1355,7 @@
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
"Value" = "8:0.0000"
"Value" = "8:137.81846"
}
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_7B3108566881452A924BC2B19DDC345A"
{
Expand All @@ -1418,7 +1371,7 @@
"Condition" = "8:"
"Transitive" = "11:FALSE"
"ValueTypes" = "3:1"
"Value" = "8:0.0000"
"Value" = "8:137.81846"
}
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_931A9E9CD9C84ADD9D4CDFC776B62872"
{
Expand Down
Loading

0 comments on commit 5fd0ab5

Please sign in to comment.