Merge remote-tracking branch 'origin/Applications/19.04'

[dolphin.git] / src / views / renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index ee2b15e6ea1a0277e7577025a67cf69512530d57..5d329c3ce57a9545631f878ddce8dbdbe2dafc5c 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,32 +19,30 @@
 
 #include "renamedialog.h"
 
 
 #include "renamedialog.h"
 

-#include <KLineEdit>
-#include <KLocale>
-#include <konq_operations.h>
-#include <KStringHandler>
-#include <knuminput.h>
-
+#include <KGuiItem>
+#include <KIO/BatchRenameJob>
+#include <KIO/CopyJob>
+#include <KIO/FileUndoManager>
+#include <KJobUiDelegate>
+#include <KJobWidgets>
+#include <KLocalizedString>
+
+#include <QDialogButtonBox>

 #include <QHBoxLayout>
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QLabel>

-#include <QVBoxLayout>
-
-/**
- * Helper function for sorting items with qSort() in
- * DolphinView::renameSelectedItems().
- */
-bool lessThan(const KFileItem& item1, const KFileItem& item2)
-{
-    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
-}
+#include <QLineEdit>
+#include <QMimeDatabase>
+#include <QPushButton>
+#include <QSpinBox>

 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :

-    KDialog(parent),
+    QDialog(parent),

     m_renameOneItem(false),
     m_newName(),
     m_renameOneItem(false),
     m_newName(),

-    m_lineEdit(0),
+    m_lineEdit(nullptr),

     m_items(items),
     m_items(items),

-    m_spinBox(0)
+    m_allExtensionsDifferent(true),
+    m_spinBox(nullptr)

 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));


@@ -53,24 +51,34 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 

-    setCaption(m_renameOneItem ?
+    setWindowTitle(m_renameOneItem ?

                i18nc("@title:window", "Rename Item") :
                i18nc("@title:window", "Rename Items"));
                i18nc("@title:window", "Rename Item") :
                i18nc("@title:window", "Rename Items"));

-    setButtons(Ok | Cancel);
-    setDefaultButton(Ok);
-
-    setButtonGuiItem(Ok, KGuiItem(i18nc("@action:button", "&Rename"), "dialog-ok-apply"));
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
+    m_okButton = buttonBox->button(QDialogButtonBox::Ok);
+    m_okButton->setDefault(true);
+    m_okButton->setShortcut(Qt::CTRL + Qt::Key_Return);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &RenameDialog::slotAccepted);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &RenameDialog::reject);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QObject::deleteLater);
+    m_okButton->setDefault(true);
+
+    KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), QStringLiteral("dialog-ok-apply")));

 
     QWidget* page = new QWidget(this);
 
     QWidget* page = new QWidget(this);

-    setMainWidget(page);
+    mainLayout->addWidget(page);
+    mainLayout->addWidget(buttonBox);

 
     QVBoxLayout* topLayout = new QVBoxLayout(page);
 
 
     QVBoxLayout* topLayout = new QVBoxLayout(page);
 

-    QLabel* editLabel = 0;
+    QLabel* editLabel = nullptr;

     if (m_renameOneItem) {
         m_newName = items.first().name();
     if (m_renameOneItem) {
         m_newName = items.first().name();

-        editLabel = new QLabel(i18nc("@label:textbox", "Rename the item <filename>%1</filename> to:", m_newName),
+        editLabel = new QLabel(xi18nc("@label:textbox", "Rename the item <filename>%1</filename> to:", m_newName),

                                page);
                                page);

+        editLabel->setTextFormat(Qt::PlainText);

     } else {
         m_newName = i18nc("@info:status", "New name #");
         editLabel = new QLabel(i18ncp("@label:textbox",
     } else {
         m_newName = i18nc("@info:status", "New name #");
         editLabel = new QLabel(i18ncp("@label:textbox",


@@ -79,14 +87,18 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
                                page);
     }
 
                                page);
     }
 

-    m_lineEdit = new KLineEdit(page);
-    connect(m_lineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotTextChanged(QString)));
+    m_lineEdit = new QLineEdit(page);
+    mainLayout->addWidget(m_lineEdit);
+    connect(m_lineEdit, &QLineEdit::textChanged, this, &RenameDialog::slotTextChanged);

 
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {
 
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {

-        const QString fileName = items.first().url().prettyUrl();
-        const QString extension = KMimeType::extractKnownExtension(fileName.toLower());
-        if (extension.length() > 0) {
+        const QString fileName = items.first().url().toDisplayString();
+        QMimeDatabase db;
+        const QString extension = db.suffixForFileName(fileName.toLower());
+
+        // If the current item is a directory, select the whole file name.
+        if ((extension.length() > 0) && !items.first().isDir()) {

             // Don't select the extension
             selectionLength -= extension.length() + 1;
         }
             // Don't select the extension
             selectionLength -= extension.length() + 1;
         }


@@ -97,17 +109,35 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 
     m_lineEdit->setText(m_newName);
     m_lineEdit->setSelection(0, selectionLength);
 
     m_lineEdit->setText(m_newName);
     m_lineEdit->setSelection(0, selectionLength);

-    m_lineEdit->setFocus();

 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);
 
     if (!m_renameOneItem) {
 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);
 
     if (!m_renameOneItem) {

+        QSet<QString> extensions;
+        foreach (const KFileItem& item, m_items) {
+            QMimeDatabase db;
+            const QString extension = db.suffixForFileName(item.url().toDisplayString().toLower());
+
+            if (extensions.contains(extension)) {
+                m_allExtensionsDifferent = false;
+                break;
+            }
+
+            extensions.insert(extension);
+        }
+

         QLabel* infoLabel = new QLabel(i18nc("@info", "# will be replaced by ascending numbers starting with:"), page);
         QLabel* infoLabel = new QLabel(i18nc("@info", "# will be replaced by ascending numbers starting with:"), page);

-        m_spinBox = new KIntSpinBox(0, 10000, 1, 1, page, 10);
+        mainLayout->addWidget(infoLabel);
+        m_spinBox = new QSpinBox(page);
+        m_spinBox->setMaximum(10000);
+        m_spinBox->setMinimum(0);
+        m_spinBox->setSingleStep(1);
+        m_spinBox->setValue(1);
+        m_spinBox->setDisplayIntegerBase(10);

 
         QHBoxLayout* horizontalLayout = new QHBoxLayout(page);
 
         QHBoxLayout* horizontalLayout = new QHBoxLayout(page);

-        horizontalLayout->setMargin(0);
+        horizontalLayout->setContentsMargins(0, 0, 0, 0);

         horizontalLayout->addWidget(infoLabel);
         horizontalLayout->addWidget(m_spinBox);
 
         horizontalLayout->addWidget(infoLabel);
         horizontalLayout->addWidget(m_spinBox);
 


@@ -119,93 +149,77 @@ RenameDialog::~RenameDialog()
 {
 }
 
 {
 }
 

-void RenameDialog::slotButtonClicked(int button)
+void RenameDialog::slotAccepted()

 {
 {

-    if (button == KDialog::Ok) {
-        m_newName = m_lineEdit->text();
-
-        if (m_renameOneItem) {
-            Q_ASSERT(m_items.count() == 1);
-            const KUrl oldUrl = m_items.first().url();
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(KIO::encodeFileName(m_newName));
-            KonqOperations::rename(this, oldUrl, newUrl);
-        } else {
-            renameItems();
-        }
+    QWidget* widget = parentWidget();
+    if (!widget) {
+        widget = this;
+    }
+
+    const QList<QUrl> srcList = m_items.urlList();
+    const QString newName = m_lineEdit->text();
+    KIO::FileUndoManager::CommandType cmdType;
+    KIO::Job *job = nullptr;
+    if (m_renameOneItem) {
+        Q_ASSERT(m_items.count() == 1);
+        cmdType = KIO::FileUndoManager::Rename;
+        const QUrl oldUrl = m_items.constFirst().url();
+        QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
+        newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
+        m_renamedItems << newUrl;
+        job = KIO::moveAs(oldUrl, newUrl, KIO::HideProgressInfo);
+    } else {
+        cmdType = KIO::FileUndoManager::BatchRename;
+        job = KIO::batchRename(srcList, newName, m_spinBox->value(), QLatin1Char('#'));
+        connect(qobject_cast<KIO::BatchRenameJob*>(job), &KIO::BatchRenameJob::fileRenamed, this, &RenameDialog::slotFileRenamed);

     }
 
     }
 

-    KDialog::slotButtonClicked(button);
+    KJobWidgets::setWindow(job, widget);
+    const QUrl parentUrl = srcList.first().adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash);
+    KIO::FileUndoManager::self()->recordJob(cmdType, srcList, parentUrl, job);
+
+    connect(job, &KJob::result, this, &RenameDialog::slotResult);
+    connect(job, &KJob::result, this, &QObject::deleteLater);
+
+    job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+
+    accept();

 }
 
 void RenameDialog::slotTextChanged(const QString& newName)
 {
     bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String("."));
 }
 
 void RenameDialog::slotTextChanged(const QString& newName)
 {
     bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String("."));

-    if (enable) {
-        if (m_renameOneItem) {
-            enable = enable && (newName != m_newName);
+    if (enable && !m_renameOneItem) {
+        const int count = newName.count(QLatin1Char('#'));
+        if (count == 0) {
+            // Renaming multiple files without '#' will only work if all extensions are different.
+            enable = m_allExtensionsDifferent;

         } else {
             // Assure that the new name contains exactly one # (or a connected sequence of #'s)
         } else {
             // Assure that the new name contains exactly one # (or a connected sequence of #'s)

-            const int minSplitCount = 1;
-            int maxSplitCount = 2;
-            if (newName.startsWith(QLatin1Char('#'))) {
-                --maxSplitCount;
-            }
-            if (newName.endsWith(QLatin1Char('#'))) {
-                --maxSplitCount;
-            }
-            const int splitCount = newName.split(QLatin1Char('#'), QString::SkipEmptyParts).count();
-            enable = enable && (splitCount >= minSplitCount) && (splitCount <= maxSplitCount);
+            const int first = newName.indexOf(QLatin1Char('#'));
+            const int last = newName.lastIndexOf(QLatin1Char('#'));
+            enable = (last - first + 1 == count);

         }
     }
         }
     }

-    enableButtonOk(enable);
+    m_okButton->setEnabled(enable);

 }
 
 }
 

-void RenameDialog::renameItems()
+void RenameDialog::slotFileRenamed(const QUrl &oldUrl, const QUrl &newUrl)

 {
 {

-    // Currently the items are sorted by the selection order, resort
-    // them by the filename. This assures that the new sort order is similar to
-    // the current filename sort order.
-    qSort(m_items.begin(), m_items.end(), lessThan);
-
-    // Iterate through all items and rename them...
-    int index = m_spinBox->value();
-    foreach (const KFileItem& item, m_items) {
-        QString newName = indexedName(m_newName, index, QLatin1Char('#'));
-        ++index;
-
-        const KUrl oldUrl = item.url();
-        const QString extension = KMimeType::extractKnownExtension(oldUrl.prettyUrl().toLower());
-        if (!extension.isEmpty()) {
-            newName.append(QLatin1Char('.'));
-            newName.append(extension);
-        }
-
-        if (oldUrl.fileName() != newName) {
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(KIO::encodeFileName(newName));
-            KonqOperations::rename(this, oldUrl, newUrl);
-        }
-    }
+    Q_UNUSED(oldUrl)
+    m_renamedItems << newUrl;

 }
 
 }
 

-QString RenameDialog::indexedName(const QString& name, int index, const QChar& indexPlaceHolder)
+void RenameDialog::slotResult(KJob *job)

 {
 {

-    QString newName = name;
-
-    QString indexString = QString::number(index);
-
-    // Insert leading zeros if necessary
-    const int minIndexLength = name.count(indexPlaceHolder);
-    while (indexString.length() < minIndexLength) {
-        indexString.prepend(QLatin1Char('0'));
+    if (!job->error()) {
+        emit renamingFinished(m_renamedItems);

     }
     }

+}

 
 

-    // Replace the index placeholders by the indexString
-    const int placeHolderStart = newName.indexOf(indexPlaceHolder);
-    newName.replace(placeHolderStart, minIndexLength, indexString);
+void RenameDialog::showEvent(QShowEvent* event)
+{
+    m_lineEdit->setFocus();

 
 

-    return newName;
+    QDialog::showEvent(event);

 }
 }

-
-#include "renamedialog.moc"