Forwardport 773570:

[dolphin.git] / src / treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index d095ee13d00d1397ea1f19eccfe9acb9ca22b6f9..40c5e9cd8f4fd8844685e3de72898314751650c0 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -79,7 +79,7 @@ void TreeViewContextMenu::open()
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_fileInfo.url();
     if (url.isLocalFile()) {
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
     const KUrl& url = m_fileInfo.url();
     if (url.isLocalFile()) {

-        QAction* moveToTrashAction = new QAction(KIcon("edit-trash"),
+        QAction* moveToTrashAction = new QAction(KIcon("user-trash"),

                                                  i18nc("@action:inmenu", "Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);
                                                  i18nc("@action:inmenu", "Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);


@@ -141,7 +141,7 @@ void TreeViewContextMenu::rename()
 {
     KFileItemList item;
     item.append(m_fileInfo);
 {
     KFileItemList item;
     item.append(m_fileInfo);

-    RenameDialog dialog(item);
+    RenameDialog dialog(m_parent, item);

     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {
     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {


@@ -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();
 }