diff --git a/Express Apps/ExpressIcons.xaml b/Express Apps/ExpressIcons.xaml index 1391d63..3c44aa1 100644 --- a/Express Apps/ExpressIcons.xaml +++ b/Express Apps/ExpressIcons.xaml @@ -2085,6 +2085,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6349,6 +6417,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9808,6 +9935,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Express Apps/My Project/AssemblyInfo.vb b/Express Apps/My Project/AssemblyInfo.vb index e5f6f6b..d44dc82 100644 --- a/Express Apps/My Project/AssemblyInfo.vb +++ b/Express Apps/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Globalization @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ExpressControls/My Project/AssemblyInfo.vb b/ExpressControls/My Project/AssemblyInfo.vb index 96c72e9..33d3a54 100644 --- a/ExpressControls/My Project/AssemblyInfo.vb +++ b/ExpressControls/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Globalization @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/ExpressControls/Themes/Generic.xaml b/ExpressControls/Themes/Generic.xaml index 8f5600d..4b37805 100644 --- a/ExpressControls/Themes/Generic.xaml +++ b/ExpressControls/Themes/Generic.xaml @@ -280,7 +280,7 @@ VerticalAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="stack"> - - + diff --git a/Font Express/My Project/AssemblyInfo.vb b/Font Express/My Project/AssemblyInfo.vb index 549a057..635cf58 100644 --- a/Font Express/My Project/AssemblyInfo.vb +++ b/Font Express/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Globalization @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Present Express/My Project/AssemblyInfo.vb b/Present Express/My Project/AssemblyInfo.vb index daf99f5..2adc58f 100644 --- a/Present Express/My Project/AssemblyInfo.vb +++ b/Present Express/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Globalization @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Quota Express/My Project/AssemblyInfo.vb b/Quota Express/My Project/AssemblyInfo.vb index 797bc42..14e7b36 100644 --- a/Quota Express/My Project/AssemblyInfo.vb +++ b/Quota Express/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Globalization @@ -55,5 +55,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Type Express/MainWindow.xaml.vb b/Type Express/MainWindow.xaml.vb index ea72f5a..417ab2c 100644 --- a/Type Express/MainWindow.xaml.vb +++ b/Type Express/MainWindow.xaml.vb @@ -394,8 +394,8 @@ Class MainWindow End Sub Private Sub WorkAreaChanged(sender As Object, e As EventArgs) - MaxHeight = SystemParameters.WorkArea.Height + 12 - MaxWidth = SystemParameters.WorkArea.Width + 12 + MaxHeight = SystemParameters.WorkArea.Height + 13 + MaxWidth = SystemParameters.WorkArea.Width + 13 End Sub @@ -1439,14 +1439,25 @@ Class MainWindow TemplateSearchTxt.Focus() If ThisFile = "" And DocTxt.Text = "" Then - SetTemplate(sender.Tag.ToString().Split(",")) + If TypeOf sender.Tag Is String Then + SetTemplate(sender.Tag.ToString().Split(",")) + Else + SetTemplate(sender.Tag) + End If + CloseMenuStoryboard.Begin() TextFocus() Else Dim NewForm1 As New MainWindow NewForm1.Show() - NewForm1.SetTemplate(sender.Tag.ToString().Split(",")) + + If TypeOf sender.Tag Is String Then + NewForm1.SetTemplate(sender.Tag.ToString().Split(",")) + Else + NewForm1.SetTemplate(sender.Tag) + End If + NewForm1.MainTabs.SelectedIndex = 1 NewForm1.TextFocus() diff --git a/Type Express/My Project/AssemblyInfo.vb b/Type Express/My Project/AssemblyInfo.vb index d6cb56b..6c36669 100644 --- a/Type Express/My Project/AssemblyInfo.vb +++ b/Type Express/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Globalization @@ -55,6 +55,6 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +