Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 3e9b39327d9907012c92a679180ae2d8054907e2..39e61c4640f8fc3d4a26059d2f16c4ac5ce3732e 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -43,13 +43,12 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 
-    setButtonGuiItem(Ok, KGuiItem(i18nc("@action:button", "Rename"), "dialog-ok-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) {
@@ -65,13 +64,17 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     }
 
     m_lineEdit = new KLineEdit(page);
-    QString extension = extensionString(items[0].url().prettyUrl());
-    if (extension.length() > 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].url().prettyUrl().contains(extension)) {
+            fileName = items[i].url().prettyUrl().toLower();
+            if (!fileName.endsWith(extension)) {
                 // at least one item does not have the same extension
                 extension.truncate(0);
                 break;
@@ -107,7 +110,8 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 }
 
 RenameDialog::~RenameDialog()
-{}
+{
+}
 
 void RenameDialog::slotButtonClicked(int button)
 {
@@ -125,36 +129,4 @@ void RenameDialog::slotButtonClicked(int button)
     KDialog::slotButtonClicked(button);
 }
 
-QString RenameDialog::extensionString(const QString& name)
-{
-    QString extension;
-
-    const QStringList strings = name.split('.');
-    const int size = strings.size();
-    for (int i = size - 1; i >= 0; --i) {
-        const QString& str = strings.at(i);
-
-        // 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 isNumeric = false;
-        str.toInt(&isNumeric);
-        if (isNumeric) {
-            break;
-        }
-
-        // Extensions may not contain a space and the maximum length
-        // should not exceed 4 characters. This prevents that strings like
-        // "Open office.org writer documentation.pdf" get ".org writer documentation.pdf"
-        // as extension.
-        if (str.contains(' ') || (str.length() > 4)) {
-            break;
-        }
-
-        extension.insert(0, '.' + str);
-    }
-
-    return extension;
-}
-
 #include "renamedialog.moc"