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

List:       kde-commits
Subject:    kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2005-02-27 12:52:57
Message-ID: 20050227125257.22E611160A () office ! kde ! org
[Download RAW message or body]

CVS commit by tokoe: 

Use another action collection to do not show up the dynamic actions
in the toolbar editor.

BUGS:100362


  M +4 -3      extensionmanager.cpp   1.19
  M +2 -0      extensionmanager.h   1.6


--- kdepim/kaddressbook/extensionmanager.cpp  #1.18:1.19
@@ -45,4 +45,6 @@ ExtensionManager::ExtensionManager( KAB:
   createExtensionWidgets();
 
+  mActionCollection = new KActionCollection( this, "ActionCollection" );
+
   QTimer::singleShot( 0, this, SLOT( createActions() ) );
 }
@@ -87,4 +89,5 @@ void ExtensionManager::reconfigure()
   saveSettings();
   createExtensionWidgets();
+  createActions();
   restoreSettings();
 }
@@ -142,5 +145,5 @@ void ExtensionManager::createActions()
     ExtensionData data = *it;
     KToggleAction *action = new KToggleAction( data.title, 0, mMapper, SLOT( map() ),
-                                               mCore->actionCollection(),
+                                               mActionCollection,
                                                QString( data.identifier + "_extension" ).latin1() );
     action->setExclusiveGroup( "extensions" );
@@ -230,6 +233,4 @@ void ExtensionManager::createExtensionWi
 
   mCurrentExtensionWidget = 0;
-
-  createActions();
 }
 

--- kdepim/kaddressbook/extensionmanager.h  #1.5:1.6
@@ -35,4 +35,5 @@ class Core;
 
 class QSignalMapper;
+class KActionCollection;
 
 class ExtensionData
@@ -94,4 +95,5 @@ class ExtensionManager : public QHBox
     QSignalMapper *mMapper;
     QPtrList<KAction> mActionList;
+    KActionCollection *mActionCollection;
 };
 


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