diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-03-15 20:37:15 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-03-15 20:37:15 (GMT) |
| commit | 85f8ef218dff328748bf617bbca8c374064c9949 (patch) | |
| tree | 1a4a0fd530854c8380dd082d5ae6c27d3cb1f948 /shell/view/devices | |
| parent | 672d06d85edb7b1c0241c4cc8ab7229b1c156fce (diff) | |
Rearrange network device handling bits
Diffstat (limited to 'shell/view/devices')
| -rw-r--r-- | shell/view/devices/Makefile.am | 6 | ||||
| -rw-r--r-- | shell/view/devices/network/Makefile.am | 5 | ||||
| -rw-r--r-- | shell/view/devices/network/__init__.py | 0 | ||||
| -rw-r--r-- | shell/view/devices/network/wired.py (renamed from shell/view/devices/wirednetwork.py) | 0 | ||||
| -rw-r--r-- | shell/view/devices/network/wireless.py (renamed from shell/view/devices/wirelessnetwork.py) | 8 |
5 files changed, 12 insertions, 7 deletions
diff --git a/shell/view/devices/Makefile.am b/shell/view/devices/Makefile.am index d48504d..c040beb 100644 --- a/shell/view/devices/Makefile.am +++ b/shell/view/devices/Makefile.am @@ -1,7 +1,7 @@ +SUBDIRS = network + sugardir = $(pkgdatadir)/shell/view/devices sugar_PYTHON = \ __init__.py \ battery.py \ - deviceview.py \ - wirednetwork.py \ - wirelessnetwork.py + deviceview.py diff --git a/shell/view/devices/network/Makefile.am b/shell/view/devices/network/Makefile.am new file mode 100644 index 0000000..3c21490 --- /dev/null +++ b/shell/view/devices/network/Makefile.am @@ -0,0 +1,5 @@ +sugardir = $(pkgdatadir)/shell/view/devices/network +sugar_PYTHON = \ + __init__.py \ + wired.py \ + wireless.py diff --git a/shell/view/devices/network/__init__.py b/shell/view/devices/network/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/shell/view/devices/network/__init__.py diff --git a/shell/view/devices/wirednetwork.py b/shell/view/devices/network/wired.py index c484b75..c484b75 100644 --- a/shell/view/devices/wirednetwork.py +++ b/shell/view/devices/network/wired.py diff --git a/shell/view/devices/wirelessnetwork.py b/shell/view/devices/network/wireless.py index 2acb231..0387156 100644 --- a/shell/view/devices/wirelessnetwork.py +++ b/shell/view/devices/network/wireless.py @@ -18,7 +18,7 @@ from sugar.graphics import canvasicon from sugar.graphics import color from sugar.graphics import units -from model.devices import wirelessnetwork +from model.devices.network import wireless from view.pulsingicon import PulsingIcon _ICON_NAME = 'device-network-wireless' @@ -57,12 +57,12 @@ class DeviceView(PulsingIcon): def _update_state(self): # FIXME Change icon colors once we have real icons state = self._model.props.state - if state == wirelessnetwork.STATE_ACTIVATING: + if state == wireless.STATE_ACTIVATING: self.props.fill_color = color.ICON_FILL_INACTIVE self.props.stroke_color = color.ICON_STROKE_INACTIVE - elif state == wirelessnetwork.STATE_ACTIVATED: + elif state == wireless.STATE_ACTIVATED: self.props.fill_color = None self.props.stroke_color = None - elif state == wirelessnetwork.STATE_INACTIVE: + elif state == wireless.STATE_INACTIVE: self.props.fill_color = color.ICON_FILL_INACTIVE self.props.stroke_color = color.ICON_STROKE_INACTIVE |