author | eilers <eilers> | 2002-10-25 13:06:09 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-25 13:06:09 (UTC) |
commit | 3421736c248c6ca7171bafdf3af9e2edf94eb593 (patch) (unidiff) | |
tree | d07fb1c6ae99109aec6e483b1e848533a61d7b6d /core | |
parent | 2f2c23d398b6a47bd06aaf329a55bb455cf5ddd1 (diff) | |
download | opie-3421736c248c6ca7171bafdf3af9e2edf94eb593.zip opie-3421736c248c6ca7171bafdf3af9e2edf94eb593.tar.gz opie-3421736c248c6ca7171bafdf3af9e2edf94eb593.tar.bz2 |
If I want to edit my personal settings, category is disabled.
Now using Datepicker for birthday and annyversary..
-rw-r--r-- | core/pim/addressbook/TODO | 11 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 9 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg_base.ui | 6 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 153 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.h | 16 |
5 files changed, 154 insertions, 41 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO index 96134f4..100a6fd 100644 --- a/core/pim/addressbook/TODO +++ b/core/pim/addressbook/TODO | |||
@@ -7,18 +7,18 @@ Urgent: | |||
7 | 7 | ||
8 | Important: | 8 | Important: |
9 | 9 | ||
10 | - Personal contact editor: Disable categories | ||
11 | - Name order selected in "contacteditor" not used in list view. | 10 | - Name order selected in "contacteditor" not used in list view. |
12 | - contacteditor: Birthday, annyversary, ... : Use Dateselector | ||
13 | 11 | ||
14 | - Overview window cleanup needed.. | 12 | - Overview window cleanup needed.. |
15 | - Cursor keys should work in detail-view (ablabel) | 13 | - Cursor keys should work in detail-view (ablabel) |
16 | - "What's this" should be added | 14 | -> Ablabel should be removed and Abtable should be increased with |
15 | different views (as started by darwin zins).. | ||
17 | - Store last settings of combo-boxes | 16 | - Store last settings of combo-boxes |
18 | - Finishing of new View functions (List, Phonebook...) | 17 | - Finishing of new View functions (List, Phonebook...) |
19 | - The names of the countries are sorted by there english names, only.. | 18 | - The names of the countries are sorted by there english names, only.. |
20 | Even if they are translated.. :S | 19 | Even if they are translated.. :S |
21 | - Reload if contacts were changed externally | 20 | - Reload if contacts were changed externally |
21 | - "What's this" should be added | ||
22 | 22 | ||
23 | Less important: | 23 | Less important: |
24 | 24 | ||
@@ -29,7 +29,7 @@ Less important: | |||
29 | (abtable should store Iterator for selected Category) | 29 | (abtable should store Iterator for selected Category) |
30 | 30 | ||
31 | Should be Fixed (not absolute sure, need further validation): | 31 | Should be Fixed (not absolute sure, need further validation): |
32 | - "Nonenglish" translation bug has to be fixed. | 32 | |
33 | 33 | ||
34 | Fixed: | 34 | Fixed: |
35 | - Syncing: abtable not reloaded after sync. | 35 | - Syncing: abtable not reloaded after sync. |
@@ -41,3 +41,6 @@ Fixed: | |||
41 | - Mail-Icon is missing | 41 | - Mail-Icon is missing |
42 | - Use opie-mail insted of qt-mail if possible. | 42 | - Use opie-mail insted of qt-mail if possible. |
43 | - Font menu is invisible using german translation | 43 | - Font menu is invisible using german translation |
44 | - Personal contact editor: Disable categories | ||
45 | - "Nonenglish" translation bug has to be fixed. | ||
46 | - contacteditor: Birthday, annyversary, ... : Use Dateselector | ||
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 39d8321..108e66d 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -94,7 +94,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
94 | caseSensitive = cfg.readBoolEntry( "caseSensitive" ); | 94 | caseSensitive = cfg.readBoolEntry( "caseSensitive" ); |
95 | doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" ); | 95 | doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" ); |
96 | cfg.setGroup("Mail"); | 96 | cfg.setGroup("Mail"); |
97 | m_useQtMail = cfg.readBoolEntry( "useQtMail" ); | 97 | m_useQtMail = cfg.readBoolEntry( "useQtMail", true ); |
98 | m_useOpieMail=cfg.readBoolEntry( "useOpieMail" ); | 98 | m_useOpieMail=cfg.readBoolEntry( "useOpieMail" ); |
99 | 99 | ||
100 | 100 | ||
@@ -673,12 +673,16 @@ void AddressbookWindow::editPersonal() | |||
673 | if (QFile::exists(filename)) | 673 | if (QFile::exists(filename)) |
674 | me = OContact::readVCard( filename )[0]; | 674 | me = OContact::readVCard( filename )[0]; |
675 | if (bAbEditFirstTime) { | 675 | if (bAbEditFirstTime) { |
676 | qWarning("Editing personal data"); | ||
676 | abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields, | 677 | abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields, |
677 | this, "editor" ); | 678 | this, "editor" ); |
678 | // don't create a new editor every time | 679 | // don't create a new editor every time |
679 | bAbEditFirstTime = FALSE; | 680 | bAbEditFirstTime = FALSE; |
680 | } else | 681 | } else{ |
681 | abEditor->setEntry( me ); | 682 | abEditor->setEntry( me ); |
683 | } | ||
684 | |||
685 | abEditor->setPersonalView( true ); | ||
682 | 686 | ||
683 | abEditor->setCaption(tr("Edit My Personal Details")); | 687 | abEditor->setCaption(tr("Edit My Personal Details")); |
684 | abEditor->showMaximized(); | 688 | abEditor->showMaximized(); |
@@ -694,6 +698,7 @@ void AddressbookWindow::editPersonal() | |||
694 | abView()->sync(); | 698 | abView()->sync(); |
695 | } | 699 | } |
696 | abEditor->setCaption( tr("Edit Address") ); | 700 | abEditor->setCaption( tr("Edit Address") ); |
701 | abEditor->setPersonalView( false ); | ||
697 | } | 702 | } |
698 | 703 | ||
699 | void AddressbookWindow::slotPersonalView() | 704 | void AddressbookWindow::slotPersonalView() |
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui index d3ea12e..a6fcffa 100644 --- a/core/pim/addressbook/configdlg_base.ui +++ b/core/pim/addressbook/configdlg_base.ui | |||
@@ -12,8 +12,8 @@ | |||
12 | <rect> | 12 | <rect> |
13 | <x>0</x> | 13 | <x>0</x> |
14 | <y>0</y> | 14 | <y>0</y> |
15 | <width>217</width> | 15 | <width>244</width> |
16 | <height>287</height> | 16 | <height>298</height> |
17 | </rect> | 17 | </rect> |
18 | </property> | 18 | </property> |
19 | <property stdset="1"> | 19 | <property stdset="1"> |
@@ -329,6 +329,8 @@ is provided free !</string> | |||
329 | <tabstop>m_useWildCard</tabstop> | 329 | <tabstop>m_useWildCard</tabstop> |
330 | <tabstop>m_useCaseSensitive</tabstop> | 330 | <tabstop>m_useCaseSensitive</tabstop> |
331 | <tabstop>m_signalWrapAround</tabstop> | 331 | <tabstop>m_signalWrapAround</tabstop> |
332 | <tabstop>m_useQtMail</tabstop> | ||
333 | <tabstop>m_useOpieMail</tabstop> | ||
332 | <tabstop>buttonOk</tabstop> | 334 | <tabstop>buttonOk</tabstop> |
333 | <tabstop>buttonCancel</tabstop> | 335 | <tabstop>buttonCancel</tabstop> |
334 | </tabstops> | 336 | </tabstops> |
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index e7f2ebd..a59a927 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <qpe/categoryselect.h> | 24 | #include <qpe/categoryselect.h> |
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/qpedialog.h> | 26 | #include <qpe/qpedialog.h> |
27 | #include <qpe/timeconversion.h> | ||
27 | 28 | ||
28 | #include <qcombobox.h> | 29 | #include <qcombobox.h> |
29 | #include <qlabel.h> | 30 | #include <qlabel.h> |
@@ -36,6 +37,7 @@ | |||
36 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
37 | #include <qmainwindow.h> | 38 | #include <qmainwindow.h> |
38 | #include <qvaluelist.h> | 39 | #include <qvaluelist.h> |
40 | #include <qpopupmenu.h> | ||
39 | 41 | ||
40 | static inline bool containsAlphaNum( const QString &str ); | 42 | static inline bool containsAlphaNum( const QString &str ); |
41 | static inline bool constainsWhiteSpace( const QString &str ); | 43 | static inline bool constainsWhiteSpace( const QString &str ); |
@@ -57,7 +59,8 @@ ContactEditor::ContactEditor( const OContact &entry, | |||
57 | WFlags fl ) | 59 | WFlags fl ) |
58 | : QDialog( parent, name, TRUE, fl ), | 60 | : QDialog( parent, name, TRUE, fl ), |
59 | orderedValues( newOrderedValues ), | 61 | orderedValues( newOrderedValues ), |
60 | slOrdered( *slNewOrdered ) | 62 | slOrdered( *slNewOrdered ), |
63 | m_personalView ( false ) | ||
61 | { | 64 | { |
62 | 65 | ||
63 | init(); | 66 | init(); |
@@ -206,7 +209,16 @@ void ContactEditor::init() { | |||
206 | continue; | 209 | continue; |
207 | } | 210 | } |
208 | 211 | ||
209 | if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" ) | 212 | if ( *it == "Name Title" || |
213 | *it == "First Name" || | ||
214 | *it == "Middle Name" || | ||
215 | *it == "Last Name" || | ||
216 | *it == "File As" || | ||
217 | *it == "Default Email" || | ||
218 | *it == "Emails" || | ||
219 | *it == "Groups" || | ||
220 | *it == "Anniversary" || | ||
221 | *it == "Birthday" ) | ||
210 | continue; | 222 | continue; |
211 | 223 | ||
212 | if ( *it == "Name Title" ) { | 224 | if ( *it == "Name Title" ) { |
@@ -402,11 +414,21 @@ void ContactEditor::init() { | |||
402 | cmbFileAs = new QComboBox( TRUE, container ); | 414 | cmbFileAs = new QComboBox( TRUE, container ); |
403 | gl->addWidget( cmbFileAs, 6, 1 ); | 415 | gl->addWidget( cmbFileAs, 6, 1 ); |
404 | 416 | ||
405 | l = new QLabel( tr( "Category" ), container ); | 417 | labCat = new QLabel( tr( "Category" ), container ); |
406 | gl->addWidget( l, 7, 0 ); | 418 | gl->addWidget( labCat, 7, 0 ); |
407 | cmbCat = new CategorySelect( container ); | 419 | cmbCat = new CategorySelect( container ); |
408 | gl->addWidget( cmbCat, 7, 1 ); | 420 | gl->addWidget( cmbCat, 7, 1 ); |
409 | 421 | ||
422 | // We don't need categories for the personal view | ||
423 | if ( m_personalView ){ | ||
424 | qWarning("Disable Category.."); | ||
425 | labCat->hide(); | ||
426 | cmbCat->hide(); | ||
427 | } else { | ||
428 | labCat->show(); | ||
429 | cmbCat->show(); | ||
430 | } | ||
431 | |||
410 | btnNote = new QPushButton( tr( "Notes..." ), container ); | 432 | btnNote = new QPushButton( tr( "Notes..." ), container ); |
411 | gl->addWidget( btnNote, 8, 1 ); | 433 | gl->addWidget( btnNote, 8, 1 ); |
412 | 434 | ||
@@ -707,9 +729,56 @@ void ContactEditor::init() { | |||
707 | 729 | ||
708 | gl = new QGridLayout( container, 1, 2, 2, 4 ); | 730 | gl = new QGridLayout( container, 1, 2, 2, 4 ); |
709 | 731 | ||
732 | int counter = 0; | ||
733 | |||
734 | // Birthday | ||
735 | l = new QLabel( tr("Birthday"), container ); | ||
736 | gl->addWidget( l, counter, 0 ); | ||
737 | |||
738 | QPopupMenu* m1 = new QPopupMenu( container ); | ||
739 | birthdayPicker = new DateBookMonth( m1, 0, TRUE ); | ||
740 | m1->insertItem( birthdayPicker ); | ||
741 | |||
742 | birthdayButton= new QToolButton( container, "buttonStart" ); | ||
743 | birthdayButton->setPopup( m1 ); | ||
744 | birthdayButton->setPopupDelay(0); | ||
745 | gl->addWidget( birthdayButton, counter , 1 ); | ||
746 | connect( birthdayPicker, SIGNAL( dateClicked( int, int, int ) ), | ||
747 | this, SLOT( slotBirthdayDateChanged( int, int, int ) ) ); | ||
748 | |||
749 | ++counter; | ||
750 | |||
751 | // Anniversary | ||
752 | l = new QLabel( tr("Anniversary"), container ); | ||
753 | gl->addWidget( l, counter, 0 ); | ||
754 | |||
755 | m1 = new QPopupMenu( container ); | ||
756 | anniversaryPicker = new DateBookMonth( m1, 0, TRUE ); | ||
757 | m1->insertItem( anniversaryPicker ); | ||
758 | |||
759 | anniversaryButton= new QToolButton( container, "buttonStart" ); | ||
760 | anniversaryButton->setPopup( m1 ); | ||
761 | anniversaryButton->setPopupDelay(0); | ||
762 | gl->addWidget( anniversaryButton, counter , 1 ); | ||
763 | connect( anniversaryPicker, SIGNAL( dateClicked( int, int, int ) ), | ||
764 | this, SLOT( slotAnniversaryDateChanged( int, int, int ) ) ); | ||
765 | |||
766 | ++counter; | ||
767 | |||
768 | // Gender | ||
769 | l = new QLabel( tr("Gender"), container ); | ||
770 | gl->addWidget( l, counter, 0 ); | ||
771 | cmbGender = new QComboBox( container ); | ||
772 | cmbGender->insertItem( "", 0 ); | ||
773 | cmbGender->insertItem( tr("Male"), 1); | ||
774 | cmbGender->insertItem( tr("Female"), 2); | ||
775 | gl->addWidget( cmbGender, counter, 1 ); | ||
776 | |||
777 | ++counter; | ||
778 | |||
710 | // Create Labels and lineedit fields for every dynamic entry | 779 | // Create Labels and lineedit fields for every dynamic entry |
711 | QStringList::ConstIterator it = slDynamicEntries.begin(); | 780 | QStringList::ConstIterator it = slDynamicEntries.begin(); |
712 | for (i = 0; it != slDynamicEntries.end(); i++, ++it) { | 781 | for (i = counter; it != slDynamicEntries.end(); i++, ++it) { |
713 | l = new QLabel( QString::null , container ); | 782 | l = new QLabel( QString::null , container ); |
714 | listName.append( l ); | 783 | listName.append( l ); |
715 | gl->addWidget( l, i, 0 ); | 784 | gl->addWidget( l, i, 0 ); |
@@ -720,13 +789,6 @@ void ContactEditor::init() { | |||
720 | // Fill labels with names.. | 789 | // Fill labels with names.. |
721 | loadFields(); | 790 | loadFields(); |
722 | 791 | ||
723 | l = new QLabel( tr("Gender"), container ); | ||
724 | gl->addWidget( l, slDynamicEntries.count(), 0 ); | ||
725 | cmbGender = new QComboBox( container ); | ||
726 | cmbGender->insertItem( "", 0 ); | ||
727 | cmbGender->insertItem( tr("Male"), 1); | ||
728 | cmbGender->insertItem( tr("Female"), 2); | ||
729 | gl->addWidget( cmbGender, slDynamicEntries.count(), 1 ); | ||
730 | 792 | ||
731 | tabMain->insertTab( tabViewport, tr( "Details" ) ); | 793 | tabMain->insertTab( tabViewport, tr( "Details" ) ); |
732 | 794 | ||
@@ -1009,6 +1071,7 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) { | |||
1009 | 1071 | ||
1010 | } | 1072 | } |
1011 | 1073 | ||
1074 | // Loads the detail fields | ||
1012 | void ContactEditor::loadFields() { | 1075 | void ContactEditor::loadFields() { |
1013 | 1076 | ||
1014 | QStringList::ConstIterator it; | 1077 | QStringList::ConstIterator it; |
@@ -1036,18 +1099,27 @@ void ContactEditor::loadFields() { | |||
1036 | if ( *it == "Spouse" ) | 1099 | if ( *it == "Spouse" ) |
1037 | (*lit)->setText( tr( "Spouse" ) ); | 1100 | (*lit)->setText( tr( "Spouse" ) ); |
1038 | 1101 | ||
1039 | if ( *it == "Birthday" ) | ||
1040 | (*lit)->setText( tr( "Birthday" ) ); | ||
1041 | |||
1042 | if ( *it == "Anniversary" ) | ||
1043 | (*lit)->setText( tr( "Anniversary" ) ); | ||
1044 | |||
1045 | if ( *it == "Nickname" ) | 1102 | if ( *it == "Nickname" ) |
1046 | (*lit)->setText( tr( "Nickname" ) ); | 1103 | (*lit)->setText( tr( "Nickname" ) ); |
1047 | 1104 | ||
1048 | if ( *it == "Children" ) | 1105 | if ( *it == "Children" ) |
1049 | (*lit)->setText( tr( "Children" ) ); | 1106 | (*lit)->setText( tr( "Children" ) ); |
1050 | } | 1107 | } |
1108 | // Set DatePicker | ||
1109 | qWarning ("**Info: %s", ent.birthday().latin1() ); | ||
1110 | if ( !ent.birthday().isEmpty() ){ | ||
1111 | birthdayButton->setText( ent.birthday() ); | ||
1112 | birthdayPicker->setDate( TimeConversion::fromString ( ent.birthday() ) ); | ||
1113 | } else | ||
1114 | birthdayButton->setText( tr ("Unknown") ); | ||
1115 | |||
1116 | qWarning ("**Info: %s", ent.anniversary().latin1() ); | ||
1117 | if ( !ent.anniversary().isEmpty() ){ | ||
1118 | anniversaryButton->setText( ent.anniversary() ); | ||
1119 | anniversaryPicker->setDate( TimeConversion::fromString ( ent.birthday() ) ); | ||
1120 | } else | ||
1121 | anniversaryButton->setText( tr ("Unknown") ); | ||
1122 | |||
1051 | } | 1123 | } |
1052 | 1124 | ||
1053 | void ContactEditor::accept() { | 1125 | void ContactEditor::accept() { |
@@ -1429,12 +1501,6 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1429 | if ( *it == "Spouse" ) | 1501 | if ( *it == "Spouse" ) |
1430 | (*itLE)->setText( ent.spouse() ); | 1502 | (*itLE)->setText( ent.spouse() ); |
1431 | 1503 | ||
1432 | if ( *it == "Birthday" ) | ||
1433 | (*itLE)->setText( ent.birthday() ); | ||
1434 | |||
1435 | if ( *it == "Anniversary" ) | ||
1436 | (*itLE)->setText( ent.anniversary() ); | ||
1437 | |||
1438 | if ( *it == "Nickname" ) | 1504 | if ( *it == "Nickname" ) |
1439 | (*itLE)->setText( ent.nickname() ); | 1505 | (*itLE)->setText( ent.nickname() ); |
1440 | 1506 | ||
@@ -1518,6 +1584,7 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1518 | 1584 | ||
1519 | } | 1585 | } |
1520 | 1586 | ||
1587 | |||
1521 | cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); | 1588 | cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); |
1522 | 1589 | ||
1523 | QString gender = ent.gender(); | 1590 | QString gender = ent.gender(); |
@@ -1531,6 +1598,8 @@ void ContactEditor::setEntry( const OContact &entry ) { | |||
1531 | 1598 | ||
1532 | slotAddressTypeChange( cmbAddress->currentItem() ); | 1599 | slotAddressTypeChange( cmbAddress->currentItem() ); |
1533 | 1600 | ||
1601 | loadFields(); | ||
1602 | |||
1534 | } | 1603 | } |
1535 | 1604 | ||
1536 | void ContactEditor::saveEntry() { | 1605 | void ContactEditor::saveEntry() { |
@@ -1627,12 +1696,6 @@ void ContactEditor::saveEntry() { | |||
1627 | if ( *it == "Spouse" ) | 1696 | if ( *it == "Spouse" ) |
1628 | ent.setSpouse( (*itLE)->text() ); | 1697 | ent.setSpouse( (*itLE)->text() ); |
1629 | 1698 | ||
1630 | if ( *it == "Birthday" ) | ||
1631 | ent.setBirthday( (*itLE)->text() ); | ||
1632 | |||
1633 | if ( *it == "Anniversary" ) | ||
1634 | ent.setAnniversary( (*itLE)->text() ); | ||
1635 | |||
1636 | if ( *it == "Nickname" ) | 1699 | if ( *it == "Nickname" ) |
1637 | ent.setNickname( (*itLE)->text() ); | 1700 | ent.setNickname( (*itLE)->text() ); |
1638 | 1701 | ||
@@ -1806,3 +1869,33 @@ static inline bool constainsWhiteSpace( const QString &str ) | |||
1806 | return FALSE; | 1869 | return FALSE; |
1807 | } | 1870 | } |
1808 | 1871 | ||
1872 | void ContactEditor::setPersonalView( bool personal ) | ||
1873 | { | ||
1874 | m_personalView = personal; | ||
1875 | if ( personal ){ | ||
1876 | cmbCat->hide(); | ||
1877 | labCat->hide(); | ||
1878 | } else{ | ||
1879 | cmbCat->show(); | ||
1880 | labCat->show(); | ||
1881 | |||
1882 | } | ||
1883 | } | ||
1884 | |||
1885 | void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day) | ||
1886 | { | ||
1887 | QDate date; | ||
1888 | date.setYMD( year, month, day ); | ||
1889 | QString dateString = TimeString::numberDateString( date ); | ||
1890 | anniversaryButton->setText( dateString ); | ||
1891 | ent.setAnniversary ( dateString ); | ||
1892 | } | ||
1893 | |||
1894 | void ContactEditor::slotBirthdayDateChanged( int year, int month, int day) | ||
1895 | { | ||
1896 | QDate date; | ||
1897 | date.setYMD( year, month, day ); | ||
1898 | QString dateString = TimeString::numberDateString( date ); | ||
1899 | birthdayButton->setText( dateString ); | ||
1900 | ent.setBirthday ( dateString ); | ||
1901 | } | ||
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h index 8ed8553..40ce864 100644 --- a/core/pim/addressbook/contacteditor.h +++ b/core/pim/addressbook/contacteditor.h | |||
@@ -23,6 +23,8 @@ | |||
23 | 23 | ||
24 | #include <opie/ocontact.h> | 24 | #include <opie/ocontact.h> |
25 | 25 | ||
26 | #include <qpe/datebookmonth.h> | ||
27 | |||
26 | #include <qdialog.h> | 28 | #include <qdialog.h> |
27 | #include <qlist.h> | 29 | #include <qlist.h> |
28 | #include <qmap.h> | 30 | #include <qmap.h> |
@@ -61,6 +63,7 @@ class ContactEditor : public QDialog { | |||
61 | ~ContactEditor(); | 63 | ~ContactEditor(); |
62 | void loadFields(); | 64 | void loadFields(); |
63 | void setNameFocus(); | 65 | void setNameFocus(); |
66 | void setPersonalView( bool personal = true ); | ||
64 | OContact entry() const { return ent; } | 67 | OContact entry() const { return ent; } |
65 | 68 | ||
66 | public slots: | 69 | public slots: |
@@ -78,7 +81,6 @@ class ContactEditor : public QDialog { | |||
78 | bool isEmpty(); | 81 | bool isEmpty(); |
79 | void cleanupFields(); | 82 | void cleanupFields(); |
80 | QString parseName( QString fullName, int type ); | 83 | QString parseName( QString fullName, int type ); |
81 | |||
82 | private slots: | 84 | private slots: |
83 | void slotChooser1Change( const QString &textChanged ); | 85 | void slotChooser1Change( const QString &textChanged ); |
84 | void slotChooser2Change( const QString &textChanged ); | 86 | void slotChooser2Change( const QString &textChanged ); |
@@ -97,6 +99,8 @@ class ContactEditor : public QDialog { | |||
97 | void slotZipChange( const QString &textChanged ); | 99 | void slotZipChange( const QString &textChanged ); |
98 | void slotCountryChange( const QString &textChanged ); | 100 | void slotCountryChange( const QString &textChanged ); |
99 | void slotFullNameChange( const QString &textChanged ); | 101 | void slotFullNameChange( const QString &textChanged ); |
102 | void slotAnniversaryDateChanged( int year, int month, int day); | ||
103 | void slotBirthdayDateChanged( int year, int month, int day); | ||
100 | 104 | ||
101 | private: | 105 | private: |
102 | bool useFullName, hasGender, hasTitle, hasCompany, hasNotes, hasStreet, hasStreet2, hasPOBox, hasCity, hasState, hasZip, hasCountry; | 106 | bool useFullName, hasGender, hasTitle, hasCompany, hasNotes, hasStreet, hasStreet2, hasPOBox, hasCity, hasState, hasZip, hasCountry; |
@@ -112,6 +116,8 @@ class ContactEditor : public QDialog { | |||
112 | QStringList slOrdered; | 116 | QStringList slOrdered; |
113 | QStringList slDynamicEntries; | 117 | QStringList slDynamicEntries; |
114 | 118 | ||
119 | bool m_personalView; | ||
120 | |||
115 | QStringList slHomeAddress; | 121 | QStringList slHomeAddress; |
116 | QStringList slBusinessAddress; | 122 | QStringList slBusinessAddress; |
117 | QStringList slChooserNames; | 123 | QStringList slChooserNames; |
@@ -143,6 +149,7 @@ class ContactEditor : public QDialog { | |||
143 | QComboBox *cmbChooserField4; | 149 | QComboBox *cmbChooserField4; |
144 | QComboBox *cmbFileAs; | 150 | QComboBox *cmbFileAs; |
145 | CategorySelect *cmbCat; | 151 | CategorySelect *cmbCat; |
152 | QLabel *labCat; | ||
146 | 153 | ||
147 | QScrollView *svAddress; | 154 | QScrollView *svAddress; |
148 | QLineEdit *txtAddress; | 155 | QLineEdit *txtAddress; |
@@ -156,7 +163,10 @@ class ContactEditor : public QDialog { | |||
156 | 163 | ||
157 | QScrollView *svDetails; | 164 | QScrollView *svDetails; |
158 | QComboBox *cmbGender; | 165 | QComboBox *cmbGender; |
159 | 166 | DateBookMonth* birthdayPicker; | |
160 | }; | 167 | QToolButton* birthdayButton; |
168 | DateBookMonth* anniversaryPicker; | ||
169 | QToolButton* anniversaryButton; | ||
170 | }; | ||
161 | 171 | ||
162 | #endif | 172 | #endif |