Add tool tip text for file location data.

The tool tip shows the original file name.

diff --git a/localmylist/database.cpp b/localmylist/database.cpp
index 8633dea3a302693cef33b9ed8c6b2e528dfe6b97..270b482cc51894b4a17be4186ecef608447fc45f 100644 (file)
--- a/localmylist/database.cpp
+++ b/localmylist/database.cpp
@@ -1988,6 +1988,7 @@ void Database::readFileLocationData(const SqlResultIteratorInterface &result, Fi
        data.fid = result.value(offset++).toInt();
        data.hostId = result.value(offset++).toInt();
        data.path = result.value(offset++).toString();
+       data.originalName = result.value(offset++).toString();
        data.renamed = result.value(offset++).toDateTime();
        data.failedRename = result.value(offset++).toBool();
 }
@@ -2073,7 +2074,7 @@ QString Database::fileFields()
 QString Database::fileLocationFields()
 {
        return
-       "fl.location_id, fl.fid, fl.host_id, fl.path, fl.renamed, fl.failed_rename ";
+       "fl.location_id, fl.fid, fl.host_id, fl.path, fl.original_name, fl.renamed, fl.failed_rename ";
 }
 
 QString Database::pendingMyListUpdateFields()

diff --git a/localmylist/dynamicmodel/data.cpp b/localmylist/dynamicmodel/data.cpp
index e613c99528781ae1e21b883475b9e5dc8074571a..34b7602d1aae3bcbec655749581728457fa9795b 100644 (file)
--- a/localmylist/dynamicmodel/data.cpp
+++ b/localmylist/dynamicmodel/data.cpp
@@ -415,27 +415,38 @@ int FileLocationData::id() const
 
 QVariant FileLocationData::data(int column, int role) const
 {
-       if (role != Qt::DisplayRole)
-               return QVariant();
-
-       switch (column)
+       switch (role)
        {
-               case 0:
-                       return fileLocationData.path;
-               case 1:
-               return QString("%1 (%2)").arg(hostName)
-                               .arg(fileLocationData.hostId);
-               case 2:
-                       return "";
-               case 3:
-                       return "";
-               case 4:
-                       if (!fileLocationData.renamed.isValid())
-                               return QObject::tr("No");
-                       if (fileLocationData.failedRename)
-                               return QObject::tr("Rename failed: %1").arg(fileLocationData.renameError);
-                       return QObject::tr("Yes, on %1").arg(fileLocationData.renamed.toString());
+               case Qt::DisplayRole:
+                       switch (column)
+                       {
+                               case 0:
+                                       return fileLocationData.path;
+                               case 1:
+                               return QString("%1 (%2)").arg(hostName)
+                                               .arg(fileLocationData.hostId);
+                               case 2:
+                                       return "";
+                               case 3:
+                                       return "";
+                               case 4:
+                                       if (!fileLocationData.renamed.isValid())
+                                               return QObject::tr("No");
+                                       if (fileLocationData.failedRename)
+                                               return QObject::tr("Rename failed: %1").arg(fileLocationData.renameError);
+                                       return QObject::tr("Yes, on %1").arg(fileLocationData.renamed.toString());
+                       }
+               break;
+               case Qt::ToolTipRole:
+                       switch (column)
+                       {
+                               case 0:
+                                       return fileLocationData.originalName;
+                               break;
+                       }
+               break;
        }
+
        return QVariant();
 }