-modificato webbrouse da navigate a source

Guide/GuideV.xaml

@@ -1,19 +1,17 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="GuideV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtDOOR.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-   IsMinimizable="True" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-   Height="800" Width="1500">
-   
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtDOOR.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="True" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            Height="800" Width="1500">
 
    <DockPanel Margin="5">
       <WebBrowser x:Name="DoorBrowser"/>
    </DockPanel>
 
-   
 </EgtWPFLib5:EgtCustomWindow>

Guide/GuideV.xaml.vb

@@ -20,10 +20,10 @@ Public Class GuideV
       Dim sHelpDir As String = String.Empty
       If OptionModule.m_SmartHelp = HelpPage.LocalHost Then
          sHelpDir = IniFile.m_sHelpDir.Replace("C:", "file://127.0.0.1/c$")
-         DoorBrowser.Navigate(New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html"))
+         DoorBrowser.Source = New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html")
       ElseIf OptionModule.m_SmartHelp = HelpPage.WebBrowserVB Then
          sHelpDir = IniFile.m_sHelpDir
-         DoorBrowser.Navigate(New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html"))
+         DoorBrowser.Source = New Uri(sHelpDir & "\" & m_Language & "\" & GuideVM.m_AddressGuide & ".html")
       Else
          sHelpDir = IniFile.m_sHelpDir
          Try

Order/OrderVM.vb

@@ -66,10 +66,18 @@ Public Class OrderVM
       End Get
    End Property
 
+   Private Function VerifyNotIsNothing() As Boolean
+      If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) OrElse
+         IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly) OrElse
+         Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then
+         Return False
+      End If
+      Return True
+   End Function
+
    Public Property Customer As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Customer
       End Get
       Set(value As String)
@@ -83,8 +91,7 @@ Public Class OrderVM
 
    Public Property Elevation As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Elevation
       End Get
       Set(value As String)
@@ -98,8 +105,7 @@ Public Class OrderVM
 
    Public Property Project As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Project
       End Get
       Set(value As String)
@@ -113,8 +119,7 @@ Public Class OrderVM
 
    Public Property PO As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.PO
       End Get
       Set(value As String)
@@ -128,8 +133,7 @@ Public Class OrderVM
 
    Public Property Line As String
       Get
-         If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso
-            Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing
+         If Not VerifyNotIsNothing() Then Return Nothing
          Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Line
       End Get
       Set(value As String)