Cleanup of URL drop handling (simplified code, modifier keys work again). After furth...

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 43db19354290452a7ba5b15b592568772d965512..ab43d47530cdba2b84b01ae95574ec7eb41fd719 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include "renamedialog.h"
@@ -29,19 +29,25 @@
 #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));
@@ -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"