Remove the automoc noise

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

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 5c9151df0603055ffe2578f822b6b200036d805d..ff0801d1a9fe64a83ce904918a8f8d1c4c06e094 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *
 /***************************************************************************
  *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *

- *   Copyright (C) 2006 by Cvetoslav Ludmiloff                             *
+ *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -20,27 +20,30 @@
 
 #include "treeviewcontextmenu.h"
 
 
 #include "treeviewcontextmenu.h"
 

-#include <kfileitem.h>
-#include <kiconloader.h>
-#include <kio/deletejob.h>
-#include <kmenu.h>
+#include <KFileItem>
+#include <KIconLoader>
+#include <KIO/DeleteJob>
+#include <KMenu>
+#include <KIcon>
+#include <KSharedConfig>
+#include <KConfigGroup>

 #include <konqmimedata.h>
 #include <konqmimedata.h>

-#include <kfileitemlistproperties.h>
+#include <KFileItemListProperties>

 #include <konq_operations.h>
 #include <konq_operations.h>

-#include <klocale.h>
-#include <kpropertiesdialog.h>
+#include <KLocale>
+#include <KPropertiesDialog>

 
 #include "folderspanel.h"
 
 #include <QApplication>
 #include <QClipboard>
 
 #include "folderspanel.h"
 
 #include <QApplication>
 #include <QClipboard>

-#include <QPointer>
+#include <QMimeData>

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

-    m_fileInfo(fileInfo)
+    m_fileItem(fileInfo)

 {
 }
 
 {
 }
 


@@ -52,22 +55,21 @@ void TreeViewContextMenu::open()
 {
     KMenu* popup = new KMenu(m_parent);
 
 {
     KMenu* popup = new KMenu(m_parent);
 

-    if (!m_fileInfo.isNull()) {
-        KFileItemListProperties capabilities(KFileItemList() << m_fileInfo);
+    if (!m_fileItem.isNull()) {
+        KFileItemListProperties capabilities(KFileItemList() << m_fileItem);

 
         // insert 'Cut', 'Copy' and 'Paste'
         QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
         cutAction->setEnabled(capabilities.supportsMoving());
 
         // insert 'Cut', 'Copy' and 'Paste'
         QAction* cutAction = new QAction(KIcon("edit-cut"), i18nc("@action:inmenu", "Cut"), this);
         cutAction->setEnabled(capabilities.supportsMoving());

-        connect(cutAction, SIGNAL(triggered()), this, SLOT(cut()));
+        connect(cutAction, &QAction::triggered, this, &TreeViewContextMenu::cut);

 
         QAction* copyAction = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this);
 
         QAction* copyAction = new QAction(KIcon("edit-copy"), i18nc("@action:inmenu", "Copy"), this);

-        connect(copyAction, SIGNAL(triggered()), this, SLOT(copy()));
+        connect(copyAction, &QAction::triggered, this, &TreeViewContextMenu::copy);

 
 

-        QAction* pasteAction = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste"), this);
-        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);
-        connect(pasteAction, SIGNAL(triggered()), this, SLOT(paste()));
-        pasteAction->setEnabled(!pasteData.isEmpty() && capabilities.supportsWriting());
+        const QPair<bool, QString> pasteInfo = KonqOperations::pasteInfo(m_fileItem.url());
+        QAction* pasteAction = new QAction(KIcon("edit-paste"), pasteInfo.second, this);
+        connect(pasteAction, &QAction::triggered, this, &TreeViewContextMenu::paste);
+        pasteAction->setEnabled(pasteInfo.first);

 
         popup->addAction(cutAction);
         popup->addAction(copyAction);
 
         popup->addAction(cutAction);
         popup->addAction(copyAction);


@@ -78,7 +80,7 @@ void TreeViewContextMenu::open()
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
         renameAction->setIcon(KIcon("edit-rename"));
         QAction* renameAction = new QAction(i18nc("@action:inmenu", "Rename..."), this);
         renameAction->setEnabled(capabilities.supportsMoving());
         renameAction->setIcon(KIcon("edit-rename"));

-        connect(renameAction, SIGNAL(triggered()), this, SLOT(rename()));
+        connect(renameAction, &QAction::triggered, this, &TreeViewContextMenu::rename);

         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'
         popup->addAction(renameAction);
 
         // insert 'Move to Trash' and (optionally) 'Delete'


@@ -86,13 +88,13 @@ void TreeViewContextMenu::open()
         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
 
         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
 

-        const KUrl url = m_fileInfo.url();
+        const KUrl url = m_fileItem.url();

         if (url.isLocalFile()) {
             QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
                                                     i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);
         if (url.isLocalFile()) {
             QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
                                                     i18nc("@action:inmenu", "Move to Trash"), this);
             const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
             moveToTrashAction->setEnabled(enableMoveToTrash);

-            connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash()));
+            connect(moveToTrashAction, &QAction::triggered, this, &TreeViewContextMenu::moveToTrash);

             popup->addAction(moveToTrashAction);
         } else {
             showDeleteCommand = true;
             popup->addAction(moveToTrashAction);
         } else {
             showDeleteCommand = true;


@@ -101,49 +103,59 @@ void TreeViewContextMenu::open()
         if (showDeleteCommand) {
             QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
             deleteAction->setEnabled(capabilities.supportsDeleting());
         if (showDeleteCommand) {
             QAction* deleteAction = new QAction(KIcon("edit-delete"), i18nc("@action:inmenu", "Delete"), this);
             deleteAction->setEnabled(capabilities.supportsDeleting());

-            connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem()));
+            connect(deleteAction, &QAction::triggered, this, &TreeViewContextMenu::deleteItem);

             popup->addAction(deleteAction);
         }
 
         popup->addSeparator();
             popup->addAction(deleteAction);
         }
 
         popup->addSeparator();

-
-        // insert 'Properties' entry
-        QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
-        propertiesAction->setIcon(KIcon("document-properties"));
-        connect(propertiesAction, SIGNAL(triggered()), this, SLOT(showProperties()));
-        popup->addAction(propertiesAction);
-
-        popup->addSeparator();

     }
 
     }
 

+    // insert 'Show Hidden Files'

     QAction* showHiddenFilesAction = new QAction(i18nc("@action:inmenu", "Show Hidden Files"), this);
     showHiddenFilesAction->setCheckable(true);
     showHiddenFilesAction->setChecked(m_parent->showHiddenFiles());
     popup->addAction(showHiddenFilesAction);
     QAction* showHiddenFilesAction = new QAction(i18nc("@action:inmenu", "Show Hidden Files"), this);
     showHiddenFilesAction->setCheckable(true);
     showHiddenFilesAction->setChecked(m_parent->showHiddenFiles());
     popup->addAction(showHiddenFilesAction);

-    connect(showHiddenFilesAction, SIGNAL(toggled(bool)), this, SLOT(setShowHiddenFiles(bool)));
+    connect(showHiddenFilesAction, &QAction::toggled, this, &TreeViewContextMenu::setShowHiddenFiles);

 
 

+    // insert 'Automatic Scrolling'

     QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
     autoScrollingAction->setCheckable(true);
     autoScrollingAction->setChecked(m_parent->autoScrolling());
     QAction* autoScrollingAction = new QAction(i18nc("@action:inmenu", "Automatic Scrolling"), this);
     autoScrollingAction->setCheckable(true);
     autoScrollingAction->setChecked(m_parent->autoScrolling());

-    popup->addAction(autoScrollingAction);
-    connect(autoScrollingAction, SIGNAL(toggled(bool)), this, SLOT(setAutoScrolling(bool)));
+    // TODO: Temporary disabled. Horizontal autoscrolling will be implemented later either
+    // in KItemViews or manually as part of the FoldersPanel
+    //popup->addAction(autoScrollingAction);
+    connect(autoScrollingAction, &QAction::toggled, this, &TreeViewContextMenu::setAutoScrolling);

 
 

-    popup->addSeparator();
-    foreach (QAction* action, m_parent->customContextMenuActions()) {
-        popup->addAction(action);
+    if (!m_fileItem.isNull()) {
+        // insert 'Properties' entry
+        QAction* propertiesAction = new QAction(i18nc("@action:inmenu", "Properties"), this);
+        propertiesAction->setIcon(KIcon("document-properties"));
+        connect(propertiesAction, &QAction::triggered, this, &TreeViewContextMenu::showProperties);
+        popup->addAction(propertiesAction);
+    }
+
+    QList<QAction*> customActions = m_parent->customContextMenuActions();
+    if (!customActions.isEmpty()) {
+        popup->addSeparator();
+        foreach (QAction* action, customActions) {
+            popup->addAction(action);
+        }

     }
 
     }
 

+    QWeakPointer<KMenu> popupPtr = popup;

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

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

 }
 
 void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
 {
     KUrl::List kdeUrls;
 }
 
 void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
 {
     KUrl::List kdeUrls;

-    kdeUrls.append(m_fileInfo.url());
+    kdeUrls.append(m_fileItem.url());

     KUrl::List mostLocalUrls;
     bool dummy;
     KUrl::List mostLocalUrls;
     bool dummy;

-    mostLocalUrls.append(m_fileInfo.mostLocalUrl(dummy));
+    mostLocalUrls.append(m_fileItem.mostLocalUrl(dummy));

     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, cut);
 }
 
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, cut);
 }
 


@@ -163,39 +175,29 @@ void TreeViewContextMenu::copy()
 
 void TreeViewContextMenu::paste()
 {
 
 void TreeViewContextMenu::paste()
 {

-    QClipboard* clipboard = QApplication::clipboard();
-    const QMimeData* mimeData = clipboard->mimeData();
-
-    const KUrl::List source = KUrl::List::fromMimeData(mimeData);
-    const KUrl& dest = m_fileInfo.url();
-    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
-        KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
-        clipboard->clear();
-    } else {
-        KonqOperations::copy(m_parent, KonqOperations::COPY, source, dest);
-    }
+    KonqOperations::doPaste(m_parent, m_fileItem.url());

 }
 
 void TreeViewContextMenu::rename()
 {
 }
 
 void TreeViewContextMenu::rename()
 {

-    m_parent->rename(m_fileInfo);
+    m_parent->rename(m_fileItem);

 }
 
 void TreeViewContextMenu::moveToTrash()
 {
 }
 
 void TreeViewContextMenu::moveToTrash()
 {

-    KonqOperations::del(m_parent, KonqOperations::TRASH, m_fileInfo.url());
+    KonqOperations::del(m_parent, KonqOperations::TRASH, KUrl::List() << m_fileItem.url());

 }
 
 void TreeViewContextMenu::deleteItem()
 {
 }
 
 void TreeViewContextMenu::deleteItem()
 {

-    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo.url());
+    KonqOperations::del(m_parent, KonqOperations::DEL, KUrl::List() << m_fileItem.url());

 }
 
 void TreeViewContextMenu::showProperties()
 {
 }
 
 void TreeViewContextMenu::showProperties()
 {

-    QPointer<KPropertiesDialog> dialog = new KPropertiesDialog(m_fileInfo.url(), m_parent);
-    dialog->exec();
-    delete dialog;
+    KPropertiesDialog* dialog = new KPropertiesDialog(m_fileItem.url(), m_parent);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();

 }
 
 void TreeViewContextMenu::setShowHiddenFiles(bool show)
 }
 
 void TreeViewContextMenu::setShowHiddenFiles(bool show)


@@ -208,4 +210,3 @@ void TreeViewContextMenu::setAutoScrolling(bool enable)
     m_parent->setAutoScrolling(enable);
 }
 
     m_parent->setAutoScrolling(enable);
 }
 

-#include "treeviewcontextmenu.moc"