Download as
Browse Code »

Commit fd7c18236b80e540cc1c1957223cac8fdff742f9

Authored by Eric Menezes Noronha
1 parent c9d7fbbb
Exists in master

Correção de bug ao coletar registro em máquinas de 64 bits.

Showing 7 changed files with 62 additions and 144 deletions   Show diff stats
@@ -162,7 +162,7 @@ object frmMapaCacic: TfrmMapaCacic @@ -162,7 +162,7 @@ object frmMapaCacic: TfrmMapaCacic
162 780 162 780
163 374) 163 374)
164 object lbEtiqueta2: TLabel 164 object lbEtiqueta2: TLabel
165 - Left = 277 165 + Left = 420
166 Top = 33 166 Top = 33
167 Width = 250 167 Width = 250
168 Height = 13 168 Height = 13
@@ -180,8 +180,8 @@ object frmMapaCacic: TfrmMapaCacic @@ -180,8 +180,8 @@ object frmMapaCacic: TfrmMapaCacic
180 Visible = False 180 Visible = False
181 end 181 end
182 object lbEtiqueta3: TLabel 182 object lbEtiqueta3: TLabel
183 - Left = 511  
184 - Top = 33 183 + Left = 420
  184 + Top = 82
185 Width = 250 185 Width = 250
186 Height = 13 186 Height = 13
187 Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.' 187 Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.'
@@ -199,7 +199,7 @@ object frmMapaCacic: TfrmMapaCacic @@ -199,7 +199,7 @@ object frmMapaCacic: TfrmMapaCacic
199 end 199 end
200 object lbEtiqueta4: TLabel 200 object lbEtiqueta4: TLabel
201 Left = 43 201 Left = 43
202 - Top = 80 202 + Top = 82
203 Width = 250 203 Width = 250
204 Height = 13 204 Height = 13
205 Hint = 'Este '#233' o usu'#225'rio logado atualmente' 205 Hint = 'Este '#233' o usu'#225'rio logado atualmente'
@@ -268,8 +268,8 @@ object frmMapaCacic: TfrmMapaCacic @@ -268,8 +268,8 @@ object frmMapaCacic: TfrmMapaCacic
268 Visible = False 268 Visible = False
269 end 269 end
270 object lbEtiqueta5: TLabel 270 object lbEtiqueta5: TLabel
271 - Left = 420  
272 - Top = 82 271 + Left = 43
  272 + Top = 133
273 Width = 250 273 Width = 250
274 Height = 13 274 Height = 13
275 Hint = 'Nome do usu'#225'rio logado.' 275 Hint = 'Nome do usu'#225'rio logado.'
@@ -284,7 +284,7 @@ object frmMapaCacic: TfrmMapaCacic @@ -284,7 +284,7 @@ object frmMapaCacic: TfrmMapaCacic
284 Visible = False 284 Visible = False
285 end 285 end
286 object lbEtiqueta7: TLabel 286 object lbEtiqueta7: TLabel
287 - Left = 420 287 + Left = 661
288 Top = 129 288 Top = 129
289 Width = 69 289 Width = 69
290 Height = 13 290 Height = 13
@@ -302,7 +302,7 @@ object frmMapaCacic: TfrmMapaCacic @@ -302,7 +302,7 @@ object frmMapaCacic: TfrmMapaCacic
302 Visible = False 302 Visible = False
303 end 303 end
304 object lbEtiqueta6: TLabel 304 object lbEtiqueta6: TLabel
305 - Left = 43 305 + Left = 420
306 Top = 129 306 Top = 129
307 Width = 175 307 Width = 175
308 Height = 13 308 Height = 13
@@ -321,42 +321,6 @@ object frmMapaCacic: TfrmMapaCacic @@ -321,42 +321,6 @@ object frmMapaCacic: TfrmMapaCacic
321 ShowHint = True 321 ShowHint = True
322 Visible = False 322 Visible = False
323 end 323 end
324 - object lbEtiquetaTel: TLabel  
325 - Left = 514  
326 - Top = 129  
327 - Width = 69  
328 - Height = 13  
329 - Hint = 'Digite o telefone do seu local de trabalho.'  
330 - AutoSize = False  
331 - Caption = 'Telefone'  
332 - Font.Charset = DEFAULT_CHARSET  
333 - Font.Color = clWindowText  
334 - Font.Height = -11  
335 - Font.Name = 'MS Sans Serif'  
336 - Font.Style = []  
337 - ParentFont = False  
338 - ParentShowHint = False  
339 - ShowHint = True  
340 - Visible = False  
341 - end  
342 - object lbEtiqueta8: TLabel  
343 - Left = 632  
344 - Top = 129  
345 - Width = 69  
346 - Height = 13  
347 - Hint = 'Digite o ramal do seu local de trabalho.'  
348 - AutoSize = False  
349 - Caption = 'Ramal'  
350 - Font.Charset = DEFAULT_CHARSET  
351 - Font.Color = clWindowText  
352 - Font.Height = -11  
353 - Font.Name = 'MS Sans Serif'  
354 - Font.Style = []  
355 - ParentFont = False  
356 - ParentShowHint = False  
357 - ShowHint = True  
358 - Visible = False  
359 - end  
360 object edTeInfoPatrimonio4: TEdit 324 object edTeInfoPatrimonio4: TEdit
361 Left = 43 325 Left = 43
362 Top = 99 326 Top = 99
@@ -376,9 +340,9 @@ object frmMapaCacic: TfrmMapaCacic @@ -376,9 +340,9 @@ object frmMapaCacic: TfrmMapaCacic
376 Visible = False 340 Visible = False
377 end 341 end
378 object edTeInfoPatrimonio3: TEdit 342 object edTeInfoPatrimonio3: TEdit
379 - Left = 509  
380 - Top = 52  
381 - Width = 221 343 + Left = 420
  344 + Top = 99
  345 + Width = 312
382 Height = 24 346 Height = 24
383 Font.Charset = DEFAULT_CHARSET 347 Font.Charset = DEFAULT_CHARSET
384 Font.Color = clWindowText 348 Font.Color = clWindowText
@@ -399,13 +363,13 @@ object frmMapaCacic: TfrmMapaCacic @@ -399,13 +363,13 @@ object frmMapaCacic: TfrmMapaCacic
399 Height = 20 363 Height = 20
400 Caption = 'Recarregar' 364 Caption = 'Recarregar'
401 Enabled = False 365 Enabled = False
402 - TabOrder = 13 366 + TabOrder = 11
403 OnClick = btCombosUpdateClick 367 OnClick = btCombosUpdateClick
404 end 368 end
405 object edTeInfoPatrimonio2: TEdit 369 object edTeInfoPatrimonio2: TEdit
406 - Left = 277 370 + Left = 420
407 Top = 52 371 Top = 52
408 - Width = 221 372 + Width = 312
409 Height = 24 373 Height = 24
410 Font.Charset = DEFAULT_CHARSET 374 Font.Charset = DEFAULT_CHARSET
411 Font.Color = clWindowText 375 Font.Color = clWindowText
@@ -419,23 +383,6 @@ object frmMapaCacic: TfrmMapaCacic @@ -419,23 +383,6 @@ object frmMapaCacic: TfrmMapaCacic
419 TabOrder = 1 383 TabOrder = 1
420 Visible = False 384 Visible = False
421 end 385 end
422 - object edTeInfoPatrimonio8: TEdit  
423 - Left = 632  
424 - Top = 148  
425 - Width = 98  
426 - Height = 24  
427 - Font.Charset = DEFAULT_CHARSET  
428 - Font.Color = clWindowText  
429 - Font.Height = -13  
430 - Font.Name = 'MS Sans Serif'  
431 - Font.Style = []  
432 - MaxLength = 10  
433 - ParentFont = False  
434 - ParentShowHint = False  
435 - ShowHint = True  
436 - TabOrder = 8  
437 - Visible = False  
438 - end  
439 object edTeInfoPatrimonio9: TEdit 386 object edTeInfoPatrimonio9: TEdit
440 Left = 43 387 Left = 43
441 Top = 201 388 Top = 201
@@ -451,13 +398,13 @@ object frmMapaCacic: TfrmMapaCacic @@ -451,13 +398,13 @@ object frmMapaCacic: TfrmMapaCacic
451 ParentFont = False 398 ParentFont = False
452 ParentShowHint = False 399 ParentShowHint = False
453 ShowHint = True 400 ShowHint = True
454 - TabOrder = 9 401 + TabOrder = 7
455 Visible = False 402 Visible = False
456 end 403 end
457 object edTeInfoPatrimonio1: TEdit 404 object edTeInfoPatrimonio1: TEdit
458 Left = 43 405 Left = 43
459 Top = 52 406 Top = 52
460 - Width = 221 407 + Width = 310
461 Height = 24 408 Height = 24
462 Font.Charset = DEFAULT_CHARSET 409 Font.Charset = DEFAULT_CHARSET
463 Font.Color = clWindowText 410 Font.Color = clWindowText
@@ -472,8 +419,8 @@ object frmMapaCacic: TfrmMapaCacic @@ -472,8 +419,8 @@ object frmMapaCacic: TfrmMapaCacic
472 Visible = False 419 Visible = False
473 end 420 end
474 object edTeInfoPatrimonio5: TEdit 421 object edTeInfoPatrimonio5: TEdit
475 - Left = 420  
476 - Top = 99 422 + Left = 43
  423 + Top = 152
477 Width = 310 424 Width = 310
478 Height = 24 425 Height = 24
479 Enabled = False 426 Enabled = False
@@ -495,7 +442,7 @@ object frmMapaCacic: TfrmMapaCacic @@ -495,7 +442,7 @@ object frmMapaCacic: TfrmMapaCacic
495 Width = 774 442 Width = 774
496 Height = 83 443 Height = 83
497 Caption = 'Termo de Responsabilidade' 444 Caption = 'Termo de Responsabilidade'
498 - TabOrder = 11 445 + TabOrder = 9
499 object rdConcordaTermos: TRadioButton 446 object rdConcordaTermos: TRadioButton
500 Left = 3 447 Left = 3
501 Top = 23 448 Top = 23
@@ -527,14 +474,14 @@ object frmMapaCacic: TfrmMapaCacic @@ -527,14 +474,14 @@ object frmMapaCacic: TfrmMapaCacic
527 Font.Name = 'Arial' 474 Font.Name = 'Arial'
528 Font.Style = [fsBold] 475 Font.Style = [fsBold]
529 ParentFont = False 476 ParentFont = False
530 - TabOrder = 12 477 + TabOrder = 10
531 Visible = False 478 Visible = False
532 OnClick = AtualizaPatrimonio 479 OnClick = AtualizaPatrimonio
533 end 480 end
534 object edTeInfoPatrimonio6: TEdit 481 object edTeInfoPatrimonio6: TEdit
535 - Left = 43  
536 - Top = 148  
537 - Width = 310 482 + Left = 420
  483 + Top = 152
  484 + Width = 229
538 Height = 24 485 Height = 24
539 Font.Charset = DEFAULT_CHARSET 486 Font.Charset = DEFAULT_CHARSET
540 Font.Color = clWindowText 487 Font.Color = clWindowText
@@ -549,8 +496,8 @@ object frmMapaCacic: TfrmMapaCacic @@ -549,8 +496,8 @@ object frmMapaCacic: TfrmMapaCacic
549 Visible = False 496 Visible = False
550 end 497 end
551 object edTeInfoPatrimonio7: TEdit 498 object edTeInfoPatrimonio7: TEdit
552 - Left = 420  
553 - Top = 148 499 + Left = 663
  500 + Top = 152
554 Width = 67 501 Width = 67
555 Height = 24 502 Height = 24
556 Font.Charset = DEFAULT_CHARSET 503 Font.Charset = DEFAULT_CHARSET
@@ -580,23 +527,7 @@ object frmMapaCacic: TfrmMapaCacic @@ -580,23 +527,7 @@ object frmMapaCacic: TfrmMapaCacic
580 ParentFont = False 527 ParentFont = False
581 ParentShowHint = False 528 ParentShowHint = False
582 ShowHint = True 529 ShowHint = True
583 - TabOrder = 10  
584 - Visible = False  
585 - end  
586 - object edTeInfoPatrimonioTel: TMaskEdit  
587 - Left = 514  
588 - Top = 148  
589 - Width = 89  
590 - Height = 24  
591 - EditMask = '!\(999\)99999-9999;0;_'  
592 - Font.Charset = DEFAULT_CHARSET  
593 - Font.Color = clBlack  
594 - Font.Height = -11  
595 - Font.Name = 'MS Sans Serif'  
596 - Font.Style = []  
597 - MaxLength = 15  
598 - ParentFont = False  
599 - TabOrder = 7 530 + TabOrder = 8
600 Visible = False 531 Visible = False
601 end 532 end
602 end 533 end
@@ -644,13 +575,13 @@ object frmMapaCacic: TfrmMapaCacic @@ -644,13 +575,13 @@ object frmMapaCacic: TfrmMapaCacic
644 Width = 40 575 Width = 40
645 Height = 20 576 Height = 20
646 BevelWidth = 2 577 BevelWidth = 2
647 - Caption = 'X' 578 + Caption = 'Close'
648 Color = clRed 579 Color = clRed
649 Enabled = False 580 Enabled = False
650 - Font.Charset = DEFAULT_CHARSET 581 + Font.Charset = ANSI_CHARSET
651 Font.Color = clInfoBk 582 Font.Color = clInfoBk
652 - Font.Height = 20  
653 - Font.Name = 'Arial Black' 583 + Font.Height = -13
  584 + Font.Name = 'Tahoma'
654 Font.Style = [] 585 Font.Style = []
655 ParentBackground = False 586 ParentBackground = False
656 ParentFont = False 587 ParentFont = False
@@ -85,7 +85,6 @@ type @@ -85,7 +85,6 @@ type
85 edTeInfoPatrimonio3: TEdit; 85 edTeInfoPatrimonio3: TEdit;
86 btCombosUpdate: TButton; 86 btCombosUpdate: TButton;
87 edTeInfoPatrimonio2: TEdit; 87 edTeInfoPatrimonio2: TEdit;
88 - edTeInfoPatrimonio8: TEdit;  
89 edTeInfoPatrimonio9: TEdit; 88 edTeInfoPatrimonio9: TEdit;
90 edTeInfoPatrimonio1: TEdit; 89 edTeInfoPatrimonio1: TEdit;
91 edTeInfoPatrimonio5: TEdit; 90 edTeInfoPatrimonio5: TEdit;
@@ -97,9 +96,6 @@ type @@ -97,9 +96,6 @@ type
97 lbEtiqueta6: TLabel; 96 lbEtiqueta6: TLabel;
98 edTeInfoPatrimonio7: TEdit; 97 edTeInfoPatrimonio7: TEdit;
99 btKonamiCode: TPanel; 98 btKonamiCode: TPanel;
100 - edTeInfoPatrimonioTel: TMaskEdit;  
101 - lbEtiquetaTel: TLabel;  
102 - lbEtiqueta8: TLabel;  
103 edTeInfoPatrimonio10: TEdit; 99 edTeInfoPatrimonio10: TEdit;
104 100
105 procedure FormCreate(Sender: TObject); 101 procedure FormCreate(Sender: TObject);
@@ -170,7 +166,7 @@ End; @@ -170,7 +166,7 @@ End;
170 procedure TfrmMapaCacic.Finalizar; 166 procedure TfrmMapaCacic.Finalizar;
171 Begin 167 Begin
172 Visible := false; 168 Visible := false;
173 - 169 +
174 if FileExists(objCACIC.getLocalFolderName + '\temp\aguarde_MAPACACIC.txt') then 170 if FileExists(objCACIC.getLocalFolderName + '\temp\aguarde_MAPACACIC.txt') then
175 objCACIC.deleteFileOrFolder(objCacic.getLocalFolderName + 171 objCACIC.deleteFileOrFolder(objCacic.getLocalFolderName +
176 '\temp\aguarde_MAPACACIC.txt'); 172 '\temp\aguarde_MAPACACIC.txt');
@@ -401,8 +397,6 @@ if edTeInfoPatrimonio5.text <> '' then @@ -401,8 +397,6 @@ if edTeInfoPatrimonio5.text <> '' then
401 '[UserName]' + edTeInfoPatrimonio5.Text + '[/UserName]' + 397 '[UserName]' + edTeInfoPatrimonio5.Text + '[/UserName]' +
402 '[Coordenacao_Setor]' + edTeInfoPatrimonio6.Text + '[/Coordenacao_Setor]' + 398 '[Coordenacao_Setor]' + edTeInfoPatrimonio6.Text + '[/Coordenacao_Setor]' +
403 '[Sala]' + edTeInfoPatrimonio7.Text + '[/Sala]' + 399 '[Sala]' + edTeInfoPatrimonio7.Text + '[/Sala]' +
404 - '[Tel]' + edTeInfoPatrimonioTel.text + '[/Tel]' +  
405 - '[Ramal]' + edTeInfoPatrimonio8.text + '[/Ramal]' +  
406 '[ComputerName]' + edTeInfoPatrimonio9.text + '[/ComputerName]' + 400 '[ComputerName]' + edTeInfoPatrimonio9.text + '[/ComputerName]' +
407 '[IPComputer]' + edTeInfoPatrimonio10.text + '[/IPComputer]' 401 '[IPComputer]' + edTeInfoPatrimonio10.text + '[/IPComputer]'
408 , ',','[[COMMA]]',[rfReplaceAll]); 402 , ',','[[COMMA]]',[rfReplaceAll]);
@@ -553,19 +547,6 @@ Begin @@ -553,19 +547,6 @@ Begin
553 edTeInfoPatrimonio7.visible := True; 547 edTeInfoPatrimonio7.visible := True;
554 // end; 548 // end;
555 549
556 - lbEtiquetaTel.Visible := true;  
557 - edTeInfoPatrimonioTel.Hint := objCacic.getValueFromTags('te_help_etiqueta_tel', strConfigsPatrimonioInterface);  
558 - edTeInfoPatrimonioTel.Text := strTeInfoPatrimonioTel;  
559 - edTeInfoPatrimonioTel.visible := True;  
560 -  
561 - edTeInfoPatrimonio8.Text := strTeInfoPatrimonio8;  
562 - if edTeInfoPatrimonio8.Text <> '' then  
563 - begin  
564 - lbEtiqueta8.Visible := true;  
565 - edTeInfoPatrimonio8.Visible := true;  
566 - end;  
567 - lbEtiqueta8.Visible := true;  
568 - edTeInfoPatrimonio8.Visible := true;  
569 //-----------------------NOME DO COMPUTADOR PARA O EDTEXT----------------------- 550 //-----------------------NOME DO COMPUTADOR PARA O EDTEXT-----------------------
570 edTeInfoPatrimonio9.Text := NomeComputador; 551 edTeInfoPatrimonio9.Text := NomeComputador;
571 if edTeInfoPatrimonio9.Text <> '' then 552 if edTeInfoPatrimonio9.Text <> '' then
@@ -729,8 +710,14 @@ begin @@ -729,8 +710,14 @@ begin
729 objCacic.writeDailyLog('SEM PRIVILÉGIOS: Necessário ser administrador "local" ou de Domínio!'); 710 objCacic.writeDailyLog('SEM PRIVILÉGIOS: Necessário ser administrador "local" ou de Domínio!');
730 Finalizar; 711 Finalizar;
731 End; 712 End;
732 - Finally  
733 - End; 713 + Except
  714 + on E:Exception do
  715 + Begin
  716 + objCacic.writeExceptionLog(E.Message,e.ClassName + 'Erro ao criar formulario.');
  717 + objCACIC.writeDailyLog('Erro ao criar formulario.');
  718 + Finalizar;
  719 + End; //on E:Exception do
  720 + end;
734 end; 721 end;
735 722
736 723
@@ -957,8 +944,6 @@ begin @@ -957,8 +944,6 @@ begin
957 ldap.Timeout := 5000; 944 ldap.Timeout := 5000;
958 if ldap.Login and ldap.Bind then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind) 945 if ldap.Login and ldap.Bind then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
959 begin 946 begin
960 - // 41680200020  
961 -  
962 ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio2, retorno); //Faz a pesquisa, com o CPF repassado. 947 ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio2, retorno); //Faz a pesquisa, com o CPF repassado.
963 result := LDAPResultdump(ldap.SearchResult); 948 result := LDAPResultdump(ldap.SearchResult);
964 objCACIC.writeDailyLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.'); 949 objCACIC.writeDailyLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.');
@@ -971,8 +956,6 @@ begin @@ -971,8 +956,6 @@ begin
971 Except 956 Except
972 on E:Exception do 957 on E:Exception do
973 Begin 958 Begin
974 - MessageDlg(#13#13+'Problemas para pegar nome do usuário.'+#13#13+  
975 - 'Por favor, digite seu nome no campo solicitado',mtError, [mbOK], 0);  
976 objCacic.writeExceptionLog(E.Message,e.ClassName); 959 objCacic.writeExceptionLog(E.Message,e.ClassName);
977 objCACIC.writeDailyLog('Nome Usuário: Falha ao tentar recuperar o nome.'); 960 objCACIC.writeDailyLog('Nome Usuário: Falha ao tentar recuperar o nome.');
978 End; //on E:Exception do 961 End; //on E:Exception do
gercols/gercols.dpr
  Diff comments   View file @fd7c182
@@ -677,8 +677,8 @@ var @@ -677,8 +677,8 @@ var
677 SubRegistry: TRegistry; 677 SubRegistry: TRegistry;
678 saida: String; 678 saida: String;
679 begin 679 begin
680 - Registry := TRegistry.Create;  
681 - SubRegistry := TRegistry.Create; 680 + Registry := TRegistry.Create(KEY_WOW64_64KEY);
  681 + SubRegistry := TRegistry.Create(KEY_WOW64_64KEY);
682 Registry.RootKey := HKEY_LOCAL_MACHINE; 682 Registry.RootKey := HKEY_LOCAL_MACHINE;
683 if Registry.OpenKeyReadOnly(Key) then begin 683 if Registry.OpenKeyReadOnly(Key) then begin
684 Try 684 Try
@@ -736,16 +736,22 @@ end; @@ -736,16 +736,22 @@ end;
736 Function SoftwareList: String; 736 Function SoftwareList: String;
737 var 737 var
738 strChave: String; 738 strChave: String;
  739 + strChave6432: String;
739 outString: String; 740 outString: String;
  741 + outString6432: String;
740 begin 742 begin
741 // Esse registro é onde vamos buscar a chave do SO 743 // Esse registro é onde vamos buscar a chave do SO
742 - strChave := '\Software\Microsoft\Windows\CurrentVersion\Uninstall';  
743 - 744 + strChave := '\Software\Microsoft\Windows\CurrentVersion\Uninstall';
  745 + strChave6432 := '\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall';
744 // Passo aqui o registro e a profundidade dos campos que quero ver 746 // Passo aqui o registro e a profundidade dos campos que quero ver
  747 + outString6432 := DisplayKeys(strChave6432, 3);
745 outString := DisplayKeys(strChave, 3); 748 outString := DisplayKeys(strChave, 3);
746 // objCacic.setValueToFile('collects', 'colsoft_puro', outString, 'c:\Cacic\colsoft.inf'); 749 // objCacic.setValueToFile('collects', 'colsoft_puro', outString, 'c:\Cacic\colsoft.inf');
747 // Retorno uma string com todas as tags coletadas do registro 750 // Retorno uma string com todas as tags coletadas do registro
748 - Result := outString; 751 + if ((outString <> outString6432) and (outString6432 <> '')) then
  752 + Result := outString + outString6432
  753 + else
  754 + result := outString;
749 end; 755 end;
750 756
751 // Procedimento que executa a coleta de hardware 757 // Procedimento que executa a coleta de hardware
gercols/gercols.dproj
  Diff comments   View file @fd7c182
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <Borland.Personality>Delphi.Personality</Borland.Personality> 38 <Borland.Personality>Delphi.Personality</Borland.Personality>
39 <Borland.ProjectType>VCLApplication</Borland.ProjectType> 39 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
40 <BorlandProject> 40 <BorlandProject>
41 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">7</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.7</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 41 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">8</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.8</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
42 </ProjectExtensions> 42 </ProjectExtensions>
43 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 43 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
44 <ItemGroup> 44 <ItemGroup>
gercols/gercols.res
View file @fd7c182
No preview for this file type
@@ -1376,13 +1376,6 @@ object FormularioGeral: TFormularioGeral @@ -1376,13 +1376,6 @@ object FormularioGeral: TFormularioGeral
1376 Spacing = 1 1376 Spacing = 1
1377 end 1377 end
1378 end 1378 end
1379 - object timerNuIntervalo: TTimer  
1380 - Enabled = False  
1381 - Interval = 5000  
1382 - OnTimer = timerNuIntervaloTimer  
1383 - Left = 226  
1384 - Top = 570  
1385 - end  
1386 object timerNuExecApos: TTimer 1379 object timerNuExecApos: TTimer
1387 Enabled = False 1380 Enabled = False
1388 Interval = 1 1381 Interval = 1
@@ -1755,7 +1748,7 @@ object FormularioGeral: TFormularioGeral @@ -1755,7 +1748,7 @@ object FormularioGeral: TFormularioGeral
1755 000000000000} 1748 000000000000}
1756 end 1749 end
1757 object timerCheckNoMinuto: TTimer 1750 object timerCheckNoMinuto: TTimer
1758 - Interval = 60000 1751 + Interval = 600000
1759 OnTimer = timerCheckNoMinutoTimer 1752 OnTimer = timerCheckNoMinutoTimer
1760 Left = 36 1753 Left = 36
1761 Top = 566 1754 Top = 566
@@ -1776,4 +1769,10 @@ object FormularioGeral: TFormularioGeral @@ -1776,4 +1769,10 @@ object FormularioGeral: TFormularioGeral
1776 Left = 392 1769 Left = 392
1777 Top = 568 1770 Top = 568
1778 end 1771 end
  1772 + object timerNuIntervalo: TTimer
  1773 + Enabled = False
  1774 + Interval = 1
  1775 + Left = 232
  1776 + Top = 568
  1777 + end
1779 end 1778 end
1 -(** 1 +(**
2 --------------------------------------------------------------------------------------------------------------------------------------------------------------- 2 ---------------------------------------------------------------------------------------------------------------------------------------------------------------
3 Copyright 2000, 2001, 2002, 2003, 2004, 2005 Dataprev - Empresa de Tecnologia e Informa��es da Previd�ncia Social, Brasil 3 Copyright 2000, 2001, 2002, 2003, 2004, 2005 Dataprev - Empresa de Tecnologia e Informa��es da Previd�ncia Social, Brasil
4 4
@@ -114,7 +114,6 @@ type @@ -114,7 +114,6 @@ type
114 Pn_Linha4_TCPIP: TPanel; 114 Pn_Linha4_TCPIP: TPanel;
115 Pn_Linha6_TCPIP: TPanel; 115 Pn_Linha6_TCPIP: TPanel;
116 Pn_Linha5_TCPIP: TPanel; 116 Pn_Linha5_TCPIP: TPanel;
117 - timerNuIntervalo: TTimer;  
118 timerNuExecApos: TTimer; 117 timerNuExecApos: TTimer;
119 Popup_Menu_Contexto: TPopupMenu; 118 Popup_Menu_Contexto: TPopupMenu;
120 Mnu_LogAtividades: TMenuItem; 119 Mnu_LogAtividades: TMenuItem;
@@ -173,6 +172,7 @@ type @@ -173,6 +172,7 @@ type
173 cn: TSHChangeNotify; 172 cn: TSHChangeNotify;
174 imgIconList: TImageList; 173 imgIconList: TImageList;
175 timerCheckNoMinuto: TTimer; 174 timerCheckNoMinuto: TTimer;
  175 + timerNuIntervalo: TTimer;
176 TrayIcon1: TTrayIcon; 176 TrayIcon1: TTrayIcon;
177 ApplicationEvents1: TApplicationEvents; 177 ApplicationEvents1: TApplicationEvents;
178 Panel1: TPanel; 178 Panel1: TPanel;
@@ -1350,7 +1350,6 @@ begin @@ -1350,7 +1350,6 @@ begin
1350 End 1350 End
1351 else 1351 else
1352 objCACIC.writeDailyLog('Não foi possível invocar o Mapa Cacic!'); 1352 objCACIC.writeDailyLog('Não foi possível invocar o Mapa Cacic!');
1353 - End;  
1354 End; 1353 End;
1355 End; 1354 End;
1356 end; 1355 end;
@@ -2656,7 +2655,7 @@ begin @@ -2656,7 +2655,7 @@ begin
2656 ARect.Left := LEFT_MENU_ITEM; 2655 ARect.Left := LEFT_MENU_ITEM;
2657 ACanvas.FillRect(ARect); 2656 ACanvas.FillRect(ARect);
2658 2657
2659 - DrawText(ACanvas.Handle, PChar('Configura��es'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP}); 2658 + DrawText(ACanvas.Handle, PChar('Configuracoes'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
2660 end; 2659 end;
2661 2660
2662 procedure TFormularioGeral.Mnu_ExecutarAgoraDrawItem(Sender: TObject; 2661 procedure TFormularioGeral.Mnu_ExecutarAgoraDrawItem(Sender: TObject;
@@ -2684,7 +2683,7 @@ begin @@ -2684,7 +2683,7 @@ begin
2684 ARect.Left := LEFT_MENU_ITEM; 2683 ARect.Left := LEFT_MENU_ITEM;
2685 ACanvas.FillRect(ARect); 2684 ACanvas.FillRect(ARect);
2686 2685
2687 - DrawText(ACanvas.Handle, PChar('Informa��es Gerais'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP}); 2686 + DrawText(ACanvas.Handle, PChar('Informacoes Gerais'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
2688 end; 2687 end;
2689 2688
2690 procedure TFormularioGeral.Mnu_SuporteRemotoDrawItem(Sender: TObject; 2689 procedure TFormularioGeral.Mnu_SuporteRemotoDrawItem(Sender: TObject;