ubuntu-system-settings

Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/hide-broken-panels-on-snappy into lp://qastaging/ubuntu-system-settings

  1. hide-broken-panels-on-snappy
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Ken VanDine
Approved revision: 1749
Merged at revision: 1745
Proposed branch: lp://qastaging/~jonas-drange/ubuntu-system-settings/hide-broken-panels-on-snappy
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 271 lines (+119/-7)
12 files modified
plugins/about/PageComponent.qml (+1/-1)
plugins/about/Software.qml (+1/-1)
plugins/battery/PageComponent.qml (+1/-0)
plugins/language/PageComponent.qml (+3/-1)
plugins/notifications/CMakeLists.txt (+2/-0)
plugins/notifications/notifications.settings (+2/-1)
plugins/notifications/plugin/CMakeLists.txt (+6/-0)
plugins/notifications/plugin/notifications-plugin.cpp (+59/-0)
plugins/notifications/plugin/notifications-plugin.h (+36/-0)
plugins/security-privacy/PageComponent.qml (+1/-0)
plugins/sound/PageComponent.qml (+5/-3)
src/main.cpp (+2/-0)
To merge this branch: bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/hide-broken-panels-on-snappy
Reviewer Review Type Date Requested Status
Ken VanDine Approve
system-apps-ci-bot continuous-integration Needs Fixing
Lukáš Tinkl (community) Needs Fixing
Review via email: mp+311166@code.qastaging.launchpad.net

Commit message

On snappy it changes the following:
* hides "Developer mode"
* hides "Sleep after"
* hides Notifications panel
* hides Sound panel
* fixes folderlistmodel in Software licenses page

To post a comment you must log in.
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

What is the intention of hiding the sound panel? It works just fine in snappy env; similar for "Sleep after", we will soon be able to manipulate the brightness as well.

review: Needs Information
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

> What is the intention of hiding the sound panel? It works just fine in snappy
> env; similar for "Sleep after", we will soon be able to manipulate the
> brightness as well.

I didn't get it to work, and there were reports that it wasn't working.

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ setVisibility(!env.contains(QLatin1String("SNAP")));

A much quicker and efficient way is to call:

setVisibility(!qEnvironmentVariableIsSet("SNAP"));

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

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

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

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

This looks good. I tested for regressions on a vivid device, no issues.

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