summaryrefslogtreecommitdiff
authoreilers <eilers>2003-02-24 09:33:19 (UTC)
committer eilers <eilers>2003-02-24 09:33:19 (UTC)
commit6696e7855b81581d964db64dc7b886c3f58d94ea (patch) (unidiff)
tree504994d669cb119dda5e2c55bc5bb92b7afdff17
parentd5746c625ebf540711179ef01a7bb99bc3b2c3d6 (diff)
downloadopie-6696e7855b81581d964db64dc7b886c3f58d94ea.zip
opie-6696e7855b81581d964db64dc7b886c3f58d94ea.tar.gz
opie-6696e7855b81581d964db64dc7b886c3f58d94ea.tar.bz2
Change default settings of combos for contacteditor
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/TODO1
-rw-r--r--core/pim/addressbook/contacteditor.cpp8
-rw-r--r--core/pim/addressbook/version.h2
3 files changed, 6 insertions, 5 deletions
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
@@ -28,24 +28,25 @@ Bugs but not in addressbook:
28 28
29- Exporting and reimporting of Jobtitle was reported to fail (Could not reproduce this ! (se)) 29- Exporting and reimporting of Jobtitle was reported to fail (Could not reproduce this ! (se))
30 30
31 31
32Urgent: 32Urgent:
33-------- 33--------
34ContactEditor: 34ContactEditor:
35- Contact-Editor is temporarely reenabled. Wait for replacement. 35- Contact-Editor is temporarely reenabled. Wait for replacement.
36- Redesign of Contacteditor 36- Redesign of Contacteditor
37- Category is on the wrong position after changing to personal and back to normal 37- Category is on the wrong position after changing to personal and back to normal
38 ( Temporarily workaround: Category is never deactivated.. :S ) 38 ( Temporarily workaround: Category is never deactivated.. :S )
39 39
40- Fix handling of 3 Firstnames
40 41
41Important: 42Important:
42---------- 43----------
43 44
44- If new contact is added (contacteditor closed): focus (table, card) to 45- If new contact is added (contacteditor closed): focus (table, card) to
45 this entry ! 46 this entry !
46- After search (Started with Return): KeyFocus should be on Tabelle 47- After search (Started with Return): KeyFocus should be on Tabelle
47 48
48- "What's this" should be added (Deleyed after Feature Freeze) 49- "What's this" should be added (Deleyed after Feature Freeze)
49 50
50Less important: 51Less important:
51--------------- 52---------------
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
@@ -1482,28 +1482,28 @@ void ContactEditor::setEntry( const OContact &entry ) {
1482 slotAddressTypeChange( cmbAddress->currentItem() ); 1482 slotAddressTypeChange( cmbAddress->currentItem() );
1483 1483
1484 // Calling "show()" to arrange all widgets. Otherwise we will get 1484 // Calling "show()" to arrange all widgets. Otherwise we will get
1485 // a wrong position of the textfields and are unable to put our 1485 // a wrong position of the textfields and are unable to put our
1486 // default-email combo over it.. This is very ugly ! 1486 // default-email combo over it.. This is very ugly !
1487 // Does anybody has a better solution ? 1487 // Does anybody has a better solution ?
1488 // Basically we should rethink the strategy to hide 1488 // Basically we should rethink the strategy to hide
1489 // a textfield with overwriting.. (se) 1489 // a textfield with overwriting.. (se)
1490 show(); 1490 show();
1491 1491
1492 // Get combo-settings from contact and set preset.. 1492 // Get combo-settings from contact and set preset..
1493 contactfields.loadFromRecord( ent ); 1493 contactfields.loadFromRecord( ent );
1494 cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 0) ); 1494 cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) );
1495 cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 1) ); 1495 cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) );
1496 cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 2) ); 1496 cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) );
1497 cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 5) ); 1497 cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 6) );
1498 cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) ); 1498 cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) );
1499 slotCmbChooser1Change( cmbChooserField1->currentItem() ); 1499 slotCmbChooser1Change( cmbChooserField1->currentItem() );
1500 slotCmbChooser2Change( cmbChooserField2->currentItem() ); 1500 slotCmbChooser2Change( cmbChooserField2->currentItem() );
1501 slotCmbChooser3Change( cmbChooserField3->currentItem() ); 1501 slotCmbChooser3Change( cmbChooserField3->currentItem() );
1502 slotCmbChooser4Change( cmbChooserField4->currentItem() ); 1502 slotCmbChooser4Change( cmbChooserField4->currentItem() );
1503 slotAddressTypeChange( cmbAddress->currentItem() ); 1503 slotAddressTypeChange( cmbAddress->currentItem() );
1504 1504
1505 updateDatePicker(); 1505 updateDatePicker();
1506 1506
1507 initializing = false; 1507 initializing = false;
1508} 1508}
1509void ContactEditor::updateDatePicker() 1509void ContactEditor::updateDatePicker()
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
@@ -1,10 +1,10 @@
1#ifndef _VERSION_H_ 1#ifndef _VERSION_H_
2#define _VERSION_H_ 2#define _VERSION_H_
3 3
4#define MAINVERSION "0" 4#define MAINVERSION "0"
5#define SUBVERSION "2" 5#define SUBVERSION "2"
6#define PATCHVERSION "0" 6#define PATCHVERSION "1"
7 7
8#define APPNAME "OPIE_ADDRESSBOOK" 8#define APPNAME "OPIE_ADDRESSBOOK"
9 9
10#endif 10#endif