From 6696e7855b81581d964db64dc7b886c3f58d94ea Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Mon, 24 Feb 2003 09:33:19 +0000
Subject: Change default settings of combos for contacteditor

---
(limited to 'core/pim')

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 906b462..719b720 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -37,6 +37,7 @@ ContactEditor:
 - Category is on the wrong position after changing to personal and back to normal
 	( Temporarily workaround: Category is never deactivated.. :S )
 
+- Fix handling of 3 Firstnames
 
 Important:
 ----------
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 97573af..b60f2dd 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1491,10 +1491,10 @@ void ContactEditor::setEntry( const OContact &entry ) {
 
 	// Get combo-settings from contact and set preset..
 	contactfields.loadFromRecord( ent );
-	cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 0) );
-	cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 1) );
-	cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 2) );
-	cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 5) );
+	cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) );
+	cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) );
+	cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) );
+	cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 6) );
 	cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) );
 	slotCmbChooser1Change( cmbChooserField1->currentItem() );
 	slotCmbChooser2Change( cmbChooserField2->currentItem() );
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index e716fe4..3c1e5ee 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -3,7 +3,7 @@
 
 #define MAINVERSION  "0"
 #define SUBVERSION   "2"
-#define PATCHVERSION "0"
+#define PATCHVERSION "1"
 
 #define APPNAME "OPIE_ADDRESSBOOK"
 
--
cgit v0.9.0.2