X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/905277aac40f2a55daa5bb2925acb6d4046dacfd..29c5ab3b74d26657c60b40770676be082caa953d:/src/dolphinviewactionhandler.cpp diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp index 81f990270..71e9fd398 100644 --- a/src/dolphinviewactionhandler.cpp +++ b/src/dolphinviewactionhandler.cpp @@ -18,16 +18,20 @@ ***************************************************************************/ #include "dolphinviewactionhandler.h" -#include +#include "settings/viewpropertiesdialog.h" #include "dolphinview.h" - +#include "zoomlevelinfo.h" #include #include #include #include +#include #include +#include +#include + DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) : QObject(parent), @@ -53,12 +57,23 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) this, SLOT(slotShowPreviewChanged())); connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(slotSortOrderChanged(Qt::SortOrder))); + connect(view, SIGNAL(sortFoldersFirstChanged(bool)), + this, SLOT(slotSortFoldersFirstChanged(bool))); connect(view, SIGNAL(additionalInfoChanged()), this, SLOT(slotAdditionalInfoChanged())); connect(view, SIGNAL(categorizedSortingChanged()), this, SLOT(slotCategorizedSortingChanged())); connect(view, SIGNAL(showHiddenFilesChanged()), this, SLOT(slotShowHiddenFilesChanged())); + connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)), + this, SLOT(slotSortingChanged(DolphinView::Sorting))); + connect(view, SIGNAL(zoomLevelChanged(int)), + this, SLOT(slotZoomLevelChanged(int))); +} + +DolphinView* DolphinViewActionHandler::currentView() +{ + return m_currentView; } void DolphinViewActionHandler::createActions() @@ -66,15 +81,17 @@ void DolphinViewActionHandler::createActions() // This action doesn't appear in the GUI, it's for the shortcut only. // KNewMenu takes care of the GUI stuff. KAction* newDirAction = m_actionCollection->addAction("create_dir"); - newDirAction->setText(i18n("Create Folder...")); + newDirAction->setText(i18nc("@action", "Create Folder...")); newDirAction->setShortcut(Qt::Key_F10); - connect(newDirAction, SIGNAL(triggered()), SLOT(slotCreateDir())); + newDirAction->setIcon(KIcon("folder-new")); + connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory())); // Edit menu KAction* 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())); KAction* moveToTrash = m_actionCollection->addAction("move_to_trash"); @@ -90,6 +107,24 @@ void DolphinViewActionHandler::createActions() deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); connect(deleteAction, SIGNAL(triggered()), this, SLOT(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"); + // The descriptive text is just for the shortcuts editor. + deleteWithTrashShortcut->setText(i18nc("@action:inmenu File", "Delete (using shortcut for Trash)")); + deleteWithTrashShortcut->setShortcut(QKeySequence::Delete); + deleteWithTrashShortcut->setEnabled(false); + connect(deleteWithTrashShortcut, SIGNAL(triggered()), this, SLOT(slotDeleteItems())); + + KAction *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())); + // View menu QActionGroup* viewModeActions = new QActionGroup(this); @@ -115,6 +150,13 @@ void DolphinViewActionHandler::createActions() sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); + KToggleAction* sortFoldersFirst = m_actionCollection->add("folders_first"); + sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First")); + connect(sortFoldersFirst, SIGNAL(triggered()), this, SLOT(toggleSortFoldersFirst())); + + QActionGroup* sortByActionGroup = createSortByActionGroup(); + connect(sortByActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotSortTriggered(QAction*))); + QActionGroup* showInformationActionGroup = createAdditionalInformationActionGroup(); connect(showInformationActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(toggleAdditionalInfo(QAction*))); @@ -124,9 +166,20 @@ void DolphinViewActionHandler::createActions() KToggleAction* showHiddenFiles = m_actionCollection->add("show_hidden_files"); showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files")); - showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period); + showHiddenFiles->setShortcuts(QList() << Qt::ALT + Qt::Key_Period << Qt::Key_F8); connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool))); + KAction* adjustViewProps = m_actionCollection->addAction("view_properties"); + adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); + 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); + findFile->setIcon(KIcon("edit-find")); + connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile())); } QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup() @@ -167,10 +220,74 @@ QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup() return showInformationGroup; } -void DolphinViewActionHandler::slotCreateDir() +Q_DECLARE_METATYPE(DolphinView::Sorting) + +QActionGroup* DolphinViewActionHandler::createSortByActionGroup() { - Q_ASSERT(m_currentView); - KonqOperations::newDir(m_currentView, m_currentView->url()); + QActionGroup* sortByActionGroup = new QActionGroup(m_actionCollection); + sortByActionGroup->setExclusive(true); + + KToggleAction* sortByName = m_actionCollection->add("sort_by_name"); + sortByName->setText(i18nc("@action:inmenu Sort By", "Name")); + sortByName->setData(QVariant::fromValue(DolphinView::SortByName)); + sortByActionGroup->addAction(sortByName); + + KToggleAction* sortBySize = m_actionCollection->add("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("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("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("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("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("sort_by_type"); + sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); + sortByType->setData(QVariant::fromValue(DolphinView::SortByType)); + sortByActionGroup->addAction(sortByType); + + // TODO: Hid "sort by rating" and "sort by tags" as without caching the performance + // is too slow currently (Nepomuk will support caching in future releases). + // + // KToggleAction* sortByRating = m_actionCollection->add("sort_by_rating"); + // sortByRating->setData(QVariant::fromValue(DolphinView::SortByRating)); + // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); + // sortByActionGroup->addAction(sortByRating); + // + // KToggleAction* sortByTags = m_actionCollection->add("sort_by_tags"); + // sortByTags->setData(QVariant::fromValue(DolphinView::SortByTags)); + // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); + // sortByActionGroup->addAction(sortByTags); + // +#ifdef HAVE_NEPOMUK + // if (!MetaDataWidget::metaDataAvailable()) { + // sortByRating->setEnabled(false); + // sortByTags->setEnabled(false); + // } +#else + // sortByRating->setEnabled(false); + // sortByTags->setEnabled(false); +#endif + + + + return sortByActionGroup; } void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action) @@ -229,6 +346,11 @@ QString DolphinViewActionHandler::currentViewModeActionName() const return QString(); // can't happen } +KActionCollection* DolphinViewActionHandler::actionCollection() +{ + return m_actionCollection; +} + void DolphinViewActionHandler::updateViewActions() { QAction* viewModeAction = m_actionCollection->action(currentViewModeActionName()); @@ -236,22 +358,15 @@ void DolphinViewActionHandler::updateViewActions() viewModeAction->setChecked(true); } - QAction* zoomInAction = m_actionCollection->action(KStandardAction::stdName(KStandardAction::ZoomIn)); - if (zoomInAction != 0) { - zoomInAction->setEnabled(m_currentView->isZoomInPossible()); - } - - QAction* zoomOutAction = m_actionCollection->action(KStandardAction::stdName(KStandardAction::ZoomOut)); - if (zoomOutAction != 0) { - zoomOutAction->setEnabled(m_currentView->isZoomOutPossible()); - } - QAction* showPreviewAction = m_actionCollection->action("show_preview"); showPreviewAction->setChecked(m_currentView->showPreview()); slotSortOrderChanged(m_currentView->sortOrder()); + slotSortFoldersFirstChanged(m_currentView->sortFoldersFirst()); slotAdditionalInfoChanged(); slotCategorizedSortingChanged(); + slotSortingChanged(m_currentView->sorting()); + slotZoomLevelChanged(m_currentView->zoomLevel()); QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); showHiddenFilesAction->setChecked(m_currentView->showHiddenFiles()); @@ -260,13 +375,15 @@ void DolphinViewActionHandler::updateViewActions() void DolphinViewActionHandler::zoomIn() { - m_currentView->zoomIn(); + const int level = m_currentView->zoomLevel(); + m_currentView->setZoomLevel(level + 1); updateViewActions(); } void DolphinViewActionHandler::zoomOut() { - m_currentView->zoomOut(); + const int level = m_currentView->zoomLevel(); + m_currentView->setZoomLevel(level - 1); updateViewActions(); } @@ -275,6 +392,11 @@ void DolphinViewActionHandler::toggleSortOrder() m_currentView->toggleSortOrder(); } +void DolphinViewActionHandler::toggleSortFoldersFirst() +{ + m_currentView->toggleSortFoldersFirst(); +} + void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order) { QAction* descending = m_actionCollection->action("descending"); @@ -282,6 +404,11 @@ void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order) descending->setChecked(sortDescending); } +void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst) +{ + m_actionCollection->action("folders_first")->setChecked(foldersFirst); +} + void DolphinViewActionHandler::toggleAdditionalInfo(QAction* action) { emit actionBeingHandled(); @@ -347,3 +474,93 @@ KToggleAction* DolphinViewActionHandler::columnsModeAction() columnView->setData(QVariant::fromValue(DolphinView::ColumnView)); return columnView; } + +void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting) +{ + QAction* action = 0; + switch (sorting) { + case 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; +#ifdef HAVE_NEPOMUK + case DolphinView::SortByRating: + action = m_actionCollection->action("sort_by_rating"); + break; + case DolphinView::SortByTags: + action = m_actionCollection->action("sort_by_tags"); + break; +#endif + default: + break; + } + + if (action != 0) { + action->setChecked(true); + } +} + +void DolphinViewActionHandler::slotZoomLevelChanged(int level) +{ + QAction* zoomInAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomIn)); + if (zoomInAction != 0) { + zoomInAction->setEnabled(level < ZoomLevelInfo::maximumLevel()); + } + + QAction* zoomOutAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomOut)); + if (zoomOutAction != 0) { + zoomOutAction->setEnabled(level > ZoomLevelInfo::minimumLevel()); + } +} + +void DolphinViewActionHandler::slotSortTriggered(QAction* action) +{ + const DolphinView::Sorting sorting = action->data().value(); + m_currentView->setSorting(sorting); +} + +void DolphinViewActionHandler::slotAdjustViewProperties() +{ + emit actionBeingHandled(); + ViewPropertiesDialog dlg(m_currentView); + dlg.exec(); +} + +void DolphinViewActionHandler::slotFindFile() +{ + KRun::run("kfind %u", m_currentView->url(), m_currentView->window()); +} + +void DolphinViewActionHandler::slotProperties() +{ + KPropertiesDialog* dialog = 0; + const KFileItemList list = m_currentView->selectedItems(); + if (list.isEmpty()) { + const KUrl url = m_currentView->url(); + dialog = new KPropertiesDialog(url, m_currentView); + } else { + dialog = new KPropertiesDialog(list, m_currentView); + } + + dialog->setAttribute(Qt::WA_DeleteOnClose); + dialog->show(); + dialog->raise(); + dialog->activateWindow(); +}