author | zautrix <zautrix> | 2005-06-27 20:33:47 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-27 20:33:47 (UTC) |
commit | bf664c505e66f54dd03c3518386fdeab43108e56 (patch) (unidiff) | |
tree | 2e41ba8c43b8126f643c94ceecd1bcf83800cd43 /kabc | |
parent | d730e4b5cd81965f224b69efcc91dd58253f0b98 (diff) | |
download | kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.zip kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.tar.gz kdepimpi-bf664c505e66f54dd03c3518386fdeab43108e56.tar.bz2 |
fixes
-rw-r--r-- | kabc/addresseedialog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 9197850..0cf75a0 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp | |||
@@ -58,16 +58,17 @@ QString AddresseeItem::key( int column, bool ) const | |||
58 | return text(column).lower(); | 58 | return text(column).lower(); |
59 | } | 59 | } |
60 | 60 | ||
61 | AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | 61 | AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : |
62 | KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), | 62 | KDialogBase( KDialogBase::Plain, i18n("Select Addressee"), |
63 | Ok|Cancel, No, parent ), mMultiple( multiple ) | 63 | Ok|Cancel, No, parent ), mMultiple( multiple ) |
64 | { | 64 | { |
65 | qDebug("NEW AddresseeDialog "); | 65 | qDebug("NEW AddresseeDialog "); |
66 | |||
66 | QWidget *topWidget = plainPage(); | 67 | QWidget *topWidget = plainPage(); |
67 | 68 | ||
68 | QBoxLayout *topLayout = new QHBoxLayout( topWidget ); | 69 | QBoxLayout *topLayout = new QHBoxLayout( topWidget ); |
69 | 70 | ||
70 | 71 | ||
71 | KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); | 72 | KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget); |
72 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 73 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
73 | 74 | ||
@@ -319,18 +320,21 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent ) | |||
319 | } | 320 | } |
320 | 321 | ||
321 | delete dlg; | 322 | delete dlg; |
322 | return addressee; | 323 | return addressee; |
323 | } | 324 | } |
324 | 325 | ||
325 | Addressee::List AddresseeDialog::getAddressees( QWidget *parent ) | 326 | Addressee::List AddresseeDialog::getAddressees( QWidget *parent ) |
326 | { | 327 | { |
327 | AddresseeDialog *dlg = new AddresseeDialog( parent, true ); | ||
328 | Addressee::List addressees; | 328 | Addressee::List addressees; |
329 | static bool running = false; | ||
330 | if ( running ) return addressees; | ||
331 | running = true; | ||
332 | AddresseeDialog *dlg = new AddresseeDialog( parent, true ); | ||
329 | static int geoX = 0; | 333 | static int geoX = 0; |
330 | static int geoY = 0; | 334 | static int geoY = 0; |
331 | static int geoW = 0; | 335 | static int geoW = 0; |
332 | static int geoH = 0; | 336 | static int geoH = 0; |
333 | if ( QApplication::desktop()->width() <= 640 ) | 337 | if ( QApplication::desktop()->width() <= 640 ) |
334 | dlg->showMaximized(); | 338 | dlg->showMaximized(); |
335 | else { | 339 | else { |
336 | if ( !geoX && ! geoY && !geoW &&!geoH ) { | 340 | if ( !geoX && ! geoY && !geoW &&!geoH ) { |
@@ -349,15 +353,16 @@ Addressee::List AddresseeDialog::getAddressees( QWidget *parent ) | |||
349 | geoY = dlg->geometry().y(); | 353 | geoY = dlg->geometry().y(); |
350 | geoW = dlg->width(); | 354 | geoW = dlg->width(); |
351 | geoH = dlg->height(); | 355 | geoH = dlg->height(); |
352 | if ( result == QDialog::Accepted ) { | 356 | if ( result == QDialog::Accepted ) { |
353 | addressees = dlg->addressees(); | 357 | addressees = dlg->addressees(); |
354 | } | 358 | } |
355 | 359 | ||
356 | delete dlg; | 360 | delete dlg; |
361 | running = false; | ||
357 | return addressees; | 362 | return addressees; |
358 | } | 363 | } |
359 | 364 | ||
360 | void AddresseeDialog::addressBookChanged() | 365 | void AddresseeDialog::addressBookChanged() |
361 | { | 366 | { |
362 | loadAddressBook(); | 367 | loadAddressBook(); |
363 | } | 368 | } |