From 33213f25e465b4a853ade98c98a91d50d1400c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Fri, 4 Oct 2019 15:13:24 +0200 Subject: [PATCH] Update to CEF 77.1.8 --- README.md | 6 +- demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas | 5 +- demos/Delphi_VCL/MiniBrowser/uPreferences.dfm | 71 ++++++++++++------- demos/Delphi_VCL/MiniBrowser/uPreferences.pas | 9 +-- demos/Lazarus/MiniBrowser/MiniBrowser.lps | 66 ++++++++--------- demos/Lazarus/MiniBrowser/uMiniBrowser.pas | 5 +- packages/cef4delphi_lazarus.lpk | 2 +- source/uCEFApplication.pas | 2 +- update_CEF4Delphi.json | 4 +- 9 files changed, 99 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index c6c05e6b..7886bc60 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ CEF4Delphi is an open source project created by Salvador D CEF4Delphi is based on DCEF3, made by Henri Gourvest. The original license of DCEF3 still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 77.1.7 which includes Chromium 77.0.3865.90. +CEF4Delphi uses CEF 77.1.8 which includes Chromium 77.0.3865.90. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_77.1.7%2Bgc7dbc2f%2Bchromium-77.0.3865.90_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_77.1.7%2Bgc7dbc2f%2Bchromium-77.0.3865.90_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_77.1.8%2Bg41b180d%2Bchromium-77.0.3865.90_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_77.1.8%2Bg41b180d%2Bchromium-77.0.3865.90_windows64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.3 Rio and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2 and Lazarus 2.0.4/FPC 3.0.4. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas b/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas index 6fa03f25..1f441494 100644 --- a/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas +++ b/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas @@ -1156,8 +1156,11 @@ begin end; procedure TMiniBrowserFrm.CopyAllTextMsg(var aMessage : TMessage); +var + TempName : string; begin - Chromium1.RetrieveText; + TempName := InputBox('Frame name', 'Type the fame name or leave it blank to select the main frame :', ''); + Chromium1.RetrieveText(TempName); end; procedure TMiniBrowserFrm.CopyFramesIDsMsg(var aMessage : TMessage); diff --git a/demos/Delphi_VCL/MiniBrowser/uPreferences.dfm b/demos/Delphi_VCL/MiniBrowser/uPreferences.dfm index edbf117a..4dc5aa06 100644 --- a/demos/Delphi_VCL/MiniBrowser/uPreferences.dfm +++ b/demos/Delphi_VCL/MiniBrowser/uPreferences.dfm @@ -4,7 +4,7 @@ object PreferencesFrm: TPreferencesFrm BorderIcons = [biSystemMenu] BorderStyle = bsSingle Caption = 'Preferences' - ClientHeight = 397 + ClientHeight = 388 ClientWidth = 428 Color = clBtnFace Font.Charset = DEFAULT_CHARSET @@ -13,33 +13,20 @@ object PreferencesFrm: TPreferencesFrm Font.Name = 'Tahoma' Font.Style = [] FormStyle = fsStayOnTop + Padding.Left = 10 + Padding.Top = 10 + Padding.Right = 10 + Padding.Bottom = 10 OldCreateOrder = False Position = poScreenCenter PixelsPerInch = 96 TextHeight = 13 - object Button1: TButton - Left = 232 - Top = 364 - Width = 75 - Height = 25 - Caption = 'Ok' - ModalResult = 1 - TabOrder = 2 - end - object Button2: TButton - Left = 345 - Top = 364 - Width = 75 - Height = 25 - Caption = 'Cancel' - ModalResult = 2 - TabOrder = 3 - end object GroupBox1: TGroupBox - Left = 8 - Top = 8 - Width = 412 + Left = 10 + Top = 10 + Width = 408 Height = 250 + Align = alTop Caption = ' Proxy ' TabOrder = 0 object ProxyTypeLbl: TLabel @@ -186,10 +173,11 @@ object PreferencesFrm: TPreferencesFrm end end object GroupBox2: TGroupBox - Left = 8 - Top = 271 - Width = 412 + Left = 10 + Top = 260 + Width = 408 Height = 84 + Align = alTop Caption = ' Custom header ' TabOrder = 1 object HeaderNameLbl: TLabel @@ -221,4 +209,37 @@ object PreferencesFrm: TPreferencesFrm TabOrder = 1 end end + object Panel1: TPanel + Left = 10 + Top = 353 + Width = 408 + Height = 25 + Align = alBottom + BevelOuter = bvNone + Padding.Left = 30 + Padding.Right = 30 + TabOrder = 2 + ExplicitTop = 373 + object Button1: TButton + Left = 30 + Top = 0 + Width = 120 + Height = 25 + Align = alLeft + Caption = 'Ok' + ModalResult = 1 + TabOrder = 0 + end + object Button2: TButton + Left = 258 + Top = 0 + Width = 120 + Height = 25 + Align = alRight + Caption = 'Cancel' + ModalResult = 2 + TabOrder = 1 + ExplicitLeft = 278 + end + end end diff --git a/demos/Delphi_VCL/MiniBrowser/uPreferences.pas b/demos/Delphi_VCL/MiniBrowser/uPreferences.pas index 7d05726b..dcc0ec84 100644 --- a/demos/Delphi_VCL/MiniBrowser/uPreferences.pas +++ b/demos/Delphi_VCL/MiniBrowser/uPreferences.pas @@ -44,16 +44,14 @@ interface uses {$IFDEF DELPHI16_UP} Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, - Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.Samples.Spin; + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.Samples.Spin, Vcl.ExtCtrls; {$ELSE} Windows, Messages, SysUtils, Variants, Classes, Graphics, - Controls, Forms, Dialogs, StdCtrls, Spin; + Controls, Forms, Dialogs, StdCtrls, Spin, ExtCtrls; {$ENDIF} type TPreferencesFrm = class(TForm) - Button1: TButton; - Button2: TButton; GroupBox1: TGroupBox; ProxyTypeCbx: TComboBox; ProxyTypeLbl: TLabel; @@ -77,6 +75,9 @@ type ProxySchemeCb: TComboBox; MaxConnectionsPerProxyLbl: TLabel; MaxConnectionsPerProxyEdt: TSpinEdit; + Panel1: TPanel; + Button1: TButton; + Button2: TButton; private { Private declarations } public diff --git a/demos/Lazarus/MiniBrowser/MiniBrowser.lps b/demos/Lazarus/MiniBrowser/MiniBrowser.lps index bed2df6b..559a529e 100644 --- a/demos/Lazarus/MiniBrowser/MiniBrowser.lps +++ b/demos/Lazarus/MiniBrowser/MiniBrowser.lps @@ -22,8 +22,8 @@ - - + + @@ -83,7 +83,7 @@ - + @@ -91,115 +91,115 @@ - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/demos/Lazarus/MiniBrowser/uMiniBrowser.pas b/demos/Lazarus/MiniBrowser/uMiniBrowser.pas index 2550fe86..69e7d5df 100644 --- a/demos/Lazarus/MiniBrowser/uMiniBrowser.pas +++ b/demos/Lazarus/MiniBrowser/uMiniBrowser.pas @@ -1224,8 +1224,11 @@ begin end; procedure TMiniBrowserFrm.CopyAllTextMsg(var aMessage : TMessage); +var + TempName : string; begin - Chromium1.RetrieveText; + TempName := InputBox('Frame name', 'Type the fame name or leave it blank to select the main frame :', ''); + Chromium1.RetrieveText(TempName); end; procedure TMiniBrowserFrm.CopyFramesIDsMsg(var aMessage : TMessage); diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 17e14a37..eb340098 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas index 8c5310b6..ca5b3ae6 100644 --- a/source/uCEFApplication.pas +++ b/source/uCEFApplication.pas @@ -62,7 +62,7 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 77; CEF_SUPPORTED_VERSION_MINOR = 1; - CEF_SUPPORTED_VERSION_RELEASE = 7; + CEF_SUPPORTED_VERSION_RELEASE = 8; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 77; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index ffa99e6f..c107fb08 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : false, - "InternalVersion" : 36, + "InternalVersion" : 37, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "77.1.7.0" + "Version" : "77.1.8.0" } ], "UpdatePackageData" : {