Fix includes

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

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index d3c80e3da54a2a7047f649c8fa97e69441617345..458b9ef79447f9658648ae7338a317f245edc824 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -20,19 +20,25 @@
 #include "renamedialog.h"
 
 #include <KLineEdit>
 #include "renamedialog.h"
 
 #include <KLineEdit>

-#include <KLocale>
-#include <konq_operations.h>
-#include <KStringHandler>
+#include <KLocalizedString>
+#include <KJobWidgets>
+#include <KIO/CopyJob>
+#include <KIO/FileUndoManager>

 #include <kstringhandler_deprecated.h> //TODO port to QCollator
 #include <knuminput.h>
 #include <kmimetype.h>
 #include <kstringhandler_deprecated.h> //TODO port to QCollator
 #include <knuminput.h>
 #include <kmimetype.h>

+#include <KJobUiDelegate>

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

+#include <QMimeDatabase>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <KGuiItem>

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

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

     m_renameOneItem(false),
     m_newName(),
     m_lineEdit(0),
     m_renameOneItem(false),
     m_newName(),
     m_lineEdit(0),


@@ -47,16 +53,24 @@ 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, SIGNAL(accepted()), this, SLOT(slotAccepted()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    m_okButton->setDefault(true);
+
+    KGuiItem::assign(m_okButton, KGuiItem(i18nc("@action:button", "&Rename"), "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);
 


@@ -75,12 +89,14 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     }
 
     m_lineEdit = new KLineEdit(page);
     }
 
     m_lineEdit = new KLineEdit(page);

+    mainLayout->addWidget(m_lineEdit);

     connect(m_lineEdit, &KLineEdit::textChanged, this, &RenameDialog::slotTextChanged);
 
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {
         const QString fileName = items.first().url().toDisplayString();
     connect(m_lineEdit, &KLineEdit::textChanged, this, &RenameDialog::slotTextChanged);
 
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {
         const QString fileName = items.first().url().toDisplayString();

-        const QString extension = KMimeType::extractKnownExtension(fileName.toLower());
+        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()) {
 
         // If the current item is a directory, select the whole file name.
         if ((extension.length() > 0) && !items.first().isDir()) {


@@ -102,7 +118,8 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     if (!m_renameOneItem) {
         QSet<QString> extensions;
         foreach (const KFileItem& item, m_items) {
     if (!m_renameOneItem) {
         QSet<QString> extensions;
         foreach (const KFileItem& item, m_items) {

-            const QString extension = KMimeType::extractKnownExtension(item.url().toDisplayString().toLower());
+            QMimeDatabase db;
+            const QString extension = db.suffixForFileName(item.url().toDisplayString().toLower());

 
             if (extensions.contains(extension)) {
                 m_allExtensionsDifferent = false;
 
             if (extensions.contains(extension)) {
                 m_allExtensionsDifferent = false;


@@ -113,6 +130,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
         }
 
         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);

+        mainLayout->addWidget(infoLabel);

         m_spinBox = new KIntSpinBox(0, 10000, 1, 1, page, 10);
 
         QHBoxLayout* horizontalLayout = new QHBoxLayout(page);
         m_spinBox = new KIntSpinBox(0, 10000, 1, 1, page, 10);
 
         QHBoxLayout* horizontalLayout = new QHBoxLayout(page);


@@ -130,32 +148,32 @@ RenameDialog::~RenameDialog()
 
 void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
 {
 
 void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
 {

-    const KUrl oldUrl = item.url();
-    KUrl newUrl = oldUrl;
-    newUrl.setFileName(KIO::encodeFileName(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;
     }
 
 
     QWidget* widget = parentWidget();
     if (!widget) {
         widget = this;
     }
 

-    KonqOperations::rename(widget, oldUrl, newUrl);
+    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)
+void RenameDialog::slotAccepted()

 {
 {

-    if (button == KDialog::Ok) {
-        m_newName = m_lineEdit->text();
+    m_newName = m_lineEdit->text();

 
 

-        if (m_renameOneItem) {
-            Q_ASSERT(m_items.count() == 1);
-            renameItem(m_items.first(), m_newName);
-        } else {
-            renameItems();
-        }
+    if (m_renameOneItem) {
+        Q_ASSERT(m_items.count() == 1);
+        renameItem(m_items.first(), m_newName);
+    } else {
+        renameItems();

     }
     }

-
-    KDialog::slotButtonClicked(button);
+    accept();

 }
 
 void RenameDialog::slotTextChanged(const QString& newName)
 }
 
 void RenameDialog::slotTextChanged(const QString& newName)


@@ -173,7 +191,7 @@ void RenameDialog::slotTextChanged(const QString& newName)
             enable = (last - first + 1 == count);
         }
     }
             enable = (last - first + 1 == count);
         }
     }

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

 }
 
 void RenameDialog::renameItems()
 }
 
 void RenameDialog::renameItems()


@@ -184,8 +202,9 @@ void RenameDialog::renameItems()
         QString newName = indexedName(m_newName, index, QLatin1Char('#'));
         ++index;
 
         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();
+        QMimeDatabase db;
+        const QString extension = db.suffixForFileName(oldUrl.path().toLower());

         if (!extension.isEmpty()) {
             newName.append(QLatin1Char('.'));
             newName.append(extension);
         if (!extension.isEmpty()) {
             newName.append(QLatin1Char('.'));
             newName.append(extension);