summaryrefslogtreecommitdiff
authortille <tille>2002-12-18 13:01:15 (UTC)
committer tille <tille>2002-12-18 13:01:15 (UTC)
commit9471f69c44e811781ed9f643f5b84d7b459df601 (patch) (side-by-side diff)
treef8daf275c36b9a068cbec9ff487a195e639ff8bf
parent930884a92b064766ed436111778fc55f157c6e1c (diff)
downloadopie-9471f69c44e811781ed9f643f5b84d7b459df601.zip
opie-9471f69c44e811781ed9f643f5b84d7b459df601.tar.gz
opie-9471f69c44e811781ed9f643f5b84d7b459df601.tar.bz2
changing from defaultemail to something else now hides the combo
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/contacteditor.cpp19
-rw-r--r--core/pim/addressbook/contacteditor.h3
2 files changed, 14 insertions, 8 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index f125edb..cc3908a 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -67,14 +67,14 @@ ContactEditor::ContactEditor( const OContact &entry,
m_personalView ( false )
{
init();
setEntry( entry );
-
cmbDefaultEmail = 0;
+ defaultEmailChooserPosition = -1;
}
ContactEditor::~ContactEditor() {
}
void ContactEditor::init() {
@@ -628,14 +628,15 @@ void ContactEditor::defaultEmailChanged(int i){
qDebug("defaultEmailChanged");
int index = cmbChooserField1->currentItem();
slChooserValues[index] = cmbDefaultEmail->text(i);
}
-void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid ) {
+void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
+ qDebug("defaultEmailChooserPosition %i, widgetPos %i ",defaultEmailChooserPosition,widgetPos);
if (slChooserNames[index] == "Default Email"){
if (cmbDefaultEmail) delete cmbDefaultEmail;
cmbDefaultEmail = new QComboBox(inputWid->parentWidget());
cmbDefaultEmail->setGeometry(inputWid->frameGeometry());
cmbDefaultEmail->insertStringList(ent.emailList());
connect(cmbDefaultEmail,SIGNAL(activated(int)),
@@ -643,34 +644,38 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QLineE
QString demail = ent.defaultEmail();
for ( int i = 0; i < cmbDefaultEmail->count(); i++)
if ( cmbDefaultEmail->text( i ) == demail )
cmbDefaultEmail->setCurrentItem( i );
cmbDefaultEmail->show();
- }
+ defaultEmailChooserPosition = widgetPos;
+ }else if (defaultEmailChooserPosition == widgetPos){
+ qDebug("cmbDefaultEmail->hide()");
+ if (cmbDefaultEmail) cmbDefaultEmail->hide();
+ }
slChooserValues[index] = textChanged;
}
void ContactEditor::slotChooser1Change( const QString &textChanged ) {
- chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1);
+ chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
}
void ContactEditor::slotChooser2Change( const QString &textChanged ) {
- chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2);
+ chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
}
void ContactEditor::slotChooser3Change( const QString &textChanged ) {
- chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3);
+ chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
}
void ContactEditor::slotChooser4Change( const QString &textChanged ) {
- chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4);
+ chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
}
void ContactEditor::slotAddressChange( const QString &textChanged ) {
if ( cmbAddress->currentItem() == 0 ) {
slBusinessAddress[0] = textChanged;
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index d4b7f27..63257f8 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -100,13 +100,14 @@ class ContactEditor : public QDialog {
void slotBirthdayDateChanged( int year, int month, int day);
void slotRemoveBirthday();
void slotRemoveAnniversary();
void defaultEmailChanged(int);
private:
- void chooserChange( const QString&, int , QLineEdit* );
+ int defaultEmailChooserPosition;
+ void chooserChange( const QString&, int , QLineEdit*, int );
bool useFullName;
OContact ent;
QDialog *dlgNote;
QDialog *dlgName;