CHANGE: use aprsmap via external mode.

Author: andreaspeters

src/flexpacket.lps

@@ -18,9 +18,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMain"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="15"/>
-        <TopLine Value="1528"/>
-        <CursorPos X="42" Y="1536"/>
+        <TopLine Value="1582"/>
+        <CursorPos Y="1582"/>
         <UsageCount Value="210"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -172,10 +173,9 @@
       <Unit>
         <Filename Value="upipes.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="16"/>
-        <TopLine Value="118"/>
-        <CursorPos Y="121"/>
+        <TopLine Value="16"/>
+        <CursorPos X="24" Y="21"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit>
@@ -269,34 +269,6 @@
       </Unit>
     </Units>
     <JumpHistory HistoryIndex="29">
-      <Position>
-        <Filename Value="uconvers.pas"/>
-        <Caret Line="40" TopLine="28"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="5" Column="67"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="185" Column="32" TopLine="163"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1141" Column="24" TopLine="1119"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1889" Column="41" TopLine="1879"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1922" Column="46" TopLine="1899"/>
-      </Position>
-      <Position>
-        <Filename Value="uhostmode.pas"/>
-        <Caret Line="28" Column="91" TopLine="25"/>
-      </Position>
       <Position>
         <Filename Value="ukissmode.pas"/>
         <Caret Line="100" TopLine="86"/>
@@ -373,10 +345,6 @@
         <Filename Value="umain.pas"/>
         <Caret Line="1591" Column="43" TopLine="1585"/>
       </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1705" Column="32" TopLine="1802"/>
-      </Position>
       <Position>
         <Filename Value="umain.pas"/>
         <Caret Line="1702" Column="34" TopLine="1696"/>
@@ -389,6 +357,38 @@
         <Filename Value="umain.pas"/>
         <Caret Line="640" Column="34" TopLine="627"/>
       </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="1536" Column="42" TopLine="1528"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="1072" Column="11" TopLine="1069"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="38" Column="23" TopLine="18"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="133" Column="33" TopLine="101"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="1072" Column="21" TopLine="1051"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="1697" TopLine="1674"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="1080" TopLine="1069"/>
+      </Position>
+      <Position>
+        <Filename Value="umain.pas"/>
+        <Caret Line="1165" Column="23" TopLine="1138"/>
+      </Position>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

src/i18n/flexpacket.pot

@@ -349,6 +349,7 @@ msgid "My Callsign"
 msgstr ""
 
 #: tfmain.actsetexternalmode.caption
+msgctxt "tfmain.actsetexternalmode.caption"
 msgid "Enable External Mode"
 msgstr ""
 
@@ -405,11 +406,8 @@ msgid "Send/Receive Formular Data"
 msgstr ""
 
 #: tfmain.tbmap.caption
-msgid "&APRS"
-msgstr ""
-
-#: tfmain.tbmap.hint
-msgid "Start External APRS Map"
+msgctxt "tfmain.tbmap.caption"
+msgid "Enable External Mode"
 msgstr ""
 
 #: ttfadressbook.adeleteshortcut.caption

src/umain.lfm

@@ -6,7 +6,7 @@ object FMain: TFMain
   BorderIcons = [biSystemMenu, biMinimize]
   BorderWidth = 1
   Caption = 'FlexPacket'
-  ClientHeight = 699
+  ClientHeight = 665
   ClientWidth = 1135
   DoubleBuffered = True
   Icon.Data = {
@@ -2098,10 +2098,9 @@ object FMain: TFMain
     end
     object TBMap: TToolButton
       Left = 226
-      Hint = 'Start External APRS Map'
       Top = 0
       AutoSize = True
-      Caption = '&APRS'
+      Caption = 'Enable External Mode'
       ImageIndex = 3
       ParentShowHint = False
       ShowCaption = False
@@ -2161,7 +2160,7 @@ object FMain: TFMain
     AnchorSideTop.Control = PSChannelSplitter
     Left = 1
     Height = 23
-    Top = 675
+    Top = 641
     Width = 1133
     AutoSize = False
     Font.CharSet = ANSI_CHARSET
@@ -2789,7 +2788,7 @@ object FMain: TFMain
     AnchorSideBottom.Control = SBStatus
     Cursor = crDefault
     Left = 1
-    Height = 529
+    Height = 495
     Top = 146
     Width = 1133
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -2809,7 +2808,7 @@ object FMain: TFMain
     object PSSMTx: TPairSplitterSide
       Cursor = crArrow
       Left = 0
-      Height = 224
+      Height = 190
       Top = 305
       Width = 1133
     end

src/umain.lrj

@@ -1,8 +1,7 @@
 {"version":1,"strings":[
 {"hash":224613124,"name":"tfmain.caption","sourcebytes":[70,108,101,120,80,97,99,107,101,116],"value":"FlexPacket"},
 {"hash":53766881,"name":"tfmain.tbformular.hint","sourcebytes":[83,101,110,100,47,82,101,99,101,105,118,101,32,70,111,114,109,117,108,97,114,32,68,97,116,97],"value":"Send/Receive Formular Data"},
-{"hash":170198448,"name":"tfmain.tbmap.hint","sourcebytes":[83,116,97,114,116,32,69,120,116,101,114,110,97,108,32,65,80,82,83,32,77,97,112],"value":"Start External APRS Map"},
-{"hash":2778483,"name":"tfmain.tbmap.caption","sourcebytes":[38,65,80,82,83],"value":"&APRS"},
+{"hash":258533733,"name":"tfmain.tbmap.caption","sourcebytes":[69,110,97,98,108,101,32,69,120,116,101,114,110,97,108,32,77,111,100,101],"value":"Enable External Mode"},
 {"hash":2805797,"name":"tfmain.mainmenuitemfile.caption","sourcebytes":[38,70,105,108,101],"value":"&File"},
 {"hash":213577587,"name":"tfmain.mainmenuitemsettings.caption","sourcebytes":[38,83,101,116,116,105,110,103,115],"value":"&Settings"},
 {"hash":79984933,"name":"tfmain.menuitem6.caption","sourcebytes":[69,110,97,98,108,101],"value":"Enable"},

src/umain.pas

@@ -1069,8 +1069,14 @@ procedure TFMain.actFileUploadClick(Sender: TObject);
 procedure TFMain.TBMapClick(Sender: TObject);
 var run: TProcess;
 begin
-  if not IsPipeExisting('flexpacketaprspipe') then
-    CreatePipe('flexpacketaprspipe');
+
+  actSetExternalMode.Checked := True;
+  ExternalMode := True;
+
+  if not IsPipeExisting('flexpacketwritepipe') then
+    CreatePipe('flexpacketwritepipe');
+  if not IsPipeExisting('flexpacketreadpipe') then
+  CreatePipe('flexpacketreadpipe');
 
   run := TProcess.Create(nil);
   try
@@ -1155,8 +1161,8 @@ procedure TFMain.TMainTimer(Sender: TObject);
     end;
 
     // handle aprs messages. APRS Messages can only be at the Monitoring Channel.
-    if i = 0 then
-      GetAPRSMessage(Data);
+//    if i = 0 then
+//      GetAPRSMessage(Data);
 
     // colorize text if channel is in convers mode
     if FPConfig.IsConvers[i] then