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 02dd2e9f6dbfe15fd4a330d9f4a1fdec11f4853c..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,14 +64,17 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     }
 
     m_lineEdit = new KLineEdit(page);
-    QString extension = KMimeType::extractKnownExtension(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;