Draw dragged items. Better conditions (more accurate to our behavior, hey ! we have...

[dolphin.git] / src / treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index cdb1afedad8edd01c01fae8f820e8d04c0ffa610..ec6d322008b5e98e66f14e2f86e6fd16111cfdb4 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -30,8 +30,8 @@
 
 #include "renamedialog.h"
 
 
 #include "renamedialog.h"
 

-#include <QApplication>
-#include <QClipboard>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>

 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
                                          KFileItem* fileInfo) :
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
                                          KFileItem* fileInfo) :


@@ -69,7 +69,7 @@ void TreeViewContextMenu::open()
     popup->addSeparator();
 
     // insert 'Rename'
     popup->addSeparator();
 
     // insert 'Rename'

-    QAction* renameAction = new QAction(i18n("Rename"), this);
+    QAction* renameAction = new QAction(i18n("Rename..."), this);

     connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
     popup->addAction(renameAction);
 
     connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
     popup->addAction(renameAction);
 


@@ -82,8 +82,7 @@ void TreeViewContextMenu::open()
         QAction* moveToTrashAction = new QAction(KIcon("edit-trash"), i18n("Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);
         QAction* moveToTrashAction = new QAction(KIcon("edit-trash"), i18n("Move To Trash"), this);
         connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
         popup->addAction(moveToTrashAction);

-    }
-    else {
+    } else {

         showDeleteCommand = true;
     }
 
         showDeleteCommand = true;
     }
 


@@ -95,9 +94,9 @@ void TreeViewContextMenu::open()
 
     popup->addSeparator();
 
 
     popup->addSeparator();
 

-    // insert 'Properties...' entry
-    QAction* propertiesAction = new QAction(i18n("Properties..."), this);
-    connect(this, SIGNAL(triggered()), this, SLOT(showProperties()));
+    // insert 'Properties' entry
+    QAction* propertiesAction = new QAction(i18n("Properties"), this);
+    connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));

     popup->addAction(propertiesAction);
 
     popup->exec(QCursor::pos());
     popup->addAction(propertiesAction);
 
     popup->exec(QCursor::pos());


@@ -132,8 +131,7 @@ void TreeViewContextMenu::paste()
     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
         KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
         clipboard->clear();
     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
         KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
         clipboard->clear();

-    }
-    else {
+    } else {

         KonqOperations::copy(m_parent, KonqOperations::COPY, source, dest);
     }
 }
         KonqOperations::copy(m_parent, KonqOperations::COPY, source, dest);
     }
 }


@@ -164,7 +162,8 @@ void TreeViewContextMenu::deleteItem()
 
 void TreeViewContextMenu::showProperties()
 {
 
 void TreeViewContextMenu::showProperties()
 {

-    new KPropertiesDialog(m_fileInfo->url());
+    KPropertiesDialog dialog(m_fileInfo->url());
+    dialog.exec();

 }
 
 #include "treeviewcontextmenu.moc"
 }
 
 #include "treeviewcontextmenu.moc"