diff --git a/windows/src/desktop/setup/UfrmHTML.dfm b/windows/src/desktop/setup/UfrmHTML.dfm
index 4e22a11fff..4cbd86602e 100644
--- a/windows/src/desktop/setup/UfrmHTML.dfm
+++ b/windows/src/desktop/setup/UfrmHTML.dfm
@@ -27,28 +27,21 @@ object frmHTML: TfrmHTML
Anchors = [akLeft, akTop, akRight, akBottom]
BevelOuter = bvNone
TabOrder = 0
- object web: TKeymanEmbeddedWB
+ object web: TWebBrowser
Left = 0
Top = 0
Width = 666
Height = 273
Align = alClient
TabOrder = 0
- OnCommandStateChange = webCommandStateChange
- OnNewWindow3 = webNewWindow3
- DisableCtrlShortcuts = 'N'
- UserInterfaceOptions = [EnablesFormsAutoComplete, EnableThemes]
- About = ' EmbeddedWB http://bsalsa.com/'
- DisableErrors.fpExceptions = False
- PrintOptions.HTMLHeader.Strings = (
- '')
- PrintOptions.Orientation = poPortrait
- ExplicitTop = 1
- ExplicitWidth = 477
+ ExplicitLeft = 184
+ ExplicitTop = 136
+ ExplicitWidth = 300
+ ExplicitHeight = 150
ControlData = {
- 4C000000A52F0000631B00000000000000000000000000000000000000000000
+ 4C000000D5440000371C00000000000000000000000000000000000000000000
000000004C000000000000000000000001000000E0D057007335CF11AE690800
- 2B2E12620C000000000000004C0000000114020000000000C000000000000046
+ 2B2E126208000000000000004C0000000114020000000000C000000000000046
8000000000000000000000000000000000000000000000000000000000000000
00000000000000000100000000000000000000000000000000000000}
end
diff --git a/windows/src/desktop/setup/UfrmHTML.pas b/windows/src/desktop/setup/UfrmHTML.pas
index 0633eb6c04..03ca425efa 100644
--- a/windows/src/desktop/setup/UfrmHTML.pas
+++ b/windows/src/desktop/setup/UfrmHTML.pas
@@ -33,17 +33,16 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- StdCtrls, ExtCtrls, OleCtrls, SHDocVw, EmbeddedWB,
- SHDocVw_EWB, EwbCore, KeymanEmbeddedWB;
+ StdCtrls, ExtCtrls, OleCtrls, SHDocVw;
type
TfrmHTML = class(TForm)
cmdOK: TButton;
panHTML: TPanel;
- web: TKeymanEmbeddedWB;
cmdPrint: TButton;
cmdBack: TButton;
cmdForward: TButton;
+ web: TWebBrowser;
procedure cmdPrintClick(Sender: TObject);
procedure webNewWindow3(ASender: TObject; var ppDisp: IDispatch;
var Cancel: WordBool; dwFlags: Cardinal; const bstrUrlContext,
@@ -100,7 +99,7 @@ end;
procedure TfrmHTML.cmdPrintClick(Sender: TObject);
begin
- web.Print;
+ web.ExecWB(OLECMDID_PRINT, 0);
end;
end.
diff --git a/windows/src/desktop/setup/setup.dpr b/windows/src/desktop/setup/setup.dpr
index 228a3b8e49..39e23fe92a 100644
--- a/windows/src/desktop/setup/setup.dpr
+++ b/windows/src/desktop/setup/setup.dpr
@@ -25,8 +25,6 @@ uses
UfrmRunDesktop in 'UfrmRunDesktop.pas' {frmRunDesktop},
UfrmInstallOptions in 'UfrmInstallOptions.pas' {frmInstallOptions},
RunTools in 'RunTools.pas',
- UfrmHTML in 'UfrmHTML.pas' {frmHTML},
- KeymanEmbeddedWB in '..\..\global\delphi\comp\KeymanEmbeddedWB.pas',
ErrLogPath in '..\..\global\delphi\general\ErrLogPath.pas',
ShellUserRegistry in '..\..\global\delphi\general\ShellUserRegistry.pas',
RegistryHelpers in 'RegistryHelpers.pas',
diff --git a/windows/src/desktop/setup/setup.dproj b/windows/src/desktop/setup/setup.dproj
index 6e3637895e..d2e023712f 100644
--- a/windows/src/desktop/setup/setup.dproj
+++ b/windows/src/desktop/setup/setup.dproj
@@ -122,10 +122,6 @@
-
-
-
-
diff --git a/windows/src/engine/tsysinfo/sysinfo_main.pas b/windows/src/engine/tsysinfo/sysinfo_main.pas
index bdd7d8931b..3de0a597be 100644
--- a/windows/src/engine/tsysinfo/sysinfo_main.pas
+++ b/windows/src/engine/tsysinfo/sysinfo_main.pas
@@ -20,11 +20,14 @@ unit sysinfo_main; // I3309
interface
+{$MESSAGE HINT 'Hook up remainder of CEF'}
+
uses
System.UITypes,
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ComCtrls, Contnrs, Menus, si_base, ExtCtrls,
- EmbeddedWB, msxml;
+ Keyman.UI.UframeCEFHost,
+ msxml;
type
TfrmDiagnostics = class(TForm)
@@ -83,9 +86,7 @@ type
procedure PrepareTabs; // I3556
procedure ShowFiles; // I3556
procedure LoadPage(FPageIndex: Integer); // I3556
- procedure webDocumentComplete(ASender: TObject; const pDisp: IDispatch;
- // I3556
- var URL: OleVariant);
+ procedure webLoadEnd(ASender: TObject);
procedure WMUserLoad(var Message: TMessage); message WM_USER_Load;
procedure SaveDiagnosticsAndExit(FileName: string);
procedure LoadGlobalData;
@@ -433,21 +434,20 @@ end;
procedure TfrmDiagnostics.PrepareTabs; // I3180 // I3542 // I3556
var
i: Integer;
- web: TEmbeddedWB;
+ web: TframeCEFHost;
si: TSI_Base;
begin
LoadGlobalData;
for i := 0 to FSIList.Count - 1 do
begin
si := FSIList[i];
- web := TEmbeddedWB.Create(si.Parent);
+ web := TframeCEFHost.Create(si.Parent);
// web.Parent := si.Parent as TWinControl;
(si.Parent as TWinControl).InsertControl(web);
(si.Parent as TTabSheet).Caption := si.Caption;
(si.Parent as TTabSheet).TabVisible := True;
web.Align := alClient;
web.Visible := True;
- web.Loaded;
LoadPage(i);
// pages.Pages[i].TabVisible := (pages.Pages[i].ControlCount > 0) and pages.Pages[i].Controls[0].Visible;
end;
@@ -474,8 +474,7 @@ begin
PostMessage(Handle, WM_USER_Load, 0, FPageIndex);
end;
-procedure TfrmDiagnostics.webDocumentComplete(ASender: TObject; // I3556
- const pDisp: IDispatch; var URL: OleVariant);
+procedure TfrmDiagnostics.webLoadEnd(ASender: TObject); // I3556
begin
// Cleanup;
end;
@@ -486,12 +485,12 @@ procedure TfrmDiagnostics.WMUserLoad(var Message: TMessage); // I3556
var
xml, xsl: IXMLDOMDocument;
buf: WideString;
- web: TEmbeddedWB;
+ web: TframeCEFHost;
afilename: string;
begin
web := (FSIList[Message.LParam].Parent as TTabSheet).Controls[0]
- as TEmbeddedWB;
- web.OnDocumentComplete := webDocumentComplete;
+ as TframeCEFHost;
+ web.OnLoadEnd := webLoadEnd;
if not mnuOptionsXMLView.Checked and FSIList[Message.LParam].HasXSLT then
begin
diff --git a/windows/src/engine/tsysinfo/tsysinfo.dpr b/windows/src/engine/tsysinfo/tsysinfo.dpr
index 2f81bbd891..5a8e5f8767 100644
--- a/windows/src/engine/tsysinfo/tsysinfo.dpr
+++ b/windows/src/engine/tsysinfo/tsysinfo.dpr
@@ -53,7 +53,12 @@ uses
TempFileManager in '..\..\global\delphi\general\TempFileManager.pas',
SHDocVw in '..\..\global\delphi\vcl\SHDocVw.pas',
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
- kmxfileconsts in '..\..\global\delphi\general\kmxfileconsts.pas';
+ kmxfileconsts in '..\..\global\delphi\general\kmxfileconsts.pas',
+ Keyman.System.CEFManager in '..\..\global\delphi\chromium\Keyman.System.CEFManager.pas',
+ Keyman.UI.UframeCEFHost in '..\..\global\delphi\chromium\Keyman.UI.UframeCEFHost.pas' {frameCEFHost},
+ UserMessages in '..\..\global\delphi\general\UserMessages.pas',
+ KeymanPaths in '..\..\global\delphi\general\KeymanPaths.pas',
+ ExternalExceptionHandler in '..\..\global\delphi\general\ExternalExceptionHandler.pas';
{$R *.res}
{$R manifest.res}
diff --git a/windows/src/engine/tsysinfo/tsysinfo.dproj b/windows/src/engine/tsysinfo/tsysinfo.dproj
index 6cd10172b7..56bad35cfd 100644
--- a/windows/src/engine/tsysinfo/tsysinfo.dproj
+++ b/windows/src/engine/tsysinfo/tsysinfo.dproj
@@ -200,6 +200,14 @@
+
+
+
+ dfm
+
+
+
+
Cfg_2
Base