From 431f5456f30291d40a6afa9a4c3ec8b18afff8ca Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Wed, 7 Oct 2020 18:12:18 +0200
Subject: [PATCH 1/9] add labels and types

---
 dropship.glade          |  2 +-
 pendingTransmissions.ui | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dropship.glade b/dropship.glade
index 8d00b0b..be802e1 100644
--- a/dropship.glade
+++ b/dropship.glade
@@ -111,7 +111,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="pendingBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="margin_left">16</property>
diff --git a/pendingTransmissions.ui b/pendingTransmissions.ui
index f7b98cc..11b5e80 100644
--- a/pendingTransmissions.ui
+++ b/pendingTransmissions.ui
@@ -2,13 +2,15 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-no</property>
+    <property name="icon_size">3</property>
+  </object>
   <template class="PendingTransmission" parent="GtkBox">
     <property name="name">pendingTransmission</property>
     <property name="can_focus">False</property>
-    <property name="decorated">False</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -119,12 +121,11 @@
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
     </child>
   </template>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-no</property>
-    <property name="icon_size">3</property>
-  </object>
 </interface>

From 3b8fb6603223acad5578c9083c9bb2a0db9cd485 Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Wed, 7 Oct 2020 18:13:46 +0200
Subject: [PATCH 2/9] try to add templates but ughhhh

---
 dropship.py | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/dropship.py b/dropship.py
index e726e2e..c51f057 100644
--- a/dropship.py
+++ b/dropship.py
@@ -92,13 +92,20 @@ class DropShip:
         self.recv_box = self.builder.get_object("receiveBoxCodeEntry")
         self.recv_box.connect("activate", self.on_recv)
 
+        # Pending Transmissions UI
+        self.pending_box = self.builder.get_object("pendingBox")
+        self.transfer_code = ''
+
     def on_drop(self, widget, drag_context, x, y, data, info, time):
         """Handler for file dropping."""
         files = data.get_uris()
         self.files_to_send = files
         if len(files) == 1:
             fpath = files[0].replace("file://", "")
+            status = pendingTransmissions(fpath, self.transfer_code)
+            self.pending_box.add(status, True, True, 0)
             self.nursery.start_soon(self.wormhole_send, fpath)
+
         else:
             log.info("Multiple file sending coming soon ™")
 
@@ -127,9 +134,9 @@ class DropShip:
         self.drop_spinner.start()
 
         output = await process.stderr.receive_some()
-        code = output.decode().split()[-1]
+        self.transfer_code = output.decode().split()[-1]
 
-        self.drop_label.set_text(code)
+        self.drop_label.set_text(self.transfer_code)
         self.drop_label.set_visible(True)
         self.drop_label.set_selectable(True)
 
@@ -144,6 +151,23 @@ class DropShip:
         command = ["wormhole", "receive", "--accept-file", code]
         await trio.run_process(command, stderr=PIPE)
 
+@gtk.Template.from_file('pendingTransmissions.ui')
+class pendingTransmissions(gtk.Box):
+    __gtype_name__ = 'PendingTransmission'
+
+
+fileNameLabel           = gtk.Template.Child('fileNameLabel')
+fileNameMetadata        = gtk.Template.Child('fileNameMetadata')
+transmissionCodeButton  = gtk.Template.Child('transmissionCodeButton')
+cancelTransmission      = gtk.Template.Child('cancelTransmission')
+
+def __init__(self, widget, fileName, transferCode):
+    super(Gtk.Box, self).__init__()
+
+    self.init_template()
+
+    self.fileNameLabel.set_text(fileName)
+    self.transmissionCodeButton.set_label(transferCode)
 
 async def main():
     """Trio main entrypoint."""

From 6ed2310537450db837dea7942b7a7c74b6f9835e Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Fri, 9 Oct 2020 18:08:17 +0200
Subject: [PATCH 3/9] add ui templates for pending transmissions

---
 pendingTransmissions.ui | 16 +++++++++++++---
 ui_templates.py         | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 ui_templates.py

diff --git a/pendingTransmissions.ui b/pendingTransmissions.ui
index 11b5e80..9cb951f 100644
--- a/pendingTransmissions.ui
+++ b/pendingTransmissions.ui
@@ -10,11 +10,15 @@
   </object>
   <template class="PendingTransmission" parent="GtkBox">
     <property name="name">pendingTransmission</property>
+    <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="valign">start</property>
+    <property name="hexpand">True</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
         <child>
           <object class="GtkImage">
             <property name="width_request">50</property>
@@ -36,6 +40,7 @@
             <property name="can_focus">False</property>
             <property name="margin_top">6</property>
             <property name="margin_bottom">6</property>
+            <property name="hexpand">True</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
@@ -44,10 +49,12 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="fileNameLabel">
+                    <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">screenshot_01-292.jpg</property>
-                    <property name="ellipsize">end</property>
+                    <property name="halign">start</property>
+                    <property name="label" translatable="yes">screenshot_lkashdflasjdjasödjlkasjdlaskdlkashd01-292.jpg</property>
+                    <property name="ellipsize">middle</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="scale" value="1.2"/>
@@ -63,6 +70,7 @@
                   <object class="GtkLabel" id="fileNameMetadata">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="halign">start</property>
                     <property name="label" translatable="yes">336 KB</property>
                   </object>
                   <packing>
@@ -84,8 +92,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="margin_top">6</property>
+                <signal name="clicked" handler="transfer_button_click" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -110,6 +119,7 @@
             <property name="margin_top">16</property>
             <property name="margin_bottom">16</property>
             <property name="image">image1</property>
+            <signal name="clicked" handler="cancel_transfer" swapped="no"/>
             <style>
               <class name="circular"/>
             </style>
diff --git a/ui_templates.py b/ui_templates.py
new file mode 100644
index 0000000..33ffb3e
--- /dev/null
+++ b/ui_templates.py
@@ -0,0 +1,40 @@
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk, GLib, Gdk
+
+@Gtk.Template.from_file('pendingTransmissions.ui')
+class pendingTransmissions(Gtk.Box):
+    __gtype_name__ = 'PendingTransmission'
+
+    fileNameLabel           = Gtk.Template.Child()
+    fileNameMetadata        = Gtk.Template.Child()
+    transmissionCodeButton  = Gtk.Template.Child()
+    cancelTransmission      = Gtk.Template.Child()
+
+    def __init__(self, parent, fileName, transferCode):
+        super(Gtk.Box, self).__init__()
+        #Gtk.Frame.__init__(self)    
+        # This must occur *after* you initialize your base
+        self.init_template()
+        #TODO (Roel)
+        self.fileNameLabel.set_ellipsize(2)  
+        self.fileNameLabel.set_text(fileName)
+
+        self.transmissionCodeButton.set_label(transferCode)
+
+    @Gtk.Template.Callback()
+    def transfer_button_click(self,widget):
+        '''
+        what to do when we press the button:
+        copy the code again to clipboard
+        '''
+        print('click')
+
+    @Gtk.Template.Callback()
+    def cancel_transfer(self,widget):
+        '''
+        cancel the transfer
+        destroy thread
+        remove the object from the list
+        '''
+        print('poof!')
\ No newline at end of file

From ce89f0f463a8f329d2eb6c9de5b64ed5473d10b1 Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Fri, 9 Oct 2020 18:08:51 +0200
Subject: [PATCH 4/9] implement ui template, change librarynames gtk to Gtk etc

---
 dropship.py | 66 +++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 40 deletions(-)

diff --git a/dropship.py b/dropship.py
index c51f057..9d32998 100644
--- a/dropship.py
+++ b/dropship.py
@@ -12,9 +12,11 @@ import trio_gtk
 gi.require_version("Gtk", "3.0")
 gi.require_version("Gdk", "3.0")
 
-from gi.repository import Gdk as gdk
-from gi.repository import GLib as glib
-from gi.repository import Gtk as gtk
+from gi.repository import Gdk
+from gi.repository import GLib
+from gi.repository import Gtk
+
+from ui_templates import pendingTransmissions
 
 logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO"))
 
@@ -30,7 +32,7 @@ class DropShip:
         self.CSS_FILE = "dropship.css"
         self.DOWNLOAD_DIR = os.path.expanduser("~")
 
-        self.clipboard = gtk.Clipboard.get(gdk.SELECTION_CLIPBOARD)
+        self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
         self.nursery = nursery
 
         self.init_glade()
@@ -40,42 +42,39 @@ class DropShip:
 
     def init_glade(self):
         """Initialise the GUI from Glade file."""
-        self.builder = gtk.Builder()
+        self.builder = Gtk.Builder()
         self.builder.add_from_file(self.GLADE_FILE)
         self.builder.connect_signals(self)
 
     def init_css(self):
         """Initialise CSS injection."""
-        self.screen = gdk.Screen.get_default()
-        self.provider = gtk.CssProvider()
+        self.screen = Gdk.Screen.get_default()
+        self.provider = Gtk.CssProvider()
         self.provider.load_from_path(self.CSS_FILE)
-        gtk.StyleContext.add_provider_for_screen(
-            self.screen, self.provider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+        Gtk.StyleContext.add_provider_for_screen(
+            self.screen, self.provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
         )
 
     def init_window(self):
         """Initialise the Main GUI window."""
         self.main_window_id = "mainWindow"
         self.window = self.builder.get_object(self.main_window_id)
-        self.window.connect("delete-event", gtk.main_quit)
+        self.window.connect("delete-event", Gtk.main_quit)
         self.window.show()
 
     def init_ui_elements(self):
         """Initialize the UI elements."""
 
-        # TODO (rra) find out how to use composite templates
-        # https://github.com/sebp/PyGObject-Tutorial/issues/149
-
         # Send UI
         # Drag & Drop Box
         self.files_to_send = ""
-        self.enforce_target = gtk.TargetEntry.new(
-            "text/uri-list", gtk.TargetFlags(4), 129
+        self.enforce_target = Gtk.TargetEntry.new(
+            "text/uri-list", Gtk.TargetFlags(4), 129
         )
 
         self.drop_box = self.builder.get_object("dropBox")
         self.drop_box.drag_dest_set(
-            gtk.DestDefaults.ALL, [self.enforce_target], gdk.DragAction.COPY
+            Gtk.DestDefaults.ALL, [self.enforce_target], Gdk.DragAction.COPY
         )
         self.drop_box.connect("drag-data-received", self.on_drop)
         self.drop_label = self.builder.get_object("dropLabel")
@@ -84,7 +83,7 @@ class DropShip:
         # File chooser
         self.file_chooser = self.builder.get_object("filePicker")
         self.file_chooser.add_buttons(
-            "Cancel", gtk.ResponseType.CANCEL, "Add", gtk.ResponseType.OK
+            "Cancel", Gtk.ResponseType.CANCEL, "Add", Gtk.ResponseType.OK
         )
 
         # Receive UI
@@ -96,16 +95,20 @@ class DropShip:
         self.pending_box = self.builder.get_object("pendingBox")
         self.transfer_code = ''
 
+
     def on_drop(self, widget, drag_context, x, y, data, info, time):
         """Handler for file dropping."""
         files = data.get_uris()
         self.files_to_send = files
         if len(files) == 1:
             fpath = files[0].replace("file://", "")
-            status = pendingTransmissions(fpath, self.transfer_code)
-            self.pending_box.add(status, True, True, 0)
+            # TODO Luke can u make a callback that spawns pendingTransmissions after we got a code?
             self.nursery.start_soon(self.wormhole_send, fpath)
 
+            # TODO Roel/Luke, move this somewhere logical in its own function?
+            status = pendingTransmissions(self, fpath.split('/')[-1], self.transfer_code)
+            self.pending_box.add(status)
+
         else:
             log.info("Multiple file sending coming soon ™")
 
@@ -116,7 +119,7 @@ class DropShip:
     def add_files(self, widget, event):
         """Handler for adding files with system interface"""
         response = self.file_chooser.run()
-        if response == gtk.ResponseType.OK:
+        if response == Gtk.ResponseType.OK:
             fpath = self.file_chooser.get_filenames()[0]
             self.nursery.start_soon(self.wormhole_send, fpath)
         self.file_chooser.hide()
@@ -134,9 +137,10 @@ class DropShip:
         self.drop_spinner.start()
 
         output = await process.stderr.receive_some()
-        self.transfer_code = output.decode().split()[-1]
+        code = output.decode().split()[-1]
+        self.transfer_code = code  
 
-        self.drop_label.set_text(self.transfer_code)
+        self.drop_label.set_text(code)
         self.drop_label.set_visible(True)
         self.drop_label.set_selectable(True)
 
@@ -151,24 +155,6 @@ class DropShip:
         command = ["wormhole", "receive", "--accept-file", code]
         await trio.run_process(command, stderr=PIPE)
 
-@gtk.Template.from_file('pendingTransmissions.ui')
-class pendingTransmissions(gtk.Box):
-    __gtype_name__ = 'PendingTransmission'
-
-
-fileNameLabel           = gtk.Template.Child('fileNameLabel')
-fileNameMetadata        = gtk.Template.Child('fileNameMetadata')
-transmissionCodeButton  = gtk.Template.Child('transmissionCodeButton')
-cancelTransmission      = gtk.Template.Child('cancelTransmission')
-
-def __init__(self, widget, fileName, transferCode):
-    super(Gtk.Box, self).__init__()
-
-    self.init_template()
-
-    self.fileNameLabel.set_text(fileName)
-    self.transmissionCodeButton.set_label(transferCode)
-
 async def main():
     """Trio main entrypoint."""
     async with trio.open_nursery() as nursery:

From 46761036ccc6f7cf615fe46bd2b2337b6cf4c131 Mon Sep 17 00:00:00 2001
From: rra <rscmbbn@riseup.net>
Date: Sat, 10 Oct 2020 18:36:59 +0200
Subject: [PATCH 5/9] status icon & button are now stacks, properly ellipsize
 label, tweak layout

---
 dropship.glade          |  42 +++++++--------
 pendingTransmissions.ui | 113 ++++++++++++++++++++++++++++++----------
 2 files changed, 107 insertions(+), 48 deletions(-)

diff --git a/dropship.glade b/dropship.glade
index be802e1..b282ff1 100644
--- a/dropship.glade
+++ b/dropship.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkApplicationWindow" id="mainWindow">
@@ -7,21 +7,6 @@
     <property name="resizable">False</property>
     <property name="default_width">250</property>
     <property name="default_height">250</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkStackSwitcher">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="stack">sendReceiveStack</property>
-          </object>
-        </child>
-      </object>
-    </child>
     <child>
       <object class="GtkStack" id="sendReceiveStack">
         <property name="visible">True</property>
@@ -114,8 +99,8 @@
           <object class="GtkBox" id="pendingBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">16</property>
-            <property name="margin_right">16</property>
+            <property name="margin_start">16</property>
+            <property name="margin_end">16</property>
             <property name="margin_top">16</property>
             <property name="margin_bottom">16</property>
             <property name="orientation">vertical</property>
@@ -131,6 +116,21 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkStackSwitcher">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">10</property>
+            <property name="stack">sendReceiveStack</property>
+          </object>
+        </child>
+      </object>
+    </child>
   </object>
   <object class="GtkFileChooserDialog" id="filePicker">
     <property name="can_focus">False</property>
@@ -139,9 +139,6 @@
     <property name="transient_for">mainWindow</property>
     <property name="has_resize_grip">True</property>
     <property name="select_multiple">True</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="can_focus">False</property>
@@ -169,5 +166,8 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/pendingTransmissions.ui b/pendingTransmissions.ui
index 9cb951f..6ea4408 100644
--- a/pendingTransmissions.ui
+++ b/pendingTransmissions.ui
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-no</property>
-    <property name="icon_size">3</property>
-  </object>
   <template class="PendingTransmission" parent="GtkBox">
     <property name="name">pendingTransmission</property>
     <property name="visible">True</property>
@@ -20,13 +14,41 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <child>
-          <object class="GtkImage">
-            <property name="width_request">50</property>
-            <property name="height_request">50</property>
+          <object class="GtkStack" id="transferStatusStack">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-network</property>
-            <property name="icon_size">6</property>
+            <property name="margin_start">6</property>
+            <property name="margin_end">12</property>
+            <child>
+              <object class="GtkImage">
+                <property name="width_request">30</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">network-transmit</property>
+                <property name="icon_size">5</property>
+              </object>
+              <packing>
+                <property name="name">page0</property>
+                <property name="title" translatable="yes">page0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">dialog-ok</property>
+                <property name="icon_size">5</property>
+              </object>
+              <packing>
+                <property name="name">page1</property>
+                <property name="title" translatable="yes">page1</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -49,15 +71,15 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="fileNameLabel">
-                    <property name="width_request">70</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">screenshot_lkashdflasjdjasödjlkasjdlaskdlkashd01-292.jpg</property>
                     <property name="ellipsize">middle</property>
+                    <property name="max_width_chars">20</property>
+                    <property name="track_visited_links">False</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
-                      <attribute name="scale" value="1.2"/>
                     </attributes>
                   </object>
                   <packing>
@@ -92,7 +114,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">start</property>
+                <property name="halign">center</property>
                 <property name="margin_top">6</property>
                 <signal name="clicked" handler="transfer_button_click" swapped="no"/>
               </object>
@@ -110,19 +132,50 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="cancelTransmission">
+          <object class="GtkStack" id="statusButtonsStack">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="margin_top">16</property>
-            <property name="margin_bottom">16</property>
-            <property name="image">image1</property>
-            <signal name="clicked" handler="cancel_transfer" swapped="no"/>
-            <style>
-              <class name="circular"/>
-            </style>
+            <property name="can_focus">False</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">6</property>
+            <property name="hhomogeneous">False</property>
+            <property name="transition_type">crossfade</property>
+            <child>
+              <object class="GtkButton" id="cancelTransmission">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin_top">16</property>
+                <property name="margin_bottom">16</property>
+                <property name="image">image1</property>
+                <signal name="clicked" handler="cancel_transfer" swapped="no"/>
+                <style>
+                  <class name="circular"/>
+                </style>
+              </object>
+              <packing>
+                <property name="name">page0</property>
+                <property name="title" translatable="yes">page0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="label" translatable="yes">button</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin_top">16</property>
+                <property name="margin_bottom">16</property>
+              </object>
+              <packing>
+                <property name="name">page1</property>
+                <property name="title" translatable="yes">page1</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -138,4 +191,10 @@
       </packing>
     </child>
   </template>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-no</property>
+    <property name="icon_size">3</property>
+  </object>
 </interface>

From d98ea0de8a72f0b809b3b12388440ec26da0150d Mon Sep 17 00:00:00 2001
From: rra <rscmbbn@riseup.net>
Date: Sat, 10 Oct 2020 18:37:17 +0200
Subject: [PATCH 6/9] copy code to clipboard automagically

---
 dropship.py     | 2 ++
 ui_templates.py | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dropship.py b/dropship.py
index 9d32998..7c867d7 100644
--- a/dropship.py
+++ b/dropship.py
@@ -138,6 +138,8 @@ class DropShip:
 
         output = await process.stderr.receive_some()
         code = output.decode().split()[-1]
+
+        self.clipboard.set_text(code, -1)
         self.transfer_code = code  
 
         self.drop_label.set_text(code)
diff --git a/ui_templates.py b/ui_templates.py
index 33ffb3e..4302606 100644
--- a/ui_templates.py
+++ b/ui_templates.py
@@ -17,9 +17,8 @@ class pendingTransmissions(Gtk.Box):
         # This must occur *after* you initialize your base
         self.init_template()
         #TODO (Roel)
-        self.fileNameLabel.set_ellipsize(2)  
-        self.fileNameLabel.set_text(fileName)
 
+        self.fileNameLabel.set_text(fileName)
         self.transmissionCodeButton.set_label(transferCode)
 
     @Gtk.Template.Callback()
@@ -29,6 +28,10 @@ class pendingTransmissions(Gtk.Box):
         copy the code again to clipboard
         '''
         print('click')
+        code = widget.get_label()
+
+        clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD)
+        clipboard.set_text(code, -1) #-1 is auto-size
 
     @Gtk.Template.Callback()
     def cancel_transfer(self,widget):

From 2443410f48f67ff670b7d770639abed596e89c47 Mon Sep 17 00:00:00 2001
From: rra <rscmbbn@riseup.net>
Date: Sat, 10 Oct 2020 19:41:17 +0200
Subject: [PATCH 7/9] pendingTransfers now shown in listbox

---
 dropship.py             |  10 +-
 pendingTransferRow.ui   | 227 ++++++++++++++++++++++++++++++++++++++++
 pendingTransmissions.ui | 200 -----------------------------------
 ui_templates.py         |  17 ++-
 4 files changed, 239 insertions(+), 215 deletions(-)
 create mode 100644 pendingTransferRow.ui
 delete mode 100644 pendingTransmissions.ui

diff --git a/dropship.py b/dropship.py
index 7c867d7..6a49d6b 100644
--- a/dropship.py
+++ b/dropship.py
@@ -16,7 +16,7 @@ from gi.repository import Gdk
 from gi.repository import GLib
 from gi.repository import Gtk
 
-from ui_templates import pendingTransmissions
+from ui_templates import pendingTransferRow
 
 logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO"))
 
@@ -91,8 +91,8 @@ class DropShip:
         self.recv_box = self.builder.get_object("receiveBoxCodeEntry")
         self.recv_box.connect("activate", self.on_recv)
 
-        # Pending Transmissions UI
-        self.pending_box = self.builder.get_object("pendingBox")
+        # Pending Transfers UI
+        self.pending_transfers_list = self.builder.get_object("pendingTransfersList")
         self.transfer_code = ''
 
 
@@ -106,8 +106,8 @@ class DropShip:
             self.nursery.start_soon(self.wormhole_send, fpath)
 
             # TODO Roel/Luke, move this somewhere logical in its own function?
-            status = pendingTransmissions(self, fpath.split('/')[-1], self.transfer_code)
-            self.pending_box.add(status)
+            status = pendingTransferRow(self, fpath.split('/')[-1], self.transfer_code)
+            self.pending_transfers_list.add(status)
 
         else:
             log.info("Multiple file sending coming soon ™")
diff --git a/pendingTransferRow.ui b/pendingTransferRow.ui
new file mode 100644
index 0000000..2296915
--- /dev/null
+++ b/pendingTransferRow.ui
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.36.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-no</property>
+    <property name="icon_size">3</property>
+  </object>
+  <object class="GtkListBoxRow" id="pendingTransferRow">
+    <property name="width_request">100</property>
+    <property name="height_request">80</property>
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="activatable">False</property>
+    <property name="selectable">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="name">pendingTransmission</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="valign">start</property>
+        <property name="hexpand">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_bottom">2</property>
+            <property name="hexpand">True</property>
+            <child>
+              <object class="GtkStack" id="transferStatusStack">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">12</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">12</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="width_request">30</property>
+                    <property name="height_request">30</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">network-transmit</property>
+                    <property name="icon_size">5</property>
+                  </object>
+                  <packing>
+                    <property name="name">page0</property>
+                    <property name="title" translatable="yes">page0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">dialog-ok</property>
+                    <property name="icon_size">5</property>
+                  </object>
+                  <packing>
+                    <property name="name">page1</property>
+                    <property name="title" translatable="yes">page1</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <property name="hexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="fileNameLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">screenshot_lkashdflasjdjasödjlkasjdlaskdlkashd01-292.jpg</property>
+                        <property name="ellipsize">middle</property>
+                        <property name="max_width_chars">20</property>
+                        <property name="track_visited_links">False</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="fileNameMetadata">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">336 KB</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="transferCodeButton">
+                    <property name="label" translatable="yes">5-courier-happening</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">center</property>
+                    <property name="margin_top">6</property>
+                    <signal name="clicked" handler="copy_transfer_code" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkStack" id="statusButtonsStack">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">6</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">6</property>
+                <property name="hhomogeneous">False</property>
+                <property name="transition_type">crossfade</property>
+                <child>
+                  <object class="GtkButton" id="cancelTransfer">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="margin_top">16</property>
+                    <property name="margin_bottom">16</property>
+                    <property name="image">image1</property>
+                    <signal name="clicked" handler="cancel_transfer" swapped="no"/>
+                    <style>
+                      <class name="circular"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="name">page0</property>
+                    <property name="title" translatable="yes">page0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label" translatable="yes">button</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="margin_top">16</property>
+                    <property name="margin_bottom">16</property>
+                  </object>
+                  <packing>
+                    <property name="name">page1</property>
+                    <property name="title" translatable="yes">page1</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/pendingTransmissions.ui b/pendingTransmissions.ui
deleted file mode 100644
index 6ea4408..0000000
--- a/pendingTransmissions.ui
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <template class="PendingTransmission" parent="GtkBox">
-    <property name="name">pendingTransmission</property>
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="valign">start</property>
-    <property name="hexpand">True</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <child>
-          <object class="GtkStack" id="transferStatusStack">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_start">6</property>
-            <property name="margin_end">12</property>
-            <child>
-              <object class="GtkImage">
-                <property name="width_request">30</property>
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">network-transmit</property>
-                <property name="icon_size">5</property>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title" translatable="yes">page0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">dialog-ok</property>
-                <property name="icon_size">5</property>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">page1</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">6</property>
-            <property name="margin_bottom">6</property>
-            <property name="hexpand">True</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="fileNameLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">screenshot_lkashdflasjdjasödjlkasjdlaskdlkashd01-292.jpg</property>
-                    <property name="ellipsize">middle</property>
-                    <property name="max_width_chars">20</property>
-                    <property name="track_visited_links">False</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="fileNameMetadata">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">336 KB</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="transmissionCodeButton">
-                <property name="label" translatable="yes">5-courier-happening</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="margin_top">6</property>
-                <signal name="clicked" handler="transfer_button_click" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="statusButtonsStack">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_start">12</property>
-            <property name="margin_end">6</property>
-            <property name="hhomogeneous">False</property>
-            <property name="transition_type">crossfade</property>
-            <child>
-              <object class="GtkButton" id="cancelTransmission">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin_top">16</property>
-                <property name="margin_bottom">16</property>
-                <property name="image">image1</property>
-                <signal name="clicked" handler="cancel_transfer" swapped="no"/>
-                <style>
-                  <class name="circular"/>
-                </style>
-              </object>
-              <packing>
-                <property name="name">page0</property>
-                <property name="title" translatable="yes">page0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">button</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin_top">16</property>
-                <property name="margin_bottom">16</property>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">page1</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </template>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-no</property>
-    <property name="icon_size">3</property>
-  </object>
-</interface>
diff --git a/ui_templates.py b/ui_templates.py
index 4302606..24df7e8 100644
--- a/ui_templates.py
+++ b/ui_templates.py
@@ -2,27 +2,24 @@ import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, GLib, Gdk
 
-@Gtk.Template.from_file('pendingTransmissions.ui')
-class pendingTransmissions(Gtk.Box):
-    __gtype_name__ = 'PendingTransmission'
+@Gtk.Template.from_file('pendingTransferRow.ui')
+class pendingTransferRow(Gtk.ListBoxRow):
+    __gtype_name__ = 'PendingTransferRow'
 
     fileNameLabel           = Gtk.Template.Child()
     fileNameMetadata        = Gtk.Template.Child()
-    transmissionCodeButton  = Gtk.Template.Child()
-    cancelTransmission      = Gtk.Template.Child()
+    transferCodeButton      = Gtk.Template.Child()
+    cancelTransfer          = Gtk.Template.Child()
 
     def __init__(self, parent, fileName, transferCode):
-        super(Gtk.Box, self).__init__()
-        #Gtk.Frame.__init__(self)    
-        # This must occur *after* you initialize your base
+        super(Gtk.ListBoxRow, self).__init__()
         self.init_template()
-        #TODO (Roel)
 
         self.fileNameLabel.set_text(fileName)
         self.transmissionCodeButton.set_label(transferCode)
 
     @Gtk.Template.Callback()
-    def transfer_button_click(self,widget):
+    def copy_transfer_code(self,widget):
         '''
         what to do when we press the button:
         copy the code again to clipboard

From 652668f454056b7224d0252d65a26c926ae7de54 Mon Sep 17 00:00:00 2001
From: rra <rscmbbn@riseup.net>
Date: Sat, 10 Oct 2020 19:41:31 +0200
Subject: [PATCH 8/9] add listbox

---
 dropship.glade | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dropship.glade b/dropship.glade
index b282ff1..483cc94 100644
--- a/dropship.glade
+++ b/dropship.glade
@@ -105,8 +105,19 @@
             <property name="margin_bottom">16</property>
             <property name="orientation">vertical</property>
             <child>
-              <placeholder/>
+              <object class="GtkListBox" id="pendingTransfersList">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
+            <style>
+              <class name=".pendingArea"/>
+            </style>
           </object>
           <packing>
             <property name="name">Pending</property>

From 7037060829f06ad9a92b8811c54b51f663d62efa Mon Sep 17 00:00:00 2001
From: rra <rscmbbn@riseup.net>
Date: Sun, 11 Oct 2020 09:28:27 +0200
Subject: [PATCH 9/9] WIP: use listbox to hold pending tranfers

---
 dropship.py     | 3 ++-
 ui_templates.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dropship.py b/dropship.py
index 6a49d6b..07127e0 100644
--- a/dropship.py
+++ b/dropship.py
@@ -107,7 +107,8 @@ class DropShip:
 
             # TODO Roel/Luke, move this somewhere logical in its own function?
             status = pendingTransferRow(self, fpath.split('/')[-1], self.transfer_code)
-            self.pending_transfers_list.add(status)
+            # TODO Roel, find out how to add to a listbox
+            self.pending_transfers_list.insert(status,-1) #-1 is add at bottom
 
         else:
             log.info("Multiple file sending coming soon ™")
diff --git a/ui_templates.py b/ui_templates.py
index 24df7e8..e368329 100644
--- a/ui_templates.py
+++ b/ui_templates.py
@@ -16,7 +16,7 @@ class pendingTransferRow(Gtk.ListBoxRow):
         self.init_template()
 
         self.fileNameLabel.set_text(fileName)
-        self.transmissionCodeButton.set_label(transferCode)
+        self.transferCodeButton.set_label(transferCode)
 
     @Gtk.Template.Callback()
     def copy_transfer_code(self,widget):