erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-11 03:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

[Windows] Remove final references to KeymanEmbeddedWB

Browse source
This commit is contained in:
Marc Durdin 2019-04-07 06:44:42 +07:00
parent 3bd586c917
commit 9cbb8dba4e
7 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
windows/src/desktop/setup/UfrmHTML.dfm
View file

@ -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 = (
'<HTML></HTML>')
PrintOptions.Orientation = poPortrait
ExplicitTop = 1
ExplicitWidth = 477
ExplicitLeft = 184
ExplicitTop = 136
ExplicitWidth = 300
ExplicitHeight = 150
ControlData = {
4C000000A52F0000631B00000000000000000000000000000000000000000000
4C000000D5440000371C00000000000000000000000000000000000000000000
000000004C000000000000000000000001000000E0D057007335CF11AE690800
2B2E12620C000000000000004C0000000114020000000000C000000000000046
2B2E126208000000000000004C0000000114020000000000C000000000000046
8000000000000000000000000000000000000000000000000000000000000000
00000000000000000100000000000000000000000000000000000000}
end

7
windows/src/desktop/setup/UfrmHTML.pas
View file

@ -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.

2
windows/src/desktop/setup/setup.dpr
View file

@ -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',

4
windows/src/desktop/setup/setup.dproj
View file

@ -122,10 +122,6 @@
<Form>frmInstallOptions</Form>
</DCCReference>
<DCCReference Include="RunTools.pas"/>
<DCCReference Include="UfrmHTML.pas">
<Form>frmHTML</Form>
</DCCReference>
<DCCReference Include="..\..\global\delphi\comp\KeymanEmbeddedWB.pas"/>
<DCCReference Include="..\..\global\delphi\general\ErrLogPath.pas"/>
<DCCReference Include="..\..\global\delphi\general\ShellUserRegistry.pas"/>
<DCCReference Include="RegistryHelpers.pas"/>

23
windows/src/engine/tsysinfo/sysinfo_main.pas
View file

@ -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

7
windows/src/engine/tsysinfo/tsysinfo.dpr
View file

@ -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}

8
windows/src/engine/tsysinfo/tsysinfo.dproj
View file

@ -200,6 +200,14 @@
<DCCReference Include="..\..\global\delphi\vcl\SHDocVw.pas"/>
<DCCReference Include="..\..\global\delphi\cust\StockFileNames.pas"/>
<DCCReference Include="..\..\global\delphi\general\kmxfileconsts.pas"/>
<DCCReference Include="..\..\global\delphi\chromium\Keyman.System.CEFManager.pas"/>
<DCCReference Include="..\..\global\delphi\chromium\Keyman.UI.UframeCEFHost.pas">
<Form>frameCEFHost</Form>
<FormType>dfm</FormType>
</DCCReference>
<DCCReference Include="..\..\global\delphi\general\UserMessages.pas"/>
<DCCReference Include="..\..\global\delphi\general\KeymanPaths.pas"/>
<DCCReference Include="..\..\global\delphi\general\ExternalExceptionHandler.pas"/>
<BuildConfiguration Include="Debug">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>