X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ab39a5952001cdb3d1b9ca693da7f8e246558fb8..d64bbc333c5014fad116efc98b77cf3268fc07e0:/src/dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index cc89725c2..ab28dca26 100644
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -26,12 +26,13 @@
 
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <kactionmenu.h>
+#include <kselectaction.h>
 #include <klocale.h>
 #include <knewmenu.h>
 #include <ktoggleaction.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
-#include <knewstuff2/engine.h>
 
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
@@ -80,7 +81,7 @@ DolphinView* DolphinViewActionHandler::currentView()
 void DolphinViewActionHandler::createActions()
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
-    // KNewMenu takes care of the GUI stuff.
+    // KNewFileMenu takes care of the GUI stuff.
     KAction* newDirAction = m_actionCollection->addAction("create_dir");
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);
@@ -127,11 +128,16 @@ void DolphinViewActionHandler::createActions()
     connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
 
     // View menu
-
-    QActionGroup* viewModeActions = new QActionGroup(this);
-    viewModeActions->addAction(iconsModeAction());
-    viewModeActions->addAction(detailsModeAction());
-    viewModeActions->addAction(columnsModeAction());
+    KToggleAction* iconsAction = iconsModeAction();
+    KToggleAction* detailsAction = detailsModeAction();
+    KToggleAction* columnsAction = columnsModeAction();
+
+    KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>("view_mode");
+    viewModeActions->setText(i18nc("@action:intoolbar", "View Mode"));
+    viewModeActions->addAction(iconsAction);
+    viewModeActions->addAction(detailsAction);
+    viewModeActions->addAction(columnsAction);
+    viewModeActions->setToolBarMode(KSelectAction::MenuMode);
     connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
 
     KStandardAction::zoomIn(this,
@@ -156,11 +162,31 @@ void DolphinViewActionHandler::createActions()
     sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First"));
     connect(sortFoldersFirst, SIGNAL(triggered()), this, SLOT(toggleSortFoldersFirst()));
 
+    // View -> Sort By
     QActionGroup* sortByActionGroup = createSortByActionGroup();
     connect(sortByActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotSortTriggered(QAction*)));
 
-    QActionGroup* showInformationActionGroup = createAdditionalInformationActionGroup();
-    connect(showInformationActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(toggleAdditionalInfo(QAction*)));
+    KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>("sort");
+    sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
+    sortByActionMenu->setDelayed(false);
+
+    foreach (QAction* action, sortByActionGroup->actions()) {
+        sortByActionMenu->addAction(action);
+    }
+    sortByActionMenu->addSeparator();
+    sortByActionMenu->addAction(sortDescending);
+    sortByActionMenu->addAction(sortFoldersFirst);
+
+    // View -> Additional Information
+    QActionGroup* additionalInfoGroup = createAdditionalInformationActionGroup();
+    connect(additionalInfoGroup, SIGNAL(triggered(QAction*)), this, SLOT(toggleAdditionalInfo(QAction*)));
+
+    KActionMenu* additionalInfoMenu = m_actionCollection->add<KActionMenu>("additional_info");
+    additionalInfoMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
+    additionalInfoMenu->setDelayed(false);
+    foreach (QAction* action, additionalInfoGroup->actions()) {
+        additionalInfoMenu->addAction(action);
+    }
 
     KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>("show_in_groups");
     showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
@@ -182,51 +208,53 @@ void DolphinViewActionHandler::createActions()
     findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("edit-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));
-	
-    // Settings menu
-
-    KAction* getServiceMenu = m_actionCollection->addAction("get_servicemenu");
-    getServiceMenu->setText(i18nc("@action:inmenu Settings", "Get Service Menu..."));
-    getServiceMenu->setIcon(KIcon("get-hot-new-stuff"));
-    connect(getServiceMenu, SIGNAL(triggered()), this, SLOT(slotGetServiceMenu()));
 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
 {
-    QActionGroup* showInformationGroup = new QActionGroup(m_actionCollection);
-    showInformationGroup->setExclusive(false);
+    QActionGroup* additionalInfoGroup = new QActionGroup(m_actionCollection);
+    additionalInfoGroup->setExclusive(false);
+
+    KActionMenu* showInformationMenu = m_actionCollection->add<KActionMenu>("additional_info");
+    showInformationMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
+    showInformationMenu->setDelayed(false);
 
     KToggleAction* showSizeInfo = m_actionCollection->add<KToggleAction>("show_size_info");
     showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
     showSizeInfo->setData(KFileItemDelegate::Size);
-    showSizeInfo->setActionGroup(showInformationGroup);
+    showSizeInfo->setActionGroup(additionalInfoGroup);
 
     KToggleAction* showDateInfo = m_actionCollection->add<KToggleAction>("show_date_info");
     showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
     showDateInfo->setData(KFileItemDelegate::ModificationTime);
-    showDateInfo->setActionGroup(showInformationGroup);
+    showDateInfo->setActionGroup(additionalInfoGroup);
 
     KToggleAction* showPermissionsInfo = m_actionCollection->add<KToggleAction>("show_permissions_info");
     showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
     showPermissionsInfo->setData(KFileItemDelegate::Permissions);
-    showPermissionsInfo->setActionGroup(showInformationGroup);
+    showPermissionsInfo->setActionGroup(additionalInfoGroup);
 
     KToggleAction* showOwnerInfo = m_actionCollection->add<KToggleAction>("show_owner_info");
     showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
     showOwnerInfo->setData(KFileItemDelegate::Owner);
-    showOwnerInfo->setActionGroup(showInformationGroup);
+    showOwnerInfo->setActionGroup(additionalInfoGroup);
 
     KToggleAction* showGroupInfo = m_actionCollection->add<KToggleAction>("show_group_info");
     showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
     showGroupInfo->setData(KFileItemDelegate::OwnerAndGroup);
-    showGroupInfo->setActionGroup(showInformationGroup);
+    showGroupInfo->setActionGroup(additionalInfoGroup);
 
     KToggleAction* showMimeInfo = m_actionCollection->add<KToggleAction>("show_mime_info");
     showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
     showMimeInfo->setData(KFileItemDelegate::FriendlyMimeType);
-    showMimeInfo->setActionGroup(showInformationGroup);
+    showMimeInfo->setActionGroup(additionalInfoGroup);
 
-    return showInformationGroup;
+    KToggleAction* showPathOrUrlInfo = m_actionCollection->add<KToggleAction>("show_path_or_url_info");
+    showPathOrUrlInfo->setText(i18nc("@action:inmenu Additional information", "Path"));
+    showPathOrUrlInfo->setData(KFileItemDelegate::LocalPathOrUrl);
+    showPathOrUrlInfo->setActionGroup(additionalInfoGroup);
+
+    return additionalInfoGroup;
 }
 
 Q_DECLARE_METATYPE(DolphinView::Sorting)
@@ -278,6 +306,9 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action)
 {
     const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
     m_currentView->setMode(mode);
+
+    QAction* viewModeMenu = m_actionCollection->action("view_mode");
+    viewModeMenu->setIcon(KIcon(action->icon()));
 }
 
 void DolphinViewActionHandler::slotRename()
@@ -340,6 +371,9 @@ void DolphinViewActionHandler::updateViewActions()
     QAction* viewModeAction = m_actionCollection->action(currentViewModeActionName());
     if (viewModeAction != 0) {
         viewModeAction->setChecked(true);
+
+        QAction* viewModeMenu = m_actionCollection->action("view_mode");
+        viewModeMenu->setIcon(KIcon(viewModeAction->icon()));
     }
 
     QAction* showPreviewAction = m_actionCollection->action("show_preview");
@@ -354,7 +388,6 @@ void DolphinViewActionHandler::updateViewActions()
 
     QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files");
     showHiddenFilesAction->setChecked(m_currentView->showHiddenFiles());
-
 }
 
 void DolphinViewActionHandler::zoomIn()
@@ -493,6 +526,9 @@ void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting)
 
     if (action != 0) {
         action->setChecked(true);
+
+        QAction* sortByMenu =  m_actionCollection->action("sort");
+        sortByMenu->setIcon(KIcon(action->icon()));
     }
 }