Change default Dolphin toolbar layout

[dolphin.git] / src / panels / folders / treeviewcontextmenu.cpp

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 6381a88ff13993cfc8e254a00f55e24b15c32405..df9b9d62e5aba15270814b27907a83b1ce71dd4a 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -20,30 +20,28 @@
 
 #include "treeviewcontextmenu.h"
 
 
 #include "treeviewcontextmenu.h"
 

-#include <KFileItem>
+#include "folderspanel.h"
+#include "global.h"
+
+#include <KConfigGroup>
+#include <KFileItemListProperties>

 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>

+#include <KIO/FileUndoManager>

 #include <KIO/JobUiDelegate>
 #include <KIO/JobUiDelegate>

-#include <QMenu>
-#include <QIcon>
+#include <KIO/Paste>
+#include <KIO/PasteJob>

 #include <KJobWidgets>
 #include <KJobWidgets>

-#include <KSharedConfig>
-#include <KConfigGroup>
-#include <KUrlMimeData>
-#include <KFileItemListProperties>

 #include <KLocalizedString>
 #include <KLocalizedString>

-#include <KIO/PasteJob>
-#include <KIO/Paste>
-#include <KIO/FileUndoManager>

 #include <KPropertiesDialog>
 #include <KPropertiesDialog>

-
-#include "folderspanel.h"
+#include <KSharedConfig>
+#include <KUrlMimeData>

 
 #include <QApplication>
 #include <QClipboard>
 
 #include <QApplication>
 #include <QClipboard>

+#include <QMenu>

 #include <QMimeData>
 #include <QPointer>
 #include <QMimeData>
 #include <QPointer>

-#include "global.h"

 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :


@@ -57,7 +55,7 @@ TreeViewContextMenu::~TreeViewContextMenu()
 {
 }
 
 {
 }
 

-void TreeViewContextMenu::open()
+void TreeViewContextMenu::open(const QPoint& pos)

 {
     QMenu* popup = new QMenu(m_parent);
 
 {
     QMenu* popup = new QMenu(m_parent);
 


@@ -125,12 +123,13 @@ void TreeViewContextMenu::open()
     popup->addAction(showHiddenFilesAction);
     connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);
 
     popup->addAction(showHiddenFilesAction);
     connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);
 

-    // insert 'Limit to Home Directory'
-    const QUrl url = m_fileItem.url();
-    const bool showLimitToHomeDirectory = url.isLocalFile() && (Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url));
-    if (showLimitToHomeDirectory) {
+    if (!m_fileItem.isNull()) {
+        // insert 'Limit to Home Directory'
+        const QUrl url = m_fileItem.url();
+        const bool enableLimitToHomeDirectory = url.isLocalFile();

         QAction* limitFoldersPanelToHomeAction = new QAction(i18nc("@action:inmenu", "Limit to Home Directory"), this);
         limitFoldersPanelToHomeAction->setCheckable(true);
         QAction* limitFoldersPanelToHomeAction = new QAction(i18nc("@action:inmenu", "Limit to Home Directory"), this);
         limitFoldersPanelToHomeAction->setCheckable(true);

+        limitFoldersPanelToHomeAction->setEnabled(enableLimitToHomeDirectory);

         limitFoldersPanelToHomeAction->setChecked(m_parent->limitFoldersPanelToHome());
         popup->addAction(limitFoldersPanelToHomeAction);
         connect(limitFoldersPanelToHomeAction, &QAction::toggled, this, &TreeViewContextMenu::setLimitFoldersPanelToHome);
         limitFoldersPanelToHomeAction->setChecked(m_parent->limitFoldersPanelToHome());
         popup->addAction(limitFoldersPanelToHomeAction);
         connect(limitFoldersPanelToHomeAction, &QAction::toggled, this, &TreeViewContextMenu::setLimitFoldersPanelToHome);


@@ -162,7 +161,7 @@ void TreeViewContextMenu::open()
     }
 
     QPointer<QMenu> popupPtr = popup;
     }
 
     QPointer<QMenu> popupPtr = popup;

-    popup->exec(QCursor::pos());
+    popup->exec(pos);

     if (popupPtr.data()) {
         popupPtr.data()->deleteLater();
     }
     if (popupPtr.data()) {
         popupPtr.data()->deleteLater();
     }