Readded correct Q_ASSERT(m_fileInfo.isNull()) (the previous Q_ASSERT(!m_fileInfo...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ce14c37ef9570945ba5a9493b598bae453501cf8..8bd67111b54277f82a1ec041ef52ff4d8da53387 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -49,7 +49,7 @@
 #include <Qt3Support/Q3ValueList>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 #include <Qt3Support/Q3ValueList>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,

-                                       KFileItem* fileInfo,
+                                       const KFileItem& fileInfo,

                                        const KUrl& baseUrl) :
     m_mainWindow(parent),
     m_fileInfo(fileInfo),
                                        const KUrl& baseUrl) :
     m_mainWindow(parent),
     m_fileInfo(fileInfo),


@@ -64,7 +64,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 }
 
 DolphinContextMenu::~DolphinContextMenu()
 }
 
 DolphinContextMenu::~DolphinContextMenu()

-{}
+{
+}

 
 void DolphinContextMenu::open()
 {
 
 void DolphinContextMenu::open()
 {


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

-    if (m_fileInfo != 0) {
+    if (!m_fileInfo.isNull()) {

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


@@ -100,7 +101,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
 
     KMenu* popup = new KMenu(m_mainWindow);
 

-    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("Empty Trash"), popup);
+    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18nc("@action:inmenu", "Empty Trash"), popup);

     KConfig trashConfig("trashrc", KConfig::OnlyLocal);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);
     KConfig trashConfig("trashrc", KConfig::OnlyLocal);
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     popup->addAction(emptyTrashAction);


@@ -109,11 +110,12 @@ void DolphinContextMenu::openTrashContextMenu()
     popup->addAction(propertiesAction);
 
     if (popup->exec(QCursor::pos()) == emptyTrashAction) {
     popup->addAction(propertiesAction);
 
     if (popup->exec(QCursor::pos()) == emptyTrashAction) {

-        const QString text(i18n("Do you really want to empty the Trash? All items will get deleted."));
+        const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will get deleted."));

         const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
         const bool del = KMessageBox::warningContinueCancel(m_mainWindow,

-                         text,
-                         QString(),
-                         KGuiItem(i18n("Empty Trash"), KIcon("user-trash"))
+                                                            text,
+                                                            QString(),
+                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
+                                                                     KIcon("user-trash"))

                                                            ) == KMessageBox::Continue;
         if (del) {
             KonqOperations::emptyTrash(m_mainWindow);
                                                            ) == KMessageBox::Continue;
         if (del) {
             KonqOperations::emptyTrash(m_mainWindow);


@@ -130,7 +132,7 @@ void DolphinContextMenu::openTrashItemContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
 
     KMenu* popup = new KMenu(m_mainWindow);
 

-    QAction* restoreAction = new QAction(i18n("Restore"), m_mainWindow);
+    QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);

     popup->addAction(restoreAction);
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
     popup->addAction(restoreAction);
 
     QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");


@@ -148,7 +150,7 @@ void DolphinContextMenu::openTrashItemContextMenu()
 
 void DolphinContextMenu::openItemContextMenu()
 {
 
 void DolphinContextMenu::openItemContextMenu()
 {

-    Q_ASSERT(m_fileInfo != 0);
+    Q_ASSERT(!m_fileInfo.isNull());

 
     KMenu* popup = new KMenu(m_mainWindow);
     insertDefaultItemActions(popup);
 
     KMenu* popup = new KMenu(m_mainWindow);
     insertDefaultItemActions(popup);


@@ -157,8 +159,9 @@ void DolphinContextMenu::openItemContextMenu()
 
     // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* bookmarkAction = 0;
 
     // insert 'Bookmark This Folder' entry if exactly one item is selected
     QAction* bookmarkAction = 0;

-    if (m_fileInfo->isDir() && (m_selectedUrls.count() == 1)) {
-        bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark Folder..."));
+    if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
+        bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
+                                          i18nc("@action:inmenu", "Bookmark Folder..."));

     }
 
     // Insert 'Open With...' sub menu
     }
 
     // Insert 'Open With...' sub menu


@@ -177,10 +180,10 @@ void DolphinContextMenu::openItemContextMenu()
     QAction* activatedAction = popup->exec(QCursor::pos());
 
     if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) {
     QAction* activatedAction = popup->exec(QCursor::pos());
 
     if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) {

-        const KUrl selectedUrl(m_fileInfo->url());
+        const KUrl selectedUrl(m_fileInfo.url());

         if (selectedUrl.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),
         if (selectedUrl.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),

-                    selectedUrl);
+                                                                selectedUrl);

         }
     } else if (serviceActions.contains(activatedAction)) {
         // one of the 'Actions' items has been selected
         }
     } else if (serviceActions.contains(activatedAction)) {
         // one of the 'Actions' items has been selected


@@ -205,7 +208,7 @@ void DolphinContextMenu::openItemContextMenu()
 
 void DolphinContextMenu::openViewportContextMenu()
 {
 
 void DolphinContextMenu::openViewportContextMenu()
 {

-    Q_ASSERT(m_fileInfo == 0);
+    Q_ASSERT(m_fileInfo.isNull());

     KMenu* popup = new KMenu(m_mainWindow);
 
     // setup 'Create New' menu
     KMenu* popup = new KMenu(m_mainWindow);
 
     // setup 'Create New' menu


@@ -219,7 +222,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addAction(pasteAction);
 
     // setup 'View Mode' menu
     popup->addAction(pasteAction);
 
     // setup 'View Mode' menu

-    KMenu* viewModeMenu = new KMenu(i18n("View Mode"));
+    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));

 
     QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
     viewModeMenu->addAction(iconsMode);
 
     QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
     viewModeMenu->addAction(iconsMode);


@@ -234,19 +237,21 @@ void DolphinContextMenu::openViewportContextMenu()
     viewModeMenu->addAction(previewsMode);
 
     popup->addMenu(viewModeMenu);
     viewModeMenu->addAction(previewsMode);
 
     popup->addMenu(viewModeMenu);

+

     popup->addSeparator();
 
     popup->addSeparator();
 

-    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark This Folder..."));
+    QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
+                                               i18nc("@action:inmenu", "Bookmark This Folder..."));

     popup->addSeparator();
 
     popup->addSeparator();
 

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

 
 

-    QAction* activatedAction = popup->exec(QCursor::pos());
-    if (activatedAction == propertiesAction) {
+    QAction* action = popup->exec(QCursor::pos());
+    if (action == propertiesAction) {

         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         KPropertiesDialog dialog(url);
         dialog.exec();
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         KPropertiesDialog dialog(url);
         dialog.exec();

-    } else if (activatedAction == bookmarkAction) {
+    } else if (action == bookmarkAction) {

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


@@ -306,24 +311,24 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
     // attached which allows to select a custom application. If no applications are registered
     // no sub menu is created at all, only "Open With..." will be offered.
     bool insertOpenWithItems = true;
     // attached which allows to select a custom application. If no applications are registered
     // no sub menu is created at all, only "Open With..." will be offered.
     bool insertOpenWithItems = true;

-    const QString contextMimeType(m_fileInfo->mimetype());
+    const QString contextMimeType(m_fileInfo.mimetype());

 
 

-    QListIterator<KFileItem*> mimeIt(m_selectedItems);
+    QListIterator<KFileItem> mimeIt(m_selectedItems);

     while (insertOpenWithItems && mimeIt.hasNext()) {
     while (insertOpenWithItems && mimeIt.hasNext()) {

-        KFileItem* item = mimeIt.next();
-        insertOpenWithItems = (contextMimeType == item->mimetype());
+        KFileItem item = mimeIt.next();
+        insertOpenWithItems = (contextMimeType == item.mimetype());

     }
 
     QList<QAction*> openWithActions;
     if (insertOpenWithItems) {
         // fill the 'Open with' sub menu with application types
     }
 
     QList<QAction*> openWithActions;
     if (insertOpenWithItems) {
         // fill the 'Open with' sub menu with application types

-        const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo->url());
+        const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo.url());

         KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(),
                                 "Application",
                                 "Type == 'Application'");
         if (offers.count() > 0) {
             KService::List::Iterator it;
         KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(),
                                 "Application",
                                 "Type == 'Application'");
         if (offers.count() > 0) {
             KService::List::Iterator it;

-            KMenu* openWithMenu = new KMenu(i18n("Open With"));
+            KMenu* openWithMenu = new KMenu(i18nc("@title:menu", "Open With"));

             for (it = offers.begin(); it != offers.end(); ++it) {
                 // The offer list from the KTrader returns duplicate
                 // application entries. Although this seems to be a configuration
             for (it = offers.begin(); it != offers.end(); ++it) {
                 // The offer list from the KTrader returns duplicate
                 // application entries. Although this seems to be a configuration


@@ -339,7 +344,7 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
             }
 
             openWithMenu->addSeparator();
             }
 
             openWithMenu->addSeparator();

-            QAction* action = openWithMenu->addAction(i18n("&Other..."));
+            QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other..."));

 
             openWithActions << action;
             popup->addMenu(openWithMenu);
 
             openWithActions << action;
             popup->addMenu(openWithMenu);


@@ -347,13 +352,13 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
             // No applications are registered, hence just offer
             // a "Open With..." item instead of a sub menu containing
             // only one entry.
             // No applications are registered, hence just offer
             // a "Open With..." item instead of a sub menu containing
             // only one entry.

-            QAction* action = popup->addAction(i18n("Open With..."));
+            QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));

             openWithActions << action;
         }
     } else {
         // At least one of the selected items has a different MIME type. In this case
         // just show a disabled "Open With..." entry.
             openWithActions << action;
         }
     } else {
         // At least one of the selected items has a different MIME type. In this case
         // just show a disabled "Open With..." entry.

-        QAction* action = popup->addAction(i18n("Open With..."));
+        QAction* action = popup->addAction(i18nc("@title:menu", "Open With..."));

         action->setEnabled(false);
     }
 
         action->setEnabled(false);
     }
 


@@ -361,14 +366,14 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
 }
 
 QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
 }
 
 QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,

-        QVector<KDesktopFileActions::Service>& actionsVector)
+                                                      QVector<KDesktopFileActions::Service>& actionsVector)

 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in
     // libqonq/konq_operations.h of Konqueror.
     // (Copyright (C) 2000  David Faure <faure@kde.org>)
 
 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in
     // libqonq/konq_operations.h of Konqueror.
     // (Copyright (C) 2000  David Faure <faure@kde.org>)
 

-    KMenu* actionsMenu = new KMenu(i18n("Actions"));
+    KMenu* actionsMenu = new KMenu(i18nc("@title:menu", "Actions"));

 
     QList<QAction*> serviceActions;
 
 
     QList<QAction*> serviceActions;
 


@@ -396,11 +401,11 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                     if ((*it) == "all/allfiles") {
                         // The service type is valid for all files, but not for directories.
                         // Check whether the selected items only consist of files...
                     if ((*it) == "all/allfiles") {
                         // The service type is valid for all files, but not for directories.
                         // Check whether the selected items only consist of files...

-                        QListIterator<KFileItem*> mimeIt(m_selectedItems);
+                        QListIterator<KFileItem> mimeIt(m_selectedItems);

                         insert = true;
                         while (insert && mimeIt.hasNext()) {
                         insert = true;
                         while (insert && mimeIt.hasNext()) {

-                            KFileItem* item = mimeIt.next();
-                            insert = !item->isDir();
+                            KFileItem item = mimeIt.next();
+                            insert = !item.isDir();

                         }
                     }
 
                         }
                     }
 


@@ -408,11 +413,11 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                         // Check whether the MIME types of all selected files match
                         // to the mimetype of the service action. As soon as one MIME
                         // type does not match, no service menu is shown at all.
                         // Check whether the MIME types of all selected files match
                         // to the mimetype of the service action. As soon as one MIME
                         // type does not match, no service menu is shown at all.

-                        QListIterator<KFileItem*> mimeIt(m_selectedItems);
+                        QListIterator<KFileItem> mimeIt(m_selectedItems);

                         insert = true;
                         while (insert && mimeIt.hasNext()) {
                         insert = true;
                         while (insert && mimeIt.hasNext()) {

-                            KFileItem* item = mimeIt.next();
-                            const QString mimeType(item->mimetype());
+                            KFileItem item = mimeIt.next();
+                            const QString mimeType(item.mimetype());

                             const QString mimeGroup(mimeType.left(mimeType.indexOf('/')));
 
                             insert  = (*it == mimeType) ||
                             const QString mimeGroup(mimeType.left(mimeType.indexOf('/')));
 
                             insert  = (*it == mimeType) ||