diff --git a/CustomControls/ExperimentPrint.vb b/CustomControls/ExperimentPrint.vb
index d37c71f..e54cd83 100644
--- a/CustomControls/ExperimentPrint.vb
+++ b/CustomControls/ExperimentPrint.vb
@@ -25,10 +25,13 @@ Public Class ExperimentPrint
Dim pdfPath As String = ""
If Not printAsPDF Then
+
If Not printDlg.ShowDialog Then
Exit Sub
End If
+
Else
+
Dim saveFileDlg As New SaveFileDialog
With saveFileDlg
If My.Settings.LastPdfSaveDir = "" Then
@@ -46,10 +49,10 @@ Public Class ExperimentPrint
Exit Sub
End If
End With
+
End If
- '- set wait cursor on application window
- ' Dim appWindow = WPFToolbox.FindVisualParent(Of Window)(Me)
+ 'set wait cursor on application window
appWindow.Cursor = Cursors.Wait
appWindow.ForceCursor = True
WPFToolbox.WaitForPriority(Threading.DispatcherPriority.ContextIdle)
@@ -86,8 +89,14 @@ Public Class ExperimentPrint
CompletePDF(pdfDoc, pdfPath, expEntry) 'add attachments, convert to PDF/A-3b
End If
+ Dim info As New ProcessStartInfo(pdfPath)
+ info.UseShellExecute = True
+ Process.Start(info)
+
Else
+
printDlg.PrintDocument(stackPrintTempl.Paginator, "Printing " + expEntry.ExperimentID)
+
End If
Catch ex As Exception
diff --git a/CustomControls/Notifications/StatusInfoPanel.xaml b/CustomControls/Notifications/StatusInfoPanel.xaml
index 02e80cb..c8dbd71 100644
--- a/CustomControls/Notifications/StatusInfoPanel.xaml
+++ b/CustomControls/Notifications/StatusInfoPanel.xaml
@@ -44,13 +44,13 @@
-
+
-
-
+
+
+
-
+
-
+
-
-
-
-
+
@@ -89,7 +81,7 @@
-
+
@@ -136,7 +128,7 @@
+ DockPanel.Dock="top" Background="#5D86C5">
diff --git a/CustomControls/StepSummary.xaml.vb b/CustomControls/Notifications/StepSummary.xaml.vb
similarity index 100%
rename from CustomControls/StepSummary.xaml.vb
rename to CustomControls/Notifications/StepSummary.xaml.vb
diff --git a/Deployment/Phoenix ELN.im9 b/Deployment/Phoenix ELN.im9
index b78c0f5..695c5ae 100644
--- a/Deployment/Phoenix ELN.im9
+++ b/Deployment/Phoenix ELN.im9
@@ -282,13 +282,13 @@ project Flags=0x20 {
str Value: Default="<$shpath(26)=@\\AppData=_LocAppDataFolder>";
}
var BuildBase: Flags=0x5, Type=0, Description="Build target base name" {
- str Value: Default="Phoenix ELN-0.9.1-Setup";
+ str Value: Default="Phoenix-ELN-0.9.2-Setup";
}
var BuildDate: Flags=0x5, Type=0, Description="Build date as YYYYMMDD" {
- str Value: Default=20240216;
+ str Value: Default=20240228;
}
var BuildDayNo: Flags=0x5, Type=0, Description="Build day number, starting from 1 January 2000" {
- str Value: Default=8813;
+ str Value: Default=8825;
}
var BuildFolder: Flags=0x5, Type=1, Description="Folder containing the build target" {
str Value: Default="F:\\Benutzer\\Stefan\\Documents\\WPF_Projekte\\Phoenix ELN\\Deployment\\Phoenix ELN\\Phoenix-ELN";
@@ -300,10 +300,10 @@ project Flags=0x20 {
str Value: Default="Serial# C9E5D07AFA20E6D5-04010108";
}
var BuildTarget: Flags=0x5, Type=1, Description="Build target file path" {
- str Value: Default="F:\\Benutzer\\Stefan\\Documents\\WPF_Projekte\\Phoenix ELN\\Deployment\\Phoenix ELN\\Phoenix-ELN\\Phoenix ELN-0.9.1-Setup.exe";
+ str Value: Default="F:\\Benutzer\\Stefan\\Documents\\WPF_Projekte\\Phoenix ELN\\Deployment\\Phoenix ELN\\Phoenix-ELN\\Phoenix-ELN-0.9.2-Setup.exe";
}
var BuildTime: Flags=0x5, Type=0, Description="Build time as HHMMSS" {
- str Value: Default=061429;
+ str Value: Default=151149;
}
var BuildType: Flags=0x5, Type=0, Description="Build type: always TSU" {
str Value: Default=TSU;
@@ -599,7 +599,7 @@ project Flags=0x20 {
str Value: Default="\\Microsoft Office\\Office>";
}
var PackageCode: Flags=0x205, Type=0, Description="Distribution package GUID" {
- str Value: Default="{B55FAF0B-A8C6-42FA-68E3-77C33070B53D}";
+ str Value: Default="{3400E1E5-A7ED-492B-6332-78E8B12FFBD3}";
}
var PersonalFolder: Flags=0x244, Type=1, Description="Current User Documents folder" {
str Value: Default="<$shpath(5)=@\\Personal=_LocPersonalFolder>";
@@ -633,10 +633,10 @@ project Flags=0x20 {
str Value: Default="";
}
var ProductName: Flags=0x204, Type=0, Description="Product name" {
- str Value: Default="Phoenix-ELN";
+ str Value: Default="Phoenix ELN";
}
var ProductVersion: Flags=0x204, Type=0, Description="Product version" {
- str Value: Default="0.9.2";
+ str Value: Default="0.9.3";
}
var ProfileFolder: Flags=0x244, Type=1, Description="Current User profile base folder" {
str Value: Default="<$syspath(7)=$shpath(40)=%USERPROFILE=_LocProfileFolder>";
@@ -770,7 +770,7 @@ project Flags=0x20 {
str Value: Default="<$sysval(4)>";
}
var SessionID: Flags=0x204, Type=0, Description="Pseudo-random 8-character session identifier" {
- str Value: Default=DF26891F;
+ str Value: Default=D3DD6A33;
}
var ShellFoldersCU: Flags=0x20C, Type=2, Description="Current User Shell folders registry key" {
str Value: Default="\\\\Explorer\\Shell Folders";
@@ -5528,6 +5528,10 @@ project Flags=0x20 {
str DisplayName: Flags=0x40000, Default=Watch_20240221154112;
str Description: Flags=0x40000;
}
+ component Watch_20240228151035: Flags=0x0, Platforms=0x7FFFFFFF, Packaging=0, Languages="0=", State0=3, State1=3, ExtraSize=0 {
+ str DisplayName: Flags=0x40000, Default=Watch_20240228151035;
+ str Description: Flags=0x40000;
+ }
}
component Folder1_A8A264769C3704B4: Flags=0x0, Platforms=0x7FFFFFFF, Packaging=0, Languages="0=", State0=3, State1=3, ExtraSize=0 {
str DisplayName: Flags=0x40000, Default=Folder1_Files;
@@ -5840,22 +5844,22 @@ project Flags=0x20 {
folder INSTALLDIR: Flags=0x0, Traits=0x80000000, InstallAction=0, RemoveAction=1 {
str Name: Default="";
wlist Watchlist_FF5B2057B5E221F6: Flags=0xE000003F, Path="..\\ELN-Main\\bin\\Release\\Publish", Filter="*.*", Exclude="*.bak;*.tmp;*.lnk;*.log;*.acl;*.gid;*.fts;*.pnf;*.oca;*.scc;*.$*;*.~*;.svn";
- file CustomControls.dll.config_00444E05208FE4BB: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\CustomControls.dll.config", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
+ file CustomControls.dll.config_00444E05208FE4BB: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\CustomControls.dll.config", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
str Name: Default=CustomControls.dll.config;
}
- file CustomControls.pdb_FFB8ABFCA880C1B6: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\CustomControls.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
+ file CustomControls.pdb_FFB8ABFCA880C1B6: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\CustomControls.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
str Name: Default=CustomControls.pdb;
}
- file D3DCompiler_47_cor3.dll_E52B9B636C2272F1: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\D3DCompiler_47_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=400, Packaging=0 {
+ file D3DCompiler_47_cor3.dll_E52B9B636C2272F1: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\D3DCompiler_47_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=400, Packaging=0 {
str Name: Default=D3DCompiler_47_cor3.dll;
}
- file e_sqlite3.dll_C5C0B5D547CAA173: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\e_sqlite3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=1000, Packaging=0 {
+ file e_sqlite3.dll_C5C0B5D547CAA173: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\e_sqlite3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=1000, Packaging=0 {
str Name: Default=e_sqlite3.dll;
}
- file ElnBase.pdb_39F2C8A9119685D1: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\ElnBase.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
+ file ElnBase.pdb_39F2C8A9119685D1: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\ElnBase.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
str Name: Default=ElnBase.pdb;
}
- file ElnCoreModel.pdb_825DE769278299F4: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\ElnCoreModel.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
+ file ElnCoreModel.pdb_825DE769278299F4: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\ElnCoreModel.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
str Name: Default=ElnCoreModel.pdb;
}
folder Folder1_40053762E24C7C21: Flags=0x0, Component="Phoenix ELN Install Files", Traits=0x80000000, InstallAction=0, RemoveAction=1 {
@@ -5882,25 +5886,25 @@ project Flags=0x20 {
str Name: Default=Readme.txt;
}
}
- file PenImc_cor3.dll_633D865A844398FD: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\PenImc_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=1, RegOrder=1000, Packaging=0 {
+ file PenImc_cor3.dll_633D865A844398FD: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\PenImc_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=1, RegOrder=1000, Packaging=0 {
str Name: Default=PenImc_cor3.dll;
}
- file PhoenixELN.dll.config_A24DEB8BD158AF79: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\PhoenixELN.dll.config", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
+ file PhoenixELN.dll.config_A24DEB8BD158AF79: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\PhoenixELN.dll.config", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
str Name: Default=PhoenixELN.dll.config;
}
- file PhoenixELN.exe_03B5412C1540DD20: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\PhoenixELN.exe", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=2000, Packaging=0 {
+ file PhoenixELN.exe_03B5412C1540DD20: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\PhoenixELN.exe", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=2000, Packaging=0 {
str Name: Default=PhoenixELN.exe;
}
- file PhoenixELN.pdb_D6E580F012F75184: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\PhoenixELN.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
+ file PhoenixELN.pdb_D6E580F012F75184: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\PhoenixELN.pdb", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=0, Packaging=0 {
str Name: Default=PhoenixELN.pdb;
}
- file PresentationNative_cor3.dll_D88C1C42A2CCA390: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\PresentationNative_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=1000, Packaging=0 {
+ file PresentationNative_cor3.dll_D88C1C42A2CCA390: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\PresentationNative_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=1000, Packaging=0 {
str Name: Default=PresentationNative_cor3.dll;
}
- file vcruntime140_cor3.dll_0D7E982A9183EE66: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\vcruntime140_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=400, Packaging=0 {
+ file vcruntime140_cor3.dll_0D7E982A9183EE66: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\vcruntime140_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=400, Packaging=0 {
str Name: Default=vcruntime140_cor3.dll;
}
- file wpfgfx_cor3.dll_56B33718D73573B6: Flags=0x0, Component=Watch_20240221154112, Path="..\\ELN-Main\\bin\\Release\\Publish\\wpfgfx_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=1000, Packaging=0 {
+ file wpfgfx_cor3.dll_56B33718D73573B6: Flags=0x0, Component=Watch_20240228151035, Path="..\\ELN-Main\\bin\\Release\\Publish\\wpfgfx_cor3.dll", Attributes=0x0, InstallAction=4, RemoveAction=2, Registration=0, RegOrder=1000, Packaging=0 {
str Name: Default=wpfgfx_cor3.dll;
}
}
diff --git a/Deployment/Phoenix ELN.iw9 b/Deployment/Phoenix ELN.iw9
index e4253ff..4e7902a 100644
--- a/Deployment/Phoenix ELN.iw9
+++ b/Deployment/Phoenix ELN.iw9
@@ -8,5 +8,5 @@ Version=9059
Default=1033
[Configs]
-Phoenix-ELN=00000453|133530001802554492|Build succeeded|Phoenix ELN\Phoenix-ELN\Phoenix-ELN-0.9.2-Setup.exe|0.9.2|57950144
+Phoenix-ELN=00000453|133536031551777846|Build succeeded|Phoenix ELN\Phoenix-ELN\Phoenix-ELN-0.9.2-Setup.exe|0.9.2|57963968
diff --git a/Deployment/Phoenix ELN/Phoenix-ELN(0.9.3)-PackList.txt b/Deployment/Phoenix ELN/Phoenix-ELN(0.9.3)-PackList.txt
new file mode 100644
index 0000000..3390552
--- /dev/null
+++ b/Deployment/Phoenix ELN/Phoenix-ELN(0.9.3)-PackList.txt
@@ -0,0 +1,23 @@
+2024-01-21 16:08:22| 9.118.7305.8787| 545272|-R-S|C:\Program Files\InstallMate 9\Stubs80\Tsu32u.dll
+2024-03-01 12:52:45| | 79097|-R-S|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\Deployment\Phoenix ELN\Phoenix-ELN\Phoenix ELN-0.9.3-Setup.dat
+2024-03-01 12:52:45| | 235008|-R-S|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\Deployment\Phoenix ELN\Phoenix-ELN\Phoenix ELN-0.9.3-Setup32.dll
+2015-09-08 13:36:32| | 23558|-R-S|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\Deployment\blankcd.ico
+2024-03-01 12:52:45| | 2060|-R-S|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\Deployment\Phoenix ELN\Phoenix-ELN\Readme.txt
+2024-03-01 12:52:45| 0.9.3.0| 46528|-R-S|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\Deployment\Phoenix ELN\Phoenix-ELN\_Setup.exe
+2024-02-16 05:50:31| | 1769472|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\References\DB-Seed\ElnData.db
+2024-03-01 12:50:56| | 206696|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\CustomControls.pdb
+2024-03-01 12:50:59| | 45744|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\PhoenixELN.pdb
+2024-03-01 12:50:55| | 35156|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\ElnBase.pdb
+2024-02-29 16:25:11| | 28724|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\ElnCoreModel.pdb
+2024-03-01 12:51:03| 1.0.0.0| 193815703|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\PhoenixELN.exe
+2023-09-30 03:17:50| 10.0.22621.2428| 4127224|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\D3DCompiler_47_cor3.dll
+2024-01-18 21:48:36| 8.0.224.6806| 1803536|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\wpfgfx_cor3.dll
+2023-08-23 19:33:44| | 1308672|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\e_sqlite3.dll
+2023-08-18 11:58:18| 1.0.6.0| 1061888|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\References\libinchi\32bit\libinchi.dll
+2023-11-20 05:34:02| 8.0.23.56901| 943792|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\PresentationNative_cor3.dll
+2024-01-18 21:47:58| 8.0.224.6806| 141584|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\PenImc_cor3.dll
+2023-12-28 03:12:06| 14.38.33130.0| 91240|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\vcruntime140_cor3.dll
+2023-08-18 11:58:18| 1.0.6.0| 1297408|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\References\libinchi\64bit\libinchi.dll
+2024-02-29 15:02:59| | 3921|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\CustomControls.dll.config
+2024-01-23 06:32:43| | 1339|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\ELN-Main\bin\Release\Publish\PhoenixELN.dll.config
+2024-01-25 13:06:01| | 197|----|F:\Benutzer\Stefan\Documents\WPF_Projekte\Phoenix ELN\References\libinchi\Readme.txt
diff --git a/Deployment/Phoenix ELN/Phoenix-ELN/Phoenix-ELN-0.9.2-Setup.exe b/Deployment/Phoenix ELN/Phoenix-ELN/Phoenix ELN-0.9.3-Setup.exe
similarity index 81%
rename from Deployment/Phoenix ELN/Phoenix-ELN/Phoenix-ELN-0.9.2-Setup.exe
rename to Deployment/Phoenix ELN/Phoenix-ELN/Phoenix ELN-0.9.3-Setup.exe
index 598db23..80985fe 100644
Binary files a/Deployment/Phoenix ELN/Phoenix-ELN/Phoenix-ELN-0.9.2-Setup.exe and b/Deployment/Phoenix ELN/Phoenix-ELN/Phoenix ELN-0.9.3-Setup.exe differ
diff --git a/GitHub_Assets/Release_Assets/ComponentProperties.png b/GitHub_Assets/Release_Assets/ComponentProperties.png
new file mode 100644
index 0000000..7ea5aa0
Binary files /dev/null and b/GitHub_Assets/Release_Assets/ComponentProperties.png differ