From 52461712a85184583d4fdaa5caf68a73d2fd5664 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Mon, 9 Dec 2024 15:31:38 +0100 Subject: [PATCH] -modificato webbrouse da navigate a source --- Guide/GuideV.xaml | 22 ++++++++++------------ Guide/GuideV.xaml.vb | 4 ++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Guide/GuideV.xaml b/Guide/GuideV.xaml index 4885f88..9177b46 100644 --- a/Guide/GuideV.xaml +++ b/Guide/GuideV.xaml @@ -1,19 +1,17 @@  - + 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"> - diff --git a/Guide/GuideV.xaml.vb b/Guide/GuideV.xaml.vb index b1e840c..ad9b445 100644 --- a/Guide/GuideV.xaml.vb +++ b/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