From 21785a2cf1141f667fb7d89e48dd3ca5c6c70313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Mon, 14 Jan 2013 18:29:00 -0300
Subject: [PATCH shell] Adapt to changes in icons - SL #3569
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>
- Use entry-search instead of system-search in entries
- Keep using system-search in activity list view, but adjust the colors
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
extensions/cpsection/datetime/view.py | 2 +-
src/jarabe/controlpanel/toolbar.py | 2 +-
src/jarabe/desktop/activitieslist.py | 4 ++--
src/jarabe/desktop/viewtoolbar.py | 2 +-
src/jarabe/journal/journaltoolbox.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index e768e03..734240b 100644
a
|
b
|
class TimeZone(SectionView): |
41 | 41 | |
42 | 42 | self._entry = iconentry.IconEntry() |
43 | 43 | self._entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, |
44 | | 'system-search') |
| 44 | 'entry-search') |
45 | 45 | self._entry.add_clear_button() |
46 | 46 | self.pack_start(self._entry, False, False, 0) |
47 | 47 | self._entry.show() |
diff --git a/src/jarabe/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py
index 1423e94..5f298b9 100644
a
|
b
|
class MainToolbar(Gtk.Toolbar): |
50 | 50 | tool_item.show() |
51 | 51 | self._search_entry = iconentry.IconEntry() |
52 | 52 | self._search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, |
53 | | 'system-search') |
| 53 | 'entry-search') |
54 | 54 | self._search_entry.add_clear_button() |
55 | 55 | self._search_entry.set_width_chars(25) |
56 | 56 | text = _('Search in %s') % _('Settings') |
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 7d7ae6f..1cf67ab 100644
a
|
b
|
class ClearMessageBox(Gtk.EventBox): |
333 | 333 | |
334 | 334 | icon = Icon(pixel_size=style.LARGE_ICON_SIZE, |
335 | 335 | icon_name='system-search', |
336 | | stroke_color=style.COLOR_TRANSPARENT.get_svg(), |
337 | | fill_color=style.COLOR_BUTTON_GREY.get_svg()) |
| 336 | stroke_color=style.COLOR_BUTTON_GREY.get_svg(), |
| 337 | fill_color=style.COLOR_TRANSPARENT.get_svg()) |
338 | 338 | box.pack_start(icon, expand=True, fill=False, padding=0) |
339 | 339 | icon.show() |
340 | 340 | |
diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py
index 5cb0186..850ccbc 100644
a
|
b
|
class ViewToolbar(Gtk.Toolbar): |
58 | 58 | |
59 | 59 | self.search_entry = iconentry.IconEntry() |
60 | 60 | self.search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, |
61 | | 'system-search') |
| 61 | 'entry-search') |
62 | 62 | self.set_placeholder_text_for_view(_('Home')) |
63 | 63 | self.search_entry.add_clear_button() |
64 | 64 | self.search_entry.set_width_chars(25) |
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index e87da2d..f794dd7 100644
a
|
b
|
class MainToolbox(ToolbarBox): |
79 | 79 | |
80 | 80 | self.search_entry = iconentry.IconEntry() |
81 | 81 | self.search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, |
82 | | 'system-search') |
| 82 | 'entry-search') |
83 | 83 | text = _('Search in %s') % _('Journal') |
84 | 84 | self.search_entry.set_placeholder_text(text) |
85 | 85 | self.search_entry.connect('activate', self._search_entry_activated_cb) |