[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2005-03-21 16:39:01
Message-ID: 20050321163901.CCE035F4 () office ! kde ! org
[Download RAW message or body]

CVS commit by tokoe: 

Fixed bug 102078 and made the name/organization in the address view update
automatically.

BUGS:102078


  M +8 -1      addresseditwidget.cpp   1.42
  M +1 -0      addresseditwidget.h   1.18
  M +4 -0      addresseeeditorwidget.cpp   1.107


--- kdepim/kaddressbook/addresseditwidget.cpp  #1.41:1.42
@@ -93,4 +93,5 @@ AddressEditWidget::AddressEditWidget( QW
   mAddressField->setFrameStyle( QFrame::Panel | QFrame::Sunken );
   mAddressField->setMinimumHeight( 20 );
+  mAddressField->setAlignment( Qt::AlignTop );
   layout->addWidget( mAddressField );
 
@@ -166,4 +167,10 @@ void AddressEditWidget::setAddresses( co
 }
 
+void AddressEditWidget::updateAddressee( const KABC::Addressee &addr )
+{
+  mAddressee = addr;
+  updateAddressEdit();
+}
+
 void AddressEditWidget::edit()
 {
@@ -214,5 +221,5 @@ void AddressEditWidget::updateAddressEdi
     if ( !a.isEmpty() ) {
 #if KDE_VERSION >= 319
-      if ( a.type() & KABC::Address::Work ) {
+      if ( a.type() & KABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) {
         mAddressField->setText( a.formattedAddress( mAddressee.realName(),
                                    mAddressee.organization() ) );

--- kdepim/kaddressbook/addresseditwidget.h  #1.17:1.18
@@ -60,4 +60,5 @@ class AddressEditWidget : public QWidget
     void setAddresses( const KABC::Addressee &addr,
                        const KABC::Address::List &list );
+    void updateAddressee( const KABC::Addressee &addr );
 
     void updateTypeCombo( const KABC::Address::List&, KComboBox* );

--- kdepim/kaddressbook/addresseeeditorwidget.cpp  #1.106:1.107
@@ -702,4 +702,6 @@ void AddresseeEditorWidget::organization
   nameBoxChanged();
 
+  mAddressEditWidget->updateAddressee( mAddressee );
+
   emitModified();
 }
@@ -724,4 +726,6 @@ void AddresseeEditorWidget::nameBoxChang
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
   }
+
+  mAddressEditWidget->updateAddressee( mAddressee );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]