From 8eed64171cfdee8be2690e4fb7e0aaeb3aafc6e5 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 24 Dec 2007 19:07:32 +0000 Subject: Move (broken) action "Edit/Properties" to dolphinpart and made it work there. Pass parent widget to all KPropertiesDialog instances. svn path=/trunk/KDE/kdebase/apps/; revision=752542 --- src/dolphinpart.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/dolphinpart.cpp') diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index da6faecc6..12ba14a9f 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -18,6 +18,7 @@ */ #include "dolphinpart.h" +#include #include #include "dolphinsortfilterproxymodel.h" #include "dolphinview.h" @@ -131,9 +132,14 @@ void DolphinPart::createActions() connect(deleteAction, SIGNAL(triggered()), m_view, SLOT(deleteSelectedItems())); KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" ); - editMimeTypeAction->setText( i18n( "&Edit File Type..." ) ); + editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) ); connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType())); + KAction *propertiesAction = actionCollection()->addAction( "properties" ); + propertiesAction->setText( i18nc("@action:inmenu Edit", "Properties") ); + propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return); + connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties())); + // This action doesn't appear in the GUI, it's for the shortcut only. // KNewMenu takes care of the GUI stuff. KAction* newDirAction = actionCollection()->addAction( "create_dir" ); @@ -192,7 +198,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) } QStringList actions; - actions << "rename" << "move_to_trash" << "delete" << "editMimeType"; + actions << "rename" << "move_to_trash" << "delete" << "editMimeType" << "properties"; foreach(const QString& actionName, actions) { QAction* action = actionCollection()->action(actionName); Q_ASSERT(action); @@ -407,7 +413,16 @@ void DolphinPart::slotEditMimeType() { const KFileItemList items = m_view->selectedItems(); if (!items.isEmpty()) { - KonqOperations::editMimeType( items.first().mimetype(), m_view ); + KonqOperations::editMimeType(items.first().mimetype(), m_view); + } +} + +void DolphinPart::slotProperties() +{ + const KFileItemList items = m_view->selectedItems(); + if (!items.isEmpty()) { + KPropertiesDialog dialog(items.first().url(), m_view); + dialog.exec(); } } -- cgit v1.3