v.0.9.3 Release

abrechts · Mar 1, 2024 · 7273c89 · 7273c89
1 parent a7ff7dc
commit 7273c89
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 42 deletions.
diff --git 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
@@ -44,13 +44,13 @@
 
             <local:StatusDemo Margin="-2,0,0,4" Visibility="{Binding UserID,Converter={StaticResource demoVisConv}}"/>
 
-            <StackPanel Margin="2,0,6,6" >
+            <StackPanel Margin="2,0,6,6" Background="Whitesmoke">
 
-                <Grid HorizontalAlignment="Left"
-                      >
-                    <StackPanel Orientation="Horizontal" Margin="0,0,0,4" >
+                <Grid HorizontalAlignment="Left">
+
+                    <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
 
-                        <TextBlock Text="● App Version:" TextWrapping="Wrap" Margin="0,4,3,0" FontStyle="Italic"/>
+                        <TextBlock Text="● App Version:" TextWrapping="Wrap" Margin="1,4,3,0" FontStyle="Italic"/>
 
                         <Border Margin="0,4,4,0" CornerRadius="4" Background="#FFEBEBEB">
                             <TextBlock Text="{Binding Database.CurrAppVersion,Converter={StaticResource appVersionConv}}" d:Text="2.12.3" 
@@ -89,7 +89,7 @@
 
                     <StackPanel Orientation="Horizontal" Margin="0,0,0,4">
 
-                        <TextBlock Text="● Unfinalized Exp:" TextWrapping="Wrap" Margin="0,0,4,0" VerticalAlignment="Center" FontStyle="Italic"/>
+                        <TextBlock Text="● Unfinalized Exp:" TextWrapping="Wrap" Margin="1,0,4,0" VerticalAlignment="Center" FontStyle="Italic"/>
 
                         <Border Margin="0,0,4,0" CornerRadius="4" Background="#FFEBEBEB">
                             <TextBlock d:Text="11" Text="{Binding tblExperiments, Converter={StaticResource unfinalizedCountConv}}"  

diff --git a/CustomControls/StepSummary.xaml → ...omControls/Notifications/StepSummary.xaml b/CustomControls/StepSummary.xaml → ...omControls/Notifications/StepSummary.xaml
@@ -32,18 +32,10 @@
 
     <DockPanel Margin="0,4,0,4" >
 
-        <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="top" DockPanel.Dock="top" Margin="-4,0,0,0">
-                <TextBlock Text="Same Step Reactions" FontWeight="Bold" FontSize="12.3" 
-                    Foreground="#FF0941CC" Margin="0,0,4,3" FontStyle="Italic" />
-                <ContentControl Content="{StaticResource icoInfo}" Height="12" Cursor="Hand" ToolTipService.InitialShowDelay="250" Opacity="0.9"
-                    ToolTip="All experiments with identical reference reactant &#x0a;and product as the current experiment."/>
-            </StackPanel>-->
-
-
         <!--Ref.Reactant-->
         <StackPanel DockPanel.Dock="Top" Margin="0,2,0,8">
 
-            <Border CornerRadius="6" BorderBrush="#FF4D84D7" BorderThickness="1" Padding="8,0" HorizontalAlignment="Center" Background="#FF4D84D7">
+            <Border CornerRadius="6" BorderBrush="#FF4D84D7" BorderThickness="1" Padding="8,0" HorizontalAlignment="Center" Background="#5D86C5">
                 <TextBlock Text="Reactant >" VerticalAlignment="Center" Foreground="white" Background="transparent" 
                         FontStyle="Italic" FontWeight="demibold" Padding="1,0" Margin="1,1,1,1" FontFamily="Verdana" FontSize="10"/>
             </Border>
@@ -89,7 +81,7 @@
         <!--Ref.Product-->
         <StackPanel DockPanel.Dock="Top" >
 
-            <Border CornerRadius="6" BorderBrush="#FF4D84D7" BorderThickness="1" Padding="8,0"  HorizontalAlignment="Center" Background="#FF4D84D7">
+            <Border CornerRadius="6" BorderBrush="#FF4D84D7" BorderThickness="1" Padding="8,0"  HorizontalAlignment="Center" Background="#5D86C5">
                 <TextBlock Text="> Product" VerticalAlignment="Center" Foreground="white" FontFamily="Verdana" FontSize="10"
                    Background="transparent" FontStyle="Italic" FontWeight="demibold" Padding="1,0" Margin="1,1,1,1"/>
             </Border>
@@ -136,7 +128,7 @@
         <DockPanel Margin="0,10,0,0" >
 
             <Border CornerRadius="6" BorderBrush="#FF4D84D7" BorderThickness="1" Padding="8,0"  HorizontalAlignment="Center" 
-                    DockPanel.Dock="top" Background="#FF4D84D7">
+                    DockPanel.Dock="top" Background="#5D86C5">
                 <TextBlock Text="Same Step" VerticalAlignment="Center" Foreground="white" FontFamily="Verdana" FontSize="10"
                         Background="transparent" FontStyle="Italic" FontWeight="demibold" Padding="1,0" Margin="1,1,1,1"/>
             </Border>

diff --git a/CustomControls/StepSummary.xaml.vb → ...ontrols/Notifications/StepSummary.xaml.vb b/CustomControls/StepSummary.xaml.vb → ...ontrols/Notifications/StepSummary.xaml.vb
diff --git a/Deployment/Phoenix ELN.im9 b/Deployment/Phoenix ELN.im9
@@ -282,13 +282,13 @@ project Flags=0x20 {
 			str Value: Default="<$shpath(26)=@<ShellFoldersCU>\\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="<MSOfficeDir14=MSOfficeDir12=MSOfficeDir11=MSOfficeDir10=MSOfficeDir9=MSOfficeDir8=!<ProgramFilesFolder>\\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)=@<ShellFoldersCU>\\Personal=_LocPersonalFolder>";
@@ -633,10 +633,10 @@ project Flags=0x20 {
 			str Value: Default="<UILangID>";
 		}
 		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="<HKCU>\\<WinCurVer>\\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="<ProductName>";
 				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
@@ -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