← Back to branch summary

~ssweeny/ubuntu-system-settings/wily-recompile-with-udm

~ssweeny/ubuntu-system-settings/wily-recompile-with-udm

« back to all changes in this revision

Viewing changes to plugins/sound/PageComponent.qml

Committer: Scott Sweeny
Date: 2015-10-13 15:11:57 UTC
mfrom: (1534.2.10 ubuntu-system-settings)
Revision ID: scott.sweeny@canonical.com-20151013151157-w0tbxxmbv8471h8h

Merge trunk

files removed:
plugins/sound/SilentModeWarning.qml

files modified:
debian/changelog

plugins/hotspot/CMakeLists.txt

plugins/phone/ServiceInfo.qml

plugins/security-privacy/PageComponent.qml

plugins/security-privacy/diagnostics/PageComponent.qml

plugins/security-privacy/diagnostics/diagnostics.cpp

plugins/security-privacy/diagnostics/diagnostics.h

plugins/security-privacy/trust-store-model.cpp

plugins/sound/CMakeLists.txt

plugins/sound/PageComponent.qml

plugins/sound/SoundsList.qml

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_security.py

Show diffs side-by-side

added added

removed removed

plugins/sound/PageComponent.qml

95

95

objectPath: "/com/canonical/indicator/sound"

96

96

97

97

property variant volume: action("volume")

98

property variant silentMode: action("silent-mode")

99

98

property variant highVolume: action("high-volume")

100

99

101

100

Component.onCompleted: start()

Older »