Merge lp:~donadigo/switchboard-plug-networking/page-cleanup into lp:~elementary-pantheon/switchboard-plug-networking/trunk
Proposed by
Adam Bieńkowski
Status: | Merged |
---|---|
Approved by: | Danielle Foré |
Approved revision: | 117 |
Merged at revision: | 115 |
Proposed branch: | lp:~donadigo/switchboard-plug-networking/page-cleanup |
Merge into: | lp:~elementary-pantheon/switchboard-plug-networking/trunk |
Diff against target: |
281 lines (+48/-67) 5 files modified
src/Plug.vala (+0/-4) src/Widgets/Device/DeviceItem.vala (+2/-2) src/Widgets/Device/DevicePage.vala (+2/-15) src/Widgets/Page.vala (+32/-8) src/Widgets/WiFi/WiFiPage.vala (+12/-38) |
To merge this branch: | bzr merge lp:~donadigo/switchboard-plug-networking/page-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danielle Foré | Approve | ||
Review via email: mp+265743@code.launchpad.net |
Commit message
Page cleanup:
* Added init () method
* Renamed wifi states to: Enabled and Disabled
* Moved methods from DevicePage to Page class to make them more unified.
Description of the change
Page cleanup. Moved some methods from DevicePage to Page class to make them more unified. Renamed wifi states to: Enabled and Disabled.
* Fixed: control_switch does not switch when device state changed not from plug.
* Switch now reflects wireless state instead of the device state.
To post a comment you must log in.
Enabling and disabling doesn't seem to work as expected.
Disabling always crashes the plug (I would consider this a regression since in trunk the switch does nothing. Nothing is probably better than a crash).
Enabling doesn't change the status in the sidebar (it should be "Disconnected" to match the status shown in the plug). However since the sidebar status doesn't seem to work correctly in trunk either, I don't think this is a blocker or necessarily needs to be fixed in this branch. Maybe in another branch the sidebar status should be changed so that it reads the same as the status in the plug. Its information seems to be accurate and reflect various network states.
The switch moves to the "disabled" state when merely disconnected. It sounds like you introduced this change intentionally, but it doesn't make design sense. There is already a disconnect button. This switch should reflect whether the device is on and capable of connecting to a network, not whether it is connected or not.