Network Menu

Merge lp:~kvalo/indicator-network/settings-backend-begin into lp:~indicator-applet-developers/indicator-network/indicator-network

  1. settings-backend-begin
  2. Merge into indicator-network
Proposed by Kalle Valo
Status: Merged
Merged at revision: 123
Proposed branch: lp:~kvalo/indicator-network/settings-backend-begin
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 166 lines (+19/-35)
5 files modified
src/settings/indicatorNetworkSettings/backend/devicemanager.py (+8/-8)
src/settings/indicatorNetworkSettings/enums.py (+1/-2)
src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py (+4/-9)
src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py (+2/-8)
src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py (+4/-8)
To merge this branch: bzr merge lp:~kvalo/indicator-network/settings-backend-begin
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+43635@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/settings/indicatorNetworkSettings/backend/devicemanager.py'
2--- src/settings/indicatorNetworkSettings/backend/devicemanager.py 2010-12-13 18:48:43 +0000
3+++ src/settings/indicatorNetworkSettings/backend/devicemanager.py 2010-12-14 12:28:05 +0000
4@@ -86,30 +86,30 @@
5 connected = self.connman.get_connected_technologies()
6
7 if "ethernet" in connected:
8- self.ethernet_device.set_state(DEVICE_STATE_ONLINE)
9+ self.ethernet_device.set_state(DEVICE_STATE_CONNECTED)
10 elif "ethernet" in enabled:
11- self.ethernet_device.set_state(DEVICE_STATE_OFFLINE)
12+ self.ethernet_device.set_state(DEVICE_STATE_ON)
13 else:
14 self.ethernet_device.set_state(DEVICE_STATE_OFF)
15
16 if "wifi" in connected:
17- self.wifi_device.set_state(DEVICE_STATE_ONLINE)
18+ self.wifi_device.set_state(DEVICE_STATE_CONNECTED)
19 elif "wifi" in enabled:
20- self.wifi_device.set_state(DEVICE_STATE_OFFLINE)
21+ self.wifi_device.set_state(DEVICE_STATE_ON)
22 else:
23 self.wifi_device.set_state(DEVICE_STATE_OFF)
24
25 if "cellular" in connected:
26- self.cellular_device.set_state(DEVICE_STATE_ONLINE)
27+ self.cellular_device.set_state(DEVICE_STATE_CONNECTED)
28 elif "cellular" in enabled:
29- self.cellular_device.set_state(DEVICE_STATE_OFFLINE)
30+ self.cellular_device.set_state(DEVICE_STATE_ON)
31 else:
32 self.cellular_device.set_state(DEVICE_STATE_OFF)
33
34 if "bluetooth" in connected:
35- self.bluetooth_device.set_state(DEVICE_STATE_ONLINE)
36+ self.bluetooth_device.set_state(DEVICE_STATE_CONNECTED)
37 elif "bluetooth" in enabled:
38- self.bluetooth_device.set_state(DEVICE_STATE_OFFLINE)
39+ self.bluetooth_device.set_state(DEVICE_STATE_ON)
40 else:
41 self.bluetooth_device.set_state(DEVICE_STATE_OFF)
42
43
44=== modified file 'src/settings/indicatorNetworkSettings/enums.py'
45--- src/settings/indicatorNetworkSettings/enums.py 2010-12-07 15:07:37 +0000
46+++ src/settings/indicatorNetworkSettings/enums.py 2010-12-14 12:28:05 +0000
47@@ -36,8 +36,7 @@
48 DEVICE_TYPE_BLUETOOTH:"bluetooth-active",
49 DEVICE_TYPE_MOBILE:"gsm-3g-high"}
50
51-DEVICE_STATE_OFF, DEVICE_STATE_OFFLINE, DEVICE_STATE_CONNECTED, \
52- DEVICE_STATE_ONLINE = range(4)
53+DEVICE_STATE_OFF, DEVICE_STATE_ON, DEVICE_STATE_CONNECTED, = range(3)
54
55
56 GENERIC_DEVICE_ICON = DEVICE_TYPE_ICONS[DEVICE_TYPE_WIRED]
57
58=== modified file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py'
59--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py 2010-12-07 15:07:37 +0000
60+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py 2010-12-14 12:28:05 +0000
61@@ -73,21 +73,16 @@
62 settings_editable = False
63 toggleswitch_state = True
64 status_text = _("Connected to “Vodafone UK”.")
65- elif state == DEVICE_STATE_ONLINE:
66+ elif state == DEVICE_STATE_ON:
67 device_editable = True
68 settings_editable = False
69 toggleswitch_state = True
70- status_text = _("Connected to the Internet on “Vodafone UK”.")
71+ status_text = _("Not connected.")
72 elif state == DEVICE_STATE_OFF:
73 device_editable = False
74 settings_editable = True
75 toggleswitch_state = False
76 status_text = _("The Mobile Broadband device is powered off.")
77- elif state == DEVICE_STATE_OFFLINE:
78- device_editable = True
79- settings_editable = True
80- toggleswitch_state = False
81- status_text = _("Mobile Broadband is offline.")
82
83 self.toggleswitch.set_sensitive(device_editable)
84 self.toggleswitch.set_active(toggleswitch_state)
85@@ -113,9 +108,9 @@
86
87 def _on_toggleswitch_toggled(self, widget):
88 if widget.get_active():
89- self.device.set_state(DEVICE_STATE_CONNECTED)
90+ self.device.enable()
91 else:
92- self.device.set_state(DEVICE_STATE_OFFLINE)
93+ self.device.disable()
94
95 def _on_checkbutton_show_pin_toggled(self, widget):
96 self.entry_pin.set_visibility(widget.get_active())
97
98=== modified file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py'
99--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py 2010-12-13 17:57:27 +0000
100+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py 2010-12-14 12:28:05 +0000
101@@ -70,7 +70,6 @@
102 ## Packing
103 self.scrolledwindow_connections.add(self.treeview_connections)
104 ## Population
105- # FIXME
106 connections = app.devicemanager.get_remembered_wireless_connections()
107 for connection in connections:
108 self._add_connection(connection)
109@@ -79,12 +78,12 @@
110
111 # Private Functions
112 def _update_widget_states(self, state):
113- if state == DEVICE_STATE_CONNECTED:
114+ if state == DEVICE_STATE_ON:
115 device_editable = True
116 settings_editable = True
117 toggleswitch_state = True
118 status_text = _("Wi-fi is on but not connected to the Internet.")
119- elif state == DEVICE_STATE_ONLINE:
120+ elif state == DEVICE_STATE_CONNECTED:
121 device_editable = True
122 settings_editable = True
123 toggleswitch_state = True
124@@ -94,11 +93,6 @@
125 settings_editable = False
126 toggleswitch_state = False
127 status_text = _("The Wi-fi device is powered off.")
128- elif state == DEVICE_STATE_OFFLINE:
129- device_editable = True
130- settings_editable = False
131- toggleswitch_state = False
132- status_text = _("Wi-fi is offline.")
133
134 self.vbox_connections.set_sensitive(settings_editable)
135 self.toggleswitch.set_sensitive(device_editable)
136
137=== modified file 'src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py'
138--- src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py 2010-12-07 15:07:37 +0000
139+++ src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py 2010-12-14 12:28:05 +0000
140@@ -134,22 +134,18 @@
141 def _get_pin_color(self, state):
142 if state == DEVICE_STATE_OFF:
143 return "grey"
144- elif state == DEVICE_STATE_OFFLINE:
145- return "red"
146- elif state == DEVICE_STATE_CONNECTED:
147+ elif state == DEVICE_STATE_ON:
148 return "yellow"
149- elif state == DEVICE_STATE_ONLINE:
150+ elif state == DEVICE_STATE_CONNECTED:
151 return "green"
152
153 def _get_device_caption(self, state):
154 if state == DEVICE_STATE_OFF:
155 return _("Off")
156- elif state == DEVICE_STATE_OFFLINE:
157- return _("Offline")
158+ elif state == DEVICE_STATE_ON:
159+ return _("Not Connected")
160 elif state == DEVICE_STATE_CONNECTED:
161 return _("Connected")
162- elif state == DEVICE_STATE_ONLINE:
163- return _("Online")
164
165 def _get_markup(self, label, caption):
166 return "%s\n<span font_size=\"small\">%s</span>" % (label, caption)

Subscribers

People subscribed via source and target branches