Icon naming spec compliance (code changes - KDE/):

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ce505ea3f69c0bafacb4542b368f2d439b9cb1d3..13406a6b5224d5b7f08d9a4eb2eca3a82882ff59 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -41,6 +41,7 @@
 #include "kfileplacesview.h"
 
 #include "dolphin_generalsettings.h"
 #include "kfileplacesview.h"
 
 #include "dolphin_generalsettings.h"

+#include "dolphin_iconsmodesettings.h"

 
 #include <kaction.h>
 #include <kactioncollection.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>


@@ -52,11 +53,10 @@
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
 #include <kicon.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>

-#include <kio/deletejob.h>
-#include <kio/renamedialog.h>

 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmenu.h>

+#include <kmenubar.h>

 #include <kmessagebox.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kmessagebox.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>


@@ -78,6 +78,7 @@
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),
 DolphinMainWindow::DolphinMainWindow(int id) :
     KXmlGuiWindow(0),
     m_newMenu(0),

+    m_showMenuBar(0),

     m_splitter(0),
     m_activeViewContainer(0),
     m_id(id)
     m_splitter(0),
     m_activeViewContainer(0),
     m_id(id)


@@ -89,9 +90,9 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     new MainWindowAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
 
     new MainWindowAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
 

-    KonqUndoManager::incRef();
+    KonqFileUndoManager::incRef();

 
 

-    KonqUndoManager* undoManager = KonqUndoManager::self();
+    KonqFileUndoManager* undoManager = KonqFileUndoManager::self();

     undoManager->setUiInterface(new UndoUiInterface(this));
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),
     undoManager->setUiInterface(new UndoUiInterface(this));
 
     connect(undoManager, SIGNAL(undoAvailable(bool)),


@@ -104,7 +105,7 @@ DolphinMainWindow::DolphinMainWindow(int id) :
 
 DolphinMainWindow::~DolphinMainWindow()
 {
 
 DolphinMainWindow::~DolphinMainWindow()
 {

-    KonqUndoManager::decRef();
+    KonqFileUndoManager::decRef();

     DolphinApplication::app()->removeMainWindow(this);
 }
 
     DolphinApplication::app()->removeMainWindow(this);
 }
 


@@ -123,11 +124,10 @@ void DolphinMainWindow::toggleViews()
     m_viewContainer[SecondaryView] = container;
 }
 
     m_viewContainer[SecondaryView] = container;
 }
 

-void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType)

 {
     clearStatusBar();
 {
     clearStatusBar();

-    KonqOperations::rename(this, oldUrl, newUrl);
-    m_undoCommandTypes.append(KonqUndoManager::RENAME);
+    m_undoCommandTypes.append(commandType);

 }
 
 void DolphinMainWindow::refreshViews()
 }
 
 void DolphinMainWindow::refreshViews()


@@ -150,6 +150,9 @@ void DolphinMainWindow::refreshViews()
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                  const KUrl& destination)
 {
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
                                  const KUrl& destination)
 {

+    kDebug() << "Source" << urls;
+    kDebug() << "Destination:" << destination;
+

     Qt::DropAction action = Qt::CopyAction;
 
     Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     Qt::DropAction action = Qt::CopyAction;
 
     Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();


@@ -175,7 +178,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'
 
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'

-        QAction* moveAction = popup.addAction(KIcon("goto-page"),
+        QAction* moveAction = popup.addAction(KIcon("go-jump"),

                                               i18nc("@action:inmenu",
                                                     "&Move Here\t<shortcut>%1</shortcut>", seq));
 
                                               i18nc("@action:inmenu",
                                                     "&Move Here\t<shortcut>%1</shortcut>", seq));
 


@@ -187,7 +190,7 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);
 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);

-        QAction* linkAction = popup.addAction(KIcon("www"),
+        QAction* linkAction = popup.addAction(KIcon("insert-link"),

                                               i18nc("@action:inmenu",
                                                     "&Link Here\t<shortcut>%1</shortcut>", seq));
 
                                               i18nc("@action:inmenu",
                                                     "&Link Here\t<shortcut>%1</shortcut>", seq));
 


@@ -208,15 +211,18 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
     switch (action) {
     case Qt::MoveAction:
 
     switch (action) {
     case Qt::MoveAction:

-        moveUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::MOVE);

         break;
 
     case Qt::CopyAction:
         break;
 
     case Qt::CopyAction:

-        copyUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::COPY);

         break;
 
     case Qt::LinkAction:
         break;
 
     case Qt::LinkAction:

-        linkUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::LINK);

         break;
 
     default:
         break;
 
     default:


@@ -237,7 +243,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
     }
 }
 
     }
 }
 

-void DolphinMainWindow::changeSelection(const QList<KFileItem>& selection)
+void DolphinMainWindow::changeSelection(const KFileItemList& selection)

 {
     activeViewContainer()->view()->changeSelection(selection);
 }
 {
     activeViewContainer()->view()->changeSelection(selection);
 }


@@ -321,37 +327,62 @@ void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
     descending->setChecked(sortDescending);
 }
 
     descending->setChecked(sortDescending);
 }
 

-void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info)
+void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list)

 {
 {

-    QAction* action = 0;
-    switch (info) {
-    case KFileItemDelegate::FriendlyMimeType:
-        action = actionCollection()->action("show_mime_info");
-        break;
-    case KFileItemDelegate::Size:
-        action = actionCollection()->action("show_size_info");
-        break;
-    case KFileItemDelegate::ModificationTime:
-        action = actionCollection()->action("show_date_info");
-        break;
-    case KFileItemDelegate::NoInformation:
-    default:
-        action = actionCollection()->action("clear_info");
-        break;
-    }
+    QAction* showSizeInfo = actionCollection()->action("show_size_info");
+    QAction* showDateInfo = actionCollection()->action("show_date_info");
+    QAction* showPermissionsInfo = actionCollection()->action("show_permissions_info");
+    QAction* showOwnerInfo = actionCollection()->action("show_owner_info");
+    QAction* showGroupInfo = actionCollection()->action("show_group_info");
+    QAction* showMimeInfo = actionCollection()->action("show_mime_info");

 
 

-    if (action != 0) {
-        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
-        toggleAction->setChecked(true);
+    showSizeInfo->setChecked(false);
+    showDateInfo->setChecked(false);
+    showPermissionsInfo->setChecked(false);
+    showOwnerInfo->setChecked(false);
+    showGroupInfo->setChecked(false);
+    showMimeInfo->setChecked(false);
+
+    const DolphinView* view = m_activeViewContainer->view();

 
 

-        QActionGroup* group = toggleAction->actionGroup();
-        Q_ASSERT(group != 0);
-        const DolphinView* view = m_activeViewContainer->view();
-        group->setEnabled(view->mode() == DolphinView::IconsView);
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const bool enable = (view->mode() == DolphinView::DetailsView) ||
+                         ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
+
+    showSizeInfo->setEnabled(enable);
+    showDateInfo->setEnabled(enable);
+    showPermissionsInfo->setEnabled(enable);
+    showOwnerInfo->setEnabled(enable);
+    showGroupInfo->setEnabled(enable);
+    showMimeInfo->setEnabled(enable);
+
+    foreach (KFileItemDelegate::Information info, list) {
+        switch (info) {
+        case KFileItemDelegate::Size:
+            showSizeInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::ModificationTime:
+            showDateInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Permissions:
+            showPermissionsInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Owner:
+            showOwnerInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::OwnerAndGroup:
+            showGroupInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::FriendlyMimeType:
+            showMimeInfo->setChecked(true);
+            break;
+        default:
+            break;
+        }

     }
 }
 
     }
 }
 

-void DolphinMainWindow::slotSelectionChanged(const QList<KFileItem>& selection)
+void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)

 {
     updateEditActions();
 
 {
     updateEditActions();
 


@@ -417,34 +448,44 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
     KXmlGuiWindow::closeEvent(event);
 }
 
     KXmlGuiWindow::closeEvent(event);
 }
 

-void DolphinMainWindow::saveProperties(KConfig* config)
+void DolphinMainWindow::saveProperties(KConfigGroup& group)

 {
 {

-    KConfigGroup primaryView = config->group("Primary view");
-    primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url());
-    primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable());
-    if (m_viewContainer[SecondaryView] != 0) {
-        KConfigGroup secondaryView = config->group("Secondary view");
-        secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url());
-        secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable());
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
+    group.writeEntry("Primary Url", cont->url().url());
+    group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+
+    cont = m_viewContainer[SecondaryView];
+    if (cont != 0) {
+        group.writeEntry("Secondary Url", cont->url().url());
+        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());

     }
 }
 
     }
 }
 

-void DolphinMainWindow::readProperties(KConfig* config)
+void DolphinMainWindow::readProperties(const KConfigGroup& group)

 {
 {

-    const KConfigGroup primaryViewGroup = config->group("Primary view");
-    m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url"));
-    bool editable = primaryViewGroup.readEntry("Editable Url", false);
-    m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];

 
 

-    if (config->hasGroup("Secondary view")) {
-        const KConfigGroup secondaryViewGroup = config->group("Secondary view");
-        if (m_viewContainer[PrimaryView] == 0) {
+    cont->setUrl(group.readEntry("Primary Url"));
+    bool editable = group.readEntry("Primary Editable Url", false);
+    cont->urlNavigator()->setUrlEditable(editable);
+
+    cont = m_viewContainer[SecondaryView];
+    const QString secondaryUrl = group.readEntry("Secondary Url");
+    if (!secondaryUrl.isEmpty()) {
+        if (cont == 0) {
+            // a secondary view should be shown, but no one is available
+            // currently -> create a new view

             toggleSplitView();
             toggleSplitView();

+            cont = m_viewContainer[SecondaryView];
+            Q_ASSERT(cont != 0);

         }
         }

-        m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url"));
-        editable = secondaryViewGroup.readEntry("Editable Url", false);
-        m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
-    } else if (m_viewContainer[SecondaryView] != 0) {
+
+        cont->setUrl(secondaryUrl);
+        bool editable = group.readEntry("Secondary Editable Url", false);
+        cont->urlNavigator()->setUrlEditable(editable);
+    } else if (cont != 0) {
+        // no secondary view should be shown, but the default setting shows
+        // one already -> close the view

         toggleSplitView();
     }
 }
         toggleSplitView();
     }
 }


@@ -458,47 +499,37 @@ void DolphinMainWindow::updateNewMenu()
 void DolphinMainWindow::rename()
 {
     clearStatusBar();
 void DolphinMainWindow::rename()
 {
     clearStatusBar();

-    m_activeViewContainer->renameSelectedItems();
+    m_activeViewContainer->view()->renameSelectedItems();

 }
 
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::moveToTrash()
 {
     clearStatusBar();

-    const KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
-    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls);
-    m_undoCommandTypes.append(KonqUndoManager::TRASH);
+
+    DolphinView* view = m_activeViewContainer->view();
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+        view->deleteSelectedItems();
+    } else {
+        view->trashSelectedItems();
+    }

 }
 
 void DolphinMainWindow::deleteItems()
 {
     clearStatusBar();
 }
 
 void DolphinMainWindow::deleteItems()
 {
     clearStatusBar();

-
-    const KUrl::List list = m_activeViewContainer->view()->selectedUrls();
-    const bool del = KonqOperations::askDeleteConfirmation(list,
-                     KonqOperations::DEL,
-                     KonqOperations::DEFAULT_CONFIRMATION,
-                     this);
-
-    if (del) {
-        KIO::Job* job = KIO::del(list);
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotHandleJobError(KJob*)));
-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotDeleteFileFinished(KJob*)));
-    }
+    m_activeViewContainer->view()->deleteSelectedItems();

 }
 
 void DolphinMainWindow::properties()
 {
 }
 
 void DolphinMainWindow::properties()
 {

-    QList<KFileItem> list = m_activeViewContainer->view()->selectedItems();
-    // ### KPropertiesDialog still uses pointer-based KFileItemList
-    KFileItemList lst;
-    // Can't be a const_iterator :(
-    for ( QList<KFileItem>::iterator it = list.begin(), end = list.end() ; it != end ; ++it ) {
-        lst << & *it; // ugly!
-    }
-    KPropertiesDialog dialog(lst, this);
-    dialog.exec();
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+
+    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+    dialog->raise();
+    dialog->activateWindow();

 }
 
 void DolphinMainWindow::quit()
 }
 
 void DolphinMainWindow::quit()


@@ -514,24 +545,6 @@ void DolphinMainWindow::slotHandlePlacesError(const QString &message)
     }
 }
 
     }
 }
 

-void DolphinMainWindow::slotHandleJobError(KJob* job)
-{
-    if (job->error() != 0) {
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        statusBar->setMessage(job->errorString(),
-                              DolphinStatusBar::Error);
-    }
-}
-
-void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
-{
-    if (job->error() == 0) {
-        DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
-        statusBar->setMessage(i18nc("@info:status", "Delete operation completed."),
-                              DolphinStatusBar::OperationCompleted);
-    }
-}
-

 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));


@@ -540,31 +553,31 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
     }
 
     if (available && (m_undoCommandTypes.count() > 0)) {
     }
 
     if (available && (m_undoCommandTypes.count() > 0)) {

-        const KonqUndoManager::CommandType command = m_undoCommandTypes.takeFirst();
+        const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst();

         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {

-        case KonqUndoManager::COPY:
+        case KonqFileUndoManager::COPY:

             statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::MOVE:
+        case KonqFileUndoManager::MOVE:

             statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Move operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::LINK:
+        case KonqFileUndoManager::LINK:

             statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Link operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::TRASH:
+        case KonqFileUndoManager::TRASH:

             statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;

-        case KonqUndoManager::RENAME:
+        case KonqFileUndoManager::RENAME:

             statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
 
             statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),
                                   DolphinStatusBar::OperationCompleted);
             break;
 

-        case KonqUndoManager::MKDIR:
+        case KonqFileUndoManager::MKDIR:

             statusBar->setMessage(i18nc("@info:status", "Created folder."),
                                   DolphinStatusBar::OperationCompleted);
             break;
             statusBar->setMessage(i18nc("@info:status", "Created folder."),
                                   DolphinStatusBar::OperationCompleted);
             break;


@@ -587,60 +600,22 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 void DolphinMainWindow::undo()
 {
     clearStatusBar();
 void DolphinMainWindow::undo()
 {
     clearStatusBar();

-    KonqUndoManager::self()->undo();
+    KonqFileUndoManager::self()->undo();

 }
 
 void DolphinMainWindow::cut()
 {
 }
 
 void DolphinMainWindow::cut()
 {

-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
-    QApplication::clipboard()->setMimeData(mimeData);
+    m_activeViewContainer->view()->cutSelectedItems();

 }
 
 void DolphinMainWindow::copy()
 {
 }
 
 void DolphinMainWindow::copy()
 {

-    QMimeData* mimeData = new QMimeData();
-    const KUrl::List kdeUrls = m_activeViewContainer->view()->selectedUrls();
-    const KUrl::List mostLocalUrls;
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
-
-    QApplication::clipboard()->setMimeData(mimeData);
+    m_activeViewContainer->view()->copySelectedItems();

 }
 
 void DolphinMainWindow::paste()
 {
 }
 
 void DolphinMainWindow::paste()
 {

-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    clearStatusBar();
-
-    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
-
-    // per default the pasting is done into the current Url of the view
-    KUrl destUrl(m_activeViewContainer->url());
-
-    // check whether the pasting should be done into a selected directory
-    KUrl::List selectedUrls = m_activeViewContainer->view()->selectedUrls();
-    if (selectedUrls.count() == 1) {
-        const KFileItem fileItem(S_IFDIR,
-                                 KFileItem::Unknown,
-                                 selectedUrls.first(),
-                                 true);
-        if (fileItem.isDir()) {
-            // only one item is selected which is a directory, hence paste
-            // into this directory
-            destUrl = selectedUrls.first();
-        }
-    }
-
-    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
-        moveUrls(sourceUrls, destUrl);
-        clipboard->clear();
-    } else {
-        copyUrls(sourceUrls, destUrl);
-    }
+    m_activeViewContainer->view()->paste();

 }
 
 void DolphinMainWindow::updatePasteAction()
 }
 
 void DolphinMainWindow::updatePasteAction()


@@ -650,39 +625,9 @@ void DolphinMainWindow::updatePasteAction()
         return;
     }
 
         return;
     }
 

-    QString text(i18nc("@action:inmenu", "Paste"));
-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    if (!urls.isEmpty()) {
-        pasteAction->setEnabled(true);
-
-        pasteAction->setText(i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count()));
-    } else {
-        pasteAction->setEnabled(false);
-        pasteAction->setText(i18nc("@action:inmenu", "Paste"));
-    }
-
-    if (pasteAction->isEnabled()) {
-        KUrl::List urls = m_activeViewContainer->view()->selectedUrls();
-        const uint count = urls.count();
-        if (count > 1) {
-            // pasting should not be allowed when more than one file
-            // is selected
-            pasteAction->setEnabled(false);
-        } else if (count == 1) {
-            // Only one file is selected. Pasting is only allowed if this
-            // file is a directory.
-            // TODO: this doesn't work with remote protocols; instead we need a
-            // m_activeViewContainer->selectedFileItems() to get the real KFileItems
-            const KFileItem fileItem(S_IFDIR,
-                                     KFileItem::Unknown,
-                                     urls.first(),
-                                     true);
-            pasteAction->setEnabled(fileItem.isDir());
-        }
-    }
+    QPair<bool, QString> pasteInfo = m_activeViewContainer->view()->pasteInfo();
+    pasteAction->setEnabled(pasteInfo.first);
+    pasteAction->setText(pasteInfo.second);

 }
 
 void DolphinMainWindow::selectAll()
 }
 
 void DolphinMainWindow::selectAll()


@@ -696,19 +641,11 @@ void DolphinMainWindow::invertSelection()
     clearStatusBar();
     m_activeViewContainer->view()->invertSelection();
 }
     clearStatusBar();
     m_activeViewContainer->view()->invertSelection();
 }

-void DolphinMainWindow::setIconsView()
-{
-    m_activeViewContainer->view()->setMode(DolphinView::IconsView);
-}

 
 

-void DolphinMainWindow::setDetailsView()
+void DolphinMainWindow::setViewMode(QAction* action)

 {
 {

-    m_activeViewContainer->view()->setMode(DolphinView::DetailsView);
-}
-
-void DolphinMainWindow::setColumnView()
-{
-    m_activeViewContainer->view()->setMode(DolphinView::ColumnView);
+    const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
+    m_activeViewContainer->view()->setMode(mode);

 }
 
 void DolphinMainWindow::sortByName()
 }
 
 void DolphinMainWindow::sortByName()


@@ -776,27 +713,34 @@ void DolphinMainWindow::toggleSortCategorization()
     view->setCategorizedSorting(!categorizedSorting);
 }
 
     view->setCategorizedSorting(!categorizedSorting);
 }
 

-void DolphinMainWindow::clearInfo()
+void DolphinMainWindow::toggleSizeInfo()

 {
 {

-    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::NoInformation);
+    toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size);

 }
 
 }
 

-void DolphinMainWindow::showMimeInfo()
+void DolphinMainWindow::toggleDateInfo()

 {
 {

-    clearStatusBar();
-    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);
+    toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime);

 }
 
 }
 

-void DolphinMainWindow::showSizeInfo()
+void DolphinMainWindow::togglePermissionsInfo()

 {
 {

-    clearStatusBar();
-    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::Size);
+    toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions);

 }
 
 }
 

-void DolphinMainWindow::showDateInfo()
+void DolphinMainWindow::toggleOwnerInfo()

 {
 {

-    clearStatusBar();
-    m_activeViewContainer->view()->setAdditionalInfo(KFileItemDelegate::ModificationTime);
+    toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner);
+}
+
+void DolphinMainWindow::toggleGroupInfo()
+{
+    toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup);
+}
+
+void DolphinMainWindow::toggleMimeInfo()
+{
+    toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType);

 }
 
 void DolphinMainWindow::toggleSplitView()
 }
 
 void DolphinMainWindow::toggleSplitView()


@@ -897,7 +841,9 @@ void DolphinMainWindow::toggleEditLocation()
 
 void DolphinMainWindow::editLocation()
 {
 
 void DolphinMainWindow::editLocation()
 {

-    m_activeViewContainer->urlNavigator()->setUrlEditable(true);
+    KUrlNavigator* navigator = m_activeViewContainer->urlNavigator();
+    navigator->setUrlEditable(true);
+    navigator->setFocus();

 }
 
 void DolphinMainWindow::adjustViewProperties()
 }
 
 void DolphinMainWindow::adjustViewProperties()


@@ -991,6 +937,12 @@ void DolphinMainWindow::compareFiles()
 
 }
 
 
 }
 

+void DolphinMainWindow::toggleShowMenuBar()
+{
+    const bool visible = menuBar()->isVisible();
+    menuBar()->setVisible(!visible);
+}
+

 void DolphinMainWindow::editSettings()
 {
     DolphinSettingsDialog dialog(this);
 void DolphinMainWindow::editSettings()
 {
     DolphinSettingsDialog dialog(this);


@@ -1051,14 +1003,6 @@ void DolphinMainWindow::init()
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }

-#ifdef HAVE_NEPOMUK
-    if (!MetaDataWidget::metaDataAvailable()) {
-        DolphinStatusBar* statusBar = activeViewContainer()->statusBar();
-        statusBar->setMessage(i18nc("@info:status",
-                                    "Failed to contact Nepomuk service, annotation and tagging are disabled."),
-                                    DolphinStatusBar::Error);
-    }
-#endif

 
     emit urlChanged(homeUrl);
 }
 
     emit urlChanged(homeUrl);
 }


@@ -1097,30 +1041,22 @@ void DolphinMainWindow::setupActions()
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 

-    QAction* newWindow = actionCollection()->addAction("new_window");
+    KAction* newWindow = actionCollection()->addAction("new_window");

     newWindow->setIcon(KIcon("window-new"));
     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
     newWindow->setIcon(KIcon("window-new"));
     newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 

-    QAction* rename = actionCollection()->addAction("rename");
-    rename->setText(i18nc("@action:inmenu File", "Rename..."));
-    rename->setShortcut(Qt::Key_F2);
+    KAction* rename = DolphinView::createRenameAction(actionCollection());

     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 

-    QAction* moveToTrash = actionCollection()->addAction("move_to_trash");
-    moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
-    moveToTrash->setIcon(KIcon("edit-trash"));
-    moveToTrash->setShortcut(QKeySequence::Delete);
+    KAction* moveToTrash = DolphinView::createMoveToTrashAction(actionCollection());

     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 

-    QAction* deleteAction = actionCollection()->addAction("delete");
-    deleteAction->setText(i18nc("@action:inmenu File", "Delete"));
-    deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
-    deleteAction->setIcon(KIcon("edit-delete"));
+    KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());

     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 

-    QAction* properties = actionCollection()->addAction("properties");
+    KAction* properties = actionCollection()->addAction("properties");

     properties->setText(i18nc("@action:inmenu File", "Properties"));
     properties->setShortcut(Qt::ALT | Qt::Key_Return);
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
     properties->setText(i18nc("@action:inmenu File", "Properties"));
     properties->setShortcut(Qt::ALT | Qt::Key_Return);
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));


@@ -1132,16 +1068,21 @@ void DolphinMainWindow::setupActions()
                           SLOT(undo()),
                           actionCollection());
 
                           SLOT(undo()),
                           actionCollection());
 

-    KStandardAction::cut(this, SLOT(cut()), actionCollection());
+    //Need to remove shift+del from cut action, else the shortcut for deletejob
+    //doesn't work
+    KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
+    KShortcut cutShortcut = cut->shortcut();
+    cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
+    cut->setShortcut(cutShortcut);

     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
 
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
 

-    QAction* selectAll = actionCollection()->addAction("select_all");
+    KAction* selectAll = actionCollection()->addAction("select_all");

     selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
     selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 
     selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
     selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 

-    QAction* invertSelection = actionCollection()->addAction("invert_selection");
+    KAction* invertSelection = actionCollection()->addAction("invert_selection");

     invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
     invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
     invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
     invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));


@@ -1155,28 +1096,16 @@ void DolphinMainWindow::setupActions()
                              SLOT(zoomOut()),
                              actionCollection());
 
                              SLOT(zoomOut()),
                              actionCollection());
 

-    KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
-    iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
-    iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
-    iconsView->setIcon(KIcon("fileview-icon"));
-    connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));

 
 

-    KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
-    detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
-    detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
-    detailsView->setIcon(KIcon("fileview-detailed"));
-    connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
-
-    KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
-    columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
-    columnView->setShortcut(Qt::CTRL | Qt::Key_3);
-    columnView->setIcon(KIcon("fileview-column"));
-    connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));
+    KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
+    KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
+    KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());

 
     QActionGroup* viewModeGroup = new QActionGroup(this);
     viewModeGroup->addAction(iconsView);
     viewModeGroup->addAction(detailsView);
     viewModeGroup->addAction(columnView);
 
     QActionGroup* viewModeGroup = new QActionGroup(this);
     viewModeGroup->addAction(iconsView);
     viewModeGroup->addAction(detailsView);
     viewModeGroup->addAction(columnView);

+    connect(viewModeGroup, SIGNAL(triggered(QAction*)), this, SLOT(setViewMode(QAction*)));

 
     KToggleAction* sortByName = actionCollection()->add<KToggleAction>("sort_by_name");
     sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));
 
     KToggleAction* sortByName = actionCollection()->add<KToggleAction>("sort_by_name");
     sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));


@@ -1206,24 +1135,27 @@ void DolphinMainWindow::setupActions()
     sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
     connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
 
     sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
     connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
 

-    KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
-    sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
-
-    KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
-    sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
-
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //
+    // KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
+    // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
+    //
+    // KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
+    // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
+    //

 #ifdef HAVE_NEPOMUK
 #ifdef HAVE_NEPOMUK

-    if (MetaDataWidget::metaDataAvailable()) {
-        connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
-        connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
-    }
-    else {
-        sortByRating->setEnabled(false);
-        sortByTags->setEnabled(false);
-    }
+    // if (MetaDataWidget::metaDataAvailable()) {
+    //     connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
+    //     connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
+    // }
+    // else {
+    //     sortByRating->setEnabled(false);
+    //     sortByTags->setEnabled(false);
+    // }

 #else
 #else

-    sortByRating->setEnabled(false);
-    sortByTags->setEnabled(false);
+    // sortByRating->setEnabled(false);
+    // sortByTags->setEnabled(false);

 #endif
 
     QActionGroup* sortGroup = new QActionGroup(this);
 #endif
 
     QActionGroup* sortGroup = new QActionGroup(this);


@@ -1234,8 +1166,11 @@ void DolphinMainWindow::setupActions()
     sortGroup->addAction(sortByOwner);
     sortGroup->addAction(sortByGroup);
     sortGroup->addAction(sortByType);
     sortGroup->addAction(sortByOwner);
     sortGroup->addAction(sortByGroup);
     sortGroup->addAction(sortByType);

-    sortGroup->addAction(sortByRating);
-    sortGroup->addAction(sortByTags);
+
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //sortGroup->addAction(sortByRating);
+    //sortGroup->addAction(sortByTags);

 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));


@@ -1245,27 +1180,29 @@ void DolphinMainWindow::setupActions()
     showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
     connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
 
     showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
     connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
 

-    KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");
-    clearInfo->setText(i18nc("@action:inmenu Additional information", "No Information"));
-    connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo()));
-
-    KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
-    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
-    connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo()));
-

     KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
     showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
     KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
     showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));

-    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo()));
+    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo()));

 
     KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
     showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
 
     KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
     showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));

-    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo()));
+    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo()));
+
+    KToggleAction* showPermissionsInfo = actionCollection()->add<KToggleAction>("show_permissions_info");
+    showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
+    connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo()));
+
+    KToggleAction* showOwnerInfo = actionCollection()->add<KToggleAction>("show_owner_info");
+    showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
+    connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo()));
+
+    KToggleAction* showGroupInfo = actionCollection()->add<KToggleAction>("show_group_info");
+    showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
+    connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo()));

 
 

-    QActionGroup* infoGroup = new QActionGroup(this);
-    infoGroup->addAction(clearInfo);
-    infoGroup->addAction(showMimeInfo);
-    infoGroup->addAction(showSizeInfo);
-    infoGroup->addAction(showDateInfo);
+    KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
+    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
+    connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo()));

 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));


@@ -1277,18 +1214,18 @@ void DolphinMainWindow::setupActions()
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 

-    QAction* split = actionCollection()->addAction("split_view");
+    KAction* split = actionCollection()->addAction("split_view");

     split->setShortcut(Qt::Key_F10);
     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     split->setShortcut(Qt::Key_F10);
     updateSplitAction();
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 

-    QAction* reload = actionCollection()->addAction("reload");
+    KAction* reload = actionCollection()->addAction("reload");

     reload->setText(i18nc("@action:inmenu View", "Reload"));
     reload->setShortcut(Qt::Key_F5);
     reload->setIcon(KIcon("view-refresh"));
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 
     reload->setText(i18nc("@action:inmenu View", "Reload"));
     reload->setShortcut(Qt::Key_F5);
     reload->setIcon(KIcon("view-refresh"));
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 

-    QAction* stop = actionCollection()->addAction("stop");
+    KAction* stop = actionCollection()->addAction("stop");

     stop->setText(i18nc("@action:inmenu View", "Stop"));
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
     stop->setText(i18nc("@action:inmenu View", "Stop"));
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));


@@ -1301,17 +1238,21 @@ void DolphinMainWindow::setupActions()
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 

-    QAction* editLocation = actionCollection()->addAction("edit_location");
+    KAction* editLocation = actionCollection()->addAction("edit_location");

     editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location"));
     editLocation->setShortcut(Qt::Key_F6);
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
 
     editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location"));
     editLocation->setShortcut(Qt::Key_F6);
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
 

-    QAction* adjustViewProps = actionCollection()->addAction("view_properties");
+    KAction* adjustViewProps = actionCollection()->addAction("view_properties");

     adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
     connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
 
     // setup 'Go' menu
     adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
     connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
 
     // setup 'Go' menu

-    KStandardAction::back(this, SLOT(goBack()), actionCollection());
+    KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
+    KShortcut backShortcut = backAction->shortcut();
+    backShortcut.setAlternate(Qt::Key_Backspace);
+    backAction->setShortcut(backShortcut);
+

     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());


@@ -1320,7 +1261,7 @@ void DolphinMainWindow::setupActions()
     QAction* findFile = actionCollection()->addAction("find_file");
     findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     QAction* findFile = actionCollection()->addAction("find_file");
     findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);

-    findFile->setIcon(KIcon("file-find"));
+    findFile->setIcon(KIcon("edit-find"));

     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");


@@ -1328,13 +1269,14 @@ void DolphinMainWindow::setupActions()
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
 
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
 

-    QAction* compareFiles = actionCollection()->addAction("compare_files");
+    KAction* compareFiles = actionCollection()->addAction("compare_files");

     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     // setup 'Settings' menu
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     // setup 'Settings' menu

+    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());

     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 }
 
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 }
 


@@ -1354,8 +1296,8 @@ void DolphinMainWindow::setupDockWidgets()
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             infoWidget, SLOT(setUrl(KUrl)));
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     connect(this, SIGNAL(urlChanged(KUrl)),
             infoWidget, SLOT(setUrl(KUrl)));

-    connect(this, SIGNAL(selectionChanged(QList<KFileItem>)),
-            infoWidget, SLOT(setSelection(QList<KFileItem>)));
+    connect(this, SIGNAL(selectionChanged(KFileItemList)),
+            infoWidget, SLOT(setSelection(KFileItemList)));

     connect(this, SIGNAL(requestItemInfo(KFileItem)),
             infoWidget, SLOT(requestDelayedItemInfo(KFileItem)));
 
     connect(this, SIGNAL(requestItemInfo(KFileItem)),
             infoWidget, SLOT(requestDelayedItemInfo(KFileItem)));
 


@@ -1375,8 +1317,8 @@ void DolphinMainWindow::setupDockWidgets()
             treeWidget, SLOT(setUrl(KUrl)));
     connect(treeWidget, SIGNAL(changeUrl(KUrl)),
             this, SLOT(changeUrl(KUrl)));
             treeWidget, SLOT(setUrl(KUrl)));
     connect(treeWidget, SIGNAL(changeUrl(KUrl)),
             this, SLOT(changeUrl(KUrl)));

-    connect(treeWidget, SIGNAL(changeSelection(QList<KFileItem>)),
-            this, SLOT(changeSelection(QList<KFileItem>)));
+    connect(treeWidget, SIGNAL(changeSelection(KFileItemList)),
+            this, SLOT(changeSelection(KFileItemList)));

     connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)),
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 


@@ -1402,22 +1344,23 @@ void DolphinMainWindow::setupDockWidgets()
         terminalDock->hide();
     }
 
         terminalDock->hide();
     }
 

-    QDockWidget *placesDock = new QDockWidget(i18nc("@title:window", "Places"));
+    QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));

     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);

-    KFilePlacesView *listView = new KFilePlacesView(placesDock);
-    placesDock->setWidget(listView);
-    listView->setModel(DolphinSettings::instance().placesModel());
+    KFilePlacesView* placesView = new KFilePlacesView(placesDock);
+    placesDock->setWidget(placesView);
+    placesView->setModel(DolphinSettings::instance().placesModel());
+    placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

 
     placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
     placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);
     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
 
     placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
     placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);
     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);

-    connect(listView, SIGNAL(urlChanged(KUrl)),
+    connect(placesView, SIGNAL(urlChanged(KUrl)),

             this, SLOT(changeUrl(KUrl)));
     connect(this, SIGNAL(urlChanged(KUrl)),
             this, SLOT(changeUrl(KUrl)));
     connect(this, SIGNAL(urlChanged(KUrl)),

-            listView, SLOT(setUrl(KUrl)));
+            placesView, SLOT(setUrl(KUrl)));

 }
 
 void DolphinMainWindow::updateHistory()
 }
 
 void DolphinMainWindow::updateHistory()


@@ -1438,7 +1381,7 @@ void DolphinMainWindow::updateHistory()
 
 void DolphinMainWindow::updateEditActions()
 {
 
 void DolphinMainWindow::updateEditActions()
 {

-    const QList<KFileItem> list = m_activeViewContainer->view()->selectedItems();
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();

     if (list.isEmpty()) {
         stateChanged("has_no_selection");
     } else {
     if (list.isEmpty()) {
         stateChanged("has_no_selection");
     } else {


@@ -1446,13 +1389,13 @@ void DolphinMainWindow::updateEditActions()
 
         QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {
 
         QAction* renameAction = actionCollection()->action("rename");
         if (renameAction != 0) {

-            renameAction->setEnabled(list.count() >= 1);
+            renameAction->setEnabled(true);

         }
 
         bool enableMoveToTrash = true;
 
         }
 
         bool enableMoveToTrash = true;
 

-        QList<KFileItem>::const_iterator it = list.begin();
-        const QList<KFileItem>::const_iterator end = list.end();
+        KFileItemList::const_iterator it = list.begin();
+        const KFileItemList::const_iterator end = list.end();

         while (it != end) {
             const KUrl& url = (*it).url();
             // only enable the 'Move to Trash' action for local files
         while (it != end) {
             const KUrl& url = (*it).url();
             // only enable the 'Move to Trash' action for local files


@@ -1481,21 +1424,7 @@ void DolphinMainWindow::updateViewActions()
         zoomOutAction->setEnabled(view->isZoomOutPossible());
     }
 
         zoomOutAction->setEnabled(view->isZoomOutPossible());
     }
 

-    QAction* action = 0;
-    switch (view->mode()) {
-    case DolphinView::IconsView:
-        action = actionCollection()->action("icons");
-        break;
-    case DolphinView::DetailsView:
-        action = actionCollection()->action("details");
-        break;
-    case DolphinView::ColumnView:
-        action = actionCollection()->action("columns");
-        break;
-    default:
-        break;
-    }
-
+    QAction* action = actionCollection()->action(view->currentViewModeActionName());

     if (action != 0) {
         KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
         toggleAction->setChecked(true);
     if (action != 0) {
         KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
         toggleAction->setChecked(true);


@@ -1533,24 +1462,6 @@ void DolphinMainWindow::updateGoActions()
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 

-void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::COPY, source, dest);
-    m_undoCommandTypes.append(KonqUndoManager::COPY);
-}
-
-void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::MOVE, source, dest);
-    m_undoCommandTypes.append(KonqUndoManager::MOVE);
-}
-
-void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::LINK, source, dest);
-    m_undoCommandTypes.append(KonqUndoManager::LINK);
-}
-

 void DolphinMainWindow::clearStatusBar()
 {
     m_activeViewContainer->statusBar()->clear();
 void DolphinMainWindow::clearStatusBar()
 {
     m_activeViewContainer->statusBar()->clear();


@@ -1575,14 +1486,16 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));

-    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::AdditionalInformation)),
-            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation)));
-    connect(view, SIGNAL(selectionChanged(QList<KFileItem>)),
-            this, SLOT(slotSelectionChanged(QList<KFileItem>)));
+    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)),
+            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));
+    connect(view, SIGNAL(selectionChanged(KFileItemList)),
+            this, SLOT(slotSelectionChanged(KFileItemList)));

     connect(view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
     connect(view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));

+    connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
+            this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));

 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),
 
     const KUrlNavigator* navigator = container->urlNavigator();
     connect(navigator, SIGNAL(urlChanged(const KUrl&)),


@@ -1608,8 +1521,30 @@ void DolphinMainWindow::updateSplitAction()
     }
 }
 
     }
 }
 

+void DolphinMainWindow::toggleAdditionalInfo(const char* actionName,
+                                             KFileItemDelegate::Information info)
+{
+    clearStatusBar();
+
+    DolphinView* view = m_activeViewContainer->view();
+    KFileItemDelegate::InformationList list = view->additionalInfo();
+
+    const bool show = actionCollection()->action(actionName)->isChecked();
+
+    const int index = list.indexOf(info);
+    const bool containsInfo = (index >= 0);
+    if (show && !containsInfo) {
+        list.append(info);
+        view->setAdditionalInfo(list);
+    } else if (!show && containsInfo) {
+        list.removeAt(index);
+        view->setAdditionalInfo(list);
+        Q_ASSERT(list.indexOf(info) < 0);
+    }
+}
+

 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :
 DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) :

-    KonqUndoManager::UiInterface(mainWin),
+    KonqFileUndoManager::UiInterface(mainWin),

     m_mainWin(mainWin)
 {
     Q_ASSERT(m_mainWin != 0);
     m_mainWin(mainWin)
 {
     Q_ASSERT(m_mainWin != 0);