Changes to Undo/Redo in regard to ProgressIndicator

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 301c02713fb69256949f1f8a20069a1a211d338e..02238e5e749f30ae82dc08d9643237b319612015 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -29,29 +29,35 @@
 #include <klineedit.h>
 
 RenameDialog::RenameDialog(const KUrl::List& items) :
-    KDialogBase(Plain, i18n("Rename Items"),
-                Ok|Cancel, Ok)
+    KDialog()
 {
-    setButtonOK(KGuiItem(i18n("Rename"), "apply"));
+    setCaption(i18n("Rename Items"));
+    setButtons(Ok|Cancel);
+    setDefaultButton(Ok);
 
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(plainPage(), 0, spacingHint());
+    setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "apply"));
+
+    QWidget *page = new QWidget(this);
+    setMainWidget(page);
+
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(page, 0, spacingHint());
     topLayout->setMargin(KDialog::marginHint());
 
     const int itemCount = items.count();
-    QLabel* editLabel = new QLabel(i18n("Rename the %1 selected items to:").arg(itemCount),
-                                   plainPage());
+    QLabel* editLabel = new QLabel(i18n("Rename the %1 selected items to:",itemCount),
+                                   page);
 
-    m_lineEdit = new KLineEdit(plainPage());
+    m_lineEdit = new KLineEdit(page);
     m_newName = i18n("New name #");
     assert(itemCount > 1);
-    QString postfix(items[0].prettyURL().section('.',1));
+    QString postfix(items[0].prettyUrl().section('.',1));
     if (postfix.length() > 0) {
         // The first item seems to have a postfix (e. g. 'jpg' or 'txt'). Now
         // check whether all other items have the same postfix. If this is the
         // case, add this postfix to the name suggestion.
         postfix.insert(0, '.');
         for (int i = 1; i < itemCount; ++i) {
-            if (!items[i].prettyURL().contains(postfix)) {
+            if (!items[i].prettyUrl().contains(postfix)) {
                 // at least one item does not have the same postfix
                 postfix.truncate(0);
                 break;
@@ -67,7 +73,7 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     m_lineEdit->setSelection(0, selectionLength - 1);
     m_lineEdit->setFocus();
 
-    QLabel* infoLabel = new QLabel(i18n("(# will be replaced by ascending numbers)"), plainPage());
+    QLabel* infoLabel = new QLabel(i18n("(# will be replaced by ascending numbers)"), page);
 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);
@@ -78,14 +84,16 @@ RenameDialog::~RenameDialog()
 {
 }
 
-void RenameDialog::slotOk()
+void RenameDialog::slotButtonClicked(int button)
 {
-    m_newName = m_lineEdit->text();
-    if (m_newName.contains('#') != 1) {
-        m_newName.truncate(0);
+    if (button==Ok) {
+        m_newName = m_lineEdit->text();
+        if (m_newName.contains('#') != 1) {
+            m_newName.truncate(0);
+        }
     }
 
-    KDialogBase::slotOk();
+    KDialog::slotButtonClicked(button);
 }
 
 #include "renamedialog.moc"