sdxo#2333: Add "Reload" option in locally-mounted-shares.

1 files changed, 31 insertions, 25 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 08ff4a6..1ef3dd9 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,6 +1,6 @@
-From f1fd1f92fb52f0ba81c62caa90a4269d99dac938 Mon Sep 17 00:00:00 2001
+From aa06134ada3e9022c680addddae4e6ce0a9ef1ed Mon Sep 17 00:00:00 2001
 From: Ajay Garg <ajay@activitycentral.com>
-Date: Tue, 18 Sep 2012 13:23:31 +0530
+Date: Tue, 18 Sep 2012 13:38:36 +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>
@@ -16,11 +16,11 @@ Signed-off-by: Ajay Garg <ajay@activitycentral.com>
  src/jarabe/journal/volumestoolbar.py  |   94 ++++++---
  src/jarabe/journal/webdavmanager.py   |  172 ++++++++++-----
  src/jarabe/view/buddymenu.py          |   45 ++++-
- src/jarabe/view/palettes.py           |   38 ++--
+ src/jarabe/view/palettes.py           |   35 +++-
  src/webdav/Connection.py              |   11 +-
  src/webdav/WebdavClient.py            |   16 +-
  src/webdav/davlib.py                  |    9 +-
- 15 files changed, 874 insertions(+), 279 deletions(-)
+ 15 files changed, 880 insertions(+), 270 deletions(-)
 
 diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
 index 55e0c31..7cbeefb 100644
@@ -1773,10 +1773,10 @@ index dfbcfa3..f6af1b5 100644
      def _add_my_items(self):
          item = MenuItem(_('Shutdown'), 'system-shutdown')
 diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
-index 3b26faf..f6bca48 100644
+index 3b26faf..34cce63 100644
 --- a/src/jarabe/view/palettes.py
 +++ b/src/jarabe/view/palettes.py
-@@ -339,33 +339,35 @@ class JournalXSPalette(Palette):
+@@ -339,12 +339,14 @@ class JournalXSPalette(Palette):
  
  
  class RemoteSharePalette(Palette):
@@ -1793,34 +1793,40 @@ index 3b26faf..f6bca48 100644
 +        self.props.secondary_text = \
 +                glib.markup_escape_text(self._ip_address_or_dns_name)
  
--        vbox = gtk.VBox()
--        self.set_content(vbox)
--        vbox.show()
-+        if show_unmount_option == True:
-+            vbox = gtk.VBox()
-+            self.set_content(vbox)
-+            vbox.show()
+         vbox = gtk.VBox()
+         self.set_content(vbox)
+@@ -352,20 +354,35 @@ class RemoteSharePalette(Palette):
  
--        self.connect('popup', self.__popup_cb)
-+            self.connect('popup', self.__popup_cb)
-+            menu_item = MenuItem(pgettext('Share', 'Unmount'))
-+            icon = Icon(icon_name='media-eject', icon_size=gtk.ICON_SIZE_MENU)
-+            menu_item.set_image(icon)
-+            icon.show()
+         self.connect('popup', self.__popup_cb)
  
 -        menu_item = MenuItem(pgettext('Share', 'Unmount'))
 -
 -        icon = Icon(icon_name='media-eject', icon_size=gtk.ICON_SIZE_MENU)
--        menu_item.set_image(icon)
--        icon.show()
--
++        menu_item = MenuItem(pgettext('Share', _('Reload')))
++        icon = Icon(icon_name='system-restart', icon_size=gtk.ICON_SIZE_MENU)
+         menu_item.set_image(icon)
+         icon.show()
+ 
 -        menu_item.connect('activate', self.__unmount_activate_cb)
--        self.menu.append(menu_item)
--        menu_item.show()
++        menu_item.connect('activate', self.__reload_remote_share)
+         self.menu.append(menu_item)
+         menu_item.show()
+ 
++
++        if show_unmount_option == True:
++            menu_item = MenuItem(pgettext('Share', 'Unmount'))
++            icon = Icon(icon_name='media-eject', icon_size=gtk.ICON_SIZE_MENU)
++            menu_item.set_image(icon)
++            icon.show()
++
 +            menu_item.connect('activate', self.__unmount_activate_cb)
 +            self.menu.append(menu_item)
 +            menu_item.show()
- 
++
++    def __reload_remote_share(self, menu_item):
++        from jarabe.journal.journalactivity import get_journal
++        get_journal().get_list_view().refresh()
++
      def __unmount_activate_cb(self, menu_item):
          from jarabe.journal.journalactivity import get_journal
 +