iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Capitalise first letter of device name.

Browse Source
This commit is contained in:
Craig Drummond
2015-12-20 10:21:40 +00:00
parent 887927b850
commit 7c12f2f478
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -85,6 +85,7 @@
62. Default to Qt5 builds.
63. Fix copying songs to devices - incorrect number of bytes were transferred.
64. Only use MTP device with BUSNUM and DEVNUM properties.
65. Capitalise first letter of device name.
1.5.2
-----

28
devices/device.cpp
View File

@@ -294,6 +294,34 @@ QTemporaryFile * Device::copySongToTemp(Song &song)
return temp;
}
Device::Device(MusicModel *m, Solid::Device &dev, bool albumArtistSupport, bool flat)
: MusicLibraryItemRoot(dev.product().startsWith(dev.vendor()) ? dev.product() : (dev.vendor()+QChar(' ')+dev.product()), albumArtistSupport, flat)
, configured(false)
, solidDev(dev)
, deviceId(dev.udi())
, update(0)
, needToFixVa(false)
, jobAbortRequested(false)
, transcoding(false)
{
m_model=m;
icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
m_itemData[0]=m_itemData[0].toUpper();
}
Device::Device(MusicModel *m, const QString &name, const QString &id)
: MusicLibraryItemRoot(name)
, configured(false)
, deviceId(id)
, update(0)
, needToFixVa(false)
, jobAbortRequested(false)
, transcoding(false)
{
m_model=m;
icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
}
void Device::saveCache()
{
QTimer::singleShot(0, this, SIGNAL(cacheSaved()));

25
devices/device.h
View File

@@ -105,29 +105,8 @@ public:
Q_UNUSED(id)
}
#else
Device(MusicModel *m, Solid::Device &dev, bool albumArtistSupport=true, bool flat=false)
: MusicLibraryItemRoot(dev.product().startsWith(dev.vendor()) ? dev.product() : (dev.vendor()+QChar(' ')+dev.product()), albumArtistSupport, flat)
, configured(false)
, solidDev(dev)
, deviceId(dev.udi())
, update(0)
, needToFixVa(false)
, jobAbortRequested(false)
, transcoding(false) {
m_model=m;
icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
}
Device(MusicModel *m, const QString &name, const QString &id)
: MusicLibraryItemRoot(name)
, configured(false)
, deviceId(id)
, update(0)
, needToFixVa(false)
, jobAbortRequested(false)
, transcoding(false) {
m_model=m;
icn=Icon(solidDev.isValid() ? solidDev.icon() : QLatin1String("inode-directory"));
}
Device(MusicModel *m, Solid::Device &dev, bool albumArtistSupport=true, bool flat=false);
Device(MusicModel *m, const QString &name, const QString &id);
#endif
virtual ~Device() { }