summaryrefslogtreecommitdiff
path: root/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2019-02-03 00:10:52 +0000
committerThomas Preud'homme <robotux@celest.fr>2019-02-03 00:10:52 +0000
commit9b10c21f5cad0e2ec27d23c59e65af7141a226f3 (patch)
treebf81d75a9ed990bb76488c502767600fcf7550b7 /plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
parent594fcba67600704bee9115c86e18927b2237b304 (diff)
New upstream version 1.6.1.3
Diffstat (limited to 'plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp')
-rw-r--r--plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
index 3bee3ae..7683d1d 100644
--- a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
+++ b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
@@ -108,30 +108,26 @@ void FileIsSameDialog::on_SuggestNewName_clicked()
if(num==1)
{
if(firstRenamingRule.empty())
- newFileName=tr("%1 - copy").arg(fileName);
+ newFileName=tr("%name% - copy");
else
- {
newFileName=QString::fromStdString(firstRenamingRule);
- newFileName.replace(QStringLiteral("%name%"),fileName);
- }
}
else
{
if(otherRenamingRule.empty())
- newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num);
+ newFileName=tr("%name% - copy (%number%)");
else
- {
newFileName=QString::fromStdString(otherRenamingRule);
- newFileName.replace(QStringLiteral("%name%"),fileName);
- newFileName.replace(QStringLiteral("%number%"),QString::number(num));
- }
+ newFileName.replace(QStringLiteral("%number%"),QString::number(num));
}
+ newFileName.replace(QStringLiteral("%name%"),fileName);
+ newFileName.replace(QStringLiteral("%suffix%"),suffix);
destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix;
destinationInfo.setFile(destination);
num++;
}
while(destinationInfo.exists());
- ui->lineEditNewName->setText(newFileName+suffix);
+ ui->lineEditNewName->setText(newFileName);
}
void FileIsSameDialog::on_Rename_clicked()