- Update to 0.9.0

5 files changed, 96 insertions, 59 deletions

diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index fe336483315c..c489da44d30f 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	picpas
-PORTVERSION=	0.8.8
+PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -23,13 +22,13 @@ DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt|lfm)
 USE_GITHUB=	yes
 GH_ACCOUNT=	t-edson
 GH_PROJECT=	PicPas
-GH_TAGNAME=	cc5d415
+GH_TAGNAME=	520e196
 GH_TUPLE=	t-edson:MiConfig:a4a988a:miconfig/miconfig \
 		t-edson:MisUtils:742eff3:misutils/misutils  \
 		t-edson:PicUtils:5f89bdf:picutils/picutils \
 		t-edson:SynFacilUtils:2909899:syncfacilutils/syncfacilutils \
 		t-edson:UtilsGrilla:07744b9:utilsgrilla/utilsgrilla \
-		t-edson:ogEditGraf:328a207:ogeditgraf/ogeeditgraf \
+		t-edson:ogEditGraf:a19b68a:ogeditgraf/ogeeditgraf \
 		t-edson:t-Xpres:6665922:txpres/txpres
 
 USE_FPC_gtk2=	cairo
diff --git a/editors/picpas/distinfo b/editors/picpas/distinfo
index 9e8e847625a1..cff08542437d 100644
--- a/editors/picpas/distinfo
+++ b/editors/picpas/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1533887981
-SHA256 (t-edson-PicPas-v0.8.8-cc5d415_GH0.tar.gz) = 8910b43c46bd81665832f38905dd1a3a08cb568980d87631f428d00055fe8430
-SIZE (t-edson-PicPas-v0.8.8-cc5d415_GH0.tar.gz) = 18508314
+TIMESTAMP = 1589399120
+SHA256 (t-edson-PicPas-v0.9.0-520e196_GH0.tar.gz) = 0c47225abbb99f397435571b8f57757f43e5a96c3b4ab3db14dd3339f78f43fd
+SIZE (t-edson-PicPas-v0.9.0-520e196_GH0.tar.gz) = 19051230
 SHA256 (t-edson-MiConfig-a4a988a_GH0.tar.gz) = de54af664dc96f510393309454fe033e822ffae9f79ed56c715691713edaa65d
 SIZE (t-edson-MiConfig-a4a988a_GH0.tar.gz) = 34117
 SHA256 (t-edson-MisUtils-742eff3_GH0.tar.gz) = 9b45ca7f6e3870f21abef8f670a54cd111b2cafae3149263399302cdccf973da
@@ -11,7 +11,7 @@ SHA256 (t-edson-SynFacilUtils-2909899_GH0.tar.gz) = 8bf153428dbfddfd63e023175551
 SIZE (t-edson-SynFacilUtils-2909899_GH0.tar.gz) = 259715
 SHA256 (t-edson-UtilsGrilla-07744b9_GH0.tar.gz) = 7f5ec2e53a9a58a296fa5d08eebbfe54e4040bf15952ff4720ae8e92d4fd3933
 SIZE (t-edson-UtilsGrilla-07744b9_GH0.tar.gz) = 49776
-SHA256 (t-edson-ogEditGraf-328a207_GH0.tar.gz) = 83971e29290a4a43b7689d2bee7e4aa2cef2843096700918c9daf0a1e9354b6f
-SIZE (t-edson-ogEditGraf-328a207_GH0.tar.gz) = 432550
+SHA256 (t-edson-ogEditGraf-a19b68a_GH0.tar.gz) = 99ca2c8c76034983fb90349db2dd73a4fee2a3b7a8ec348bd151ebc18f4ef571
+SIZE (t-edson-ogEditGraf-a19b68a_GH0.tar.gz) = 434318
 SHA256 (t-edson-t-Xpres-6665922_GH0.tar.gz) = 813c2f966b3e0a7b1fb11010877b3a22a9f4de402bf90695f0aa056e6c69b0fe
 SIZE (t-edson-t-Xpres-6665922_GH0.tar.gz) = 833095
diff --git a/editors/picpas/files/patch-Source_FramePICDiagram.pas b/editors/picpas/files/patch-Source_FramePICDiagram.pas
new file mode 100644
index 000000000000..6a0bf7519df9
--- /dev/null
+++ b/editors/picpas/files/patch-Source_FramePICDiagram.pas
@@ -0,0 +1,84 @@
+--- Source/FramePICDiagram.pas	2020-05-13 15:24:28.472849000 -0500
++++ Source/FramePICDiagram.pas	2020-05-13 15:21:41.106017000 -0500
+@@ -1135,7 +1135,7 @@
+ begin
+   nodeList.Clear;
+   //Explora objetos gráfiocs
+-  for og in motEdi.objetos do begin
++  for og in motEdi.objects do begin
+     if og is TOgConector then begin
+       ogCon := TOgConector(og);
+       AddConnectorToNodes(ogCon);
+@@ -1151,7 +1151,7 @@
+ var
+   og: TObjGraf;
+ begin
+-  for og in motEdi.objetos do begin
++  for og in motEdi.objects do begin
+     if og.Name = AName then exit(true);
+   end;
+   exit(false);
+@@ -1174,7 +1174,7 @@
+ var
+   og: TObjGraf;
+ begin
+-  for og in motEdi.objetos do begin
++  for og in motEdi.objects do begin
+     if not(og is TOgComponent) then continue;
+     if TOgComponent(og).Ref = ARef then exit(TOgComponent(og));
+   end;
+@@ -1201,7 +1201,7 @@
+   //oc: TOgConector;
+   //xv, yv: Single;
+ begin
+-  if motEdi.seleccion.Count = 1 then begin
++  if motEdi.selection.Count = 1 then begin
+     //Hay uno seleccionado
+     if motEdi.Selected.IsSelectedBy(X,Y) then begin
+       //Click sobre un objeto seleccionado
+@@ -1240,7 +1240,7 @@
+ var
+   LogInp: TOgLogicState;
+ begin
+-  if motEdi.seleccion.Count = 1 then begin
++  if motEdi.selection.Count = 1 then begin
+     //Hay un componente seleccionado
+     if motEdi.Selected.IsSelectedBy(X,Y) then begin
+       if motEdi.Selected is TOgLogicState then begin
+@@ -1267,15 +1267,15 @@
+   pCnx, pCnx2: TPtoConx;
+ begin
+   //Verifica el estado para activar acciones
+-  acGenDelObject.Visible := motEdi.seleccion.Count>0;
+-  if motEdi.seleccion.Count = 0 then begin
++  acGenDelObject.Visible := motEdi.selection.Count>0;
++  if motEdi.selection.Count = 0 then begin
+     //Ninguno seleccionado
+     mnReset.Visible   := true;
+     mnRun.Visible     := true;
+     mnStepOver.Visible:= false;
+     //mnAddLogicTog.Visible := true;
+     VisibActionsAdd(true);
+-  end else if (motEdi.seleccion.Count = 1) and (motEdi.Selected is TOgComponent) then begin
++  end else if (motEdi.selection.Count = 1) and (motEdi.Selected is TOgComponent) then begin
+     //Hay un componente seleccionado
+     comp1 := TOgComponent(motEdi.Selected);  //Componente fuente
+     mnReset.Visible   := true;
+@@ -1308,7 +1308,7 @@
+     mnConnect.Caption := Format('Connect %s to', [pin1.lbl]);
+     //Actualiza menú de Conexión, con objetos gráficos
+     mnConnect.Clear;
+-    for og in motEdi.objetos do begin
++    for og in motEdi.objects do begin
+       if not(og is TOgComponent) then continue;
+       if og is TOgConector then continue;;
+       it := AddItemToMenu(mnConnect, og.Name, nil);
+@@ -1454,7 +1454,7 @@
+ begin
+   nodeList.Clear;
+   //Explora objetos gráfiocs
+-  for og in motEdi.objetos do begin
++  for og in motEdi.objects do begin
+     if og is TOgConector then begin
+       ogCon := TOgConector(og);
+       if ogCon.pcBEGIN.ConnectedTo = nil then begin
diff --git a/editors/picpas/files/patch-Source_PicPas.lpi b/editors/picpas/files/patch-Source_PicPas.lpi
index 07c6e6d41dc3..64eef8c2ba41 100644
--- a/editors/picpas/files/patch-Source_PicPas.lpi
+++ b/editors/picpas/files/patch-Source_PicPas.lpi
@@ -1,5 +1,5 @@
---- Source/PicPas.lpi	2018-08-10 01:23:44.189002000 -0500
-+++ Source/PicPas.lpi	2018-08-10 01:27:09.067831000 -0500
+--- Source/PicPas.lpi	2020-05-13 13:51:01.804862000 -0500
++++ Source/PicPas.lpi	2020-05-13 14:38:14.698077000 -0500
 @@ -25,7 +25,7 @@
            </Target>
            <SearchPaths>
@@ -9,11 +9,11 @@
              <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
            </SearchPaths>
            <CodeGeneration>
-@@ -300,7 +300,7 @@
+@@ -309,7 +309,7 @@
      </Target>
      <SearchPaths>
        <IncludeFiles Value="$(ProjOutDir)"/>
--      <OtherUnitFiles Value="..\..\_Librerias\SynFacilUtils-1.21;..\..\_Librerias\MisUtils-0.6;..\..\_Librerias\MiConfig-0.4;..\..\_Librerias\PicUtils-1.6;..\..\_Librerias\Xpres-1.3.2;..\..\_Librerias\UtilsGrilla-0.8;..\..\_Librerias\ogEditGraf-2.4"/>
+-      <OtherUnitFiles Value="..\..\_libraries\SynFacilUtils-1.21;..\..\_libraries\MisUtils-0.6;..\..\_libraries\MiConfig-0.4;..\..\_libraries\PicUtils-1.6;..\..\_libraries\Xpres-1.3.2;..\..\_libraries\UtilsGrilla-0.8;..\..\_libraries\ogEditGraf-2.7"/>
 +      <OtherUnitFiles Value="..\syncfacilutils;..\misutils;..\miconfig;..\picutils;..\txpres;..\utilsgrilla;..\ogeeditgraf"/>
        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
      </SearchPaths>
diff --git a/editors/picpas/files/patch-language_tra_FrameArcExplor.pas b/editors/picpas/files/patch-language_tra_FrameArcExplor.pas
deleted file mode 100644
index a47b27c91e70..000000000000
--- a/editors/picpas/files/patch-language_tra_FrameArcExplor.pas
+++ /dev/null
@@ -1,46 +0,0 @@
---- language/tra_FrameArcExplor.pas	2018-08-10 03:04:43.663098000 -0500
-+++ language/tra_FrameArcExplor.pas	2018-08-10 03:07:17.558532000 -0500
-@@ -19,33 +19,33 @@
-   TXT_DELFILE     := Trans('Delete file "%s"?', '¿Eliminar archivo "%s"?', '',
-                            ''              , ''            , '',
-                            'Supprimer fichier "%s" ?');
--  mnCarAbrirExpWin.Caption := Trans('Open on &Windows Explorer', 'Abrir en Explor. de &Windows', '',
-+  mnFolOpenInExplor.Caption := Trans('Open on &Windows Explorer', 'Abrir en Explor. de &Windows', '',
-                            ''              , ''            , '',
-                            'Ouvrir dans l''Explorateur &Windows');
--  mnCarNueArc.Caption      := Trans('&New File'               , '&Nuevo Archivo', '',
-+  mnFolNewFile.Caption      := Trans('&New File'               , '&Nuevo Archivo', '',
-                            ''              , ''            , '',
-                            '&Nouveau Fichier');
--  mnCarNueCar.Caption      := Trans('New &Folder'             , 'Nueva &Carpeta', '',
-+  mnFolNewFolder.Caption      := Trans('New &Folder'             , 'Nueva &Carpeta', '',
-                            ''              , ''            , '',
-                            'Nouveau &Répertoire');
--  mnCarCamNom.Caption      := Trans('Cha&nge Name'            , 'Ca&mbiar Nombre', '',
-+  mnFolChanName.Caption      := Trans('Cha&nge Name'            , 'Ca&mbiar Nombre', '',
-                            ''              , ''            , '',
-                            '&Renommer');
--  mnCarElimin.Caption      := Trans('&Delete'                 , 'El&iminar', '',
-+  mnFolDelete.Caption      := Trans('&Delete'                 , 'El&iminar', '',
-                            ''              , ''            , '',
-                            '&Supprimer');
--  mnCarRefrescar.Caption   := Trans('&Refresh'                , '&Refrescar', '',
-+  mnFolRefresh.Caption   := Trans('&Refresh'                , '&Refrescar', '',
-                            ''              , ''            , '',
-                            '&Rafraîchir');
--  mnArcAbrir.Caption       := Trans('&Open'                   , '&Abrir', '',
-+  mnFilOpen.Caption       := Trans('&Open'                   , '&Abrir', '',
-                            ''              , ''            , '',
-                            '&Ouvrir');
--  mnArcCamNom.Caption      := Trans('Cha&nge Name'            , 'Ca&mbiar Nombre', '',
-+  mnFilChanName.Caption      := Trans('Cha&nge Name'            , 'Ca&mbiar Nombre', '',
-                            ''              , ''            , '',
-                            '&Renommer');
--  mnArcElimin.Caption      := Trans('&Delete'                 , 'El&iminar', '',
-+  mnFilDelete.Caption      := Trans('&Delete'                 , 'El&iminar', '',
-                            ''              , ''            , '',
-                            '&Supprimer');
--  mnArcRefrescar.Caption   := Trans('&Refresh'                 , '&Refrescar', '',
-+  mnFilRefrescar.Caption   := Trans('&Refresh'                 , '&Refrescar', '',
-                            ''              , ''            , '',
-                            '&Rafraîchir');