-rw-r--r-- | core/pim/addressbook/abview.cpp | 7 | ||||
-rw-r--r-- | core/pim/addressbook/abview.h | 1 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 52 |
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 | |||
@@ -298,2 +298,9 @@ void AbView::showPersonal( bool personal ) | |||
298 | 298 | ||
299 | void AbView::setCurrentUid( int uid ){ | ||
300 | |||
301 | m_curr_Contact = uid; | ||
302 | updateView( true ); //true: Don't modificate the UID ! | ||
303 | } | ||
304 | |||
305 | |||
299 | QStringList AbView::categories() | 306 | QStringList AbView::categories() |
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 | |||
@@ -31,2 +31,3 @@ public: | |||
31 | void showPersonal( bool personal ); | 31 | void showPersonal( bool personal ); |
32 | void setCurrentUid( int uid ); | ||
32 | void setShowByCategory( const QString& cat ); | 33 | void setShowByCategory( const QString& cat ); |
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 | |||
@@ -688,32 +688,34 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
688 | ir->send( beamFilename, description, "text/x-vCard" ); | 688 | ir->send( beamFilename, description, "text/x-vCard" ); |
689 | } | 689 | } else if ( msg == "showUid(int)" ) { |
690 | #if 0 | ||
691 | else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) { | ||
692 | QDataStream stream(data,IO_ReadOnly); | 690 | QDataStream stream(data,IO_ReadOnly); |
693 | QCString ch,m; | 691 | int uid; |
694 | QStringList types; | 692 | stream >> uid; |
695 | stream >> ch >> m >> types; | 693 | |
696 | AddressPicker picker(abList,this,0,TRUE); | 694 | // Deactivate Personal View.. |
697 | picker.showMaximized(); | 695 | if ( actionPersonal->isOn() ){ |
698 | picker.setChoiceNames(types); | 696 | actionPersonal->setOn( false ); |
699 | int i=0; | 697 | slotPersonalView(); |
700 | for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) { | ||
701 | QStringList sel; | ||
702 | stream >> sel; | ||
703 | picker.setSelection(i++,sel); | ||
704 | } | 698 | } |
705 | picker.showMaximized(); | ||
706 | picker.exec(); | ||
707 | 699 | ||
708 | // ###### note: contacts may have been added - save here! | 700 | // Reset category and show as card.. |
701 | m_abView -> setShowByCategory( QString::null ); | ||
702 | m_abView -> setCurrentUid( uid ); | ||
703 | slotViewSwitched ( AbView::CardView ); | ||
704 | |||
705 | } else if ( msg == "editUid(int)" ) { | ||
706 | QDataStream stream(data,IO_ReadOnly); | ||
707 | int uid; | ||
708 | stream >> uid; | ||
709 | 709 | ||
710 | setCentralWidget(abList); | 710 | // Deactivate Personal View.. |
711 | QCopEnvelope e(ch,m); | 711 | if ( actionPersonal->isOn() ){ |
712 | i=0; | 712 | actionPersonal->setOn( false ); |
713 | for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) { | 713 | slotPersonalView(); |
714 | QStringList sel = picker.selection(i++); | ||
715 | e << sel; | ||
716 | } | 714 | } |
717 | } | 715 | |
718 | #endif | 716 | // Reset category and edit.. |
717 | m_abView -> setShowByCategory( QString::null ); | ||
718 | m_abView -> setCurrentUid( uid ); | ||
719 | slotViewEdit(); | ||
720 | } | ||
719 | 721 | ||