| -rw-r--r-- | kabc/addresseedialog.cpp | 65 |
1 files changed, 24 insertions, 41 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 0cf75a0..671787e 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -64,15 +64,10 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : { qDebug("NEW AddresseeDialog "); - QWidget *topWidget = plainPage(); - QBoxLayout *topLayout = new QHBoxLayout( topWidget ); - - - KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); + KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this ); mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); - - topLayout->addWidget(mMiniSplitter ); + setMainWidget( mMiniSplitter ); QWidget *listWidget = new QWidget( mMiniSplitter ); @@ -88,31 +83,19 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : listLayout->addWidget( mAddresseeList ); connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ), SLOT( slotOk() ) ); - //QHBox* searchBox = new QHBox ( listWidget ); - mAddresseeEdit = new QLineEdit( listWidget ); + QHBox * hb = new QHBox ( listWidget ); + listLayout->addWidget ( hb ); + mAddresseeEdit = new QLineEdit( hb ); connect( mAddresseeEdit, SIGNAL( returnPressed() ), SLOT( loadAddressBook() ) ); mAddresseeEdit->setFocus(); - QPushButton *searchButton = new QPushButton( i18n("Search!"), listWidget ); + QPushButton *searchButton = new QPushButton( i18n("Search!"), hb ); connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) ); - - QHBoxLayout *searchLayout = new QHBoxLayout (listLayout) ; - searchLayout->addWidget( mAddresseeEdit ); - searchLayout->addWidget( searchButton ); - //listLayout->addWidget( searchBox ); - - if ( mMultiple ) { - //QBoxLayout *selectedLayout = new QVBoxLayout; - //topLayout->addLayout( selectedLayout ); - //topLayout->setSpacing( spacingHint() ); - - QVBox *selectedGroup = new QVBox( mMiniSplitter ); - new QLabel ( i18n("Selected:"), selectedGroup ); - //selectedLayout->addWidget( selectedGroup ); - - mSelectedList = new KListView( selectedGroup ); - mSelectedList->addColumn( i18n("Name") ); + if ( mMultiple ) { + + mSelectedList = new KListView( mMiniSplitter ); + mSelectedList->addColumn( i18n("Selected Name") ); mSelectedList->addColumn( i18n("Email") ); mSelectedList->setAllColumnsShowFocus( true ); mSelectedList->setFullWidth( true ); @@ -330,29 +313,29 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent ) if ( running ) return addressees; running = true; AddresseeDialog *dlg = new AddresseeDialog( parent, true ); +#ifdef DESKTOP_VERSION static int geoX = 0; static int geoY = 0; static int geoW = 0; static int geoH = 0; - if ( QApplication::desktop()->width() <= 640 ) - dlg->showMaximized(); - else { - if ( !geoX && ! geoY && !geoW &&!geoH ) { - geoX = dlg->geometry().x(); - geoY = dlg->geometry().y(); - geoW = dlg->width(); - geoH = dlg->height(); - } else { - dlg->show(); - dlg->setGeometry(geoX , geoY,geoW , geoH ); - - } - } + if ( !geoX && ! geoY && !geoW &&!geoH ) { + geoX = dlg->geometry().x(); + geoY = dlg->geometry().y(); + geoW = dlg->width(); + geoH = dlg->height(); + } + dlg->show(); + dlg->setGeometry(geoX , geoY,geoW , geoH ); +#else + dlg->showMaximized(); +#endif int result = dlg->exec(); +#ifdef DESKTOP_VERSION geoX = dlg->geometry().x(); geoY = dlg->geometry().y(); geoW = dlg->width(); geoH = dlg->height(); +#endif if ( result == QDialog::Accepted ) { addressees = dlg->addressees(); } |