From b18bf480148336e6fe908ee6716b77ae879bd20c Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 30 Jan 2017 20:27:19 +0800 Subject: [PATCH] Improve error message reported to user Should not contain "file" or "folder", because it's not clear which type is selected. --- src/gui/properties/propertieswidget.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 267582fe6..957e8d98f 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -681,18 +681,18 @@ void PropertiesWidget::renameSelectedFile() // Ask for new name bool ok = false; - QString new_name_last = AutoExpandableDialog::getText(this, tr("Rename the file"), + QString new_name_last = AutoExpandableDialog::getText(this, tr("Renaming"), tr("New name:"), QLineEdit::Normal, index.data().toString(), &ok).trimmed(); - if (!ok || new_name_last.isEmpty()) + if (!ok) return; - - if (!Utils::Fs::isValidFileSystemName(new_name_last)) { - MessageBoxRaised::warning(this, tr("The file could not be renamed"), - tr("This file name contains forbidden characters, please choose a different one."), + if (new_name_last.isEmpty() || !Utils::Fs::isValidFileSystemName(new_name_last)) { + MessageBoxRaised::warning(this, tr("Rename error"), + tr("The name is empty or contains forbidden characters, please choose a different one."), QMessageBox::Ok); return; } + if (PropListModel->itemType(index) == TorrentContentModelItem::FileType) { // File renaming const int file_index = PropListModel->getFileIndex(index);