Remember the additional-info property (size, date, type, ...) for each view mode...

[dolphin.git] / src / renamedialog.cpp

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 6f08f175ec55e3b70903884a88bf35f075f67831..adfc48676467e4fa135ae5b23cb87bc65f3fff22 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -26,14 +26,14 @@
 #include <QtGui/QLabel>
 #include <QtGui/QBoxLayout>
 
 #include <QtGui/QLabel>
 #include <QtGui/QBoxLayout>
 

-RenameDialog::RenameDialog(const KUrl::List& urls, const QList<KFileItem>& items) :
-    KDialog(),
+RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
+    KDialog(parent),

     m_renameOneItem(false)
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));
 
     m_renameOneItem(false)
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));
 

-    const int itemCount = urls.count();
+    const int itemCount = items.count();

     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 
     Q_ASSERT(itemCount >= 1);
     m_renameOneItem = (itemCount == 1);
 


@@ -43,7 +43,7 @@ RenameDialog::RenameDialog(const KUrl::List& urls, const QList<KFileItem>& items
     setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 
     setButtons(Ok | Cancel);
     setDefaultButton(Ok);
 

-    setButtonGuiItem(Ok, KGuiItem(i18nc("@action:button", "Rename"), "dialog-apply"));
+    setButtonGuiItem(Ok, KGuiItem(i18nc("@action:button", "Rename"), "dialog-ok-apply"));

 
     QWidget* page = new QWidget(this);
     setMainWidget(page);
 
     QWidget* page = new QWidget(this);
     setMainWidget(page);


@@ -65,13 +65,13 @@ RenameDialog::RenameDialog(const KUrl::List& urls, const QList<KFileItem>& items
     }
 
     m_lineEdit = new KLineEdit(page);
     }
 
     m_lineEdit = new KLineEdit(page);

-    QString extension = extensionString(urls[0].prettyUrl());
+    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 (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 (!urls[i].prettyUrl().contains(extension)) {
+            if (!items[i].url().prettyUrl().contains(extension)) {

                 // at least one item does not have the same extension
                 extension.truncate(0);
                 break;
                 // at least one item does not have the same extension
                 extension.truncate(0);
                 break;


@@ -116,7 +116,7 @@ void RenameDialog::slotButtonClicked(int button)
         if (m_newName.isEmpty()) {
             m_errorString = i18nc("@info:status",
                                   "The new name is empty. A name with at least one character must be entered.");
         if (m_newName.isEmpty()) {
             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.contains('#') != 1) {
+        } else if (!m_renameOneItem && m_newName.count('#') != 1) {

             m_newName.truncate(0);
             m_errorString = i18nc("@info:status", "The name must contain exactly one # character.");
         }
             m_newName.truncate(0);
             m_errorString = i18nc("@info:status", "The name must contain exactly one # character.");
         }