X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7a593fc92bf28fbdcdec0e241e18ee8ba2ad7334..d47557dcd17a028596c4e0e7b0aabc5db4847bed:/src/views/renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 5c0ae6126..512479512 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -21,8 +21,12 @@
 
 #include <KLineEdit>
 #include <KLocale>
-#include <konq_operations.h>
+#include <KJobWidgets>
+#include <KJobUiDelegate>
+#include <KIO/CopyJob>
+#include <KIO/FileUndoManager>
 #include <KStringHandler>
+#include <kstringhandler_deprecated.h> //TODO port to QCollator
 #include <knuminput.h>
 #include <kmimetype.h>
 
@@ -62,7 +66,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     QLabel* editLabel = 0;
     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);
         editLabel->setTextFormat(Qt::PlainText);
     } else {
@@ -74,11 +78,11 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     }
 
     m_lineEdit = new KLineEdit(page);
-    connect(m_lineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotTextChanged(QString)));
+    connect(m_lineEdit, &KLineEdit::textChanged, this, &RenameDialog::slotTextChanged);
 
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {
-        const QString fileName = items.first().url().prettyUrl();
+        const QString fileName = items.first().url().toDisplayString();
         const QString extension = KMimeType::extractKnownExtension(fileName.toLower());
 
         // If the current item is a directory, select the whole file name.
@@ -101,7 +105,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     if (!m_renameOneItem) {
         QSet<QString> extensions;
         foreach (const KFileItem& item, m_items) {
-            const QString extension = KMimeType::extractKnownExtension(item.url().prettyUrl().toLower());
+            const QString extension = KMimeType::extractKnownExtension(item.url().toDisplayString().toLower());
 
             if (extensions.contains(extension)) {
                 m_allExtensionsDifferent = false;
@@ -127,6 +131,23 @@ RenameDialog::~RenameDialog()
 {
 }
 
+void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
+{
+    const QUrl oldUrl = item.url();
+    QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
+    newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
+
+    QWidget* widget = parentWidget();
+    if (!widget) {
+        widget = this;
+    }
+
+    KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
+    KJobWidgets::setWindow(job, widget);
+    KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, QList<QUrl>() << oldUrl, newUrl, job);
+    job->ui()->setAutoErrorHandlingEnabled(true);
+}
+
 void RenameDialog::slotButtonClicked(int button)
 {
     if (button == KDialog::Ok) {
@@ -134,16 +155,7 @@ void RenameDialog::slotButtonClicked(int button)
 
         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));
-
-            QWidget* widget = parentWidget();
-            if (!widget) {
-                widget = this;
-            }
-
-            KonqOperations::rename(widget, oldUrl, newUrl);
+            renameItem(m_items.first(), m_newName);
         } else {
             renameItems();
         }
@@ -178,23 +190,15 @@ void RenameDialog::renameItems()
         QString newName = indexedName(m_newName, index, QLatin1Char('#'));
         ++index;
 
-        const KUrl oldUrl = item.url();
-        const QString extension = KMimeType::extractKnownExtension(oldUrl.prettyUrl().toLower());
+        const QUrl oldUrl = item.url();
+        const QString extension = KMimeType::extractKnownExtension(oldUrl.path().toLower());
         if (!extension.isEmpty()) {
             newName.append(QLatin1Char('.'));
             newName.append(extension);
         }
 
         if (oldUrl.fileName() != newName) {
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(KIO::encodeFileName(newName));
-
-            QWidget* widget = parentWidget();
-            if (!widget) {
-                widget = this;
-            }
-
-            KonqOperations::rename(widget, oldUrl, newUrl);
+            renameItem(item, newName);
         }
     }
 }
@@ -218,4 +222,3 @@ QString RenameDialog::indexedName(const QString& name, int index, const QChar& i
     return newName;
 }
 
-#include "renamedialog.moc"