Fixed bug, again ..

Default-Email Chooser wasn't removed in some rare cases ..

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
@@ -76,128 +76,130 @@ ContactEditor::ContactEditor(	const OContact &entry,
         initializing = true;
 
         init();
         setEntry( entry );
         // cmbDefaultEmail = 0;
         // defaultEmailChooserPosition = -1;
 
         initializing = false;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
         qWarning("init() START");
         
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
                 slHomeAddress.append( "" );
                 slBusinessAddress.append( "" );
         }
 
         trlChooserNames   = OContactFields::trphonefields( false );
         slChooserNames    = OContactFields::untrphonefields( false );
         slDynamicEntries  = OContactFields::untrdetailsfields( false );
         trlDynamicEntries = OContactFields::trdetailsfields( false );
 
         // Ok, we have to remove elements from the list of dynamic entries
         // which are now stored in special (not dynamic) widgets..
         // Otherwise we will get problems with field assignments! (se)
         slDynamicEntries.remove("Anniversary");
         slDynamicEntries.remove("Birthday");
         slDynamicEntries.remove("Gender");
 
         // The same with translated fields.. But I will
         // use the translation map to avoid mismatches..
         QMap<int, QString> translMap = OContactFields::idToTrFields();
         trlDynamicEntries.remove( translMap[Qtopia::Anniversary] );
         trlDynamicEntries.remove( translMap[Qtopia::Birthday] );
         trlDynamicEntries.remove( translMap[Qtopia::Gender] );
 
         // Last Check to be sure..
         assert( slDynamicEntries.count() == trlDynamicEntries.count() );
         assert( slChooserNames.count() == trlChooserNames.count() );
 
         for (i = 0; i < slChooserNames.count(); i++)
           slChooserValues.append("");
 
 
         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 );
 
         QLabel *l = new QLabel( tr( "Job Title" ), container );
         gl->addWidget( l, 1, 0 );
         txtJobTitle = new QLineEdit( container );
         gl->addWidget( txtJobTitle, 1, 1 );
 
         l = new QLabel( tr("Suffix"), container );
         gl->addWidget( l, 2, 0 );
         txtSuffix = new QLineEdit( container );
         gl->addWidget( txtSuffix, 2, 1 );
 
         l = new QLabel( tr( "Organization" ), container );
         gl->addWidget( l, 3, 0 );
         txtOrganization = new QLineEdit( container );
         gl->addWidget( txtOrganization, 3, 1 );
 
         // Chooser 1 
         cmbChooserField1 = new QComboBox( FALSE, container );
         cmbChooserField1->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField1, 4, 0 );
         // Textfield for chooser 1.
         // Now use Widgetstack to contain the textfield and the default-email combo !
         m_widgetStack1 = new QWidgetStack( container );
         txtChooserField1 = new QLineEdit( m_widgetStack1 );
         m_widgetStack1 -> addWidget( txtChooserField1, TextField );
         gl->addWidget( m_widgetStack1, 4, 1 );
         m_widgetStack1 -> raiseWidget( TextField );
 
         // Chooser 2
         cmbChooserField2 = new QComboBox( FALSE, container );
         cmbChooserField2->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField2, 5, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack2 = new QWidgetStack( container );
         txtChooserField2 = new QLineEdit( m_widgetStack2 );
         m_widgetStack2 -> addWidget( txtChooserField2, TextField );
         gl->addWidget( m_widgetStack2, 5, 1 );
         m_widgetStack2 -> raiseWidget( TextField );
 
         // Chooser 3
         cmbChooserField3 = new QComboBox( FALSE, container );
         cmbChooserField3->setMaximumWidth( 90 );
         gl->addWidget( cmbChooserField3, 6, 0 );
         // Textfield for chooser 2
         // Now use WidgetStack to contain the textfield and the default-email combo!
         m_widgetStack3 = new QWidgetStack( container );
         txtChooserField3 = new QLineEdit( m_widgetStack3 );
         m_widgetStack3 -> addWidget( txtChooserField3, TextField );
         gl->addWidget( m_widgetStack3, 6, 1 );
         m_widgetStack3 -> raiseWidget( TextField );
 
@@ -713,137 +715,136 @@ void ContactEditor::populateDefaultEmailCmb(){
                 qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
                        cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
 
                 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
                         cmbDefaultEmail->setCurrentItem( i );
                         qDebug("set");
                         found = true;
                 }
         }
         
         // If the current default email is not found in the list, we choose the
         // first one..
         if ( !found )
                 defaultEmail = cmbDefaultEmail->text(0);
 }
 
 // Called when any combobox was changed.
 // "true" returned if the change was chandled by this function, else it should
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
         QString type = slChooserNames[index];
         qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
 
         if ( !initializing )
                 contactfields.setFieldOrder( widgetPos-1, index );
 
         // Create and connect combobox for selecting the default email 
         if ( type == "Default Email"){         
                 qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
                 
                 // More than one default-email chooser is not allowed !
                 if ( ( defaultEmailChooserPosition != -1 ) && 
                      defaultEmailChooserPosition != widgetPos && !initializing){
                         chooserError( widgetPos );
                         return true;
                 }
 
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
                 if ( cmbo ){  
                         inputStack->raiseWidget( TextField );
                         inputStack -> removeWidget( cmbo );
                         delete cmbo;
                 }
                 cmbo = new QComboBox( inputStack );
                 cmbo -> insertStringList( emails );
 
                 inputStack -> addWidget( cmbo, Combo );
                 inputStack -> raiseWidget( Combo );
 
                 defaultEmailChooserPosition = widgetPos;
                 cmbDefaultEmail = cmbo;
 
                 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;
-                        }
-
-                } 
+                }
+                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 )
 {
         qWarning("ContactEditor::chooserError( %d )", index); 
         QMessageBox::warning( this, "Chooser Error",
                               "Multiple selection of this\n"
                               "Item is not allowed !\n\n"
                               "First deselect the previous one !",
                               "&OK", 0, 0,
                               0, 0 );
 
         // Reset the selected Chooser. Unfortunately the chooser
         // generates no signal, therfore we have to 
         // call the cmbChooserChange function manually..
         switch( index ){
         case 1:
                 cmbChooserField1 -> setCurrentItem( 0 );
                 slotCmbChooser1Change( 0 );
                 break;
         case 2: 
                 cmbChooserField2 -> setCurrentItem( 0 );
                 slotCmbChooser2Change( 0 );
                 break;
         case 3: 
                 cmbChooserField3 -> setCurrentItem( 0 );
                 slotCmbChooser3Change( 0 );
                 break;
         case 4: 
                 cmbChooserField4 -> setCurrentItem( 0 );
                 slotCmbChooser4Change( 0 );
                 break;
         }
 }
 
 // Called when something was changed in a textfield (shouldn't it called textchanged? (se))
 void ContactEditor::chooserChange( const QString &textChanged, int index, 
                                    QLineEdit* , int widgetPos ) {
 
         QString type = slChooserNames[index]; // :SX
         qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",
                type.latin1(),textChanged.latin1(), index,  widgetPos );
 
         if ( type == "Default Email"){         
                 qWarning ("??? Wozu??: %s", textChanged.latin1());
                 defaultEmail = textChanged;
 
                 populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
                 qDebug("emails");
 
                 QString de;
                 emails = QStringList::split (",", textChanged );