2 files changed, 19 insertions, 3 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 86d1760..e11cf4c 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -1,488 +1,504 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "contacteditor.h"
 #include "ablabel.h"
 #include "abtable.h"
 #include "addresssettings.h"
 #include "addressbook.h"
 
 
 #include <opie/ofileselector.h>
 #include <opie/ofiledialog.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/contact.h>
 
 #ifndef MAKE_FOR_SHARP_ROM
 #include <qpe/finddialog.h>
 #endif
 
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qaction.h>
 #include <qdialog.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlayout.h>
 #include <qpe/qpemenubar.h>
 #include <qmessagebox.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qpe/qpetoolbar.h>
 #include <qstringlist.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <qdatetime.h>
 
 #include "picker.h"
 static QString addressbookOldXMLFilename()
 {
     QString filename = QPEApplication::documentDir() + "addressbook.xml";
     return filename;
 }
 
 static QString addressbookXMLFilename()
 {
     QString filename = Global::applicationFileName("addressbook",
                "addressbook.xml");
     return filename;
 }
 
 static QString addressbookPersonalVCardName()
 {
     QString filename = Global::applicationFileName("addressbook",
                "businesscard.vcf");
     return filename;
 }
 
 
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
               WFlags f )
     : QMainWindow( parent, name, f ),
       abEditor(0),
       bAbEditFirstTime(TRUE),
       syncing(FALSE)
 {
     initFields();
 
     setCaption( tr("Contacts") );
     setIcon( Resource::loadPixmap( "AddressBook" ) );
 
     setToolBarsMovable( FALSE );
 
     // Create Toolbars
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mbList = new QPEMenuBar( bar );
     mbList->setMargin( 0 );
 
     QPopupMenu *edit = new QPopupMenu( this );
     mbList->insertItem( tr( "Contact" ), edit );
 
     listTools = new QPEToolBar( this, "list operations" );
 
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null,
             0, this, 0 );
     actionNew = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
     a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
           0, this, 0 );
     actionEdit = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
     a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
          0, this, 0 );
     actionTrash = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
+
+    // make it possible to go directly to businesscard via qcop call
+#if defined(Q_WS_QWS)
+#if !defined(QT_NO_COP)
+    QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
+    connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
+             this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
+#endif
+#endif
+
+
+
+
+
 #ifndef MAKE_FOR_SHARP_ROM
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
                      QString::null, 0, this, 0 );
     actionFind = a;
     connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
     a->addTo( edit );
     a->addTo( listTools );
 #endif
 
 
     a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
                      QString::null, 0, this, 0 );
     //a->setEnabled( FALSE ); we got support for it now :) zecke
     actionMail = a;
     connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
 
 
     if ( Ir::supported() ) {
   a = new QAction( tr ("Beam Entry" ), Resource::loadPixmap( "beam" ), QString::null,
           0, this, 0 );
   actionBeam = a;
   connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
   a->addTo( edit );
   a->addTo( listTools );
     }
 
     edit->insertSeparator();
 
     a = new QAction( tr("Import vCard"), QString::null, 0, 0, 0, TRUE );
     actionPersonal = a;
     connect( a, SIGNAL( activated() ), this, SLOT( importvCard() ) );
     a->addTo( edit );
 
 
     edit->insertSeparator();
 
     a = new QAction( tr("My Personal Details"), QString::null, 0, 0, 0, TRUE );
     actionPersonal = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotPersonalView() ) );
     a->addTo( edit );
 
 
     a = new QAction( tr( "Arrange Edit Fields"), QString::null, 0, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
     a->addTo( edit );
 
     // Create Views
 
     // This is safe to call without checking to see if it exists...
     // not to mention it also does the necessary stuff for the
     // journaling...
     QString str = addressbookXMLFilename();
     if ( str.isNull() ) {
   QMessageBox::warning( this, tr("Out of Space"),
             tr("There is not enough space to create\n"
          "neccessary startup files.\n"
          "\nFree up some space before\nentering data!")
             );
     }
 
     listContainer = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( listContainer );
 
     abList = new AbTable( &orderedFields, listContainer, "table" );
     vb->addWidget(abList);
     abList->setHScrollBarMode( QScrollView::AlwaysOff );
     connect( abList, SIGNAL( empty( bool ) ),
        this, SLOT( listIsEmpty( bool ) ) );
     connect( abList, SIGNAL( details() ),
        this, SLOT( slotListView() ) );
     connect( abList, SIGNAL(currentChanged(int,int)),
        this, SLOT(slotUpdateToolbar()) );
 
     mView = 0;
 
     abList->load( addressbookXMLFilename() );
     if ( QFile::exists(addressbookOldXMLFilename()) ) {
   abList->load( addressbookOldXMLFilename() );
   QFile::remove(addressbookOldXMLFilename());
     }
 
     pLabel = new LetterPicker( listContainer );
     connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
     vb->addWidget(pLabel);
     catMenu = new QPopupMenu( this );
     catMenu->setCheckable( TRUE );
     connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
     populateCategories();
 
     mbList->insertItem( tr("View"), catMenu );
     setCentralWidget( listContainer );
 
     fontMenu = new QPopupMenu(this);
     fontMenu->setCheckable( true );
     connect( fontMenu, SIGNAL(activated(int)), this, SLOT(slotSetFont(int)));
 
     fontMenu->insertItem(tr( "Small" ), 0);
     fontMenu->insertItem(tr( "Normal" ), 1);
     fontMenu->insertItem(tr( "Large" ), 2);
 
     defaultFont = new QFont( abList->font() );
 
     slotSetFont(startFontSize);
 
     mbList->insertItem( tr("Font"), fontMenu);
     setCentralWidget(listContainer);
 
     //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 }
+
+
 void AddressbookWindow::slotSetFont( int size ) {
 
   if (size > 2 || size < 0)
     size = 1;
 
   startFontSize = size;
 
   QFont *currentFont;
 
   switch (size) {
     case 0:
       fontMenu->setItemChecked(0, true);
       fontMenu->setItemChecked(1, false);
       fontMenu->setItemChecked(2, false);
       abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
       currentFont = new QFont (abList->font());
       abList->resizeRows(currentFont->pixelSize() + 7);
       break;
     case 1:
       fontMenu->setItemChecked(0, false);
       fontMenu->setItemChecked(1, true);
       fontMenu->setItemChecked(2, false);
       abList->setFont( *defaultFont );
       currentFont = new QFont (abList->font());
       abList->resizeRows(currentFont->pixelSize() + 7);
       break;
     case 2:
       fontMenu->setItemChecked(0, false);
       fontMenu->setItemChecked(1, false);
       fontMenu->setItemChecked(2, true);
       abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
       currentFont = new QFont (abList->font());
       abList->resizeRows(currentFont->pixelSize() + 7);
       break;
   }
 }
 
 
 
 void AddressbookWindow::importvCard() {
         QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() )
             setDocument((const QString&) str );
-    
+
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
     if ( filename.find(".vcf") != int(filename.length()) - 4 ) return;
 
     QValueList<Contact> cl = Contact::readVCard( filename );
     for( QValueList<Contact>::Iterator it = cl.begin(); it != cl.end(); ++it ) {
 //  QString msg = tr("You received a vCard for\n%1.\nDo You want to add it to your\naddressbook?")
 //          .arg( (*it).fullName() );
 //  if ( QMessageBox::information( this, tr("received contact"), msg, QMessageBox::Ok, QMessageBox::Cancel ) ==
 //       QMessageBox::Ok ) {
       abList->addEntry( *it );
 //  }
     }
 
 }
 
 void AddressbookWindow::resizeEvent( QResizeEvent *e )
 {
   QMainWindow::resizeEvent( e );
 
   if ( centralWidget() == listContainer  )
       showList();
   else if ( centralWidget() == mView )
       showView();
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
   Config cfg("AddressBook");
   cfg.setGroup("Font");
   cfg.writeEntry("fontSize", startFontSize);
 }
 
 void AddressbookWindow::slotUpdateToolbar()
 {
     Contact ce = abList->currentEntry();
     actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
 
 void AddressbookWindow::showList()
 {
     if ( mView ) mView->hide();
     setCentralWidget( listContainer );
     listContainer->show();
     // update our focues... (or use a stack widget!);
     abList->setFocus();
 }
 
 void AddressbookWindow::showView()
 {
     if ( abList->numRows() > 0 ) {
   listContainer->hide();
   setCentralWidget( abView() );
   mView->show();
   mView->setFocus();
     }
 }
 
 void AddressbookWindow::slotListNew()
 {
     Contact cnt;
     if( !syncing ) {
   if ( abEditor )
       abEditor->setEntry( cnt );
   abView()->init( cnt );
   editEntry( NewEntry );
     } else {
   QMessageBox::warning(this, tr("Contacts"),
            tr("Can not edit data, currently syncing"));
     }
 }
 
 void AddressbookWindow::slotListView()
 {
     abView()->init( abList->currentEntry() );
     mView->sync();
     showView();
 }
 
 void AddressbookWindow::slotListDelete()
 {
     if(!syncing) {
   Contact tmpEntry = abList->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 ) ) {
     abList->deleteCurrentEntry();
     showList();
   }
     } else {
   QMessageBox::warning( this, tr("Contacts"),
             tr("Can not edit data, currently syncing") );
     }
 }
 
 void AddressbookWindow::slotViewBack()
 {
     showList();
 }
 
 void AddressbookWindow::slotViewEdit()
 {
     if(!syncing) {
   if (actionPersonal->isOn()) {
       editPersonal();
   } else {
       if ( !bAbEditFirstTime )
     abEditor->setEntry( abList->currentEntry() );
       editEntry( EditEntry );
   }
     } else {
   QMessageBox::warning( this, tr("Contacts"),
             tr("Can not edit data, currently syncing") );
     }
 }
 
 
 
 void AddressbookWindow::writeMail()
 {
     Contact c = abList->currentEntry();
     QString name = c.fileAs();
     QString email = c.defaultEmail();
     QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
     e << name << email;
 }
 
 
 
 
 static const char * beamfile = "/tmp/obex/contact.vcf";
 
 void AddressbookWindow::slotBeam()
 {
     QString filename;
     Contact c;
     if ( actionPersonal->isOn() ) {
   filename = addressbookPersonalVCardName();
   if (!QFile::exists(filename))
       return; // can't beam a non-existent file
   c = Contact::readVCard( filename )[0];
     } else {
   unlink( beamfile ); // delete if exists
   c = abList->currentEntry();
   mkdir("/tmp/obex/", 0755);
   Contact::writeVCard( beamfile, c );
   filename = beamfile;
     }
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
     QString description = c.fullName();
     ir->send( filename, description, "text/x-vCard" );
 }
 
 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;
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index da43731..34ca85d 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -1,108 +1,108 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef Addressbook_H
 #define Addressbook_H
 
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qstringlist.h>
 
 class ContactEditor;
 class AbLabel;
 class AbTable;
 class QPEToolBar;
 class QPopupMenu;
 class QToolButton;
 class QDialog;
 class Ir;
 class QAction;
 class LetterPicker;
 
 class AddressbookWindow: public QMainWindow
 {
     Q_OBJECT
 public:
     AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~AddressbookWindow();
 
 protected:
     void resizeEvent( QResizeEvent * e );
     void showList();
     void showView();
     enum EntryMode { NewEntry=0, EditEntry };
     void editPersonal();
     void editEntry( EntryMode );
     void closeEvent( QCloseEvent *e );
     bool save();
 
 public slots:
     void flush();
     void reload();
     void appMessage(const QCString &, const QByteArray &);
     void setDocument( const QString & );
 
 private slots:
-    void importvCard();   
+    void importvCard();
     void slotListNew();
     void slotListView();
     void slotListDelete();
     void slotViewBack();
     void slotViewEdit();
     void slotPersonalView();
     void listIsEmpty( bool );
     void slotSettings();
     void writeMail();
     void slotBeam();
     void beamDone( Ir * );
     void slotFind();
     void slotSetCategory( int );
     void slotSetLetter( char );
     void slotUpdateToolbar();
     void slotSetFont(int);
 private:
     void initFields();  // inititialize our fields...
     AbLabel *abView();
     void populateCategories();
 
     QPopupMenu *catMenu, *fontMenu;
     QPEToolBar *listTools;
     QToolButton *deleteButton;
     QValueList<int> allFields,
               orderedFields;
     QStringList slOrderedFields;
     enum Panes { paneList=0, paneView, paneEdit };
     ContactEditor *abEditor;
     AbLabel *mView;
     LetterPicker *pLabel;
     AbTable *abList;
     QWidget *listContainer;
 
-    QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, 
+    QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam,
   *actionPersonal, *actionMail;
 
     bool bAbEditFirstTime;
     int viewMargin;
 
     bool syncing;
     QFont *defaultFont;
     int startFontSize;
 };
 
 #endif