Fix style-issues in items when not using Oxygen

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index c2b15401295d176a3661c9c4008a87bb9a0c00b3..8d4a3173dafa2506737c8aca7bce1b71587949d9 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,45 +22,50 @@
 
 #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"
 

-#include <kactioncollection.h>
-#include <kdesktopfile.h>
+#include <KActionCollection>
+#include <KDesktopFile>

 #include <kfileitemactionplugin.h>
 #include <kfileitemactionplugin.h>

-#include <kfileitemactions.h>
-#include <kfileitemlistproperties.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kmimetypetrader.h>
-#include <kmodifierkeyinfo.h>
-#include <knewfilemenu.h>
+#include <kabstractfileitemactionplugin.h>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KMimeTypeTrader>
+#include <KModifierKeyInfo>
+#include <KNewFileMenu>

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

-#include <kservice.h>
-#include <klocale.h>
-#include <kpropertiesdialog.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
-
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QDir>
-
+#include <KService>
+#include <KLocale>
+#include <KPropertiesDialog>
+#include <KStandardAction>
+#include <KStandardDirs>
+#include <KToolBar>
+
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+
+#include "views/dolphinplacesmodel.h"

 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
 
 K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
 
 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),


@@ -80,12 +85,12 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedItems = view->selectedItems();
 
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedItems = view->selectedItems();
 

-    if (m_keyInfo != 0) {
+    if (m_keyInfo) {

         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);


@@ -165,8 +170,6 @@ void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
 {
     Q_ASSERT(m_context & TrashContext);
 

-    addShowMenubarAction();
-

     QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), m_popup);
     KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), m_popup);
     KConfig trashConfig("trashrc", KConfig::SimpleConfig);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));


@@ -185,22 +188,15 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 

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

     if (action == emptyTrashAction) {
     if (action == emptyTrashAction) {

-        const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
-        const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
-                                                            text,
-                                                            QString(),
-                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
-                                                                     KIcon("user-trash"))
-                                                           ) == KMessageBox::Continue;
-        if (del) {
-            KonqOperations::emptyTrash(m_mainWindow);
-        }
+        KonqOperations::emptyTrash(m_mainWindow);

     } else if (action == addToPlacesAction) {
     } else if (action == addToPlacesAction) {

-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+        const KUrl url = m_mainWindow->activeViewContainer()->url();

         if (url.isValid()) {
         if (url.isValid()) {

-            DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
+            DolphinPlacesModel::instance()->addPlace(i18nc("@label", "Trash"), url);

         }
     }
 }
         }
     }
 }


@@ -210,8 +206,6 @@ void DolphinContextMenu::openTrashItemContextMenu()
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 
     Q_ASSERT(m_context & TrashContext);
     Q_ASSERT(m_context & ItemContext);
 

-    addShowMenubarAction();
-

     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     m_popup->addAction(restoreAction);
 
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     m_popup->addAction(restoreAction);
 


@@ -221,7 +215,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());


@@ -241,12 +235,14 @@ void DolphinContextMenu::openItemContextMenu()
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu

-            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup, m_mainWindow);
+            DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);

             const DolphinView* view = m_mainWindow->activeViewContainer()->view();
             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());

+            connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
+            connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));

 
             KMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
 
             KMenu* menu = newFileMenu->menu();
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));


@@ -283,7 +279,6 @@ void DolphinContextMenu::openItemContextMenu()
         }
     }
 
         }
     }
 

-    addShowMenubarAction();

     insertDefaultItemActions();
 
     m_popup->addSeparator();
     insertDefaultItemActions();
 
     m_popup->addSeparator();


@@ -297,7 +292,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);


@@ -307,13 +302,13 @@ 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());
-    if (activatedAction != 0) {
+    QAction* activatedAction = m_popup->exec(m_pos);
+    if (activatedAction) {

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

-                DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl),
-                                                                    selectedUrl);
+                DolphinPlacesModel::instance()->addPlace(placesName(selectedUrl),
+                                                         selectedUrl);

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


@@ -325,12 +320,10 @@ void DolphinContextMenu::openItemContextMenu()
 
 void DolphinContextMenu::openViewportContextMenu()
 {
 
 void DolphinContextMenu::openViewportContextMenu()
 {

-    addShowMenubarAction();
-

     // 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());


@@ -366,19 +359,16 @@ void DolphinContextMenu::openViewportContextMenu()
 
     addCustomActions();
 
 
     addCustomActions();
 

-    QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
-    propertiesAction->setIcon(KIcon("document-properties"));
-    QAction* action = m_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();
-    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {
-        const KUrl& url = m_mainWindow->activeViewContainer()->url();
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    m_popup->addAction(propertiesAction);
+
+    addShowMenuBarAction();
+
+    QAction* action = m_popup->exec(m_pos);
+    if (addToPlacesAction && (action == addToPlacesAction)) {
+        const KUrl url = m_mainWindow->activeViewContainer()->url();

         if (url.isValid()) {
         if (url.isValid()) {

-            DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
+            DolphinPlacesModel::instance()->addPlace(placesName(url), url);

         }
     }
 }
         }
     }
 }


@@ -408,12 +398,13 @@ void DolphinContextMenu::insertDefaultItemActions()
     }
 }
 
     }
 }
 

-void DolphinContextMenu::addShowMenubarAction()
+void DolphinContextMenu::addShowMenuBarAction()

 {
 {

-    KAction* showMenuBar = m_mainWindow->showMenuBarAction();
-    if (!m_mainWindow->menuBar()->isVisible()) {
-        m_popup->addAction(showMenuBar);
+    const KActionCollection* ac = m_mainWindow->actionCollection();
+    QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
+    if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {

         m_popup->addSeparator();
         m_popup->addSeparator();

+        m_popup->addAction(showMenuBar);

     }
 }
 
     }
 }
 


@@ -428,7 +419,7 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
 
 bool DolphinContextMenu::placeExists(const KUrl& url) const
 {
 
 bool DolphinContextMenu::placeExists(const KUrl& url) const
 {

-    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    const KFilePlacesModel* placesModel = DolphinPlacesModel::instance();

     const int count = placesModel->rowCount();
 
     for (int i = 0; i < count; ++i) {
     const int count = placesModel->rowCount();
 
     for (int i = 0; i < count; ++i) {


@@ -460,7 +451,7 @@ QAction* DolphinContextMenu::createPasteAction()
 
 KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 {
 
 KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 {

-    if (m_selectedItemsProperties == 0) {
+    if (!m_selectedItemsProperties) {

         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
     }
     return *m_selectedItemsProperties;
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
     }
     return *m_selectedItemsProperties;


@@ -468,7 +459,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 
 KFileItem DolphinContextMenu::baseFileItem()
 {
 
 KFileItem DolphinContextMenu::baseFileItem()
 {

-    if (m_baseFileItem == 0) {
+    if (!m_baseFileItem) {

         m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
     }
     return *m_baseFileItem;
         m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
     }
     return *m_baseFileItem;


@@ -513,15 +504,17 @@ void DolphinContextMenu::addFileItemPluginActions()
             continue;
         }
 
             continue;
         }
 

+        // Old API (kdelibs-4.6.0 only)

         KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
         KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();

-        if (plugin == 0) {
-            continue;
+        if (plugin) {
+            plugin->setParent(m_popup);
+            m_popup->addActions(plugin->actions(props, m_mainWindow));

         }
         }

-
-        plugin->setParent(m_popup);
-        const QList<QAction*> actions = plugin->actions(props, m_mainWindow);
-        foreach (QAction* action, actions) {
-            m_popup->addAction(action);
+        // New API (kdelibs >= 4.6.1)
+        KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
+        if (abstractPlugin) {
+            abstractPlugin->setParent(m_popup);
+            m_popup->addActions(abstractPlugin->actions(props, m_mainWindow));

         }
     }
 }
         }
     }
 }