/***************************************************************************
* Copyright (C) 2008 by David Faure <faure@kde.org> *
+ * Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
#include "dolphinviewactionhandler.h"
-#include "additionalinfoaccessor.h"
+#include <config-baloo.h>
+
#include "settings/viewpropertiesdialog.h"
#include "views/dolphinview.h"
#include "views/zoomlevelinfo.h"
#include <konq_operations.h>
-#include <KAction>
+#include <QPointer>
+#include <QMenu>
+
#include <KActionCollection>
#include <KActionMenu>
-#include <KFileItemDelegate>
-#include <KLocale>
+#include <kitemviews/kfileitemmodel.h>
+#include <KLocalizedString>
#include <KNewFileMenu>
#include <KSelectAction>
#include <KToggleAction>
-#include <KRun>
#include <KPropertiesDialog>
+#include <QIcon>
#include <KDebug>
-DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
- : QObject(parent),
- m_actionCollection(collection),
- m_currentView(0)
+#ifdef HAVE_BALOO
+ #include <Baloo/IndexerConfig>
+#endif
+
+DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
+ QObject(parent),
+ m_actionCollection(collection),
+ m_currentView(0),
+ m_sortByActions(),
+ m_visibleRoles()
{
Q_ASSERT(m_actionCollection);
createActions();
m_currentView = view;
- connect(view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)),
- this, SLOT(updateViewActions()));
- connect(view, SIGNAL(previewsShownChanged(bool)),
- this, SLOT(slotPreviewsShownChanged(bool)));
- connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
- this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
- connect(view, SIGNAL(sortFoldersFirstChanged(bool)),
- this, SLOT(slotSortFoldersFirstChanged(bool)));
- connect(view, SIGNAL(additionalInfoListChanged(QList<DolphinView::AdditionalInfo>,
- QList<DolphinView::AdditionalInfo>)),
- this, SLOT(slotAdditionalInfoListChanged(QList<DolphinView::AdditionalInfo>,
- QList<DolphinView::AdditionalInfo>)));
- connect(view, SIGNAL(categorizedSortingChanged(bool)),
- this, SLOT(slotCategorizedSortingChanged(bool)));
- connect(view, SIGNAL(hiddenFilesShownChanged(bool)),
- this, SLOT(slotHiddenFilesShownChanged(bool)));
- connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
- this, SLOT(slotSortingChanged(DolphinView::Sorting)));
- connect(view, SIGNAL(zoomLevelChanged(int,int)),
- this, SLOT(slotZoomLevelChanged(int,int)));
+ connect(view, &DolphinView::modeChanged,
+ this, &DolphinViewActionHandler::updateViewActions);
+ connect(view, &DolphinView::previewsShownChanged,
+ this, &DolphinViewActionHandler::slotPreviewsShownChanged);
+ connect(view, &DolphinView::sortOrderChanged,
+ this, &DolphinViewActionHandler::slotSortOrderChanged);
+ connect(view, &DolphinView::sortFoldersFirstChanged,
+ this, &DolphinViewActionHandler::slotSortFoldersFirstChanged);
+ connect(view, &DolphinView::visibleRolesChanged,
+ this, &DolphinViewActionHandler::slotVisibleRolesChanged);
+ connect(view, &DolphinView::groupedSortingChanged,
+ this, &DolphinViewActionHandler::slotGroupedSortingChanged);
+ connect(view, &DolphinView::hiddenFilesShownChanged,
+ this, &DolphinViewActionHandler::slotHiddenFilesShownChanged);
+ connect(view, &DolphinView::sortRoleChanged,
+ this, &DolphinViewActionHandler::slotSortRoleChanged);
+ connect(view, &DolphinView::zoomLevelChanged,
+ this, &DolphinViewActionHandler::slotZoomLevelChanged);
+ connect(view, &DolphinView::writeStateChanged,
+ this, &DolphinViewActionHandler::slotWriteStateChanged);
}
DolphinView* DolphinViewActionHandler::currentView()
{
// This action doesn't appear in the GUI, it's for the shortcut only.
// KNewFileMenu takes care of the GUI stuff.
- KAction* newDirAction = m_actionCollection->addAction("create_dir");
+ QAction* newDirAction = m_actionCollection->addAction("create_dir");
newDirAction->setText(i18nc("@action", "Create Folder..."));
- newDirAction->setShortcut(Qt::Key_F10);
- newDirAction->setIcon(KIcon("folder-new"));
- connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory()));
+ m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10);
+ newDirAction->setIcon(QIcon::fromTheme("folder-new"));
+ newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
+ connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectory);
// File menu
- KAction* rename = m_actionCollection->addAction("rename");
+ QAction* rename = m_actionCollection->addAction("rename");
rename->setText(i18nc("@action:inmenu File", "Rename..."));
- rename->setShortcut(Qt::Key_F2);
- rename->setIcon(KIcon("edit-rename"));
- connect(rename, SIGNAL(triggered()), this, SLOT(slotRename()));
+ m_actionCollection->setDefaultShortcut(rename, Qt::Key_F2);
+ rename->setIcon(QIcon::fromTheme("edit-rename"));
+ connect(rename, &QAction::triggered, this, &DolphinViewActionHandler::slotRename);
- KAction* moveToTrash = m_actionCollection->addAction("move_to_trash");
+ QAction* moveToTrash = m_actionCollection->addAction("move_to_trash");
moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
- moveToTrash->setIcon(KIcon("user-trash"));
- moveToTrash->setShortcut(QKeySequence::Delete);
- connect(moveToTrash, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
- this, SLOT(slotTrashActivated(Qt::MouseButtons,Qt::KeyboardModifiers)));
+ moveToTrash->setIcon(QIcon::fromTheme("user-trash"));
+ m_actionCollection->setDefaultShortcut(moveToTrash, QKeySequence::Delete);
+ connect(moveToTrash, &QAction::triggered,
+ this, &DolphinViewActionHandler::slotTrashActivated);
- KAction* deleteAction = m_actionCollection->addAction("delete");
- deleteAction->setIcon(KIcon("edit-delete"));
+ QAction* deleteAction = m_actionCollection->addAction("delete");
+ deleteAction->setIcon(QIcon::fromTheme("edit-delete"));
deleteAction->setText(i18nc("@action:inmenu File", "Delete"));
- deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
- connect(deleteAction, SIGNAL(triggered()), this, SLOT(slotDeleteItems()));
+ m_actionCollection->setDefaultShortcut(deleteAction, Qt::SHIFT | Qt::Key_Delete);
+ connect(deleteAction, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
// This action is useful for being enabled when "move_to_trash" should be
// disabled and "delete" is enabled (e.g. non-local files), so that Key_Del
// can be used for deleting the file (#76016). It needs to be a separate action
// so that the Edit menu isn't affected.
- KAction* deleteWithTrashShortcut = m_actionCollection->addAction("delete_shortcut");
+ QAction* deleteWithTrashShortcut = m_actionCollection->addAction("delete_shortcut");
// The descriptive text is just for the shortcuts editor.
deleteWithTrashShortcut->setText(i18nc("@action \"Move to Trash\" for non-local files, etc.", "Delete (using shortcut for Trash)"));
- deleteWithTrashShortcut->setShortcut(QKeySequence::Delete);
+ m_actionCollection->setDefaultShortcut(deleteWithTrashShortcut, QKeySequence::Delete);
deleteWithTrashShortcut->setEnabled(false);
- connect(deleteWithTrashShortcut, SIGNAL(triggered()), this, SLOT(slotDeleteItems()));
+ connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
- KAction *propertiesAction = m_actionCollection->addAction( "properties" );
+ QAction *propertiesAction = m_actionCollection->addAction( "properties" );
// Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :)
propertiesAction->setText( i18nc("@action:inmenu File", "Properties") );
- propertiesAction->setIcon(KIcon("document-properties"));
- propertiesAction->setShortcut(Qt::ALT | Qt::Key_Return);
- connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
+ propertiesAction->setIcon(QIcon::fromTheme("document-properties"));
+ m_actionCollection->setDefaultShortcuts(propertiesAction, QList<QKeySequence>() << Qt::ALT + Qt::Key_Return << Qt::ALT + Qt::Key_Enter);
+ connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties);
// View menu
KToggleAction* iconsAction = iconsModeAction();
viewModeActions->addAction(compactAction);
viewModeActions->addAction(detailsAction);
viewModeActions->setToolBarMode(KSelectAction::MenuMode);
- connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
+ connect(viewModeActions, static_cast<void(KSelectAction::*)(QAction*)>(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered);
KStandardAction::zoomIn(this,
SLOT(zoomIn()),
KToggleAction* showPreview = m_actionCollection->add<KToggleAction>("show_preview");
showPreview->setText(i18nc("@action:intoolbar", "Preview"));
showPreview->setToolTip(i18nc("@info", "Show preview of files and folders"));
- showPreview->setIcon(KIcon("view-preview"));
- connect(showPreview, SIGNAL(triggered(bool)), this, SLOT(togglePreview(bool)));
+ showPreview->setIcon(QIcon::fromTheme("view-preview"));
+ connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview);
KToggleAction* sortDescending = m_actionCollection->add<KToggleAction>("descending");
sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
- connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
+ connect(sortDescending, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortOrder);
KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>("folders_first");
sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First"));
- connect(sortFoldersFirst, SIGNAL(triggered()), this, SLOT(toggleSortFoldersFirst()));
+ connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst);
// View -> Sort By
- QActionGroup* sortByActionGroup = createSortByActionGroup();
- connect(sortByActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotSortTriggered(QAction*)));
+ QActionGroup* sortByActionGroup = createFileItemRolesActionGroup("sort_by_");
KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>("sort");
sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
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);
+ QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup("show_");
+
+ KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>("additional_info");
+ visibleRolesMenu->setText(i18nc("@action:inmenu View", "Additional Information"));
+ visibleRolesMenu->setDelayed(false);
+
+ foreach (QAction* action, visibleRolesGroup->actions()) {
+ visibleRolesMenu->addAction(action);
}
KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>("show_in_groups");
+ showInGroups->setIcon(QIcon::fromTheme("view-group"));
showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
- connect(showInGroups, SIGNAL(triggered(bool)), this, SLOT(toggleSortCategorization(bool)));
+ connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files");
showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
- showHiddenFiles->setShortcuts(QList<QKeySequence>() << Qt::ALT + Qt::Key_Period << Qt::Key_F8);
- connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool)));
+ m_actionCollection->setDefaultShortcuts(showHiddenFiles, QList<QKeySequence>() << Qt::ALT + Qt::Key_Period << Qt::Key_F8);
+ connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
- KAction* adjustViewProps = m_actionCollection->addAction("view_properties");
+ QAction* adjustViewProps = m_actionCollection->addAction("view_properties");
adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
- connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(slotAdjustViewProperties()));
+ connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties);
}
-QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
+QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QString& groupPrefix)
{
- 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);
+ const bool isSortGroup = (groupPrefix == QLatin1String("sort_by_"));
+ Q_ASSERT(isSortGroup || (!isSortGroup && groupPrefix == QLatin1String("show_")));
- const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-
- const QList<DolphinView::AdditionalInfo> infoList = infoAccessor.keys();
- foreach (DolphinView::AdditionalInfo info, infoList) {
- 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);
+ QActionGroup* rolesActionGroup = new QActionGroup(m_actionCollection);
+ rolesActionGroup->setExclusive(isSortGroup);
+ if (isSortGroup) {
+ connect(rolesActionGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::slotSortTriggered);
+ } else {
+ connect(rolesActionGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::toggleVisibleRole);
}
- return additionalInfoGroup;
-}
-
-Q_DECLARE_METATYPE(DolphinView::Sorting)
-
-QActionGroup* DolphinViewActionHandler::createSortByActionGroup()
-{
- QActionGroup* sortByActionGroup = new QActionGroup(m_actionCollection);
- sortByActionGroup->setExclusive(true);
+ QString groupName;
+ KActionMenu* groupMenu = 0;
+ QActionGroup* groupMenuGroup = 0;
+
+ bool indexingEnabled = false;
+#ifdef HAVE_BALOO
+ Baloo::IndexerConfig config;
+ indexingEnabled = config.fileIndexingEnabled();
+#endif
+
+ const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+ foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
+ if (!isSortGroup && info.role == "text") {
+ // It should not be possible to hide the "text" role
+ continue;
+ }
- KToggleAction* sortByName = m_actionCollection->add<KToggleAction>("sort_by_name");
- sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));
- sortByName->setData(QVariant::fromValue(DolphinView::SortByName));
- sortByActionGroup->addAction(sortByName);
+ KToggleAction* action = 0;
+ const QString name = groupPrefix + info.role;
+ if (info.group.isEmpty()) {
+ action = m_actionCollection->add<KToggleAction>(name);
+ action->setActionGroup(rolesActionGroup);
+ } else {
+ if (!groupMenu || info.group != groupName) {
+ groupName = info.group;
+ groupMenu = m_actionCollection->add<KActionMenu>(groupName);
+ groupMenu->setText(groupName);
+ groupMenu->setActionGroup(rolesActionGroup);
+
+ groupMenuGroup = new QActionGroup(groupMenu);
+ groupMenuGroup->setExclusive(isSortGroup);
+ if (isSortGroup) {
+ connect(groupMenuGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::slotSortTriggered);
+ } else {
+ connect(groupMenuGroup, &QActionGroup::triggered,
+ this, &DolphinViewActionHandler::toggleVisibleRole);
+ }
+ }
- const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- const QList<DolphinView::AdditionalInfo> infoList = infoAccessor.keys();
- foreach (DolphinView::AdditionalInfo info, infoList) {
- 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);
+ action = new KToggleAction(groupMenu);
+ action->setActionGroup(groupMenuGroup);
+ groupMenu->addAction(action);
+ }
+ action->setText(info.translation);
+ action->setData(info.role);
+
+ const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
+ (info.requiresBaloo) ||
+ (info.requiresIndexer && indexingEnabled);
+ action->setEnabled(enable);
+
+ if (isSortGroup) {
+ m_sortByActions.insert(info.role, action);
+ } else {
+ m_visibleRoles.insert(info.role, action);
+ }
}
- return sortByActionGroup;
+ return rolesActionGroup;
}
void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action)
m_currentView->setMode(mode);
QAction* viewModeMenu = m_actionCollection->action("view_mode");
- viewModeMenu->setIcon(KIcon(action->icon()));
+ viewModeMenu->setIcon(action->icon());
}
void DolphinViewActionHandler::slotRename()
m_currentView->renameSelectedItems();
}
-void DolphinViewActionHandler::slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers modifiers)
+void DolphinViewActionHandler::slotTrashActivated()
{
emit actionBeingHandled();
- // Note: kde3's konq_mainwindow.cpp used to check
- // reason == KAction::PopupMenuActivation && ...
- // but this isn't supported anymore
- if (modifiers & Qt::ShiftModifier) {
- m_currentView->deleteSelectedItems();
- } else {
- m_currentView->trashSelectedItems();
- }
+ m_currentView->trashSelectedItems();
}
void DolphinViewActionHandler::slotDeleteItems()
return "details";
case DolphinView::CompactView:
return "compact";
+ default:
+ Q_ASSERT(false);
+ break;
}
return QString(); // can't happen
}
viewModeAction->setChecked(true);
QAction* viewModeMenu = m_actionCollection->action("view_mode");
- viewModeMenu->setIcon(KIcon(viewModeAction->icon()));
+ viewModeMenu->setIcon(viewModeAction->icon());
}
QAction* showPreviewAction = m_actionCollection->action("show_preview");
slotSortOrderChanged(m_currentView->sortOrder());
slotSortFoldersFirstChanged(m_currentView->sortFoldersFirst());
- slotAdditionalInfoListChanged(m_currentView->additionalInfoList(), QList<DolphinView::AdditionalInfo>());
- slotCategorizedSortingChanged(m_currentView->categorizedSorting());
- slotSortingChanged(m_currentView->sorting());
+ slotVisibleRolesChanged(m_currentView->visibleRoles(), QList<QByteArray>());
+ slotGroupedSortingChanged(m_currentView->groupedSorting());
+ slotSortRoleChanged(m_currentView->sortRole());
slotZoomLevelChanged(m_currentView->zoomLevel(), -1);
QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files");
m_actionCollection->action("folders_first")->setChecked(foldersFirst);
}
-void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action)
+void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
{
emit actionBeingHandled();
- const DolphinView::AdditionalInfo info =
- static_cast<DolphinView::AdditionalInfo>(action->data().toInt());
+ const QByteArray toggledRole = action->data().toByteArray();
- QList<DolphinView::AdditionalInfo> list = m_currentView->additionalInfoList();
+ QList<QByteArray> roles = m_currentView->visibleRoles();
const bool show = action->isChecked();
- const int index = list.indexOf(info);
+ const int index = roles.indexOf(toggledRole);
const bool containsInfo = (index >= 0);
if (show && !containsInfo) {
- list.append(info);
- m_currentView->setAdditionalInfoList(list);
+ roles.append(toggledRole);
+ m_currentView->setVisibleRoles(roles);
} else if (!show && containsInfo) {
- list.removeAt(index);
- m_currentView->setAdditionalInfoList(list);
- Q_ASSERT(list.indexOf(info) < 0);
+ roles.removeAt(index);
+ m_currentView->setVisibleRoles(roles);
+ Q_ASSERT(roles.indexOf(toggledRole) < 0);
}
}
-void DolphinViewActionHandler::slotAdditionalInfoListChanged(const QList<DolphinView::AdditionalInfo>& current,
- const QList<DolphinView::AdditionalInfo>& previous)
+void DolphinViewActionHandler::slotVisibleRolesChanged(const QList<QByteArray>& current,
+ const QList<QByteArray>& previous)
{
Q_UNUSED(previous);
- const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-
- const QList<DolphinView::AdditionalInfo> checkedInfo = current;
- const QList<DolphinView::AdditionalInfo> infoList = infoAccessor.keys();
-
- foreach (DolphinView::AdditionalInfo info, infoList) {
- const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType);
- QAction* action = m_actionCollection->action(name);
- Q_ASSERT(action);
- action->setChecked(checkedInfo.contains(info));
+ const QSet<QByteArray> checkedRoles = current.toSet();
+ QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles);
+ while (it.hasNext()) {
+ it.next();
+ const QByteArray& role = it.key();
+ KToggleAction* action = it.value();
+ action->setChecked(checkedRoles.contains(role));
}
}
-void DolphinViewActionHandler::toggleSortCategorization(bool categorizedSorting)
+void DolphinViewActionHandler::toggleGroupedSorting(bool grouped)
{
- m_currentView->setCategorizedSorting(categorizedSorting);
+ m_currentView->setGroupedSorting(grouped);
}
-void DolphinViewActionHandler::slotCategorizedSortingChanged(bool sortCategorized)
+void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting)
{
QAction* showInGroupsAction = m_actionCollection->action("show_in_groups");
- showInGroupsAction->setChecked(sortCategorized);
+ showInGroupsAction->setChecked(groupedSorting);
}
void DolphinViewActionHandler::toggleShowHiddenFiles(bool show)
showHiddenFilesAction->setChecked(shown);
}
+void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
+{
+ m_actionCollection->action("create_dir")->setEnabled(isFolderWritable);
+}
KToggleAction* DolphinViewActionHandler::iconsModeAction()
{
KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
iconsView->setToolTip(i18nc("@info", "Icons view mode"));
- iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
- iconsView->setIcon(KIcon("view-list-icons"));
+ m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_1);
+ iconsView->setIcon(QIcon::fromTheme("view-list-icons"));
iconsView->setData(QVariant::fromValue(DolphinView::IconsView));
return iconsView;
}
KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("compact");
iconsView->setText(i18nc("@action:inmenu View Mode", "Compact"));
iconsView->setToolTip(i18nc("@info", "Compact view mode"));
- iconsView->setShortcut(Qt::CTRL | Qt::Key_2);
- iconsView->setIcon(KIcon("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name
+ m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_2);
+ iconsView->setIcon(QIcon::fromTheme("view-list-details")); // TODO: discuss with Oxygen-team the wrong (?) name
iconsView->setData(QVariant::fromValue(DolphinView::CompactView));
return iconsView;
}
KToggleAction* detailsView = m_actionCollection->add<KToggleAction>("details");
detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
detailsView->setToolTip(i18nc("@info", "Details view mode"));
- detailsView->setShortcut(Qt::CTRL | Qt::Key_3);
- detailsView->setIcon(KIcon("view-list-text"));
+ m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL | Qt::Key_3);
+ detailsView->setIcon(QIcon::fromTheme("view-list-tree"));
detailsView->setData(QVariant::fromValue(DolphinView::DetailsView));
return detailsView;
}
-void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting)
+void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role)
{
- QAction* action = 0;
- if (sorting == DolphinView::SortByName) {
- action = m_actionCollection->action("sort_by_name");
- } else {
- const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- const QList<DolphinView::AdditionalInfo> infoList = infoAccessor.keys();
- foreach (DolphinView::AdditionalInfo info, infoList) {
- if (sorting == infoAccessor.sorting(info)) {
- const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::SortByType);
- action = m_actionCollection->action(name);
- break;
- }
- }
- }
-
+ KToggleAction* action = m_sortByActions.value(role);
if (action) {
action->setChecked(true);
- QAction* sortByMenu = m_actionCollection->action("sort");
- sortByMenu->setIcon(KIcon(action->icon()));
+ if (!action->icon().isNull()) {
+ QAction* sortByMenu = m_actionCollection->action("sort");
+ sortByMenu->setIcon(action->icon());
+ }
}
}
void DolphinViewActionHandler::slotSortTriggered(QAction* action)
{
- const DolphinView::Sorting sorting = action->data().value<DolphinView::Sorting>();
- m_currentView->setSorting(sorting);
+ // The radiobuttons of the "Sort By"-menu are split between the main-menu
+ // and several sub-menus. Because of this they don't have a common
+ // action-group that assures an exclusive toggle-state between the main-menu
+ // actions and the sub-menu-actions. If an action gets checked, it must
+ // be assured that all other actions get unchecked.
+ QAction* sortByMenu = m_actionCollection->action("sort");
+ foreach (QAction* groupAction, sortByMenu->menu()->actions()) {
+ KActionMenu* actionMenu = qobject_cast<KActionMenu*>(groupAction);
+ if (actionMenu) {
+ foreach (QAction* subAction, actionMenu->menu()->actions()) {
+ subAction->setChecked(false);
+ }
+ } else if (groupAction->actionGroup()) {
+ groupAction->setChecked(false);
+ }
+ }
+ action->setChecked(true);
+
+ // Apply the activated sort-role to the view
+ const QByteArray role = action->data().toByteArray();
+ m_currentView->setSortRole(role);
}
void DolphinViewActionHandler::slotAdjustViewProperties()
projects / dolphin.git / blobdiff