diff options
| author | Simon Schampijer <simon@laptop.org> | 2012-09-20 07:10:57 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2012-09-20 07:10:57 (GMT) |
| commit | 3c34d616fec2ae4831870848e265eb9e849287f2 (patch) | |
| tree | c6cfafb4dbb1ef45d49c0790f91a695cb9bc526f /src | |
| parent | 9f76608b744ebf4f831f87793785d20a47305d24 (diff) | |
ToolButton & similar: adapt to new API which uses the icon_name property
This patch depends on commit fe11a3aa23c0e7fbc3c0c498e147b0a20348cc12
in sugar-toolkit-gtk3.
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/viewtoolbar.py | 5 | ||||
| -rw-r--r-- | src/jarabe/frame/zoomtoolbar.py | 2 | ||||
| -rw-r--r-- | src/jarabe/journal/volumestoolbar.py | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py index 96df68e..09b4512 100644 --- a/src/jarabe/desktop/viewtoolbar.py +++ b/src/jarabe/desktop/viewtoolbar.py @@ -74,7 +74,7 @@ class ViewToolbar(Gtk.Toolbar): _FAVORITES_VIEW) self.insert(self._favorites_button, -1) - self._list_button = RadioToolButton(named_icon='view-list') + self._list_button = RadioToolButton(icon_name='view-list') self._list_button.props.group = self._favorites_button self._list_button.props.tooltip = _('List view') self._list_button.props.accelerator = _('<Ctrl>2') @@ -183,5 +183,4 @@ class FavoritesButton(RadioToolButton): self.emit('toggled') def _update_icon(self): - self.props.named_icon = favoritesview.LAYOUT_MAP[self._layout]\ - .icon_name + 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 5efc772..befca5c 100644 --- a/src/jarabe/frame/zoomtoolbar.py +++ b/src/jarabe/frame/zoomtoolbar.py @@ -63,7 +63,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 1b86cb2..8f4692d 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')) |