[Git][gajim/gajim][master] Add drag and drop for moving chats between workspaces - Commits

8 Dec 2021


      Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
00c68673 by wurstsalat at 2021-12-08T23:27:48+01:00
Add drag and drop for moving chats between workspaces
- - - - -
3 changed files:
- gajim/data/style/gajim.css
- gajim/gtk/chat_list.py
- gajim/gtk/workspace_side_bar.py
Changes:
=====================================
gajim/data/style/gajim.css
=====================================
@@ -230,12 +230,6 @@ .workspace-sidebar-item image {
    border-radius: 9px;
    margin: 6px;
 }
-.workspace-sidebar-item.drag-hover-top {
-    border-top: 1px solid #4e9a06;
-}
-.workspace-sidebar-item.drag-hover-bottom {
-    border-bottom: 1px solid #4e9a06;
-}
 .workspace-add:hover,
 .workspace-add:focus {
     background: transparent;
=====================================
gajim/gtk/chat_list.py
=====================================
@@ -24,6 +24,7 @@
 from gi.repository import Gdk
 from gi.repository import GLib
 from gi.repository import Gtk
+import cairo
from nbxmpp import JID
@@ -71,6 +72,16 @@ def __init__(self, workspace_id):
         self.connect('enter-notify-event', self._on_mouse_focus_changed)
         self.connect('leave-notify-event', self._on_mouse_focus_changed)
+        # Drag and Drop
+        entries = [Gtk.TargetEntry.new(
+            'CHAT_LIST_ITEM',
+            Gtk.TargetFlags.SAME_APP,
+            0)]
+        self.drag_dest_set(
+            Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP,
+            entries,
+            Gdk.DragAction.MOVE)
+
         self.register_events([
             ('account-enabled', ged.GUI2, self._on_account_changed),
             ('account-disabled', ged.GUI2, self._on_account_changed),
@@ -507,6 +518,18 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str,
         self._ui.eventbox.connect('button-press-event', self._on_button_press)
         self._ui.close_button.connect('clicked', self._on_close_button_clicked)
+        # Drag and Drop
+        entries = [Gtk.TargetEntry.new(
+            'CHAT_LIST_ITEM',
+            Gtk.TargetFlags.SAME_APP,
+            0)]
+        self._ui.eventbox.drag_source_set(
+            Gdk.ModifierType.BUTTON1_MASK,
+            entries,
+            Gdk.DragAction.MOVE)
+        self._ui.eventbox.connect('drag-begin', self._on_drag_begin)
+        self._ui.eventbox.connect('drag-data-get', self._on_drag_data_get)
+
         if self.type == 'groupchat':
             self._ui.group_chat_indicator.show()
@@ -621,6 +644,31 @@ def _popup_menu(self, event):
         popover.set_pointing_to(rectangle)
         popover.popup()
+    def _on_drag_begin(self,
+                       widget: Gtk.Widget,
+                       drag_context: Gdk.DragContext
+                       ) -> None:
+        # Use rendered ChatListRow as drag icon
+        alloc = self.get_allocation()
+        surface = cairo.ImageSurface(
+            cairo.Format.ARGB32, alloc.width, alloc.height)
+        context = cairo.Context(surface)
+        self.draw(context)
+        dest_x, dest_y = widget.translate_coordinates(self, 0, 0)
+        surface.set_device_offset(-dest_x, -dest_y)
+        Gtk.drag_set_icon_surface(drag_context, surface)
+
+    def _on_drag_data_get(self,
+                          _widget: Gtk.Widget,
+                          _drag_context: Gdk.DragContext,
+                          selection_data: Gtk.SelectionData,
+                          _info: int,
+                          _time: int
+                          ) -> None:
+        drop_type = Gdk.Atom.intern_static_string('CHAT_LIST_ITEM')
+        data = f'{self.account} {self.jid}'.encode('utf-8')
+        selection_data.set(drop_type, 32, data)
+
     def toggle_pinned(self) -> None:
         self._pinned = not self._pinned
=====================================
gajim/gtk/workspace_side_bar.py
=====================================
@@ -15,6 +15,8 @@
 from typing import Any
 from typing import List
+import logging
+
 from gi.repository import Gdk
 from gi.repository import Gio
 from gi.repository import GLib
@@ -26,6 +28,8 @@
from .util import open_window
+log = logging.getLogger('gajim.gui.workspace_sidebar')
+
class WorkspaceSideBar(Gtk.ListBox):
     def __init__(self, chat_page):
@@ -35,10 +39,16 @@ def __init__(self, chat_page):
         self.get_style_context().add_class('workspace-sidebar')
# Drag and Drop
-        entries = [Gtk.TargetEntry.new(
-            'WORKSPACE_SIDEBAR_ITEM',
-            Gtk.TargetFlags.SAME_APP,
-            0)]
+        entries = [
+            Gtk.TargetEntry.new(
+                'WORKSPACE_SIDEBAR_ITEM',
+                Gtk.TargetFlags.SAME_APP,
+                0),
+            Gtk.TargetEntry.new(
+                'CHAT_LIST_ITEM',
+                Gtk.TargetFlags.SAME_APP,
+                0)
+        ]
         self.drag_dest_set(
             Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP,
             entries,
@@ -50,8 +60,6 @@ def __init__(self, chat_page):
self.connect('drag-motion', self._on_drag_motion)
         self.connect('drag-data-received', self._on_drag_data_received)
-        self.connect('drag-leave', self._on_drag_leave)
-
         self.connect('row-activated', self._on_row_activated)
self.add(AddWorkspace('add'))
@@ -63,17 +71,15 @@ def __init__(self, chat_page):
                                 self._on_chat_selected)
         self._workspaces = {}
-    def _on_drag_motion(self, _widget, _drag_context, _x_coord, y_coord,
-                        _time):
+    def _on_drag_motion(self,
+                        _widget: Gtk.Widget,
+                        _drag_context: Gdk.DragContext,
+                        _x_coord: int,
+                        y_coord: int,
+                        _time: int
+                        ) -> None:
         row = self.get_row_at_y(y_coord)
-        if self.row_before:
-            self.row_before.get_style_context().remove_class(
-                'drag-hover-bottom')
-        if self.row_after:
-            self.row_after.get_style_context().remove_class(
-                'drag-hover-top')
-
         if row:
             alloc = row.get_allocation()
             hover_row_y = alloc.y
@@ -91,23 +97,27 @@ def _on_drag_motion(self, _widget, _drag_context, _x_coord, y_coord,
         if self.drag_row in (self.row_before, self.row_after):
             return False
-        if self.row_before and self.row_before.workspace_id != 'add':
-            self.row_before.get_style_context().add_class('drag-hover-bottom')
-        if self.row_after:
-            self.row_after.get_style_context().add_class('drag-hover-top')
         return True
-    def _on_drag_data_received(self, _widget, _drag_context, _x_coord,
-                               _y_coord, selection_data, _info, _time):
-        if self.row_before:
-            self.row_before.get_style_context().remove_class(
-                'drag-hover-bottom')
-        if self.row_after:
-            self.row_after.get_style_context().remove_class(
-                'drag-hover-top')
+    def _on_drag_data_received(self,
+                               _widget: Gtk.Widget,
+                               _drag_context: Gdk.DragContext,
+                               _x_coord: int,
+                               y_coord: int,
+                               selection_data: Gtk.SelectionData,
+                               _info: int,
+                               _time: int
+                               ) -> None:
+        data = selection_data.get_data().decode('utf-8')
+        item_type = selection_data.get_data_type().name()
+        if item_type == 'WORKSPACE_SIDEBAR_ITEM':
+            self._process_workspace_drop(data)
+        elif item_type == 'CHAT_LIST_ITEM':
+            self._process_chat_list_drop(data, y_coord)
+        else:
+            log.debug('Unknown item type dropped')
-        data = selection_data.get_data()
-        workspace_id = data.decode('utf-8')
+    def _process_workspace_drop(self, workspace_id: str) -> None:
         row = self.get_workspace_by_id(workspace_id)
if row in (self.row_after, None):
@@ -126,13 +136,15 @@ def _on_drag_data_received(self, _widget, _drag_context, _x_coord,
         self.store_workspace_order()
         app.window.activate_workspace(workspace_id)
-    def _on_drag_leave(self, _widget, _drag_context, _time):
-        if self.row_before:
-            self.row_before.get_style_context().remove_class(
-                'drag-hover-bottom')
-        if self.row_after:
-            self.row_after.get_style_context().remove_class(
-                'drag-hover-top')
+    def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None:
+        account, jid = identifier.split()
+        workspace_row = self.get_row_at_y(y_coord)
+        if workspace_row.workspace_id == 'add':
+            return
+
+        app.window.activate_action(
+            'move-chat-to-workspace',
+            GLib.Variant('as', [workspace_row.workspace_id, account, jid]))
def _get_row_before(self, row):
         return self.get_row_at_index(row.get_index() - 1)
@@ -141,7 +153,7 @@ def _get_row_after(self, row):
         return self.get_row_at_index(row.get_index() + 1)
def _get_last_workspace_row(self):
-        # len(children) would include AddWorkspace
+        # Calling len(children) would include AddWorkspace
         return self.get_row_at_index(len(self.get_children()) - 1)
def set_drag_row(self, row):
@@ -219,8 +231,6 @@ def __init__(self, workspace_id):
         CommonWorkspace.__init__(self, workspace_id)
         self.get_style_context().add_class('workspace-sidebar-item')
-        self._workspace_id = workspace_id
-
         self._unread_label = Gtk.Label()
         self._unread_label.get_style_context().add_class(
             'unread-counter')
@@ -286,7 +296,7 @@ def _get_workspace_menu(self) -> Gio.Menu:
             action, label = item
             action = f'win.{action}'
             menuitem = Gio.MenuItem.new(label, action)
-            variant = GLib.Variant('s', self._workspace_id)
+            variant = GLib.Variant('s', self.workspace_id)
             menuitem.set_action_and_target_value(action, variant)
             menu.append_item(menuitem)
         return menu
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00c68673ccec7a525fea5ea59979ad97a...
-- 
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00c68673ccec7a525fea5ea59979ad97a...
You're receiving this email because of your account on dev.gajim.org.





    