GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit b9ce7712)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit 76753103)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Using a new singleton class VolumeFeedback, which receives volume
change events via a ControlManager announcement and plays the sound
for a volume change on the current global master device.  This also
handles rate limiting and stopping at maximum volume as per the
referenced bugs.  Remove the corresponding code from the PulseAudio
and ALSA backends.

In theory this means that volume feedback will also work with OSS,
assuming that Canberra supports OSS output.

CCBUG:302361
CCBUG:302474
CCBUG:323608

Add an overload of ControlManager::removeListener() that takes an
additional ControlManager::ChangeType parameter, only the listener
for that change type is removed.  Used by VolumeFeedback to change
the listener for a volume change on a specified mixer, while still
maintaining the listener for a global master change.

Tidied up debug messages (log before the action to which it refers).
Make Listener a private struct (it doesn't need to be a public class).

So that it can also be used as a device name for volume feedback
via Canberra.  Apart from this the UDI is only used as an internal
identifier for hotplug, so nothing else is affected.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

And even those are probably obsolete by now.

Not sure if anyone is using it, and dataengines will be removed
in Plasma 6.

This means the messages and controls that depend on whether PulseAudio
and Canberra are available.  The critera cannot change at runtime, and
setting them up statically instead of at the showEvent() avoids the odd
situation where opening the preferences dialogue from the popup volume
control (which opens it with the "Volume Control" page shown) causes
the "Volume overdrive is only available with PulseAudio" message widget
on the "General" page to be blank.

There is no need for the separate createInstance() and getInstance().
However, it does need to be created at initialisation time so that the
signal can be connected.

KMixPrefDlg tracks the changes using KMixPrefDlg::PrefChanges depending
on which GUI control has been changed.  KMixWindow::applyPrefs() looks
at the changes which have been made and announces them as required.

Which is effectively what it was anyway.

Rename files to reflect class name
Eliminate dependencies of 'gui' and 'core' on 'apps' include files
Remove unused variables, functions and includes

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Introduced by commit d136985d.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

The control alignment carried out for the main KMix window in
ViewSliders::configurationUpdate() was not being done for
the system tray popup, which meant that the controls may
not line up with long labels.  Move the alignment to
ViewBase::adjustControlsLayout() and do it for the system tray
popup also.

CCBUG:314280

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Some controls, in particular PulseAudio, have a significant range
which means that a single step of 1 does not appear to move the slider
when an arrow key or the mouse wheel is used (although it actually does,
just very slowly).  Set the single step to give 100 steps.

BUG:416405