From 332dd5d5b48064e0ca0ebc8dcf188f2034fc1fcc Mon Sep 17 00:00:00 2001 From: APTX Date: Sun, 19 Jul 2015 03:06:18 +0200 Subject: [PATCH] Add tool tip text for file location data. The tool tip shows the original file name. --- localmylist/database.cpp | 3 +- localmylist/dynamicmodel/data.cpp | 49 +++++++++++++++++++------------ 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/localmylist/database.cpp b/localmylist/database.cpp index 8633dea..270b482 100644 --- 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 e613c99..34b7602 100644 --- 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(); } -- 2.52.0