-rw-r--r-- | kaddressbook/phoneeditwidget.cpp | 13 |
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 | |||
@@ -32,8 +32,9 @@ | |||
32 | #include <qbuttongroup.h> | 32 | #include <qbuttongroup.h> |
33 | #include <qhbox.h> | 33 | #include <qhbox.h> |
34 | #include <qcursor.h> | 34 | #include <qcursor.h> |
35 | #include <qtimer.h> | 35 | #include <qtimer.h> |
36 | #include <qapplication.h> | ||
36 | 37 | ||
37 | #include <kbuttonbox.h> | 38 | #include <kbuttonbox.h> |
38 | #include <klistview.h> | 39 | #include <klistview.h> |
39 | #include <kapplication.h> | 40 | #include <kapplication.h> |
@@ -59,14 +60,12 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name ) | |||
59 | 60 | ||
60 | QLabel *temp = new QLabel( "", this ); | 61 | QLabel *temp = new QLabel( "", this ); |
61 | temp->setAlignment( Qt::AlignCenter ); | 62 | temp->setAlignment( Qt::AlignCenter ); |
62 | temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) ); | 63 | temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) ); |
63 | gridLayout->addWidget( temp, 1, 0 ); | ||
64 | QPushButton *addBut = new QPushButton ( "add", this ); | 64 | QPushButton *addBut = new QPushButton ( "add", this ); |
65 | addBut->setPixmap ( SmallIcon("plus")); | 65 | addBut->setPixmap ( SmallIcon("plus")); |
66 | addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() ); | 66 | addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() ); |
67 | connect(addBut,SIGNAL(clicked ()),SLOT(addNumber())); | 67 | connect(addBut,SIGNAL(clicked ()),SLOT(addNumber())); |
68 | gridLayout->addWidget( addBut, 0, 0 ); | ||
69 | 68 | ||
70 | sv = new QScrollView( this ); | 69 | sv = new QScrollView( this ); |
71 | sv->setFrameStyle ( QFrame::Panel | QFrame::Plain ); | 70 | sv->setFrameStyle ( QFrame::Panel | QFrame::Plain ); |
72 | sv->setLineWidth ( 1 ); | 71 | sv->setLineWidth ( 1 ); |
@@ -76,9 +75,17 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name ) | |||
76 | sv->setResizePolicy( QScrollView::AutoOneFit ); | 75 | sv->setResizePolicy( QScrollView::AutoOneFit ); |
77 | mainLayout = new QVBoxLayout ( mw ); | 76 | mainLayout = new QVBoxLayout ( mw ); |
78 | mainLayout->setMargin( 0 ); | 77 | mainLayout->setMargin( 0 ); |
79 | mainLayout->setSpacing( 0 ); | 78 | mainLayout->setSpacing( 0 ); |
80 | gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 ); | 79 | if ( QApplication::desktop()->width() == 240 || QApplication::desktop()->width() == 480 ) { |
80 | gridLayout->addWidget( addBut, 0, 0 ); | ||
81 | gridLayout->addWidget( temp, 0, 1 ); | ||
82 | gridLayout->addMultiCellWidget( sv, 1,1 , 0,1 ); | ||
83 | } else { | ||
84 | gridLayout->addWidget( temp, 1, 0 ); | ||
85 | gridLayout->addWidget( addBut, 0, 0 ); | ||
86 | gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 ); | ||
87 | } | ||
81 | setDefaults(); | 88 | setDefaults(); |
82 | mTypeNumberEditList.setAutoDelete( true ); | 89 | mTypeNumberEditList.setAutoDelete( true ); |
83 | mPopup = new QPopupMenu( this ); | 90 | mPopup = new QPopupMenu( this ); |
84 | QStringList list = PhoneNumber::supportedTypeListNames(); | 91 | QStringList list = PhoneNumber::supportedTypeListNames(); |