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

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 648928e0f29dffd08d7f9a49399b05cf29da8d98..d7953df4fd4c13e8b08aa64ef29297d3ccbf489c 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -261,7 +261,7 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();

-        KPropertiesDialog dialog(url);
+        KPropertiesDialog dialog(url, m_mainWindow);

         dialog.exec();
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         dialog.exec();
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index da6faecc6f4ceb59d7563c6855c85510e9f5a4fe..12ba14a9fc1e5f36c70e47720a28ef4730196c99 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,6 +18,7 @@
 */
 
 #include "dolphinpart.h"
 */
 
 #include "dolphinpart.h"

+#include <kpropertiesdialog.h>

 #include <kglobalsettings.h>
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include <kglobalsettings.h>
 #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" );
     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()));
 
     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" );
     // 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;
     }
 
     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);
     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()) {
 {
     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();

     }
 }
 
     }
 }
 

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 23a5ea653e2bf13b307ed0d65305d653ff52c4c3..300924a8da9d79c939f18655c88f34dc0b805004 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -130,6 +130,11 @@ private Q_SLOTS:
      */
     void slotEditMimeType();
 
      */
     void slotEditMimeType();
 

+    /**
+     * Connected to the "properties" action
+     */
+    void slotProperties();
+

 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,

diff --git a/src/dolphinpart.rc b/src/dolphinpart.rc
index 325a3650fc263d95a5e922319b3f78f642c797af..35bde506e792442ad5421fdbc3d4c1b347275ae4 100644 (file)
--- a/src/dolphinpart.rc
+++ b/src/dolphinpart.rc
@@ -1,11 +1,12 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">

-<kpartgui name="dolphinpart" version="5" >
+<kpartgui name="dolphinpart" version="6" >

  <MenuBar>
   <Menu name="edit">
    <Action name="rename"/>
    <Action name="move_to_trash" />
    <Action name="delete"/>
    <Action name="editMimeType"/>
  <MenuBar>
   <Menu name="edit">
    <Action name="rename"/>
    <Action name="move_to_trash" />
    <Action name="delete"/>
    <Action name="editMimeType"/>

+   <Action name="properties"/>

    <Separator />
    <Action name="select_all" />
    <Action name="invert_selection" />
    <Separator />
    <Action name="select_all" />
    <Action name="invert_selection" />

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index f73b50481891143c2507c522b6710db7c2257916..40c5e9cd8f4fd8844685e3de72898314751650c0 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -164,7 +164,7 @@ void TreeViewContextMenu::deleteItem()
 
 void TreeViewContextMenu::showProperties()
 {
 
 void TreeViewContextMenu::showProperties()
 {

-    KPropertiesDialog dialog(m_fileInfo.url());
+    KPropertiesDialog dialog(m_fileInfo.url(), m_parent);

     dialog.exec();
 }
 
     dialog.exec();
 }