Use a QActionGroup and save 6 slots (and the duplication of the action names in the...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 4db66cd4bb4ce07921c93ba38a6f5f4b71c4401d..de57aa00d5573e3e8769fea7b53ce1ad1387ec5f 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -19,8 +19,6 @@
  ***************************************************************************/
 
 #include "dolphinview.h"
-#include <ktoggleaction.h>
-#include <kactioncollection.h>
 
 #include <QApplication>
 #include <QClipboard>
@@ -30,6 +28,7 @@
 #include <QTimer>
 #include <QScrollBar>
 
+#include <kactioncollection.h>
 #include <kcolorscheme.h>
 #include <kdirlister.h>
 #include <kfileitemdelegate.h>
@@ -43,6 +42,7 @@
 #include <kmimetyperesolver.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
+#include <ktoggleaction.h>
 #include <kurl.h>
 
 #include "dolphindropcontroller.h"
@@ -206,9 +206,6 @@ void DolphinView::setMode(Mode mode)
 
     deleteView();
 
-    // It is important to read the view properties _after_ deleting the view,
-    // as e. g. the detail view might adjust the additional information properties
-    // after getting closed:
     const KUrl viewPropsUrl = viewPropertiesUrl();
     ViewProperties props(viewPropsUrl);
     props.setViewMode(m_mode);
@@ -320,7 +317,13 @@ bool DolphinView::supportsCategorizedSorting() const
 
 void DolphinView::selectAll()
 {
-    itemView()->selectAll();
+    QAbstractItemView* view = itemView();
+    // TODO: there seems to be a bug in QAbstractItemView::selectAll(); if
+    // the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the
+    // selection instead of selecting all items. This is bypassed for KDE 4.0
+    // by invoking clearSelection() first.
+    view->clearSelection();
+    view->selectAll();
 }
 
 void DolphinView::invertSelection()
@@ -791,6 +794,14 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
+void DolphinView::toggleSortOrder()
+{
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);
+}
+
 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
     ViewProperties props(viewPropertiesUrl());
@@ -992,7 +1003,7 @@ KToggleAction* DolphinView::iconsModeAction(KActionCollection* 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"));
+    iconsView->setIcon(KIcon("view-list-icons"));
     iconsView->setData(QVariant::fromValue(IconsView));
     return iconsView;
 }
@@ -1002,7 +1013,7 @@ KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollectio
     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"));
+    detailsView->setIcon(KIcon("view-list-details"));
     detailsView->setData(QVariant::fromValue(DetailsView));
     return detailsView;
 }
@@ -1012,7 +1023,7 @@ KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollectio
     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"));
+    columnView->setIcon(KIcon("view-file-columns"));
     columnView->setData(QVariant::fromValue(ColumnView));
     return columnView;
 }
@@ -1203,8 +1214,8 @@ QPair<bool, QString> DolphinView::pasteInfo() const
     }
 
     if (ret.first) {
-        const KUrl::List urls = selectedUrls();
-        const uint count = urls.count();
+        const KFileItemList items = selectedItems();
+        const uint count = items.count();
         if (count > 1) {
             // pasting should not be allowed when more than one file
             // is selected
@@ -1212,13 +1223,7 @@ QPair<bool, QString> DolphinView::pasteInfo() const
         } 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);
-            ret.first = fileItem.isDir();
+            ret.first = items.first().isDir();
         }
     }
     return ret;
@@ -1250,4 +1255,58 @@ KAction* DolphinView::createDeleteAction(KActionCollection* collection)
     return deleteAction;
 }
 
+KAction* DolphinView::createNewDirAction(KActionCollection* collection)
+{
+    // This action doesn't appear in the GUI, it's for the shortcut only.
+    // KNewMenu takes care of the GUI stuff.
+    KAction* newDirAction = collection->addAction("create_dir");
+    newDirAction->setText(i18n("Create Folder..."));
+    newDirAction->setShortcut(Qt::Key_F10);
+    return newDirAction;
+}
+
+KAction* DolphinView::createSortDescendingAction(KActionCollection* collection)
+{
+    KToggleAction* sortDescending = collection->add<KToggleAction>("descending");
+    sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
+    return sortDescending;
+}
+
+QActionGroup* DolphinView::createAdditionalInformationActionGroup(KActionCollection* collection)
+{
+    QActionGroup* showInformationGroup = new QActionGroup(collection);
+
+    KToggleAction* showSizeInfo = collection->add<KToggleAction>("show_size_info");
+    showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
+    showSizeInfo->setData(KFileItemDelegate::Size);
+    showSizeInfo->setActionGroup(showInformationGroup);
+
+    KToggleAction* showDateInfo = collection->add<KToggleAction>("show_date_info");
+    showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
+    showDateInfo->setData(KFileItemDelegate::ModificationTime);
+    showDateInfo->setActionGroup(showInformationGroup);
+
+    KToggleAction* showPermissionsInfo = collection->add<KToggleAction>("show_permissions_info");
+    showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
+    showPermissionsInfo->setData(KFileItemDelegate::Permissions);
+    showPermissionsInfo->setActionGroup(showInformationGroup);
+
+    KToggleAction* showOwnerInfo = collection->add<KToggleAction>("show_owner_info");
+    showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
+    showOwnerInfo->setData(KFileItemDelegate::Owner);
+    showOwnerInfo->setActionGroup(showInformationGroup);
+
+    KToggleAction* showGroupInfo = collection->add<KToggleAction>("show_group_info");
+    showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
+    showGroupInfo->setData(KFileItemDelegate::OwnerAndGroup);
+    showGroupInfo->setActionGroup(showInformationGroup);
+
+    KToggleAction* showMimeInfo = collection->add<KToggleAction>("show_mime_info");
+    showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
+    showMimeInfo->setData(KFileItemDelegate::FriendlyMimeType);
+    showMimeInfo->setActionGroup(showInformationGroup);
+
+    return showInformationGroup;
+}
+
 #include "dolphinview.moc"