From 01376a784ac9618f8f68f97f768a34c44eb429a5 Mon Sep 17 00:00:00 2001
From: Eric Menezes Noronha <ericmenezesn@gmail.com>
Date: Wed, 9 Apr 2014 14:36:22 -0300
Subject: [PATCH] -Adicionado "Executar Mapa" ao menu de pop up; -Adicionada função para executar o mapacacic se o valor da chave col_patr_exe for diferente de 'S';

---
 main.dfm |  6 ++++++
 main.pas | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/main.dfm b/main.dfm
index b0485c0..f641caa 100755
--- a/main.dfm
+++ b/main.dfm
@@ -1420,6 +1420,12 @@ object FormularioGeral: TFormularioGeral
       OnClick = ExecutaCacic
       OnDrawItem = Mnu_ExecutarAgoraDrawItem
     end
+    object ExecutarMapa1: TMenuItem
+      Caption = 'Executar Mapa'
+      Hint = 'Executa Mapa Cacic'
+      OnClick = InvocaMapa1Click
+      OnDrawItem = ExecutarMapa1DrawItem
+    end
     object Mnu_InformacoesGerais: TMenuItem
       Caption = 'Informa'#231#245'es Gerais'
       Hint = 
diff --git a/main.pas b/main.pas
index 151f8ab..e91bd8d 100755
--- a/main.pas
+++ b/main.pas
@@ -175,6 +175,7 @@ type
     TrayIcon1: TTrayIcon;
     ApplicationEvents1: TApplicationEvents;
     Panel1: TPanel;
+    ExecutarMapa1: TMenuItem;
     procedure RemoveIconesMortos;
     procedure ChecaCONFIGS;
     procedure CriaFormSenha(Sender: TObject);
@@ -257,6 +258,9 @@ type
     procedure timerNuIntervaloTimer(Sender: TObject);
     procedure ApplicationEvents1Message(var Msg: tagMSG;
       var Handled: Boolean);
+    procedure InvocaMapa1Click(Sender: TObject);
+    procedure ExecutarMapa1DrawItem(Sender: TObject; ACanvas: TCanvas;
+      ARect: TRect; Selected: Boolean);
   private
     FUsb : TUsbClass;
     ShutdownEmExecucao : Boolean;
@@ -1218,6 +1222,11 @@ begin
      End;
 end;
 
+procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject);
+begin
+  Invoca_MapaCacic;
+end;
+
 ////////////////////////////////////////////////////////////////////////////////
 //               CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC                   //
 ////////////////////////////////////////////////////////////////////////////////
@@ -1227,13 +1236,13 @@ begin
   if ActualActivity = 0 then
      Begin
         // Caso exista o Mapa Cacic será verificada a versão e excluída caso antiga(Uma forma de ação pró-ativa)
-        if FileExists(objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe') then
+        if FileExists(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe') then
           Begin
             ChecaCONFIGS;
 
             timerNuExecApos.Enabled  := False;
             objCACIC.writeDebugLog('Invoca_MapaCacic: Criando Processo Mapa => "'+objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe');
-            objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe',true,SW_SHOW);
+            objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',true,SW_SHOW);
             g_intStatus := 1;
             objCacic.setBoolCipher(not objCacic.isInDebugMode);
           End
@@ -1276,9 +1285,10 @@ begin
 ////////////////////////////////////////////////////////////////////////////////
 //               CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC                   //
 ////////////////////////////////////////////////////////////////////////////////
-//    if trim(objCACIC.getValueFromFile('Configs','Patrimonio_exe',
-//                                      strGerColsInfFileName))<>'s' then
-//      Invoca_MapaCacic;
+   if trim(objCACIC.getValueFromFile('Configs','col_patr_exe',
+                                      strGerColsInfFileName))<>'s' then begin
+      Invoca_MapaCacic;
+   end;
 //          AGUARDANDO CONFIGURAÇÃO DO GERENTE, SENDO INVOCADO NA INSTALAÇÃO, ATÉ O MOMENTO.
 ////////////////////////////// FIM /////////////////////////////////////////////
 
@@ -1418,6 +1428,20 @@ begin
    objCACIC.writeDebugLog('ExecutaCACIC: ' + DupeString('=',100));
 end;
 
+procedure TFormularioGeral.ExecutarMapa1DrawItem(Sender: TObject;
+  ACanvas: TCanvas; ARect: TRect; Selected: Boolean);
+begin
+ if Selected then
+   ACanvas.Brush.Color := clHighlight
+ else
+   ACanvas.Brush.Color := clMenu;
+
+ ARect.Left := LEFT_MENU_ITEM;
+ ACanvas.FillRect(ARect);
+
+ DrawText(ACanvas.Handle, PChar('Executar Mapa'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
+end;
+
 procedure TFormularioGeral.ExibirLogAtividades(Sender: TObject);
 begin
      Application.CreateForm(tformLog,formLog);
--
libgit2 0.21.2