Download as
Browse Code »

Commit 01376a784ac9618f8f68f97f768a34c44eb429a5

Authored by Eric Menezes Noronha
1 parent 1f42d222
Exists in master

-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';
Showing 2 changed files with 35 additions and 5 deletions   Show diff stats
main.dfm
  Diff comments   View file @01376a7
... ... @@ -1420,6 +1420,12 @@ object FormularioGeral: TFormularioGeral
1420 1420 OnClick = ExecutaCacic
1421 1421 OnDrawItem = Mnu_ExecutarAgoraDrawItem
1422 1422 end
  1423 + object ExecutarMapa1: TMenuItem
  1424 + Caption = 'Executar Mapa'
  1425 + Hint = 'Executa Mapa Cacic'
  1426 + OnClick = InvocaMapa1Click
  1427 + OnDrawItem = ExecutarMapa1DrawItem
  1428 + end
1423 1429 object Mnu_InformacoesGerais: TMenuItem
1424 1430 Caption = 'Informa'#231#245'es Gerais'
1425 1431 Hint =
... ...
main.pas
  Diff comments   View file @01376a7
... ... @@ -175,6 +175,7 @@ type
175 175 TrayIcon1: TTrayIcon;
176 176 ApplicationEvents1: TApplicationEvents;
177 177 Panel1: TPanel;
  178 + ExecutarMapa1: TMenuItem;
178 179 procedure RemoveIconesMortos;
179 180 procedure ChecaCONFIGS;
180 181 procedure CriaFormSenha(Sender: TObject);
... ... @@ -257,6 +258,9 @@ type
257 258 procedure timerNuIntervaloTimer(Sender: TObject);
258 259 procedure ApplicationEvents1Message(var Msg: tagMSG;
259 260 var Handled: Boolean);
  261 + procedure InvocaMapa1Click(Sender: TObject);
  262 + procedure ExecutarMapa1DrawItem(Sender: TObject; ACanvas: TCanvas;
  263 + ARect: TRect; Selected: Boolean);
260 264 private
261 265 FUsb : TUsbClass;
262 266 ShutdownEmExecucao : Boolean;
... ... @@ -1218,6 +1222,11 @@ begin
1218 1222 End;
1219 1223 end;
1220 1224  
  1225 +procedure TFormularioGeral.InvocaMapa1Click(Sender: TObject);
  1226 +begin
  1227 + Invoca_MapaCacic;
  1228 +end;
  1229 +
1221 1230 ////////////////////////////////////////////////////////////////////////////////
1222 1231 // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
1223 1232 ////////////////////////////////////////////////////////////////////////////////
... ... @@ -1227,13 +1236,13 @@ begin
1227 1236 if ActualActivity = 0 then
1228 1237 Begin
1229 1238 // Caso exista o Mapa Cacic será verificada a versão e excluída caso antiga(Uma forma de ação pró-ativa)
1230   - if FileExists(objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe') then
  1239 + if FileExists(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe') then
1231 1240 Begin
1232 1241 ChecaCONFIGS;
1233 1242  
1234 1243 timerNuExecApos.Enabled := False;
1235 1244 objCACIC.writeDebugLog('Invoca_MapaCacic: Criando Processo Mapa => "'+objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe');
1236   - objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\MapaCACIC.exe',true,SW_SHOW);
  1245 + objCACIC.createOneProcess(objCACIC.getLocalFolderName + 'Modules\mapacacic.exe',true,SW_SHOW);
1237 1246 g_intStatus := 1;
1238 1247 objCacic.setBoolCipher(not objCacic.isInDebugMode);
1239 1248 End
... ... @@ -1276,9 +1285,10 @@ begin
1276 1285 ////////////////////////////////////////////////////////////////////////////////
1277 1286 // CRIADO PARA TESTAR A CHAMADA DO MAPA CACIC //
1278 1287 ////////////////////////////////////////////////////////////////////////////////
1279   -// if trim(objCACIC.getValueFromFile('Configs','Patrimonio_exe',
1280   -// strGerColsInfFileName))<>'s' then
1281   -// Invoca_MapaCacic;
  1288 + if trim(objCACIC.getValueFromFile('Configs','col_patr_exe',
  1289 + strGerColsInfFileName))<>'s' then begin
  1290 + Invoca_MapaCacic;
  1291 + end;
1282 1292 // AGUARDANDO CONFIGURAÇÃO DO GERENTE, SENDO INVOCADO NA INSTALAÇÃO, ATÉ O MOMENTO.
1283 1293 ////////////////////////////// FIM /////////////////////////////////////////////
1284 1294  
... ... @@ -1418,6 +1428,20 @@ begin
1418 1428 objCACIC.writeDebugLog('ExecutaCACIC: ' + DupeString('=',100));
1419 1429 end;
1420 1430  
  1431 +procedure TFormularioGeral.ExecutarMapa1DrawItem(Sender: TObject;
  1432 + ACanvas: TCanvas; ARect: TRect; Selected: Boolean);
  1433 +begin
  1434 + if Selected then
  1435 + ACanvas.Brush.Color := clHighlight
  1436 + else
  1437 + ACanvas.Brush.Color := clMenu;
  1438 +
  1439 + ARect.Left := LEFT_MENU_ITEM;
  1440 + ACanvas.FillRect(ARect);
  1441 +
  1442 + DrawText(ACanvas.Handle, PChar('Executar Mapa'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
  1443 +end;
  1444 +
1421 1445 procedure TFormularioGeral.ExibirLogAtividades(Sender: TObject);
1422 1446 begin
1423 1447 Application.CreateForm(tformLog,formLog);
... ...