1 files changed, 12 insertions, 13 deletions

diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 9ee4eac..1e9743c 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -50,13 +50,13 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QGridLayout *topLayout = new QGridLayout( this, 2, 1, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   QGroupBox *photoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 4, 2,
+  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
                                             KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
 
   mPhotoLabel = new QLabel( photoBox );
   int fac = 9;
   if ( QApplication::desktop()->width() > 320 )
@@ -72,26 +72,25 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined. Does this harm ???");
 #endif //KAB_EMBEDDED  
   
   
   boxLayout->addWidget( mPhotoUrl, 0, 1 );
-  
-  mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), photoBox );
+  QHBox *hb1 = new QHBox ( photoBox );
+  mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), hb1 );
   mUsePhotoUrl->setEnabled( false );
-  boxLayout->addWidget( mUsePhotoUrl, 1, 1 );
+  boxLayout->addWidget( hb1, 1, 1 );
 
-  QPushButton * pb = new QPushButton( i18n( "Remove" ), photoBox );
+  QPushButton * pb = new QPushButton( i18n( "Remove" ), hb1 );
   connect( pb, SIGNAL( clicked() ),this, SLOT( removePhoto() ) );
-  boxLayout->addWidget( pb, 2, 1 );
-  boxLayout->addWidget( new QLabel(  photoBox ), 3, 1 );
+  boxLayout->addWidget( new QLabel(  photoBox ), 2, 1 );
 
   topLayout->addWidget( photoBox, 0, 0 );
 
   QGroupBox *logoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
-  boxLayout = new QGridLayout( logoBox->layout(), 4, 2, KDialog::spacingHint() );
+  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
 
   mLogoLabel = new QLabel( logoBox );
   mLogoLabel->setFixedSize( 50*9/fac, 70*9/fac );
   mLogoLabel->setScaledContents( true );
   mLogoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
@@ -102,20 +101,20 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   mLogoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined 2");
 #endif //KAB_EMBEDDED  
   boxLayout->addWidget( mLogoUrl, 0, 1 );
   
-  mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), logoBox );
+  QHBox *hb2 = new QHBox ( logoBox );
+  mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), hb2 );
   mUseLogoUrl->setEnabled( false );
-  boxLayout->addWidget( mUseLogoUrl, 1, 1 );
+  boxLayout->addWidget( hb2, 1, 1 );
 
-   pb = new QPushButton( i18n( "Remove" ), logoBox );
+   pb = new QPushButton( i18n( "Remove" ), hb2 );
   connect( pb, SIGNAL( clicked() ),this, SLOT( removeLogo() ) );
-  boxLayout->addWidget( pb, 2, 1 );
-  boxLayout->addWidget( new QLabel(  logoBox ), 3, 1 );
+  boxLayout->addWidget( new QLabel(  logoBox ), 2, 1 );
   topLayout->addWidget( logoBox, 1, 0 );
 
   connect( mPhotoUrl, SIGNAL( textChanged( const QString& ) ),
            SIGNAL( changed() ) );
   connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
            SLOT( loadPhoto() ) );