diff options
author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-16 15:16:21 (GMT) |
---|---|---|
committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-24 19:22:02 (GMT) |
commit | 54dc55baad526a5b80273585cf414d401219df6a (patch) | |
tree | 3da061f8bae53534b897b22392a7527870c7250f /extensions/deviceicon | |
parent | c01171f8a2da07d0c9901848f4519a2cffb90c81 (diff) |
pep8 cleanup: fix number of blank lines
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
Diffstat (limited to 'extensions/deviceicon')
-rw-r--r-- | extensions/deviceicon/battery.py | 5 | ||||
-rw-r--r-- | extensions/deviceicon/network.py | 6 | ||||
-rw-r--r-- | extensions/deviceicon/speaker.py | 4 | ||||
-rw-r--r-- | extensions/deviceicon/volume.py | 11 |
4 files changed, 25 insertions, 1 deletions
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index 8b1bac8..c1c920b 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -30,6 +30,7 @@ from sugar.graphics.xocolor import XoColor from jarabe.frame.frameinvoker import FrameWidgetInvoker + _ICON_NAME = 'battery' _STATUS_CHARGING = 0 @@ -42,6 +43,7 @@ _CHARGING_PROP = 'battery.rechargeable.is_charging' _DISCHARGING_PROP = 'battery.rechargeable.is_discharging' _PRESENT_PROP = 'battery.present' + class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 102 @@ -101,6 +103,7 @@ class DeviceView(TrayIcon): def _battery_status_changed_cb(self, pspec, param): self._update_info() + class BatteryPalette(Palette): def __init__(self, primary_text): @@ -155,6 +158,7 @@ class BatteryPalette(Palette): self.props.secondary_text = secondary_text self._status_label.set_text(status_text) + class DeviceModel(gobject.GObject): __gproperties__ = { 'level' : (int, None, None, 0, 100, 0, @@ -241,6 +245,7 @@ class DeviceModel(gobject.GObject): self._present = self._get_present() self.notify('present') + def setup(tray): bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) proxy = bus.get_object('org.freedesktop.Hal', diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py index 447cad5..55e334f 100644 --- a/extensions/deviceicon/network.py +++ b/extensions/deviceicon/network.py @@ -49,6 +49,7 @@ from jarabe.model.network import IP4Config from jarabe.frame.frameinvoker import FrameWidgetInvoker from jarabe.view.pulsingicon import PulsingIcon + IP_ADDRESS_TEXT_TEMPLATE = _("IP address: %s") _NM_SERVICE = 'org.freedesktop.NetworkManager' @@ -199,6 +200,7 @@ class WiredPalette(Palette): ip_address_text = "" self._ip_address_label.set_text(ip_address_text) + class GsmPalette(Palette): __gtype_name__ = 'SugarGsmPalette' @@ -749,6 +751,7 @@ class GsmDeviceView(TrayIcon): signal_name='PppStats', path=self._device.object_path, dbus_interface=_NM_SERIAL_IFACE) + def create_palette(self): palette = GsmPalette() @@ -1001,6 +1004,7 @@ class WiredDeviceObserver(object): del self._device_view self._device_view = None + class GsmDeviceObserver(object): def __init__(self, device, tray): self._device = device @@ -1015,6 +1019,7 @@ class GsmDeviceObserver(object): self._tray.remove_device(self._device_view) self._device_view = None + class NetworkManagerObserver(object): def __init__(self, tray): self._bus = dbus.SystemBus() @@ -1073,5 +1078,6 @@ class NetworkManagerObserver(object): device.disconnect() del self._devices[device_op] + def setup(tray): device_observer = NetworkManagerObserver(tray) diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py index cf06e01..ae84036 100644 --- a/extensions/deviceicon/speaker.py +++ b/extensions/deviceicon/speaker.py @@ -32,6 +32,7 @@ from jarabe.model import sound _ICON_NAME = 'speaker' + class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 103 @@ -86,6 +87,7 @@ class DeviceView(TrayIcon): def __speaker_status_changed_cb(self, pspec_, param_): self._update_info() + class SpeakerPalette(Palette): def __init__(self, primary_text, model): @@ -167,6 +169,7 @@ class SpeakerPalette(Palette): self._update_level() self._update_muted() + class DeviceModel(gobject.GObject): __gproperties__ = { 'level' : (int, None, None, 0, 100, 0, gobject.PARAM_READWRITE), @@ -212,5 +215,6 @@ class DeviceModel(gobject.GObject): elif pspec.name == "muted": self._set_muted(value) + def setup(tray): tray.add_device(DeviceView()) diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py index e7f62a2..ea2377d 100644 --- a/extensions/deviceicon/volume.py +++ b/extensions/deviceicon/volume.py @@ -28,8 +28,10 @@ from jarabe.journal import journalactivity from jarabe.view.palettes import VolumePalette from jarabe.frame.frameinvoker import FrameWidgetInvoker + _icons = {} + class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 500 @@ -70,9 +72,11 @@ class DeviceView(TrayIcon): journal.reveal() return True + def setup(tray): gobject.idle_add(_setup_volumes, tray) + def _setup_volumes(tray): volume_monitor = gio.volume_monitor_get() @@ -86,9 +90,11 @@ def _setup_volumes(tray): volume_monitor.connect('mount-added', _mount_added_cb, tray) volume_monitor.connect('mount-removed', _mount_removed_cb, tray) + def _volume_added_cb(volume_monitor, volume, tray): _mount(volume, tray) + def _mount(volume, tray): # Follow Nautilus behaviour here # since it has the same issue with removable device @@ -102,20 +108,23 @@ def _mount(volume, tray): #TODO: pass None as mount_operation, or better, SugarMountOperation volume.mount(gtk.MountOperation(tray.get_toplevel()), _mount_cb) + def _mount_cb(volume, result): logging.debug('_mount_cb %r %r', volume, result) volume.mount_finish(result) + def _mount_added_cb(volume_monitor, mount, tray): _add_device(mount, tray) + def _mount_removed_cb(volume_monitor, mount, tray): icon = _icons[mount] tray.remove_device(icon) del _icons[mount] + def _add_device(mount, tray): icon = DeviceView(mount) _icons[mount] = icon tray.add_device(icon) - |