From: Peter Penz Date: Mon, 3 May 2010 15:40:24 +0000 (+0000) Subject: Allow to add menu groups like "View Mode", "Sort By"... to be added as toolbar item... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/23f31b60b0c5b054886ed4812eb0a833803eef6d Allow to add menu groups like "View Mode", "Sort By"... to be added as toolbar item (see http://reviewboard.kde.org/r/3862). Thanks to Todd for the patch! CCMAIL: toddrme2178@gmail.com svn path=/trunk/KDE/kdebase/apps/; revision=1122320 --- diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index eaa8ebb8a..3d9b92f52 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -52,6 +52,7 @@ #include #include +#include #include #include #include @@ -1638,6 +1639,14 @@ void DolphinMainWindow::setupDockWidgets() this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); connect(this, SIGNAL(urlChanged(KUrl)), placesPanel, SLOT(setUrl(KUrl))); + + KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu File", "Panels"), this); + actionCollection()->addAction("panels", panelsMenu); + panelsMenu->setDelayed(false); + panelsMenu->addAction(placesAction); + panelsMenu->addAction(infoAction); + panelsMenu->addAction(foldersAction); + panelsMenu->addAction(terminalAction); } void DolphinMainWindow::updateEditActions() diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc index 7340c4dc1..1ff1e040f 100644 --- a/src/dolphinpart.rc +++ b/src/dolphinpart.rc @@ -21,30 +21,8 @@ &View - - Sort By - - - - - - - - - - - - - - - Additional Information - - - - - - - + + diff --git a/src/dolphinui.rc b/src/dolphinui.rc index 61b7df615..3ec650daa 100644 --- a/src/dolphinui.rc +++ b/src/dolphinui.rc @@ -18,36 +18,9 @@ - - View Mode - - - - - - Sort By - - - - - - - - - - - - - - - Additional Information - - - - - - - + + + @@ -56,13 +29,7 @@ - - Panels - - - - - + Location Bar diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp index 9082e0dd0..8c07148d7 100644 --- a/src/dolphinviewactionhandler.cpp +++ b/src/dolphinviewactionhandler.cpp @@ -26,6 +26,8 @@ #include #include +#include +#include #include #include #include @@ -126,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("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, @@ -158,8 +165,19 @@ void DolphinViewActionHandler::createActions() 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* sortActionMenu = m_actionCollection->add("sort"); + sortActionMenu->setText(i18nc("@action:inmenu View", "Sort By")); + sortActionMenu->setDelayed(false); + + foreach(QAction* actionItem, sortByActionGroup->actions()) { + sortActionMenu->addAction(actionItem); + } + sortActionMenu->addSeparator(); + sortActionMenu->addAction(sortDescending); + sortActionMenu->addAction(sortFoldersFirst); + + KActionMenu* showInformationActionMenu = createAdditionalInformationActionMenu(); + connect(showInformationActionMenu, SIGNAL(triggered(QAction*)), this, SLOT(toggleAdditionalInfo(QAction*))); KToggleAction* showInGroups = m_actionCollection->add("show_in_groups"); showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); @@ -183,42 +201,43 @@ void DolphinViewActionHandler::createActions() connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile())); } -QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup() +KActionMenu* DolphinViewActionHandler::createAdditionalInformationActionMenu() { - QActionGroup* showInformationGroup = new QActionGroup(m_actionCollection); - showInformationGroup->setExclusive(false); + KActionMenu* showInformationMenu = m_actionCollection->add("additional_info"); + showInformationMenu->setText(i18nc("@action:inmenu View", "Additional Information")); + showInformationMenu->setDelayed(false); KToggleAction* showSizeInfo = m_actionCollection->add("show_size_info"); showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size")); showSizeInfo->setData(KFileItemDelegate::Size); - showSizeInfo->setActionGroup(showInformationGroup); + showInformationMenu->addAction(showSizeInfo); KToggleAction* showDateInfo = m_actionCollection->add("show_date_info"); showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date")); showDateInfo->setData(KFileItemDelegate::ModificationTime); - showDateInfo->setActionGroup(showInformationGroup); + showInformationMenu->addAction(showDateInfo); KToggleAction* showPermissionsInfo = m_actionCollection->add("show_permissions_info"); showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions")); showPermissionsInfo->setData(KFileItemDelegate::Permissions); - showPermissionsInfo->setActionGroup(showInformationGroup); + showInformationMenu->addAction(showPermissionsInfo); KToggleAction* showOwnerInfo = m_actionCollection->add("show_owner_info"); showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner")); showOwnerInfo->setData(KFileItemDelegate::Owner); - showOwnerInfo->setActionGroup(showInformationGroup); + showInformationMenu->addAction(showOwnerInfo); KToggleAction* showGroupInfo = m_actionCollection->add("show_group_info"); showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group")); showGroupInfo->setData(KFileItemDelegate::OwnerAndGroup); - showGroupInfo->setActionGroup(showInformationGroup); + showInformationMenu->addAction(showGroupInfo); KToggleAction* showMimeInfo = m_actionCollection->add("show_mime_info"); showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); - showMimeInfo->setData(KFileItemDelegate::FriendlyMimeType); - showMimeInfo->setActionGroup(showInformationGroup); + showMimeInfo->setData(KFileItemDelegate::FriendlyMimeType);; + showInformationMenu->addAction(showMimeInfo); - return showInformationGroup; + return showInformationMenu; } Q_DECLARE_METATYPE(DolphinView::Sorting) @@ -270,6 +289,9 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) { const DolphinView::Mode mode = action->data().value(); m_currentView->setMode(mode); + + QAction* viewModeMenu = m_actionCollection->action("view_mode"); + viewModeMenu->setIcon(KIcon(action->icon())); } void DolphinViewActionHandler::slotRename() @@ -332,6 +354,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"); @@ -346,7 +371,6 @@ void DolphinViewActionHandler::updateViewActions() QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); showHiddenFilesAction->setChecked(m_currentView->showHiddenFiles()); - } void DolphinViewActionHandler::zoomIn() @@ -485,6 +509,9 @@ void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting) if (action != 0) { action->setChecked(true); + + QAction* sortByMenu = m_actionCollection->action("sort"); + sortByMenu->setIcon(KIcon(action->icon())); } } diff --git a/src/dolphinviewactionhandler.h b/src/dolphinviewactionhandler.h index 5193da719..4186a479f 100644 --- a/src/dolphinviewactionhandler.h +++ b/src/dolphinviewactionhandler.h @@ -23,7 +23,10 @@ #include "dolphinview.h" #include "libdolphin_export.h" +#include +#include #include + class KToggleAction; class QAction; class QActionGroup; @@ -217,10 +220,10 @@ private: */ void createActions(); /** - * Creates an action group with all the "show additional information" actions in it. + * Creates an action menu with all the "show additional information" actions in it. * Helper method for createActions(); */ - QActionGroup* createAdditionalInformationActionGroup(); + KActionMenu* createAdditionalInformationActionMenu(); /** * Creates an action group with all the "sort by" actions in it.