1 files changed, 10 insertions, 3 deletions

diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index f52cedb..7e2aec1 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -4,109 +4,116 @@
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
 #include <qlistbox.h>
 #include <qlistview.h>
 #include <qbuttongroup.h>
 #include <qhbox.h>
 #include <qcursor.h>
 #include <qtimer.h>
+#include <qapplication.h> 
 
 #include <kbuttonbox.h>
 #include <klistview.h>
 #include <kapplication.h>
 #include <qapplication.h>
 #include <kconfig.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
 #include <kabc/phonenumber.h>
 
 #include "typecombo.h"
 
 #include "phoneeditwidget.h"
 
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
   : QWidget(parent,name)
 {
     QGridLayout* gridLayout = new QGridLayout ( this, 2,2 );
 
     QLabel *temp = new QLabel( "", this );
     temp->setAlignment( Qt::AlignCenter );
     temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
-    gridLayout->addWidget( temp, 1, 0 );
     QPushButton *addBut = new QPushButton ( "add", this );
     addBut->setPixmap ( SmallIcon("plus"));
     addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() );
     connect(addBut,SIGNAL(clicked ()),SLOT(addNumber()));
-    gridLayout->addWidget( addBut, 0, 0 );
 
     sv = new QScrollView( this );
     sv->setFrameStyle ( QFrame::Panel | QFrame::Plain );
     sv->setLineWidth ( 1 ); 
     sv->setMidLineWidth ( 1 ); 
     mw = new QWidget ( sv->viewport() );
     sv->addChild(mw);
     sv->setResizePolicy( QScrollView::AutoOneFit );
     mainLayout = new QVBoxLayout ( mw );
     mainLayout->setMargin( 0 );
     mainLayout->setSpacing( 0 );
-    gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 );
+    if ( QApplication::desktop()->width() == 240 || QApplication::desktop()->width() == 480 ) {
+        gridLayout->addWidget( addBut, 0, 0 );
+        gridLayout->addWidget( temp, 0, 1 );
+        gridLayout->addMultiCellWidget( sv, 1,1 , 0,1 );
+    } else {
+        gridLayout->addWidget( temp, 1, 0 );
+        gridLayout->addWidget( addBut, 0, 0 );
+        gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 );
+    }
     setDefaults();
     mTypeNumberEditList.setAutoDelete( true );
     mPopup = new QPopupMenu( this );
     QStringList list = PhoneNumber::supportedTypeListNames();
     mPopupCount = list.count();
     int i = 0;
     while ( i < mPopupCount ) {
         mPopup->insertItem( list[ i ], i );
         ++i;
     }
     connect(mPopup,SIGNAL(activated(int)),this,SLOT(addNumberInt( int)));
     
 }
 
 PhoneEditWidget::~PhoneEditWidget()
 {
 }
 void  PhoneEditWidget::setDefaults()
 {
     mTypeNumberEditList.clear();
     PhoneTypeNumberEdit* edit = appendEditCombo();
     KABC::PhoneNumber phoneNumber;
     phoneNumber.setType( KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref );
     edit->setPhoneNumber( phoneNumber  );
     edit = appendEditCombo();
     phoneNumber.setType( KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
     edit->setPhoneNumber( phoneNumber  );
     edit = appendEditCombo();
     phoneNumber.setType( KABC::PhoneNumber::Cell );
     edit->setPhoneNumber( phoneNumber  );
 
 }