From 71849d926d45dbb3761d9a85f73e836154039f3d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 11 Jul 2019 16:05:41 +1000
Subject: [PATCH] Hook up synchronizing the drawings

And drop the rotate/sync button while we're there. The rotate button because
it's not hooked up anyway. The sync button because that is not how we work: we
just always listen while we're running, any drawing will "immediately" be
synched from the device.
---
 data/ui/DrawingPerspective.ui | 49 +++++++++++------------------------
 tuhigui/drawingperspective.py | 27 ++++++++++++++-----
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/data/ui/DrawingPerspective.ui b/data/ui/DrawingPerspective.ui
index 76969c0..c7943d4 100644
--- a/data/ui/DrawingPerspective.ui
+++ b/data/ui/DrawingPerspective.ui
@@ -2,11 +2,6 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="image_rotate">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">object-rotate-right</property>
-  </object>
   <template class="DrawingPerspective" parent="GtkStack">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -62,35 +57,6 @@
                 <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">image_rotate</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="btn_sync">
-                <property name="label" translatable="yes">Sync!</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="margin_left">10</property>
-                <property name="margin_right">20</property>
-                <signal name="clicked" handler="_on_sync_button_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -123,6 +89,21 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel" id="label_sync">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Press button on device to synchronize drawings</property>
+            <attributes>
+              <attribute name="size" value="20000"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="name">page0</property>
diff --git a/tuhigui/drawingperspective.py b/tuhigui/drawingperspective.py
index a6ed557..0427951 100644
--- a/tuhigui/drawingperspective.py
+++ b/tuhigui/drawingperspective.py
@@ -30,9 +30,14 @@ class DrawingPerspective(Gtk.Stack):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.known_drawings = []
 
-    def _init_drawings(self):
+    def _update_drawings(self, device, pspec):
         for ts in self.device.drawings_available:
+            if ts in self.known_drawings:
+                continue
+
+            self.known_drawings.append(ts)
             js = json.loads(self.device.json(ts))
             svg = JsonSvg(js)
             drawing = Drawing(svg)
@@ -47,6 +52,11 @@ class DrawingPerspective(Gtk.Stack):
         self._device = device
         self.label_devicename.set_text(f'{device.name} - {device.address}')
 
+        device.connect('notify::connected', self._on_connected)
+        device.connect('notify::listening', self._on_listening_stopped)
+        self.device.connect('notify::drawings-available',
+                            self._update_drawings)
+
         # icon name is something like battery-020-charging, or battery-040
         # in 20-step increments
         if device.battery_state == 1:
@@ -57,13 +67,18 @@ class DrawingPerspective(Gtk.Stack):
         batt_icon_name = f'battery-{percent}{state}'
         _, isize = self.image_battery.get_icon_name()
         self.image_battery.set_from_icon_name(batt_icon_name, isize)
-        self._init_drawings()
+        self._update_drawings(self.device, None)
+
+        # We always want to sync on startup
+        device.start_listening()
 
     @GObject.Property
     def name(self):
         return "drawing_perspective"
 
-    @Gtk.Template.Callback("_on_sync_button_clicked")
-    def _on_quit_button_clicked(self, button):
-        button.set_label('Stop')
-        print('sync now')
+    def _on_connected(self, device, pspec):
+        pass
+
+    def _on_listening_stopped(self, device, pspec):
+        # We never want to stop listening
+        device.start_listening()