Download as
Browse Code »

Commit 311d9b2060e626edf8579388e41881d1a5b81a4d

Authored by Edmar Moretti
1 parent 9859e9a5
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 4 changed files with 20 additions and 33 deletions   Show diff stats
classesjs/classe_barradebotoes.js
  Diff comments   View file @311d9b2
@@ -558,14 +558,6 @@ i3GEO.barraDeBotoes = { @@ -558,14 +558,6 @@ i3GEO.barraDeBotoes = {
558 if(i3GEO.barraDeBotoes.ATIVA === false){ 558 if(i3GEO.barraDeBotoes.ATIVA === false){
559 return; 559 return;
560 } 560 }
561 - //  
562 - //desativa a função de zoom por box nativa do OpenLayers  
563 - //  
564 - if(i3GEO.Interface.ATUAL==="openlayers"){  
565 - try  
566 - {i3GEO.Interface.openlayers.OLzoom.deactivate();}  
567 - catch(e){}  
568 - }  
569 var estilo,temp,ist,cor,ko; 561 var estilo,temp,ist,cor,ko;
570 this.BOTAOCLICADO = icone; 562 this.BOTAOCLICADO = icone;
571 ko = this.LISTABOTOES.length-1; 563 ko = this.LISTABOTOES.length-1;
classesjs/classe_configura.js
  Diff comments   View file @311d9b2
@@ -700,35 +700,27 @@ i3GEO.configura = { @@ -700,35 +700,27 @@ i3GEO.configura = {
700 dica:$trad("d3"), 700 dica:$trad("d3"),
701 titulo:$trad("d3t"), 701 titulo:$trad("d3t"),
702 funcaoonclick:function(){ 702 funcaoonclick:function(){
  703 + if(i3GEO.Interface.TABLET === false){
  704 + i3GEO.janela.tempoMsg($trad("x69"));
  705 + }
  706 + else{
  707 + i3GEO.janela.tempoMsg($trad("x70"));
  708 + }
703 if(i3GEO.Interface.ATUAL === "googlemaps"){ 709 if(i3GEO.Interface.ATUAL === "googlemaps"){
704 //alert("Pressione a tecla CTRL junto com o botão esquerdo do mouse"); 710 //alert("Pressione a tecla CTRL junto com o botão esquerdo do mouse");
705 - i3GEO.janela.tempoMsg($trad("x69"));  
706 g_tipoacao='pan'; 711 g_tipoacao='pan';
707 g_operacao='navega'; 712 g_operacao='navega';
708 i3GEO.barraDeBotoes.ativaIcone("pan"); 713 i3GEO.barraDeBotoes.ativaIcone("pan");
709 i3GEO.barraDeBotoes.BOTAOPADRAO = "pan"; 714 i3GEO.barraDeBotoes.BOTAOPADRAO = "pan";
710 i3GeoMap.setOptions({draggable:true}); 715 i3GeoMap.setOptions({draggable:true});
711 - i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pan",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic); 716 + i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pointer",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic);
712 return; 717 return;
713 } 718 }
714 - var temp;  
715 - temp = "zoom";  
716 - i3GEO.util.mudaCursor(i3GEO.configura.cursores,temp,i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic);  
717 - g_operacao='navega';  
718 - g_tipoacao='zoomli';  
719 - i3GEO.barraDeBotoes.ativaIcone("zoomli");  
720 - marcadorZoom = "";  
721 if(i3GEO.Interface.ATUAL==="openlayers"){ 719 if(i3GEO.Interface.ATUAL==="openlayers"){
722 - i3GEO.Interface.openlayers.OLpanel.activateControl(i3GEO.Interface.openlayers.OLzoom); 720 + i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pointer",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic);
  721 + //i3GEO.Interface.openlayers.OLpanel.activateControl(i3GEO.Interface.openlayers.OLzoom);
723 return; 722 return;
724 } 723 }
725 - if(!$i("i3geoboxZoom"))  
726 - {i3GEO.navega.zoomBox.criaBox();}  
727 - if(i3GEO.eventos.MOUSEDOWN.toString().search("i3GEO.navega.zoomBox.inicia()") < 0)  
728 - {i3GEO.eventos.MOUSEDOWN.push("i3GEO.navega.zoomBox.inicia()");}  
729 - if(i3GEO.eventos.MOUSEUP.toString().search("i3GEO.navega.zoomBox.termina()") < 0)  
730 - {i3GEO.eventos.MOUSEUP.push("i3GEO.navega.zoomBox.termina()");}  
731 - i3GEO.barraDeBotoes.BOTAOPADRAO = "zoomli";  
732 } 724 }
733 }, 725 },
734 { 726 {
@@ -740,22 +732,17 @@ i3GEO.configura = { @@ -740,22 +732,17 @@ i3GEO.configura = {
740 dica:$trad("d4"), 732 dica:$trad("d4"),
741 titulo:$trad("d4t"), 733 titulo:$trad("d4t"),
742 funcaoonclick:function(){ 734 funcaoonclick:function(){
743 - var temp;  
744 g_tipoacao='pan'; 735 g_tipoacao='pan';
745 g_operacao='navega'; 736 g_operacao='navega';
746 i3GEO.barraDeBotoes.ativaIcone("pan"); 737 i3GEO.barraDeBotoes.ativaIcone("pan");
747 i3GEO.barraDeBotoes.BOTAOPADRAO = "pan"; 738 i3GEO.barraDeBotoes.BOTAOPADRAO = "pan";
748 if(i3GEO.Interface.ATUAL === "googlemaps"){ 739 if(i3GEO.Interface.ATUAL === "googlemaps"){
749 i3GeoMap.setOptions({draggable:true}); 740 i3GeoMap.setOptions({draggable:true});
750 - i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pan",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic); 741 + i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pointer",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic);
751 return; 742 return;
752 } 743 }
753 if($i(i3GEO.Interface.IDMAPA)){ 744 if($i(i3GEO.Interface.IDMAPA)){
754 - $i(i3GEO.Interface.IDMAPA).title = "";  
755 - temp = "pan";  
756 - if(i3GEO.Interface.ATIVAMENUCONTEXTO)  
757 - {temp = "pan_contexto";}  
758 - i3GEO.util.mudaCursor(i3GEO.configura.cursores,temp,i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic); 745 + i3GEO.util.mudaCursor(i3GEO.configura.cursores,"pointer",i3GEO.Interface.IDMAPA,i3GEO.configura.locaplic);
759 } 746 }
760 marcadorZoom = ""; 747 marcadorZoom = "";
761 if(i3GEO.Interface.ATUAL==="openlayers"){ 748 if(i3GEO.Interface.ATUAL==="openlayers"){
classesjs/classe_interface.js
  Diff comments   View file @311d9b2
@@ -688,6 +688,7 @@ i3GEO.Interface = { @@ -688,6 +688,7 @@ i3GEO.Interface = {
688 // 688 //
689 if(i3GEO.Interface.TABLET === false){ 689 if(i3GEO.Interface.TABLET === false){
690 i3GEO.Interface.openlayers.OLpan = new OpenLayers.Control.Navigation(); 690 i3GEO.Interface.openlayers.OLpan = new OpenLayers.Control.Navigation();
  691 + //OpenLayers.Handler.MOD_SHIFT = OpenLayers.Handler.MOD_CTRL;
691 i3GEO.Interface.openlayers.OLzoom = new OpenLayers.Control.ZoomBox(); 692 i3GEO.Interface.openlayers.OLzoom = new OpenLayers.Control.ZoomBox();
692 i3GEO.Interface.openlayers.OLpanel = new OpenLayers.Control.Panel(); 693 i3GEO.Interface.openlayers.OLpanel = new OpenLayers.Control.Panel();
693 i3GEO.Interface.openlayers.OLpanel.addControls([i3GEO.Interface.openlayers.OLpan,i3GEO.Interface.openlayers.OLzoom]); 694 i3GEO.Interface.openlayers.OLpanel.addControls([i3GEO.Interface.openlayers.OLpan,i3GEO.Interface.openlayers.OLzoom]);
classesjs/dicionario.js
  Diff comments   View file @311d9b2
@@ -2020,7 +2020,14 @@ it:&quot;&quot; @@ -2020,7 +2020,14 @@ it:&quot;&quot;
2020 }], 2020 }],
2021 "x69":[ 2021 "x69":[
2022 { 2022 {
2023 -pt:"Pressione a tecla CTRL junto com o bot&atilde;o esquerdo do mouse e arraste para definir a &aacute;rea de zoom", 2023 +pt:"Pressione a tecla CTRL junto com o bot&atilde;o esquerdo do mouse e arraste para definir a &aacute;rea que será aproximada",
  2024 +en:"",
  2025 +es:"",
  2026 +it:""
  2027 +}],
  2028 +"x70":[
  2029 +{
  2030 +pt:"Utilize os dedos em um movimento de pin&ccedil;a para definir a &aacute;rea que ser&aacute; aproximada ou afastada",
2024 en:"", 2031 en:"",
2025 es:"", 2032 es:"",
2026 it:"" 2033 it:""