1 files changed, 123 insertions, 30 deletions

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
@@ -21,24 +21,26 @@
 #include "contacteditor.h"
 #include "addresspicker.h"
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
+#include <qpe/timeconversion.h>
 
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qvaluelist.h>
+#include <qpopupmenu.h> 
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
@@ -54,13 +56,14 @@ ContactEditor::ContactEditor(	const OContact &entry,
                                 QStringList *slNewOrdered,
                                 QWidget *parent,
                                 const char *name,
                                 WFlags fl )
         : QDialog( parent, name, TRUE, fl ),
           orderedValues( newOrderedValues ),
-          slOrdered( *slNewOrdered )
+          slOrdered( *slNewOrdered ),
+          m_personalView ( false )
 {
 
         init();
         initMap();
         setEntry( entry );
         qDebug("finish");
@@ -203,13 +206,22 @@ void ContactEditor::init() {
                                 slChooserNames.append( *it );
                                 slChooserValues.append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
-                        if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" )
+                        if ( *it == "Name Title" || 
+                             *it == "First Name" || 
+                             *it == "Middle Name" || 
+                             *it == "Last Name" || 
+                             *it == "File As" || 
+                             *it == "Default Email" || 
+                             *it == "Emails" || 
+                             *it == "Groups"  || 
+                             *it == "Anniversary" || 
+                             *it == "Birthday" )
                                 continue;
 
                         if ( *it == "Name Title" ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
@@ -399,17 +411,27 @@ void ContactEditor::init() {
 
         l = new QLabel( tr( "File As" ), container );
         gl->addWidget( l, 6, 0 );
         cmbFileAs = new QComboBox( TRUE, container );
         gl->addWidget( cmbFileAs, 6, 1 );
 
-        l = new QLabel( tr( "Category" ), container );
-        gl->addWidget( l, 7, 0 );
+        labCat = new QLabel( tr( "Category" ), container );
+        gl->addWidget( labCat, 7, 0 );
         cmbCat = new CategorySelect( container );
         gl->addWidget( cmbCat, 7, 1 );
 
+        // We don't need categories for the personal view
+        if ( m_personalView ){
+                qWarning("Disable Category..");
+                labCat->hide();
+                cmbCat->hide();
+        } else {
+                labCat->show();
+                cmbCat->show();
+        }
+
         btnNote = new QPushButton( tr( "Notes..." ), container );
         gl->addWidget( btnNote, 8, 1 );
 
         tabMain->insertTab( tabViewport, tr( "General" ) );
 
         tabViewport = new QWidget ( tabMain );
@@ -704,32 +726,72 @@ void ContactEditor::init() {
 
         container = new QWidget( svDetails->viewport() );
         svDetails->addChild( container );
 
         gl = new QGridLayout( container, 1, 2, 2, 4 );
 
+        int counter = 0;
+
+        // Birthday
+        l = new QLabel( tr("Birthday"), container );
+        gl->addWidget( l, counter, 0 );
+
+         QPopupMenu* m1 = new QPopupMenu( container );
+         birthdayPicker = new DateBookMonth( m1, 0, TRUE );
+         m1->insertItem( birthdayPicker );
+
+        birthdayButton= new QToolButton( container, "buttonStart" );
+         birthdayButton->setPopup( m1 );
+        birthdayButton->setPopupDelay(0);
+        gl->addWidget( birthdayButton, counter , 1  );
+        connect( birthdayPicker, SIGNAL( dateClicked( int, int, int ) ),
+                 this, SLOT( slotBirthdayDateChanged( int, int, int ) ) );
+
+        ++counter;
+
+        // Anniversary
+        l = new QLabel( tr("Anniversary"), container );
+        gl->addWidget( l, counter, 0 );
+
+         m1 = new QPopupMenu( container );
+         anniversaryPicker = new DateBookMonth( m1, 0, TRUE );
+         m1->insertItem( anniversaryPicker );
+
+        anniversaryButton= new QToolButton( container, "buttonStart" );
+         anniversaryButton->setPopup( m1 );
+        anniversaryButton->setPopupDelay(0);
+        gl->addWidget( anniversaryButton, counter , 1  );
+        connect( anniversaryPicker, SIGNAL( dateClicked( int, int, int ) ),
+                 this, SLOT( slotAnniversaryDateChanged( int, int, int ) ) );
+
+        ++counter;
+
+        // Gender
+        l = new QLabel( tr("Gender"), container );
+        gl->addWidget( l, counter, 0 );
+        cmbGender = new QComboBox( container );
+        cmbGender->insertItem( "", 0 );
+        cmbGender->insertItem( tr("Male"), 1);
+        cmbGender->insertItem( tr("Female"), 2);
+        gl->addWidget( cmbGender, counter, 1 );
+
+        ++counter;
+
         // Create Labels and lineedit fields for every dynamic entry
         QStringList::ConstIterator it = slDynamicEntries.begin();
-        for (i = 0; it != slDynamicEntries.end(); i++, ++it) {
+        for (i = counter; it != slDynamicEntries.end(); i++, ++it) {
                 l = new QLabel( QString::null , container );
                 listName.append( l );
                 gl->addWidget( l, i, 0 );
                 QLineEdit *e = new QLineEdit( container );
                 listValue.append( e );
                 gl->addWidget( e, i, 1);
         }
         // Fill labels with names..
         loadFields();
 
-        l = new QLabel( tr("Gender"), container );
-        gl->addWidget( l, slDynamicEntries.count(), 0 );
-        cmbGender = new QComboBox( container );
-        cmbGender->insertItem( "", 0 );
-        cmbGender->insertItem( tr("Male"), 1);
-        cmbGender->insertItem( tr("Female"), 2);
-        gl->addWidget( cmbGender, slDynamicEntries.count(), 1 );
 
         tabMain->insertTab( tabViewport, tr( "Details" ) );
 
         dlgNote = new QDialog( this, "Note Dialog", TRUE );
         dlgNote->setCaption( tr("Enter Note") );
         QVBoxLayout *vbNote = new QVBoxLayout( dlgNote );
@@ -1006,12 +1068,13 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
         cmbFileAs->setCurrentItem( index );
 
         useFullName = TRUE;
 
 }
 
+// Loads the detail fields
 void ContactEditor::loadFields() {
 
         QStringList::ConstIterator it;
         QListIterator<QLabel> lit( listName );
         for ( it = slDynamicEntries.begin(); *lit; ++lit, ++it) {
 
@@ -1033,24 +1096,33 @@ void ContactEditor::loadFields() {
                 if ( *it == "Manager" )
                         (*lit)->setText( tr( "Manager" ) );
 
                 if ( *it == "Spouse" )
                         (*lit)->setText( tr( "Spouse" ) );
 
-                if ( *it == "Birthday" )
-                        (*lit)->setText( tr( "Birthday" ) );
-
-                if ( *it == "Anniversary" )
-                        (*lit)->setText( tr( "Anniversary" ) );
-
                 if ( *it == "Nickname" )
                         (*lit)->setText( tr( "Nickname" ) );
 
                 if ( *it == "Children" )
                         (*lit)->setText( tr( "Children" ) );
         }
+        // Set DatePicker
+        qWarning ("**Info: %s", ent.birthday().latin1() );
+        if ( !ent.birthday().isEmpty() ){
+                birthdayButton->setText( ent.birthday() );
+                birthdayPicker->setDate( TimeConversion::fromString ( ent.birthday() ) );
+        } else
+                birthdayButton->setText( tr ("Unknown") );
+                
+        qWarning ("**Info: %s", ent.anniversary().latin1() );
+        if ( !ent.anniversary().isEmpty() ){
+                anniversaryButton->setText( ent.anniversary() );
+                anniversaryPicker->setDate( TimeConversion::fromString ( ent.birthday() ) );
+        } else
+                anniversaryButton->setText( tr ("Unknown") );
+
 }
 
 void ContactEditor::accept() {
 
         if ( isEmpty() ) {
                 cleanupFields();
@@ -1426,18 +1498,12 @@ void ContactEditor::setEntry( const OContact &entry ) {
                 if ( *it == "Manager" )
                         (*itLE)->setText( ent.manager() );
 
                 if ( *it == "Spouse" )
                         (*itLE)->setText( ent.spouse() );
 
-                if ( *it == "Birthday" )
-                        (*itLE)->setText( ent.birthday() );
-
-                if ( *it == "Anniversary" )
-                        (*itLE)->setText( ent.anniversary() );
-
                 if ( *it == "Nickname" )
                         (*itLE)->setText( ent.nickname() );
 
                 if ( *it == "Children" )
                         (*itLE)->setText( ent.children() );
 
@@ -1515,12 +1581,13 @@ void ContactEditor::setEntry( const OContact &entry ) {
                 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
                         *itV = ent.businessWebpage();
 
 
         }
 
+        
         cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
 
         QString gender = ent.gender();
         cmbGender->setCurrentItem( gender.toInt() );
 
         txtNote->setText( ent.notes() );
@@ -1528,12 +1595,14 @@ void ContactEditor::setEntry( const OContact &entry ) {
         slotCmbChooser1Change( cmbChooserField1->currentItem() );
         slotCmbChooser2Change( cmbChooserField2->currentItem() );
         slotCmbChooser3Change( cmbChooserField3->currentItem() );
 
         slotAddressTypeChange( cmbAddress->currentItem() );
 
+        loadFields();
+
 }
 
 void ContactEditor::saveEntry() {
 
         if ( useFullName == TRUE ) {
                 txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) );
@@ -1624,18 +1693,12 @@ void ContactEditor::saveEntry() {
                 if ( *it == "Manager" )
                         ent.setManager( (*itLE)->text() );
 
                 if ( *it == "Spouse" )
                         ent.setSpouse( (*itLE)->text() );
 
-                if ( *it == "Birthday" )
-                        ent.setBirthday( (*itLE)->text() );
-
-                if ( *it == "Anniversary" )
-                        ent.setAnniversary( (*itLE)->text() );
-
                 if ( *it == "Nickname" )
                         ent.setNickname( (*itLE)->text() );
 
                 if ( *it == "Children" )
                         ent.setChildren( (*itLE)->text() );
 
@@ -1803,6 +1866,36 @@ static inline bool constainsWhiteSpace( const QString &str )
     for (i = 0; i < count; i++ )
         if ( str[i].isSpace() )
             return TRUE;
     return FALSE;
 }
 
+void ContactEditor::setPersonalView( bool personal )
+{
+        m_personalView = personal;
+        if ( personal ){
+                cmbCat->hide();
+                labCat->hide();
+        } else{
+                cmbCat->show();
+                labCat->show();
+                
+        }
+}
+
+void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
+{
+    QDate date;
+    date.setYMD( year, month, day );
+    QString dateString = TimeString::numberDateString( date );
+    anniversaryButton->setText( dateString );
+    ent.setAnniversary ( dateString );
+}
+
+void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
+{
+    QDate date;
+    date.setYMD( year, month, day );
+    QString dateString = TimeString::numberDateString( date );
+    birthdayButton->setText( dateString );
+    ent.setBirthday ( dateString );
+}