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
=== modified file 'src/settings/indicatorNetworkSettings/backend/devicemanager.py'
--- src/settings/indicatorNetworkSettings/backend/devicemanager.py 2010-12-13 18:48:43 +0000
+++ src/settings/indicatorNetworkSettings/backend/devicemanager.py 2010-12-14 12:28:05 +0000
@@ -86,30 +86,30 @@
86 connected = self.connman.get_connected_technologies()86 connected = self.connman.get_connected_technologies()
8787
88 if "ethernet" in connected:88 if "ethernet" in connected:
89 self.ethernet_device.set_state(DEVICE_STATE_ONLINE)89 self.ethernet_device.set_state(DEVICE_STATE_CONNECTED)
90 elif "ethernet" in enabled:90 elif "ethernet" in enabled:
91 self.ethernet_device.set_state(DEVICE_STATE_OFFLINE)91 self.ethernet_device.set_state(DEVICE_STATE_ON)
92 else:92 else:
93 self.ethernet_device.set_state(DEVICE_STATE_OFF)93 self.ethernet_device.set_state(DEVICE_STATE_OFF)
9494
95 if "wifi" in connected:95 if "wifi" in connected:
96 self.wifi_device.set_state(DEVICE_STATE_ONLINE)96 self.wifi_device.set_state(DEVICE_STATE_CONNECTED)
97 elif "wifi" in enabled:97 elif "wifi" in enabled:
98 self.wifi_device.set_state(DEVICE_STATE_OFFLINE)98 self.wifi_device.set_state(DEVICE_STATE_ON)
99 else:99 else:
100 self.wifi_device.set_state(DEVICE_STATE_OFF)100 self.wifi_device.set_state(DEVICE_STATE_OFF)
101101
102 if "cellular" in connected:102 if "cellular" in connected:
103 self.cellular_device.set_state(DEVICE_STATE_ONLINE)103 self.cellular_device.set_state(DEVICE_STATE_CONNECTED)
104 elif "cellular" in enabled:104 elif "cellular" in enabled:
105 self.cellular_device.set_state(DEVICE_STATE_OFFLINE)105 self.cellular_device.set_state(DEVICE_STATE_ON)
106 else:106 else:
107 self.cellular_device.set_state(DEVICE_STATE_OFF)107 self.cellular_device.set_state(DEVICE_STATE_OFF)
108108
109 if "bluetooth" in connected:109 if "bluetooth" in connected:
110 self.bluetooth_device.set_state(DEVICE_STATE_ONLINE)110 self.bluetooth_device.set_state(DEVICE_STATE_CONNECTED)
111 elif "bluetooth" in enabled:111 elif "bluetooth" in enabled:
112 self.bluetooth_device.set_state(DEVICE_STATE_OFFLINE)112 self.bluetooth_device.set_state(DEVICE_STATE_ON)
113 else:113 else:
114 self.bluetooth_device.set_state(DEVICE_STATE_OFF)114 self.bluetooth_device.set_state(DEVICE_STATE_OFF)
115115
116116
=== modified file 'src/settings/indicatorNetworkSettings/enums.py'
--- src/settings/indicatorNetworkSettings/enums.py 2010-12-07 15:07:37 +0000
+++ src/settings/indicatorNetworkSettings/enums.py 2010-12-14 12:28:05 +0000
@@ -36,8 +36,7 @@
36 DEVICE_TYPE_BLUETOOTH:"bluetooth-active",36 DEVICE_TYPE_BLUETOOTH:"bluetooth-active",
37 DEVICE_TYPE_MOBILE:"gsm-3g-high"}37 DEVICE_TYPE_MOBILE:"gsm-3g-high"}
3838
39DEVICE_STATE_OFF, DEVICE_STATE_OFFLINE, DEVICE_STATE_CONNECTED, \39DEVICE_STATE_OFF, DEVICE_STATE_ON, DEVICE_STATE_CONNECTED, = range(3)
40 DEVICE_STATE_ONLINE = range(4)
4140
4241
43GENERIC_DEVICE_ICON = DEVICE_TYPE_ICONS[DEVICE_TYPE_WIRED]42GENERIC_DEVICE_ICON = DEVICE_TYPE_ICONS[DEVICE_TYPE_WIRED]
4443
=== modified file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py 2010-12-07 15:07:37 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/mobile.py 2010-12-14 12:28:05 +0000
@@ -73,21 +73,16 @@
73 settings_editable = False73 settings_editable = False
74 toggleswitch_state = True74 toggleswitch_state = True
75 status_text = _("Connected to “Vodafone UK”.")75 status_text = _("Connected to “Vodafone UK”.")
76 elif state == DEVICE_STATE_ONLINE:76 elif state == DEVICE_STATE_ON:
77 device_editable = True77 device_editable = True
78 settings_editable = False78 settings_editable = False
79 toggleswitch_state = True79 toggleswitch_state = True
80 status_text = _("Connected to the Internet on “Vodafone UK”.")80 status_text = _("Not connected.")
81 elif state == DEVICE_STATE_OFF:81 elif state == DEVICE_STATE_OFF:
82 device_editable = False82 device_editable = False
83 settings_editable = True83 settings_editable = True
84 toggleswitch_state = False84 toggleswitch_state = False
85 status_text = _("The Mobile Broadband device is powered off.")85 status_text = _("The Mobile Broadband device is powered off.")
86 elif state == DEVICE_STATE_OFFLINE:
87 device_editable = True
88 settings_editable = True
89 toggleswitch_state = False
90 status_text = _("Mobile Broadband is offline.")
91 86
92 self.toggleswitch.set_sensitive(device_editable)87 self.toggleswitch.set_sensitive(device_editable)
93 self.toggleswitch.set_active(toggleswitch_state)88 self.toggleswitch.set_active(toggleswitch_state)
@@ -113,9 +108,9 @@
113 108
114 def _on_toggleswitch_toggled(self, widget):109 def _on_toggleswitch_toggled(self, widget):
115 if widget.get_active():110 if widget.get_active():
116 self.device.set_state(DEVICE_STATE_CONNECTED)111 self.device.enable()
117 else:112 else:
118 self.device.set_state(DEVICE_STATE_OFFLINE)113 self.device.disable()
119114
120 def _on_checkbutton_show_pin_toggled(self, widget):115 def _on_checkbutton_show_pin_toggled(self, widget):
121 self.entry_pin.set_visibility(widget.get_active())116 self.entry_pin.set_visibility(widget.get_active())
122117
=== modified file 'src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py 2010-12-13 17:57:27 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/device_boxes/wireless.py 2010-12-14 12:28:05 +0000
@@ -70,7 +70,6 @@
70 ## Packing70 ## Packing
71 self.scrolledwindow_connections.add(self.treeview_connections)71 self.scrolledwindow_connections.add(self.treeview_connections)
72 ## Population72 ## Population
73 # FIXME
74 connections = app.devicemanager.get_remembered_wireless_connections()73 connections = app.devicemanager.get_remembered_wireless_connections()
75 for connection in connections:74 for connection in connections:
76 self._add_connection(connection)75 self._add_connection(connection)
@@ -79,12 +78,12 @@
7978
80 # Private Functions79 # Private Functions
81 def _update_widget_states(self, state):80 def _update_widget_states(self, state):
82 if state == DEVICE_STATE_CONNECTED:81 if state == DEVICE_STATE_ON:
83 device_editable = True82 device_editable = True
84 settings_editable = True83 settings_editable = True
85 toggleswitch_state = True84 toggleswitch_state = True
86 status_text = _("Wi-fi is on but not connected to the Internet.")85 status_text = _("Wi-fi is on but not connected to the Internet.")
87 elif state == DEVICE_STATE_ONLINE:86 elif state == DEVICE_STATE_CONNECTED:
88 device_editable = True87 device_editable = True
89 settings_editable = True88 settings_editable = True
90 toggleswitch_state = True89 toggleswitch_state = True
@@ -94,11 +93,6 @@
94 settings_editable = False93 settings_editable = False
95 toggleswitch_state = False94 toggleswitch_state = False
96 status_text = _("The Wi-fi device is powered off.")95 status_text = _("The Wi-fi device is powered off.")
97 elif state == DEVICE_STATE_OFFLINE:
98 device_editable = True
99 settings_editable = False
100 toggleswitch_state = False
101 status_text = _("Wi-fi is offline.")
10296
103 self.vbox_connections.set_sensitive(settings_editable)97 self.vbox_connections.set_sensitive(settings_editable)
104 self.toggleswitch.set_sensitive(device_editable)98 self.toggleswitch.set_sensitive(device_editable)
10599
=== modified file 'src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py'
--- src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py 2010-12-07 15:07:37 +0000
+++ src/settings/indicatorNetworkSettings/frontend/widgets/deviceview.py 2010-12-14 12:28:05 +0000
@@ -134,22 +134,18 @@
134 def _get_pin_color(self, state):134 def _get_pin_color(self, state):
135 if state == DEVICE_STATE_OFF:135 if state == DEVICE_STATE_OFF:
136 return "grey"136 return "grey"
137 elif state == DEVICE_STATE_OFFLINE:137 elif state == DEVICE_STATE_ON:
138 return "red"
139 elif state == DEVICE_STATE_CONNECTED:
140 return "yellow"138 return "yellow"
141 elif state == DEVICE_STATE_ONLINE:139 elif state == DEVICE_STATE_CONNECTED:
142 return "green"140 return "green"
143 141
144 def _get_device_caption(self, state):142 def _get_device_caption(self, state):
145 if state == DEVICE_STATE_OFF:143 if state == DEVICE_STATE_OFF:
146 return _("Off")144 return _("Off")
147 elif state == DEVICE_STATE_OFFLINE:145 elif state == DEVICE_STATE_ON:
148 return _("Offline")146 return _("Not Connected")
149 elif state == DEVICE_STATE_CONNECTED:147 elif state == DEVICE_STATE_CONNECTED:
150 return _("Connected")148 return _("Connected")
151 elif state == DEVICE_STATE_ONLINE:
152 return _("Online")
153149
154 def _get_markup(self, label, caption):150 def _get_markup(self, label, caption):
155 return "%s\n<span font_size=\"small\">%s</span>" % (label, caption)151 return "%s\n<span font_size=\"small\">%s</span>" % (label, caption)

Subscribers

People subscribed via source and target branches