Commit by Matěj Laitl on master :: rv2.5.0-123-gec41a52 amarok/README: (link)

Add gmock optional dependency to README

Commit by Bart Cerneels on master :: rv2.5.0-121-gd564521 amarok/src/EngineController.cpp: (link)

Fix playing CD's broken in recent commit.

commit 67f5c1ae332f6727f91af346a6b5858fe6e5b285 introduced percent encoding,
which was not properly decoded in EngineController.

CCMAIL:b dot steinbrink at gmx dot de

Commit by Matěj Laitl on master :: rv2.5.0-118-ga8332c4 amarok/ (5 files in 3 dirs): (link)

MetaFile::Track: add setCollection(), use it in UmsCollection

BUGFIXES:
 * Don't report collection of USB Mass Storage tracks as None.

DIGEST: Bugfix

Commit by Matěj Laitl on master :: rv2.5.0-116-g88f7be6 amarok/src/context/applets/videoclip/VideoclipApplet.cpp: (link)

Fix another crash on exit with Qt 4.8 wrt qDeleteAll()

BUG: 285951

Commit by Matěj Laitl on master :: rv2.5.0-115-g1140d30 amarok/src/core-impl/collections/support/MemoryCollection.h: (link)

Older gcc evidently needs template parameters repeated

Some users got these errors with gcc 4.4.5:
src/core-impl/collections/support/MemoryCollection.h:38:
Error: "template<class Key, class T> class QMap" used without template
parameters

Thanks to d-fens_ in #amarok

Commit by Matěj Laitl on master :: rv2.5.0-113-g3e0935c amarok/src/core-impl/collections/db/sql/device/massstorage/amarok_device_massstorage.desktop: (link)

Fixup previous commit, Local Files backend supports pluggable devices too

CCBUG: 293277

Commit by Matěj Laitl on master :: rv2.5.0-114-g76239bb amarok/ (3 files in 2 dirs): (link)

UmsCollection: rework factory <-> collection interaction

The main change is that the UmsCollection is created only for
_accessible_ (mounted) Solid devices so no phantom (allowing no
interaction) collections are listed in collection browser.

Another change is that not-activated UMS collections get
"(not activated)" appended to their name so that it is more clear that
users need to click "Use As Collection" button, which is by the way
renamed to "Activate This Collection" by this commit.

The changes in UmsColllectionFactory are done with future merge with
other "new" pluggable collections factories in mind -- 80% of the code
in UmsColllecionFactory is the same as in out-of-tree rewrite of the
iPod collection.

CHANGES:
 * Don't show unmounted USB Mass Storage devices and make it clear when
   the device is not "activated" yet.

CCMAIL: Bart Cerneels <bart dot cerneels at kde dot org>
DIGEST: Better behaviour of USB Mass Storage collection [see CHANGES]

Commit by Matěj Laitl on master :: rv2.5.0-112-g3788b0e amarok/ (6 files in 6 dirs): (link)

Change GUI strings in Configuration dialog to reduce user confusion

This is a result of a dialogue with an Amarok user (Leonidas Tsampros)
on #amarok who (logically) thought that if he enables "NFS Device" in
"Devices" section of Amarok plugins, NFS will pop-up as another
collection.

This is not how SMB, NFS, MassStorage "Devices" work currently, they
are meant to enable users to have a part of their collection on
respective devices.

I believe that the old plugin names and descriptions are confusing to
the extent that their translations should be dropped; it should be a
plenty of time till Amarok 2.6 so translators should have opportunity
to pickup these. (or, do .desktop translations get erased automatically
when original string changes?)

CHANGES:
 * "Devices" in Amarok configuration -> Plugins is with other related strings
   renamed to "Local Collection Backends" to reduce user confusion.

BUG: 293277
FIXED-IN: 2.6
REVIEW: 103871

Commit by Matěj Laitl on master :: rv2.5.0-111-gccd18a6 amarok/ (2 files in 2 dirs): (link)

MetaFile::Album: support for embedded album cover reading & writing

FEATURES:
  * Support for embedded album covers in non-collection tracks and
    in USB Mass Storage collection.

This could potentially slow down performace of album loading, but my
tests show that cover art loading takes 2 - 10ms, which is really okay.
Also, the fact that track has embedded cover is cached, so there is no
penalty for tracks wihout cover.

DIGEST: Feature

Commit by Matěj Laitl on master :: rv2.5.0-110-g0292de0 amarok/src/core-impl/collections/support/CollectionManager.cpp: (link)

Extend fix of bug 285951 to the other crash site

This should definitely fix the Amarok crashes during exit bug.

BUG: 285951
FIXED-IN: 2.6
DIGEST: fix crash bug

Commit by Matěj Laitl on master :: rv2.5.0-109-gc31d00f amarok/ (5 files in 2 dirs): (link)

UmsCollection: reflect track add/change/remove in the ui

I wonder no-one actually noticed/reported that the collection browser
doesn't update.

BUGFIXES:
 * When adding, changing and removing tracks in USB Mass Storage collection,
   actually update the user interface to show it.

DIGEST: bugfix
CCMAIL: Bart Cerneels <bart dot cerneels at kde dot org>

Commit by Matěj Laitl on master :: rv2.5.0-108-g2267541 amarok/ (3 files in 2 dirs): (link)

UmsCollectionLocation: cleanups, corrections, fixes

This fixes UmsCollectionLocation to be on par with Amarok standards.
This is the first part of making the USB Mass Storage collection behave
like it should.

BUGFIXES:
 * Remove empty folders when deleting tracks from USB Mass Storage collection.
 * Don't copy tracks to USB Mass Storage collection in move operation.
 * Fix defunct aborting of transfers to USB Mass Storage collection.

BUG: 290448
FIXED-IN: 2.6
DIGEST: bugfix
CCMAIL: Bart Cerneels <bart dot cerneels at kde dot org>

Commit by Matěj Laitl on master :: rv2.5.0-117-g8a90627 amarok/ (6 files in 2 dirs): (link)

Another approach to fix bug 291068, be more permissive

Bart originally solved the bug by enabling track dropping only
precisely on root collection rows. This is IMO too much restrictive
as it prevents you to drag tracks between 2 large expanded collections
without excessive scrolling. (something I would miss) Additionally,
there was no visual indication that the drop will not be performed.

This is my try to rework it in a way that:
 * keeps drops onto artists/albums (whatever you first level
   entity in collection browser is) allowed. There is a drop indicator
   that clearly shows that the drop will go _between_ the entities, not
   to them.
 * disables drops to read-only collections
 * disabled drops are indicated visually using the not-allowed mouse
   cursor (the tricky part, but commented well in code)

Some more code comments not present in review request are added.

BUG: 291068
REVIEW: 103856
DIGEST: More natural drag'n'drop behaviour in collection browser

Commit by Matěj Laitl on master :: rv2.5.0-107-ge9f05d8 amarok/ (5 files in 2 dirs): (link)

Shift key while dragging tracks to collections changes from copying to moving

The functionality was already there, but unintentionally disabled because
default implementation of CollectionTreeItemModel::supportedDropActions()
did not return Qt::MoveAction.

Care is taken to visually indicate the feature in gui by changing the mouse
cursor.

DIGEST: Feature, see title.

Commit by Björn Steinbrink on master :: rv2.5.0-106-g67f5c1a amarok/ (2 files in 2 dirs): (link)

Fix failure to rip CD tracks with special characters in their title

Certain characters such as ? have a special meaning in URLs so they have
to be encoded when used in path component, but the AudioCdCollection
fails to do so and just embeds the raw track title into the URL. Thus it
is impossible to rip tracks that contain such characters in their title,
as the URL passed to the KIO subsystem is invalid.

BUG: 224437
FIXED-IN: 2.6
REVIEW: 103841

Commit by Daniel Faust on master :: rv2.5.0-102-gcd76b2c amarok/ (2 files in 2 dirs): (link)

Fix crash when trying to save custom equalizer presets.

This also improves the UI a little bit (deactivates unusable buttons).

Also it prohibits saving a 'Manual' profile in non-english versions.
Overwriting default presets still doesn't work in non-english versions, though.

BUG:286227
FIXED-IN:2.6

Commit by Bart Cerneels on master :: rv2.5.0-105-g8d103cf amarok/ (2 files in 2 dirs): (link)

Don't accept drops on non-collectionheader items.

Caused the copy dialog to come up.

BUG: 291068
FIXED-IN: 2.6

Commit by Bart Cerneels on master :: rv2.5.0-104-g73813af amarok/ (3 files in 2 dirs): (link)

Fix PlaylistBrowser scroll w/ keyboard navigation.

BUG: 259791
FIXED-IN: 2.6

Commit by Bart Cerneels on master :: rv2.5.0-103-geae396e amarok/ (3 files in 2 dirs): (link)

Enable keyboard activation of PlaylistBrowser items.

Note: keyboard navigation using the arrow keys is only possible if the
default shortcut asssignments for seeking are changed.

Commit by Christophe Giboudeaux on master :: rv2.5.0-101-g1020874 amarok/ (2 files in 2 dirs): (link)

FindMySQLAmarok.cmake: do not rely on mysql_config --variable=...

As least mysql 5.1.* doesn't support this syntax and emits usage
information when called, which is then feed into MYSQL_INCLUDE_DIR
which in turn makes very funny output when -Wmissing-include-dirs is
passed to gcc. This has been reported in [1] and further discussion
about this was at [2].

[1] http://mail.kde.org/pipermail/amarok-devel/2011-December/009663.html
[2] http://mail.kde.org/pipermail/amarok-devel/2011-December/009668.html

MYSQL_INCLUDE_DIR is now found by looking up mysql.h in a predefined
list of directories (not nice, but works).

Patch author is Christophe Giboudeaux, comment form Matej Laitl follows:
It was suggested that Amarok should use FindMySQL.cmake from kdelibs
that doesn't call mysql_config at all, but I've found that at least
call to mysql_config --libs cannot be easily avoided without
hard-coding that MySQL depends on ssl, pthread, crypt libraries to
Amarok.