From e69ceb25df919258e75f37d66dc24664e19934c4 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 13 Jan 2022 21:30:42 +0000 Subject: [PATCH] Revert "Added option to remove/replace originals in transcoder dialog." This reverts commit 6b6547095ac60b6e4c9113fffdfa9b5e945bb9b0. --- src/transcoder/transcodedialog.cpp | 18 ------------------ src/transcoder/transcodedialog.ui | 12 +----------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp index e19d3643c..6ee7685c4 100644 --- a/src/transcoder/transcodedialog.cpp +++ b/src/transcoder/transcodedialog.cpp @@ -98,9 +98,6 @@ TranscodeDialog::TranscodeDialog(QWidget* parent) } } - ui_->remove_original->setChecked( - s.value("overwrite_existing", false).toBool()); - // Add a start button start_button_ = ui_->button_box->addButton(tr("Start transcoding"), QDialogButtonBox::ActionRole); @@ -186,7 +183,6 @@ void TranscodeDialog::Start() { QSettings s; s.beginGroup(kSettingsGroup); s.setValue("last_output_format", preset.codec_mimetype_); - s.setValue("overwrite_existing", ui_->remove_original->isChecked()); } void TranscodeDialog::Cancel() { @@ -210,20 +206,6 @@ void TranscodeDialog::JobComplete(const QUrl& input, const QString& output, UpdateStatusText(); UpdateProgress(); - - bool overwrite_existing = ui_->remove_original->isChecked(); - QFileInfo input_fileinfo(input); - QFileInfo output_fileinfo(output); - bool same_extension = input_fileinfo.suffix() == output_fileinfo.suffix(); - bool same_path = - input_fileinfo.absolutePath() == output_fileinfo.absolutePath(); - - if (success && overwrite_existing) { - QFile(input).remove(); - if (same_path && same_extension) { - QFile(output).rename(input); - } - } } void TranscodeDialog::UpdateProgress() { diff --git a/src/transcoder/transcodedialog.ui b/src/transcoder/transcodedialog.ui index 4029b3ea9..d4bd8115c 100644 --- a/src/transcoder/transcodedialog.ui +++ b/src/transcoder/transcodedialog.ui @@ -7,7 +7,7 @@ 0 0 499 - 482 + 448 @@ -165,16 +165,6 @@ - - - - If enabled the original files will be removed. If transcoded files have the same file extension and the destination is the same directory as the original files, the original files will be replaced. - - - Remove or replace original files - - -