2 files changed, 30 insertions, 4 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 2a27efc..7e800fa 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -1,108 +1,110 @@
 Stuff todo until OPIE 1.0 :
 ===========================
 
 Feature requests:
 -----------------
 - Dial by mobile phone by tapping the number.. 
   (Maybe using gsmtool. And we may
         add a library class for this)
 - dial with dtmfdial incase it's installed and there's no mobile
 - 3rd column for 2. Contact
 - Implementing additional Views (Phonebook, ...)
 - Birthday & Anniversary Reminder
 - Plugin for Today for Birthdays and Anniversaries
+- Beaming of multiple contacts (current list/ by search or by category)
 
 Known Bugs:
 -----------
 - Language not English (tested with german opie-translation): 
         1. Configure nicht übersetzt (alles leer).
         2. Contacteditor nur teilweise übersetzt.
         3. Kategorie-Picker geht nicht.
 
 
 Bugs but not in addressbook:
 -----------------------------
 - VCARD: If umlaut (äöüß) in address, the parser gets confused..
 
 - Exporting and reimporting of Jobtitle was reported to fail (Could not reproduce this ! (se))
 
 
 Urgent:
 --------
 - Implement Button Pics
 - Fix start of opie-mail
 
 ContactEditor:
 - Contact-Editor is temporarely reenabled. Wait for replacement.
 - Redesign of Contacteditor
 - Store last settings of combo-boxes
 - Category is on the wrong position after changing to personal and back to normal
         ( Temporarily workaround: Category is never deactivated.. :S )
 - Personal and Business Web-page is not editable 
 
 Important:
 ----------
 
 - Implement a picker/combo for the default email.
 - After search (Started with Return): KeyFocus should be on Tabelle
 
 - Add a dialog to accept and optionally edit  received contacts by IRDA. 
 - "What's this" should be added (Deleyed after Feature Freeze)
 
 Less important:
 ---------------
 - Reload if contacts were changed externally
 - Overview window cleanup needed..
 - The picker (alphabetical sort widget) should be
    placed verticaly or horizontally (configurable)
 - Find a smart solution for activating/deactivating the "send email" event
 
 Should be Fixed (not absolute sure, need further validation):
 -------------------------------------------------------------
-- Searchwidget closed: Selected user is jumping
-- Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist)
-        zu lange..
 
 
 Fixed:
 -------
 - Syncing: abtable not reloaded after sync.
 - Find widget should be replaced by something like 
   qpdf has.
 - Adding a configuration dialog
 - Picker: Activated letter schould be more visible
 - Advanced handling of cursor keys (search..)
 - Mail-Icon is missing
 - Use opie-mail insted of qt-mail if possible.
 - Font menu is invisible using german translation
 - Personal contact editor: Disable categories
 - "Nonenglish" translation bug has to be fixed.
 - contacteditor: Birthday, annyversary, ... : Use Dateselector
 - The names of the countries are sorted by there english names, only..
   Even if they are translated.. :S
 - Cursor keys should work in detail-view (ablabel)
   -> Ablabel should be removed and Abtable should be increased with
         different views (as started by darwin zins)..
 - Use advanced database functions in abtable to decrease
   memory footprint and to make everything more easy !
         (abtable should store Iterator for selected Category)
 - Abtable: Configure Contact column (internally already available, 
         need configuration)
 - Select of primary contact (see #274 on mantis)
 - Category-select does not work completely: "Unfiled" is always in listview ..
 - Return from Contacteditor: Category resettet to all
 - Personal Details not working
 - If category changed, the letterpicker should be resetted
 - There should be some icons for List and Cardview
 - If in Cardview and a category change removes all entries: 
         There are already entries in Cardview after up/down
 - Personal Details: Anniversary zeigt Fantasie-Werte
 - Unfiled shown just in Category "All" and "Unfiled". 
 - After finising search and after Edit: Clear Picker
 - After Edit: Table position back to edited entry.
 - Optimize Table Update...
 - Change MyDialog to Config
 - Store position and state of toolbar
+- Searchwidget closed: Selected user is jumping
+- Wenn suchen beendet, dann dauert das Tabellenupdate (was überhaupt überflüssig ist)
+        zu lange..
 - VCARD: Import of Anniversary does not work correctly (currently disabled)
 - Name order selected in "contacteditor" not used in list view.
 - OK-Key does not switch from Detailview (ablable) to Listview
+- Receiving of beams should open a dialog
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 60db2b4..e009d52 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -226,260 +226,284 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
          m_abView = new AbView( listContainer, m_config.orderList() );
          vb->addWidget( m_abView );
         // abList->setHScrollBarMode( QScrollView::AlwaysOff );
         connect( m_abView, SIGNAL( signalViewSwitched ( int ) ), 
                  this, SLOT( slotViewSwitched( int ) ) );
 
         
         QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
         
         m_abView->load();
         
         // Letter Picker
         pLabel = new LetterPicker( listContainer );
         connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
         connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) );
 
         vb->addWidget( pLabel );
 
         // Category Menu
         catMenu = new QPopupMenu( this );
         catMenu->setCheckable( TRUE );
         connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
         populateCategories();
         mbList->insertItem( tr("View"), catMenu );
         
          defaultFont = new QFont( m_abView->font() );
          slotSetFont(m_config.fontSize());
         m_curFontSize = m_config.fontSize();
         
         setCentralWidget(listContainer);
         
         //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 
         
         isLoading = false;
 }
 
 
 void AddressbookWindow::slotConfig()
 {
         ConfigDlg* dlg = new ConfigDlg( this, "Config" );
         dlg -> setConfig( m_config );
         dlg -> showMaximized();
         if ( dlg -> exec() ) {
                 qWarning ("Config Dialog accepted !");
                 m_config = dlg -> getConfig();
                 if ( m_curFontSize != m_config.fontSize() ){
                         qWarning("Font was changed!");
                         m_curFontSize = m_config.fontSize();
                         emit slotSetFont( m_curFontSize );
                 }
                 m_abView -> setListOrder( m_config.orderList() );
         }
 
         delete dlg;
 }
 
 
 void AddressbookWindow::slotSetFont( int size ) 
 {
         qWarning("void AddressbookWindow::slotSetFont( %d )", size);
         
         if (size > 2 || size < 0)
                 size = 1;
         
         m_config.setFontSize( size );
         
         QFont *currentFont;
         
         switch (size) {
         case 0:
                 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
                 currentFont = new QFont (m_abView->font());
                 // abList->resizeRows(currentFont->pixelSize() + 7); :SX
                 // abList->resizeRows();
                 break;
         case 1:
                 m_abView->setFont( *defaultFont );
                 currentFont = new QFont (m_abView->font());
         //      // abList->resizeRows(currentFont->pixelSize() + 7);
         //      abList->resizeRows();
                 break;
         case 2:
                 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
                 currentFont = new QFont (m_abView->font());
         //      //abList->resizeRows(currentFont->pixelSize() + 7);
         //      abList->resizeRows();
                 break;
         }
 }
 
 
 
 void AddressbookWindow::importvCard() {
         QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() ){
                 setDocument((const QString&) str );
         }
         
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
         qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
 
         if ( filename.find(".vcf") != int(filename.length()) - 4 ){ 
 
 
 
                 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
                                                   tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
                                                   tr( "&Yes" ), tr( "&No" ), QString::null,
                                                   0,      // Enter == button 0
                                                   2 ) ) { // Escape == button 2
                 case 0: 
                         qWarning("YES clicked");
                         break;
                 case 1: 
                         qWarning("NO clicked");
                         return;
                         break;
                 }
         }
 
         OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
                                                                          filename );
         OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
         OContactAccess::List allList = access->allRecords();
+        qWarning( "Found number of contacts in File: %d", allList.count() );
 
+        bool doAsk = true;
         OContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
-                m_abView->addEntry( *it );
+                qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
+                if ( doAsk ){
+                        switch( QMessageBox::information( this, tr ( "Add Contact ?" ),
+                                                          tr( "Do you really want add contact for \n%1 ?" )
+                                                          .arg( (*it).fullName().latin1() ),
+                                                          tr( "&Yes" ), tr( "&No" ), tr( "&AllYes"),
+                                                          0,      // Enter == button 0
+                                                          2 ) ) { // Escape == button 2
+                        case 0: 
+                                qWarning("YES clicked");
+                                m_abView->addEntry( *it );
+                                break;
+                        case 1: 
+                                qWarning("NO clicked");
+                                break;
+                        case 2:
+                                qWarning("YesAll clicked");
+                                doAsk = false;
+                                break;
+                        }
+                }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();
 }
 
 void AddressbookWindow::slotUpdateToolbar()
 {
          OContact ce = m_abView->currentEntry();
         actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
 
 void AddressbookWindow::slotListNew()
 {
         OContact cnt;
         if( !syncing ) {
                 editEntry( NewEntry );
         } else {
                 QMessageBox::warning(this, tr("OContacts"),
                                      tr("Can not edit data, currently syncing"));
         }
 }
 
 // void AddressbookWindow::slotListView()
 // {
         // m_abView -> init( abList->currentEntry() );
         // // :SX mView->sync();
         //      //:SXshowView();
 // }
 
 void AddressbookWindow::slotListDelete()
 {
         if(!syncing) {
                 OContact 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") );
         }
 }
 
 void AddressbookWindow::slotFindOpen()
 {
         searchBar->show();
         m_abView -> inSearch();
         searchEdit->setFocus();
 }
 void AddressbookWindow::slotFindClose()
 {
         searchBar->hide();
         m_abView -> offSearch();
         // m_abView->setFocus();
 }
 
 
 void AddressbookWindow::slotFind()
 {
         m_abView->slotDoFind( searchEdit->text(), m_config.beCaseSensitive(), m_config.useRegExp(), false);
         
         searchEdit->clearFocus();
         // m_abView->setFocus();
         
 }
 
 void AddressbookWindow::slotViewBack()
 {
         // :SX showList();
 }
 
 void AddressbookWindow::slotViewEdit()
 {
         if(!syncing) {
                 if (actionPersonal->isOn()) {
                         editPersonal();
                 } else {
                         editEntry( EditEntry );
                 }
         } else {
                 QMessageBox::warning( this, tr("Contacts"),
                                       tr("Can not edit data, currently syncing") );
         }
 }
 
 
 
 void AddressbookWindow::writeMail()
 {
         OContact 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..