Fixed issue that when starting Dolphin with the column view a wrong layout has been...

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index c3fe9d7223a89e07a67cf5501adf88b7ffc51b48..39e61c4640f8fc3d4a26059d2f16c4ac5ce3732e 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -19,14 +19,15 @@
 
 #include "renamedialog.h"
 
+#include <kfileitem.h>
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QBoxLayout>
 
-RenameDialog::RenameDialog(const KUrl::List& items) :
-    KDialog(),
+RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
+    KDialog(parent),
     m_renameOneItem(false)
 {
     const QSize minSize = minimumSize();
@@ -36,42 +37,46 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 
-    setCaption(m_renameOneItem ? i18n("Rename Item") : i18n("Rename Items"));
-    setButtons(Ok|Cancel);
+    setCaption(m_renameOneItem ?
+               i18nc("@title:window", "Rename Item") :
+               i18nc("@title:window", "Rename Items"));
+    setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 
-    setButtonGuiItem(Ok, KGuiItem(i18n("Rename"), "dialog-apply"));
+    setButtonGuiItem(Ok, KGuiItem(i18nc("@action:button", "&Rename"), "dialog-ok-apply"));
 
     QWidget* page = new QWidget(this);
     setMainWidget(page);
 
     QVBoxLayout* topLayout = new QVBoxLayout(page);
-    topLayout->setMargin(KDialog::marginHint());
 
     QLabel* editLabel = 0;
     if (m_renameOneItem) {
-        const KUrl& url = items.first();
-        m_newName = url.fileName();
-        editLabel = new QLabel(i18n("Rename the item '%1' to:", m_newName),
+        m_newName = items.first().name();
+        editLabel = new QLabel(i18nc("@label:textbox", "Rename the item <filename>%1</filename> to:", m_newName),
                                page);
-    }
-    else {
-        m_newName = i18n("New name #");
-        editLabel = new QLabel(i18n("Rename the %1 selected items to:", itemCount),
+    } else {
+        m_newName = i18nc("@info:status", "New name #");
+        editLabel = new QLabel(i18ncp("@label:textbox",
+                                      "Rename the %1 selected item to:",
+                                      "Rename the %1 selected items to:", itemCount),
                                page);
     }
 
     m_lineEdit = new KLineEdit(page);
-    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, '.');
+
+    QString fileName = items[0].url().prettyUrl();
+    QString extension = KMimeType::extractKnownExtension(fileName.toLower());
+    if (!extension.isEmpty()) {
+        extension.insert(0, '.');
+        // The first item seems to have a extension (e. g. '.jpg' or '.txt'). Now
+        // check whether all other URLs have the same extension. If this is the
+        // case, add this extension to the name suggestion.
         for (int i = 1; i < itemCount; ++i) {
-            if (!items[i].prettyUrl().contains(postfix)) {
-                // at least one item does not have the same postfix
-                postfix.truncate(0);
+            fileName = items[i].url().prettyUrl().toLower();
+            if (!fileName.endsWith(extension)) {
+                // at least one item does not have the same extension
+                extension.truncate(0);
                 break;
             }
         }
@@ -82,13 +87,12 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
         --selectionLength; // don't select the # character
     }
 
-    const int postfixLength = postfix.length();
-    if (postfixLength > 0) {
+    const int extensionLength = extension.length();
+    if (extensionLength > 0) {
         if (m_renameOneItem) {
-            selectionLength -= postfixLength;
-        }
-        else {
-            m_newName.append(postfix);
+            selectionLength -= extensionLength;
+        } else {
+            m_newName.append(extension);
         }
     }
 
@@ -100,7 +104,7 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     topLayout->addWidget(m_lineEdit);
 
     if (!m_renameOneItem) {
-        QLabel* infoLabel = new QLabel(i18n("(# will be replaced by ascending numbers)"), page);
+        QLabel* infoLabel = new QLabel(i18nc("@info", "(# will be replaced by ascending numbers)"), page);
         topLayout->addWidget(infoLabel);
     }
 }
@@ -114,11 +118,11 @@ void RenameDialog::slotButtonClicked(int button)
     if (button == Ok) {
         m_newName = m_lineEdit->text();
         if (m_newName.isEmpty()) {
-            m_errorString = i18n("The new name is empty. A name with at least one character must be entered.");
-        }
-        else if (!m_renameOneItem && m_newName.contains('#') != 1) {
+            m_errorString = i18nc("@info:status",
+                                  "The new name is empty. A name with at least one character must be entered.");
+        } else if (!m_renameOneItem && (m_newName.count('#') == 0)) {
             m_newName.truncate(0);
-            m_errorString = i18n("The name must contain exactly one # character.");
+            m_errorString = i18nc("@info:status", "The name must contain at least one # character.");
         }
     }