--- /dev/null
+ # -------------------------------------------------
+ # 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
+ }
--- /dev/null
+ /*
+ 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));
+ }