summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp9
-rw-r--r--libkdepim/categoryeditdialog_base.cpp5
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()
2197 mActionCopy->plug( editMenu ); 2197 mActionCopy->plug( editMenu );
2198 mActionPaste->plug( editMenu ); 2198 mActionPaste->plug( editMenu );
2199 mActionDelete->plug( editMenu ); 2199 mActionDelete->plug( editMenu );
2200 editMenu->insertSeparator(); 2200 editMenu->insertSeparator();
2201 mActionSelectAll->plug( editMenu ); 2201 mActionSelectAll->plug( editMenu );
2202 2202
2203 mActionSetFormattedName->plug( changeMenu ); 2203 mActionSetFormattedName->plug( changeMenu );
2204 mActionRemoveVoice->plug( changeMenu ); 2204 mActionRemoveVoice->plug( changeMenu );
2205 // settings menu 2205 // settingsmings menu
2206//US special menuentry to configure the addressbook resources. On KDE 2206//US special menuentry to configure the addressbook resources. On KDE
2207// you do that through the control center !!! 2207// you do that through the control center !!!
2208 mActionConfigResources->plug( settingsMenu ); 2208 // settingsMenu->insertSeparator();
2209 settingsMenu->insertSeparator();
2210 2209
2211 mActionConfigKAddressbook->plug( settingsMenu ); 2210 mActionConfigKAddressbook->plug( settingsMenu, 0 );
2211 mActionConfigResources->plug( settingsMenu,1 );
2212 settingsMenu->insertSeparator(2);
2212 2213
2213 if ( mIsPart ) { 2214 if ( mIsPart ) {
2214 //US not implemented yet 2215 //US not implemented yet
2215 //mActionConfigShortcuts->plug( settingsMenu ); 2216 //mActionConfigShortcuts->plug( settingsMenu );
2216 //mActionConfigureToolbars->plug( settingsMenu ); 2217 //mActionConfigureToolbars->plug( settingsMenu );
2217 2218
2218 } else { 2219 } else {
2219 //US not implemented yet 2220 //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
31 31
32{ 32{
33 if ( !name ) 33 if ( !name )
34 setName( "CategoryEditDialog_base" ); 34 setName( "CategoryEditDialog_base" );
35 CategoryEditDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout"); 35 CategoryEditDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout");
36 36
37 mEdit = new QLineEdit( this, "mEdit" ); 37 mEdit = new QLineEdit( this, "mEdit" );
38 38
39 CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 1 ); 39 CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 0 );
40 40
41 Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13"); 41 Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13");
42 42
43 // mButtonHelp = new QPushButton( this, "mButtonHelp" ); 43 // mButtonHelp = new QPushButton( this, "mButtonHelp" );
44 //mButtonHelp->setAutoDefault( TRUE ); 44 //mButtonHelp->setAutoDefault( TRUE );
45 //Layout13->addWidget( mButtonHelp ); 45 //Layout13->addWidget( mButtonHelp );
46 //QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); 46 //QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
47 //Layout13->addItem( spacer ); 47 //Layout13->addItem( spacer );
@@ -63,17 +63,18 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
63 mCategories = new QListView( this, "mCategories" ); 63 mCategories = new QListView( this, "mCategories" );
64 mCategories->addColumn( tr2i18n( "Category" ) ); 64 mCategories->addColumn( tr2i18n( "Category" ) );
65 65
66 CategoryEditDialog_baseLayout->addWidget( mCategories, 0, 0 ); 66 CategoryEditDialog_baseLayout->addWidget( mCategories, 0, 0 );
67 67
68 layout103 = new QVBoxLayout( 0, 0, 6, "layout103"); 68 layout103 = new QVBoxLayout( 0, 0, 6, "layout103");
69 69
70 mButtonAdd = new QPushButton( this, "mButtonAdd" ); 70 mButtonAdd = new QPushButton( this, "mButtonAdd" );
71 layout103->addWidget( mButtonAdd ); 71 CategoryEditDialog_baseLayout->addMultiCellWidget(mButtonAdd , 1, 1, 1, 1 );
72 //layout103->addWidget( mButtonAdd );
72 73
73 mButtonModify = new QPushButton( this, "mButtonModify" ); 74 mButtonModify = new QPushButton( this, "mButtonModify" );
74 layout103->addWidget( mButtonModify ); 75 layout103->addWidget( mButtonModify );
75 76
76 mButtonRemove = new QPushButton( this, "mButtonRemove" ); 77 mButtonRemove = new QPushButton( this, "mButtonRemove" );
77 layout103->addWidget( mButtonRemove ); 78 layout103->addWidget( mButtonRemove );
78 QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 79 QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
79 layout103->addItem( spacer_2 ); 80 layout103->addItem( spacer_2 );