Merged with ui. Added .orig files to .gitignore.

Conflicts:
	.gitignore
	Situare.pro
	src/ui/mainwindow.cpp

diff --cc .gitignore
index c6c1b2a,4f0f80b..e588ff6
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -11,4 -11,3 +11,5 @@@ moc_
  *.moc
  *.pro.user
  Makefile
 +Situare
++*.orig

diff --cc Situare.pro
index 3102903,7feb438..bf32cea
--- 1/Situare.pro
--- 2/Situare.pro
+++ b/Situare.pro
@@@ -5,12 -5,8 +5,16 @@@ TARGET = Situar
  TEMPLATE = app
  SOURCES += src/main.cpp \
      src/ui/mainwindow.cpp \
+     src/ui/listviewtab.cpp \
 -    src/ui/mapviewtab.cpp
++    src/ui/mapviewtab.cpp \
 +    src/map/mapengine.cpp \
 +    src/map/mapview.cpp \
 +    src/map/mapscene.cpp \
 +    src/map/maptile.cpp
  HEADERS += src/ui/mainwindow.h \
+     src/ui/listviewtab.h \
 -    src/ui/mapviewtab.h
++    src/ui/mapviewtab.h \
 +    src/map/mapengine.h \
 +    src/map/mapview.h \
 +    src/map/mapscene.h \
 +    src/map/maptile.h

diff --cc res/images/test_map_tiles/14_9351_4261.png
index 0000000,0000000..b04b729
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9351_4262.png
index 0000000,0000000..3382873
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9351_4263.png
index 0000000,0000000..7b4583e
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9351_4264.png
index 0000000,0000000..5e246fe
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9354_4261.png
index 0000000,0000000..c8119a0
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9354_4262.png
index 0000000,0000000..4b57dab
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9354_4263.png
index 0000000,0000000..c464dbe
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/14_9354_4264.png
index 0000000,0000000..5767434
new file mode 100644 (file)
Binary files differ

diff --cc res/images/test_map_tiles/empty.png
index 0000000,0000000..018cde4
new file mode 100644 (file)
Binary files differ

diff --cc src/ui/mapviewtab.cpp
index 0000000,37c65be..cbe8118
mode 000000,100644..100644
--- /dev/null
--- 2/src/ui/mapviewtab.cpp
+++ b/src/ui/mapviewtab.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 "mapviewtab.h"
++#include "../map/mapview.h"
++#include "../map/mapengine.h"
+ 
+ SituareMapView::SituareMapView(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);
++   mapEngine->setViewLocation(QPointF(25.5000, 65.0000));
+ }