--- a/phonebookui/pbkcommonui/pbkcommonui.pro	Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookui/pbkcommonui/pbkcommonui.pro	Wed Aug 18 09:39:00 2010 +0300
@@ -29,6 +29,7 @@
 INCLUDEPATH += ../../inc
 INCLUDEPATH += ../../phonebookengines/cntimageutility/inc
 INCLUDEPATH += ../../phonebookengines/cntsimutility/inc
+INCLUDEPATH += ../phonebookapp/inc
 INCLUDEPATH += ../cnthistorymodel/inc
 
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
@@ -96,9 +97,9 @@
     inc/cnteditviewdetailitem.h \
     inc/cnteditviewheadingitem.h \
     inc/cntstringmapper.h \
-    inc/cntmycardselectionview.h \
     inc/cntmycardview.h \
     inc/cntgroupmemberview.h \
+    inc/cntgroupmemberview_p.h \
     inc/cntgroupactionsview.h \
     inc/cntgroupeditormodel.h \
     inc/cnthistoryview.h \
@@ -128,7 +129,8 @@
     inc/cntgroupdeletepopup.h \
     inc/cntextensionmanager.h \
     inc/cntimagelabel.h \
-    inc/cntfetchcontactsview.h \
+    inc/cntfetchcontactpopup.h \
+    inc/cntfetchmarkall.h \
     inc/cntimportsview.h \
     inc/cntsettingsview.h \
     inc/cntpresencelistener.h \
@@ -137,8 +139,9 @@
     inc/cntcommondetailviewitem.h \
     ../../inc/cntdebug.h \
     inc/cntactionpopup_p.h \
-    inc/cntactionpopup.h
-    
+    inc/cntactionpopup.h \
+    inc/cntsavemanager.h \
+    inc/cntkeygrabber.h
     
     
 SOURCES += \
@@ -174,9 +177,9 @@
     src/cnteditviewdetailitem.cpp \
     src/cnteditviewheadingitem.cpp \
     src/cnteditviewseparator.cpp \
-    src/cntmycardselectionview.cpp \
     src/cntmycardview.cpp \
     src/cntgroupmemberview.cpp\
+    src/cntgroupmemberview_p.cpp\
     src/cntgroupactionsview.cpp \
     src/cntgroupeditormodel.cpp \
     src/cnthistoryview.cpp \
@@ -204,16 +207,37 @@
     src/cntextensionmanager.cpp \
     src/cntimagelabel.cpp \
     src/cntimportsview.cpp \
-    src/cntfetchcontactsview.cpp \
+    src/cntfetchcontactpopup.cpp \
+    src/cntfetchmarkall.cpp \
     src/cntsettingsview.cpp \
     src/cntpresencelistener.cpp \
     src/cntdetailorderinghelper.cpp \
     src/cntsettingsmodel.cpp \
     src/cntcommondetailviewitem.cpp \
     src/cntactionpopup_p.cpp \
-    src/cntactionpopup.cpp
+    src/cntactionpopup.cpp \
+    src/cntsavemanager.cpp \
+    src/cntkeygrabber.cpp
+
+DOCML += resources/contacts_contactcard.docml \
+         resources/contacts_ev.docml \
+         resources/contacts_mc.docml \
+         resources/contacts_if.docml \
+         resources/contacts_list.docml \
+         resources/contacts_namelist.docml \
+         resources/contacts_groupactions.docml \
+         resources/contacts_history.docml \
+         resources/contacts_editor.docml \
+         resources/contacts_sim.docml \
+         resources/contacts_favorite.docml \
+         resources/contacts_favmember.docml \
+         resources/contacts_collections.docml \
+         resources/contacts_groupmembers.docml \
+         resources/contacts_detail_editor.docml \
+         resources/contacts_fetchdialog.docml \
+         resources/contacts_settings.docml
     
-RESOURCES += resources\pbkcommonui.qrc
+RESOURCES += resources/pbkcommonui.qrc
 
 LIBS+= -lhbcore \
        -lxqservice \