From 79ff9b9f2da498db81b9396bc68373347f3a2960 Mon Sep 17 00:00:00 2001 From: gambas Date: Sun, 14 Nov 2021 22:09:48 +0100 Subject: [PATCH] Help browser: Correctly react to switches between offline and online help. [DEVELOPMENT ENVIRONMENT] * BUG: Help browser: Correctly react to switches between offline and online help. * NEW: Update financial support. --- app/src/gambas3/.src/Help/FHelpBrowser.class | 2 +- app/src/gambas3/.src/Help/FHelpBrowser.form | 2 +- app/src/gambas3/.src/Help/HelpView.class | 9 ++++++++- app/src/gambas3/support.txt | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.class b/app/src/gambas3/.src/Help/FHelpBrowser.class index 2785dca77..ce0d688d1 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.class +++ b/app/src/gambas3/.src/Help/FHelpBrowser.class @@ -53,7 +53,7 @@ End Public Sub ReadConfig() - webHelp.ReadConfig + If webHelp.ReadConfig() Then GotoHome $bOffLine = Settings["/UseOfflineHelp"] diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.form b/app/src/gambas3/.src/Help/FHelpBrowser.form index 34f553644..474ed89bb 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.form +++ b/app/src/gambas3/.src/Help/FHelpBrowser.form @@ -140,7 +140,7 @@ Index = 0 } { webHelp HelpView - MoveScaled(50,8,22,16) + MoveScaled(52,5,24,18) } } } diff --git a/app/src/gambas3/.src/Help/HelpView.class b/app/src/gambas3/.src/Help/HelpView.class index e9fc5fb86..3b0dcf437 100644 --- a/app/src/gambas3/.src/Help/HelpView.class +++ b/app/src/gambas3/.src/Help/HelpView.class @@ -4,6 +4,10 @@ Export Inherits UserControl +Public Const _Properties As String = "*,Zoom" +Public Const _DrawWith As String = "WebView" + + Property Zoom As Float Property Url As String Property Read Browser As Boolean @@ -16,7 +20,7 @@ Public Sub _new() End -Public Sub ReadConfig() +Public Sub ReadConfig() As Boolean Dim bOffline As Boolean @@ -30,6 +34,9 @@ Public Sub ReadConfig() $hView = New HelpBrowser(Me) As "hvwHelp" Endif Try $hView.Border = False + '$hView.Hide + $hView.Show ' FIXME: Why calling Show() is needed with gb.qt5??? + Return True Endif End diff --git a/app/src/gambas3/support.txt b/app/src/gambas3/support.txt index b80d08b80..35667c0f5 100644 --- a/app/src/gambas3/support.txt +++ b/app/src/gambas3/support.txt @@ -129,6 +129,8 @@ 3 Peter Pach 3 Andres Carranza Silva 3 Eagle Eye Digital Solutions +3 Manfred Heyen +3 Bernd Kühn 3 DaifNet 3 Alessandri Guzman Abad 2 Eloy Velázquez López @@ -145,7 +147,6 @@ 2 Ľuboš Ilenčík 2 Jose Aguilar Vega 2 Olivier Reichelt -2 Manfred Heyen 2 John Terry 2 Timucin Kanatli 2 Brice Vidal