diff --git a/shell/view/frame/ZoomBox.py b/shell/view/frame/ZoomBox.py index 231f1883..29defaa1 100644 --- a/shell/view/frame/ZoomBox.py +++ b/shell/view/frame/ZoomBox.py @@ -14,71 +14,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import logging -from gettext import gettext as _ - import hippo -from sugar.graphics.menu import Menu, MenuItem from sugar.graphics import color from sugar.graphics.iconbutton import IconButton import sugar -class ActivityMenu(Menu): - ACTION_SHARE = 1 - ACTION_CLOSE = 2 - - def __init__(self, activity_model): - Menu.__init__(self, activity_model.get_title()) - - if not activity_model.get_shared(): - self.add_item(MenuItem(ActivityMenu.ACTION_SHARE, - _('Share'), - 'theme:stock-share-mesh')) - - self.add_item(MenuItem(ActivityMenu.ACTION_CLOSE, - _('Close'), - 'theme:stock-close')) - -class ActivityButton(IconButton): - def __init__(self, shell, activity_model, popup_context): - self._shell = shell - self._activity_model = activity_model - self._popup_context = popup_context - - icon_name = self._activity_model.get_icon_name() - icon_color = self._activity_model.get_icon_color() - - IconButton.__init__(self, icon_name=icon_name, xo_color=icon_color) - - def get_popup(self): - menu = ActivityMenu(self._activity_model) - menu.connect('action', self._action_cb) - return menu - - def get_popup_context(self): - return self._popup_context - - def _action_cb(self, menu, menu_item): - # TODO: Wouldn't be better to share/close the activity associated with - # this button instead of asking for the current activity? - activity = self._shell.get_current_activity() - if activity == None: - logging.error('No active activity.') - return - - if menu_item.props.action_id == ActivityMenu.ACTION_SHARE: - activity.share() - elif menu_item.props.action_id == ActivityMenu.ACTION_CLOSE: - activity.close() - class ZoomBox(hippo.CanvasBox): - def __init__(self, shell, popup_context): + def __init__(self, shell): hippo.CanvasBox.__init__(self, orientation=hippo.ORIENTATION_HORIZONTAL) self._shell = shell - self._popup_context = popup_context - self._activity_icon = None icon = IconButton(icon_name='theme:stock-zoom-mesh', stroke_color=color.BLACK, @@ -104,24 +50,5 @@ class ZoomBox(hippo.CanvasBox): icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_ACTIVITY) self.append(icon) - home_model = shell.get_model().get_home() - home_model.connect('active-activity-changed', - self._activity_changed_cb) - self._set_current_activity(home_model.get_current_activity()) - - def _set_current_activity(self, home_activity): - if self._activity_icon: - self.remove(self._activity_icon) - - if home_activity: - icon = ActivityButton(self._shell, home_activity, self._popup_context) - self.append(icon) - self._activity_icon = icon - else: - self._activity_icon = None - - def _activity_changed_cb(self, home_model, home_activity): - self._set_current_activity(home_activity) - def _level_clicked_cb(self, item, level): self._shell.set_zoom_level(level) diff --git a/shell/view/frame/frame.py b/shell/view/frame/frame.py index 472cb5fb..d37ce4c1 100644 --- a/shell/view/frame/frame.py +++ b/shell/view/frame/frame.py @@ -217,7 +217,7 @@ class Frame(object): panel = self._create_panel(hippo.ORIENTATION_HORIZONTAL) root = panel.get_root() - box = ZoomBox(self._shell, self._popup_context) + box = ZoomBox(self._shell) root.append(box) #box = OverlayBox(self._shell)