sdxo#2335: Disable Drag-and-Copy in Batch-Mode.

1 files changed, 54 insertions, 8 deletions

diff --git a/rpms/sugar/0130-1-to-N-feature-via-School-Server.patch b/rpms/sugar/0130-1-to-N-feature-via-School-Server.patch
index 47584a0..1b63172 100644
--- a/rpms/sugar/0130-1-to-N-feature-via-School-Server.patch
+++ b/rpms/sugar/0130-1-to-N-feature-via-School-Server.patch
@@ -1,7 +1,7 @@
-From 865725f2c4a76b6a52267623ba6546954ad2dccc Mon Sep 17 00:00:00 2001
+From 507b3ad4a7392c0bab27d51180c4be75c5d5078f Mon Sep 17 00:00:00 2001
 From: Ajay Garg <ajay@activitycentral.com>
-Date: Tue, 18 Sep 2012 13:49:44 +0530
-Subject: [sugar PATCH] 1-to-N-feature via Peer-to-Peer mechanism; and Via-School-Server mechanism.
+Date: Tue, 18 Sep 2012 15:04:16 +0530
+Subject: [sugar PATCH] 1-to-N-feature via Peer-to-Peer mechanism; and Via-School-Server mechanism
 Organization: Sugar Labs Foundation
 Signed-off-by: Ajay Garg <ajay@activitycentral.com>
 ---
@@ -9,8 +9,9 @@ Signed-off-by: Ajay Garg <ajay@activitycentral.com>
  src/jarabe/frame/frame.py             |    3 +
  src/jarabe/intro/window.py            |   12 +
  src/jarabe/journal/expandedentry.py   |   24 ++-
- src/jarabe/journal/journalactivity.py |   17 +-
+ src/jarabe/journal/journalactivity.py |   19 ++-
  src/jarabe/journal/journaltoolbox.py  |   44 ++++-
+ src/jarabe/journal/listview.py        |   15 +-
  src/jarabe/journal/model.py           |  388 +++++++++++++++++++++++----------
  src/jarabe/journal/palettes.py        |  303 ++++++++++++++++++++++---
  src/jarabe/journal/volumestoolbar.py  |  135 ++++++++----
@@ -20,7 +21,7 @@ Signed-off-by: Ajay Garg <ajay@activitycentral.com>
  src/webdav/Connection.py              |   11 +-
  src/webdav/WebdavClient.py            |   16 +-
  src/webdav/davlib.py                  |    9 +-
- 15 files changed, 929 insertions(+), 290 deletions(-)
+ 16 files changed, 942 insertions(+), 294 deletions(-)
 
 diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
 index 55e0c31..7cbeefb 100644
@@ -121,7 +122,7 @@ index 03f8cd1..1e857ba 100644
          keep_icon = KeepIcon(False)
          keep_icon.connect('activated', self._keep_icon_activated_cb)
 diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
-index fc4773d..5f2a734 100644
+index fc4773d..f902027 100644
 --- a/src/jarabe/journal/journalactivity.py
 +++ b/src/jarabe/journal/journalactivity.py
 @@ -180,10 +180,14 @@ class JournalActivity(JournalWindow):
@@ -143,7 +144,19 @@ index fc4773d..5f2a734 100644
  
      def _volume_error_cb(self, gobject, message, severity):
          self.update_error_alert(severity, message, None, None)
-@@ -449,6 +453,8 @@ class JournalActivity(JournalWindow):
+@@ -418,9 +422,11 @@ class JournalActivity(JournalWindow):
+         # (re)-switch, only if not already.
+         if (switch) and (not self._editing_mode):
+             self._editing_mode = True
++            self.get_list_view().disable_drag_and_copy()
+             self.show_main_view()
+         elif (not switch) and (self._editing_mode):
+             self._editing_mode = False
++            self.get_list_view().enable_drag_and_copy()
+             self.show_main_view()
+ 
+     def get_list_view(self):
+@@ -449,6 +455,8 @@ class JournalActivity(JournalWindow):
              self.remove_alert(self._current_alert)
              self.add_alert(alert)
  
@@ -152,7 +165,7 @@ index fc4773d..5f2a734 100644
          self._current_alert = alert
          self._current_alert.show()
          show_normal_cursor()
-@@ -475,6 +481,9 @@ class JournalActivity(JournalWindow):
+@@ -475,6 +483,9 @@ class JournalActivity(JournalWindow):
          self._data = data
          self.update_alert(self._confirmation_alert)
  
@@ -254,6 +267,39 @@ index 6b2494e..b1c0cac 100644
      def get_current_entry_number(self):
          return self._selected_entries
  
+diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
+index 333d88a..93ca98d 100644
+--- a/src/jarabe/journal/listview.py
++++ b/src/jarabe/journal/listview.py
+@@ -106,10 +106,7 @@ class BaseListView(gtk.Bin):
+         self._inhibit_refresh = False
+         self._selected_entries = 0
+ 
+-        self.tree_view.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
+-                                                [('text/uri-list', 0, 0),
+-                                                 ('journal-object-id', 0, 0)],
+-                                                gtk.gdk.ACTION_COPY)
++        self.enable_drag_and_copy()
+ 
+         # Auto-update stuff
+         self._fully_obscured = True
+@@ -121,6 +118,16 @@ class BaseListView(gtk.Bin):
+         model.updated.connect(self.__model_updated_cb)
+         model.deleted.connect(self.__model_deleted_cb)
+ 
++
++    def enable_drag_and_copy(self):
++        self.tree_view.enable_model_drag_source(gtk.gdk.BUTTON1_MASK,
++                                                [('text/uri-list', 0, 0),
++                                                 ('journal-object-id', 0, 0)],
++                                                gtk.gdk.ACTION_COPY)
++
++    def disable_drag_and_copy(self):
++        self.tree_view.unset_rows_drag_source()
++
+     def __model_created_cb(self, sender, signal, object_id):
+         if self._is_new_item_visible(object_id):
+             self._set_dirty()
 diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
 index 422e947..1a47556 100644
 --- a/src/jarabe/journal/model.py