#include "dolphinviewactionhandler.h"
+#include "additionalinfoaccessor.h"
#include "settings/viewpropertiesdialog.h"
#include "dolphinview.h"
#include "zoomlevelinfo.h"
#include <kaction.h>
#include <kactioncollection.h>
+#include <kactionmenu.h>
+#include <kfileitemdelegate.h>
#include <klocale.h>
#include <knewmenu.h>
+#include <kselectaction.h>
#include <ktoggleaction.h>
#include <krun.h>
#include <kpropertiesdialog.h>
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);
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,
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"));
connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(slotAdjustViewProperties()));
// Tools menu
-
KAction* findFile = m_actionCollection->addAction("find_file");
findFile->setText(i18nc("@action:inmenu Tools", "Find File..."));
findFile->setShortcut(Qt::CTRL | Qt::Key_F);
QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
{
- QActionGroup* showInformationGroup = new QActionGroup(m_actionCollection);
- showInformationGroup->setExclusive(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);
+ QActionGroup* additionalInfoGroup = new QActionGroup(m_actionCollection);
+ additionalInfoGroup->setExclusive(false);
- KToggleAction* showDateInfo = m_actionCollection->add<KToggleAction>("show_date_info");
- showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
- showDateInfo->setData(KFileItemDelegate::ModificationTime);
- showDateInfo->setActionGroup(showInformationGroup);
+ KActionMenu* showInformationMenu = m_actionCollection->add<KActionMenu>("additional_info");
+ showInformationMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
+ showInformationMenu->setDelayed(false);
- KToggleAction* showPermissionsInfo = m_actionCollection->add<KToggleAction>("show_permissions_info");
- showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
- showPermissionsInfo->setData(KFileItemDelegate::Permissions);
- showPermissionsInfo->setActionGroup(showInformationGroup);
+ const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- KToggleAction* showOwnerInfo = m_actionCollection->add<KToggleAction>("show_owner_info");
- showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
- showOwnerInfo->setData(KFileItemDelegate::Owner);
- showOwnerInfo->setActionGroup(showInformationGroup);
-
- KToggleAction* showGroupInfo = m_actionCollection->add<KToggleAction>("show_group_info");
- showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
- showGroupInfo->setData(KFileItemDelegate::OwnerAndGroup);
- showGroupInfo->setActionGroup(showInformationGroup);
-
- KToggleAction* showMimeInfo = m_actionCollection->add<KToggleAction>("show_mime_info");
- showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
- showMimeInfo->setData(KFileItemDelegate::FriendlyMimeType);
- showMimeInfo->setActionGroup(showInformationGroup);
+ const KFileItemDelegate::InformationList infos = infoAccessor.keys();
+ foreach (KFileItemDelegate::Information info, infos) {
+ const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType);
+ KToggleAction* action = m_actionCollection->add<KToggleAction>(name);
+ action->setText(infoAccessor.translation(info));
+ action->setData(info);
+ action->setActionGroup(additionalInfoGroup);
+ }
- return showInformationGroup;
+ return additionalInfoGroup;
}
Q_DECLARE_METATYPE(DolphinView::Sorting)
sortByName->setData(QVariant::fromValue(DolphinView::SortByName));
sortByActionGroup->addAction(sortByName);
- KToggleAction* sortBySize = m_actionCollection->add<KToggleAction>("sort_by_size");
- sortBySize->setText(i18nc("@action:inmenu Sort By", "Size"));
- sortBySize->setData(QVariant::fromValue(DolphinView::SortBySize));
- sortByActionGroup->addAction(sortBySize);
-
- KToggleAction* sortByDate = m_actionCollection->add<KToggleAction>("sort_by_date");
- sortByDate->setText(i18nc("@action:inmenu Sort By", "Date"));
- sortByDate->setData(QVariant::fromValue(DolphinView::SortByDate));
- sortByActionGroup->addAction(sortByDate);
-
- KToggleAction* sortByPermissions = m_actionCollection->add<KToggleAction>("sort_by_permissions");
- sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions"));
- sortByPermissions->setData(QVariant::fromValue(DolphinView::SortByPermissions));
- sortByActionGroup->addAction(sortByPermissions);
-
- KToggleAction* sortByOwner = m_actionCollection->add<KToggleAction>("sort_by_owner");
- sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner"));
- sortByOwner->setData(QVariant::fromValue(DolphinView::SortByOwner));
- sortByActionGroup->addAction(sortByOwner);
-
- KToggleAction* sortByGroup = m_actionCollection->add<KToggleAction>("sort_by_group");
- sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group"));
- sortByGroup->setData(QVariant::fromValue(DolphinView::SortByGroup));
- sortByActionGroup->addAction(sortByGroup);
-
- KToggleAction* sortByType = m_actionCollection->add<KToggleAction>("sort_by_type");
- sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
- sortByType->setData(QVariant::fromValue(DolphinView::SortByType));
- sortByActionGroup->addAction(sortByType);
+ const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+ const KFileItemDelegate::InformationList infos = infoAccessor.keys();
+ foreach (KFileItemDelegate::Information info, infos) {
+ const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::SortByType);
+ KToggleAction* action = m_actionCollection->add<KToggleAction>(name);
+ action->setText(infoAccessor.translation(info));
+ const DolphinView::Sorting sorting = infoAccessor.sorting(info);
+ action->setData(QVariant::fromValue(sorting));
+ sortByActionGroup->addAction(action);
+ }
return sortByActionGroup;
}
{
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()
// Note: kde3's konq_mainwindow.cpp used to check
// reason == KAction::PopupMenuActivation && ...
// but this isn't supported anymore
- if (modifiers & Qt::ShiftModifier)
+ if (modifiers & Qt::ShiftModifier) {
m_currentView->deleteSelectedItems();
- else
+ } else {
m_currentView->trashSelectedItems();
+ }
}
void DolphinViewActionHandler::slotDeleteItems()
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");
QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files");
showHiddenFilesAction->setChecked(m_currentView->showHiddenFiles());
-
}
void DolphinViewActionHandler::zoomIn()
void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting)
{
+ const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+ const KFileItemDelegate::InformationList infos = infoAccessor.keys();
+
QAction* action = 0;
- switch (sorting) {
- case DolphinView::SortByName:
+ if (sorting == DolphinView::SortByName) {
action = m_actionCollection->action("sort_by_name");
- break;
- case DolphinView::SortBySize:
- action = m_actionCollection->action("sort_by_size");
- break;
- case DolphinView::SortByDate:
- action = m_actionCollection->action("sort_by_date");
- break;
- case DolphinView::SortByPermissions:
- action = m_actionCollection->action("sort_by_permissions");
- break;
- case DolphinView::SortByOwner:
- action = m_actionCollection->action("sort_by_owner");
- break;
- case DolphinView::SortByGroup:
- action = m_actionCollection->action("sort_by_group");
- break;
- case DolphinView::SortByType:
- action = m_actionCollection->action("sort_by_type");
- break;
- default:
- break;
+ } else {
+ foreach (const KFileItemDelegate::Information info, infos) {
+ if (sorting == infoAccessor.sorting(info)) {
+ const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::SortByType);
+ action = m_actionCollection->action(name);
+ break;
+ }
+ }
}
if (action != 0) {
action->setChecked(true);
+
+ QAction* sortByMenu = m_actionCollection->action("sort");
+ sortByMenu->setIcon(KIcon(action->icon()));
}
}
projects / dolphin.git / blobdiff