1 files changed, 8 insertions, 5 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 75e539a..6984501 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -283,601 +283,604 @@ void AddressbookWindow::setDocument( const QString &filename )
                 }else
                         m_abView->addEntry( *it );
 
         }
 
         delete access;
 }
 
 void AddressbookWindow::resizeEvent( QResizeEvent *e )
 {
         QMainWindow::resizeEvent( e );
 
 
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
         ToolBarDock dock;
         int dummy;
         bool bDummy;
         getLocation ( listTools, dock, dummy, bDummy, dummy );
         m_config.setToolBarDock( dock );
         m_config.save();
 }
 
 int AddressbookWindow::create()
 {
     return 0;
 }
 
 bool AddressbookWindow::remove( int /*uid*/ )
 {
     return false;
 }
 
 void AddressbookWindow::beam( int /*uid*/ )
 {
 }
 
 void AddressbookWindow::show( int /*uid*/ )
 {
 }
 
 void AddressbookWindow::edit( int /*uid*/ )
 {
 }
 
 void AddressbookWindow::add( const Opie::OPimRecord& )
 {
 }
 
 void AddressbookWindow::slotItemNew()
 {
         Opie::OPimContact cnt;
         if( !syncing ) {
                 editEntry( NewEntry );
         } else {
                 QMessageBox::warning(this, tr("Contacts"),
                                      tr("Can not edit data, currently syncing"));
         }
 }
 
 void AddressbookWindow::slotItemEdit()
 {
         if(!syncing) {
                 if (m_actionPersonal->isOn()) {
                         editPersonal();
                 } else {
                         editEntry( EditEntry );
                 }
         } else {
                 QMessageBox::warning( this, tr("Contacts"),
                                       tr("Can not edit data, currently syncing") );
         }
 }
 
 void AddressbookWindow::slotItemDuplicate()
 {
     if(!syncing)
     {
         Opie::OPimContact entry = m_abView->currentEntry();
         entry.assignUid();
         m_abView->addEntry( entry );
         m_abView->setCurrentUid( entry.uid() );
     }
     else
     {
         QMessageBox::warning( this, tr("Contacts"),
                               tr("Can not edit data, currently syncing") );
     }
 }
 
 void AddressbookWindow::slotItemDelete()
 {
         if(!syncing) {
                 Opie::OPimContact tmpEntry = m_abView ->currentEntry();
 
                 // get a name, do the best we can...
                 QString strName = tmpEntry.fullName();
                 if ( strName.isEmpty() ) {
                         strName = tmpEntry.company();
                         if ( strName.isEmpty() )
                                 strName = "No Name";
                 }
 
 
                 if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
                                                    strName ) ) {
                         m_abView->removeEntry( tmpEntry.uid() );
                 }
         } else {
                 QMessageBox::warning( this, tr("Contacts"),
                                       tr("Can not edit data, currently syncing") );
         }
 }
 
 static const char * beamfile = "/tmp/obex/contact.vcf";
 
 void AddressbookWindow::slotItemBeam()
 {
         QString beamFilename;
         Opie::OPimContact c;
         if ( m_actionPersonal->isOn() ) {
                 beamFilename = addressbookPersonalVCardName();
                 if ( !QFile::exists( beamFilename ) )
                         return; // can't beam a non-existent file
                 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                         beamFilename );
                 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                 Opie::OPimContactAccess::List allList = access->allRecords();
                 Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
                 c = *it;
 
                 delete access;
         } else {
                 unlink( beamfile ); // delete if exists
                 mkdir("/tmp/obex/", 0755);
                 c = m_abView -> currentEntry();
                 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                         beamfile );
                 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                 access->add( c );
                 access->save();
                 delete access;
 
                 beamFilename = beamfile;
         }
 
         odebug << "Beaming: " << beamFilename << oendl;
 
         Ir *ir = new Ir( this );
         connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
         QString description = c.fullName();
         ir->send( beamFilename, description, "text/x-vCard" );
 }
 
 void AddressbookWindow::slotItemFind()
 {
 }
 
 void AddressbookWindow::slotConfigure()
 {
         ConfigDlg* dlg = new ConfigDlg( this, "Config" );
         dlg -> setConfig( m_config );
         if ( QPEApplication::execDialog( dlg ) ) {
                 odebug << "Config Dialog accepted!" << oendl;
                 m_config = dlg -> getConfig();
                 if ( m_curFontSize != m_config.fontSize() ){
                         odebug << "Font was changed!" << oendl;
                         m_curFontSize = m_config.fontSize();
                         emit slotSetFont( m_curFontSize );
                 }
                 m_abView -> setListOrder( m_config.orderList() );
         }
 
         delete dlg;
 }
 
 void AddressbookWindow::slotShowFind( bool show )
 {
     if ( show )
     {
         // Display search bar
         m_searchBar->show();
         m_abView -> inSearch();
         m_searchEdit->setFocus();
     }
     else
     {
         // Hide search bar
         m_searchBar->hide();
         m_abView -> offSearch();
     }
 }
 
 void AddressbookWindow::slotFind()
 {
         m_abView->slotDoFind( m_searchEdit->text(), m_config.beCaseSensitive(), m_config.useRegExp(), false);
 
         m_searchEdit->clearFocus();
         // m_abView->setFocus();
 
 }
 
 void AddressbookWindow::slotViewBack()
 {
         // :SX showList();
 }
 
 void AddressbookWindow::writeMail()
 {
         Opie::OPimContact c = m_abView -> currentEntry();
         QString name = c.fileAs();
         QString email = c.defaultEmail();
 
         // I prefer the OPIE-Environment variable before the
         // QPE-one..
         QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
         if ( basepath.isEmpty() )
                 basepath = QString::fromLatin1( getenv("QPEDIR") );
 
         // Try to access the preferred. If not possible, try to
         // switch to the other one..
         if ( m_config.useQtMail() ){
                 odebug << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
                 if ( QFile::exists( basepath + "/bin/qtmail" ) ){
                         odebug << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
                         e << name << email;
                         return;
                 } else
                         m_config.setUseOpieMail( true );
         }
         if ( m_config.useOpieMail() ){
                 odebug << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
                 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
                         odebug << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
                         e << name << email;
                         return;
                 } else
                         m_config.setUseQtMail( true );
         }
 
 }
 
 void AddressbookWindow::beamDone( Ir *ir )
 {
 
         delete ir;
         unlink( beamfile );
 }
 
 
 static void parseName( const QString& name, QString *first, QString *middle,
                        QString * last )
 {
 
         int comma = name.find ( "," );
         QString rest;
         if ( comma > 0 ) {
                 *last = name.left( comma );
                 comma++;
                 while ( comma < int(name.length()) && name[comma] == ' ' )
                         comma++;
                 rest = name.mid( comma );
         } else {
                 int space = name.findRev( ' ' );
                 *last = name.mid( space+1 );
                 rest = name.left( space );
         }
         int space = rest.find( ' ' );
         if ( space <= 0 ) {
                 *first = rest;
         } else {
                 *first = rest.left( space );
                 *middle = rest.mid( space+1 );
         }
 
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
         bool needShow = false;
                 odebug << "Receiving QCop-Call with message " << msg << oendl;
 
 
         if (msg == "editPersonal()") {
                 editPersonal();
 
         // Categories might have changed, so reload
         reloadCategories();
         } else if (msg == "editPersonalAndClose()") {
                 editPersonal();
                 close();
         } else if ( msg == "addContact(QString,QString)" ) {
                 QDataStream stream(data,IO_ReadOnly);
                 QString name, email;
                 stream >> name >> email;
 
                 Opie::OPimContact cnt;
                 QString fn, mn, ln;
                 parseName( name, &fn, &mn, &ln );
                         //odebug << " " << fn << " - " << mn " - " << ln << oendl;
                 cnt.setFirstName( fn );
                 cnt.setMiddleName( mn );
                 cnt.setLastName( ln );
                 cnt.insertEmails( email );
                 cnt.setDefaultEmail( email );
                 cnt.setFileAs();
 
                 m_abView -> addEntry( cnt );
 
                 // :SXm_abView()->init( cnt );
                 editEntry( EditEntry );
 
         // Categories might have changed, so reload
         reloadCategories();
         } else if ( msg == "beamBusinessCard()" ) {
                 QString beamFilename = addressbookPersonalVCardName();
                 if ( !QFile::exists( beamFilename ) )
                         return; // can't beam a non-existent file
 
                 Ir *ir = new Ir( this );
                 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
                 QString description = "mycard.vcf";
                 ir->send( beamFilename, description, "text/x-vCard" );
         } else if ( msg == "show(int)" ) {
                 raise();
                 QDataStream stream(data,IO_ReadOnly);
                 int uid;
                 stream >> uid;
 
                 odebug << "Showing uid: " << uid << oendl;
 
                 // Deactivate Personal View..
                 if ( m_actionPersonal->isOn() ){
                         m_actionPersonal->setOn( false );
                         slotPersonalView();
                 }
 
                 // Reset category and show as card..
                 m_abView -> setShowByCategory( QString::null );
                 m_abView -> setCurrentUid( uid );
                 slotViewSwitched ( AbView::CardView );
 
                 needShow = true;
 
 
         } else if ( msg == "edit(int)" ) {
                 QDataStream stream(data,IO_ReadOnly);
                 int uid;
                 stream >> uid;
 
                 // Deactivate Personal View..
                 if ( m_actionPersonal->isOn() ){
                         m_actionPersonal->setOn( false );
                         slotPersonalView();
                 }
 
                 // Reset category and edit..
                 m_abView -> setShowByCategory( QString::null );
                 m_abView -> setCurrentUid( uid );
                 slotItemEdit();
 
         // Categories might have changed, so reload
         reloadCategories();
     }
 
         if (needShow)
             QPEApplication::setKeepRunning();
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
         Opie::OPimContact entry;
         if ( !abEditor ) {
                 abEditor = new ContactEditor( entry, this, "editor" );
         }
         if ( entryMode == EditEntry )
                 abEditor->setEntry( m_abView -> currentEntry() );
         else if ( entryMode == NewEntry )
                 abEditor->setEntry( entry );
-        // other things may change the caption.
-        abEditor->setCaption( tr("Edit Address") );
+
+    // Set the dialog caption
+    if ( m_actionPersonal->isOn() )
+        abEditor->setCaption( tr( "Edit My Personal Details" ) );
+    else
+        abEditor->setCaption( tr( "Edit Contact" ) );
 
         // fix the focus...
         abEditor->setNameFocus();
         if ( QPEApplication::execDialog( abEditor ) == QDialog::Accepted ) {
                 setFocus();
                 if ( entryMode == NewEntry ) {
                         Opie::OPimContact insertEntry = abEditor->entry();
                         insertEntry.assignUid();
                         m_abView -> addEntry( insertEntry );
                         m_abView -> setCurrentUid( insertEntry.uid() );
                 } else {
                         Opie::OPimContact replEntry = abEditor->entry();
 
                         if ( !replEntry.isValidUid() )
                                 replEntry.assignUid();
 
                         m_abView -> replaceEntry( replEntry );
                 }
 
         // Categories might have changed, so reload
         reloadCategories();
         }
 }
 
 void AddressbookWindow::editPersonal()
 {
         Opie::OPimContact entry;
 
         // Switch to personal view if not selected
         // but take care of the menu, too
         if ( ! m_actionPersonal->isOn() ){
                 odebug << "*** ++++" << oendl;
                 m_actionPersonal->setOn( true );
                 slotPersonalView();
         }
 
         if ( !abEditor ) {
                 abEditor = new ContactEditor( entry, this, "editor" );
         }
 
-         abEditor->setCaption(tr("Edit My Personal Details"));
-         abEditor->setPersonalView( true );
+        abEditor->setPersonalView( true );
         editEntry( EditEntry );
-         abEditor->setPersonalView( false );
+        abEditor->setPersonalView( false );
 
 }
 
 
 void AddressbookWindow::slotPersonalView()
 {
     odebug << "slotPersonalView()" << oendl;
 
     bool personal = m_actionPersonal->isOn();
 
     // Disable actions when showing personal details
     setItemNewEnabled( !personal );
     setItemDuplicateEnabled( !personal );
     setItemDeleteEnabled( !personal );
     m_actionMail->setEnabled( !personal );
     setShowCategories( !personal );
 
     // Display appropriate view
     m_abView->showPersonal( personal );
 
     if ( personal )
     {
         setCaption( tr( "Contacts - My Personal Details") );
 
         // Set category to 'All' to make sure personal details is visible
         setViewCategory( "All" );
         m_abView->setShowByCategory( "All" );
 
         // Temporarily disable letter picker
         pLabel->hide();
     }
     else
     {
         setCaption( tr( "Contacts") );
 
         // Re-enable letter picker
         pLabel->show();
     }
 }
 
 void AddressbookWindow::reload()
 {
         syncing = false;
         m_abView->clear();
         m_abView->reload();
 }
 
 void AddressbookWindow::flush()
 {
         syncing = true;
         m_abView->save();
 }
 
 
 void AddressbookWindow::closeEvent( QCloseEvent *e )
 {
     if ( active_view == AbView::CardView )
     {
         if ( !m_actionPersonal->isOn() )
         {
             // Switch to table view only if not editing personal details
             slotViewSwitched( AbView::TableView );
         }
         else
         {
             // If currently editing personal details, switch off personal view
             m_actionPersonal->setOn( false );
             slotPersonalView();
         }
 
         e->ignore();
         return;
         }
         if(syncing) {
                 /* shouldn't we save, I hear you say? well its already been set
                    so that an edit can not occur during a sync, and we flushed
                    at the start of the sync, so there is no need to save
                    Saving however itself would cause problems. */
                 e->accept();
                 return;
         }
         //################## shouldn't always save
         // True, but the database handles this automatically ! (se)
         if ( save() )
                 e->accept();
         else
                 e->ignore();
 }
 
 /*
   Returns true if it is OK to exit
 */
 
 bool AddressbookWindow::save()
 {
         if ( !m_abView->save() ) {
                 if ( QMessageBox::critical( 0, tr( "Out of space" ),
                                             tr("Unable to save information.\n"
                                                "Free up some space\n"
                                                "and try again.\n"
                                                "\nQuit anyway?"),
                                             QMessageBox::Yes|QMessageBox::Escape,
                                             QMessageBox::No|QMessageBox::Default )
                      != QMessageBox::No )
                         return true;
                 else
                         return false;
         }
         return true;
 }
 
 #ifdef __DEBUG_RELEASE
 void AddressbookWindow::slotSave()
 {
         save();
 }
 #endif
 
 
 void AddressbookWindow::slotNotFound()
 {
         odebug << "Got not found signal!" << oendl;
         QMessageBox::information( this, tr( "Not Found" ),
                                  "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
 
 
 }
 void AddressbookWindow::slotWrapAround()
 {
         odebug << "Got wrap signal!" << oendl;
         // if ( doNotifyWrapAround )
         //      QMessageBox::information( this, tr( "End of list" ),
         //                                tr( "End of list. Wrap around now...!" ) + "\n" );
 
 }
 
 void AddressbookWindow::slotSetCategory( const QString &category )
 {
         odebug << "void AddressbookWindow::slotSetCategory( " << category << " )" << oendl;
 
         // Tell the view about the selected category
     m_config.setCategory( category );
         m_abView -> setShowByCategory( category );
 }
 
 void AddressbookWindow::slotViewSwitched( int view )
 {
         odebug << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
 
         // Tell the view about the selected view
         m_abView -> setShowToView ( (AbView::Views) view );
         active_view = view;
 }
 
 
 void AddressbookWindow::slotListView()
 {
         slotViewSwitched( AbView::TableView );
 }
 
 void AddressbookWindow::slotCardView()
 {
         slotViewSwitched( AbView::CardView );
 }
 
 void AddressbookWindow::slotSetLetter( char c ) {
 
          m_abView->setShowByLetter( c, m_config.letterPickerSearch() );
 
 }