Network Menu

src/indicator/CMakeLists.txt (+1/-1)
src/indicator/menuitems/settings-item.cpp (+23/-13)
src/indicator/menuitems/settings-item.h (+16/-20)
src/indicator/menuitems/wifi-link-item.cpp (+0/-13)
src/indicator/sections/ethernet-section.cpp (+3/-3)
src/indicator/sections/vpn-section.cpp (+3/-17)
src/indicator/sections/wifi-section.cpp (+3/-14)
src/indicator/sections/wwan-section.cpp (+3/-17)

To merge this branch:

bzr merge lp://qastaging/~pete-woods/indicator-network/use-correct-settings-item-lp1642989

Medium

Triaged

Link a bug report

Reviewer	Review Type	Date Requested	Status
dobey (community)		2017-03-20	Needs Fixing on 2017-04-05
unity-api-1-bot	continuous-integration		Approve on 2017-03-20
Review via email: mp+320341@code.qastaging.launchpad.net

Commit message

Use new SettingsItem class to consistently export the settings menu items

Description of the change

Use new SettingsItem class to consistently export the settings menu items

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-03-20:

FAILED: Continuous integration, rev:673
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/42/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1839/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1846
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1622/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1622/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1622/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1622/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1622/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1622/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/42/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~pete-woods/indicator-network/use-correct-settings-item-lp1642989 updated on 2017-03-20

674. By Pete Woods on 2017-03-20: Reorder settings ID to maintain backwards compatibility

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-03-20:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-network-ci/43/rebuild

review: Approve (continuous-integration)

Revision history for this message

dobey (dobey) wrote on 2017-04-05:

Some needs fixing regarding the changes to the license headers, but otherwise looking good.

review: Needs Fixing

Unmerged revisions

674. By Pete Woods on 2017-03-20: Reorder settings ID to maintain backwards compatibility
673. By Pete Woods on 2017-03-20: Use new SettingsItem class to consistently export the settings menu items
672. By Pete Woods on 2017-03-20: Add basic ethernet settings menu export
671. By Pete Woods on 2017-03-17: Only physically export a single "phone" and tweak the indicator config file so it's used everywhere