Adding license header in kitemlistviewaccessible

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 7aac7707bb7c161698ef0e0122b5ab10fec5b2d9..bb26c7aaeda87ba77f9e241cfde6c4961ce90640 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,7 +22,6 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"

-#include "settings/dolphinsettings.h"

 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 


@@ -32,7 +31,6 @@
 #include <kabstractfileitemactionplugin.h>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <kabstractfileitemactionplugin.h>
 #include <KFileItemActions>
 #include <KFileItemListProperties>

-#include <KFilePlacesModel>

 #include <KGlobal>
 #include <KIconLoader>
 #include <KIO/NetAccess>
 #include <KGlobal>
 #include <KIconLoader>
 #include <KIO/NetAccess>


@@ -51,6 +49,9 @@
 #include <KStandardDirs>
 #include <KToolBar>
 
 #include <KStandardDirs>
 #include <KToolBar>
 

+#include <panels/places/placesitem.h>
+#include <panels/places/placesitemmodel.h>
+

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


@@ -61,8 +62,11 @@
 K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,

+                                       const QPoint& pos,

                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :

+    QObject(parent),
+    m_pos(pos),

     m_mainWindow(parent),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
     m_mainWindow(parent),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),


@@ -86,8 +90,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
         if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
             m_shiftPressed = true;
         }
         if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
             m_shiftPressed = true;
         }

-        connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)),
-                this, SLOT(slotKeyModifierPressed(Qt::Key, bool)));
+        connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key,bool)),
+                this, SLOT(slotKeyModifierPressed(Qt::Key,bool)));

     }
 
     m_removeAction = new QAction(this);
     }
 
     m_removeAction = new QAction(this);


@@ -156,10 +160,10 @@ void DolphinContextMenu::slotKeyModifierPressed(Qt::Key key, bool pressed)
 void DolphinContextMenu::slotRemoveActionTriggered()
 {
     const KActionCollection* collection = m_mainWindow->actionCollection();
 void DolphinContextMenu::slotRemoveActionTriggered()
 {
     const KActionCollection* collection = m_mainWindow->actionCollection();

-    if (m_shiftPressed) {
-        collection->action("delete")->trigger();
-    } else {
+    if (moveToTrash()) {

         collection->action("move_to_trash")->trigger();
         collection->action("move_to_trash")->trigger();

+    } else {
+        collection->action("delete")->trigger();

     }
 }
 
     }
 }
 


@@ -172,14 +176,6 @@ void DolphinContextMenu::openTrashContextMenu()
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     m_popup->addAction(emptyTrashAction);
 
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     m_popup->addAction(emptyTrashAction);
 

-    QAction* addToPlacesAction = m_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();
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     addCustomActions();
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");


@@ -187,14 +183,8 @@ void DolphinContextMenu::openTrashContextMenu()
 
     addShowMenuBarAction();
 
 
     addShowMenuBarAction();
 

-    QAction *action = m_popup->exec(QCursor::pos());
-    if (action == emptyTrashAction) {
+    if (m_popup->exec(m_pos) == emptyTrashAction) {

         KonqOperations::emptyTrash(m_mainWindow);
         KonqOperations::emptyTrash(m_mainWindow);

-    } else if (action == addToPlacesAction) {
-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
-        if (url.isValid()) {
-            DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
-        }

     }
 }
 
     }
 }
 


@@ -212,7 +202,7 @@ void DolphinContextMenu::openTrashItemContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 

-    if (m_popup->exec(QCursor::pos()) == restoreAction) {
+    if (m_popup->exec(m_pos) == restoreAction) {

         KUrl::List selectedUrls;
         foreach (const KFileItem &item, m_selectedItems) {
             selectedUrls.append(item.url());
         KUrl::List selectedUrls;
         foreach (const KFileItem &item, m_selectedItems) {
             selectedUrls.append(item.url());


@@ -234,7 +224,7 @@ void DolphinContextMenu::openItemContextMenu()
             // setup 'Create New' menu
             DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
             const DolphinView* view = m_mainWindow->activeViewContainer()->view();
             // setup 'Create New' menu
             DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
             const DolphinView* view = m_mainWindow->activeViewContainer()->view();

-            newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+            newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());

             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());


@@ -289,7 +279,7 @@ void DolphinContextMenu::openItemContextMenu()
     addVersionControlPluginActions();
 
     // insert 'Copy To' and 'Move To' sub menus
     addVersionControlPluginActions();
 
     // insert 'Copy To' and 'Move To' sub menus

-    if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
+    if (GeneralSettings::showCopyMoveMenu()) {

         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!selectedItemsProperties().supportsWriting());
         m_copyToMenu.addActionsTo(m_popup);
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!selectedItemsProperties().supportsWriting());
         m_copyToMenu.addActionsTo(m_popup);


@@ -299,13 +289,15 @@ void DolphinContextMenu::openItemContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 

-    QAction* activatedAction = m_popup->exec(QCursor::pos());
+    QAction* activatedAction = m_popup->exec(m_pos);

     if (activatedAction) {
         if (activatedAction == addToPlacesAction) {
             const KUrl selectedUrl(m_fileInfo.url());
             if (selectedUrl.isValid()) {
     if (activatedAction) {
         if (activatedAction == addToPlacesAction) {
             const KUrl selectedUrl(m_fileInfo.url());
             if (selectedUrl.isValid()) {

-                DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl),
-                                                                    selectedUrl);
+                PlacesItemModel model;
+                const QString text = selectedUrl.fileName();
+                PlacesItem* item = model.createPlacesItem(text, selectedUrl);
+                model.appendItemToGroup(item);

             }
         } else if (activatedAction == openParentInNewWindowAction) {
             m_command = OpenParentFolderInNewWindow;
             }
         } else if (activatedAction == openParentInNewWindowAction) {
             m_command = OpenParentFolderInNewWindow;


@@ -320,7 +312,7 @@ void DolphinContextMenu::openViewportContextMenu()
     // setup 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     // setup 'Create New' menu
     KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();

-    newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());

     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(m_baseUrl);
     m_popup->addMenu(newFileMenu->menu());
     newFileMenu->checkUpToDate();
     newFileMenu->setPopupFiles(m_baseUrl);
     m_popup->addMenu(newFileMenu->menu());


@@ -361,11 +353,14 @@ void DolphinContextMenu::openViewportContextMenu()
 
     addShowMenuBarAction();
 
 
     addShowMenuBarAction();
 

-    QAction* action = m_popup->exec(QCursor::pos());
+    QAction* action = m_popup->exec(m_pos);

     if (addToPlacesAction && (action == addToPlacesAction)) {
     if (addToPlacesAction && (action == addToPlacesAction)) {

-        const KUrl url = m_mainWindow->activeViewContainer()->url();
-        if (url.isValid()) {
-            DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
+        const DolphinViewContainer* container =  m_mainWindow->activeViewContainer();
+        if (container->url().isValid()) {
+            PlacesItemModel model;
+            PlacesItem* item = model.createPlacesItem(container->placesText(),
+                                                      container->url());
+            model.appendItemToGroup(item);

         }
     }
 }
         }
     }
 }


@@ -405,27 +400,18 @@ void DolphinContextMenu::addShowMenuBarAction()
     }
 }
 
     }
 }
 

-QString DolphinContextMenu::placesName(const KUrl& url) const
-{
-    QString name = url.fileName();
-    if (name.isEmpty()) {
-        name = url.host();
-    }
-    return name;
-}
-

 bool DolphinContextMenu::placeExists(const KUrl& url) const
 {
 bool DolphinContextMenu::placeExists(const KUrl& url) const
 {

-    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    const int count = placesModel->rowCount();
+    PlacesItemModel model;

 
 

+    const int count = model.count();

     for (int i = 0; i < count; ++i) {
     for (int i = 0; i < count; ++i) {

-        const QModelIndex index = placesModel->index(i, 0);
-
-        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
+        const KUrl placeUrl = model.placesItem(i)->url();
+        if (placeUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {

             return true;
         }
     }
             return true;
         }
     }

+

     return false;
 }
 
     return false;
 }
 


@@ -446,7 +432,7 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
     return action;
 }
 

-KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
+KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const

 {
     if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
 {
     if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);


@@ -538,13 +524,12 @@ void DolphinContextMenu::addCustomActions()
 void DolphinContextMenu::updateRemoveAction()
 {
     const KActionCollection* collection = m_mainWindow->actionCollection();
 void DolphinContextMenu::updateRemoveAction()
 {
     const KActionCollection* collection = m_mainWindow->actionCollection();

-    const bool moveToTrash = selectedItemsProperties().isLocal() && !m_shiftPressed;

 
     // Using m_removeAction->setText(action->text()) does not apply the &-shortcut.
     // This is only done until the original action has been shown at least once. To
     // bypass this issue, the text and &-shortcut is applied manually.
     const QAction* action = 0;
 
     // Using m_removeAction->setText(action->text()) does not apply the &-shortcut.
     // This is only done until the original action has been shown at least once. To
     // bypass this issue, the text and &-shortcut is applied manually.
     const QAction* action = 0;

-    if (moveToTrash) {
+    if (moveToTrash()) {

         action = collection->action("move_to_trash");
         m_removeAction->setText(i18nc("@action:inmenu", "&Move to Trash"));
     } else {
         action = collection->action("move_to_trash");
         m_removeAction->setText(i18nc("@action:inmenu", "&Move to Trash"));
     } else {


@@ -555,4 +540,9 @@ void DolphinContextMenu::updateRemoveAction()
     m_removeAction->setShortcuts(action->shortcuts());
 }
 
     m_removeAction->setShortcuts(action->shortcuts());
 }
 

+bool DolphinContextMenu::moveToTrash() const
+{
+    return !m_shiftPressed;
+}
+

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