3 files changed, 35 insertions, 25 deletions

diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index b89b794..d3ca783 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -287,24 +287,31 @@ void AbView::showPersonal( bool personal )
                 delete m_contactdb;
 
                 m_contactdb = m_storedDB;
                 m_storedDB = 0l;
 
                 m_curr_View = TableView;
                 m_inPersonal = false;
 
         }
         load();
 }
 
+void AbView::setCurrentUid( int uid ){
+
+        m_curr_Contact = uid;
+        updateView( true ); //true: Don't modificate the UID ! 
+}
+
+
 QStringList AbView::categories()
 {
         mCat.load( categoryFileName() );
         QStringList categoryList = mCat.labels( "Contacts" );
         return categoryList;
 }
 
 // BEGIN: Slots
 void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
                          bool , QString cat )
 {
                 //qWarning( "void AbView::slotDoFind" );
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h
index 8570fe7..55c63cc 100644
--- a/core/pim/addressbook/abview.h
+++ b/core/pim/addressbook/abview.h
@@ -20,24 +20,25 @@ public:
     enum Views{ TableView=0, CardView, PersonalView };
 
     AbView( QWidget* parent, const QValueList<int>& ordered );
     ~AbView();
 
     bool save();
     void load();
     void reload();
     void clear();
 
     void setView( Views view );
     void showPersonal( bool personal );
+    void setCurrentUid( int uid );
     void setShowByCategory( const QString& cat );
     void setShowToView( Views view );
     void setShowByLetter( char c );
     void setListOrder( const QValueList<int>& ordered );
 
     // Add Entry and put to current
     void addEntry( const OContact &newContact );
     void removeEntry( const int UID );
     void replaceEntry( const OContact &contact );
     OContact currentEntry();
 
     void inSearch()  { m_inSearch = true; }
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 89a3312..e053e94 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -677,54 +677,56 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
                 // :SXm_abView()->init( cnt );
                 editEntry( EditEntry );
         } 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" );
-        }
-#if 0
-        else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) {
+        } else if ( msg == "showUid(int)" ) {
                 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);
+                int uid;
+                stream >> uid;
+
+                // Deactivate Personal View..
+                if ( actionPersonal->isOn() ){
+                        actionPersonal->setOn( false );
+                        slotPersonalView();
                 }
-                picker.showMaximized();
-                picker.exec();
 
-                // ###### note: contacts may have been added - save here!
+                // Reset category and show as card..
+                m_abView -> setShowByCategory( QString::null );
+                m_abView -> setCurrentUid( uid );
+                slotViewSwitched ( AbView::CardView );
+
+        } else if ( msg == "editUid(int)" ) {
+                QDataStream stream(data,IO_ReadOnly);
+                int uid;
+                stream >> uid;
 
-                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;
+                // Deactivate Personal View..
+                if ( actionPersonal->isOn() ){
+                        actionPersonal->setOn( false );
+                        slotPersonalView();
                 }
-        }
-#endif
+
+                // Reset category and edit..
+                m_abView -> setShowByCategory( QString::null );
+                m_abView -> setCurrentUid( uid );
+                slotViewEdit();
+        } 
 
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
         OContact entry;
         if ( !abEditor ) {
                 abEditor = new ContactEditor( entry, this, "editor" );
         }
         if ( entryMode == EditEntry )
                 abEditor->setEntry( m_abView -> currentEntry() );
         else if ( entryMode == NewEntry )