From: Sami Rämö <sami.ramo@ixonos.com>
Date: Thu, 1 Apr 2010 10:28:29 +0000 (+0300)
Subject: Merged with master
X-Git-Tag: v0.1~4
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=15f09832359bd4335a2aa21cfb6cac1c4343baba;p=situare

Merged with master
---

15f09832359bd4335a2aa21cfb6cac1c4343baba
diff --cc .gitignore
index 23b038f,73ae3af..37bdac3
--- a/.gitignore
+++ b/.gitignore
@@@ -11,6 -11,5 +11,8 @@@ moc_
  *.moc
  *.pro.user
  Makefile
 +Situare
 +*.orig
 +doc/doxygen/*
+ situare
 -testtabs
++testtabs
diff --cc src/src.pro
index 0000000,08eb1d8..37136c4
mode 000000,100644..100644
--- a/src/src.pro
+++ b/src/src.pro
@@@ -1,0 -1,43 +1,53 @@@
+ # -------------------------------------------------
+ # Project created by QtCreator 2010-03-26T07:57:35
+ # -------------------------------------------------
+ TARGET = ../situare
+ TEMPLATE = app
+ SOURCES += main.cpp \
+     ui/mainwindow.cpp \
+     ui/mapviewscreen.cpp \
 -    ui/listviewscreen.cpp
++    ui/listviewscreen.cpp \
++    map/mapengine.cpp \
++    map/mapview.cpp \
++    map/mapscene.cpp \
++    map/maptile.cpp
++
+ HEADERS += ui/mainwindow.h \
+     ui/mapviewscreen.h \
 -    ui/listviewscreen.h
++    ui/listviewscreen.h \
++    map/mapengine.h \
++    map/mapview.h \
++    map/mapscene.h \
++    map/maptile.h
++
+ 
+ # -----------------------------------------------------------------
+ # Debian packetizing additions
+ # -----------------------------------------------------------------
+ unix { 
+     # VARIABLES
+     isEmpty(PREFIX):PREFIX = /usr/local
+     BINDIR = $$PREFIX/bin
+     DATADIR = $$PREFIX/share
+     DEFINES += DATADIR=\"$$DATADIR\" \
+         PKGDATADIR=\"$$PKGDATADIR\"
+     
+     # MAKE INSTALL
+     INSTALLS += target \
+         desktop \
+         iconxpm \
+         icon26 \
+         icon40 \
+         icon64
+     target.path = $$BINDIR
+     desktop.path = $$DATADIR/applications/hildon
+     desktop.files += $${TARGET}.desktop
+     iconxpm.path = $$DATADIR/pixmap
+     iconxpm.files += ../data/maemo/$${TARGET}.xpm
+     icon26.path = $$DATADIR/icons/hicolor/26x26/apps
+     icon26.files += ../data/26x26/$${TARGET}.png
+     icon40.path = $$DATADIR/icons/hicolor/40x40/apps
+     icon40.files += ../data/40x40/$${TARGET}.png
+     icon64.path = $$DATADIR/icons/hicolor/64x64/apps
+     icon64.files += ../data/64x64/$${TARGET}.png
+ }
diff --cc src/ui/mapviewscreen.cpp
index 0000000,e05de43..b3ebc2c
mode 000000,100644..100644
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@@ -1,0 -1,31 +1,35 @@@
+ /*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+ 
+       Kaj Wallin - kaj.wallin@ixonos.com
+ 
+    Situare is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    version 2 as published by the Free Software Foundation.
+ 
+    Situare is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+    along with Situare; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+    USA.
+ */
+ 
+ #include "mapviewscreen.h"
++#include "../map/mapview.h"
++#include "../map/mapengine.h"
+ 
+ MapViewScreen::MapViewScreen(QWidget *parent)
+    : QWidget(parent)
+ {
 -   QPushButton *mapViewButton = new QPushButton(tr("This is MAPVIEW"));
+    QHBoxLayout *mapViewLayout = new QHBoxLayout;
 -   mapViewLayout->addWidget(mapViewButton);
++   MapView *mapView = new MapView(this);
++   mapViewLayout->addWidget(mapView);
+    setLayout(mapViewLayout);
++   MapEngine *mapEngine = new MapEngine(mapView, this);
++   mapEngine->setViewLocation(QPointF(25.5000, 65.0000));
+ }