Merge branch 'master' of https://vcs.maemo.org/git/situare into map

diff --combined src/src.pro
index 4068f33,4f084e6..633c529
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -3,6 -3,7 +3,6 @@@
  # -------------------------------------------------
  TARGET = ../situare
  TEMPLATE = app
 -RESOURCES += images.qrc
  SOURCES += main.cpp \
      ui/mainwindow.cpp \
      ui/mapviewscreen.cpp \
@@@ -11,7 -12,9 +11,9 @@@
      map/mapview.cpp \
      map/mapscene.cpp \
      map/maptile.cpp \
-     map/mapfetcher.cpp
 -    map/mapfetcher.cpp \
++    map/mapfetcher.cpp\
+     ui/pixmap.cpp \
+     ui/infotab.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -20,18 -23,12 +22,20 @@@
      map/mapscene.h \
      map/maptile.h \
      map/mapfetcher.h \
-     map/mapcommon.h
 -    common.h \
++    map/mapcommon.h \
+     ui/pixmap.h \
+     ui/infotab.h
  QT += network \
      webkit
  
 +# use don't use OpenGL when building in scratchbox
 +!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)
 +}
 +
  # -----------------------------------------------------------------
  # Debian packetizing additions
  # -----------------------------------------------------------------
@@@ -53,4 -50,3 +57,4 @@@ unix 
      target.path = $$BINDIR
      INSTALLS += target
  }
 +RESOURCES += 

diff --combined src/ui/mapviewscreen.cpp
index a736179,1bd35eb..bdb6dcd
--- 1/src/ui/mapviewscreen.cpp
--- 2/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@@ -20,52 -20,20 +20,54 @@@
  */
  
  #include "mapviewscreen.h"
+ #include "infotab.h"
  #include "../map/mapview.h"
  #include "../map/mapengine.h"
+ #include "infotab.h"
  
  MapViewScreen::MapViewScreen(QWidget *parent)
     : QWidget(parent)
  {
 -   QHBoxLayout *mapViewLayout = new QHBoxLayout;
 -   MapView *mapView = new MapView(this);
 -   mapViewLayout->addWidget(mapView);
 -   setLayout(mapViewLayout);
 -   MapEngine *mapEngine = new MapEngine(this);
 -   mapView->setScene(mapEngine->scene());
 -   connect(mapEngine, SIGNAL(zoomLevelChanged(int)), mapView, SLOT(setZoomLevel(int)));
 -   mapEngine->setViewLocation(QPointF(25.5000, 65.0000));
 +    MapView *mapView = new MapView(this);
 +    mapEngine = new MapEngine(this);
 +    mapView->setScene(mapEngine->scene());
 +
 +    connect(mapView, SIGNAL(viewScrolled(QPoint)), mapEngine, SLOT(setLocation(QPoint)));
 +    connect(mapEngine, SIGNAL(locationChanged(QPoint)),
 +           mapView, SLOT(centerToSceneCoordinates(QPoint)));
 +    connect(mapEngine, SIGNAL(zoomLevelChanged(int)), mapView, SLOT(setZoomLevel(int)));
 +    connect(mapView, SIGNAL(viewResized(QSize)), mapEngine, SLOT(viewResized(QSize)));
 +
 +    QHBoxLayout *mapViewLayout = new QHBoxLayout;
 +    //DEBUG
 +    QVBoxLayout *mapControlLayout = new QVBoxLayout;
 +    QWidget *mapControl = new QWidget(this);
 +    mapControl->setLayout(mapControlLayout);
 +    search = new QPushButton("Search", this);
 +    zoomOut = new QPushButton("-", this);
 +    zoomIn = new QPushButton("+", this);
 +    mapControlLayout->addWidget(&latLine);
 +    mapControlLayout->addWidget(&lonLine);
 +    mapControlLayout->addWidget(search);
 +    mapControlLayout->addWidget(zoomIn);
 +    mapControlLayout->addWidget(zoomOut);
 +    mapViewLayout->addWidget(mapControl);
 +    connect(search, SIGNAL(clicked()), this, SLOT(searchMap()));
 +    connect(zoomIn, SIGNAL(clicked()), mapEngine, SLOT(zoomIn()));
 +    connect(zoomOut, SIGNAL(clicked()), mapEngine, SLOT(zoomOut()));
 +    //DEBUG
 +    mapViewLayout->addWidget(mapView);
 +    setLayout(mapViewLayout);
 +
 +    mapEngine->init();
 +}
 +
 +void MapViewScreen::searchMap()
 +{
 +    qreal lat = latLine.text().toFloat();
 +    qreal lon = lonLine.text().toFloat();
 +
 +    qDebug() << lat << "," << lon;
 +
 +    mapEngine->setViewLocation(QPointF(lon, lat));
  }