author | eilers <eilers> | 2003-03-05 11:45:30 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-03-05 11:45:30 (UTC) |
commit | 97a499b24e53ba4d9f00086f2ec1df1d7f3d7569 (patch) (unidiff) | |
tree | c79e599a3a175e173f7a903e518c6f6f085268ce /core/pim | |
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 | 19 |
1 files changed, 10 insertions, 9 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 | |||
@@ -134,12 +134,14 @@ void ContactEditor::init() { | |||
134 | 134 | ||
135 | vb = new QVBoxLayout( tabViewport ); | 135 | vb = new QVBoxLayout( tabViewport ); |
136 | 136 | ||
137 | svGeneral = new QScrollView( tabViewport ); | 137 | svGeneral = new QScrollView( tabViewport ); |
138 | vb->addWidget( svGeneral, 0, 0 ); | 138 | vb->addWidget( svGeneral, 0, 0 ); |
139 | svGeneral->setResizePolicy( QScrollView::AutoOneFit ); | 139 | svGeneral->setResizePolicy( QScrollView::AutoOneFit ); |
140 | // svGeneral->setHScrollBarMode( QScrollView::AlwaysOff ); | ||
141 | // svGeneral->setVScrollBarMode( QScrollView::AlwaysOff ); | ||
140 | svGeneral->setFrameStyle( QFrame::NoFrame ); | 142 | svGeneral->setFrameStyle( QFrame::NoFrame ); |
141 | 143 | ||
142 | QWidget *container = new QWidget( svGeneral->viewport() ); | 144 | QWidget *container = new QWidget( svGeneral->viewport() ); |
143 | svGeneral->addChild( container ); | 145 | svGeneral->addChild( container ); |
144 | 146 | ||
145 | QGridLayout *gl = new QGridLayout( container, 1, 1, 2, 4 ); | 147 | QGridLayout *gl = new QGridLayout( container, 1, 1, 2, 4 ); |
@@ -771,21 +773,20 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w | |||
771 | 773 | ||
772 | } else { | 774 | } else { |
773 | // Something else was selected: Hide combo.. | 775 | // Something else was selected: Hide combo.. |
774 | qWarning(" Hiding default-email combo" ); | 776 | qWarning(" Hiding default-email combo" ); |
775 | if ( defaultEmailChooserPosition == widgetPos ){ | 777 | if ( defaultEmailChooserPosition == widgetPos ){ |
776 | defaultEmailChooserPosition = -1; | 778 | defaultEmailChooserPosition = -1; |
777 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); | 779 | } |
778 | if ( cmbo ){ | 780 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); |
779 | inputStack->raiseWidget( TextField ); | 781 | if ( cmbo ){ |
780 | inputStack -> removeWidget( cmbo ); | 782 | inputStack->raiseWidget( TextField ); |
781 | cmbDefaultEmail = 0l; | 783 | inputStack -> removeWidget( cmbo ); |
782 | delete cmbo; | 784 | cmbDefaultEmail = 0l; |
783 | } | 785 | delete cmbo; |
784 | 786 | } | |
785 | } | ||
786 | 787 | ||
787 | // Caller should initialize the responsible textfield, therefore | 788 | // Caller should initialize the responsible textfield, therefore |
788 | // "false" is returned | 789 | // "false" is returned |
789 | return false; | 790 | return false; |
790 | } | 791 | } |
791 | 792 | ||