ubuntu-system-settings

Merge lp://qastaging/~ken-vandine/ubuntu-system-settings/launcher_reset into lp://qastaging/ubuntu-system-settings

  1. launcher_reset
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1776
Merged at revision: 1778
Proposed branch: lp://qastaging/~ken-vandine/ubuntu-system-settings/launcher_reset
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 782 lines (+39/-606)
16 files modified
plugins/CMakeLists.txt (+0/-1)
plugins/launcher/CMakeLists.txt (+1/-1)
plugins/launcher/PageComponent.qml (+34/-0)
plugins/launcher/ResetLauncherHome.qml (+4/-3)
plugins/reset/CMakeLists.txt (+0/-24)
plugins/reset/EntryComponent.qml (+0/-40)
plugins/reset/EraseEverything.qml (+0/-58)
plugins/reset/PageComponent.qml (+0/-147)
plugins/reset/ResetAllSettings.qml (+0/-42)
plugins/reset/plugin.cpp (+0/-34)
plugins/reset/plugin.h (+0/-33)
plugins/reset/qmldir (+0/-2)
plugins/reset/reset.cpp (+0/-56)
plugins/reset/reset.h (+0/-36)
plugins/reset/reset.settings (+0/-19)
plugins/reset/settings-reset.svg (+0/-110)
To merge this branch: bzr merge lp://qastaging/~ken-vandine/ubuntu-system-settings/launcher_reset
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Jonas G. Drange (community) Approve
Review via email: mp+321457@code.qastaging.launchpad.net

Commit message

Add reset launcher to the launcher panel

Description of the change

Add reset launcher to the launcher panel

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

LGTM! Thank you.

review: Approve
lp://qastaging/~ken-vandine/ubuntu-system-settings/launcher_reset updated
1777. By Ken VanDine

destroy popup after reset

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1776
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/29/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2367
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2367
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2183/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2183
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2183/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/29/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches