SVN_SILENT Added newline at EOF.

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 107c2b24ac9db54f39764b5b1bb6c2703f03d5b4..1d99f96373e7dcce4817954c7946dfc9b1eea1cc 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
@@ -60,7 +60,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
-    m_context(NoContext)
+    m_context(NoContext),
+    m_copyToMenu(parent)
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
@@ -179,13 +180,13 @@ void DolphinContextMenu::openItemContextMenu()
         newMenu->slotCheckUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
         newMenu->setEnabled(capabilities().supportsWriting());
-        
+
         KMenu* menu = newMenu->menu();
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));
         popup->addMenu(newMenu->menu());
         popup->addSeparator();
-    
+
         // insert 'Open in new window' and 'Open in new tab' entries
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
@@ -283,12 +284,10 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
-                
+
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
@@ -322,7 +321,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
-    
+
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");