[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/akregator_port] akregator2/src: Port feed/folder context menu
From:       Frank Osterfeld <frank.osterfeld () kdab ! com>
Date:       2012-03-04 19:20:26
Message-ID: 20120304192026.2F672A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 20a555660fe819e25b5380dbd4f15cc4dd3fa5e8 by Frank Osterfeld.
Committed on 04/03/2012 at 19:09.
Pushed by osterfeld into branch 'akregator_port'.

Port feed/folder context menu

M  +6    -7    akregator2/src/selectioncontroller.cpp

http://commits.kde.org/kdepim/20a555660fe819e25b5380dbd4f15cc4dd3fa5e8

diff --git a/akregator2/src/selectioncontroller.cpp \
b/akregator2/src/selectioncontroller.cpp index 6cfc440..e6fd11a 100644
--- a/akregator2/src/selectioncontroller.cpp
+++ b/akregator2/src/selectioncontroller.cpp
@@ -25,6 +25,7 @@
 #include "selectioncontroller.h"
 #include "actionmanager.h"
 
+#include <krss/feedcollection.h>
 #include <krss/feeditemmodel.h>
 #include <krss/rssitem.h>
 
@@ -229,20 +230,18 @@ void \
Akregator2::SelectionController::setFolderExpansionHandler( Akregator2::Fol  
 void Akregator2::SelectionController::subscriptionContextMenuRequested( const \
QPoint& point )  {
-#ifdef KRSS_PORT_DISABLED
     Q_ASSERT( m_feedSelector );
-    const shared_ptr<const KRss::TreeNode> treeNode = ::subscriptionForIndex( \
                m_feedSelector->indexAt( point ) );
-    if ( !treeNode )
+    const QModelIndex index = m_feedSelector->indexAt( point );
+    const Akonadi::Collection collection = index.data( \
Akonadi::EntityTreeModel::CollectionRole ).value<Akonadi::Collection>(); +    if ( \
!collection.isValid() )  return;
-
-    QWidget* w = ActionManager::getInstance()->container( treeNode->tier() == \
                KRss::TreeNode::TagTier ?
-                                                          "feedgroup_popup" : \
"feeds_popup" ); +    const bool isFolder = FeedCollection( collection ).isFolder();
+    QWidget* w = ActionManager::getInstance()->container( isFolder ? \
"feedgroup_popup" : "feeds_popup" );  QMenu* popup = qobject_cast<QMenu*>( w );
     if ( popup ) {
         const QPoint globalPos = m_feedSelector->viewport()->mapToGlobal( point );
         popup->exec( globalPos );
     }
-#endif
 }
 
 void Akregator2::SelectionController::itemSelectionChanged()


[prev in list] [next in list] [prev in thread] [next in thread]