X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/cdcb4b0166aefdd382d20e7ff3b5cb217ba54ba8..45a1074b0a38f38cfebde8bb65d5a6520b2db3e8:/src/renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 7bee7b9e7..adfc48676 100644
--- 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,11 +37,13 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 
-    setCaption(m_renameOneItem ? i18n("Rename Item") : i18n("Rename Items"));
+    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);
@@ -50,27 +53,27 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
 
     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),
+        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 extension = extensionString(items[0].url().prettyUrl());
+    if (extension.length() > 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);
+            if (!items[i].url().prettyUrl().contains(extension)) {
+                // at least one item does not have the same extension
+                extension.truncate(0);
                 break;
             }
         }
@@ -81,12 +84,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;
+            selectionLength -= extensionLength;
         } else {
-            m_newName.append(postfix);
+            m_newName.append(extension);
         }
     }
 
@@ -98,7 +101,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);
     }
 }
@@ -111,14 +114,41 @@ 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('#') != 1) {
             m_newName.truncate(0);
-            m_errorString = i18n("The name must contain exactly one # character.");
+            m_errorString = i18nc("@info:status", "The name must contain exactly one # character.");
         }
     }
 
     KDialog::slotButtonClicked(button);
 }
 
+QString RenameDialog::extensionString(const QString& name)
+{
+    QString extension;
+    bool foundExtension = false;  // true if at least one valid file extension
+                                  // like "gif", "txt", ... has been found
+
+    QStringList strings = name.split('.');
+    const int size = strings.size();
+    for (int i = 1; i < size; ++i) {
+        const QString& str = strings.at(i);
+        if (!foundExtension) {
+            // Sub strings like "9", "12", "99", ... which contain only
+            // numbers don't count as extension. Usually they are version
+            // numbers like in "cmake-2.4.5".
+            bool ok = false;
+            str.toInt(&ok);
+            foundExtension = !ok;
+        }
+        if (foundExtension) {
+            extension += '.' + str;
+        }
+    }
+
+    return extension;
+}
+
 #include "renamedialog.moc"