diff options
Diffstat (limited to 'src/jarabe/journal/journaltoolbox.py')
| -rw-r--r-- | src/jarabe/journal/journaltoolbox.py | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py index bdd16c3..6d2cf33 100644 --- a/src/jarabe/journal/journaltoolbox.py +++ b/src/jarabe/journal/journaltoolbox.py @@ -71,7 +71,7 @@ class MainToolbox(ToolbarBox): __gsignals__ = { 'query-changed': (GObject.SignalFlags.RUN_FIRST, None, ([object])), - } + } def __init__(self): ToolbarBox.__init__(self) @@ -98,7 +98,7 @@ class MainToolbox(ToolbarBox): self._what_search_combo = ComboBox() self._what_combo_changed_sid = self._what_search_combo.connect( - 'changed', self._combo_changed_cb) + 'changed', self._combo_changed_cb) tool_item = ToolComboBox(self._what_search_combo) self.toolbar.insert(tool_item, -1) tool_item.show() @@ -115,10 +115,10 @@ class MainToolbox(ToolbarBox): self._sorting_button.show() # TODO: enable it when the DS supports saving the buddies. - #self._with_search_combo = self._get_with_search_combo() - #tool_item = ToolComboBox(self._with_search_combo) - #self.insert(tool_item, -1) - #tool_item.show() + # self._with_search_combo = self._get_with_search_combo() + # tool_item = ToolComboBox(self._with_search_combo) + # self.insert(tool_item, -1) + # tool_item.show() self._query = self._build_query() @@ -130,7 +130,7 @@ class MainToolbox(ToolbarBox): when_search.append_separator() when_search.append_item(_ACTION_TODAY, _('Today')) when_search.append_item(_ACTION_SINCE_YESTERDAY, - _('Since yesterday')) + _('Since yesterday')) # TRANS: Filter entries modified during the last 7 days. when_search.append_item(_ACTION_PAST_WEEK, _('Past week')) # TRANS: Filter entries modified during the last 30 days. @@ -299,7 +299,7 @@ class MainToolbox(ToolbarBox): generic_type.type_id, generic_type.name, generic_type.icon) if generic_type.type_id == current_value: current_value_index = \ - len(self._what_search_combo.get_model()) - 1 + len(self._what_search_combo.get_model()) - 1 self._what_search_combo.set_active(current_value_index) @@ -317,9 +317,10 @@ class MainToolbox(ToolbarBox): # try activity-provided icon if os.path.exists(activity_info.get_icon()): try: - self._what_search_combo.append_item(service_name, - activity_info.get_name(), - file_name=activity_info.get_icon()) + self._what_search_combo.append_item( + service_name, + activity_info.get_name(), + file_name=activity_info.get_icon()) except GObject.GError, exception: logging.warning('Falling back to default icon for' ' "what" filter because %r (%r) has an' @@ -330,13 +331,14 @@ class MainToolbox(ToolbarBox): continue # fall back to generic icon - self._what_search_combo.append_item(service_name, - activity_info.get_name(), - icon_name='application-octet-stream') + self._what_search_combo.append_item( + service_name, + activity_info.get_name(), + icon_name='application-octet-stream') finally: self._what_search_combo.handler_unblock( - self._what_combo_changed_sid) + self._what_combo_changed_sid) def __favorite_button_toggled_cb(self, favorite_button): self._update_if_needed() @@ -352,13 +354,14 @@ class DetailToolbox(ToolbarBox): __gsignals__ = { 'volume-error': (GObject.SignalFlags.RUN_FIRST, None, ([str, str])), - } + } def __init__(self): ToolbarBox.__init__(self) self._metadata = None self._temp_file_path = None + self._refresh = None self._resume = ToolButton('activity-start') self._resume.connect('clicked', self._resume_clicked_cb) @@ -384,8 +387,9 @@ class DetailToolbox(ToolbarBox): self.toolbar.insert(self._duplicate, -1) if len(accountsmanager.get_configured_accounts()) > 0: + logging.debug('CONFIGURED ACCOUNTS: creating _refresh') self._refresh = ToolButton() - icon = Icon(icon_name='refresh', xo_color=color) + icon = Icon(icon_name='refresh-web-account-menu', xo_color=color) self._refresh.set_icon_widget(icon) icon.show() @@ -393,6 +397,8 @@ class DetailToolbox(ToolbarBox): self._refresh.connect('clicked', self._refresh_clicked_cb) self.toolbar.insert(self._refresh, -1) self._refresh.show() + else: + logging.debug('NO CONFIGURED ACCOUNTS') separator = Gtk.SeparatorToolItem() self.toolbar.insert(separator, -1) @@ -408,7 +414,8 @@ class DetailToolbox(ToolbarBox): self._metadata = metadata self._refresh_copy_palette() self._refresh_duplicate_palette() - self._refresh_refresh_palette() + if self._refresh is not None: + self._refresh_refresh_palette() self._refresh_resume_palette() def _resume_clicked_cb(self, button): @@ -421,7 +428,6 @@ class DetailToolbox(ToolbarBox): button.palette.popup(immediate=True, state=Palette.SECONDARY) def _duplicate_clicked_cb(self, button): - file_path = model.get_file(self._metadata['uid']) try: model.copy(self._metadata, '/') except IOError, e: @@ -511,7 +517,8 @@ class DetailToolbox(ToolbarBox): volume_menu.show() for account in accountsmanager.get_configured_accounts(): - menu = account.get_share_menu(self._metadata) + menu = account.get_shared_journal_entry().get_share_menu( + self._metadata) palette.menu.append(menu) def _refresh_duplicate_palette(self): @@ -533,7 +540,7 @@ class DetailToolbox(ToolbarBox): palette.menu.remove(menu_item) for account in accountsmanager.get_configured_accounts(): - menu = account.get_refresh_menu() + menu = account.get_shared_journal_entry().get_refresh_menu() palette.menu.append(menu) menu.set_metadata(self._metadata) @@ -557,9 +564,9 @@ class DetailToolbox(ToolbarBox): for activity_info in misc.get_activities(self._metadata): menu_item = MenuItem(activity_info.get_name()) menu_item.set_image(Icon(file=activity_info.get_icon(), - icon_size=Gtk.IconSize.MENU)) + icon_size=Gtk.IconSize.MENU)) menu_item.connect('activate', self._resume_menu_item_activate_cb, - activity_info.get_bundle_id()) + activity_info.get_bundle_id()) palette.menu.append(menu_item) menu_item.show() @@ -609,7 +616,7 @@ class SortingButton(ToolButton): def __sort_type_changed_cb(self, widget, property_, icon_name): self._property = property_ - #FIXME: Implement sorting order + # FIXME: Implement sorting order self._order = Gtk.SortType.ASCENDING self.emit('sort-property-changed') |