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 | |
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() { | |||
128 | QVBoxLayout *vb = new QVBoxLayout( this ); | 128 | QVBoxLayout *vb = new QVBoxLayout( this ); |
129 | 129 | ||
130 | tabMain = new QTabWidget( this ); | 130 | tabMain = new QTabWidget( this ); |
131 | vb->addWidget( tabMain ); | 131 | vb->addWidget( tabMain ); |
132 | 132 | ||
133 | QWidget *tabViewport = new QWidget ( tabMain ); | 133 | QWidget *tabViewport = new QWidget ( tabMain ); |
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 ); |
146 | gl->setResizeMode( QLayout::FreeResize ); | 148 | gl->setResizeMode( QLayout::FreeResize ); |
147 | 149 | ||
148 | btnFullName = new QPushButton( tr( "Full Name..." ), container ); | 150 | btnFullName = new QPushButton( tr( "Full Name..." ), container ); |
149 | gl->addWidget( btnFullName, 0, 0 ); | 151 | gl->addWidget( btnFullName, 0, 0 ); |
150 | txtFullName = new QLineEdit( container ); | 152 | txtFullName = new QLineEdit( container ); |
151 | gl->addWidget( txtFullName, 0, 1 ); | 153 | gl->addWidget( txtFullName, 0, 1 ); |
@@ -765,34 +767,33 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w | |||
765 | connect( cmbo,SIGNAL( activated(int) ), | 767 | connect( cmbo,SIGNAL( activated(int) ), |
766 | SLOT( defaultEmailChanged(int) ) ); | 768 | SLOT( defaultEmailChanged(int) ) ); |
767 | 769 | ||
768 | // Set current default email | 770 | // Set current default email |
769 | populateDefaultEmailCmb(); | 771 | populateDefaultEmailCmb(); |
770 | 772 | ||
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; |
779 | } | ||
777 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); | 780 | QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); |
778 | if ( cmbo ){ | 781 | if ( cmbo ){ |
779 | inputStack->raiseWidget( TextField ); | 782 | inputStack->raiseWidget( TextField ); |
780 | inputStack -> removeWidget( cmbo ); | 783 | inputStack -> removeWidget( cmbo ); |
781 | cmbDefaultEmail = 0l; | 784 | cmbDefaultEmail = 0l; |
782 | delete cmbo; | 785 | delete cmbo; |
783 | } | 786 | } |
784 | 787 | ||
785 | } | ||
786 | |||
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 | ||
792 | // Everything is worked off .. | 793 | // Everything is worked off .. |
793 | return true; | 794 | return true; |
794 | 795 | ||
795 | } | 796 | } |
796 | 797 | ||
797 | // Currently accessed when we select default-email more than once ! | 798 | // Currently accessed when we select default-email more than once ! |
798 | void ContactEditor::chooserError( int index ) | 799 | void ContactEditor::chooserError( int index ) |