diff --git a/src/api/datatransfer.h b/src/api/datatransfer.h index f9bf4b35e8d5940bd88fccd172ae231d4169f234..1de9fe7fe7b2bb9532e9eaadc31b9efc1b3be25f 100644 --- a/src/api/datatransfer.h +++ b/src/api/datatransfer.h @@ -44,6 +44,8 @@ struct Info std::size_t progress; ///< if status >= on_progress, gives number of bytes tx/rx until now std::string path; std::string displayName; + std::string accountId; + std::string peerUri; }; } // namespace lrc::api::datatransfer diff --git a/src/datatransfermodel.cpp b/src/datatransfermodel.cpp index a322a4567103ffc79a8124795ecdd0982c9d2256..5c48cd61d263ecff8352a654f6a973b29bf99192 100644 --- a/src/datatransfermodel.cpp +++ b/src/datatransfermodel.cpp @@ -174,6 +174,8 @@ DataTransferModel::transferInfo(const std::string& lrc_id) lrc_info.path = dring_info.displayName.toStdString(); lrc_info.displayName = dring_info.displayName.toStdString(); lrc_info.status = convertDataTransferEvent(DRing::DataTransferEventCode(dring_info.lastEvent)); + lrc_info.accountId = dring_info.accountId.toStdString(); + lrc_info.peerUri = dring_info.peer.toStdString(); return lrc_info; } diff --git a/src/dbus/metatypes.h b/src/dbus/metatypes.h index 29df7c3dc0f6e8d6daad8ac86f5f29f7462ec2cf..f3f13e3fe00d9818c0fe8010c00268b4a97fb786 100644 --- a/src/dbus/metatypes.h +++ b/src/dbus/metatypes.h @@ -73,6 +73,8 @@ static inline QDBusArgument &operator<<(QDBusArgument& argument, const DataTrans argument << info.bytesProgress; argument << info.displayName; argument << info.path; + argument << info.accountId; + argument << info.peer; argument.endStructure(); return argument; @@ -87,6 +89,8 @@ static inline const QDBusArgument &operator>>(const QDBusArgument& argument, Dat argument >> info.bytesProgress; argument >> info.displayName; argument >> info.path; + argument >> info.accountId; + argument >> info.peer; argument.endStructure(); return argument; diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h index 02f7fe6a2cceaf719dc313a1f05c70c8b1b0506f..417c725fd8acb8488ceaa62d56994bd76d3ce259 100644 --- a/src/qtwrapper/configurationmanager_wrap.h +++ b/src/qtwrapper/configurationmanager_wrap.h @@ -603,6 +603,8 @@ public Q_SLOTS: // METHODS lrc_info.bytesProgress = dring_info.bytesProgress; lrc_info.displayName = QString::fromStdString(dring_info.displayName); lrc_info.path = QString::fromStdString(dring_info.path); + lrc_info.accountId = QString::fromStdString(dring_info.accountId); + lrc_info.peer = QString::fromStdString(dring_info.peer); return lrc_info; } diff --git a/src/typedefs.h b/src/typedefs.h index 8dedadcdea5ef01d4cd59b887c2cd448dd1344cc..a6e4ed4bbfe6f8103720aeb8af16b60e8e55b054 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -48,6 +48,8 @@ struct DataTransferInfo qulonglong bytesProgress; QString displayName; QString path; + QString accountId; + QString peer; }; /**