aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* re-enable notifications-testCharles Kerr2016-01-061-1/+1
|
* sync with trunk.15.10Charles Kerr2016-01-063-1/+73
|\
| * Releasing 12.10.2+16.04.20160105.2-0ubuntu1CI Train Bot2016-01-051-0/+66
| |
| * Adds an action to signal the UI to sync the current volume when we are ↵Xavi Garcia Mena2016-01-0513-25/+307
| |\ | | | | | | | | | | | | | | | waiting for the user to confirm or reject the high volume notification. Fixes: #1512798, #1520548 Approved by: PS Jenkins bot, Charles Kerr, Nick Dedekind
| * \ This branch re-adds the integration tests using gmenuharness.Xavi Garcia Mena2016-01-057-31/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added OSD notifications to show output source when the volume or source change (LP: #1382548, LP: #1415480, LP: #1484589) * debian/control: Added the following build dependencies: - cmake-extras (>= 0.4), - google-mock (>= 1.6.0+svn437), - libqtdbusmock1-dev (>= 0.3), - libqtdbustest1-dev, - libunity-api-dev, - pulseaudio, - qt5-default, - qtbase5-dev, - qtbase5-dev-tools, - qtdeclarative5-dev, - qtdeclarative5-dev-tools * Added gmenuharness library for integration tests support. New Files: - src/gmenuharness/CMakeLists.txt - src/gmenuharness/MatchResult.cpp - src/gmenuharness/MatchUtils.cpp - src/gmenuharness/MenuItemMatcher.cpp - src/gmenuharness/MenuMatcher.cpp - include/unity/gmenuharness/MatchResult.h - include/unity/gmenuharness/MatchUtils.h - include/unity/gmenuharness/MenuItemMatcher.h - include/unity/gmenuharness/MenuMatcher.h * Added integration tests using gmenuharness New Files: - tests/dbus-types/CMakeLists.txt - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml - tests/dbus-types/dbus-types.h - tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml - tests/dbus-types/org.freedesktop.Accounts.xml - tests/dbus-types/org.freedesktop.DBus.Properties.xml - tests/dbus-types/org.freedesktop.Notifications.xml - tests/dbus-types/org.gtk.Actions.xml - tests/dbus-types/pulseaudio-volume.cpp - tests/dbus-types/pulseaudio-volume.h - tests/integration/CMakeLists.txt - tests/integration/indicator-sound-test-base.cpp - tests/integration/indicator-sound-test-base.h - tests/integration/main.cpp - tests/integration/test-indicator.cpp - tests/integration/touch-stream-restore.table - tests/integration/utils/dbus-pulse-volume.cpp - tests/integration/utils/dbus-pulse-volume.h - tests/integration/utils/get-volume.cpp - tests/integration/utils/set-volume.cpp - tests/service-mocks/CMakeLists.txt - tests/service-mocks/DBusPropertiesNotifier.cpp - tests/service-mocks/DBusPropertiesNotifier.h - tests/service-mocks/accounts-mock/AccountsDefs.h - tests/service-mocks/accounts-mock/AccountsMock.cpp - tests/service-mocks/accounts-mock/AccountsMock.h - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h - tests/service-mocks/accounts-mock/CMakeLists.txt - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml - tests/service-mocks/accounts-mock/main.cpp - tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml - tests/service-mocks/media-player-mpris-mock/CMakeLists.txt - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h - tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop - tests/service-mocks/media-player-mpris-mock/main.cpp - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml - tests/service-mocks/media-player-mpris-mock/player-update.cpp Approved by: Charles Kerr, Xavi Garcia
| * \ \ This branch just readds the OSD notifications code, that was reverted in ↵Xavi Garcia Mena2016-01-0561-176/+6328
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | trunk as the corresponding silo was also rolled back after landing. Approved by: PS Jenkins bot, Xavi Garcia
* | \ \ \ sync with trunkCharles Kerr2016-01-053-78/+33
|\ \ \ \ \
| * \ \ \ \ adding lp:~xavi-garcia-mena/indicator-sound/action-sync-volumeCharles Kerr2016-01-0513-25/+307
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | adding lp:~xavi-garcia-mena/indicator-sound/re-add-integration-testsCharles Kerr2016-01-057-31/+66
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | [ Xavi Garcia ]Xavi Garcia Mena2016-01-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added OSD notifications to show output source when the volume or source change (LP: #1382548, LP: #1415480, LP: #1484589) * debian/control: Added the following build dependencies: - cmake-extras (>= 0.4), - google-mock (>= 1.6.0+svn437), - libqtdbusmock1-dev (>= 0.3), - libqtdbustest1-dev, - libunity-api-dev, - pulseaudio, - qt5-default, - qtbase5-dev, - qtbase5-dev-tools, - qtdeclarative5-dev, - qtdeclarative5-dev-tools * Added gmenuharness library for integration tests support. New Files: - src/gmenuharness/CMakeLists.txt - src/gmenuharness/MatchResult.cpp - src/gmenuharness/MatchUtils.cpp - src/gmenuharness/MenuItemMatcher.cpp - src/gmenuharness/MenuMatcher.cpp - include/unity/gmenuharness/MatchResult.h - include/unity/gmenuharness/MatchUtils.h - include/unity/gmenuharness/MenuItemMatcher.h - include/unity/gmenuharness/MenuMatcher.h * Added integration tests using gmenuharness New Files: - tests/dbus-types/CMakeLists.txt - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml - tests/dbus-types/dbus-types.h - tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml - tests/dbus-types/org.freedesktop.Accounts.xml - tests/dbus-types/org.freedesktop.DBus.Properties.xml - tests/dbus-types/org.freedesktop.Notifications.xml - tests/dbus-types/org.gtk.Actions.xml - tests/dbus-types/pulseaudio-volume.cpp - tests/dbus-types/pulseaudio-volume.h - tests/integration/CMakeLists.txt - tests/integration/indicator-sound-test-base.cpp - tests/integration/indicator-sound-test-base.h - tests/integration/main.cpp - tests/integration/test-indicator.cpp - tests/integration/touch-stream-restore.table - tests/integration/utils/dbus-pulse-volume.cpp - tests/integration/utils/dbus-pulse-volume.h - tests/integration/utils/get-volume.cpp - tests/integration/utils/set-volume.cpp - tests/service-mocks/CMakeLists.txt - tests/service-mocks/DBusPropertiesNotifier.cpp - tests/service-mocks/DBusPropertiesNotifier.h - tests/service-mocks/accounts-mock/AccountsDefs.h - tests/service-mocks/accounts-mock/AccountsMock.cpp - tests/service-mocks/accounts-mock/AccountsMock.h - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp - tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h - tests/service-mocks/accounts-mock/CMakeLists.txt - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml - tests/service-mocks/accounts-mock/main.cpp - tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml - tests/service-mocks/media-player-mpris-mock/CMakeLists.txt - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp - tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h - tests/service-mocks/media-player-mpris-mock/applications/testplayer1.desktop - tests/service-mocks/media-player-mpris-mock/main.cpp - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.Player.xml - tests/service-mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml - tests/service-mocks/media-player-mpris-mock/player-update.cpp
| | * | | | remove changed in debian/changelogXavi Garcia Mena2016-01-051-76/+0
| | | | | |
| | * | | | re-added new stuffXavi Garcia Mena2016-01-051-0/+76
| | | | | |
| | * | | | sync changelog with previous branchXavi Garcia Mena2016-01-051-76/+19
| | | | | |
| | * | | | Rolling back to release 516Xavi Garcia Mena2016-01-051-24/+9
| | | | | |
| | * | | | sync debian/changelog with pre-requisite branchXavi Garcia Mena2016-01-051-9/+24
| | | | | |
| | * | | | removed extra line in debian/changelogXavi Garcia Mena2016-01-051-1/+0
| | | | | |
| | * | | | Conflicts resolved with restored branchXavi Garcia Mena2015-12-237-31/+142
| | |\ \ \ \
| * | \ \ \ \ adding lp:~xavi-garcia-mena/indicator-sound/restore-osd-notificationsCharles Kerr2016-01-0561-176/+6328
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | restore debian/changelog changesXavi Garcia Mena2016-01-051-2/+21
| | |/ / /
| | * | | restore OSD notificationsXavi Garcia Mena2015-12-2362-197/+6330
| | | | |
| * | | | Releasing 12.10.2+16.04.20151223.1-0ubuntu1CI Train Bot2015-12-231-0/+9
| | | | |
| * | | | Very simple change to make upstart try to respawn the process 30 times ↵Xavi Garcia Mena2015-12-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (instead of 2). This is a workaround for the case when dbus session is not ready yet at startup. Approved by: Xavi Garcia
| | * | | | Changed number of upstart respawn retriesXavi Garcia Mena2015-12-231-1/+1
| |/ / / /
| * | | | Releasing 12.10.2+16.04.20151223-0ubuntu1CI Train Bot2015-12-231-0/+7
| | | | |
| * | | | Very simple change to make upstart try to respawn the process 30 times ↵CI Train Bot2015-12-230-0/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | (instead of 2). This is a workaround for the case when dbus session is not ready yet at startup. Approved by: PS Jenkins bot, Charles Kerr
| * | | Restore changelog entries for CI Train purposes but note that they should be ↵Timo Jyrinki2015-12-231-0/+26
| | | | | | | | | | | | | | | | ignored as they were reverted.
| * | | Reverted to release 507Xavi Garcia Mena2015-12-2363-6349/+177
| | | |
| * | | Releasing 12.10.2+16.04.20151222-0ubuntu1CI Train Bot2015-12-221-0/+9
| | | |
| * | | Very simple change to make upstart try to respawn the process 30 times ↵Xavi Garcia Mena2015-12-221-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (instead of 2). This is a workaround for the case when dbus session is not ready yet at startup. Approved by: PS Jenkins bot, Charles Kerr
| | * | | Changed number of times upstart can try to respawn the processXavi Garcia Mena2015-12-211-1/+1
| |/ / /
* | | | revert previous commit to preserve translation strings (eg, s/USB/Usb/)Charles Kerr2016-01-052-4/+4
| | | |
* | | | typo fix: s/Usb/USB/ in ui stringscharles kerr2016-01-012-4/+4
| | | |
* | | | in notifications-test, make the loop test more flexiblecharles kerr2016-01-011-16/+27
| | | |
* | | | use a custom timer to speed up TriggerWarning's many test combinationscharles kerr2015-12-311-2/+28
| | | |
* | | | expand volume warning test to include all trigger requirementscharles kerr2015-12-311-31/+74
| | | |
* | | | re-add notifications-test to testscharles kerr2015-12-311-1/+1
| | | |
* | | | in icon picking code, fold redundant cases togethercharles kerr2015-12-312-185/+54
| | | |
* | | | use the 'unowned' keyword when picking from lists of hardcoded stringscharles kerr2015-12-312-16/+16
| | | |
* | | | fix references to unowned strings returned by Environment.get_variable()charles kerr2015-12-312-3/+3
| | | |
* | | | fix references to unowned strings returned by Proplist.gets()charles kerr2015-12-311-4/+4
| | | |
* | | | use predefined VariantTypes instead of reinventing the wheelcharles kerr2015-12-314-8/+8
| | | |
* | | | simplify some code in volume-warning and volume-warning-pulsecharles kerr2015-12-312-63/+46
| | | |
* | | | copyediting: yet more whitespacecharles kerr2015-12-311-25/+25
| | | |
* | | | update POTFILES.incharles kerr2015-12-311-0/+4
| | | |
* | | | in info-warning's icon picking code, fold redundant cases into one.charles kerr2015-12-311-77/+1
| | | | | | | | | | | | | | | | | | | | | | | | It looks like these switch statements are intended for future expansion, so leaving the basic switching logic intact
* | | | copyediting: whitespacecharles kerr2015-12-313-22/+24
| | | |
* | | | in Options, make const strings constcharles kerr2015-12-311-12/+16
| | | |
* | | | rename VolumeWarning.high_volume_approved as VolumeWarning.approvedcharles kerr2015-12-313-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | After being moved into a class named "VolumeWarning", the high_volume_ prefix was redunant.
* | | | add new Notifications test for volume-warning requiring headphonescharles kerr2015-12-301-0/+59
| | | |
* | | | in mock Notify server, support actions required for volume warningscharles kerr2015-12-301-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 23:15:09 +0000