mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-29 05:48:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3625 from Chocobo1/native_path

Browse source 
Use native path separators
This commit is contained in:
sledgehammer999 2015-08-30 07:07:58 -05:00
commit a0da4a844c
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/application.cpp
View file

@ -60,6 +60,7 @@
#include "application.h"
#include "core/logger.h"
#include "core/preferences.h"
#include "core/utils/fs.h"
#include "core/utils/misc.h"
#include "core/iconprovider.h"
#include "core/scanfoldersmodel.h"
@ -146,7 +147,7 @@ void Application::torrentFinished(BitTorrent::TorrentHandle *const torrent)
program.replace("%N", torrent->name());
program.replace("%F", (file_count > 1) ? "" : torrent->fileName(0));
program.replace("%L", torrent->label());
program.replace("%D", torrent->rootPath());
program.replace("%D", Utils::Fs::toNativePath(torrent->rootPath()));
program.replace("%K", (file_count > 1) ? "multi" : "single");
program.replace("%C", QString::number(torrent->filesCount()));
program.replace("%Z", QString::number(torrent->totalSize()));

2
src/gui/properties/propertieswidget.cpp
View file

@ -251,7 +251,7 @@ BitTorrent::TorrentHandle *PropertiesWidget::getCurrentTorrent() const
void PropertiesWidget::updateSavePath(BitTorrent::TorrentHandle *const torrent)
{
if (m_torrent == torrent) {
save_path->setText(m_torrent->rootPath());
save_path->setText(Utils::Fs::toNativePath(m_torrent->rootPath()));
}
}

2
src/gui/torrentmodel.cpp
View file

@ -221,7 +221,7 @@ QVariant TorrentModel::data(const QModelIndex &index, int role) const
case TR_TIME_ELAPSED:
return (role == Qt::DisplayRole) ? torrent->activeTime() : torrent->seedingTime();
case TR_SAVE_PATH:
return torrent->rootPath();
return Utils::Fs::toNativePath(torrent->rootPath());
case TR_COMPLETED:
return torrent->completedSize();
case TR_RATIO_LIMIT:

2
src/webui/btjson.cpp
View file

@ -509,7 +509,7 @@ QByteArray btjson::getPropertiesForTorrent(const QString& hash)
dataDict[KEY_PROP_COMPLETION_DATE] = -1;
dataDict[KEY_PROP_CREATION_DATE] = -1;
}
dataDict[KEY_PROP_SAVE_PATH] = torrent->savePathParsed();
dataDict[KEY_PROP_SAVE_PATH] = Utils::Fs::toNativePath(torrent->rootPath());
dataDict[KEY_PROP_COMMENT] = torrent->comment();
return json::toJson(dataDict);