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 def141e047a104bee6d8dc40ee78b761ff9d337c..adfc48676467e4fa135ae5b23cb87bc65f3fff22 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -19,14 +19,15 @@
 
 #include "renamedialog.h"
 
 
 #include "renamedialog.h"
 

+#include <kfileitem.h>

 #include <klineedit.h>
 #include <klocale.h>
 
 #include <QtGui/QLabel>
 #include <QtGui/QBoxLayout>
 
 #include <klineedit.h>
 #include <klocale.h>
 
 #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();
     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);
 
     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);
 
     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);
 
     QWidget* page = new QWidget(this);
     setMainWidget(page);


@@ -50,24 +53,25 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
 
     QLabel* editLabel = 0;
     if (m_renameOneItem) {
 
     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 {
                                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);
                                page);
     }
 
     m_lineEdit = new KLineEdit(page);

-    QString extension = extensionString(items[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
     if (extension.length() > 0) {
         // The first item seems to have a extension (e. g. '.jpg' or '.txt'). Now

-        // check whether all other items have the same extension. If this is the
+        // 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) {
         // case, add this extension to the name suggestion.
         for (int i = 1; i < itemCount; ++i) {

-            if (!items[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;


@@ -97,7 +101,7 @@ RenameDialog::RenameDialog(const KUrl::List& items) :
     topLayout->addWidget(m_lineEdit);
 
     if (!m_renameOneItem) {
     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);
     }
 }
         topLayout->addWidget(infoLabel);
     }
 }


@@ -110,17 +114,18 @@ void RenameDialog::slotButtonClicked(int button)
     if (button == Ok) {
         m_newName = m_lineEdit->text();
         if (m_newName.isEmpty()) {
     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_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);
 }
 
         }
     }
 
     KDialog::slotButtonClicked(button);
 }
 

-QString RenameDialog::extensionString(const QString& name) const
+QString RenameDialog::extensionString(const QString& name)

 {
     QString extension;
     bool foundExtension = false;  // true if at least one valid file extension
 {
     QString extension;
     bool foundExtension = false;  // true if at least one valid file extension