squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-05 15:12:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Win32 fixes from stable branch

Browse Source
This commit is contained in:
Christophe Dumez
2010-06-03 21:08:28 +00:00
parent 4e1366bf0d
commit b719bfaecb
5 changed files with 95 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/torrentadditiondlg.h
View File

@@ -99,7 +99,11 @@ public:
//torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch);
defaultSavePath = Preferences::getSavePath();
appendLabelToSavePath = Preferences::appendTorrentLabel();
savePathTxt->setText(defaultSavePath);
QString display_path = defaultSavePath;
#ifdef Q_WS_WIN
display_path = display_path.replace("/", "\\");
#endif
savePathTxt->setText(display_path);
if(Preferences::addTorrentsInPause()) {
addInPause->setChecked(true);
//addInPause->setEnabled(false);
@@ -421,7 +425,11 @@ public slots:
void on_browseButton_clicked(){
QString dir;
const QString &save_path = misc::expandPath(savePathTxt->text());
QString save_path = savePathTxt->text();
#ifdef Q_WS_WIN
save_path = save_path.replace("\\", "/");
#endif
save_path = misc::expandPath(save_path);
const QDir &saveDir(save_path);
if(!save_path.isEmpty() && saveDir.exists()){
dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath());
@@ -429,6 +437,9 @@ public slots:
dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
}
if(!dir.isNull()){
#ifdef Q_WS_WIN
dir = dir.replace("/", "\\");
#endif
savePathTxt->setText(dir);
}
}
@@ -452,7 +463,11 @@ public slots:
QMessageBox::critical(0, tr("Empty save path"), tr("Please enter a save path"));
return;
}
QDir savePath(misc::expandPath(savePathTxt->text()));
QString save_path = savePathTxt->text();
#ifdef Q_WS_WIN
save_path = save_path.replace("\\", "/");
#endif
QDir savePath(misc::expandPath(save_path));
// Check if savePath exists
if(!savePath.exists()){
if(!savePath.mkpath(savePath.path())){