github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 21:03:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Show disk space while retrieving metadata. Closes #1693.

Browse source
This commit is contained in:
sledgehammer999 2014-08-10 00:57:31 +03:00
commit 2f0d6815c9
1 changed files with 52 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/addnewtorrentdialog.cpp
View file

@ -158,7 +158,7 @@ void AddNewTorrentDialog::showAdvancedSettings(bool show)
if (show) {
ui->adv_button->setText(QString::fromUtf8("▲"));
ui->settings_group->setVisible(true);
ui->info_group->setVisible(m_hasMetadata);
ui->info_group->setVisible(true);
if (m_hasMetadata && (m_torrentInfo->num_files() > 1)) {
ui->content_tree->setVisible(true);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
@ -235,7 +235,7 @@ bool AddNewTorrentDialog::loadMagnet(const QString &magnet_uri)
setWindowTitle(torrent_name.isEmpty() ? tr("Magnet link") : torrent_name);
QIniSettings settings;
showAdvancedSettings(settings.value("AddNewTorrentDialog/expanded").toBool());
setupTreeview();
// Set dialog position
setdialogPosition();
@ -288,11 +288,11 @@ void AddNewTorrentDialog::updateFileNameInSavePaths(const QString &new_filename)
}
}
void AddNewTorrentDialog::updateDiskSpaceLabel()
{
Q_ASSERT(m_hasMetadata);
void AddNewTorrentDialog::updateDiskSpaceLabel() {
// Determine torrent size
qulonglong torrent_size = 0;
if (m_hasMetadata) {
if (m_contentModel) {
const std::vector<int> priorities = m_contentModel->model()->getFilesPriorities();
Q_ASSERT(priorities.size() == (uint) m_torrentInfo->num_files());
@ -303,7 +303,9 @@ void AddNewTorrentDialog::updateDiskSpaceLabel()
} else {
torrent_size = m_torrentInfo->total_size();
}
QString size_string = misc::friendlyUnit(torrent_size);
}
QString size_string = torrent_size ? misc::friendlyUnit(torrent_size) : QString(tr("Not Available", "This size is unavailable."));
size_string += " (";
size_string += tr("Disk space: %1").arg(misc::friendlyUnit(fsutils::freeDiskSpaceOnPath(ui->save_path_combo->currentText())));
size_string += ")";
@ -364,7 +366,6 @@ void AddNewTorrentDialog::onSavePathChanged(int index)
relayout();
// Remember index
old_index = ui->save_path_combo->currentIndex();
if (m_hasMetadata)
updateDiskSpaceLabel();
}
@ -633,6 +634,11 @@ void AddNewTorrentDialog::setMetadataProgressIndicator(bool visibleIndicator, co
}
void AddNewTorrentDialog::setupTreeview() {
if (!m_hasMetadata) {
ui->comment_lbl->setText(tr("Not Available", "This comment is unavailable"));
ui->date_lbl->setText(tr("Not Available", "This date is unavailable"));
}
else {
// Set dialog title
setWindowTitle(misc::toQStringU(m_torrentInfo->name()));
@ -640,7 +646,6 @@ void AddNewTorrentDialog::setupTreeview() {
QString comment = misc::toQString(m_torrentInfo->comment());
ui->comment_lbl->setText(comment.replace('\n', ' '));
ui->date_lbl->setText(m_torrentInfo->creation_date() ? misc::toQString(*m_torrentInfo->creation_date()) : tr("Not available"));
updateDiskSpaceLabel();
file_storage fs = m_torrentInfo->files();
@ -682,8 +687,10 @@ void AddNewTorrentDialog::setupTreeview() {
ui->save_path_combo->setItemText(i, fsutils::toDisplayPath(QDir(ui->save_path_combo->itemText(i)).absoluteFilePath(single_file_relpath)));
}
}
}
QIniSettings settings;
updateDiskSpaceLabel();
showAdvancedSettings(settings.value("AddNewTorrentDialog/expanded").toBool());
// Set dialog position
setdialogPosition();