diff options
author | Manuel Quiñones <manuq@laptop.org> | 2012-11-06 18:44:30 (GMT) |
---|---|---|
committer | Manuel Quiñones <manuq@laptop.org> | 2012-11-07 12:52:24 (GMT) |
commit | 798548f856b8ada8a41cd700e1ed0f2c79a8643f (patch) | |
tree | e6dce7788bb775cd8cf38843a664be6c5fc997ea /extensions | |
parent | c6b4c32f290d693a95cdcf88b956fd891ae0b13d (diff) |
Palettes: adjust to the new API - SL #4144
The API now allows to hide the implementation details using a
PaletteMenuBox as container.
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/deviceicon/battery.py | 21 | ||||
-rw-r--r-- | extensions/deviceicon/network.py | 7 | ||||
-rw-r--r-- | extensions/deviceicon/speaker.py | 27 | ||||
-rw-r--r-- | extensions/deviceicon/speech.py | 45 | ||||
-rw-r--r-- | extensions/deviceicon/volume.py | 5 |
5 files changed, 59 insertions, 46 deletions
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index 7fcca8d..0a1bf26 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -27,6 +27,7 @@ from sugar3.graphics import style from sugar3.graphics.icon import get_icon_state from sugar3.graphics.tray import TrayIcon from sugar3.graphics.palette import Palette +from sugar3.graphics.palettemenu import PaletteMenuBox from sugar3.graphics.xocolor import XoColor from jarabe.frame.frameinvoker import FrameWidgetInvoker @@ -116,21 +117,25 @@ class BatteryPalette(Palette): self._level = 0 self._time = 0 self._status = _STATUS_NOT_PRESENT + + self._progress_widget = PaletteMenuBox() + self.set_content(self._progress_widget) + self._progress_widget.show() + + inner_box = Gtk.VBox() + self._progress_widget.append_item(inner_box) + inner_box.show() + self._progress_bar = Gtk.ProgressBar() self._progress_bar.set_size_request( style.zoom(style.GRID_CELL_SIZE * 4), -1) + inner_box.pack_start(self._progress_bar, True, True, 0) self._progress_bar.show() + self._status_label = Gtk.Label() + inner_box.pack_start(self._status_label, True, True, 0) self._status_label.show() - vbox = Gtk.VBox() - vbox.pack_start(self._progress_bar, True, True, 0) - vbox.pack_start(self._status_label, True, True, 0) - vbox.show() - - self._progress_widget = vbox - self.set_content(self._progress_widget) - def set_info(self, percentage, seconds, status): self._level = percentage self._time = seconds diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py index 3351281..fbd0ef4 100644 --- a/extensions/deviceicon/network.py +++ b/extensions/deviceicon/network.py @@ -34,8 +34,9 @@ import dbus from sugar3.graphics.icon import get_icon_state from sugar3.graphics import style from sugar3.graphics.palette import Palette -from sugar3.graphics.palettemenuitem import PaletteMenuItem -from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator +from sugar3.graphics.palettemenu import PaletteMenuBox +from sugar3.graphics.palettemenu import PaletteMenuItem +from sugar3.graphics.palettemenu import PaletteMenuItemSeparator from sugar3.graphics.toolbutton import ToolButton from sugar3.graphics.tray import TrayIcon from sugar3.graphics.icon import Icon @@ -74,6 +75,8 @@ class WirelessPalette(Palette): self._channel_label.show() self._ip_address_label = Gtk.Label() + self._ip_address_label.props.xalign = 0.0 + self._ip_address_label.show() self._info = Gtk.VBox() diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py index 8260d49..67c3f27 100644 --- a/extensions/deviceicon/speaker.py +++ b/extensions/deviceicon/speaker.py @@ -25,8 +25,9 @@ from sugar3.graphics import style from sugar3.graphics.icon import get_icon_state, Icon from sugar3.graphics.tray import TrayIcon from sugar3.graphics.palette import Palette -from sugar3.graphics.palettemenuitem import PaletteMenuItem -from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator +from sugar3.graphics.palettemenu import PaletteMenuBox +from sugar3.graphics.palettemenu import PaletteMenuItem +from sugar3.graphics.palettemenu import PaletteMenuItemSeparator from sugar3.graphics.xocolor import XoColor from jarabe.frame.frameinvoker import FrameWidgetInvoker @@ -90,19 +91,19 @@ class SpeakerPalette(Palette): self._model = model - vbox = Gtk.VBox() - self.set_content(vbox) - vbox.show() + box = PaletteMenuBox() + self.set_content(box) + box.show() self._mute_item = PaletteMenuItem('') self._mute_icon = Icon(icon_size=Gtk.IconSize.MENU) self._mute_item.set_image(self._mute_icon) - vbox.add(self._mute_item) + box.append_item(self._mute_item) self._mute_item.show() self._mute_item.connect('activate', self.__mute_activate_cb) separator = PaletteMenuItemSeparator() - vbox.pack_start(separator, True, True, 0) + box.append_item(separator) separator.show() vol_step = sound.VOLUME_STEP @@ -112,11 +113,13 @@ class SpeakerPalette(Palette): step_incr=vol_step, page_incr=vol_step, page_size=vol_step) - self._hscale = Gtk.HScale() - self._hscale.set_adjustment(self._adjustment) - self._hscale.set_digits(0) - vbox.add(self._hscale) - self._hscale.show() + + hscale = Gtk.HScale() + hscale.props.draw_value = False + hscale.set_adjustment(self._adjustment) + hscale.set_digits(0) + box.append_item(hscale) + hscale.show() self._adjustment_handler_id = \ self._adjustment.connect('value_changed', diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py index 1f7bf02..a0a2ad1 100644 --- a/extensions/deviceicon/speech.py +++ b/extensions/deviceicon/speech.py @@ -24,8 +24,9 @@ from gi.repository import GObject from sugar3.graphics.icon import Icon from sugar3.graphics.tray import TrayIcon from sugar3.graphics.palette import Palette -from sugar3.graphics.palettemenuitem import PaletteMenuItem -from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator +from sugar3.graphics.palettemenu import PaletteMenuBox +from sugar3.graphics.palettemenu import PaletteMenuItem +from sugar3.graphics.palettemenu import PaletteMenuItemSeparator from sugar3.graphics.xocolor import XoColor from sugar3.graphics import style @@ -66,9 +67,9 @@ class SpeechPalette(Palette): self._manager.connect('stop', self._set_menu_state, 'stop') self._manager.connect('pause', self._set_menu_state, 'pause') - vbox = Gtk.VBox() - self.set_content(vbox) - vbox.show() + box = PaletteMenuBox() + self.set_content(box) + box.show() self._play_icon = Icon(icon_name='player_play') self._pause_icon = Icon(icon_name='player_pause') @@ -77,48 +78,48 @@ class SpeechPalette(Palette): text_label=_('Say selected text')) self._play_pause_menu.set_image(self._play_icon) self._play_pause_menu.connect('activate', self.__play_activated_cb) - vbox.pack_start(self._play_pause_menu, True, True, 0) + box.append_item(self._play_pause_menu) self._play_pause_menu.show() self._stop_menu = PaletteMenuItem(icon_name='player_stop', text_label=_('Stop playback')) self._stop_menu.connect('activate', self.__stop_activated_cb) self._stop_menu.set_sensitive(False) - vbox.pack_start(self._stop_menu, True, True, 0) - self._stop_menu.show() + box.append_item(self._stop_menu) separator = PaletteMenuItemSeparator() - vbox.pack_start(separator, True, True, 0) + box.append_item(separator) separator.show() pitch_label = Gtk.Label(_('Pitch')) - vbox.pack_start(pitch_label, True, True, padding=style.DEFAULT_PADDING) + box.append_item(pitch_label, vertical_padding=0) pitch_label.show() self._adj_pitch = Gtk.Adjustment(value=self._manager.get_pitch(), lower=self._manager.MIN_PITCH, upper=self._manager.MAX_PITCH) - self._hscale_pitch = Gtk.HScale() - self._hscale_pitch.set_adjustment(self._adj_pitch) - self._hscale_pitch.set_draw_value(False) - vbox.pack_start(self._hscale_pitch, True, True, 0) - self._hscale_pitch.show() + hscale_pitch = Gtk.HScale() + hscale_pitch.set_adjustment(self._adj_pitch) + hscale_pitch.set_draw_value(False) + + box.append_item(hscale_pitch, vertical_padding=0) + hscale_pitch.show() rate_label = Gtk.Label(_('Rate')) - vbox.pack_start(rate_label, True, True, - padding=style.DEFAULT_PADDING) + box.append_item(rate_label, vertical_padding=0) rate_label.show() self._adj_rate = Gtk.Adjustment(value=self._manager.get_rate(), lower=self._manager.MIN_RATE, upper=self._manager.MAX_RATE) - self._hscale_rate = Gtk.HScale() - self._hscale_rate.set_adjustment(self._adj_rate) - self._hscale_rate.set_draw_value(False) - vbox.pack_start(self._hscale_rate, True, True, 0) - self._hscale_rate.show() + hscale_rate = Gtk.HScale() + hscale_rate.set_adjustment(self._adj_rate) + hscale_rate.set_draw_value(False) + + box.append_item(hscale_rate, vertical_padding=0) + hscale_rate.show() self._adj_pitch.connect('value_changed', self.__adj_pitch_changed_cb) self._adj_rate.connect('value_changed', self.__adj_rate_changed_cb) diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py index 6930811..76cb41b 100644 --- a/extensions/deviceicon/volume.py +++ b/extensions/deviceicon/volume.py @@ -24,8 +24,9 @@ from gi.repository import GConf from sugar3.graphics.tray import TrayIcon from sugar3.graphics.xocolor import XoColor -from sugar3.graphics.palettemenuitem import PaletteMenuItem -from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator +from sugar3.graphics.palettemenu import PaletteMenuBox +from sugar3.graphics.palettemenu import PaletteMenuItem +from sugar3.graphics.palettemenu import PaletteMenuItemSeparator from sugar3.graphics.icon import Icon from jarabe.journal import journalactivity |