• R/O
  • SSH
  • HTTPS

integradorcaie: コミット


コミットメタ情報

リビジョン3 (tree)
日時2018-07-24 13:36:57
作者derekwildstar

ログメッセージ

Ajustes para compilação no Delphi 25

変更サマリ

差分

--- trunk/prj/IntegradorCAIE.dpr (revision 2)
+++ trunk/prj/IntegradorCAIE.dpr (revision 3)
@@ -5,8 +5,6 @@
55 Vcl.Forms,
66 UFormPrincipal in '..\src\UFormPrincipal.pas' {FormPrincipal},
77 UDamoPrincipal in '..\src\UDamoPrincipal.pas' {DamoPrincipal: TDataModule},
8- Vcl.Themes,
9- Vcl.Styles,
108 UConfiguracoes in '..\src\lib\UConfiguracoes.pas',
119 URequestThread in '..\src\lib\URequestThread.pas',
1210 ServerCAIE in '..\src\lib\ServerCAIE.pas',
@@ -14,7 +12,9 @@
1412 UFormPerguntaEnvio in '..\src\UFormPerguntaEnvio.pas' {FormPerguntaEnvio},
1513 UFormProgresso in '..\src\UFormProgresso.pas' {FormProgresso},
1614 UFormStatus in '..\src\UFormStatus.pas' {FormStatus},
17- URequestThreadCAIE in '..\src\lib\URequestThreadCAIE.pas';
15+ URequestThreadCAIE in '..\src\lib\URequestThreadCAIE.pas',
16+ Vcl.Themes,
17+ Vcl.Styles;
1818
1919 {$R *.res}
2020
--- trunk/prj/IntegradorCAIE.dproj (revision 2)
+++ trunk/prj/IntegradorCAIE.dproj (revision 3)
@@ -1,7 +1,7 @@
11 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22 <PropertyGroup>
33 <ProjectGuid>{D0AEBD98-3F69-42B3-9CCD-14182960D5D0}</ProjectGuid>
4- <ProjectVersion>15.3</ProjectVersion>
4+ <ProjectVersion>18.4</ProjectVersion>
55 <FrameworkType>VCL</FrameworkType>
66 <MainSource>IntegradorCAIE.dpr</MainSource>
77 <Base>True</Base>
@@ -53,16 +53,22 @@
5353 <DCC_S>false</DCC_S>
5454 <DCC_F>false</DCC_F>
5555 <DCC_K>false</DCC_K>
56+ <SanitizedProjectName>IntegradorCAIE</SanitizedProjectName>
57+ <Custom_Styles>&quot;Emerald Light Slate|VCLSTYLE|$(BDSCOMMONDIR)\Styles\EmeraldLightSlate.vsf&quot;</Custom_Styles>
5658 </PropertyGroup>
5759 <PropertyGroup Condition="'$(Base_Win32)'!=''">
5860 <DCC_UsePackage>myprovider190;FireDACSqliteDriver;MidasConnR;rbUSER1519;DBXSqliteDriver;FireDACPgDriver;fmx;IndySystem;TeeDB;dacvcl190;vclib;inetdbbde;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DataSnapServer;ADOConnR;DataSnapProviderClient;DBXSybaseASEDriver;PNGComponentsR;DbxCommonDriver;rbDIDE1519;vclimg;unidac190;rbIBE1519;dbxcds;DatasnapConnectorsFreePascal;rbADO1519;rbFireDAC1519;MetropolisUILiveTile;vcldb;vcldsnap;fmxFireDAC;DBXDb2Driver;rbIDE1519;rbTCUI1519;DBXOracleDriver;CustomIPTransport;rbBDE1519;SynEdit_RXE5;vclribbon;FireDACConnR;dsnap;fmxase;vcl;IndyCore;CloudService;DBXMSSQLDriver;FmxTeeUI;FireDACIBDriver;DataSnapFireDAC;FireDACDBXDriver;PicShowR;dclRBE1519;rbCIDE1519;inetdbxpress;webdsnap;dclRBDBE1519;FireDACDb2Driver;ZeosLibConnR;adortl;FireDACASADriver;bindcompfmx;DBXConnR;dclRBIBE1519;vcldbx;FireDACODBCDriver;rbUSERDesign1519;rbRAP1519;rtl;dbrtl;DbxClientDriver;rbDBDE1519;FireDACCommon;bindcomp;inetdb;Tee;DBXOdbcDriver;vclFireDAC;xmlrtl;svnui;ibxpress;IBXConnR;UserControlR;IndyProtocols;DBXMySQLDriver;FireDACCommonDriver;bindengine;vclactnband;soaprtl;bindcompdbx;FMXTee;TeeUI;bindcompvcl;rbDAD1519;vclie;FireDACADSDriver;vcltouch;BDEConnR;rbTC1519;dac190;VclSmp;FireDACMSSQLDriver;FireDAC;VCLRESTComponents;Intraweb;DBXInformixDriver;rbDBE1519;DataSnapConnectors;FireDACDataSnapDriver;unidacvcl190;dclRBADO1519;dclRBFireDAC1519;dsnapcon;DBXFirebirdDriver;rbRCL1519;inet;pgprovider190;fmxobj;FireDACMySQLDriver;vclx;rbRTL1519;rbDB1519;UniDACConnR;svn;DBXSybaseASADriver;FireDACOracleDriver;fmxdae;RESTComponents;rbRIDE1519;bdertl;dclRBBDE1519;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;$(DCC_UsePackage)</DCC_UsePackage>
5961 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
6062 <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
61- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
63+ <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
6264 <VerInfo_Locale>1033</VerInfo_Locale>
65+ <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
66+ <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
6367 </PropertyGroup>
6468 <PropertyGroup Condition="'$(Base_Win64)'!=''">
6569 <DCC_UsePackage>FireDACSqliteDriver;DBXSqliteDriver;FireDACPgDriver;fmx;IndySystem;TeeDB;dacvcl190;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DataSnapServer;DataSnapProviderClient;DBXSybaseASEDriver;DbxCommonDriver;vclimg;unidac190;dbxcds;DatasnapConnectorsFreePascal;MetropolisUILiveTile;vcldb;vcldsnap;fmxFireDAC;DBXDb2Driver;DBXOracleDriver;CustomIPTransport;SynEdit_RXE5;vclribbon;dsnap;fmxase;vcl;IndyCore;CloudService;DBXMSSQLDriver;FmxTeeUI;FireDACIBDriver;DataSnapFireDAC;FireDACDBXDriver;inetdbxpress;webdsnap;FireDACDb2Driver;adortl;FireDACASADriver;bindcompfmx;FireDACODBCDriver;rtl;dbrtl;DbxClientDriver;FireDACCommon;bindcomp;inetdb;Tee;DBXOdbcDriver;vclFireDAC;xmlrtl;ibxpress;IndyProtocols;DBXMySQLDriver;FireDACCommonDriver;bindengine;vclactnband;soaprtl;bindcompdbx;FMXTee;TeeUI;bindcompvcl;vclie;FireDACADSDriver;vcltouch;dac190;VclSmp;FireDACMSSQLDriver;FireDAC;VCLRESTComponents;Intraweb;DBXInformixDriver;DataSnapConnectors;FireDACDataSnapDriver;unidacvcl190;dsnapcon;DBXFirebirdDriver;inet;pgprovider190;fmxobj;FireDACMySQLDriver;vclx;DBXSybaseASADriver;FireDACOracleDriver;fmxdae;RESTComponents;FireDACMSAccDriver;dbexpress;DataSnapIndy10ServerTransport;$(DCC_UsePackage)</DCC_UsePackage>
70+ <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
71+ <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
6672 </PropertyGroup>
6773 <PropertyGroup Condition="'$(Cfg_1)'!=''">
6874 <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -77,6 +83,10 @@
7783 <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7884 <VerInfo_Locale>1033</VerInfo_Locale>
7985 <DCC_RemoteDebug>false</DCC_RemoteDebug>
86+ <BT_BuildType>Debug</BT_BuildType>
87+ <Debugger_DebugSourcePath>D:\Desenvolvimento\Delphi\Componentes\KRAKATOA\KRKLIB\SRC\Rtl\win\;$(Debugger_DebugSourcePath)</Debugger_DebugSourcePath>
88+ <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
89+ <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
8090 </PropertyGroup>
8191 <PropertyGroup Condition="'$(Cfg_2)'!=''">
8292 <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -186,10 +196,11 @@
186196 <Source Name="MainSource">IntegradorCAIE.dpr</Source>
187197 </Source>
188198 <Excluded_Packages>
189- <Excluded_Packages Name="$(BDSBIN)\webdsnap190.bpl">Embarcadero InternetExpress Components</Excluded_Packages>
199+ <Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
200+ <Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
190201 </Excluded_Packages>
191202 </Delphi.Personality>
192- <Deployment/>
203+ <Deployment Version="3"/>
193204 <Platforms>
194205 <Platform value="Win32">True</Platform>
195206 <Platform value="Win64">False</Platform>
@@ -199,4 +210,5 @@
199210 </ProjectExtensions>
200211 <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
201212 <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
213+ <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
202214 </Project>
--- trunk/src/lib/URequestThreadCAIE.pas (revision 2)
+++ trunk/src/lib/URequestThreadCAIE.pas (revision 3)
@@ -8,7 +8,8 @@
88
99 type
1010 TOnStartRequest = TNotifyEvent;
11- TOnGetDataSets = procedure(out ACartorios, AGuias, AAtos, AReceitas: TClientDataSet) of object;
11+ TMoment = (mUnknown, mConfigureCompressionProgress, mCompressionProgress, mEncoding, mRequesting);
12+ TOnStatus = procedure(AMoment: TMoment; AData1: Int64; AData2: String) of object;
1213
1314 TRequestThreadCAIE = class(TThread)
1415 private
@@ -25,11 +26,15 @@
2526
2627 FOnStartRequest: TOnStartRequest;
2728
28- FAdditionalData: Pointer;
29+ FProgressMoment: TMoment;
30+ FProgressData1: Int64;
31+ FProgressData2: String;
32+ FOnStatus: TOnStatus;
2933
3034 function Requisicao: String;
3135 procedure DoHttpWebNodeBeforePost(const HTTPReqResp: THTTPReqResp; Data: Pointer);
3236 procedure DoStartRequest;
37+ procedure DoStatus;
3338 procedure BuildFileContents;
3439 procedure DoCompressProgress(ASender: TObject);
3540 protected
@@ -40,8 +45,8 @@
4045 class function GetFileContents(AUsuarioAtual: Pessoa; ACartorios, AGuias, AAtos, AReceitas: TClientDataSet): String;
4146
4247 property OnStartRequest: TOnStartRequest read FOnStartRequest write FOnStartRequest;
48+ property OnStatus: TOnStatus read FOnStatus write FOnStatus;
4349
44- property AdditionalData: Pointer write FAdditionalData;
4550 property UsuarioAtual: Pessoa write FUsuarioAtual;
4651 property NomeArquivo: String write FNomeArquivo;
4752 property Cartorios: TClientDataSet write FCartorios;
@@ -56,7 +61,8 @@
5661
5762 uses
5863 Winapi.ActiveX, System.SysUtils, System.Types, Winapi.WinInet,
59- Data.DB, StrUtils, KRK.Lib.Rtl.Win.WinCrypt.Utilities, UFormStatus, ZLib, EncdDecd;
64+ Data.DB, StrUtils, KRK.Lib.Rtl.Win.WinCrypt.Utilities, UFormStatus, ZLib,
65+ System.NetEncoding;
6066
6167 { TRequestThread }
6268
@@ -242,8 +248,13 @@
242248 try
243249 StringStream := TStringStream.Create(GetFileContents(FUsuarioAtual,FCartorios,FGuias,FAtos,FReceitas));
244250 try
245- if Assigned(FAdditionalData) then
246- TFormStatus(FAdditionalData).ResetGauge(StringStream.Size);
251+ if Assigned(FOnStatus) then
252+ begin
253+ FProgressMoment := mConfigureCompressionProgress;
254+ FProgressData1 := StringStream.Size;
255+ FProgressData2 := 'Comprimindo dados...'#13#10;
256+ Synchronize(DoStatus);
257+ end;
247258
248259 with TZCompressionStream.Create(clMax,MemoryStream) do
249260 try
@@ -250,9 +261,15 @@
250261 OnProgress := DoCompressProgress;
251262 CopyFrom(StringStream,StringStream.Size);
252263
253- if Assigned(FAdditionalData) then
254- TFormStatus(FAdditionalData).UpdateProgress(StringStream.Size);
255264 finally
265+ if Assigned(FOnStatus) then
266+ begin
267+ FProgressMoment := mCompressionProgress;
268+ FProgressData1 := StringStream.Size;
269+ FProgressData2 := 'Comprimindo dados...'#13#10;
270+ Synchronize(DoStatus);
271+ end;
272+
256273 Free;
257274 end;
258275 finally
@@ -261,9 +278,17 @@
261278
262279 MemoryStream.Position := 0;
263280
281+ if Assigned(FOnStatus) then
282+ begin
283+ FProgressMoment := mEncoding;
284+ FProgressData1 := 0;
285+ FProgressData2 := 'Codificando dados...';
286+ Synchronize(DoStatus);
287+ end;
288+
264289 StringStream := TStringStream.Create('');
265290 try
266- EncodeStream(MemoryStream,StringStream);
291+ TNetEncoding.Base64.Encode(MemoryStream, StringStream);
267292 FFileContents := StringStream.DataString;
268293 finally
269294 StringStream.Free;
@@ -275,12 +300,14 @@
275300
276301 function TRequestThreadCAIE.Requisicao: String;
277302 begin
278- if Assigned(FAdditionalData) then
279- TFormStatus(FAdditionalData).StartTimer;
303+ if Assigned(FOnStatus) then
304+ begin
305+ FProgressMoment := mRequesting;
306+ FProgressData1 := 0;
307+ FProgressData2 := 'Enviando dados ao CAIE...';
308+ Synchronize(DoStatus);
309+ end;
280310
281- while True do
282- Sleep(1000);
283-
284311 Result := GetServerCAIEPortType(False,'',FHTTPRIO).inserirArquivo(FUsuarioAtual.cpf,FFileContents,FNomeArquivo);
285312 end;
286313
@@ -304,10 +331,20 @@
304331 end;
305332
306333
334+procedure TRequestThreadCAIE.DoStatus;
335+begin
336+ FOnStatus(FProgressMoment,FProgressData1,FProgressData2);
337+end;
338+
307339 procedure TRequestThreadCAIE.DoCompressProgress(ASender: TObject);
308340 begin
309- if Assigned(FAdditionalData) then
310- TFormStatus(FAdditionalData).UpdateProgress(TZCompressionStream(ASender).Position);
341+ if Assigned(FOnStatus) then
342+ begin
343+ FProgressMoment := mCompressionProgress;
344+ FProgressData1 := TZCompressionStream(ASender).Position;
345+ FProgressData2 := 'Comprimindo dados...'#13#10;
346+ Synchronize(DoStatus);
347+ end;
311348 end;
312349
313350 procedure TRequestThreadCAIE.DoStartRequest;
--- trunk/src/UDamoPrincipal.pas (revision 2)
+++ trunk/src/UDamoPrincipal.pas (revision 3)
@@ -3,12 +3,11 @@
33 interface
44
55 uses
6- System.SysUtils, System.Classes, Data.DB, Datasnap.DBClient, Xml.xmldom,
7- Xmlxform, Vcl.StdCtrls, Vcl.Dialogs, Winapi.Windows, KRK.Lib.Rtl.Win.WinCrypt,
8- URequestThread, KRK.Components.AdditionalControls.DefinedCrypt,
9- UFormProgresso, Vcl.ExtCtrls, Soap.InvokeRegistry, Soap.Rio,
10- Soap.SOAPHTTPClient, UFormStatus, URequestThreadCAIE,
11- UFormBlender, ServerCAIE;
6+ System.SysUtils, System.Classes, Data.DB, Datasnap.DBClient, Vcl.StdCtrls,
7+ Vcl.Dialogs, Winapi.Windows, KRK.Lib.Rtl.Win.WinCrypt, URequestThread,
8+ KRK.Components.AdditionalControls.DefinedCrypt, UFormProgresso, Vcl.ExtCtrls,
9+ Soap.InvokeRegistry, Soap.Rio, Soap.SOAPHTTPClient, UFormStatus,
10+ URequestThreadCAIE, UFormBlender, ServerCAIE, Xml.xmldom, Xml.XmlTransform;
1211
1312 type
1413 TDamoPrincipal = class(TDataModule)
@@ -51,7 +50,7 @@
5150 KRDC: TKRKDefinedCrypt;
5251 TIME: TTimer;
5352 procedure DASOCartoriosDataChange(Sender: TObject; Field: TField);
54- procedure DoUpdateProgressOnSaveOrLoad(ASender: TObject; APosition: Integer);
53+ procedure DoEncryptDecryptProgress(ASender: TObject; APosition: Integer);
5554 procedure FormatarCPFCNPJOnGetText(Sender: TField; var Text: string; DisplayText: Boolean);
5655 procedure FormatarValorOnGetText(Sender: TField; var Text: string; DisplayText: Boolean);
5756 procedure TIMETimer(Sender: TObject);
@@ -65,12 +64,13 @@
6564 FDiretorioAtual: String;
6665 FFormProgresso: TFormProgresso;
6766 FStartTick: Cardinal;
68- FormBlenderRequisicaoCAIE: TFormBlender;
67+ FFormBlenderRequisicaoCAIE: TFormBlender;
6968 function EnumCertAltNameEntries(ACertAltNameEntry: TCertAltNameEntry; AEnumCertAltNameEntriesArguments: array of const): Boolean;
7069 procedure DoTerminateRequest(ASender: TObject);
7170 procedure DoTerminateRequestCAIE(ASender: TObject);
7271 procedure DoStartRequest(ASender: TObject);
7372 procedure DoStartRequestCAIE(ASender: TObject);
73+ procedure DoStatusCAIE(AMoment: TMoment; AData1: Int64; AData2: String);
7474 // function GetFileContents(ACartorios, AGuias, AAtos, AReceitas: TClientDataSet): String;
7575 public
7676 { Public declarations }
@@ -165,7 +165,8 @@
165165 FFormProgresso.PRBR.Max := Length(Subject);
166166 FFormProgresso.PRBR.Position := 0;
167167
168- KRDC.OnUpdateProgress := DoUpdateProgressOnSaveOrLoad;
168+ KRDC.OnUpdateProgress := DoEncryptDecryptProgress;
169+
169170 TempStream := KRDC.SubjectToStream(KRDC.SingleEncryptDecrypt(FUsuarioAtual.cpf + FUsuarioAtual.nome + FUsuarioAtual.cpf
170171 ,Subject
171172 ,fDecrypt));
@@ -286,12 +287,12 @@
286287
287288 procedure TDamoPrincipal.DoStartRequestCAIE(ASender: TObject);
288289 begin
289- TFormBlender.ShowMe(FormPrincipal,TFormStatus,FormBlenderRequisicaoCAIE);
290+ TFormBlender.ShowMe(FormPrincipal,TFormStatus,FFormBlenderRequisicaoCAIE);
290291
291- while not FormBlenderRequisicaoCAIE.InternalFormVisible do
292+ while not FFormBlenderRequisicaoCAIE.InternalFormVisible do
292293 Application.ProcessMessages;
293294
294- TRequestThreadCAIE(ASender).AdditionalData := FormBlenderRequisicaoCAIE.InternalFormInstance;
295+// TRequestThreadCAIE(ASender).AdditionalData := FormBlenderRequisicaoCAIE.InternalFormInstance;
295296 end;
296297
297298 // Executado ao final da execução da thread de requisição
@@ -340,7 +341,7 @@
340341 var
341342 FormStatus: TFormStatus;
342343 begin
343- FormStatus := TFormStatus(FormBlenderRequisicaoCAIE.InternalFormInstance);
344+ FormStatus := TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance);
344345
345346 FormStatus.TIME.Enabled := False;
346347 if FRequestThreadCAIE.Sucesso then
@@ -379,15 +380,34 @@
379380 Application.MessageBox(PChar(FRequestThreadCAIE.Resposta),'Falha na requisição',MB_ICONERROR);
380381 end;
381382
382- FormBlenderRequisicaoCAIE.Close;
383- FormBlenderRequisicaoCAIE.Free;
383+ FFormBlenderRequisicaoCAIE.Close;
384+ FFormBlenderRequisicaoCAIE.Free;
384385 end;
385386
386-procedure TDamoPrincipal.DoUpdateProgressOnSaveOrLoad(ASender: TObject; APosition: Integer);
387+procedure TDamoPrincipal.DoEncryptDecryptProgress(ASender: TObject; APosition: Integer);
387388 begin
388389 FFormProgresso.PRBR.Position := APosition;
389390 end;
390391
392+procedure TDamoPrincipal.DoStatusCAIE(AMoment: TMoment; AData1: Int64; AData2: String);
393+begin
394+ case AMoment of
395+ mConfigureCompressionProgress: begin
396+ TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).LABEStep5FinalMessage.Caption := AData2;
397+ TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).ResetProgressBar(AData1);
398+ end;
399+ mCompressionProgress: TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).UpdateProgress(AData1);
400+ mEncoding: begin
401+ TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).PRBR1.Hide;
402+ TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).LABEStep5FinalMessage.Caption := AData2;
403+ end;
404+ mRequesting: begin
405+ TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).LABEStep5FinalMessage.Caption := AData2;
406+ TFormStatus(FFormBlenderRequisicaoCAIE.InternalFormInstance).StartTimer;
407+ end;
408+ end;
409+end;
410+
391411 procedure TDamoPrincipal.FillCSPInfo(AComboBox: TComboBox; ACSPName, ACSPType, ACSPGUID: TEdit);
392412 begin
393413 ACSPName.Text := TSCP(AComboBox.Items.Objects[AComboBox.ItemIndex]).CSPName;
@@ -614,6 +634,7 @@
614634 FRequestThreadCAIE := TRequestThreadCAIE.Create;
615635 FRequestThreadCAIE.OnTerminate := DoTerminateRequestCAIE;
616636 FRequestThreadCAIE.OnStartRequest := DoStartRequestCAIE;
637+ FRequestThreadCAIE.OnStatus := DoStatusCAIE;
617638 FRequestThreadCAIE.Cartorios := CLDSCartorios;
618639 FRequestThreadCAIE.Guias := CLDSGuias;
619640 FRequestThreadCAIE.Atos := CLDSAtos;
@@ -668,7 +689,7 @@
668689 FFormProgresso.PRBR.Max := TempStream.Size;
669690 FFormProgresso.PRBR.Position := 0;
670691
671- KRDC.OnUpdateProgress := DoUpdateProgressOnSaveOrLoad;
692+ KRDC.OnUpdateProgress := DoEncryptDecryptProgress;
672693 KRDC.SaveToFile(SADI.FileName
673694 ,KRDC.SingleEncryptDecrypt(FUsuarioAtual.cpf + FUsuarioAtual.nome + FUsuarioAtual.cpf
674695 ,Subject
--- trunk/src/UFormStatus.pas (revision 2)
+++ trunk/src/UFormStatus.pas (revision 3)
@@ -28,7 +28,7 @@
2828 public
2929 { Public declarations }
3030 procedure StartTimer;
31- procedure ResetGauge(AMax: Int64);
31+ procedure ResetProgressBar(AMax: Int64);
3232 procedure UpdateProgress(AProgress: Int64);
3333 end;
3434
@@ -38,7 +38,7 @@
3838
3939 procedure TFormStatus.FormShow(Sender: TObject);
4040 begin
41- LABEStep5FinalMessage.Caption := 'Serializando e comprimindo dados...';
41+ LABEStep5FinalMessage.Caption := 'Serializando dados...';
4242 IMAGStep5Status.Picture.LoadFromFile(ExtractFilePath(ParamStr(0)) + 'res\RequestRunning200.gif');
4343
4444 (IMAGStep5Status.Picture.Graphic as TGIFImage).Animate := True;
@@ -45,10 +45,11 @@
4545 (IMAGStep5Status.Picture.Graphic as TGIFImage).AnimationSpeed:= 200;
4646 end;
4747
48-procedure TFormStatus.ResetGauge(AMax: Int64);
48+procedure TFormStatus.ResetProgressBar(AMax: Int64);
4949 begin
5050 PRBR1.Position := 0;
5151 PRBR1.Max := AMax;
52+ PRBR1.Visible := True;
5253 end;
5354
5455 procedure TFormStatus.StartTimer;
@@ -67,6 +68,4 @@
6768 PRBR1.Position := AProgress;
6869 end;
6970
70-colocar o progressbar no label de baixo
71-
7271 end.
旧リポジトリブラウザで表示