| author | eilers <eilers> | 2003-03-05 11:45:30 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2003-03-05 11:45:30 (UTC) |
| commit | 97a499b24e53ba4d9f00086f2ec1df1d7f3d7569 (patch) (side-by-side diff) | |
| tree | c79e599a3a175e173f7a903e518c6f6f085268ce | |
| parent | a1b76d948b7d45e8813181396ed83c002587feb9 (diff) | |
| download | opie-97a499b24e53ba4d9f00086f2ec1df1d7f3d7569.zip opie-97a499b24e53ba4d9f00086f2ec1df1d7f3d7569.tar.gz opie-97a499b24e53ba4d9f00086f2ec1df1d7f3d7569.tar.bz2 | |
Fixed bug, again ..
Default-Email Chooser wasn't removed in some rare cases ..
| -rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 7682399..0b65a10 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -128,24 +128,26 @@ void ContactEditor::init() { QVBoxLayout *vb = new QVBoxLayout( this ); tabMain = new QTabWidget( this ); vb->addWidget( tabMain ); QWidget *tabViewport = new QWidget ( tabMain ); vb = new QVBoxLayout( tabViewport ); svGeneral = new QScrollView( tabViewport ); vb->addWidget( svGeneral, 0, 0 ); svGeneral->setResizePolicy( QScrollView::AutoOneFit ); + // svGeneral->setHScrollBarMode( QScrollView::AlwaysOff ); + // svGeneral->setVScrollBarMode( QScrollView::AlwaysOff ); svGeneral->setFrameStyle( QFrame::NoFrame ); QWidget *container = new QWidget( svGeneral->viewport() ); svGeneral->addChild( container ); QGridLayout *gl = new QGridLayout( container, 1, 1, 2, 4 ); gl->setResizeMode( QLayout::FreeResize ); btnFullName = new QPushButton( tr( "Full Name..." ), container ); gl->addWidget( btnFullName, 0, 0 ); txtFullName = new QLineEdit( container ); gl->addWidget( txtFullName, 0, 1 ); @@ -765,34 +767,33 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w connect( cmbo,SIGNAL( activated(int) ), SLOT( defaultEmailChanged(int) ) ); // Set current default email populateDefaultEmailCmb(); } else { // Something else was selected: Hide combo.. qWarning(" Hiding default-email combo" ); if ( defaultEmailChooserPosition == widgetPos ){ defaultEmailChooserPosition = -1; + } QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); if ( cmbo ){ inputStack->raiseWidget( TextField ); inputStack -> removeWidget( cmbo ); cmbDefaultEmail = 0l; delete cmbo; } - } - // Caller should initialize the responsible textfield, therefore // "false" is returned return false; } // Everything is worked off .. return true; } // Currently accessed when we select default-email more than once ! void ContactEditor::chooserError( int index ) |