2 files changed, 8 insertions, 6 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3b1a0c1..3f7a7da 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2197,23 +2197,24 @@ void KABCore::addActionsManually()
   mActionCopy->plug( editMenu );
   mActionPaste->plug( editMenu );
   mActionDelete->plug( editMenu );
   editMenu->insertSeparator();
   mActionSelectAll->plug( editMenu );
 
   mActionSetFormattedName->plug( changeMenu );
   mActionRemoveVoice->plug( changeMenu );
-  // settings menu
+  // settingsmings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
-  mActionConfigResources->plug( settingsMenu );
-  settingsMenu->insertSeparator();
+  // settingsMenu->insertSeparator();
 
-  mActionConfigKAddressbook->plug( settingsMenu );
+  mActionConfigKAddressbook->plug( settingsMenu, 0 );
+  mActionConfigResources->plug( settingsMenu,1 );
+  settingsMenu->insertSeparator(2);
 
   if ( mIsPart ) {
     //US not implemented yet
     //mActionConfigShortcuts->plug( settingsMenu );
     //mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     //US not implemented yet
diff --git a/libkdepim/categoryeditdialog_base.cpp b/libkdepim/categoryeditdialog_base.cpp
index 2390bbd..1908576 100644
--- a/libkdepim/categoryeditdialog_base.cpp
+++ b/libkdepim/categoryeditdialog_base.cpp
@@ -31,17 +31,17 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
 
 {
     if ( !name )
         setName( "CategoryEditDialog_base" );
     CategoryEditDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout"); 
 
     mEdit = new QLineEdit( this, "mEdit" );
 
-    CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 1 );
+    CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 0 );
 
     Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13"); 
 
     // mButtonHelp = new QPushButton( this, "mButtonHelp" );
     //mButtonHelp->setAutoDefault( TRUE );
     //Layout13->addWidget( mButtonHelp );
     //QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
     //Layout13->addItem( spacer );
@@ -63,17 +63,18 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
     mCategories = new QListView( this, "mCategories" );
     mCategories->addColumn( tr2i18n( "Category" ) );
 
     CategoryEditDialog_baseLayout->addWidget( mCategories, 0, 0 );
 
     layout103 = new QVBoxLayout( 0, 0, 6, "layout103"); 
 
     mButtonAdd = new QPushButton( this, "mButtonAdd" );
-    layout103->addWidget( mButtonAdd );
+    CategoryEditDialog_baseLayout->addMultiCellWidget(mButtonAdd , 1, 1, 1, 1 );
+    //layout103->addWidget( mButtonAdd );
 
     mButtonModify = new QPushButton( this, "mButtonModify" );
     layout103->addWidget( mButtonModify );
 
     mButtonRemove = new QPushButton( this, "mButtonRemove" );
     layout103->addWidget( mButtonRemove );
     QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     layout103->addItem( spacer_2 );