diff options
author | Manuel Quiñones <manuq@laptop.org> | 2012-10-10 20:07:46 (GMT) |
---|---|---|
committer | Manuel Quiñones <manuq@laptop.org> | 2012-10-12 18:09:30 (GMT) |
commit | 7a2fbf62bdde3c047852ab07489f140c22aa8862 (patch) | |
tree | a82138378dc5087efb15970f23452fdf4f8f05cc | |
parent | ed38c2f4bd9174702223d229c71004a7ecf91e58 (diff) |
Port icons in canvas from EventIcon to CanvasIcon for press and hover feedback - SL #3989
Except for the pulsing icon EventPulsingIcon that is informatinal
only.
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
-rw-r--r-- | extensions/cpsection/aboutme/view.py | 8 | ||||
-rw-r--r-- | src/jarabe/desktop/favoritesview.py | 6 | ||||
-rw-r--r-- | src/jarabe/desktop/friendview.py | 4 | ||||
-rw-r--r-- | src/jarabe/desktop/meshbox.py | 9 | ||||
-rw-r--r-- | src/jarabe/journal/expandedentry.py | 10 | ||||
-rw-r--r-- | src/jarabe/view/buddyicon.py | 12 |
6 files changed, 26 insertions, 23 deletions
diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py index 293923d..3cbd93e 100644 --- a/extensions/cpsection/aboutme/view.py +++ b/extensions/cpsection/aboutme/view.py @@ -21,7 +21,7 @@ from gettext import gettext as _ from sugar3.graphics import style from sugar3.graphics.xocolor import XoColor, colors -from sugar3.graphics.icon import EventIcon +from sugar3.graphics.icon import CanvasIcon from jarabe.controlpanel.sectionview import SectionView from jarabe.controlpanel.inlinealert import InlineAlert @@ -111,7 +111,7 @@ _NEXT_STROKE_COLOR = 3 _PREVIOUS_STROKE_COLOR = 4 -class ColorPicker(EventIcon): +class ColorPicker(CanvasIcon): __gsignals__ = { 'color-changed': (GObject.SignalFlags.RUN_FIRST, None, @@ -119,8 +119,8 @@ class ColorPicker(EventIcon): } def __init__(self, picker): - EventIcon.__init__(self, icon_name='computer-xo', - pixel_size=style.XLARGE_ICON_SIZE) + CanvasIcon.__init__(self, icon_name='computer-xo', + pixel_size=style.XLARGE_ICON_SIZE) self._picker = picker self._color = None diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 5839db0..a6dc01f 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -28,7 +28,6 @@ from gi.repository import GdkPixbuf from sugar3.graphics import style from sugar3.graphics.icon import Icon -from sugar3.graphics.icon import EventIcon from sugar3.graphics.icon import CanvasIcon from sugar3.graphics.menuitem import MenuItem from sugar3.graphics.alert import Alert @@ -540,9 +539,9 @@ class FavoritePalette(ActivityPalette): self.emit('entry-activate', entry) -class CurrentActivityIcon(EventIcon): +class CurrentActivityIcon(CanvasIcon): def __init__(self): - EventIcon.__init__(self, icon_name='activity-journal', + CanvasIcon.__init__(self, icon_name='activity-journal', pixel_size=style.STANDARD_ICON_SIZE, cache=True) self._home_model = shell.get_model() self._home_activity = self._home_model.get_active_activity() @@ -574,6 +573,7 @@ class CurrentActivityIcon(EventIcon): palette = JournalPalette(self._home_activity) else: palette = CurrentActivityPalette(self._home_activity) + self.connect_to_palette_pop_events(palette) return palette def __active_activity_changed_cb(self, home_model, home_activity): diff --git a/src/jarabe/desktop/friendview.py b/src/jarabe/desktop/friendview.py index 77f4b6e..3d2249b 100644 --- a/src/jarabe/desktop/friendview.py +++ b/src/jarabe/desktop/friendview.py @@ -18,7 +18,7 @@ from gi.repository import Gtk from sugar3.graphics import style -from sugar3.graphics.icon import EventIcon +from sugar3.graphics.icon import CanvasIcon from jarabe.view.buddyicon import BuddyIcon from jarabe.model import bundleregistry @@ -38,7 +38,7 @@ class FriendView(Gtk.VBox): self.add(self._buddy_icon) self._buddy_icon.show() - self._activity_icon = EventIcon(pixel_size=size) + self._activity_icon = CanvasIcon(pixel_size=size) self._update_activity() self._buddy.connect('notify::current-activity', diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 24d445c..1d36b54 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -27,7 +27,7 @@ from gi.repository import Gtk from gi.repository import GConf from sugar3.graphics.icon import Icon -from sugar3.graphics.icon import EventIcon +from sugar3.graphics.icon import CanvasIcon from sugar3.graphics import style from sugar3.graphics import palette from sugar3.graphics.menuitem import MenuItem @@ -55,11 +55,11 @@ _OLPC_MESH_ICON_NAME = 'network-mesh' _FILTERED_ALPHA = 0.33 -class _ActivityIcon(EventIcon): +class _ActivityIcon(CanvasIcon): def __init__(self, model, file_name, xo_color, size=style.STANDARD_ICON_SIZE): - EventIcon.__init__(self, file_name=file_name, - xo_color=xo_color, pixel_size=size) + CanvasIcon.__init__(self, file_name=file_name, + xo_color=xo_color, pixel_size=size) self._model = model self.connect('button-release-event', self.__button_release_event_cb) @@ -89,6 +89,7 @@ class _ActivityIcon(EventIcon): item.show() p.menu.append(item) + self.connect_to_palette_pop_events(p) return p def __button_release_event_cb(self, widget, event): diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index 8144980..21c0672 100644 --- a/src/jarabe/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -29,7 +29,7 @@ import simplejson from sugar3.graphics import style from sugar3.graphics.xocolor import XoColor -from sugar3.graphics.icon import EventIcon +from sugar3.graphics.icon import CanvasIcon from sugar3.util import format_size from jarabe.journal.keepicon import KeepIcon @@ -51,9 +51,9 @@ class BuddyList(Gtk.Alignment): hbox = Gtk.HBox() for buddy in buddies: nick_, color = buddy - icon = EventIcon(icon_name='computer-xo', - xo_color=XoColor(color), - pixel_size=style.STANDARD_ICON_SIZE) + icon = CanvasIcon(icon_name='computer-xo', + xo_color=XoColor(color), + pixel_size=style.STANDARD_ICON_SIZE) icon.set_palette(BuddyPalette(buddy)) hbox.pack_start(icon, True, True, 0) self.add(hbox) @@ -171,7 +171,7 @@ class ExpandedEntry(Gtk.EventBox): return keep_icon def _create_icon(self): - icon = EventIcon(file_name=misc.get_icon_name(self._metadata)) + icon = CanvasIcon(file_name=misc.get_icon_name(self._metadata)) icon.connect_after('button-release-event', self._icon_button_release_event_cb) diff --git a/src/jarabe/view/buddyicon.py b/src/jarabe/view/buddyicon.py index e28fc14..cd648b1 100644 --- a/src/jarabe/view/buddyicon.py +++ b/src/jarabe/view/buddyicon.py @@ -16,7 +16,7 @@ from sugar3.graphics import style from sugar3.graphics.palette import Palette -from sugar3.graphics.icon import EventIcon +from sugar3.graphics.icon import CanvasIcon from jarabe.view.buddymenu import BuddyMenu from jarabe.util.normalize import normalize_string @@ -25,10 +25,10 @@ from jarabe.util.normalize import normalize_string _FILTERED_ALPHA = 0.33 -class BuddyIcon(EventIcon): +class BuddyIcon(CanvasIcon): def __init__(self, buddy, pixel_size=style.STANDARD_ICON_SIZE): - EventIcon.__init__(self, icon_name='computer-xo', - pixel_size=pixel_size) + CanvasIcon.__init__(self, icon_name='computer-xo', + pixel_size=pixel_size) self._filtered = False self._buddy = buddy @@ -42,7 +42,9 @@ class BuddyIcon(EventIcon): self._update_color() def create_palette(self): - return BuddyMenu(self._buddy) + palette = BuddyMenu(self._buddy) + self.connect_to_palette_pop_events(palette) + return palette def __button_release_event_cb(self, icon, event): self.props.palette.popup(immediate=True, state=Palette.SECONDARY) |