replace QList<KFileItem> by KFileItemList, as KFileItemList is not QList<KFileItem...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 42e80f9324353ee1a293dd5e6617916a2aaadd61..38408d7bf341b31441f09b3d42204cf4a2e304c5 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include "config-nepomuk.h"
+#include <config-nepomuk.h>

 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"


@@ -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();


@@ -176,20 +179,23 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'
         QAction* moveAction = popup.addAction(KIcon("goto-page"),
         QString seq = QKeySequence(Qt::ShiftModifier).toString();
         seq.chop(1); // chop superfluous '+'
         QAction* moveAction = popup.addAction(KIcon("goto-page"),

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

 
         seq = QKeySequence(Qt::ControlModifier).toString();
         seq.chop(1);
         QAction* copyAction = popup.addAction(KIcon("edit-copy"),
 
         seq = QKeySequence(Qt::ControlModifier).toString();
         seq.chop(1);
         QAction* copyAction = popup.addAction(KIcon("edit-copy"),

-                                              i18n("&Copy Here") + '\t' + seq);
+                                              i18nc("@action:inmenu",
+                                                    "&Copy Here\t<shortcut>%1</shortcut>", seq));

 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);
         QAction* linkAction = popup.addAction(KIcon("www"),
 
         seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
         seq.chop(1);
         QAction* linkAction = popup.addAction(KIcon("www"),

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

 
         popup.addSeparator();
 
         popup.addSeparator();

-        popup.addAction(KIcon("process-stop"), i18n("Cancel"));
+        popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel"));

 
         QAction* activatedAction = popup.exec(QCursor::pos());
         if (activatedAction == moveAction) {
 
         QAction* activatedAction = popup.exec(QCursor::pos());
         if (activatedAction == moveAction) {


@@ -261,11 +267,11 @@ void DolphinMainWindow::slotShowHiddenFilesChanged()
 
 void DolphinMainWindow::slotCategorizedSortingChanged()
 {
 
 void DolphinMainWindow::slotCategorizedSortingChanged()
 {

-    KToggleAction* categorizedSortingAction =
-        static_cast<KToggleAction*>(actionCollection()->action("categorized"));
+    KToggleAction* showInGroupsAction =
+        static_cast<KToggleAction*>(actionCollection()->action("show_in_groups"));

     const DolphinView* view = m_activeViewContainer->view();
     const DolphinView* view = m_activeViewContainer->view();

-    categorizedSortingAction->setChecked(view->categorizedSorting());
-    categorizedSortingAction->setEnabled(view->supportsCategorizedSorting());
+    showInGroupsAction->setChecked(view->categorizedSorting());
+    showInGroupsAction->setEnabled(view->supportsCategorizedSorting());

 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
 }
 
 void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)


@@ -273,25 +279,34 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
     QAction* action = 0;
     switch (sorting) {
     case DolphinView::SortByName:
     QAction* action = 0;
     switch (sorting) {
     case DolphinView::SortByName:

-        action = actionCollection()->action("by_name");
+        action = actionCollection()->action("sort_by_name");

         break;
     case DolphinView::SortBySize:
         break;
     case DolphinView::SortBySize:

-        action = actionCollection()->action("by_size");
+        action = actionCollection()->action("sort_by_size");

         break;
     case DolphinView::SortByDate:
         break;
     case DolphinView::SortByDate:

-        action = actionCollection()->action("by_date");
+        action = actionCollection()->action("sort_by_date");

         break;
     case DolphinView::SortByPermissions:
         break;
     case DolphinView::SortByPermissions:

-        action = actionCollection()->action("by_permissions");
+        action = actionCollection()->action("sort_by_permissions");

         break;
     case DolphinView::SortByOwner:
         break;
     case DolphinView::SortByOwner:

-        action = actionCollection()->action("by_owner");
+        action = actionCollection()->action("sort_by_owner");

         break;
     case DolphinView::SortByGroup:
         break;
     case DolphinView::SortByGroup:

-        action = actionCollection()->action("by_group");
+        action = actionCollection()->action("sort_by_group");

         break;
     case DolphinView::SortByType:
         break;
     case DolphinView::SortByType:

-        action = actionCollection()->action("by_type");
+        action = actionCollection()->action("sort_by_type");
+        break;
+#ifdef HAVE_NEPOMUK
+    case DolphinView::SortByRating:
+        action = actionCollection()->action("sort_by_rating");
+        break;
+    case DolphinView::SortByTags:
+        action = actionCollection()->action("sort_by_tags");
+        break;
+#endif

     default:
         break;
     }
     default:
         break;
     }


@@ -309,9 +324,11 @@ 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;
 {
     QAction* action = 0;

+    KFileItemDelegate::Information info = list.isEmpty() ? KFileItemDelegate::NoInformation : list.first();
+

     switch (info) {
     case KFileItemDelegate::FriendlyMimeType:
         action = actionCollection()->action("show_mime_info");
     switch (info) {
     case KFileItemDelegate::FriendlyMimeType:
         action = actionCollection()->action("show_mime_info");


@@ -357,9 +374,9 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
     emit selectionChanged(selection);
 }
 
     emit selectionChanged(selection);
 }
 

-void DolphinMainWindow::slotRequestItemInfo(const KUrl& url)
+void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)

 {
 {

-    emit requestItemInfo(url);
+    emit requestItemInfo(item);

 }
 
 void DolphinMainWindow::slotHistoryChanged()
 }
 
 void DolphinMainWindow::slotHistoryChanged()


@@ -381,11 +398,17 @@ void DolphinMainWindow::openNewMainWindow()
 
 void DolphinMainWindow::toggleActiveView()
 {
 
 void DolphinMainWindow::toggleActiveView()
 {

-    if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
-        setActiveViewContainer(m_viewContainer[SecondaryView]);
-    } else {
-        setActiveViewContainer(m_viewContainer[PrimaryView]);
+    if (m_viewContainer[SecondaryView] == 0) {
+        // only one view is available
+        return;

     }
     }

+
+    Q_ASSERT(m_activeViewContainer != 0);
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+
+    DolphinViewContainer* left  = m_viewContainer[PrimaryView];
+    DolphinViewContainer* right = m_viewContainer[SecondaryView];
+    setActiveViewContainer(m_activeViewContainer == right ? left : right);

 }
 
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 }
 
 void DolphinMainWindow::closeEvent(QCloseEvent* event)


@@ -473,6 +496,7 @@ void DolphinMainWindow::deleteItems()
 void DolphinMainWindow::properties()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
 void DolphinMainWindow::properties()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();

+

     KPropertiesDialog dialog(list, this);
     dialog.exec();
 }
     KPropertiesDialog dialog(list, this);
     dialog.exec();
 }


@@ -503,7 +527,7 @@ void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
 {
     if (job->error() == 0) {
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
 {
     if (job->error() == 0) {
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();

-        statusBar->setMessage(i18n("Delete operation completed."),
+        statusBar->setMessage(i18nc("@info:status", "Delete operation completed."),

                               DolphinStatusBar::OperationCompleted);
     }
 }
                               DolphinStatusBar::OperationCompleted);
     }
 }


@@ -520,28 +544,28 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {
         case KonqUndoManager::COPY:
         DolphinStatusBar* statusBar = m_activeViewContainer->statusBar();
         switch (command) {
         case KonqUndoManager::COPY:

-            statusBar->setMessage(i18n("Copy operation completed."),
+            statusBar->setMessage(i18nc("@info:status", "Copy operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::MOVE:
                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::MOVE:

-            statusBar->setMessage(i18n("Move operation completed."),
+            statusBar->setMessage(i18nc("@info:status", "Move operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::LINK:
                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::LINK:

-            statusBar->setMessage(i18n("Link operation completed."),
+            statusBar->setMessage(i18nc("@info:status", "Link operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::TRASH:
                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::TRASH:

-            statusBar->setMessage(i18n("Move to trash operation completed."),
+            statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::RENAME:
                                   DolphinStatusBar::OperationCompleted);
             break;
         case KonqUndoManager::RENAME:

-            statusBar->setMessage(i18n("Renaming operation completed."),
+            statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."),

                                   DolphinStatusBar::OperationCompleted);
             break;
 
         case KonqUndoManager::MKDIR:
                                   DolphinStatusBar::OperationCompleted);
             break;
 
         case KonqUndoManager::MKDIR:

-            statusBar->setMessage(i18n("Created folder."),
+            statusBar->setMessage(i18nc("@info:status", "Created folder."),

                                   DolphinStatusBar::OperationCompleted);
             break;
 
                                   DolphinStatusBar::OperationCompleted);
             break;
 


@@ -626,7 +650,7 @@ void DolphinMainWindow::updatePasteAction()
         return;
     }
 
         return;
     }
 

-    QString text(i18n("Paste"));
+    QString text(i18nc("@action:inmenu", "Paste"));

     QClipboard* clipboard = QApplication::clipboard();
     const QMimeData* mimeData = clipboard->mimeData();
 
     QClipboard* clipboard = QApplication::clipboard();
     const QMimeData* mimeData = clipboard->mimeData();
 


@@ -634,10 +658,10 @@ void DolphinMainWindow::updatePasteAction()
     if (!urls.isEmpty()) {
         pasteAction->setEnabled(true);
 
     if (!urls.isEmpty()) {
         pasteAction->setEnabled(true);
 

-        pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count()));
+        pasteAction->setText(i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count()));

     } else {
         pasteAction->setEnabled(false);
     } else {
         pasteAction->setEnabled(false);

-        pasteAction->setText(i18n("Paste"));
+        pasteAction->setText(i18nc("@action:inmenu", "Paste"));

     }
 
     if (pasteAction->isEnabled()) {
     }
 
     if (pasteAction->isEnabled()) {


@@ -722,6 +746,20 @@ void DolphinMainWindow::sortByType()
     m_activeViewContainer->view()->setSorting(DolphinView::SortByType);
 }
 
     m_activeViewContainer->view()->setSorting(DolphinView::SortByType);
 }
 

+void DolphinMainWindow::sortByRating()
+{
+#ifdef HAVE_NEPOMUK
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByRating);
+#endif
+}
+
+void DolphinMainWindow::sortByTags()
+{
+#ifdef HAVE_NEPOMUK
+    m_activeViewContainer->view()->setSorting(DolphinView::SortByTags);
+#endif
+}
+

 void DolphinMainWindow::toggleSortOrder()
 {
     DolphinView* view = m_activeViewContainer->view();
 void DolphinMainWindow::toggleSortOrder()
 {
     DolphinView* view = m_activeViewContainer->view();


@@ -764,25 +802,31 @@ void DolphinMainWindow::showDateInfo()
 void DolphinMainWindow::toggleSplitView()
 {
     if (m_viewContainer[SecondaryView] == 0) {
 void DolphinMainWindow::toggleSplitView()
 {
     if (m_viewContainer[SecondaryView] == 0) {

-        const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;

         // create a secondary view
         // create a secondary view

+        const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;
+

         const DolphinView* view = m_viewContainer[PrimaryView]->view();
         const DolphinView* view = m_viewContainer[PrimaryView]->view();

-        m_viewContainer[SecondaryView] = new DolphinViewContainer(this,
-                                                                 0,
-                                                                 view->rootUrl(),
-                                                                 view->mode(),
-                                                                 view->showHiddenFiles());
+        m_viewContainer[SecondaryView] = new DolphinViewContainer(this, 0, view->rootUrl());

         connectViewSignals(SecondaryView);
         m_splitter->addWidget(m_viewContainer[SecondaryView]);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         m_viewContainer[SecondaryView]->view()->reload();
         m_viewContainer[SecondaryView]->setActive(false);
         m_viewContainer[SecondaryView]->show();
         connectViewSignals(SecondaryView);
         m_splitter->addWidget(m_viewContainer[SecondaryView]);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         m_viewContainer[SecondaryView]->view()->reload();
         m_viewContainer[SecondaryView]->setActive(false);
         m_viewContainer[SecondaryView]->show();

-    } else {
+    } else if (m_activeViewContainer == m_viewContainer[PrimaryView]) {

         // remove secondary view
         m_viewContainer[SecondaryView]->close();
         m_viewContainer[SecondaryView]->deleteLater();
         m_viewContainer[SecondaryView] = 0;
         // remove secondary view
         m_viewContainer[SecondaryView]->close();
         m_viewContainer[SecondaryView]->deleteLater();
         m_viewContainer[SecondaryView] = 0;

+    } else {
+        // The secondary view is active, hence from a users point of view
+        // the content of the secondary view should be moved to the primary view.
+        // From an implementation point of view it is more efficient to close
+        // the primary view and exchange the internal pointers afterwards.
+        m_viewContainer[PrimaryView]->close();
+        m_viewContainer[PrimaryView]->deleteLater();
+        m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
+        m_viewContainer[SecondaryView] = 0;

     }
 
     setActiveViewContainer(m_viewContainer[PrimaryView]);
     }
 
     setActiveViewContainer(m_viewContainer[PrimaryView]);


@@ -975,10 +1019,8 @@ void DolphinMainWindow::init()
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
     m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
     m_viewContainer[PrimaryView] = new DolphinViewContainer(this,

-                                                           m_splitter,
-                                                           homeUrl,
-                                                           props.viewMode(),
-                                                           props.showHiddenFiles());
+                                                            m_splitter,
+                                                            homeUrl);

 
     m_activeViewContainer = m_viewContainer[PrimaryView];
     connectViewSignals(PrimaryView);
 
     m_activeViewContainer = m_viewContainer[PrimaryView];
     connectViewSignals(PrimaryView);


@@ -1000,29 +1042,30 @@ void DolphinMainWindow::init()
     updatePasteAction();
     updateGoActions();
 
     updatePasteAction();
     updateGoActions();
 

-    loadSettings();
+    if (generalSettings->splitView()) {
+        toggleSplitView();
+    }
+    updateViewActions();

 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }
 #ifdef HAVE_NEPOMUK
 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }
 #ifdef HAVE_NEPOMUK

-    if (!MetaDataWidget::metaDataAvailable())
-        activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
+    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);
 }
 
 #endif
 
     emit urlChanged(homeUrl);
 }
 

-void DolphinMainWindow::loadSettings()
-{
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    updateSplitAction(settings->splitView());
-    updateViewActions();
-}
-

 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
 {
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
 {

+    Q_ASSERT(view != 0);

     Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
     if (m_activeViewContainer == view) {
         return;
     Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
     if (m_activeViewContainer == view) {
         return;


@@ -1049,36 +1092,36 @@ void DolphinMainWindow::setupActions()
     // setup 'File' menu
     m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();
     // setup 'File' menu
     m_newMenu = new DolphinNewMenu(this);
     KMenu* menu = m_newMenu->menu();

-    menu->setTitle(i18n("Create New"));
+    menu->setTitle(i18nc("@title:menu", "Create New"));

     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 
     QAction* newWindow = actionCollection()->addAction("new_window");
     newWindow->setIcon(KIcon("window-new"));
     menu->setIcon(KIcon("document-new"));
     connect(menu, SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 
     QAction* newWindow = actionCollection()->addAction("new_window");
     newWindow->setIcon(KIcon("window-new"));

-    newWindow->setText(i18n("New &Window"));
+    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");
     newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
     connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
 
     QAction* rename = actionCollection()->addAction("rename");

-    rename->setText(i18n("Rename..."));
+    rename->setText(i18nc("@action:inmenu File", "Rename..."));

     rename->setShortcut(Qt::Key_F2);
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 
     QAction* moveToTrash = actionCollection()->addAction("move_to_trash");
     rename->setShortcut(Qt::Key_F2);
     connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
 
     QAction* moveToTrash = actionCollection()->addAction("move_to_trash");

-    moveToTrash->setText(i18n("Move to Trash"));
+    moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));

     moveToTrash->setIcon(KIcon("edit-trash"));
     moveToTrash->setShortcut(QKeySequence::Delete);
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 
     QAction* deleteAction = actionCollection()->addAction("delete");
     moveToTrash->setIcon(KIcon("edit-trash"));
     moveToTrash->setShortcut(QKeySequence::Delete);
     connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
 
     QAction* deleteAction = actionCollection()->addAction("delete");

-    deleteAction->setText(i18n("Delete"));
+    deleteAction->setText(i18nc("@action:inmenu File", "Delete"));

     deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
     deleteAction->setIcon(KIcon("edit-delete"));
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 
     QAction* properties = actionCollection()->addAction("properties");
     deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
     deleteAction->setIcon(KIcon("edit-delete"));
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
 
     QAction* properties = actionCollection()->addAction("properties");

-    properties->setText(i18n("Properties"));
+    properties->setText(i18nc("@action:inmenu File", "Properties"));

     properties->setShortcut(Qt::ALT | Qt::Key_Return);
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
 
     properties->setShortcut(Qt::ALT | Qt::Key_Return);
     connect(properties, SIGNAL(triggered()), this, SLOT(properties()));
 


@@ -1094,12 +1137,12 @@ void DolphinMainWindow::setupActions()
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
 
     QAction* selectAll = actionCollection()->addAction("select_all");
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
 
     QAction* selectAll = actionCollection()->addAction("select_all");

-    selectAll->setText(i18n("Select All"));
+    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");
     selectAll->setShortcut(Qt::CTRL + Qt::Key_A);
     connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
 
     QAction* invertSelection = actionCollection()->addAction("invert_selection");

-    invertSelection->setText(i18n("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->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
     connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
 


@@ -1113,19 +1156,19 @@ void DolphinMainWindow::setupActions()
                              actionCollection());
 
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
                              actionCollection());
 
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");

-    iconsView->setText(i18n("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");
     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(i18n("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");
     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(i18n("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()));
     columnView->setShortcut(Qt::CTRL | Qt::Key_3);
     columnView->setIcon(KIcon("fileview-column"));
     connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));


@@ -1135,34 +1178,54 @@ void DolphinMainWindow::setupActions()
     viewModeGroup->addAction(detailsView);
     viewModeGroup->addAction(columnView);
 
     viewModeGroup->addAction(detailsView);
     viewModeGroup->addAction(columnView);
 

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

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

-    KToggleAction* sortBySize = actionCollection()->add<KToggleAction>("by_size");
-    sortBySize->setText(i18n("By Size"));
+    KToggleAction* sortBySize = actionCollection()->add<KToggleAction>("sort_by_size");
+    sortBySize->setText(i18nc("@action:inmenu Sort By", "Size"));

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

-    KToggleAction* sortByDate = actionCollection()->add<KToggleAction>("by_date");
-    sortByDate->setText(i18n("By Date"));
+    KToggleAction* sortByDate = actionCollection()->add<KToggleAction>("sort_by_date");
+    sortByDate->setText(i18nc("@action:inmenu Sort By", "Date"));

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

-    KToggleAction* sortByPermissions = actionCollection()->add<KToggleAction>("by_permissions");
-    sortByPermissions->setText(i18n("By Permissions"));
+    KToggleAction* sortByPermissions = actionCollection()->add<KToggleAction>("sort_by_permissions");
+    sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions"));

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

-    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("by_owner");
-    sortByOwner->setText(i18n("By Owner"));
+    KToggleAction* sortByOwner = actionCollection()->add<KToggleAction>("sort_by_owner");
+    sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner"));

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

-    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("by_group");
-    sortByGroup->setText(i18n("By Group"));
+    KToggleAction* sortByGroup = actionCollection()->add<KToggleAction>("sort_by_group");
+    sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group"));

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

-    KToggleAction* sortByType = actionCollection()->add<KToggleAction>("by_type");
-    sortByType->setText(i18n("By Type"));
+    KToggleAction* sortByType = actionCollection()->add<KToggleAction>("sort_by_type");
+    sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));

     connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
 
     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"));
+
+#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);
+    }
+#else
+    sortByRating->setEnabled(false);
+    sortByTags->setEnabled(false);
+#endif
+

     QActionGroup* sortGroup = new QActionGroup(this);
     sortGroup->addAction(sortByName);
     sortGroup->addAction(sortBySize);
     QActionGroup* sortGroup = new QActionGroup(this);
     sortGroup->addAction(sortByName);
     sortGroup->addAction(sortBySize);


@@ -1171,29 +1234,31 @@ 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);

 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");

-    sortDescending->setText(i18n("Descending"));
+    sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));

     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 

-    KToggleAction* sortCategorized = actionCollection()->add<KToggleAction>("categorized");
-    sortCategorized->setText(i18n("Show in Groups"));
-    connect(sortCategorized, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
+    KToggleAction* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");
+    showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
+    connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));

 
     KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");
 
     KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");

-    clearInfo->setText(i18n("No Information"));
+    clearInfo->setText(i18nc("@action:inmenu Additional information", "No Information"));

     connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo()));
 
     KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
     connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo()));
 
     KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");

-    showMimeInfo->setText(i18n("Type"));
+    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));

     connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo()));
 
     KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
     connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo()));
 
     KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");

-    showSizeInfo->setText(i18n("Size"));
+    showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));

     connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo()));
 
     KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
     connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo()));
 
     KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");

-    showDateInfo->setText(i18n("Date"));
+    showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));

     connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo()));
 
     QActionGroup* infoGroup = new QActionGroup(this);
     connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo()));
 
     QActionGroup* infoGroup = new QActionGroup(this);


@@ -1203,28 +1268,28 @@ void DolphinMainWindow::setupActions()
     infoGroup->addAction(showDateInfo);
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
     infoGroup->addAction(showDateInfo);
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");

-    showPreview->setText(i18n("Preview"));
+    showPreview->setText(i18nc("@action:intoolbar", "Preview"));

     showPreview->setIcon(KIcon("fileview-preview"));
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
     showPreview->setIcon(KIcon("fileview-preview"));
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");

-    showHiddenFiles->setText(i18n("Show Hidden Files"));
+    showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));

     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     QAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F10);
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     QAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F10);

-    updateSplitAction(false);
+    updateSplitAction();

     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");

-    reload->setText(i18n("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()));
 
     QAction* stop = actionCollection()->addAction("stop");
     reload->setShortcut(Qt::Key_F5);
     reload->setIcon(KIcon("view-refresh"));
     connect(reload, SIGNAL(triggered()), this, SLOT(reloadView()));
 
     QAction* stop = actionCollection()->addAction("stop");

-    stop->setText(i18n("Stop"));
+    stop->setText(i18nc("@action:inmenu View", "Stop"));

     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 
     stop->setIcon(KIcon("process-stop"));
     connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
 


@@ -1232,39 +1297,43 @@ void DolphinMainWindow::setupActions()
     // changed, so that the corresponding showFullLocation action is updated. Also
     // the naming "Show full Location" is currently confusing...
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
     // changed, so that the corresponding showFullLocation action is updated. Also
     // the naming "Show full Location" is currently confusing...
     KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");

-    showFullLocation->setText(i18n("Show Full Location"));
+    showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));

     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
     QAction* editLocation = actionCollection()->addAction("edit_location");
     showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
     connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation()));
 
     QAction* editLocation = actionCollection()->addAction("edit_location");

-    editLocation->setText(i18n("Edit Location"));
+    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");
     editLocation->setShortcut(Qt::Key_F6);
     connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation()));
 
     QAction* adjustViewProps = actionCollection()->addAction("view_properties");

-    adjustViewProps->setText(i18n("Adjust View Properties..."));
+    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));

     connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties()));
 
     // setup 'Go' menu
     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());
 
     // setup 'Tools' menu
     QAction* findFile = actionCollection()->addAction("find_file");
     KStandardAction::forward(this, SLOT(goForward()), actionCollection());
     KStandardAction::up(this, SLOT(goUp()), actionCollection());
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     QAction* findFile = actionCollection()->addAction("find_file");

-    findFile->setText(i18n("Find File..."));
+    findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));

     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("file-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("file-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
     KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");

-    showFilterBar->setText(i18n("Show Filter Bar"));
+    showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));

     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
 
     QAction* compareFiles = actionCollection()->addAction("compare_files");
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
     connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility()));
 
     QAction* compareFiles = actionCollection()->addAction("compare_files");

-    compareFiles->setText(i18n("Compare Files"));
+    compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));

     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
     compareFiles->setIcon(KIcon("kompare"));
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));


@@ -1276,13 +1345,14 @@ void DolphinMainWindow::setupActions()
 void DolphinMainWindow::setupDockWidgets()
 {
     // setup "Information"
 void DolphinMainWindow::setupDockWidgets()
 {
     // setup "Information"

-    QDockWidget* infoDock = new QDockWidget(i18n("Information"));
+    QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information"));

     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
     infoDock->setWidget(infoWidget);
 
     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
     infoDock->setWidget(infoWidget);
 

-    infoDock->toggleViewAction()->setText(i18n("Information"));
+    infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information"));
+    infoDock->toggleViewAction()->setShortcut(Qt::Key_F11);

     actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
     actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);


@@ -1290,17 +1360,18 @@ void DolphinMainWindow::setupDockWidgets()
             infoWidget, SLOT(setUrl(KUrl)));
     connect(this, SIGNAL(selectionChanged(KFileItemList)),
             infoWidget, SLOT(setSelection(KFileItemList)));
             infoWidget, SLOT(setUrl(KUrl)));
     connect(this, SIGNAL(selectionChanged(KFileItemList)),
             infoWidget, SLOT(setSelection(KFileItemList)));

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

 
     // setup "Tree View"
 
     // setup "Tree View"

-    QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
+    QDockWidget* treeViewDock = new QDockWidget(i18nc("@title:window", "Folders"));

     treeViewDock->setObjectName("treeViewDock");
     treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
     treeViewDock->setWidget(treeWidget);
 
     treeViewDock->setObjectName("treeViewDock");
     treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
     treeViewDock->setWidget(treeWidget);
 

-    treeViewDock->toggleViewAction()->setText(i18n("Folders"));
+    treeViewDock->toggleViewAction()->setText(i18nc("@title:window", "Folders"));
+    treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7);

     actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);
     actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, treeViewDock);


@@ -1314,16 +1385,17 @@ void DolphinMainWindow::setupDockWidgets()
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"
             this, SLOT(dropUrls(KUrl::List, KUrl)));
 
     // setup "Terminal"

-    QDockWidget* terminalDock = new QDockWidget(i18n("Terminal"));
+    QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal"));

     terminalDock->setObjectName("terminalDock");
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 
     terminalDock->setObjectName("terminalDock");
     terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
     SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
     terminalDock->setWidget(terminalWidget);
 

-    terminalDock->toggleViewAction()->setText(i18n("Terminal"));
+    terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
+    terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);

     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
 
     actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
 

-    addDockWidget(Qt::RightDockWidgetArea, terminalDock);
+    addDockWidget(Qt::BottomDockWidgetArea, terminalDock);

     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
 
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
 


@@ -1334,14 +1406,15 @@ void DolphinMainWindow::setupDockWidgets()
         terminalDock->hide();
     }
 
         terminalDock->hide();
     }
 

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

     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     KFilePlacesView *listView = new KFilePlacesView(placesDock);
     placesDock->setWidget(listView);
     listView->setModel(DolphinSettings::instance().placesModel());
 
     placesDock->setObjectName("placesDock");
     placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     KFilePlacesView *listView = new KFilePlacesView(placesDock);
     placesDock->setWidget(listView);
     listView->setModel(DolphinSettings::instance().placesModel());
 

-    placesDock->toggleViewAction()->setText(i18n("Show Places Panel"));
+    placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places"));
+    placesDock->toggleViewAction()->setShortcut(Qt::Key_F9);

     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
 
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);


@@ -1385,8 +1458,7 @@ void DolphinMainWindow::updateEditActions()
         KFileItemList::const_iterator it = list.begin();
         const KFileItemList::const_iterator end = list.end();
         while (it != end) {
         KFileItemList::const_iterator it = list.begin();
         const KFileItemList::const_iterator end = list.end();
         while (it != end) {

-            KFileItem* item = *it;
-            const KUrl& url = item->url();
+            const KUrl& url = (*it).url();

             // only enable the 'Move to Trash' action for local files
             if (!url.isLocalFile()) {
                 enableMoveToTrash = false;
             // only enable the 'Move to Trash' action for local files
             if (!url.isLocalFile()) {
                 enableMoveToTrash = false;


@@ -1450,7 +1522,7 @@ void DolphinMainWindow::updateViewActions()
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     showHiddenFilesAction->setChecked(view->showHiddenFiles());
 
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     showHiddenFilesAction->setChecked(view->showHiddenFiles());
 

-    updateSplitAction(m_viewContainer[SecondaryView] != 0);
+    updateSplitAction();

 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));


@@ -1507,12 +1579,12 @@ 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(additionalInfoChanged(KFileItemDelegate::InformationList)),
+            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));

     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));

-    connect(view, SIGNAL(requestItemInfo(KUrl)),
-            this, SLOT(slotRequestItemInfo(KUrl)));
+    connect(view, SIGNAL(requestItemInfo(KFileItem)),
+            this, SLOT(slotRequestItemInfo(KFileItem)));

     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
 
     connect(view, SIGNAL(activated()),
             this, SLOT(toggleActiveView()));
 


@@ -1523,14 +1595,19 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             this, SLOT(slotHistoryChanged()));
 }
 
             this, SLOT(slotHistoryChanged()));
 }
 

-void DolphinMainWindow::updateSplitAction(bool isSplit)
+void DolphinMainWindow::updateSplitAction()

 {
     QAction* splitAction = actionCollection()->action("split_view");
 {
     QAction* splitAction = actionCollection()->action("split_view");

-    if (isSplit) {
-        splitAction->setText(i18n("Join"));
-        splitAction->setIcon(KIcon("fileview-join"));
+    if (m_viewContainer[SecondaryView] != 0) {
+        if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+            splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
+            splitAction->setIcon(KIcon("fileview-close-right"));
+        } else {
+            splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
+            splitAction->setIcon(KIcon("fileview-close-left"));
+        }

     } else {
     } else {

-        splitAction->setText(i18n("Split"));
+        splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));

         splitAction->setIcon(KIcon("fileview-split"));
     }
 }
         splitAction->setIcon(KIcon("fileview-split"));
     }
 }