← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/sugar-0.84/oneiric

« back to all changes in this revision

Viewing changes to src/jarabe/desktop/favoritesview.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonas Smedegaard
  • Date: 2011-01-05 22:19:07 UTC
  • mfrom: (2.2.18 sid)
  • Revision ID: james.westby@ubuntu.com-20110105221907-oii3hys2d3i021ha
Tags: 0.84.30-1
* New upstream stable release.
* Rewrite copyright file using Bazaar rev. 137 draft of DEP5 format.
  Merge Files sections with only Redhat and/or OLPC as authors and
  same licensing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/jarabe/desktop/favoritesview.py
65
65
class FavoritesView(hippo.Canvas):
66
66
    __gtype_name__ = 'SugarFavoritesView'
67
67
 
68
 
    __gsignals__ = {
69
 
        'erase-activated' : (gobject.SIGNAL_RUN_FIRST,
70
 
                             gobject.TYPE_NONE, ([str]))
71
 
    }
72
 
 
73
68
    def __init__(self, **kwargs):
74
69
        logging.debug('STARTUP: Loading the favorites view')
75
70
 
134
129
        if activity_info.get_bundle_id() == 'org.laptop.JournalActivity':
135
130
            return
136
131
        icon = ActivityIcon(activity_info, self._datastore_listener)
137
 
        icon.connect('erase-activated', self.__erase_activated_cb)
138
132
        icon.props.size = style.STANDARD_ICON_SIZE
139
133
        self._box.insert_sorted(icon, 0, self._layout.compare_activities)
140
134
        self._layout.append(icon)
141
135
 
142
 
    def __erase_activated_cb(self, activity_icon, bundle_id):
143
 
        self.emit('erase-activated', bundle_id)
144
 
 
145
136
    def __activity_added_cb(self, activity_registry, activity_info):
146
137
        registry = bundleregistry.get_registry()
147
138
        if registry.is_bundle_favorite(activity_info.get_bundle_id(),
282
273
 
283
274
    def _set_layout(self, layout):
284
275
        if layout not in LAYOUT_MAP:
285
 
            raise ValueError('Unknown favorites layout: %r' % layout)
 
276
            logging.warn('Unknown favorites layout: %r' % layout)
 
277
            layout = favoriteslayout.RingLayout.key
 
278
            assert layout in LAYOUT_MAP
286
279
 
287
280
        if type(self._layout) == LAYOUT_MAP[layout]:
288
281
            return
402
395
 
403
396
    _BORDER_WIDTH = style.zoom(3)
404
397
 
405
 
    __gsignals__ = {
406
 
        'erase-activated' : (gobject.SIGNAL_RUN_FIRST,
407
 
                             gobject.TYPE_NONE, ([str]))
408
 
    }
409
 
 
410
398
    def __init__(self, activity_info, datastore_listener):
411
399
        CanvasIcon.__init__(self, cache=True,
412
400
                            file_name=activity_info.get_icon())
469
457
    def create_palette(self):
470
458
        palette = FavoritePalette(self._activity_info, self._journal_entries)
471
459
        palette.connect('activate', self.__palette_activate_cb)
472
 
        palette.connect('erase-activated', self.__erase_activated_cb)
473
460
        return palette
474
461
 
475
 
    def __erase_activated_cb(self, palette):
476
 
        self.emit('erase-activated', self._activity_info.get_bundle_id())
477
 
 
478
462
    def __palette_activate_cb(self, palette):
479
463
        self._activate()
480
464
 
609
593
 
610
594
    def __resume_entry_cb(self, menu_item, entry):
611
595
        if entry is not None:
612
 
            journal.misc.resume(entry, self._bundle_id)
 
596
            journal.misc.resume(entry, entry['activity'])
613
597
 
614
598
class CurrentActivityIcon(CanvasIcon, hippo.CanvasItem):
615
599
    def __init__(self):
688
672
        self.emit('register-activate')
689
673
 
690
674
    def remove_register_menu(self):
691
 
        self.palette.remove(self._register_menu)
 
675
        self.palette.menu.remove(self._register_menu)
692
676
 
693
677
class FavoritesSetting(object):
694
678