ubuntu-system-settings

Merge lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher into lp://staging/ubuntu-system-settings

  1. appearance-launcher
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Ken VanDine
Approved revision: 1745
Merged at revision: 1742
Proposed branch: lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 1631 lines (+1383/-24)
35 files modified
debian/control (+1/-0)
plugins/CMakeLists.txt (+1/-0)
plugins/launcher/CMakeLists.txt (+20/-0)
plugins/launcher/PageComponent.qml (+113/-0)
plugins/launcher/launcher.h (+42/-0)
plugins/launcher/launcher.settings (+14/-0)
plugins/launcher/launcher_impl.cpp (+52/-0)
plugins/launcher/launcher_impl.h (+40/-0)
plugins/launcher/plugin.cpp (+39/-0)
plugins/launcher/plugin.h (+33/-0)
plugins/launcher/plugin/CMakeLists.txt (+8/-0)
plugins/launcher/plugin/GuAccessor.qml (+6/-0)
plugins/launcher/plugin/launcher-plugin.cpp (+86/-0)
plugins/launcher/plugin/launcher-plugin.h (+37/-0)
plugins/launcher/qmldir.in (+2/-0)
plugins/launcher/settings-launcher.svg (+179/-0)
src/CMakeLists.txt (+1/-1)
src/main.cpp (+2/-23)
tests/mocks/CMakeLists.txt (+1/-0)
tests/mocks/GSettings.1.0/CMakeLists.txt (+19/-0)
tests/mocks/GSettings.1.0/fake_gsettings.cpp (+193/-0)
tests/mocks/GSettings.1.0/fake_gsettings.h (+118/-0)
tests/mocks/GSettings.1.0/plugin.cpp (+35/-0)
tests/mocks/GSettings.1.0/plugin.h (+33/-0)
tests/mocks/GSettings.1.0/qmldir (+2/-0)
tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/SystemSettings/Launcher/CMakeLists.txt (+20/-0)
tests/mocks/Ubuntu/SystemSettings/Launcher/MockLauncherPanelPlugin.cpp (+57/-0)
tests/mocks/Ubuntu/SystemSettings/Launcher/MockLauncherPanelPlugin.h (+49/-0)
tests/mocks/Ubuntu/SystemSettings/Launcher/plugin.cpp (+37/-0)
tests/mocks/Ubuntu/SystemSettings/Launcher/plugin.h (+32/-0)
tests/mocks/Ubuntu/SystemSettings/Launcher/qmldir (+2/-0)
tests/plugins/CMakeLists.txt (+8/-0)
tests/plugins/launcher/Source/qmldir (+2/-0)
tests/plugins/launcher/tst_LauncherPageComponent.qml (+98/-0)
To merge this branch: bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher
Reviewer Review Type Date Requested Status
Ken VanDine Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+310657@code.staging.launchpad.net

Commit message

* Packaging change: depend on USC for testing
* Adds Launcher settings panel to System Settings
* Makes USS a gapplication as a requirement for the use of the qtdesktopwidget
* Adds gsetting qml mock

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1737
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/232/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1970/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1971
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1806/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1806/console

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

review: Needs Fixing (continuous-integration)
lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher updated
1738. By Jonas G. Drange

clean up screens, add working launcher panel pluguin based on qdesktopwidget

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

FAILED: Continuous integration, rev:1738
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/233/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1973/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1974
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1808/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1808/console

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

review: Needs Fixing (continuous-integration)
lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher updated
1739. By Jonas G. Drange

merge trunk

1740. By Jonas G. Drange

finishes qml testing of launcher

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

FAILED: Continuous integration, rev:1740
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/240/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1985/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1988
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1819/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1819/console

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

review: Needs Fixing (continuous-integration)
lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher updated
1741. By Jonas G. Drange

adds test dep, drops unecessary import in EntryComponent

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

FAILED: Continuous integration, rev:1741
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/241/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1989/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1992
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1822
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1822/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1822
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1822/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1822
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1822/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1822
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1822/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1822
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1822/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1822
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1822/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1822/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1822/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1822/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

The grid isn't handling the visibility change, I'm just getting an empty item in the grid.

Also line 45 of EntryComponent.qml is spewing an error about pageStack.currentPage being null when loading the grid view.

review: Needs Fixing
lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher updated
1742. By Jonas G. Drange

obtain gus in c++ using qml file

1743. By Jonas G. Drange

changes confusing guard name

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

FAILED: Continuous integration, rev:1742
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/244/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2020/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2023
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1853/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1853/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1743
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/245/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2021/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2024
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1854/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1854/console

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

review: Needs Fixing (continuous-integration)
lp://staging/~jonas-drange/ubuntu-system-settings/appearance-launcher updated
1744. By Jonas G. Drange

drops entrycomponent from makelist

1745. By Jonas G. Drange

uses RAII instead of a broken delete (there was a possible early return)

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

FAILED: Continuous integration, rev:1744
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/246/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2022/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2025
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1855
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1855/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1855
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1855/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1855
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1855/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1855
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1855/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1855
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1855/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1855
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1855/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1855/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1855/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1855/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1745
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/247/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2023/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2026
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1856/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1856/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1856/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1856/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1856/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1856/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1856/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1856/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1856
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1856/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

This looks good now. I tested for regressions on a vivid device, the launcher icon is not shown as expected.

review: Approve

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