From 94a9d520b5a60cf25b46bc97bcc58a0d9a96fb8b Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sat, 24 Jul 2010 23:20:34 +0000
Subject: [PATCH] Show the mount path of connected devices

---
 src/devices/connecteddevice.h     | 1 +
 src/devices/devicemanager.cpp     | 5 +++++
 src/devices/devicemanager.h       | 1 +
 src/devices/deviceview.cpp        | 2 +-
 src/translations/ar.po            | 3 ---
 src/translations/bg.po            | 3 ---
 src/translations/cs.po            | 6 +++---
 src/translations/da.po            | 3 ---
 src/translations/de.po            | 6 +++---
 src/translations/el.po            | 6 +++---
 src/translations/en_CA.po         | 3 ---
 src/translations/en_GB.po         | 3 ---
 src/translations/es.po            | 6 +++---
 src/translations/fi.po            | 3 ---
 src/translations/fr.po            | 6 +++---
 src/translations/gl.po            | 3 ---
 src/translations/it.po            | 6 +++---
 src/translations/kk.po            | 3 ---
 src/translations/lt.po            | 3 ---
 src/translations/nb.po            | 3 ---
 src/translations/nl.po            | 6 +++---
 src/translations/oc.po            | 3 ---
 src/translations/pl.po            | 6 +++---
 src/translations/pt.po            | 6 +++---
 src/translations/pt_BR.po         | 3 ---
 src/translations/ro.po            | 3 ---
 src/translations/ru.po            | 6 +++---
 src/translations/sk.po            | 6 +++---
 src/translations/sr.po            | 6 +++---
 src/translations/sv.po            | 3 ---
 src/translations/tr.po            | 6 +++---
 src/translations/translations.pot | 3 ---
 src/translations/uk.po            | 6 +++---
 src/translations/zh_CN.po         | 3 ---
 src/translations/zh_TW.po         | 3 ---
 35 files changed, 50 insertions(+), 94 deletions(-)

diff --git a/src/devices/connecteddevice.h b/src/devices/connecteddevice.h
index eefb5e2be..ffa2b7e46 100644
--- a/src/devices/connecteddevice.h
+++ b/src/devices/connecteddevice.h
@@ -40,6 +40,7 @@ public:
   DeviceLister* lister() const { return lister_; }
   QString unique_id() const { return unique_id_; }
   LibraryModel* model() const { return model_; }
+  QUrl url() const { return url_; }
 
   virtual MusicStorage* storage() = 0;
 
diff --git a/src/devices/devicemanager.cpp b/src/devices/devicemanager.cpp
index f02b83c61..4f97b96e0 100644
--- a/src/devices/devicemanager.cpp
+++ b/src/devices/devicemanager.cpp
@@ -241,6 +241,11 @@ QVariant DeviceManager::data(const QModelIndex& index, int role) const {
         return QVariant::fromValue(info.device_->storage());
       return QVariant();
 
+    case Role_MountPath:
+      if (info.device_)
+        return info.device_->url().path();
+      return QVariant();
+
     default:
       return QVariant();
   }
diff --git a/src/devices/devicemanager.h b/src/devices/devicemanager.h
index 0fad56a14..360b759a5 100644
--- a/src/devices/devicemanager.h
+++ b/src/devices/devicemanager.h
@@ -48,6 +48,7 @@ public:
     Role_FreeSpace,
     Role_IconName,
     Role_UpdatingPercentage,
+    Role_MountPath,
 
     LastRole,
   };
diff --git a/src/devices/deviceview.cpp b/src/devices/deviceview.cpp
index 18fcc872d..3b6c214de 100644
--- a/src/devices/deviceview.cpp
+++ b/src/devices/deviceview.cpp
@@ -99,7 +99,7 @@ void DeviceItemDelegate::paint(QPainter* p, const QStyleOptionViewItem& opt, con
         break;
 
       case DeviceManager::State_Connected:
-        status_text = tr("Connected");
+        status_text = index.data(DeviceManager::Role_MountPath).toString();
         break;
     }
   }
diff --git a/src/translations/ar.po b/src/translations/ar.po
index 619186545..46809a0c6 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -374,9 +374,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/bg.po b/src/translations/bg.po
index dbe694753..5cbcfeb42 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -374,9 +374,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/cs.po b/src/translations/cs.po
index ee51bd07a..b4e039a2a 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -376,9 +376,6 @@ msgstr "Nastavit knihovnu..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr "Připojeno"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1751,6 +1748,9 @@ msgstr "zastavit"
 msgid "track %1"
 msgstr "stopa %1"
 
+#~ msgid "Connected"
+#~ msgstr "Připojeno"
+
 #~ msgid "Options"
 #~ msgstr "Možnosti"
 
diff --git a/src/translations/da.po b/src/translations/da.po
index 011727216..c7ec92a89 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -376,9 +376,6 @@ msgstr "Indstil bibliotek..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/de.po b/src/translations/de.po
index 8ec048ffc..1d6d776b4 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -381,9 +381,6 @@ msgstr "Musiksammlung einrichten..."
 msgid "Connect device"
 msgstr "Gerät verbinden"
 
-msgid "Connected"
-msgstr "Verbunden"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1776,6 +1773,9 @@ msgstr "Anhalten"
 msgid "track %1"
 msgstr "Stück %1"
 
+#~ msgid "Connected"
+#~ msgstr "Verbunden"
+
 #~ msgid "Delete originals"
 #~ msgstr "Originale löschen"
 
diff --git a/src/translations/el.po b/src/translations/el.po
index f5d9dbfb8..baf606c41 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -385,9 +385,6 @@ msgstr "Παραμετροποίηση της βιβλιοθήκης"
 msgid "Connect device"
 msgstr "Σύνδεση συσκευής"
 
-msgid "Connected"
-msgstr "Συνδέθηκε"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1782,6 +1779,9 @@ msgstr "διακοπή"
 msgid "track %1"
 msgstr "κομμάτι %1"
 
+#~ msgid "Connected"
+#~ msgstr "Συνδέθηκε"
+
 #~ msgid "Delete originals"
 #~ msgstr "Διαγραφή των αυθεντικών"
 
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index f1ac72331..f4a4e1e0e 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -374,9 +374,6 @@ msgstr "Configure library..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index 5fb435c1d..bc6fde381 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -374,9 +374,6 @@ msgstr "Configure library..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/es.po b/src/translations/es.po
index 6bdbae6a1..52a8a08f2 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -385,9 +385,6 @@ msgstr "Configurar colección..."
 msgid "Connect device"
 msgstr "Conectar dispositivo"
 
-msgid "Connected"
-msgstr "Conectado"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1783,6 +1780,9 @@ msgstr "detener"
 msgid "track %1"
 msgstr "Pista %1"
 
+#~ msgid "Connected"
+#~ msgstr "Conectado"
+
 #~ msgid "Delete originals"
 #~ msgstr "Eliminar originales"
 
diff --git a/src/translations/fi.po b/src/translations/fi.po
index 59e1be552..2a548b5f1 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -374,9 +374,6 @@ msgstr "Kirjaston asetukset..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/fr.po b/src/translations/fr.po
index 04b1cab31..d93e2abd2 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -378,9 +378,6 @@ msgstr "Configurer votre bibliothèque..."
 msgid "Connect device"
 msgstr "Connexion du périphérique"
 
-msgid "Connected"
-msgstr "Connecté"
-
 msgid "Copy to device..."
 msgstr "Copier sur le périphérique"
 
@@ -1763,6 +1760,9 @@ msgstr ""
 msgid "track %1"
 msgstr "piste %1"
 
+#~ msgid "Connected"
+#~ msgstr "Connecté"
+
 #~ msgid "Delete originals"
 #~ msgstr "Supprimer les originaux"
 
diff --git a/src/translations/gl.po b/src/translations/gl.po
index f33f61fc5..bd6202d4e 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -374,9 +374,6 @@ msgstr "Configurar a biblioteca..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/it.po b/src/translations/it.po
index 86876c659..f8e6e1834 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -384,9 +384,6 @@ msgstr "Configura raccolta..."
 msgid "Connect device"
 msgstr "Connetti dispositivo"
 
-msgid "Connected"
-msgstr "Connesso"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1787,6 +1784,9 @@ msgstr "ferma"
 msgid "track %1"
 msgstr "traccia %1"
 
+#~ msgid "Connected"
+#~ msgstr "Connesso"
+
 #~ msgid "Delete originals"
 #~ msgstr "Elimina originali"
 
diff --git a/src/translations/kk.po b/src/translations/kk.po
index d347cde86..4936bfc6f 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -374,9 +374,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/lt.po b/src/translations/lt.po
index 3e0f2bc73..eb93d49dd 100644
--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@@ -374,9 +374,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/nb.po b/src/translations/nb.po
index 0244d8256..22232d523 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -374,9 +374,6 @@ msgstr "Sett opp bibliotek..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/nl.po b/src/translations/nl.po
index 60710b3e2..544aa83bd 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -380,9 +380,6 @@ msgstr "Bibliotheek configureren..."
 msgid "Connect device"
 msgstr "Apparaat verbinden"
 
-msgid "Connected"
-msgstr "Verbonden"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1775,6 +1772,9 @@ msgstr "stoppen"
 msgid "track %1"
 msgstr "track %1"
 
+#~ msgid "Connected"
+#~ msgstr "Verbonden"
+
 #~ msgid "Delete originals"
 #~ msgstr "Originelen wissen"
 
diff --git a/src/translations/oc.po b/src/translations/oc.po
index c09f7fe9e..264822da6 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -374,9 +374,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/pl.po b/src/translations/pl.po
index 098f32711..689c83914 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -379,9 +379,6 @@ msgstr "Konfiguruj bibliotekę..."
 msgid "Connect device"
 msgstr "Podłącz urządzenie"
 
-msgid "Connected"
-msgstr "Podłączono"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1758,6 +1755,9 @@ msgstr ""
 msgid "track %1"
 msgstr "utwór %1"
 
+#~ msgid "Connected"
+#~ msgstr "Podłączono"
+
 #~ msgid "Delete originals"
 #~ msgstr "Usuń oryginały"
 
diff --git a/src/translations/pt.po b/src/translations/pt.po
index 0680349d5..9e2c90bdf 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -382,9 +382,6 @@ msgstr "Configurar biblioteca..."
 msgid "Connect device"
 msgstr "Ligar dispositivo"
 
-msgid "Connected"
-msgstr "Ligado"
-
 msgid "Copy to device..."
 msgstr "Copiar para o dispositivo..."
 
@@ -1773,6 +1770,9 @@ msgstr "parar"
 msgid "track %1"
 msgstr "faixa %1"
 
+#~ msgid "Connected"
+#~ msgstr "Ligado"
+
 #~ msgid "Delete originals"
 #~ msgstr "Apagar originais"
 
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 4acb425e6..393bc3eb5 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -377,9 +377,6 @@ msgstr "Configurar biblioteca"
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/ro.po b/src/translations/ro.po
index 9bf9d9e66..6a7b57781 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -374,9 +374,6 @@ msgstr "Configurează biblioteca..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 68fee634c..d4137cb05 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -380,9 +380,6 @@ msgstr "Настроить коллекцию..."
 msgid "Connect device"
 msgstr "Подсоединение устройства"
 
-msgid "Connected"
-msgstr "Подключено"
-
 msgid "Copy to device..."
 msgstr "Копировать на устройство..."
 
@@ -1773,6 +1770,9 @@ msgstr "Остановить"
 msgid "track %1"
 msgstr "композиция %1"
 
+#~ msgid "Connected"
+#~ msgstr "Подключено"
+
 #~ msgid "Delete originals"
 #~ msgstr "Удалить оригиналы"
 
diff --git a/src/translations/sk.po b/src/translations/sk.po
index 40df2b479..b1ef7b66c 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -382,9 +382,6 @@ msgstr "Nastaviť zbierku..."
 msgid "Connect device"
 msgstr "Pripojiť zariadenie"
 
-msgid "Connected"
-msgstr "Pripojené"
-
 msgid "Copy to device..."
 msgstr "Skopírovať na zariadenie..."
 
@@ -1771,6 +1768,9 @@ msgstr "zastaviť"
 msgid "track %1"
 msgstr "skladba %1"
 
+#~ msgid "Connected"
+#~ msgstr "Pripojené"
+
 #~ msgid "Delete originals"
 #~ msgstr "Vymazať originály"
 
diff --git a/src/translations/sr.po b/src/translations/sr.po
index 36d23880a..8b4505bee 100644
--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@@ -374,9 +374,6 @@ msgstr "Подеси библиотеку"
 msgid "Connect device"
 msgstr "Повежи уређај"
 
-msgid "Connected"
-msgstr "Повезан"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1753,6 +1750,9 @@ msgstr "Заустави"
 msgid "track %1"
 msgstr "нумера %1"
 
+#~ msgid "Connected"
+#~ msgstr "Повезан"
+
 #~ msgid "Delete originals"
 #~ msgstr "Обриши оригинале"
 
diff --git a/src/translations/sv.po b/src/translations/sv.po
index cf2a4e794..ead864e4d 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -375,9 +375,6 @@ msgstr "Ställ in bibliotek..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/tr.po b/src/translations/tr.po
index aa7c6c040..1b5872999 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -375,9 +375,6 @@ msgstr "Kütüphaneyi düzenle..."
 msgid "Connect device"
 msgstr "Aygıtı bağla"
 
-msgid "Connected"
-msgstr "Bağlı"
-
 msgid "Copy to device..."
 msgstr ""
 
@@ -1753,6 +1750,9 @@ msgstr ""
 msgid "track %1"
 msgstr "parça %1"
 
+#~ msgid "Connected"
+#~ msgstr "Bağlı"
+
 #~ msgid "Delete originals"
 #~ msgstr "Orijinalleri Sil"
 
diff --git a/src/translations/translations.pot b/src/translations/translations.pot
index dfe723b1a..6e5c5e1f9 100644
--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@@ -365,9 +365,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/uk.po b/src/translations/uk.po
index ba1d4be13..3d38aba36 100644
--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@@ -381,9 +381,6 @@ msgstr "Налаштувати фонотеку"
 msgid "Connect device"
 msgstr "З’єднати пристрій"
 
-msgid "Connected"
-msgstr "З'єднано"
-
 msgid "Copy to device..."
 msgstr "Копіювати до пристрою..."
 
@@ -1772,6 +1769,9 @@ msgstr "зупинити"
 msgid "track %1"
 msgstr "доріжка %1"
 
+#~ msgid "Connected"
+#~ msgstr "З'єднано"
+
 #~ msgid "Delete originals"
 #~ msgstr "Вилучити ориґінали"
 
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index 2ec90cdc3..c729b3593 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -374,9 +374,6 @@ msgstr "配置乐库..."
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""
 
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index 701818b01..cbe2cdcb6 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -379,9 +379,6 @@ msgstr ""
 msgid "Connect device"
 msgstr ""
 
-msgid "Connected"
-msgstr ""
-
 msgid "Copy to device..."
 msgstr ""