Merge branch 'master' into new_panels

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 16b9a21..c880fed 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,7 +10,10 @@ RESOURCES += ../images.qrc \
 TRANSLATIONS += ../res/languages/situare_fi.ts
 SOURCES += main.cpp \
     application.cpp \
+    coordinates/geocoordinate.cpp \
+    coordinates/scenecoordinate.cpp \
     engine/engine.cpp \
+    engine/mce.cpp \
     facebookservice/facebookauthentication.cpp \
     facebookservice/facebookcredentials.cpp \
     gps/gpsposition.cpp \
@@ -21,6 +24,7 @@ SOURCES += main.cpp \
     map/gpslocationitem.cpp \
     map/mapengine.cpp \
     map/mapfetcher.cpp \
+    map/maprouteitem.cpp \
     map/mapscene.cpp \
     map/mapscroller.cpp \
     map/maptile.cpp \
@@ -31,6 +35,11 @@ SOURCES += main.cpp \
     network/networkcookiejar.cpp \
     network/networkhandler.cpp \
     network/networkreply.cpp \
+    routing/geocodingservice.cpp \
+    routing/location.cpp \
+    routing/route.cpp \
+    routing/routesegment.cpp \
+    routing/routingservice.cpp \
     situareservice/imagefetcher.cpp \
     situareservice/situareservice.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
@@ -38,40 +47,33 @@ SOURCES += main.cpp \
     ui/avatarimage.cpp \
     ui/friendlistitem.cpp \
     ui/friendlistpanel.cpp \
+    ui/fullscreenbutton.cpp \
     ui/imagebutton.cpp \
+    ui/indicatorbutton.cpp \
+    ui/indicatorbuttonpanel.cpp \
     ui/logindialog.cpp \
     ui/mainwindow.cpp \
     ui/mapscale.cpp \
-    ui/panelsidebar.cpp \
-    ui/panelsliderbar.cpp \
     ui/settingsdialog.cpp \
-    ui/sidepanel.cpp \
-    ui/sidepanelbase.cpp \
     ui/userinfo.cpp \
     ui/userinfopanel.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
-    user/user.cpp \
-    ui/fullscreenbutton.cpp \
-    engine/mce.cpp \
-    ui/indicatorbutton.cpp \
-    routing/routingservice.cpp \
-    routing/routesegment.cpp \
-    routing/route.cpp \
-    routing/location.cpp \
-    map/maprouteitem.cpp \
-    coordinates/scenecoordinate.cpp \
-    coordinates/geocoordinate.cpp \
     ui/listview.cpp \
     ui/listitem.cpp \
     ui/listitemdelegate.cpp \
     ui/friendlistitemdelegate.cpp \
     ui/searchdialog.cpp \
-    ui/indicatorbuttonpanel.cpp\
-    routing/geocodingservice.cpp
+    ui/paneltab.cpp \
+    ui/tabbedpanel.cpp \
+    ui/panelbar.cpp \
+    ui/panelcontent.cpp \
+    ui/panelbase.cpp \
+    user/user.cpp
 HEADERS += application.h \
     common.h \
     engine/engine.h \
+    error.h \
     facebookservice/facebookauthentication.h \
     facebookservice/facebookcommon.h \
     facebookservice/facebookcredentials.h \
@@ -108,19 +110,17 @@ HEADERS += application.h \
     ui/mainwindow.h \
     ui/mapscale.h \
     ui/panelcommon.h \
-    ui/panelsidebar.h \
-    ui/panelsliderbar.h \
     ui/settingsdialog.h \
     ui/userinfo.h \
     ui/userinfopanel.h \
-    ui/sidepanel.h \
-    ui/sidepanelbase.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
     user/user.h \
     ui/fullscreenbutton.h \
     engine/mce.h \
     ui/indicatorbutton.h \
+    ui/indicatorbuttonpanel.h \
+    routing/geocodingservice.h \
     routing/routingservice.h \
     routing/routingcommon.h \
     routing/routesegment.h \
@@ -136,9 +136,11 @@ HEADERS += application.h \
     ui/friendlistitemdelegate.h \
     ui/listcommon.h \
     ui/searchdialog.h \
-    ui/indicatorbuttonpanel.h\
-    error.h \
-    routing/geocodingservice.h
+    ui/paneltab.h \
+    ui/tabbedpanel.h \
+    ui/panelbar.h \
+    ui/panelcontent.h \
+    ui/panelbase.h
 QT += network \
     webkit