From 10445403c28295ffeb77858caa812913aaa88ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Tue, 15 Jan 2013 08:22:36 -0300
Subject: [PATCH browse] Icon changes - 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>
- The refresh icon was moved to Artwork, so can be removed
- Rename browse-dialog-cancel to entry-stop for clarity and consistency
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
edittoolbar.py | 2 +-
icons/browse-dialog-cancel.svg | 17 -----------------
icons/browse-view-refresh.svg | 14 --------------
icons/entry-stop.svg | 17 +++++++++++++++++
webtoolbar.py | 6 +++---
5 files changed, 21 insertions(+), 35 deletions(-)
delete mode 100644 icons/browse-dialog-cancel.svg
delete mode 100644 icons/browse-view-refresh.svg
create mode 100644 icons/entry-stop.svg
diff --git a/edittoolbar.py b/edittoolbar.py
index f77cbbe..a407226 100644
a
|
b
|
class EditToolbar(BaseEditToolbar): |
47 | 47 | search_item = Gtk.ToolItem() |
48 | 48 | self.search_entry = iconentry.IconEntry() |
49 | 49 | self.search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY, |
50 | | 'system-search') |
| 50 | 'entry-search') |
51 | 51 | self.search_entry.add_clear_button() |
52 | 52 | self.search_entry.connect('activate', self.__search_entry_activate_cb) |
53 | 53 | self.search_entry.connect('changed', self.__search_entry_changed_cb) |
diff --git a/icons/browse-dialog-cancel.svg b/icons/browse-dialog-cancel.svg
deleted file mode 100644
index 76e2703..0000000
+
|
-
|
|
1 | | <?xml version="1.0" encoding="UTF-8"?> |
2 | | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ |
3 | | <!ENTITY fill_color "#FFFFFF"> |
4 | | <!ENTITY stroke_color "#010101"> |
5 | | ]> |
6 | | <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-dialog-cancel" xml:space="preserve"> |
7 | | <g transform="matrix(1.3,0,0,1.3,-3.2682282,-3.3351543)" id="browse-dialog-cancel" style="stroke-width:2.69230771;stroke-miterlimit:4;stroke-dasharray:none"> |
8 | | <path |
9 | | d="M 14.798121,7.2131543 6.9900671,15.021208" |
10 | | id="path2986" |
11 | | style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
12 | | <path |
13 | | d="M 6.9900671,7.2131543 14.798121,15.021208" |
14 | | id="path3756" |
15 | | style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
16 | | </g> |
17 | | </svg> |
diff --git a/icons/browse-view-refresh.svg b/icons/browse-view-refresh.svg
deleted file mode 100644
index 0682978..0000000
+
|
-
|
|
1 | | <?xml version="1.0" encoding="UTF-8"?> |
2 | | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ |
3 | | <!ENTITY fill_color "#FFFFFF"> |
4 | | <!ENTITY stroke_color "#010101"> |
5 | | ]> |
6 | | <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-view-refresh" xml:space="preserve"> |
7 | | <path |
8 | | d="m 9.769744,17.559712 c -3.044496,-0.6084 -5.33832,-3.295344 -5.33832,-6.51768 0,-3.67224 2.97648,-6.649344 6.646848,-6.649344 3.672864,0 6.649344,2.977104 6.649344,6.649344 0,3.166176 -2.215824,5.816928 -5.18232,6.48648" id="path3220" style="fill:none;stroke:&stroke_color;;stroke-width:2.18400002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
9 | | <polyline |
10 | | points=" 22.936,31.578 25.5,37.994 18.746,39.439 " |
11 | | id="polyline3222" |
12 | | style="fill:none;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" |
13 | | transform="matrix(0.624,0,0,0.624,-6.142256,-6.148544)" /> |
14 | | </svg> |
diff --git a/icons/entry-stop.svg b/icons/entry-stop.svg
new file mode 100644
index 0000000..76e2703
-
|
+
|
|
| 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ |
| 3 | <!ENTITY fill_color "#FFFFFF"> |
| 4 | <!ENTITY stroke_color "#010101"> |
| 5 | ]> |
| 6 | <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22.16" height="22.16" viewBox="0 0 22.16 22.16" id="browse-dialog-cancel" xml:space="preserve"> |
| 7 | <g transform="matrix(1.3,0,0,1.3,-3.2682282,-3.3351543)" id="browse-dialog-cancel" style="stroke-width:2.69230771;stroke-miterlimit:4;stroke-dasharray:none"> |
| 8 | <path |
| 9 | d="M 14.798121,7.2131543 6.9900671,15.021208" |
| 10 | id="path2986" |
| 11 | style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
| 12 | <path |
| 13 | d="M 6.9900671,7.2131543 14.798121,15.021208" |
| 14 | id="path3756" |
| 15 | style="fill:none;stroke:&stroke_color;;stroke-width:2.69230771;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> |
| 16 | </g> |
| 17 | </svg> |
diff --git a/webtoolbar.py b/webtoolbar.py
index dc0b3de..19f2b21 100644
a
|
b
|
class PrimaryToolbar(ToolbarBase): |
278 | 278 | |
279 | 279 | self.entry = WebEntry() |
280 | 280 | self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY, |
281 | | 'browse-dialog-cancel') |
| 281 | 'entry-stop') |
282 | 282 | self.entry.connect('icon-press', self._stop_and_reload_cb) |
283 | 283 | self.entry.connect('activate', self._entry_activate_cb) |
284 | 284 | self.entry.connect('focus-in-event', self.__focus_in_event_cb) |
… |
… |
class PrimaryToolbar(ToolbarBase): |
436 | 436 | |
437 | 437 | def _show_stop_icon(self): |
438 | 438 | self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY, |
439 | | 'browse-dialog-cancel') |
| 439 | 'entry-stop') |
440 | 440 | |
441 | 441 | def _show_reload_icon(self): |
442 | 442 | self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY, |
443 | | 'browse-view-refresh') |
| 443 | 'entry-refresh') |
444 | 444 | |
445 | 445 | def _update_navigation_buttons(self): |
446 | 446 | can_go_back = self._browser.can_go_back() |