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

List:       kde-commits
Subject:    KDE/kdepim/messagelist
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2010-04-29 16:43:47
Message-ID: 20100429164347.E78EDAC7E4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1120677 by tmcguire:

Bring back the "Message List" menu.

It was lost when writing the new Pane (like many other things, I
suspect, needs some investigation).

 M  +16 -1     pane.cpp  


--- trunk/KDE/kdepim/messagelist/pane.cpp #1120676:1120677
@@ -18,9 +18,12 @@
 
 #include "pane.h"
 
+#include <KDE/KActionCollection>
+#include <KDE/KActionMenu>
 #include <KDE/KIcon>
 #include <KDE/KLocale>
 #include <KDE/KMenu>
+#include <KDE/KXMLGUIClient>
 
 #include <QtCore/QAbstractItemModel>
 #include <QtGui/QAbstractProxyModel>
@@ -42,7 +45,7 @@
 {
 public:
   Private( Pane *owner )
-    : q( owner ), mXmlGuiClient( 0 ) { }
+    : q( owner ), mXmlGuiClient( 0 ), mActionMenu( 0 ) { }
 
   void onSelectionChanged( const QItemSelection &selected, const QItemSelection \
&deselected );  void onNewTabClicked();
@@ -57,6 +60,7 @@
   Pane * const q;
 
   KXMLGUIClient *mXmlGuiClient;
+  KActionMenu *mActionMenu;
 
   QAbstractItemModel *mModel;
   QItemSelectionModel *mSelectionModel;
@@ -145,7 +149,18 @@
     Widget *w = qobject_cast<Widget *>( widget( i ) );
     w->setXmlGuiClient( d->mXmlGuiClient );
   }
+
+  // Setup "View->Message List" actions.
+  if ( xmlGuiClient ) {
+    if ( d->mActionMenu ) {
+      d->mXmlGuiClient->actionCollection()->removeAction( d->mActionMenu );
 }
+    d->mActionMenu = new KActionMenu( KIcon(), i18n( "Message List" ), this );
+    d->mXmlGuiClient->actionCollection()->addAction( "view_message_list", \
d->mActionMenu ); +    const Widget * const w = static_cast<Widget*>( currentWidget() \
); +    w->view()->fillViewMenu( d->mActionMenu->menu() );
+  }
+}
 
 bool Pane::selectNextMessageItem( MessageList::Core::MessageTypeFilter \
                messageTypeFilter,
                                   MessageList::Core::ExistingSelectionBehaviour \
existingSelectionBehaviour,


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