Hide progress info for rename jobs in rename dialog

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

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 6d009ba9a6f05d9524a4642351c37ebe08018e29..cf8f6885df9054b482f947038c15b64db306bd72 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -23,7 +23,6 @@
 #include <KJobWidgets>
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
 #include <KJobWidgets>
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>

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

 #include <KJobUiDelegate>
 
 #include <QHBoxLayout>
 #include <KJobUiDelegate>
 
 #include <QHBoxLayout>


@@ -61,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);
     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);
 
     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);
 
     QWidget* page = new QWidget(this);
     mainLayout->addWidget(page);


@@ -109,7 +108,6 @@ 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);
 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);


@@ -161,7 +159,7 @@ void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
         widget = this;
     }
 
         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);
     KJobWidgets::setWindow(job, widget);
     KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
     job->ui()->setAutoErrorHandlingEnabled(true);


@@ -198,6 +196,13 @@ void RenameDialog::slotTextChanged(const QString& newName)
     m_okButton->setEnabled(enable);
 }
 
     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...
 void RenameDialog::renameItems()
 {
     // Iterate through all items and rename them...