Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/view
diff options
context:
space:
mode:
Diffstat (limited to 'src/jarabe/view')
-rw-r--r--src/jarabe/view/Makefile.am2
-rw-r--r--src/jarabe/view/devices/Makefile.am8
-rw-r--r--src/jarabe/view/devices/__init__.py16
-rw-r--r--src/jarabe/view/devices/battery.py130
-rw-r--r--src/jarabe/view/devices/deviceview.py26
-rw-r--r--src/jarabe/view/devices/mesh.py131
-rw-r--r--src/jarabe/view/devices/speaker.py160
-rw-r--r--src/jarabe/view/devices/wireless.py144
8 files changed, 0 insertions, 617 deletions
diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am
index b22171b..18ba0a5 100644
--- a/src/jarabe/view/Makefile.am
+++ b/src/jarabe/view/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = devices
-
sugardir = $(pythondir)/jarabe/view
sugar_PYTHON = \
__init__.py \
diff --git a/src/jarabe/view/devices/Makefile.am b/src/jarabe/view/devices/Makefile.am
deleted file mode 100644
index 6a9efe0..0000000
--- a/src/jarabe/view/devices/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-sugardir = $(pythondir)/jarabe/view/devices
-sugar_PYTHON = \
- __init__.py \
- battery.py \
- deviceview.py \
- speaker.py \
- mesh.py \
- wireless.py
diff --git a/src/jarabe/view/devices/__init__.py b/src/jarabe/view/devices/__init__.py
deleted file mode 100644
index a9dd95a..0000000
--- a/src/jarabe/view/devices/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2006-2007, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
diff --git a/src/jarabe/view/devices/battery.py b/src/jarabe/view/devices/battery.py
deleted file mode 100644
index 0302ecd..0000000
--- a/src/jarabe/view/devices/battery.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (C) 2006-2007, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gettext import gettext as _
-
-import gtk
-
-from sugar import profile
-from sugar.graphics import style
-from sugar.graphics.icon import get_icon_state
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.palette import Palette
-from sugar.graphics.xocolor import XoColor
-
-from jarabe.frame.frameinvoker import FrameWidgetInvoker
-
-_ICON_NAME = 'battery'
-
-_STATUS_CHARGING = 0
-_STATUS_DISCHARGING = 1
-_STATUS_FULLY_CHARGED = 2
-
-class DeviceView(TrayIcon):
-
- FRAME_POSITION_RELATIVE = 1000
-
- def __init__(self, model):
- TrayIcon.__init__(self, icon_name=_ICON_NAME,
- xo_color=profile.get_color())
-
- self._model = model
- self.palette = BatteryPalette(_('My Battery'))
- self.set_palette(self.palette)
- self.palette.props.invoker = FrameWidgetInvoker(self)
- self.palette.set_group_id('frame')
-
- model.connect('notify::level', self._battery_status_changed_cb)
- model.connect('notify::charging', self._battery_status_changed_cb)
- model.connect('notify::discharging', self._battery_status_changed_cb)
- self._update_info()
-
- def _update_info(self):
- name = _ICON_NAME
- current_level = self._model.props.level
- xo_color = profile.get_color()
- badge_name = None
-
- if self._model.props.charging:
- status = _STATUS_CHARGING
- name += '-charging'
- xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
- style.COLOR_WHITE.get_svg()))
- elif self._model.props.discharging:
- status = _STATUS_DISCHARGING
- if current_level <= 15:
- badge_name = 'emblem-warning'
- else:
- status = _STATUS_FULLY_CHARGED
-
- self.icon.props.icon_name = get_icon_state(name, current_level, step=-5)
- self.icon.props.xo_color = xo_color
- self.icon.props.badge_name = badge_name
-
- self.palette.set_level(current_level)
- self.palette.set_status(status)
-
- def _battery_status_changed_cb(self, pspec, param):
- self._update_info()
-
-class BatteryPalette(Palette):
-
- def __init__(self, primary_text):
- Palette.__init__(self, primary_text)
-
- self._level = 0
- self._progress_bar = gtk.ProgressBar()
- self._progress_bar.set_size_request(
- style.zoom(style.GRID_CELL_SIZE * 4), -1)
- self._progress_bar.show()
- self._status_label = gtk.Label()
- self._status_label.show()
-
- vbox = gtk.VBox()
- vbox.pack_start(self._progress_bar)
- vbox.pack_start(self._status_label)
- vbox.show()
-
- self.set_content(vbox)
-
- def set_level(self, percent):
- self._level = percent
- fraction = percent / 100.0
- self._progress_bar.set_fraction(fraction)
-
- def set_status(self, status):
- current_level = self._level
- secondary_text = ''
- status_text = '%s%%' % current_level
-
- if status == _STATUS_CHARGING:
- secondary_text = _('Charging')
- elif status == _STATUS_DISCHARGING:
- if current_level <= 15:
- secondary_text = _('Very little power remaining')
- else:
- #TODO: make this less of an wild/educated guess
- minutes_remaining = int(current_level / 0.59)
- remaining_hourpart = minutes_remaining / 60
- remaining_minpart = minutes_remaining % 60
- secondary_text = _('%(hour)d:%(min).2d remaining'
- % { 'hour': remaining_hourpart,
- 'min': remaining_minpart})
- else:
- secondary_text = _('Charged')
-
- self.props.secondary_text = secondary_text
- self._status_label.set_text(status_text)
diff --git a/src/jarabe/view/devices/deviceview.py b/src/jarabe/view/devices/deviceview.py
deleted file mode 100644
index 90ebbf5..0000000
--- a/src/jarabe/view/devices/deviceview.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2006-2007, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-def create(model):
- name = 'view.devices.' + model.get_type()
-
- mod = __import__(name)
- components = name.split('.')
- for comp in components[1:]:
- mod = getattr(mod, comp)
-
- return mod.DeviceView(model)
-
diff --git a/src/jarabe/view/devices/mesh.py b/src/jarabe/view/devices/mesh.py
deleted file mode 100644
index d6248e2..0000000
--- a/src/jarabe/view/devices/mesh.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (C) 2006-2007 Red Hat, Inc.
-# Copyright (C) 2008 One Laptop Per Child
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gettext import gettext as _
-
-import gtk
-
-from sugar import profile
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics import style
-from sugar.graphics.palette import Palette
-
-from jarabe.model.devices import device
-from jarabe.model.devices import wireless
-from jarabe.hardware import hardwaremanager
-from jarabe.frame.frameinvoker import FrameWidgetInvoker
-
-class DeviceView(TrayIcon):
-
- FRAME_POSITION_RELATIVE = 400
-
- def __init__(self, model):
- TrayIcon.__init__(self, icon_name='network-mesh')
-
- self._model = model
-
- self.palette = MeshPalette(_("Mesh Network"), model)
- self.set_palette(self.palette)
- self.palette.props.invoker = FrameWidgetInvoker(self)
- self.palette.set_group_id('frame')
-
- model.connect('notify::state', self._state_changed_cb)
- model.connect('notify::activation-stage', self._state_changed_cb)
- self._update_state()
-
- def _state_changed_cb(self, model, pspec):
- self._update_state()
-
- def _update_state(self):
- # FIXME Change icon colors once we have real icons
- state = self._model.props.state
- self.palette.update_state(state)
-
- if state == device.STATE_ACTIVATING:
- self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
- self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()
- elif state == device.STATE_ACTIVATED:
- self.icon.props.xo_color = profile.get_color()
- elif state == device.STATE_INACTIVE:
- self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
- self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()
-
- if state == device.STATE_INACTIVE:
- self.palette.set_primary_text(_("Mesh Network"))
- else:
- chan = wireless.freq_to_channel(self._model.props.frequency)
- if chan > 0:
- self.palette.set_primary_text(_("Mesh Network") + " %d" % chan)
- self.palette.set_mesh_step(self._model.props.mesh_step, state)
-
-class MeshPalette(Palette):
- def __init__(self, primary_text, model):
- Palette.__init__(self, primary_text, menu_after_content=True)
- self._model = model
-
- self._step_label = gtk.Label()
- self._step_label.show()
-
- vbox = gtk.VBox()
- vbox.pack_start(self._step_label)
- vbox.show()
-
- self.set_content(vbox)
-
- self._disconnect_item = gtk.MenuItem(_('Disconnect...'))
- self._disconnect_item.connect('activate', self._disconnect_activate_cb)
- self.menu.append(self._disconnect_item)
-
- def update_state(self, state):
- if state == device.STATE_ACTIVATED:
- self._disconnect_item.show()
- else:
- self._disconnect_item.hide()
-
- def _disconnect_activate_cb(self, menuitem):
- # Disconnection for an mesh means activating the default mesh device
- # again without a channel
- network_manager = hardwaremanager.get_network_manager()
- nm_device = self._model.get_nm_device()
- if network_manager and nm_device:
- network_manager.set_active_device(nm_device)
-
- def set_mesh_step(self, step, state):
- label = ""
- if step == 1:
- if state == device.STATE_ACTIVATED:
- label = _("Connected to a School Mesh Portal")
- elif state == device.STATE_ACTIVATING:
- label = _("Looking for a School Mesh Portal...")
- elif step == 3:
- if state == device.STATE_ACTIVATED:
- label = _("Connected to an XO Mesh Portal")
- elif state == device.STATE_ACTIVATING:
- label = _("Looking for an XO Mesh Portal...")
- elif step == 4:
- if state == device.STATE_ACTIVATED:
- label = _("Connected to a Simple Mesh")
- elif state == device.STATE_ACTIVATING:
- label = _("Starting a Simple Mesh")
-
- if len(label):
- self._step_label.set_text(label)
- else:
- import logging
- logging.debug("Unhandled mesh step %d" % step)
- self._step_label.set_text(_("Unknown Mesh"))
-
diff --git a/src/jarabe/view/devices/speaker.py b/src/jarabe/view/devices/speaker.py
deleted file mode 100644
index be32b1c..0000000
--- a/src/jarabe/view/devices/speaker.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright (C) 2008 Martin Dengler
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gettext import gettext as _
-
-import gtk
-
-from jarabe.hardware import hardwaremanager
-from sugar import profile
-from sugar.graphics import style
-from sugar.graphics.icon import get_icon_state, Icon
-from sugar.graphics.menuitem import MenuItem
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics.palette import Palette
-from sugar.graphics.xocolor import XoColor
-
-from jarabe.frame.frameinvoker import FrameWidgetInvoker
-
-_ICON_NAME = 'speaker'
-
-class DeviceView(TrayIcon):
-
- FRAME_POSITION_RELATIVE = 800
-
- def __init__(self, model):
- TrayIcon.__init__(self,
- icon_name=_ICON_NAME,
- xo_color=profile.get_color())
-
- self._model = model
- self.palette = SpeakerPalette(_('My Speakers'), model=model)
- self.palette.props.invoker = FrameWidgetInvoker(self)
- self.palette.set_group_id('frame')
-
- model.connect('notify::level', self.__speaker_status_changed_cb)
- model.connect('notify::muted', self.__speaker_status_changed_cb)
- self.connect('expose-event', self.__expose_event_cb)
-
- self._icon_widget.connect('button-press-event',
- self.__update_mute_status)
-
- self._update_info()
-
- def _update_info(self):
- name = _ICON_NAME
- current_level = self._model.props.level
- xo_color = profile.get_color()
-
- if self._model.props.muted:
- name += '-muted'
- xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
- style.COLOR_WHITE.get_svg()))
-
- self.icon.props.icon_name = get_icon_state(name, current_level, step=-1)
- self.icon.props.xo_color = xo_color
-
- def __update_mute_status(self, *args):
- self._model.props.muted = not self._model.props.muted
-
- def __expose_event_cb(self, *args):
- self._update_info()
-
- def __speaker_status_changed_cb(self, pspec_, param_):
- self._update_info()
-
-class SpeakerPalette(Palette):
-
- def __init__(self, primary_text, model):
- Palette.__init__(self, label=primary_text)
-
- self._model = model
-
- self.set_size_request(style.zoom(style.GRID_CELL_SIZE * 4), -1)
-
- vbox = gtk.VBox()
- self.set_content(vbox)
- vbox.show()
-
- vol_step = hardwaremanager.VOL_CHANGE_INCREMENT_RECOMMENDATION
- self._adjustment = gtk.Adjustment(value=self._model.props.level,
- lower=0,
- upper=100 + vol_step,
- step_incr=vol_step,
- page_incr=vol_step,
- page_size=vol_step)
- self._hscale = gtk.HScale(self._adjustment)
- self._hscale.set_digits(0)
- self._hscale.set_draw_value(False)
- vbox.add(self._hscale)
- self._hscale.show()
-
- self._mute_item = MenuItem('')
- self._mute_icon = Icon(icon_size=gtk.ICON_SIZE_MENU)
- self._mute_item.set_image(self._mute_icon)
- self.menu.append(self._mute_item)
- self._mute_item.show()
-
- self._adjustment_handler_id = \
- self._adjustment.connect('value_changed',
- self.__adjustment_changed_cb)
-
- self._model_notify_level_handler_id = \
- self._model.connect('notify::level', self.__level_changed_cb)
- self._model.connect('notify::muted', self.__muted_changed_cb)
-
- self._mute_item.connect('activate', self.__mute_activate_cb)
-
- self.connect('popup', self.__popup_cb)
-
- def _update_muted(self):
- if self._model.props.muted:
- mute_item_text = _('Unmute')
- mute_item_icon_name = 'dialog-ok'
- else:
- mute_item_text = _('Mute')
- mute_item_icon_name = 'dialog-cancel'
- self._mute_item.get_child().set_text(mute_item_text)
- self._mute_icon.props.icon_name = mute_item_icon_name
-
- def _update_level(self):
- if self._adjustment.value != self._model.props.level:
- self._adjustment.handler_block(self._adjustment_handler_id)
- try:
- self._adjustment.value = self._model.props.level
- finally:
- self._adjustment.handler_unblock(self._adjustment_handler_id)
-
- def __adjustment_changed_cb(self, adj_):
- self._model.handler_block(self._model_notify_level_handler_id)
- try:
- self._model.props.level = self._adjustment.value
- finally:
- self._model.handler_unblock(self._model_notify_level_handler_id)
- self._model.props.muted = self._adjustment.value == 0
-
- def __level_changed_cb(self, pspec_, param_):
- self._update_level()
-
- def __mute_activate_cb(self, menuitem_):
- self._model.props.muted = not self._model.props.muted
-
- def __muted_changed_cb(self, pspec_, param_):
- self._update_muted()
-
- def __popup_cb(self, palette_):
- self._update_level()
- self._update_muted()
diff --git a/src/jarabe/view/devices/wireless.py b/src/jarabe/view/devices/wireless.py
deleted file mode 100644
index 6be74fb..0000000
--- a/src/jarabe/view/devices/wireless.py
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Copyright (C) 2006-2007 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gettext import gettext as _
-
-import gtk
-
-from sugar.graphics.icon import get_icon_state
-from sugar.graphics.tray import TrayIcon
-from sugar.graphics import style
-from sugar.graphics.palette import Palette
-
-from jarabe.model.devices import wireless
-from jarabe.model.devices import device
-from jarabe.hardware import hardwaremanager
-from jarabe.hardware import nmclient
-from jarabe.frame.frameinvoker import FrameWidgetInvoker
-
-_ICON_NAME = 'network-wireless'
-
-class DeviceView(TrayIcon):
-
- FRAME_POSITION_RELATIVE = 300
-
- def __init__(self, model):
- TrayIcon.__init__(self, icon_name=_ICON_NAME)
- self._model = model
-
- meshdev = None
- network_manager = hardwaremanager.get_network_manager()
- for dev in network_manager.get_devices():
- if dev.get_type() == nmclient.DEVICE_TYPE_802_11_MESH_OLPC:
- meshdev = dev
- break
-
- self._counter = 0
- self.palette = WirelessPalette(self._get_palette_primary_text(),
- meshdev)
- self.set_palette(self.palette)
- self.palette.props.invoker = FrameWidgetInvoker(self)
- self.palette.set_group_id('frame')
- self.palette.set_frequency(self._model.props.frequency)
-
- model.connect('notify::name', self._name_changed_cb)
- model.connect('notify::strength', self._strength_changed_cb)
- model.connect('notify::state', self._state_changed_cb)
-
- self._update_icon()
- self._update_state()
-
- def _get_palette_primary_text(self):
- if self._model.props.state == device.STATE_INACTIVE:
- return _("Disconnected")
- return self._model.props.name
-
- def _strength_changed_cb(self, model, pspec):
- self._update_icon()
- # Only update frequency periodically
- if self._counter % 4 == 0:
- self.palette.set_frequency(self._model.props.frequency)
- self._counter += 1
-
- def _name_changed_cb(self, model, pspec):
- self.palette.set_primary_text(self._get_palette_primary_text())
-
- def _state_changed_cb(self, model, pspec):
- self._update_icon()
- self._update_state()
- self.palette.set_primary_text(self._get_palette_primary_text())
-
- def _update_icon(self):
- # keep this code in sync with view/home/MeshBox.py
- strength = self._model.props.strength
- if self._model.props.state == device.STATE_INACTIVE:
- strength = 0
- if self._model.props.state == device.STATE_ACTIVATED:
- icon_name = '%s-connected' % _ICON_NAME
- else:
- icon_name = _ICON_NAME
- icon_name = get_icon_state(icon_name, strength)
- if icon_name:
- self.icon.props.icon_name = icon_name
-
- def _update_state(self):
- # FIXME Change icon colors once we have real icons
- state = self._model.props.state
- if state == device.STATE_ACTIVATING:
- self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
- self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()
- elif state == device.STATE_ACTIVATED:
- (stroke, fill) = self._model.get_active_network_colors()
- self.icon.props.stroke_color = stroke
- self.icon.props.fill_color = fill
- elif state == device.STATE_INACTIVE:
- self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg()
- self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg()
-
-class WirelessPalette(Palette):
- def __init__(self, primary_text, meshdev):
- Palette.__init__(self, primary_text, menu_after_content=True)
- self._meshdev = meshdev
-
- self._chan_label = gtk.Label()
- self._chan_label.show()
-
- vbox = gtk.VBox()
- vbox.pack_start(self._chan_label)
- vbox.show()
-
- if meshdev:
- disconnect_item = gtk.MenuItem(_('Disconnect...'))
- disconnect_item.connect('activate', self._disconnect_activate_cb)
- self.menu.append(disconnect_item)
- disconnect_item.show()
-
- self.set_content(vbox)
-
- def _disconnect_activate_cb(self, menuitem):
- # Disconnection for an AP means activating the default mesh device
- network_manager = hardwaremanager.get_network_manager()
- if network_manager and self._meshdev:
- network_manager.set_active_device(self._meshdev)
-
- def set_frequency(self, freq):
- try:
- chan = wireless.freq_to_channel(freq)
- except KeyError:
- chan = 0
- self._chan_label.set_text("%s: %d" % (_("Channel"), chan))
-