Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show some more information for GIO devices

Browse Source
This commit is contained in:
David Sansome 2010-07-17 22:06:19 +00:00
parent a2fe094bbe
commit d704680579
32 changed files with 190 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/devicemanager.cpp
View File

@ -200,6 +200,11 @@ QVariant DeviceManager::data(const QModelIndex& index, int role) const {
case Role_Capacity:
return info.size_;
case Role_FreeSpace:
return info.BestBackend()->lister_ ?
info.BestBackend()->lister_->DeviceFreeSpace(info.BestBackend()->unique_id_) :
QVariant();
case Role_State:
if (info.device_)
return State_Connected;

1
src/devices/devicemanager.h
View File

@ -44,6 +44,7 @@ public:
Role_UniqueId,
Role_FriendlyName,
Role_Capacity,
Role_FreeSpace,
Role_IconName,
Role_UpdatingPercentage,
};

11
src/devices/deviceproperties.cpp
View File

@ -81,8 +81,15 @@ void DeviceProperties::ShowDevice(int row) {
// Basic information
ui_->name->setText(index_.data(DeviceManager::Role_FriendlyName).toString());
ui_->capacity->setText(Utilities::PrettySize(
index_.data(DeviceManager::Role_Capacity).toLongLong()));
// Size
QString size_text = Utilities::PrettySize(
index_.data(DeviceManager::Role_Capacity).toLongLong());
qint64 free_space = index_.data(DeviceManager::Role_FreeSpace).toLongLong();
if (free_space)
size_text += QString(" (%1 %2)").arg(Utilities::PrettySize(free_space),
tr("available"));
ui_->capacity->setText(size_text);
// Find the right icon
QString icon_name = index_.data(DeviceManager::Role_IconName).toString();

11
src/devices/giolister.cpp
View File

@ -92,6 +92,8 @@ QVariantMap GioLister::DeviceHardwareInfo(const QString &id) {
const MountInfo& info = mounts_[id];
ret[QT_TR_NOOP("Mount point")] = info.mount_path;
ret[QT_TR_NOOP("Device")] = info.unix_device;
ret[QT_TR_NOOP("URI")] = info.uri;
return ret;
}
@ -180,6 +182,7 @@ GioLister::MountInfo GioLister::ReadMountInfo(GMount* mount) {
// Get the mount path
ret.mount_path = ConvertAndFree(g_file_get_path(root));
ret.uri = ConvertAndFree(g_file_get_uri(root));
// Query the filesystem info for size, free space, and type
GError* error = NULL;
@ -217,6 +220,14 @@ GioLister::MountInfo GioLister::ReadMountInfo(GMount* mount) {
g_object_unref(root);
// Get information about the volume
GVolume* volume = g_mount_get_volume(mount);
if (volume) {
ret.unix_device = ConvertAndFree(g_volume_get_identifier(
volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
g_object_unref(volume);
}
return ret;
}

2
src/devices/giolister.h
View File

@ -55,7 +55,9 @@ private:
QString unique_id() const;
GMount* mount;
QString unix_device;
QString mount_path;
QString uri;
QString name;
QStringList icon_names;
QString uuid;

6
src/translations/ar.po
View File

@ -1568,6 +1568,9 @@ msgstr ""
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "رابط(روابط)"
@ -1699,6 +1702,9 @@ msgstr ""
msgid "add %n songs"
msgstr "أضِف %n أغاني\\أغنية"
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/cs.po
View File

@ -1572,6 +1572,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbína"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL"
@ -1703,6 +1706,9 @@ msgstr "[pro úpravy klikněte]"
msgid "add %n songs"
msgstr "Přidej %n skladby"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/da.po
View File

@ -1575,6 +1575,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbine"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL'er"
@ -1706,6 +1709,9 @@ msgstr "[Klik for at redigere]"
msgid "add %n songs"
msgstr "tilføj %n sange"
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/de.po
View File

@ -1576,6 +1576,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbine"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1710,6 +1713,9 @@ msgstr "[zum Bearbeiten klicken]"
msgid "add %n songs"
msgstr "%n Stücke hinzufügen"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "BPM"

6
src/translations/el.po
View File

@ -1584,6 +1584,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbine"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1725,6 +1728,9 @@ msgstr "[κλικ για τροποποίηση]"
msgid "add %n songs"
msgstr "προσθήκη %n τραγουδιών"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/en_CA.po
View File

@ -1573,6 +1573,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbine"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1704,6 +1707,9 @@ msgstr "[click to edit]"
msgid "add %n songs"
msgstr "add %n songs"
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/en_GB.po
View File

@ -1570,6 +1570,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbine"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1701,6 +1704,9 @@ msgstr "[click to edit]"
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/es.po
View File

@ -1582,6 +1582,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbina"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1715,6 +1718,9 @@ msgstr "[click para editar]"
msgid "add %n songs"
msgstr "agregar %n pistas"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/fi.po
View File

@ -1570,6 +1570,9 @@ msgstr ""
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1701,6 +1704,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/fr.po
View File

@ -1578,6 +1578,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Spectrogramme \"Turbine\""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1711,6 +1714,9 @@ msgstr "[cliquer pour modifier]"
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/gl.po
View File

@ -1570,6 +1570,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbine"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1701,6 +1704,9 @@ msgstr "[clique para editar]"
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/it.po
View File

@ -1583,6 +1583,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbina"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL"
@ -1717,6 +1720,9 @@ msgstr "[clic per modificare]"
msgid "add %n songs"
msgstr "aggiungi %n brani"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/kk.po
View File

@ -1570,6 +1570,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1701,6 +1704,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/nb.po
View File

@ -1572,6 +1572,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbin"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1703,6 +1706,9 @@ msgstr "[klikk for å endre]"
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/oc.po
View File

@ -1568,6 +1568,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1699,6 +1702,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/pl.po
View File

@ -1570,6 +1570,9 @@ msgstr ""
msgid "Turbine"
msgstr "Turbina"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1701,6 +1704,9 @@ msgstr "[kliknij aby edytować]"
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/pt.po
View File

@ -1580,6 +1580,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbina"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1719,6 +1722,9 @@ msgstr "[clique para editar]"
msgid "add %n songs"
msgstr "adicionar %n canções"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/pt_BR.po
View File

@ -1581,6 +1581,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbina"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "Site(s)"
@ -1719,6 +1722,9 @@ msgstr "[clique para editar]"
msgid "add %n songs"
msgstr "Adicionar %n músicas"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/ro.po
View File

@ -1569,6 +1569,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(-uri)"
@ -1700,6 +1703,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/ru.po
View File

@ -1575,6 +1575,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Турбина"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL(s)"
@ -1709,6 +1712,9 @@ msgstr "[щелкните, чтобы изменить]"
msgid "add %n songs"
msgstr "добавить %n композиций"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "ударов в минуту"

6
src/translations/sk.po
View File

@ -1579,6 +1579,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbína"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URLy"
@ -1717,6 +1720,9 @@ msgstr "[kliknite pre úpravu]"
msgid "add %n songs"
msgstr "pridať %n piesní"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "bpm"

6
src/translations/sv.po
View File

@ -1575,6 +1575,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Turbin"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "Webbadress(er)"
@ -1707,6 +1710,9 @@ msgstr "[klicka för att redigera]"
msgid "add %n songs"
msgstr "Lägg till %n songer"
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/tr.po
View File

@ -1570,6 +1570,9 @@ msgstr ""
msgid "Turbine"
msgstr "Türbin"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1701,6 +1704,9 @@ msgstr ""
msgid "add %n songs"
msgstr "%n şakıyı ekle"
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/translations.pot
View File

@ -1558,6 +1558,9 @@ msgstr ""
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1689,6 +1692,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/uk.po
View File

@ -1579,6 +1579,9 @@ msgstr "TrueAudio"
msgid "Turbine"
msgstr "Турбіна"
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "Адреса(и)"
@ -1718,6 +1721,9 @@ msgstr "[клацніть, щоб змінити]"
msgid "add %n songs"
msgstr "додати %n композицій"
msgid "available"
msgstr ""
msgid "bpm"
msgstr "такт/хв."

6
src/translations/zh_CN.po
View File

@ -1568,6 +1568,9 @@ msgstr ""
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr "URL"
@ -1699,6 +1702,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""

6
src/translations/zh_TW.po
View File

@ -1568,6 +1568,9 @@ msgstr ""
msgid "Turbine"
msgstr ""
msgid "URI"
msgstr ""
msgid "URL(s)"
msgstr ""
@ -1699,6 +1702,9 @@ msgstr ""
msgid "add %n songs"
msgstr ""
msgid "available"
msgstr ""
msgid "bpm"
msgstr ""