diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-08-20 16:07:15 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-08-20 16:07:15 (GMT) |
| commit | f7bc2db7073fce3ace9d66a5a4b32765cd43d119 (patch) | |
| tree | 53fb1a6abe2d491261274fd9586f5a82e61aa102 /volumestoolbar.py | |
| parent | c1658394987a21c7ab06a9a8ff2723c6e1a9f807 (diff) | |
#1999: Colored volume icons.
Diffstat (limited to 'volumestoolbar.py')
| -rw-r--r-- | volumestoolbar.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/volumestoolbar.py b/volumestoolbar.py index ae8ec9a..b821225 100644 --- a/volumestoolbar.py +++ b/volumestoolbar.py @@ -26,6 +26,7 @@ from sugar.activity import activity from sugar.datastore import datastore from sugar.graphics.radiotoolbutton import RadioToolButton from sugar.graphics.palette import Palette +from sugar import profile HAL_SERVICE_NAME = 'org.freedesktop.Hal' HAL_MANAGER_PATH = '/org/freedesktop/Hal/Manager' @@ -52,7 +53,8 @@ class VolumesToolbar(gtk.Toolbar): # Internal flash is not in HAL internal_flash = datastore.mounts()[0] - self._add_button(internal_flash['id'], _('Journal'), 'activity-journal') + self._add_button(internal_flash['id'], _('Journal'), 'activity-journal', + profile.get_color()) bus = dbus.SystemBus() proxy = bus.get_object(HAL_SERVICE_NAME, HAL_MANAGER_PATH) @@ -103,7 +105,8 @@ class VolumesToolbar(gtk.Toolbar): return volume_id = self._mount_in_datastore(udi) volume_name, icon_name = self._get_volume_name_and_icon(udi) - self._add_button(volume_id, volume_name, icon_name, udi) + self._add_button(volume_id, volume_name, icon_name, + profile.get_color(), udi) else: self._remove_button(udi) return @@ -142,7 +145,8 @@ class VolumesToolbar(gtk.Toolbar): if device.GetProperty('volume.is_mounted'): volume_id = self._mount_in_datastore(udi) volume_name, icon_name = self._get_volume_name_and_icon(udi) - self._add_button(volume_id, volume_name, icon_name, udi) + self._add_button(volume_id, volume_name, icon_name, + profile.get_color(), udi) return label = device.GetProperty('volume.label') @@ -189,7 +193,7 @@ class VolumesToolbar(gtk.Toolbar): logging.debug('mounted volume %s' % mount_point) - def _add_button(self, volume_id, volume_name, icon_name, udi=None): + def _add_button(self, volume_id, volume_name, icon_name, xo_color, udi=None): logging.debug('VolumeToolbar._add_button: %r' % volume_name) if self.get_children(): @@ -200,7 +204,7 @@ class VolumesToolbar(gtk.Toolbar): palette = Palette(volume_name) palette.props.position = Palette.TOP - button = VolumeButton(icon_name, group, volume_id) + button = VolumeButton(icon_name, group, volume_id, xo_color) button.set_palette(palette) button.connect('toggled', self._button_toggled_cb, volume_id) self.insert(button, -1) @@ -300,8 +304,8 @@ class VolumesToolbar(gtk.Toolbar): return volume_name, icon_name class VolumeButton(RadioToolButton): - def __init__(self, icon_name, group, volume_id): - RadioToolButton.__init__(self, icon_name, group) + def __init__(self, icon_name, group, volume_id, xo_color): + RadioToolButton.__init__(self, icon_name, group, xo_color) self._volume_id = volume_id self.drag_dest_set(gtk.DEST_DEFAULT_ALL, [('journal-object-id', 0, 0)], |