Merge lp://qastaging/~larsu/unity-control-center/add-sound-indicator-visible-checkbox into lp://qastaging/~ubuntu-desktop/unity-control-center/trunk
Proposed by
Lars Karlitski
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~larsu/unity-control-center/add-sound-indicator-visible-checkbox |
| Merge into: | lp://qastaging/~ubuntu-desktop/unity-control-center/trunk |
| Diff against target: |
16260 lines (+8170/-3411) 110 files modified
configure.ac (+15/-29) debian/changelog (+134/-0) debian/control (+15/-7) debian/rules (+7/-9) debian/ucc-unity-launcher.py (+24/-0) debian/unity-control-center.install (+1/-0) debian/unity-control-center.migrations (+1/-0) panels/Makefile.am (+1/-0) panels/appearance/appearance.ui (+105/-10) panels/appearance/bg-pictures-source.c (+124/-40) panels/appearance/bg-pictures-source.h (+2/-0) panels/appearance/cc-appearance-panel.c (+151/-51) panels/bluetooth/Makefile.am (+13/-6) panels/bluetooth/bluetooth.gresource.xml (+6/-0) panels/bluetooth/bluetooth.ui (+24/-2) panels/bluetooth/cc-bluetooth-panel.c (+30/-10) panels/color/cc-color-panel.c (+1/-1) panels/common/list-languages.c (+0/-2) panels/datetime/Makefile.am (+58/-0) panels/datetime/com.canonical.controlcenter.datetime.policy.in (+21/-0) panels/datetime/datetime-dialog.ui (+864/-0) panels/datetime/datetime-prefs-locations.c (+681/-0) panels/datetime/datetime-prefs-locations.h (+35/-0) panels/datetime/datetime-prefs.c (+860/-0) panels/datetime/icons/scalable/unity-datetime-panel.svg (+861/-0) panels/datetime/settings-shared.h (+50/-0) panels/datetime/unity-datetime-panel.desktop.in.in (+12/-0) panels/datetime/utils.c (+468/-0) panels/datetime/utils.h (+66/-0) panels/display/cc-display-panel.c (+130/-18) panels/display/display-capplet.ui (+107/-44) panels/info/Makefile.am (+12/-1) panels/info/cc-info-panel.c (+109/-246) panels/info/info.ui (+12/-191) panels/info/logo-generator.vala (+47/-0) panels/info/unity-info-panel.desktop.in.in (+1/-1) panels/keyboard/gnome-keyboard-panel.ui (+1/-0) panels/mouse/gnome-mouse-properties.c (+1/-1) panels/mouse/gnome-mouse-test.c (+1/-1) panels/network/net-device-wifi.c (+5/-5) panels/power/cc-power-panel.c (+1/-1) panels/printers/cc-printers-panel.c (+2/-2) panels/printers/pp-ppd-option-widget.c (+3/-3) panels/region/cc-region-panel.c (+9/-9) panels/region/gnome-region-panel-input.c (+288/-42) panels/screen/cc-screen-panel.c (+2/-0) panels/sound/gvc-balance-bar.c (+6/-4) panels/sound/gvc-channel-bar.c (+46/-27) panels/sound/gvc-channel-bar.h (+3/-0) panels/sound/gvc-combo-box.c (+3/-2) panels/sound/gvc-mixer-dialog.c (+82/-40) panels/sound/gvc-sound-theme-chooser.c (+2/-1) panels/user-accounts/Makefile.am (+15/-15) panels/user-accounts/data/Makefile.am (+1/-12) panels/user-accounts/data/account-dialog.ui (+3/-1) panels/user-accounts/data/account-fingerprint.ui (+1/-1) panels/user-accounts/data/history-dialog.ui (+175/-0) panels/user-accounts/data/icons/Makefile.am (+0/-32) panels/user-accounts/data/password-dialog.ui (+7/-2) panels/user-accounts/data/photo-dialog.ui (+1/-0) panels/user-accounts/data/user-accounts-dialog.ui (+137/-45) panels/user-accounts/frob-account-dialog.c (+3/-3) panels/user-accounts/um-account-dialog.c (+110/-43) panels/user-accounts/um-account-dialog.h (+3/-2) panels/user-accounts/um-fingerprint-dialog.c (+12/-18) panels/user-accounts/um-fingerprint-dialog.h (+2/-2) panels/user-accounts/um-history-dialog.c (+377/-0) panels/user-accounts/um-history-dialog.h (+41/-0) panels/user-accounts/um-password-dialog.c (+125/-62) panels/user-accounts/um-password-dialog.h (+2/-2) panels/user-accounts/um-photo-dialog.c (+21/-22) panels/user-accounts/um-photo-dialog.h (+2/-2) panels/user-accounts/um-realm-manager.c (+13/-4) panels/user-accounts/um-realm-manager.h (+1/-0) panels/user-accounts/um-user-manager.c (+0/-734) panels/user-accounts/um-user-manager.h (+0/-121) panels/user-accounts/um-user-module.c (+1/-1) panels/user-accounts/um-user-panel.c (+351/-190) panels/user-accounts/um-user-panel.h (+13/-15) panels/user-accounts/um-user.c (+0/-991) panels/user-accounts/um-user.h (+0/-109) panels/user-accounts/um-utils.c (+333/-7) panels/user-accounts/um-utils.h (+18/-0) panels/user-accounts/user-accounts.gresource.xml (+23/-0) panels/wacom/Makefile.am (+15/-19) panels/wacom/calibrator/Makefile.am (+0/-3) panels/wacom/calibrator/gui_gtk.c (+2/-2) panels/wacom/cc-wacom-nav-button.c (+7/-2) panels/wacom/cc-wacom-page.c (+69/-46) panels/wacom/cc-wacom-panel.c (+10/-8) panels/wacom/cc-wacom-stylus-page.c (+8/-11) panels/wacom/gnome-wacom-properties.ui (+3/-3) panels/wacom/gsd-enums.h (+1/-1) panels/wacom/gsd-input-helper.c (+36/-3) panels/wacom/gsd-input-helper.h (+3/-0) panels/wacom/gsd-wacom-device.c (+239/-45) panels/wacom/gsd-wacom-device.h (+26/-3) panels/wacom/unity-wacom-panel.desktop.in.in (+1/-1) panels/wacom/wacom.gresource.xml (+16/-0) po/POTFILES.in (+8/-1) shell/Makefile.am (+6/-0) shell/cc-editable-entry.c (+127/-1) shell/cc-editable-entry.h (+9/-0) shell/cc-shell-model.c (+6/-2) shell/completions/unity-control-center.in (+56/-0) shell/control-center.c (+8/-2) shell/gnome-control-center.c (+209/-13) shell/gnome-control-center.h (+3/-0) shell/list-panel.sh (+8/-0) shell/shell.ui (+0/-3) |
| To merge this branch: | bzr merge lp://qastaging/~larsu/unity-control-center/add-sound-indicator-visible-checkbox |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Desktop | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-03-03.
Commit message
Add "Show sound volume in the menu bar" check box
Description of the change
Add "Show sound volume in the menu bar" check box
To post a comment you must log in.
Unmerged revisions
- 12742. By Lars Karlitski
-
Merge trunk
- 12741. By Lars Karlitski
-
Add "Show sound volume in the menu bar" check box
- 12740. By Lars Karlitski
-
Rename indicator_settings to sound_settings
- 12739. By PS Jenkins bot
-
Releasing 14.04.3+
14.04.20140226- 0ubuntu1 - 12738. By Sebastien Bacher
-
Backport some bugfixes and small improvements Fixes: 1280742
- 12737. By Robert Ancell
-
Compile with unity-settings-
daemon instead of gnome-settings- daemon Fixes: 1277585 - 12736. By Eleni Maria Stea
-
In display add_dict_entry:
replaced the gvariant arrays with gvariant builder to simplify the code - 12735. By Sebastien Bacher
-
shell: don't set a secondary icon, GtkSearchEntry already has one
- 12734. By Sebastien Bacher
-
shell: backport fixes from gnome-3-8. Those include some tweaks to the
command line options, improvements to the keyboard navigation in the icons
grid, and support for bash completion - 12733. By PS Jenkins bot
-
Releasing 14.04.3+
14.04.20140225- 0ubuntu1
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
