CVS commit by tokoe: 

Bring back the EditToolbarAction, that fixes #74817 as well.

CCMAIL:74817-done@bugs.kde.org


  M +20 -0     kaddressbookmain.cpp   1.42
  M +2 -0      kaddressbookmain.h   1.25
  M +2 -1      kaddressbookui.rc   1.46


--- kdepim/kaddressbook/kaddressbookmain.cpp  #1.41:1.42
@@ -22,4 +22,5 @@
 */
 
+#include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <klocale.h>
@@ -114,4 +115,6 @@ void KAddressBookMain::initActions()
   action = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
   action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) );
+
+  KStdAction::configureToolbars( this, SLOT( configureToolbars() ), actionCollection() );
 }
 
@@ -121,3 +124,20 @@ void KAddressBookMain::configureKeyBindi
 }
 
+void KAddressBookMain::configureToolbars()
+{
+  saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+
+  KEditToolbar edit( factory() );
+  connect( &edit, SIGNAL( newToolbarConfig() ),
+           this, SLOT( slotNewToolbarConfig() ) );
+
+  edit.exec();
+}
+
+void KAddressBookMain::newToolbarConfig()
+{
+  createGUI();
+  applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+}
+
 #include "kaddressbookmain.moc"

--- kdepim/kaddressbook/kaddressbookmain.h  #1.24:1.25
@@ -79,4 +79,6 @@ class KAddressBookMain : public KMainWin
   private slots:
     void configureKeyBindings();
+    void configureToolbars();
+    void newToolbarConfig();
 
   private:

--- kdepim/kaddressbook/kaddressbookui.rc  #1.45:1.46
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kaddressbook" version="11">
+<kpartgui name="kaddressbook" version="12">
 
   <MenuBar>
@@ -59,4 +59,5 @@
       <Separator/>
       <Action name="options_configure_keybinding"/>
+      <Action name="options_configure_toolbars"/>
       <Action name="options_configure"/>
       <Merge name="configure_merge"/>

The development of the old KAddressBook will be discontinued for KDE 4.4.
Since the new application has the same name, but a completly new code base we close all bug reports against the old version and ask the submitters to resend there reports against the new product.