summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-16 21:16:24 (UTC)
committer zautrix <zautrix>2005-03-16 21:16:24 (UTC)
commitb7184073d5e552e0f04b14c5fc0c20a7bfd26d3d (patch) (unidiff)
tree3e74cd9653c0aa4f65dd4658369662c93c3005aa
parent3f6f846915ac28e623e1f04201b233111d8bbbdf (diff)
downloadkdepimpi-b7184073d5e552e0f04b14c5fc0c20a7bfd26d3d.zip
kdepimpi-b7184073d5e552e0f04b14c5fc0c20a7bfd26d3d.tar.gz
kdepimpi-b7184073d5e552e0f04b14c5fc0c20a7bfd26d3d.tar.bz2
some fixes
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
@@ -2199,19 +2199,20 @@ void KABCore::addActionsManually()
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
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
@@ -33,13 +33,13 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
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 );
@@ -65,13 +65,14 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
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 );