4 files changed, 98 insertions, 23 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 759cb48..124ff6c 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -824,301 +824,377 @@ void AbTable::journalFreeRemove( int row )
 void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 {
     // Region of the rect we should draw
     QRegion reg( QRect( cx, cy, cw, ch ) );
     // Subtract the table from it
     reg = reg.subtract( QRect( QPoint( 0, 0 ), tableSize() ) );
     // And draw the rectangles (transformed as needed)
     QArray<QRect> r = reg.rects();
     for (unsigned int i=0; i<r.count(); i++)
         p->fillRect( r[i], colorGroup().brush( QColorGroup::Base ) );
 }
 #endif
 #endif
 
 
 // int AbTable::rowHeight( int ) const
 // {
 //     return 18;
 // }
 
 // int AbTable::rowPos( int row ) const
 // {
 //     return 18*row;
 // }
 
 // int AbTable::rowAt( int pos ) const
 // {
 //     return QMIN( pos/18, numRows()-1 );
 // }
 
 void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
                           bool backwards, int category )
 {
     if ( currFindRow < -1 )
         currFindRow = currentRow() - 1;
     clearSelection( TRUE );
     int rows,
         row;
     AbTableItem *ati;
     QRegExp r( findString );
     r.setCaseSensitive( caseSensitive );
     rows = numRows();
     static bool wrapAround = true;
 
     if ( !backwards ) {
         for ( row = currFindRow + 1; row < rows; row++ ) {
             ati = static_cast<AbTableItem*>( item(row, 0) );
             if ( contactCompare( contactList[ati], r, category ) )
                 break;
 
         }
     } else {
         for ( row = currFindRow - 1; row > -1; row-- ) {
             ati = static_cast<AbTableItem*>( item(row, 0) );
             if ( contactCompare( contactList[ati], r, category ) )
                 break;
         }
     }
     if ( row >= rows || row < 0 ) {
         if ( row < 0 )
             currFindRow = rows;
         else
             currFindRow = -1;
 
         if ( wrapAround )
             emit signalWrapAround();
         else
             emit signalNotFound();
 
         wrapAround = !wrapAround;
     } else {
         currFindRow = row;
         QTableSelection foundSelection;
         foundSelection.init( currFindRow, 0 );
         foundSelection.expandTo( currFindRow, numCols() - 1 );
         addSelection( foundSelection );
         setCurrentCell( currFindRow, numCols() - 1 );
         wrapAround = true;
     }
 }
 
 static bool contactCompare( const Contact &cnt, const QRegExp &r, int category )
 {
     bool returnMe;
     QArray<int> cats;
     cats = cnt.categories();
 
     returnMe = false;
     if ( (category == -1 && cats.count() == 0) || category == -2 )
         returnMe = cnt.match( r );
     else {
         int i;
         for ( i = 0; i < int(cats.count()); i++ ) {
             if ( cats[i] == category ) {
                 returnMe = cnt.match( r );
                 break;
             }
         }
     }
     return returnMe;
 }
 
 void AbTable::fitColumns()
 {
     int contentsWidth = visibleWidth();
     int n = numCols();
     int pw = n == 3 ? columnWidth(2) : 0;
     setColumnWidth( 0, contentsWidth - contentsWidth / 2 );
     setColumnWidth( 1, contentsWidth / 2 - pw );
 }
 
 void AbTable::show()
 {
     fitColumns();
     QTable::show();
 }
 
 void AbTable::setChoiceNames( const QStringList& list)
 {
     choicenames = list;
     if ( choicenames.isEmpty() ) {
         // hide pick column
         setNumCols( 2 );
     } else {
         // show pick column
         setNumCols( 3 );
         setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
         horizontalHeader()->setLabel( 2, tr( "Pick" ));
     }
     fitColumns();
 }
 
 void AbTable::itemClicked(int,int col)
 {
     if ( col == 2 ) {
         return;
     } else {
         emit details();
     }
 }
 
 QStringList AbTable::choiceNames() const
 {
     return choicenames;
 }
 
 void AbTable::setChoiceSelection(int /*index*/, const QStringList& /*list*/)
 {
     /* ######
 
         QString selname = choicenames.at(index);
         for (each row) {
             Contact *c = contactForRow(row);
             if ( list.contains(c->email) ) {
                 list.remove(c->email);
                 setText(row, 2, selname);
             }
         }
         for (remaining list items) {
             Contact *c = new contact(item);
             setText(newrow, 2, selname);
         }
 
     */
 }
 
 QStringList AbTable::choiceSelection(int /*index*/) const
 {
     QStringList r;
     /* ######
 
         QString selname = choicenames.at(index);
         for (each row) {
             Contact *c = contactForRow(row);
             if ( text(row,2) == selname ) {
                 r.append(c->email);
             }
         }
 
     */
     return r;
 }
 
 void AbTable::setShowCategory( const QString &c )
 {
     showCat = c;
     updateVisible();
 }
 
 void AbTable::setShowByLetter( char c )
 {
     showChar = tolower(c);
-    qDebug( "AbTable::setShowByLetter %c", showChar);
     updateVisible();
 }
 
 QString AbTable::showCategory() const
 {
     return showCat;
 }
 
 
 QStringList AbTable::categories()
 {
     mCat.load( categoryFileName() );
     QStringList categoryList = mCat.labels( "Contacts" );
     return categoryList;
 }
 
 void AbTable::updateVisible()
 {
     int visible,
         totalRows,
         id,
         totalCats,
         it,
         row;
     bool hide;
     AbTableItem *ati;
     Contact *cnt;
     QString fileAsName;
     QString tmpStr;
     visible = 0;
 
     setPaintingEnabled( FALSE );
 
     totalRows = numRows();
     id = mCat.id( "Contacts", showCat );
     QArray<int> cats;
     for ( row = 0; row < totalRows; row++ ) {
         ati = static_cast<AbTableItem*>( item(row, 0) );
         cnt = &contactList[ati];
         cats = cnt->categories();
         fileAsName = cnt->fileAs();
         hide = false;
         if ( !showCat.isEmpty() ) {
             if ( showCat == tr( "Unfiled" ) ) {
                 if ( cats.count() > 0 )
                     hide = true;
             } else {
                 // do some comparing
                 if ( !hide ) {
                     hide = true;
                     totalCats = int(cats.count());
                     for ( it = 0; it < totalCats; it++ ) {
                         if ( cats[it] == id ) {
                             hide = false;
                             break;
                         }
                     }
                 }
             }
         }
         if ( showChar != '\0' ) {
             tmpStr = fileAsName.left(1);
             tmpStr = tmpStr.lower();
-            qDebug( "updateVisible ");
-            qDebug( tmpStr );
-            qDebug( "updateVisible2 %c", showChar );
-            if ( tmpStr != QString(QChar(showChar)) ) {
+            if ( tmpStr != QString(QChar(showChar)) && showChar != '#' ) {
                     hide = true;
             }
+            if ( showChar == '#' ) {
+                    if (tmpStr == "a")
+                            hide = true;
+                    
+                    if (tmpStr == "b")
+                            hide = true;
+
+                    if (tmpStr == "c")
+                            hide = true;
+
+                    if (tmpStr == "d")
+                            hide = true;
+
+                    if (tmpStr == "e")
+                            hide = true;
+
+                    if (tmpStr == "f")
+                            hide = true;
+
+                    if (tmpStr == "g")
+                            hide = true;
+
+                    if (tmpStr == "h")
+                            hide = true;
+
+                    if (tmpStr == "i")
+                            hide = true;
+
+                    if (tmpStr == "j")
+                            hide = true;
+
+                    if (tmpStr == "k")
+                            hide = true;
+
+                    if (tmpStr == "l")
+                            hide = true;
+
+                    if (tmpStr == "m")
+                            hide = true;
+
+                    if (tmpStr == "n")
+                            hide = true;
+
+                    if (tmpStr == "o")
+                            hide = true;
+
+                    if (tmpStr == "p")
+                            hide = true;
+
+                    if (tmpStr == "q")
+                            hide = true;
+
+                    if (tmpStr == "r")
+                            hide = true;
+
+                    if (tmpStr == "s")
+                            hide = true;
+
+                    if (tmpStr == "t")
+                            hide = true;
+
+                    if (tmpStr == "u")
+                            hide = true;
+
+                    if (tmpStr == "v")
+                            hide = true;
+
+                    if (tmpStr == "w")
+                            hide = true;
+
+                    if (tmpStr == "x")
+                            hide = true;
+
+                    if (tmpStr == "y")
+                            hide = true;
+
+                    if (tmpStr == "z")
+                            hide = true;
+            }
+
         }
         if ( hide ) {
             if ( currentRow() == row )
                 setCurrentCell( -1, 0 );
             if ( rowHeight(row) > 0 )
                 hideRow( row );
         } else {
             if ( rowHeight(row) == 0 ) {
                 showRow( row );
                 adjustRow( row );
             }
             visible++;
         }
     }
     if ( !visible )
         setCurrentCell( -1, 0 );
 
     setPaintingEnabled( TRUE );
 }
 
 
 void AbTable::setPaintingEnabled( bool e )
 {
     if ( e != enablePainting ) {
         if ( !enablePainting ) {
             enablePainting = true;
             rowHeightChanged( 0 );
             viewport()->update();
         } else {
             enablePainting = false;
         }
     }
 }
 
 void AbTable::rowHeightChanged( int row )
 {
     if ( enablePainting )
         QTable::rowHeightChanged( row );
 }
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index e502cf6..beb953a 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -1,796 +1,799 @@
 /**********************************************************************
 ** 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 <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 );
 
-    QBoxLayout *vb = new QVBoxLayout( this, 0, 0 );
     // 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 );
 
 #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("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!")
                               );
     }
 
-    abList = new AbTable( &orderedFields, this, "table" );
-    vb->insertWidget(0,abList);
+    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( abList );
+    pLabel = new LetterPicker( listContainer );
     connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
-    vb->insertWidget(1,pLabel);
+    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( abList );
+    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(abList);
+    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::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() == abList  )
+  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( abList );
-    abList->show();
+    setCentralWidget( listContainer );
+    listContainer->show();
     // update our focues... (or use a stack widget!);
     abList->setFocus();
 }
 
 void AddressbookWindow::showView()
 {
     if ( abList->numRows() > 0 ) {
-        abList->hide();
+        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;
     } else {
         *first = rest.left( space );
         *middle = rest.mid( space+1 );
     }
         
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
     if (msg == "editPersonal()") {
         editPersonal();
     } else if (msg == "editPersonalAndClose()") {
         editPersonal();
         close();
     } else if ( msg == "addContact(QString,QString)" ) {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
 
         Contact cnt;
         QString fn, mn, ln;
         parseName( name, &fn, &mn, &ln );
                 //qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
         cnt.setFirstName( fn );
         cnt.setMiddleName( mn );
         cnt.setLastName( ln );
         cnt.setEmails( email );
         cnt.setDefaultEmail( email );
         cnt.setFileAs();
 
         if ( bAbEditFirstTime ) {
             abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
                                      this, "editor" );
             bAbEditFirstTime = FALSE;
         } else {
                     abEditor->setEntry( cnt );
         }
         abView()->init( cnt );
         editEntry( NewEntry );
 
 
 
     }
 #if 0
     else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) {
         QDataStream stream(data,IO_ReadOnly);
         QCString ch,m;
         QStringList types;
         stream >> ch >> m >> types;
         AddressPicker picker(abList,this,0,TRUE);
         picker.showMaximized();
         picker.setChoiceNames(types);
         int i=0;
         for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
             QStringList sel;
             stream >> sel;
             picker.setSelection(i++,sel);
         }
         picker.showMaximized();
         picker.exec();
 
         // ###### note: contacts may have been added - save here!
 
         setCentralWidget(abList);
         QCopEnvelope e(ch,m);
         i=0;
         for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
             QStringList sel = picker.selection(i++);
             e << sel;
         }
     }
 #endif
 
 }
 
 void AddressbookWindow::editPersonal()
 {
     QString filename = addressbookPersonalVCardName();
     Contact me;
     if (QFile::exists(filename))
         me = Contact::readVCard( filename )[0];
     if (bAbEditFirstTime) {
         abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields,
                 this, "editor" );
         // don't create a new editor every time
         bAbEditFirstTime = FALSE;
     } else
         abEditor->setEntry( me );
 
     abEditor->setCaption(tr("Edit My Personal Details"));
     abEditor->showMaximized();
 
     // fix the foxus...
     abEditor->setNameFocus();
     if ( abEditor->exec() ) {
         setFocus();
         Contact new_personal = abEditor->entry();
         QString fname = addressbookPersonalVCardName();
         Contact::writeVCard( fname, new_personal );
         abView()->init(new_personal);
         abView()->sync();
     }
     abEditor->setCaption( tr("Edit Address") );
 }
 
 void AddressbookWindow::slotPersonalView()
 {
     if (!actionPersonal->isOn()) {
         // we just turned it off
         setCaption( tr("Contacts") );
         actionNew->setEnabled(TRUE);
         actionTrash->setEnabled(TRUE);
 #ifndef MAKE_FOR_SHARP_ROM
         actionFind->setEnabled(TRUE);
 #endif
         slotUpdateToolbar(); // maybe some of the above could be moved there
         showList();
         return;
     }
 
     // XXX need to disable some QActions.
     actionNew->setEnabled(FALSE);
     actionTrash->setEnabled(FALSE);
 #ifndef MAKE_FOR_SHARP_ROM
     actionFind->setEnabled(FALSE);
 #endif
     actionMail->setEnabled(FALSE);
 
     setCaption( tr("Contacts - My Personal Details") );
     QString filename = addressbookPersonalVCardName();
     Contact me;
     if (QFile::exists(filename))
         me = Contact::readVCard( filename )[0];
 
     abView()->init( me );
     abView()->sync();
-    abList->hide();
+    listContainer->hide();
     setCentralWidget( abView() );
     mView->show();
     mView->setFocus();
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
     Contact entry;
     if ( bAbEditFirstTime ) {
         abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields,
                                  this, "editor" );
         bAbEditFirstTime = FALSE;
         if ( entryMode == EditEntry )
             abEditor->setEntry( abList->currentEntry() );
     }
     // other things may chane the caption.
     abEditor->setCaption( tr("Edit Address") );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     abEditor->showMaximized();
 #endif
     // fix the foxus...
     abEditor->setNameFocus();
     if ( abEditor->exec() ) {
         setFocus();
         if ( entryMode == NewEntry ) {
             Contact insertEntry = abEditor->entry();
             insertEntry.assignUid();
             abList->addEntry( insertEntry );
         } else {
             Contact replaceEntry = abEditor->entry();
             if ( !replaceEntry.isValidUid() )
                 replaceEntry.assignUid();
             abList->replaceCurrentEntry( replaceEntry );
         }
     }
     populateCategories();
     showList();
 }
 
 void AddressbookWindow::listIsEmpty( bool empty )
 {
     if ( !empty ) {
         deleteButton->setEnabled( TRUE );
     }
 }
 
 void AddressbookWindow::reload()
 {
     syncing = FALSE;
     abList->clear();
     abList->load( addressbookXMLFilename() );
 }
 
 void AddressbookWindow::flush()
 {
     syncing = TRUE;
     abList->save( addressbookXMLFilename() );
 }
 
 
 void AddressbookWindow::closeEvent( QCloseEvent *e )
 {
     if ( centralWidget() == mView ) {
         if (actionPersonal->isOn()) {
             // pretend we clicked it off
             actionPersonal->setOn(FALSE);
             slotPersonalView();
         } else {
             showList();
         }
         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
     if ( save() )
         e->accept();
     else
         e->ignore();
 }
 
 /*
   Returns TRUE if it is OK to exit
  */
 
 bool AddressbookWindow::save()
 {
     QString str = addressbookXMLFilename();
     if ( str.isNull() ) {
         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;
     } else {
         if ( !abList->save( str ) ) {
             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;
 }
 
 void AddressbookWindow::slotSettings()
 {
     AddressSettings frmSettings( this );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     frmSettings.showMaximized();
 #endif
 
     if ( frmSettings.exec() ) {
         allFields.clear();
         orderedFields.clear();
         slOrderedFields.clear();
         initFields();
          if ( abEditor )
              abEditor->loadFields();
          abList->refresh();
     }
 }
 
 
 void AddressbookWindow::initFields()
 {
     // we really don't need the things from the configuration, anymore
     // only thing that is important are the important categories.  So,
     // Call the contact functions that correspond to these old functions...
 
     QStringList xmlFields = Contact::fields();
     QStringList visibleFields = Contact::trfields();
     xmlFields.remove( "Title" );
     visibleFields.remove( tr("Name Title") );
     visibleFields.remove( tr("Notes") );
 
     int i,
         version;
     Config cfg( "AddressBook" );
     QString zn;
 
     // ### Write a function to keep this from happening again...
     QStringList::ConstIterator it;
     for ( i = 0, it = xmlFields.begin(); it != xmlFields.end(); ++it, i++ ) {
         allFields.append( i + 3 );
     }
 
     cfg.setGroup( "Version" );
     version = cfg.readNumEntry( "version" );
     i = 0;
     startFontSize = 1;
 
     if ( version >= ADDRESSVERSION ) {
 
         cfg.setGroup( "ImportantCategory" );
 
         zn = cfg.readEntry( "Category" + QString::number(i), QString::null );
         while ( !zn.isNull() ) {
             if ( zn.contains( tr("Work") ) || zn.contains( tr("Mb") ) ) {
                 slOrderedFields.clear();
                 break;
             }
             slOrderedFields.append( zn );
             zn = cfg.readEntry( "Category" + QString::number(++i), QString::null );
         }
         cfg.setGroup( "Font" );
         startFontSize = cfg.readNumEntry( "fontSize", 1 );
         
 
     } else {
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 31c4660..8e8c883 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -1,104 +1,105 @@
 /**********************************************************************
 ** 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>
 
 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 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, 
         *actionPersonal, *actionMail;
 
     bool bAbEditFirstTime;
     int viewMargin;
 
     bool syncing;
     QFont *defaultFont;
     int startFontSize;
 };
 
 #endif
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 06dcc7d..a165451 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -1,234 +1,229 @@
 #include "picker.h"
 
 #include <qfont.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qlayout.h>
 
 char PickerLabel::lastLetter = '\0';
 
 PickerLabel::PickerLabel( QWidget *parent, const char *name ) 
         : QLabel ( parent, name )
 {
         currentLetter = 0;
         //lastLetter = 0;
 
         letter1 = '\0';
         letter2 = '\0';
         letter3 = '\0';
 
         setFont( QFont( "smallsmooth", 9 ) );
         setTextFormat( Qt::RichText );
 
 }
 
 PickerLabel::~PickerLabel()
 {
 
 }
 
 void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
 {
         QString tmpStr;
 
         if (ch1 != '\0') 
                 letter1 = ch1;
         else
                 letter1 = ' ';
 
         if (ch2 != '\0') 
                 letter2 = ch2;
         else
                 letter2 = ' ';
 
         if (ch3 != '\0') 
                 letter3 = ch3;
         else
                 letter3 = ' ';
 
         tmpStr = "<qt>";
         tmpStr += letter1;
         tmpStr += letter2;
         tmpStr += letter3;
         tmpStr += "</qt>";
 
         setText(tmpStr);
 
         currentLetter = 0;
 
 }
 
 void PickerLabel::clearLetter()
 {
 
         QString tmpStr;
         
         tmpStr = "<qt>";
         tmpStr += letter1;
         tmpStr += letter2;
         tmpStr += letter3;
         tmpStr += "</qt>";
 
         setText(tmpStr);
 
         currentLetter = 0;
 
 }
 
 void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
 {
         QString tmpStr;
 
-        if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3)
+        if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0')
                 QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
         
-        qDebug( "a" );
         switch (currentLetter) {
                 case 0:
                         tmpStr = "<qt><font color=\"#7F0000\">";
                         tmpStr += letter1;
                         tmpStr += "</font>";
                         tmpStr += letter2;
                         tmpStr += letter3;
                         tmpStr += "</qt>";
 
                         setText(tmpStr);
 
                         currentLetter++;
                         lastLetter = letter1;
                         emit selectedLetter( letter1 );
-                        qDebug( "PickerLabel::mouseReleaseEvent %c", letter1 );
                         break;
 
                 case 1:
                         tmpStr = "<qt>";
                         tmpStr += letter1;
                         tmpStr += "<font color=\"#7F0000\">";
                         tmpStr += letter2;
                         tmpStr += "</font>";
                         tmpStr += letter3;
                         tmpStr += "</qt>";
 
                         setText(tmpStr);
 
                         currentLetter++;
                         lastLetter = letter2;
                         emit selectedLetter( letter2 );
-                        qDebug( "PickerLabel::mouseReleaseEvent %c", letter2 );
                         break;
                         
                 case 2:
                         tmpStr = "<qt>";
                         tmpStr += letter1;
                         tmpStr += letter2;
                         tmpStr += "<font color=\"#7F0000\">";
                         tmpStr += letter3;
                         tmpStr += "</font></qt>";
 
                         setText(tmpStr);
 
                         currentLetter++;
                         lastLetter = letter3;
                         emit selectedLetter( letter3 );
-                        qDebug( "PickerLabel::mouseReleaseEvent %c", letter3 );
                         break;
 
                 default:
                         clearLetter();
                         lastLetter = '\0';
                         emit selectedLetter( '\0' );
 
 
         }
 }
 
 void PickerLabel::emitClearSignal() {
         emit clearAll();
 }
         
 LetterPicker::LetterPicker( QWidget *parent, const char *name )
         : QFrame( parent, name )
 {
         QHBoxLayout *l = new QHBoxLayout(this);
 
         lblABC = new PickerLabel( this );
         l->addWidget( lblABC );
         
         lblDEF = new PickerLabel( this );
         l->addWidget( lblDEF );
 
         lblGHI = new PickerLabel( this );
         l->addWidget( lblGHI );
 
         lblJKL = new PickerLabel( this );
         l->addWidget( lblJKL );
 
         lblMNO = new PickerLabel( this );
         l->addWidget( lblMNO );
 
         lblPQR = new PickerLabel( this );
         l->addWidget( lblPQR );
 
         lblSTU = new PickerLabel( this );
         l->addWidget( lblSTU );
 
         lblVWX = new PickerLabel( this );
         l->addWidget( lblVWX );
 
         lblYZ = new PickerLabel( this );
         l->addWidget( lblYZ );
 
         lblABC->setLetters( 'A', 'B', 'C' );
         lblDEF->setLetters( 'D', 'E', 'F' );
         lblGHI->setLetters( 'G', 'H', 'I' );
         lblJKL->setLetters( 'J', 'K', 'L' );
         lblMNO->setLetters( 'M', 'N', 'O' );
         lblPQR->setLetters( 'P', 'Q', 'R' );
         lblSTU->setLetters( 'S', 'T', 'U' );
         lblVWX->setLetters( 'V', 'W', 'X' );
         lblYZ->setLetters( 'Y', 'Z', '#' );
 
         connect(lblABC, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblDEF, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblGHI, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblJKL, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblMNO, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblPQR, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblSTU, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblVWX, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblYZ, SIGNAL(selectedLetter(char)), this, SLOT(newLetter(char)));
         connect(lblABC, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblDEF, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblGHI, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblJKL, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblMNO, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblPQR, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblSTU, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblVWX, SIGNAL(clearAll()), this, SLOT(clear()));
         connect(lblYZ, SIGNAL(clearAll()), this, SLOT(clear()));
 
 }
 
 LetterPicker::~LetterPicker()
 {
 }
 
 void LetterPicker::clear()
 {
         lblABC->clearLetter();
         lblDEF->clearLetter();
         lblGHI->clearLetter();
         lblJKL->clearLetter();
         lblMNO->clearLetter();
         lblPQR->clearLetter();
         lblSTU->clearLetter();
         lblVWX->clearLetter();
         lblYZ->clearLetter();
 }
 
 void LetterPicker::newLetter( char letter )
 {
-        qDebug( "LetterPicker::newLetter %c", letter );
         emit letterClicked( letter );
 
 }