Modified TagsDialog.

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 1b9883d..a9850c1 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -12,6 +12,7 @@ SOURCES += main.cpp \
     application.cpp \
     coordinates/geocoordinate.cpp \
     coordinates/scenecoordinate.cpp \
+    engine/contactmanager.cpp \
     engine/engine.cpp \
     engine/mce.cpp \
     facebookservice/facebookauthentication.cpp \
@@ -61,32 +62,48 @@ SOURCES += main.cpp \
     ui/locationlistitem.cpp \
     ui/locationlistview.cpp \
     ui/indicatorbuttonpanel.cpp \
+    ui/locationsearchpanel.cpp \
     ui/logindialog.cpp \
     ui/mainwindow.cpp \
     ui/mapscale.cpp \
-    ui/settingsdialog.cpp \
-    ui/userinfo.cpp \
-    ui/userinfopanel.cpp \
-    ui/zoombutton.cpp \
-    ui/zoombuttonpanel.cpp \
-    ui/searchdialog.cpp \
     ui/panelbar.cpp \
     ui/panelbase.cpp \
     ui/panelcontentstack.cpp \
     ui/panelcontextbuttonbar.cpp \
     ui/paneltab.cpp \
     ui/paneltabbar.cpp \
-    ui/tabbedpanel.cpp \
     ui/routingpanel.cpp \
     ui/routewaypointlistitem.cpp \
-    ui/routewaypointlistview.cpp \
+    ui/routewaypointlistview.cpp \    
+    ui/searchdialog.cpp \
+    ui/searchhistorylistitem.cpp \
+    ui/searchhistorylistview.cpp \
+    ui/settingsdialog.cpp \
+    ui/tabbedpanel.cpp \
+    ui/textmodifier.cpp \
+    ui/userinfo.cpp \
+    ui/userinfopanel.cpp \
+    ui/zoombutton.cpp \
+    ui/zoombuttonpanel.cpp \
     user/user.cpp \
+    ui/listitemcontextbuttonbar.cpp \
     ui/meetpeoplepanel.cpp \
-    situareservice/database.cpp
+    situareservice/database.cpp \
+    ui/tagsdialog.cpp \
+    ui/messagelistview.cpp \
+    ui/messagelistitem.cpp \
+    ui/headerlistitemdelegate.cpp \
+    ui/messagepanel.cpp \
+    situareservice/message.cpp \
+    ui/personlistitem.cpp \
+    ui/personlistview.cpp \
+    ui/messagedialog.cpp \
+    ui/tagcompletion.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
     coordinates/scenecoordinate.h \
+    engine/contactmanager.h \
     engine/engine.h \
     engine/mce.h \
     error.h \
@@ -127,6 +144,9 @@ HEADERS += application.h \
     ui/updatelocation/texteditautoresizer.h \
     ui/updatelocation/updatelocationdialog.h \
     ui/avatarimage.h \
+    ui/extendedlistitem.h \
+    ui/extendedlistitemdelegate.h \
+    ui/extendedlistitemstore.h \
     ui/friendlistitem.h \
     ui/friendlistitemdelegate.h \
     ui/friendlistpanel.h \
@@ -135,20 +155,16 @@ HEADERS += application.h \
     ui/imagebutton.h \
     ui/indicatorbutton.h \
     ui/indicatorbuttonpanel.h \
-    ui/logindialog.h \
-    ui/locationlistview.h \
-    ui/mainwindow.h \
-    ui/mapscale.h \
-    ui/settingsdialog.h \
-    ui/userinfo.h \
-    ui/userinfopanel.h \
-    ui/zoombutton.h \
-    ui/zoombuttonpanel.h \
     ui/listcommon.h \    
     ui/listview.h \
     ui/listitem.h \
     ui/listitemdelegate.h \
-    ui/searchdialog.h \
+    ui/logindialog.h \
+    ui/locationlistitem.h \
+    ui/locationlistview.h \
+    ui/locationsearchpanel.h \
+    ui/mainwindow.h \
+    ui/mapscale.h \
     ui/panelbar.h \
     ui/panelbase.h \
     ui/panelcommon.h \
@@ -156,17 +172,36 @@ HEADERS += application.h \
     ui/panelcontextbuttonbar.h \
     ui/paneltab.h \
     ui/paneltabbar.h \
-    ui/tabbedpanel.h \
     ui/routingpanel.h \
     ui/routewaypointlistitem.h \
     ui/routewaypointlistview.h \
+    ui/searchdialog.h \
+    ui/searchhistorylistitem.h \
+    ui/searchhistorylistview.h \
+    ui/settingsdialog.h \
+    ui/tabbedpanel.h \
+    ui/textmodifier.h \
+    ui/userinfo.h \
+    ui/userinfopanel.h \
+    ui/zoombutton.h \
+    ui/zoombuttonpanel.h \
     user/user.h \
+    ui/listitemcontextbuttonbar.h \
     ui/meetpeoplepanel.h \
-    situareservice/database.h
+    situareservice/database.h \
+    ui/tagsdialog.h \
+    ui/messagelistview.h \
+    ui/messagelistitem.h \
+    ui/headerlistitemdelegate.h \
+    ui/messagepanel.h \
+    situareservice/message.h \
+    ui/personlistitem.h \
+    ui/personlistview.h \
+    ui/messagedialog.h \
+    ui/tagcompletion.h
 QT += network \
     webkit \
     sql
-
 DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {
@@ -174,9 +209,11 @@ simulator {
                gps/gpspositionprivate.cpp
     HEADERS += network/networkhandlerprivatestub.h \
                gps/gpspositionprivate.h
+    SOURCES += engine/contactmanagerprivatestub.cpp
+    HEADERS += engine/contactmanagerprivatestub.h
     QT += maemo5
     CONFIG += mobility
-    MOBILITY += location messaging
+    MOBILITY += location
 } else:maemo5 {
     armel {
         DEFINES += ARMEL
@@ -194,11 +231,14 @@ simulator {
                    gps/liblocationwrapper.h \
                    gps/geopositioninfo.h
         CONFIG += link_pkgconfig
-        PKGCONFIG += glib-2.0 liblocation mce
+        PKGCONFIG += glib-2.0 liblocation mce gtk+-2.0 libosso-abook-1.0
         LIBS += -llocation
+        SOURCES += engine/contactmanagerprivate.cpp \
+                   ui/ossoabookdialog.cpp
+        HEADERS += engine/contactmanagerprivate.h \
+                   ui/ossoabookdialog.h
         CONFIG += mobility
-        MOBILITY += messaging
-
+        MOBILITY += contacts
     } else {
         SOURCES += gps/gpspositionprivatestub.cpp \
                    network/networkhandlerprivatestub.cpp \
@@ -206,6 +246,8 @@ simulator {
         HEADERS += gps/gpspositionprivatestub.h \
                    network/networkhandlerprivatestub.h \
                    engine/mceprivatestub.h
+        SOURCES += engine/contactmanagerprivatestub.cpp
+        HEADERS += engine/contactmanagerprivatestub.h
     }
 
     QT += maemo5
@@ -226,6 +268,8 @@ simulator {
     HEADERS += gps/gpspositionprivatestub.h \
                network/networkhandlerprivatestub.h \
                engine/mceprivatestub.h
+    SOURCES += engine/contactmanagerprivatestub.cpp
+    HEADERS += engine/contactmanagerprivatestub.h
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(install headers with: sudo apt-get install libqjson-dev)