- Integrate the patch from Matthias Fuchs from http://reviewboard.kde.org/r/5496 to allow having leading zeros when renaming files: E.g. Using the name "A ###.jpg" results in the filenames "A 001.jpg", "A 002.jpg"... The patch could be simplified a little bit by guaranting only one connective sequence of #'s.

- Move the renaming code into the RenameDialog

CCMAIL: [email protected]
BUG: 226761
FIXED-IN: 4.6.0

svn path=/trunk/KDE/kdebase/apps/; revision=1182776

1 files changed, 5 insertions, 12 deletions

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 729dac372..1dabefd11 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -95,18 +95,11 @@ void FoldersPanel::rename(const KFileItem& item)
         const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
         m_treeView->edit(proxyIndex);
     } else {
-        KFileItemList items;
-        items.append(item);
-        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
-        if (dialog->exec() == QDialog::Accepted) {
-            const QString newName = dialog->newName();
-            if (!newName.isEmpty()) {
-                KUrl newUrl = item.url();
-                newUrl.setFileName(newName);
-                KonqOperations::rename(this, item.url(), newUrl);
-            }
-        }
-        delete dialog;
+        RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+        dialog->raise();
+        dialog->activateWindow();
     }
 }