resync to latest patches

5 files changed, 22 insertions, 52 deletions

diff --git a/extensions/web/facebook/facebook_online_account.py b/extensions/web/facebook/facebook_online_account.py
index ecf654f..c4f7c2a 100644
--- a/extensions/web/facebook/facebook_online_account.py
+++ b/extensions/web/facebook/facebook_online_account.py
@@ -109,11 +109,11 @@ class FacebookOnlineAccount(online_account.OnlineAccount):
         return self._client.get_string(self.ACCESS_TOKEN_KEY)
 
 
-class _FacebookShareMenu(online_account.OnlineShareMenu):
+class _FacebookShareMenu(online_account.OnlineMenu):
     __gtype_name__ = 'JournalFacebookMenu'
 
     def __init__(self, metadata, is_active):
-        online_account.OnlineShareMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         if is_active:
             icon_name = 'facebook-share'
@@ -197,9 +197,9 @@ class _FacebookShareMenu(online_account.OnlineShareMenu):
             pixbuf.savev(image_path, 'png', [], [])
 
 
-class _FacebookRefreshMenu(online_account.OnlineRefreshMenu):
+class _FacebookMenu(online_account.OnlineRefreshMenu):
     def __init__(self, is_active):
-        online_account.OnlineRefreshMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         self._is_active = is_active
         self._metadata = None
diff --git a/extensions/web/twitter/twitter_online_account.py b/extensions/web/twitter/twitter_online_account.py
index 273b3c3..89f7d8f 100644
--- a/extensions/web/twitter/twitter_online_account.py
+++ b/extensions/web/twitter/twitter_online_account.py
@@ -115,11 +115,11 @@ class TwitterOnlineAccount(online_account.OnlineAccount):
                 self._client.get_string(self.ACCESS_SECRET_KEY))
 
 
-class _TwitterShareMenu(online_account.OnlineShareMenu):
+class _TwitterShareMenu(online_account.OnlineMenu):
     __gtype_name__ = 'JournalTwitterMenu'
 
     def __init__(self, metadata, is_active):
-        online_account.OnlineShareMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         if is_active:
             icon_name = 'twitter-share'
@@ -184,9 +184,9 @@ class _TwitterShareMenu(online_account.OnlineShareMenu):
             pixbuf.savev(image_path, 'png', [], [])
 
 
-class _TwitterRefreshMenu(online_account.OnlineRefreshMenu):
+class _TwitterRefreshMenu(online_account.OnlineMenu):
     def __init__(self, is_active):
-        online_account.OnlineRefreshMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         self._is_active = is_active
         self._metadata = None
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index db934a3..d5a3da4 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -26,7 +26,6 @@ from gi.repository import GObject
 from gi.repository import Gio
 from gi.repository import Gtk
 
-from sugar3.datastore import datastore
 from sugar3.graphics.palette import Palette
 from sugar3.graphics.toolbarbox import ToolbarBox
 from sugar3.graphics.toolcombobox import ToolComboBox
@@ -38,7 +37,7 @@ from sugar3.graphics.palettemenu import PaletteMenuBox
 from sugar3.graphics.palettemenu import PaletteMenuItem
 from sugar3.graphics.icon import Icon
 from sugar3.graphics.xocolor import XoColor
-from sugar3.graphics.alert import NotifyAlert, Alert
+from sugar3.graphics.alert import Alert
 from sugar3.graphics import iconentry
 from sugar3 import mime
 
@@ -50,6 +49,7 @@ from jarabe.journal.palettes import VolumeMenu
 from jarabe.journal import journalwindow
 from jarabe.web import online_accounts_manager as oam
 
+
 _AUTOSEARCH_TIMEOUT = 1000
 
 _ACTION_ANYTIME = 0
@@ -90,6 +90,7 @@ class MainToolbox(ToolbarBox):
         self._add_widget(self.search_entry, expand=True)
 
         self._favorite_button = ToggleToolButton('emblem-favorite')
+        self._favorite_button.set_tooltip(_('Favorite entries'))
         self._favorite_button.connect('toggled',
                                       self.__favorite_button_toggled_cb)
         self.toolbar.insert(self._favorite_button, -1)
@@ -108,8 +109,6 @@ class MainToolbox(ToolbarBox):
         tool_item.show()
 
         self._sorting_button = SortingButton()
-        self._sorting_button.connect('clicked',
-                                     self.__sorting_button_clicked_cb)
         self.toolbar.insert(self._sorting_button, -1)
         self._sorting_button.connect('sort-property-changed',
                                      self.__sort_changed_cb)
@@ -227,9 +226,6 @@ class MainToolbox(ToolbarBox):
     def __sort_changed_cb(self, button):
         self._update_if_needed()
 
-    def __sorting_button_clicked_cb(self, button):
-        self._sorting_button.palette.popup(immediate=True, state=1)
-
     def _update_if_needed(self):
         new_query = self._build_query()
         if self._query != new_query:
@@ -487,7 +483,8 @@ class DetailToolbox(ToolbarBox):
             journal_menu.show()
 
         documents_path = model.get_documents_path()
-        if not self._metadata['uid'].startswith(documents_path):
+        if documents_path is not None and not \
+                self._metadata['uid'].startswith(documents_path):
             documents_menu = VolumeMenu(self._metadata, _('Documents'),
                                         documents_path)
             documents_menu.set_image(Icon(icon_name='user-documents',
@@ -590,6 +587,9 @@ class SortingButton(ToolButton):
         self.props.tooltip = _('Sort view')
         self.props.icon_name = 'view-lastedit'
 
+        self.props.hide_tooltip_on_click = False
+        self.palette_invoker.props.toggle_palette = True
+
         menu_box = PaletteMenuBox()
         self.props.palette.set_content(menu_box)
         menu_box.show()
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 621ef39..ee484a7 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -17,23 +17,20 @@
 from gettext import gettext as _
 import logging
 import os
-import tempfile
 
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Gdk
-from gi.repository import GdkPixbuf
 from gi.repository import GConf
 from gi.repository import Gio
 from gi.repository import GLib
 
-from sugar3.datastore import datastore
 from sugar3.graphics import style
 from sugar3.graphics.palette import Palette
 from sugar3.graphics.menuitem import MenuItem
 from sugar3.graphics.icon import Icon
 from sugar3.graphics.xocolor import XoColor
-from sugar3.graphics.alert import Alert, NotifyAlert
+from sugar3.graphics.alert import Alert
 from sugar3 import mime
 
 from jarabe.model import friends
@@ -44,6 +41,7 @@ from jarabe.journal import model
 from jarabe.journal import journalwindow
 from jarabe.web import online_accounts_manager as oam
 
+
 class ObjectPalette(Palette):
 
     __gtype_name__ = 'ObjectPalette'
@@ -228,8 +226,8 @@ class CopyMenu(Gtk.Menu):
             journal_menu.show()
 
         documents_path = model.get_documents_path()
-        if documents_path is not None and\
-                not self._metadata['uid'].startswith(documents_path):
+        if documents_path is not None and not \
+                self._metadata['uid'].startswith(documents_path):
             documents_menu = VolumeMenu(self._metadata, _('Documents'),
                                         documents_path)
             documents_menu.set_image(Icon(icon_name='user-documents',
diff --git a/src/jarabe/web/online_account.py b/src/jarabe/web/online_account.py
index a2eba14..ab9d5af 100644
--- a/src/jarabe/web/online_account.py
+++ b/src/jarabe/web/online_account.py
@@ -27,6 +27,7 @@ from gi.repository import GObject
 from sugar3.graphics.menuitem import MenuItem
 from sugar3.graphics.toolbutton import ToolButton
 
+
 class OnlineAccount(GObject.GObject):
     def get_description(self):
         raise Exception("Not defined")
@@ -44,36 +45,7 @@ class OnlineAccount(GObject.GObject):
         raise Exception("Not defined")
 
 
-'''
-class _TransferWidget(GObject.GObject):
-     __gsignals__ = {
-        'transfer-started': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-progress': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, float])),
-        'transfer-completed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-failed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, str])),
-        'transfer-state-changed': (GObject.SignalFlags.RUN_FIRST, None, ([str])),
-    }
-
-    def _transfer_state_changed_cb(self, transfer_object, state):
-        self.emit('transfer-state-changed', state)
-'''
-
-class OnlineShareMenu(MenuItem):
-    __gsignals__ = {
-        'transfer-started': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-progress': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, float])),
-        'transfer-completed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-failed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, str])),
-        'transfer-state-changed': (GObject.SignalFlags.RUN_FIRST, None, ([str])),
-    }
-
-    def _transfer_state_changed_cb(self, transfer_object, state):
-        logging.debug('_transfer_state_changed_cb')
-        self.emit('transfer-state-changed', state)
-
-
-# class OnlineRefreshButton(ToolButton):
-class OnlineRefreshMenu(MenuItem):
+class OnlineMenu(MenuItem):
     __gsignals__ = {
         'transfer-started': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
         'transfer-progress': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, float])),