Some improvements in handling of organizations:

- If you enter a organization name and no Fullname is entered, the
  organization name will be used.
  Thus, the organization is shown correctly in the listview..
- The letterpicker now searches for the SaveAs Entry (configurable)
  instead for lastname. Ths guarantees that the organization is found
  as expected..

This addresses bugreport #590 and #895..

1 files changed, 1 insertions, 0 deletions

diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index c6fa48f..e7432ee 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -56,96 +56,97 @@ class QLabel;
 class ContactEditor : public QDialog {
 	Q_OBJECT
 
 	public:
 		ContactEditor(	const OContact &entry,
 				QWidget *parent = 0,
 				const char *name = 0,
 				WFlags fl = 0 );
 		~ContactEditor();
 		void setNameFocus();
 		void setPersonalView( bool personal = true );
 		OContact entry() const { return ent; }
 
 	public slots:
 		void slotNote();
 		void slotName();
 		void setEntry(const OContact &entry);
 
 	protected slots:
 		void accept();
 
 	private:
 		void init();
 		void saveEntry();
 		bool isEmpty();
 		void cleanupFields();
 		void updateDatePicker();
 		QString parseName( QString fullName, int type );
 		void chooserError( int index );
 	private slots:
 		void slotChooser1Change( const QString &textChanged );
 		void slotChooser2Change( const QString &textChanged );
 		void slotChooser3Change( const QString &textChanged );
 		void slotChooser4Change( const QString &textChanged );
 		void slotCmbChooser1Change( int index );
 		void slotCmbChooser2Change( int index );
 		void slotCmbChooser3Change( int index );
 		void slotCmbChooser4Change( int index );
 		void slotAddressTypeChange( int index );
 		void slotAddressChange( const QString &textChanged );
 		void slotAddress2Change( const QString &textChanged );
 		void slotPOBoxChange( const QString &textChanged );
 		void slotCityChange( const QString &textChanged );
 		void slotStateChange( const QString &textChanged );
 		void slotZipChange( const QString &textChanged );
 		void slotCountryChange( const QString &textChanged );
 		void slotFullNameChange( const QString &textChanged );
 		void slotSuffixChange( const QString &textChanged );
+		void slotOrganizationChange( const QString &textChanged );
 		void slotAnniversaryDateChanged( int year, int month, int day);
 		void slotBirthdayDateChanged( int year, int month, int day);
 		void slotRemoveBirthday();
 		void slotRemoveAnniversary();
 		void defaultEmailChanged(int);
 
 	private:
 		enum StackWidgets { TextField = 1, Combo };
 		int defaultEmailChooserPosition;
 		void populateDefaultEmailCmb();
 		void chooserChange( const QString&, int , QLineEdit*, int );
 		bool cmbChooserChange( int , QWidgetStack*, int );
 		OContactFields contactfields;
 
 		OContact ent;
 
 		QDialog *dlgNote;
 		QDialog *dlgName;
 
 		QList<QLineEdit> listValue;
 		QList<QLabel> listName;
 
 		QStringList slDynamicEntries;
 		QStringList trlDynamicEntries;
 
 		bool m_personalView;
 
 		QStringList slHomeAddress;
 		QStringList slBusinessAddress;
 		QStringList slChooserNames;
 		QStringList slChooserValues;
 		QStringList emails;
 		QString defaultEmail;
 
 		QMultiLineEdit *txtNote;
 		QLabel *lblNote;
 
 		//QLineEdit *txtTitle;
 		QLineEdit *txtFirstName;
 		QLineEdit *txtMiddleName;
 		QLineEdit *txtLastName;
 		QLineEdit *txtSuffix;
 
 		QTabWidget *tabMain;
 		QScrollView *svGeneral;
 		QPushButton *btnFullName;
 		QPushButton *btnNote;
 		QLineEdit *txtFullName;