X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/02c08351489ed7b649e6409bf529773bab5136d8..bd47eb2e6d:/src/views/renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index c5001af08..6309bfbdf 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -23,9 +23,6 @@
 #include <KJobWidgets>
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
-#include <kstringhandler_deprecated.h> //TODO port to QCollator
-#include <knuminput.h>
-#include <kmimetype.h>
 #include <KJobUiDelegate>
 
 #include <QHBoxLayout>
@@ -35,6 +32,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QLineEdit>
+#include <QSpinBox>
 #include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
@@ -62,11 +60,11 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     m_okButton = buttonBox->button(QDialogButtonBox::Ok);
     m_okButton->setDefault(true);
     m_okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccepted()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &RenameDialog::slotAccepted);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &RenameDialog::reject);
     m_okButton->setDefault(true);
 
-    KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), "dialog-ok-apply"));
+    KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), QStringLiteral("dialog-ok-apply")));
 
     QWidget* page = new QWidget(this);
     mainLayout->addWidget(page);
@@ -110,7 +108,6 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 
     m_lineEdit->setText(m_newName);
     m_lineEdit->setSelection(0, selectionLength);
-    m_lineEdit->setFocus();
 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);
@@ -131,7 +128,12 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 
         QLabel* infoLabel = new QLabel(i18nc("@info", "# will be replaced by ascending numbers starting with:"), page);
         mainLayout->addWidget(infoLabel);
-        m_spinBox = new KIntSpinBox(0, 10000, 1, 1, page, 10);
+        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);
         horizontalLayout->setMargin(0);
@@ -157,10 +159,15 @@ void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
         widget = this;
     }
 
-    KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
+    KIO::Job * job = KIO::moveAs(oldUrl, newUrl, KIO::HideProgressInfo);
     KJobWidgets::setWindow(job, widget);
     KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
-    job->ui()->setAutoErrorHandlingEnabled(true);
+
+    if (!job->error()) {
+        m_renamedItems << newUrl;
+    }
+
+    job->uiDelegate()->setAutoErrorHandlingEnabled(true);
 }
 
 void RenameDialog::slotAccepted()
@@ -194,6 +201,13 @@ void RenameDialog::slotTextChanged(const QString& newName)
     m_okButton->setEnabled(enable);
 }
 
+void RenameDialog::showEvent(QShowEvent* event)
+{
+    m_lineEdit->setFocus();
+
+    QDialog::showEvent(event);
+}
+
 void RenameDialog::renameItems()
 {
     // Iterate through all items and rename them...
@@ -214,6 +228,10 @@ void RenameDialog::renameItems()
             renameItem(item, newName);
         }
     }
+
+    if (!m_items.empty()) {
+        emit renamingFinished(m_renamedItems);
+    }
 }
 
 QString RenameDialog::indexedName(const QString& name, int index, const QChar& indexPlaceHolder)