Finalised the classes for panels

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 2d01791..3dc44b8 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,12 +3,15 @@
 # -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-RESOURCES += images.qrc
+INCLUDEPATH += "/usr/include/qjson"
+LIBS += "-lqjson"
+RESOURCES += ../images.qrc
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
     ui/mapviewscreen.cpp \
     ui/listviewscreen.cpp \
     situareservice/situareservice.cpp \
+    situareservice/imagefetcher.cpp \
     cookiehandler/cookiehandler.cpp \
     facebookservice/facebookcredentials.cpp \
     facebookservice/facebookauthentication.cpp \
@@ -19,11 +22,25 @@ SOURCES += main.cpp \
     map/mapfetcher.cpp \
     map/mapzoompanel.cpp \
     map/mapbutton.cpp \
+    map/ownlocationitem.cpp \
+    map/baselocationitem.cpp \
+    map/friendlocationitem.cpp \
     ui/pixmap.cpp \
     ui/infotab.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
-    ui/buttonitem.cpp
+    ui/friendlistview.cpp \
+    ui/friendlistitem.cpp \
+    user/user.cpp \
+    ui/buttonitem.cpp \
+    ui/situareuser.cpp \
+    engine/engine.cpp \
+    ui/settingsdialog.cpp \
+    map/maptilerequest.cpp \
+    ui/friendlistpanel.cpp \
+    ui/userpanel.cpp \
+    ui/panelsidebar.cpp \
+    ui/panelsliderbar.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -35,26 +52,48 @@ HEADERS += ui/mainwindow.h \
     map/mapcommon.h \
     map/mapzoompanel.h \
     map/mapbutton.h \
+    map/ownlocationitem.h \
+    map/baselocationitem.h \
+    map/friendlocationitem.h \
     ui/pixmap.h \
     ui/infotab.h \
     ui/updatelocation/updatelocationdialog.h \
     ui/updatelocation/texteditautoresizer.h \
     situareservice/situareservice.h \
     situareservice/situarecommon.h \
+    situareservice/imagefetcher.h \
     cookiehandler/cookiehandler.h \
     facebookservice/facebookcredentials.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
-    ui/buttonitem.h
+    ui/friendlistview.h \
+    ui/friendlistitem.h \
+    user/user.h \
+    ui/buttonitem.h \
+    ui/situareuser.h \
+    engine/engine.h \
+    ui/settingsdialog.h \
+    map/maptilerequest.h \
+    ui/friendlistpanel.h \
+    ui/userpanel.h \
+    ui/panelcommon.h \
+    ui/panelsidebar.h \
+    ui/panelsliderbar.h
 QT += network \
     webkit
-
-# use don't use OpenGL when building in scratchbox
+DEFINES += QT_NO_DEBUG_OUTPUT
 !maemo5 { 
-    QT += opengl
-    message(OpenGL built in)
-    message(Make sure you have OpenGL development headers installed)
-    message(install headers with: sudo apt-get install libgl-dev libglu-dev)
+    message(QJson built in)
+    message(Make sure you have QJson development headers installed)
+    message(install headers with: sudo apt-get install libqjson-dev)
+}
+maemo5 { 
+    message(QJson built in)
+    message(Make sure you have QJson development headers installed)
+    message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)
+    message(to scratchbox's sources.list in /etc/apt)
+    message(run: apt-get update)
+    message(install headers with: apt-get install libqjson-dev)
 }
 
 # -----------------------------------------------------------------
@@ -72,16 +111,12 @@ unix {
     desktop.path = $$DATADIR/applications/hildon
     desktop.files += situare.desktop
     INSTALLS += desktop
-    icon26.path = $$DATADIR/icons/hicolor/26x26/apps
-    icon26.files += situare.png
-    INSTALLS += icon26
-    icon40.path = $$DATADIR/icons/hicolor/40x40/apps
-    icon40.files += situare_40x40.png
-    INSTALLS += icon40
+    icon48.path = $$DATADIR/icons/hicolor/48x48/apps
+    icon48.files += ../res/icon/48x48/situare.png
+    INSTALLS += icon48
     icon64.path = $$DATADIR/icons/hicolor/64x64/apps
-    icon64.files += situare_64x64.png
+    icon64.files += ../res/icon/64x64/situare.png
     INSTALLS += icon64
     target.path = $$BINDIR
     INSTALLS += target
 }
-RESOURCES +=