Fix issue that an old preview might be shown in a tooltip. Cool bug-id btw ;-)

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 1af74b2e31715f0034ba6e8f8c01da5d9c9c137a..d76cd8d23ebd17441d18e3cad5bdd4c6e0021dcf 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -21,14 +21,15 @@
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphincontextmenu.h"
 
 #include "dolphinmainwindow.h"

-#include "dolphinsettings.h"
-#include "dolphinview.h"
+#include "dolphinnewfilemenu.h"
+#include "settings/dolphinsettings.h"

 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
 #include <kactioncollection.h>
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
 #include <kactioncollection.h>

-#include <kfileplacesmodel.h>

 #include <kdesktopfile.h>
 #include <kdesktopfile.h>

+#include <kfileitemlistproperties.h>
+#include <kfileplacesmodel.h>

 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>


@@ -36,15 +37,12 @@
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>

-#include <knewmenu.h>
+#include <knewfilemenu.h>

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

-#include <konq_fileitemcapabilities.h>

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

-#include <konq_menuactions.h>
-#include <konq_popupmenuinformation.h>
+#include <kfileitemactions.h>

 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>

-#include <krun.h>

 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 


@@ -52,6 +50,9 @@
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 
 #include <QtGui/QClipboard>
 #include <QtCore/QDir>
 

+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
+

 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :


@@ -59,11 +60,13 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),

-    m_context(NoContext)
+    m_context(NoContext),
+    m_copyToMenu(parent),
+    m_customActions()

 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.

-    DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();

     m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
 }
     m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
 }


@@ -74,6 +77,11 @@ DolphinContextMenu::~DolphinContextMenu()
     m_capabilities = 0;
 }
 
     m_capabilities = 0;
 }
 

+void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
+{
+    m_customActions = actions;
+}
+

 void DolphinContextMenu::open()
 {
     // get the context information
 void DolphinContextMenu::open()
 {
     // get the context information


@@ -81,7 +89,7 @@ void DolphinContextMenu::open()
         m_context |= TrashContext;
     }
 
         m_context |= TrashContext;
     }
 

-    if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) {
+    if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {

         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }
         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }


@@ -117,6 +125,13 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 

+    // Don't show if url is already in places
+    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction->setVisible(false);
+    }
+
+    addCustomActions(popup);
+

     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
 


@@ -172,33 +187,38 @@ void DolphinContextMenu::openItemContextMenu()
     Q_ASSERT(!m_fileInfo.isNull());
 
     KMenu* popup = new KMenu(m_mainWindow);
     Q_ASSERT(!m_fileInfo.isNull());
 
     KMenu* popup = new KMenu(m_mainWindow);

+    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
+        // setup 'Create New' menu
+        DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(popup, m_mainWindow);
+        const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+        newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+        newFileMenu->checkUpToDate();
+        newFileMenu->setPopupFiles(m_fileInfo.url());
+        newFileMenu->setEnabled(capabilities().supportsWriting());
+
+        KMenu* menu = newFileMenu->menu();
+        menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
+        menu->setIcon(KIcon("document-new"));
+        popup->addMenu(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"));
+        popup->addSeparator();
+    }

     addShowMenubarAction(popup);
     insertDefaultItemActions(popup);
 
     popup->addSeparator();
 
     addShowMenubarAction(popup);
     insertDefaultItemActions(popup);
 
     popup->addSeparator();
 

-    // insert 'Bookmark This Folder' entry if exactly one item is selected
-    QAction* addToPlacesAction = 0;
-    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
-        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
-    }
-
-    KonqPopupMenuInformation popupInfo;
-    popupInfo.setItems(m_selectedItems);
-    popupInfo.setParentWidget(m_mainWindow);
-    KonqMenuActions menuActions;
-    menuActions.setPopupMenuInfo(popupInfo);
-
-    // Insert 'Open With...' action or sub menu
-    menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(capabilities());
+    addServiceActions(popup, fileItemActions);

 
 

-    // Insert 'Actions' sub menu
-    if (menuActions.addActionsTo(popup)) {
-        popup->addSeparator();
-    }
+    addVersionControlActions(popup);

 
 

-    // Insert 'Copy To' and 'Move To' sub menus
+    // insert 'Copy To' and 'Move To' sub menus

     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!capabilities().supportsWriting());


@@ -206,6 +226,13 @@ void DolphinContextMenu::openItemContextMenu()
         popup->addSeparator();
     }
 
         popup->addSeparator();
     }
 

+    // insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1) && !placeExists(m_fileInfo.url())) {
+        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
+    }
+

     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
     // insert 'Properties...' entry
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);


@@ -230,43 +257,51 @@ void DolphinContextMenu::openViewportContextMenu()
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu

-    KNewMenu* newMenu = m_mainWindow->newMenu();
-    newMenu->slotCheckUpToDate();
-    newMenu->setPopupFiles(m_baseUrl);
-    popup->addMenu(newMenu->menu());
+    KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newFileMenu->checkUpToDate();
+    newFileMenu->setPopupFiles(m_baseUrl);
+    popup->addMenu(newFileMenu->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"));

     popup->addSeparator();
 
     QAction* pasteAction = createPasteAction();
     popup->addAction(pasteAction);
     popup->addSeparator();
 
     QAction* pasteAction = createPasteAction();
     popup->addAction(pasteAction);

+    popup->addSeparator();

 
 

-    // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));
-
-    QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
-    viewModeMenu->addAction(iconsMode);
-
-    QAction* detailsMode = m_mainWindow->actionCollection()->action("details");
-    viewModeMenu->addAction(detailsMode);
-
-    QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
-    viewModeMenu->addAction(columnsMode);
+    // insert service actions
+    const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+    const KFileItemListProperties baseUrlProperties(KFileItemList() << item);
+    KFileItemActions fileItemActions;
+    fileItemActions.setItemListProperties(baseUrlProperties);
+    addServiceActions(popup, fileItemActions);

 
 

-    popup->addMenu(viewModeMenu);
+    addVersionControlActions(popup);

 
 

-    popup->addSeparator();
+    // insert 'Add to Places' entry if exactly one item is selected
+    QAction* addToPlacesAction = 0;
+    if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
+                                             i18nc("@action:inmenu Add current folder to places", "Add to Places"));
+    }

 
 

-    QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
-                                                  i18nc("@action:inmenu Add current folder to places", "Add to Places"));
-    popup->addSeparator();
+    addCustomActions(popup);

 
     QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
 
     QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));

-
+    propertiesAction->setIcon(KIcon("document-properties"));

     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();

-        KPropertiesDialog dialog(url, m_mainWindow);
-        dialog.exec();
-    } else if (action == addToPlacesAction) {
+
+        KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {

         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);


@@ -296,8 +331,10 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     popup->addAction(renameAction);
 
     // insert 'Move to Trash' and (optionally) 'Delete'
     popup->addAction(renameAction);
 
     // insert 'Move to Trash' and (optionally) 'Delete'

-    KConfigGroup kdeConfig(KGlobal::config(), "KDE");
-    bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
+    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");
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");


@@ -316,10 +353,6 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu)
 {
     KAction* showMenuBar = m_mainWindow->showMenuBarAction();
     if (!m_mainWindow->menuBar()->isVisible()) {
 {
     KAction* showMenuBar = m_mainWindow->showMenuBarAction();
     if (!m_mainWindow->menuBar()->isVisible()) {

-        // TODO: it should not be necessary to uncheck the menu
-        // bar action, but currently the action states don't get
-        // updated if the menu is disabled
-        showMenuBar->setChecked(false);

         menu->addAction(showMenuBar);
         menu->addSeparator();
     }
         menu->addAction(showMenuBar);
         menu->addSeparator();
     }


@@ -334,6 +367,21 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
     return name;
 }
 
     return name;
 }
 

+bool DolphinContextMenu::placeExists(const KUrl& url) const
+{
+    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    const int count = placesModel->rowCount();
+
+    for (int i = 0; i < count; ++i) {
+        const QModelIndex index = placesModel->index(i, 0);
+
+        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
+            return true;
+        }
+    }
+    return false;
+}
+

 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;
 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;


@@ -351,12 +399,44 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
     return action;
 }
 

-KonqFileItemCapabilities& DolphinContextMenu::capabilities()
+KFileItemListProperties& DolphinContextMenu::capabilities()

 {
     if (m_capabilities == 0) {
 {
     if (m_capabilities == 0) {

-        m_capabilities = new KonqFileItemCapabilities(m_selectedItems);
+        m_capabilities = new KFileItemListProperties(m_selectedItems);

     }
     return *m_capabilities;
 }
 
     }
     return *m_capabilities;
 }
 

+void DolphinContextMenu::addServiceActions(KMenu* menu, KFileItemActions& fileItemActions)
+{
+    fileItemActions.setParentWidget(m_mainWindow);
+
+    // insert 'Open With...' action or sub menu
+    fileItemActions.addOpenWithActionsTo(menu, "DesktopEntryName != 'dolphin'");
+
+    // insert 'Actions' sub menu
+    if (fileItemActions.addServiceActionsTo(menu)) {
+        menu->addSeparator();
+    }
+}
+
+void DolphinContextMenu::addVersionControlActions(KMenu* menu)
+{
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
+    if (!versionControlActions.isEmpty()) {
+        foreach (QAction* action, versionControlActions) {
+            menu->addAction(action);
+        }
+        menu->addSeparator();
+    }
+}
+
+void DolphinContextMenu::addCustomActions(KMenu* menu)
+{
+    foreach (QAction* action, m_customActions) {
+        menu->addAction(action);
+    }
+}
+

 #include "dolphincontextmenu.moc"
 #include "dolphincontextmenu.moc"