From 3a680ab99679fe3cd28c36f628000695039fe5ea Mon Sep 17 00:00:00 2001
From: Slawek Mikula <slawek.mikula@gmail.com>
Date: Sat, 6 Oct 2018 12:01:31 +0200
Subject: [PATCH] - vfrtable - added info from current route manager -
 vfrstarter - added links to radios and ATC freq search - vfrmap - added info
 from current WP + wind direction/speed

---
 gui/vfrmap.xml     | 42 +++++++++++++++++++++++++++++++
 gui/vfrstarter.xml | 28 +++++++++++++++++----
 gui/vfrtable.xml   | 63 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/gui/vfrmap.xml b/gui/vfrmap.xml
index 49913f0..ba7a502 100644
--- a/gui/vfrmap.xml
+++ b/gui/vfrmap.xml
@@ -4,6 +4,7 @@
     <name>vfrmap</name>
     <layout>vbox</layout>
     <resizable>true</resizable>
+    <modal>false</modal>
     <x>5</x>
     <y>5</y>
     <default-padding>3</default-padding>
@@ -134,4 +135,45 @@
         </group>
 
     </group>
+
+    <group>
+        <layout>hbox</layout>
+        <default-padding>2</default-padding>
+        <text>
+            <label>MMMMM</label>
+            <format>%s</format>
+            <property>/autopilot/route-manager/wp[0]/id</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMM</label>
+            <format>B %.0f</format>
+            <property>/autopilot/route-manager/wp[0]/true-bearing-deg</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMM</label>
+            <format>D %.2f nm</format>
+            <property>/autopilot/route-manager/wp[0]/dist</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMM</label>
+            <format>ETA %s</format>
+            <property>/autopilot/route-manager/wp[0]/eta</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMM</label>
+            <format>WB %.0f</format>
+            <property>/environment/wind-from-heading-deg</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMM</label>
+            <format>WS %.0f</format>
+            <property>/environment/wind-speed-kt</property>
+            <live>true</live>
+        </text>
+    </group>
 </PropertyList>
diff --git a/gui/vfrstarter.xml b/gui/vfrstarter.xml
index 0910d34..219a0bd 100644
--- a/gui/vfrstarter.xml
+++ b/gui/vfrstarter.xml
@@ -21,7 +21,6 @@
             <pref-width>27</pref-width>
             <pref-height>22</pref-height>
             <legend>MP</legend>
-            <keynum>27</keynum>
             <border>2</border>
 
             <binding>
@@ -34,7 +33,6 @@
             <pref-width>27</pref-width>
             <pref-height>22</pref-height>
             <legend>PL</legend>
-            <keynum>27</keynum>
             <border>2</border>
 
             <binding>
@@ -47,7 +45,6 @@
             <pref-width>27</pref-width>
             <pref-height>22</pref-height>
             <legend>SW</legend>
-            <keynum>27</keynum>
             <border>2</border>
 
             <binding>
@@ -56,11 +53,33 @@
             </binding>
         </button>
 
+        <button>
+            <pref-width>27</pref-width>
+            <pref-height>22</pref-height>
+            <legend>R</legend>
+            <border>2</border>
+
+            <binding>
+                <command>dialog-show</command>
+                <dialog-name>radios</dialog-name>
+            </binding>
+        </button>
+
+        <button>
+            <pref-width>27</pref-width>
+            <pref-height>22</pref-height>
+            <legend>A</legend>
+            <border>2</border>
+
+            <binding>
+				<command>ATC-freq-search</command>
+			</binding>
+        </button>
+
         <button>
             <pref-width>27</pref-width>
             <pref-height>22</pref-height>
             <legend>RM</legend>
-            <keynum>27</keynum>
             <border>2</border>
 
             <binding>
@@ -75,7 +94,6 @@
             <pref-width>22</pref-width>
             <pref-height>22</pref-height>
             <legend>X</legend>
-            <keynum>27</keynum>
             <border>2</border>
 
             <binding>
diff --git a/gui/vfrtable.xml b/gui/vfrtable.xml
index 8baabdc..54cba5a 100644
--- a/gui/vfrtable.xml
+++ b/gui/vfrtable.xml
@@ -1,9 +1,68 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <PropertyList>
     <name>vfrtable</name>
     <layout>vbox</layout>
     <resizable>true</resizable>
+    <x>5</x>
+    <y>-5</y>
     <default-padding>3</default-padding>
 
+    <color>
+        <alpha type="float">0.7</alpha>
+    </color>
+
+    <group>
+        <layout>hbox</layout>
+        <default-padding>2</default-padding>
+        <text>
+            <label>MMMMMMMMMMMMMMMM</label>
+            <format>Target: %s</format>
+            <property>/autopilot/route-manager/wp[0]/id</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMMMMMM</label>
+            <format>Dist: %.2f nm</format>
+            <property>/autopilot/route-manager/wp[0]/dist</property>
+            <live>true</live>
+        </text>
+        <text>
+            <label>MMMMMMMMM</label>
+            <format>ETA: %s</format>
+            <property>/autopilot/route-manager/wp[0]/eta</property>
+            <live>true</live>
+        </text>
+
+        <empty><stretch>1</stretch></empty>
+
+        <button>
+            <pref-width>22</pref-width>
+            <pref-height>22</pref-height>
+            <legend>X</legend>
+            <border>2</border>
+
+            <binding>
+                <command>dialog-close</command>
+            </binding>
+        </button>
+    </group>
+    <group>
+        <layout>hbox</layout>
+        <default-padding>2</default-padding>
+        <stretch>true</stretch>
+        <halign>fill</halign>
+        <valign>fill</valign>
+        <waypointlist>
+            <name>list</name>
+            <halign>fill</halign>
+            <valign>fill</valign>
+            <stretch>true</stretch>
+            <pref-height>150</pref-height>
+            <property>/sim/gui/dialogs/route-manager/selection</property>
+            <binding>
+                <command>dialog-apply</command>
+                <object-name>list</object-name>
+            </binding>
+        </waypointlist>
+    </group>
 </PropertyList>