From 3080d1479fb17ffd2e8987a6f8124af8a6bb49de Mon Sep 17 00:00:00 2001 From: rra Date: Tue, 13 Oct 2020 17:44:06 +0200 Subject: [PATCH] quick sketch of how it could work in a single window --- dropship/dropship.py | 14 +- dropship/ui/dropship_tabless.ui | 261 ++++++++++++++++++++++++++++++++ 2 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 dropship/ui/dropship_tabless.ui diff --git a/dropship/dropship.py b/dropship/dropship.py index 9740b8f..ca949e7 100644 --- a/dropship/dropship.py +++ b/dropship/dropship.py @@ -23,7 +23,7 @@ class DropShip: def __init__(self, nursery): """Object initialisation.""" - self.GLADE_FILE = f"{UI_DIR}/dropship.ui" + self.GLADE_FILE = f"{UI_DIR}/dropship_tabless.ui" self.CSS_FILE = f"{UI_DIR}/dropship.css" self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -80,6 +80,16 @@ class DropShip: "Cancel", Gtk.ResponseType.CANCEL, "Add", Gtk.ResponseType.OK ) + #sendReceiveStack + self.sendReceiveStack = self.builder.get_object("sendReceiveStack") + + #drag and drop in pending view + self.pendingdrop_box = self.builder.get_object("pendingDragDrop") + self.pendingdrop_box.drag_dest_set( + Gtk.DestDefaults.ALL, [self.enforce_target], Gdk.DragAction.COPY + ) + self.pendingdrop_box.connect("drag-data-received", self.on_drop) + # Receive UI # Code entry box self.recv_box = self.builder.get_object("receiveBoxCodeEntry") @@ -147,6 +157,8 @@ class DropShip: self._create_pending_transfer(fpath, code, scope) self.clipboard.set_text(code, -1) self._send_spinner_off(code) + pending_view = self.sendReceiveStack.get_child_by_name('Pending') + self.sendReceiveStack.set_visible_child(pending_view) log.info(f"send: successfully initiated transfer send ({code})") async def receive(self, code): diff --git a/dropship/ui/dropship_tabless.ui b/dropship/ui/dropship_tabless.ui new file mode 100644 index 0000000..82c616f --- /dev/null +++ b/dropship/ui/dropship_tabless.ui @@ -0,0 +1,261 @@ + + + + + + False + False + 250 + 250 + + + True + False + crossfade + + + True + False + + + + True + False + 16 + 16 + 16 + 16 + 16 + 16 + vertical + + + True + False + center + Drag a file +drop it here +..and ship it + + + True + True + 0 + + + + + False + + + False + False + 1 + + + + + + + + dragAndDrop + Send + + + + + True + False + vertical + True + + + + + + True + True + 16 + 16 + gtk-paste + Transfer Code + + + False + False + 1 + + + + + + + + receiveView + Receive + 1 + + + + + True + False + + + True + False + 16 + 16 + 16 + 16 + vertical + + + True + False + 6 + 6 + 6 + 6 + + + True + False + center + Drag a file to send + + + True + True + 0 + + + + + True + False + vertical + + + True + True + gtk-paste + Transfer Code + + + False + False + 0 + + + + + + + + False + True + 2 + + + + + False + True + 0 + + + + + True + True + 6 + 6 + 6 + never + in + + + True + False + + + True + False + + + + + + + True + True + 1 + + + + + + + + Pending + Pending + 2 + + + + + + + True + False + True + + + + + + + + False + Choose files to ship + dialog + mainWindow + True + True + + + False + vertical + 2 + + + False + end + + + + + + + + + False + False + 0 + + + + + + + + + + + +