From f95ed83c3eea358383ffe6052d6bb74422937c7e Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Tue, 15 Jan 2013 11:22:36 +0000
Subject: Adapt to icon changes - SL #3569

- The stop and refresh icons were moved to Sugar Artwork, so can be
  removed.  They have also been renamed, so change the code
  accordingly.

- The system-search has been renamed to entry-search in Sugar Artwork.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
---
diff --git a/edittoolbar.py b/edittoolbar.py
index f77cbbe..a407226 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -47,7 +47,7 @@ class EditToolbar(BaseEditToolbar):
         search_item = Gtk.ToolItem()
         self.search_entry = iconentry.IconEntry()
         self.search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY,
-                                             'system-search')
+                                             'entry-search')
         self.search_entry.add_clear_button()
         self.search_entry.connect('activate', self.__search_entry_activate_cb)
         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
--- a/icons/browse-dialog-cancel.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-  <!ENTITY fill_color "#FFFFFF">
-  <!ENTITY stroke_color "#010101">
-]>
-<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">
-  <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">
-    <path
-       d="M 14.798121,7.2131543 6.9900671,15.021208"
-       id="path2986"
-       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" />
-    <path
-       d="M 6.9900671,7.2131543 14.798121,15.021208"
-       id="path3756"
-       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" />
-  </g>
-</svg>
diff --git a/icons/browse-view-refresh.svg b/icons/browse-view-refresh.svg
deleted file mode 100644
index 0682978..0000000
--- a/icons/browse-view-refresh.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-  <!ENTITY fill_color "#FFFFFF">
-  <!ENTITY stroke_color "#010101">
-]>
-<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">
-  <path
-      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" />
-  <polyline
-      points="    22.936,31.578 25.5,37.994 18.746,39.439   "
-      id="polyline3222"
-      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"
-      transform="matrix(0.624,0,0,0.624,-6.142256,-6.148544)" />
-</svg>
diff --git a/webtoolbar.py b/webtoolbar.py
index dc0b3de..19f2b21 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -278,7 +278,7 @@ class PrimaryToolbar(ToolbarBase):
 
         self.entry = WebEntry()
         self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY,
-                                      'browse-dialog-cancel')
+                                      'entry-stop')
         self.entry.connect('icon-press', self._stop_and_reload_cb)
         self.entry.connect('activate', self._entry_activate_cb)
         self.entry.connect('focus-in-event', self.__focus_in_event_cb)
@@ -436,11 +436,11 @@ class PrimaryToolbar(ToolbarBase):
 
     def _show_stop_icon(self):
         self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY,
-                                      'browse-dialog-cancel')
+                                      'entry-stop')
 
     def _show_reload_icon(self):
         self.entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY,
-                                      'browse-view-refresh')
+                                      'entry-refresh')
 
     def _update_navigation_buttons(self):
         can_go_back = self._browser.can_go_back()
--
cgit v0.9.1