[Sugar-devel] [sugar] Replace named_icon by icon_name in ToolButton and similar

godiard at sugarlabs.org godiard at sugarlabs.org
Wed Sep 19 16:26:23 EDT 2012


From: Gonzalo Odiard <godiard at gmail.com>

This change is needed by the change done in sigar-toolkit-gtk3

Signed-off-by: Gonzalo Odiard <gonzalo at laptop.org>
---
 src/jarabe/desktop/homebox.py        | 4 ++--
 src/jarabe/frame/zoomtoolbar.py      | 2 +-
 src/jarabe/journal/volumestoolbar.py | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py
index 59550e9..1d84c2d 100644
--- a/src/jarabe/desktop/homebox.py
+++ b/src/jarabe/desktop/homebox.py
@@ -192,7 +192,7 @@ class HomeToolbar(Gtk.Toolbar):
         self.insert(favorites_button, -1)
         favorites_button.show()
 
-        self._list_button = RadioToolButton(named_icon='view-list')
+        self._list_button = RadioToolButton(icon_name='view-list')
         self._list_button.props.group = favorites_button
         self._list_button.props.tooltip = _('List view')
         self._list_button.props.accelerator = _('<Ctrl>2')
@@ -291,5 +291,5 @@ class FavoritesButton(RadioToolButton):
             self.emit('toggled')
 
     def _update_icon(self):
-        self.props.named_icon = favoritesview.LAYOUT_MAP[self._layout]\
+        self.props.icon_name = favoritesview.LAYOUT_MAP[self._layout]\
                                 .icon_name
diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py
index ae7d050..fcef08b 100644
--- a/src/jarabe/frame/zoomtoolbar.py
+++ b/src/jarabe/frame/zoomtoolbar.py
@@ -59,7 +59,7 @@ class ZoomToolbar(Gtk.Toolbar):
         else:
             group = None
 
-        button = RadioToolButton(named_icon=icon_name, group=group,
+        button = RadioToolButton(icon_name=icon_name, group=group,
                                  accelerator=accelerator)
         button.connect('clicked', self.__level_clicked_cb, zoom_level)
         self.add(button)
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index 0f7bdce..9c25ff6 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -334,7 +334,7 @@ class VolumeButton(BaseButton):
         if icon_name is None:
             icon_name = 'drive'
 
-        self.props.named_icon = icon_name
+        self.props.icon_name = icon_name
 
         # TODO: retrieve the colors from the owner of the device
         client = GConf.Client.get_default()
@@ -352,7 +352,7 @@ class JournalButton(BaseButton):
     def __init__(self):
         BaseButton.__init__(self, mount_point='/')
 
-        self.props.named_icon = 'activity-journal'
+        self.props.icon_name = 'activity-journal'
 
         client = GConf.Client.get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
@@ -398,7 +398,7 @@ class DocumentsButton(BaseButton):
     def __init__(self, documents_path):
         BaseButton.__init__(self, mount_point=documents_path)
 
-        self.props.named_icon = 'user-documents'
+        self.props.icon_name = 'user-documents'
 
         client = GConf.Client.get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
-- 
1.7.11.4



More information about the Sugar-devel mailing list