From 6ea89bf621ffa63dc1b8c0e182dffab82f09a040 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 14 May 2016 14:41:09 +0800 Subject: [PATCH 1/3] Improve wordings in "Auto download torrent" section --- src/base/scanfoldersmodel.cpp | 4 ++-- src/gui/options.ui | 4 ++-- src/gui/scanfoldersdelegate.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/base/scanfoldersmodel.cpp b/src/base/scanfoldersmodel.cpp index 5349bb85d..d2844506a 100644 --- a/src/base/scanfoldersmodel.cpp +++ b/src/base/scanfoldersmodel.cpp @@ -153,10 +153,10 @@ QVariant ScanFoldersModel::headerData(int section, Qt::Orientation orientation, switch (section) { case WATCH: - title = tr("Watched Folder"); + title = tr("Monitored Folder"); break; case DOWNLOAD: - title = tr("Save Files to"); + title = tr("Override Save Location"); break; } diff --git a/src/gui/options.ui b/src/gui/options.ui index 7e6649e89..0182c4917 100644 --- a/src/gui/options.ui +++ b/src/gui/options.ui @@ -1248,7 +1248,7 @@ - Add folder... + Add entry @@ -1258,7 +1258,7 @@ false - Remove folder + Remove entry diff --git a/src/gui/scanfoldersdelegate.cpp b/src/gui/scanfoldersdelegate.cpp index 0d331ce7e..5ad14f641 100644 --- a/src/gui/scanfoldersdelegate.cpp +++ b/src/gui/scanfoldersdelegate.cpp @@ -63,8 +63,8 @@ QWidget *ScanFoldersDelegate::createEditor(QWidget *parent, const QStyleOptionVi QComboBox* editor = new QComboBox(parent); editor->setFocusPolicy(Qt::StrongFocus); - editor->addItem(tr("Watch Folder")); - editor->addItem(tr("Default Folder")); + editor->addItem(tr("Same as monitored folder")); + editor->addItem(tr("Default save location")); editor->addItem(tr("Browse...")); if (index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION) { editor->insertSeparator(3); @@ -99,7 +99,7 @@ void ScanFoldersDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode model->setData( index, QFileDialog::getExistingDirectory( - 0, tr("Choose save path"), + 0, tr("Select save location"), index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION ? index.data().toString() : BitTorrent::Session::instance()->defaultSavePath()), From dbf744a1790410cdbd3ee3d3b147cd7bdaa547fb Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 14 May 2016 15:01:51 +0800 Subject: [PATCH 2/3] Change "Auto download torrent" default save path to "default location". --- src/gui/options_imp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp index b4cf8905d..e932a86d0 100644 --- a/src/gui/options_imp.cpp +++ b/src/gui/options_imp.cpp @@ -1317,7 +1317,7 @@ void options_imp::on_addScanFolderButton_clicked() const QString dir = QFileDialog::getExistingDirectory(this, tr("Add directory to scan"), Utils::Fs::toNativePath(Utils::Fs::folderName(pref->getScanDirsLastPath()))); if (!dir.isEmpty()) { - const ScanFoldersModel::PathStatus status = ScanFoldersModel::instance()->addPath(dir, ScanFoldersModel::DOWNLOAD_IN_WATCH_FOLDER, QString(), false); + const ScanFoldersModel::PathStatus status = ScanFoldersModel::instance()->addPath(dir, ScanFoldersModel::DEFAULT_LOCATION, QString(), false); QString error; switch (status) { case ScanFoldersModel::AlreadyInList: From 8a1d387c3851d8095ef5ff1a4083bd0da188d73e Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 14 May 2016 15:05:07 +0800 Subject: [PATCH 3/3] Change ambiguous text "Copy selected" to "Copy IP:port" --- src/gui/properties/peerlistwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index 2fd1bb103..dae179389 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -126,7 +126,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent) connect(header(), SIGNAL(sectionClicked(int)), SLOT(handleSortColumnChanged(int))); handleSortColumnChanged(header()->sortIndicatorSection()); m_copyHotkey = new QShortcut(QKeySequence(Qt::ControlModifier + Qt::Key_C), this, SLOT(copySelectedPeers()), 0, Qt::WidgetShortcut); - + #ifdef QBT_USES_QT5 // This hack fixes reordering of first column with Qt5. // https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777 @@ -236,7 +236,7 @@ void PeerListWidget::showPeerListMenu(const QPoint&) QAction *banAct = 0; QAction *copyPeerAct = 0; if (!selectionModel()->selectedRows().isEmpty()) { - copyPeerAct = menu.addAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy selected")); + copyPeerAct = menu.addAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy IP:port")); menu.addSeparator(); banAct = menu.addAction(GuiIconProvider::instance()->getIcon("user-group-delete"), tr("Ban peer permanently")); emptyMenu = false;