From d4987131efeef4ec98bc971ad59e842d7f2f3f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Wed, 10 Oct 2012 17:07:46 -0300
Subject: [PATCH shell 2/2] Port icons in canvas from EventIcon to CanvasIcon
for press and hover feedback - SL #3989
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>
Except for the pulsing icon EventPulsingIcon that is informatinal
only.
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
extensions/cpsection/aboutme/view.py | 8 ++++----
src/jarabe/desktop/favoritesview.py | 6 +++---
src/jarabe/desktop/friendview.py | 4 ++--
src/jarabe/desktop/meshbox.py | 9 +++++----
src/jarabe/journal/expandedentry.py | 10 +++++-----
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
|
b
|
from gettext import gettext as _ |
21 | 21 | |
22 | 22 | from sugar3.graphics import style |
23 | 23 | from sugar3.graphics.xocolor import XoColor, colors |
24 | | from sugar3.graphics.icon import EventIcon |
| 24 | from sugar3.graphics.icon import CanvasIcon |
25 | 25 | |
26 | 26 | from jarabe.controlpanel.sectionview import SectionView |
27 | 27 | from jarabe.controlpanel.inlinealert import InlineAlert |
… |
… |
_NEXT_STROKE_COLOR = 3 |
111 | 111 | _PREVIOUS_STROKE_COLOR = 4 |
112 | 112 | |
113 | 113 | |
114 | | class ColorPicker(EventIcon): |
| 114 | class ColorPicker(CanvasIcon): |
115 | 115 | __gsignals__ = { |
116 | 116 | 'color-changed': (GObject.SignalFlags.RUN_FIRST, |
117 | 117 | None, |
… |
… |
class ColorPicker(EventIcon): |
119 | 119 | } |
120 | 120 | |
121 | 121 | def __init__(self, picker): |
122 | | EventIcon.__init__(self, icon_name='computer-xo', |
123 | | pixel_size=style.XLARGE_ICON_SIZE) |
| 122 | CanvasIcon.__init__(self, icon_name='computer-xo', |
| 123 | pixel_size=style.XLARGE_ICON_SIZE) |
124 | 124 | self._picker = picker |
125 | 125 | self._color = None |
126 | 126 | |
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index d16b95e..056a4aa 100644
a
|
b
|
from gi.repository import GdkPixbuf |
28 | 28 | |
29 | 29 | from sugar3.graphics import style |
30 | 30 | from sugar3.graphics.icon import Icon |
31 | | from sugar3.graphics.icon import EventIcon |
32 | 31 | from sugar3.graphics.icon import CanvasIcon |
33 | 32 | from sugar3.graphics.menuitem import MenuItem |
34 | 33 | from sugar3.graphics.alert import Alert |
… |
… |
class FavoritePalette(ActivityPalette): |
540 | 539 | self.emit('entry-activate', entry) |
541 | 540 | |
542 | 541 | |
543 | | class CurrentActivityIcon(EventIcon): |
| 542 | class CurrentActivityIcon(CanvasIcon): |
544 | 543 | def __init__(self): |
545 | | EventIcon.__init__(self, icon_name='activity-journal', |
| 544 | CanvasIcon.__init__(self, icon_name='activity-journal', |
546 | 545 | pixel_size=style.STANDARD_ICON_SIZE, cache=True) |
547 | 546 | self._home_model = shell.get_model() |
548 | 547 | self._home_activity = self._home_model.get_active_activity() |
… |
… |
class CurrentActivityIcon(EventIcon): |
574 | 573 | palette = JournalPalette(self._home_activity) |
575 | 574 | else: |
576 | 575 | palette = CurrentActivityPalette(self._home_activity) |
| 576 | self.connect_palette_pop_events(palette) |
577 | 577 | return palette |
578 | 578 | |
579 | 579 | 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
|
b
|
|
18 | 18 | from gi.repository import Gtk |
19 | 19 | |
20 | 20 | from sugar3.graphics import style |
21 | | from sugar3.graphics.icon import EventIcon |
| 21 | from sugar3.graphics.icon import CanvasIcon |
22 | 22 | |
23 | 23 | from jarabe.view.buddyicon import BuddyIcon |
24 | 24 | from jarabe.model import bundleregistry |
… |
… |
class FriendView(Gtk.VBox): |
38 | 38 | self.add(self._buddy_icon) |
39 | 39 | self._buddy_icon.show() |
40 | 40 | |
41 | | self._activity_icon = EventIcon(pixel_size=size) |
| 41 | self._activity_icon = CanvasIcon(pixel_size=size) |
42 | 42 | self._update_activity() |
43 | 43 | |
44 | 44 | self._buddy.connect('notify::current-activity', |
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 24d445c..0b1c43d 100644
a
|
b
|
from gi.repository import Gtk |
27 | 27 | from gi.repository import GConf |
28 | 28 | |
29 | 29 | from sugar3.graphics.icon import Icon |
30 | | from sugar3.graphics.icon import EventIcon |
| 30 | from sugar3.graphics.icon import CanvasIcon |
31 | 31 | from sugar3.graphics import style |
32 | 32 | from sugar3.graphics import palette |
33 | 33 | from sugar3.graphics.menuitem import MenuItem |
… |
… |
_OLPC_MESH_ICON_NAME = 'network-mesh' |
55 | 55 | _FILTERED_ALPHA = 0.33 |
56 | 56 | |
57 | 57 | |
58 | | class _ActivityIcon(EventIcon): |
| 58 | class _ActivityIcon(CanvasIcon): |
59 | 59 | def __init__(self, model, file_name, xo_color, |
60 | 60 | size=style.STANDARD_ICON_SIZE): |
61 | | EventIcon.__init__(self, file_name=file_name, |
62 | | xo_color=xo_color, pixel_size=size) |
| 61 | CanvasIcon.__init__(self, file_name=file_name, |
| 62 | xo_color=xo_color, pixel_size=size) |
63 | 63 | self._model = model |
64 | 64 | self.connect('button-release-event', |
65 | 65 | self.__button_release_event_cb) |
… |
… |
class _ActivityIcon(EventIcon): |
89 | 89 | item.show() |
90 | 90 | p.menu.append(item) |
91 | 91 | |
| 92 | self.connect_palette_pop_events(p) |
92 | 93 | return p |
93 | 94 | |
94 | 95 | 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
|
b
|
import simplejson |
29 | 29 | |
30 | 30 | from sugar3.graphics import style |
31 | 31 | from sugar3.graphics.xocolor import XoColor |
32 | | from sugar3.graphics.icon import EventIcon |
| 32 | from sugar3.graphics.icon import CanvasIcon |
33 | 33 | from sugar3.util import format_size |
34 | 34 | |
35 | 35 | from jarabe.journal.keepicon import KeepIcon |
… |
… |
class BuddyList(Gtk.Alignment): |
51 | 51 | hbox = Gtk.HBox() |
52 | 52 | for buddy in buddies: |
53 | 53 | nick_, color = buddy |
54 | | icon = EventIcon(icon_name='computer-xo', |
55 | | xo_color=XoColor(color), |
56 | | pixel_size=style.STANDARD_ICON_SIZE) |
| 54 | icon = CanvasIcon(icon_name='computer-xo', |
| 55 | xo_color=XoColor(color), |
| 56 | pixel_size=style.STANDARD_ICON_SIZE) |
57 | 57 | icon.set_palette(BuddyPalette(buddy)) |
58 | 58 | hbox.pack_start(icon, True, True, 0) |
59 | 59 | self.add(hbox) |
… |
… |
class ExpandedEntry(Gtk.EventBox): |
171 | 171 | return keep_icon |
172 | 172 | |
173 | 173 | def _create_icon(self): |
174 | | icon = EventIcon(file_name=misc.get_icon_name(self._metadata)) |
| 174 | icon = CanvasIcon(file_name=misc.get_icon_name(self._metadata)) |
175 | 175 | icon.connect_after('button-release-event', |
176 | 176 | self._icon_button_release_event_cb) |
177 | 177 | |
diff --git a/src/jarabe/view/buddyicon.py b/src/jarabe/view/buddyicon.py
index e28fc14..fc7213a 100644
a
|
b
|
|
16 | 16 | |
17 | 17 | from sugar3.graphics import style |
18 | 18 | from sugar3.graphics.palette import Palette |
19 | | from sugar3.graphics.icon import EventIcon |
| 19 | from sugar3.graphics.icon import CanvasIcon |
20 | 20 | |
21 | 21 | from jarabe.view.buddymenu import BuddyMenu |
22 | 22 | from jarabe.util.normalize import normalize_string |
… |
… |
from jarabe.util.normalize import normalize_string |
25 | 25 | _FILTERED_ALPHA = 0.33 |
26 | 26 | |
27 | 27 | |
28 | | class BuddyIcon(EventIcon): |
| 28 | class BuddyIcon(CanvasIcon): |
29 | 29 | def __init__(self, buddy, pixel_size=style.STANDARD_ICON_SIZE): |
30 | | EventIcon.__init__(self, icon_name='computer-xo', |
31 | | pixel_size=pixel_size) |
| 30 | CanvasIcon.__init__(self, icon_name='computer-xo', |
| 31 | pixel_size=pixel_size) |
32 | 32 | |
33 | 33 | self._filtered = False |
34 | 34 | self._buddy = buddy |
… |
… |
class BuddyIcon(EventIcon): |
42 | 42 | self._update_color() |
43 | 43 | |
44 | 44 | def create_palette(self): |
45 | | return BuddyMenu(self._buddy) |
| 45 | palette = BuddyMenu(self._buddy) |
| 46 | self.connect_palette_pop_events(palette) |
| 47 | return palette |
46 | 48 | |
47 | 49 | def __button_release_event_cb(self, icon, event): |
48 | 50 | self.props.palette.popup(immediate=True, state=Palette.SECONDARY) |