git Merge branch 'search_item'

Conflicts:
	src/engine/engine.cpp
	src/ui/mainwindow.cpp

diff --cc src/engine/engine.cpp
index 3ddfb8d,13943f9..9b78942
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -624,9 -646,8 +638,12 @@@ void SituareEngine::signalsFromMainWind
      connect(m_ui, SIGNAL(findFriend(GeoCoordinate)),
              m_mapEngine, SLOT(centerToCoordinates(GeoCoordinate)));
  
 +    // signals from distence indicator button
-         connect(m_ui, SIGNAL(autoCenteringTriggered(bool)),
-                 this, SLOT(changeAutoCenteringSetting(bool)));
++    connect(m_ui, SIGNAL(autoCenteringTriggered(bool)),
++            this, SLOT(changeAutoCenteringSetting(bool)));
++
+     connect(m_ui, SIGNAL(searchForLocation(QString)),
+             this, SLOT(locationSearch(QString)));
  }
  
  void SituareEngine::signalsFromMapEngine()

diff --cc src/routing/routingservice.cpp
Simple merge

diff --cc src/src.pro
Simple merge

diff --cc src/ui/mainwindow.cpp
index 531bca2,e958631..7f5997f
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -33,9 -33,9 +33,10 @@@
  #include "common.h"
  #include "friendlistpanel.h"
  #include "fullscreenbutton.h"
 +#include "indicatorbutton.h"
  #include "logindialog.h"
  #include "mapscale.h"
+ #include "searchdialog.h"
  #include "settingsdialog.h"
  #include "userinfopanel.h"
  #include "zoombuttonpanel.h"
@@@ -431,11 -414,24 +432,17 @@@ void MainWindow::createMenus(
      connect(m_gpsToggleAct, SIGNAL(triggered(bool)),
              this, SIGNAL(gpsTriggered(bool)));
  
 -    // automatic centering
 -    m_autoCenteringAct = new QAction(tr("Auto centering"), this);
 -    m_autoCenteringAct->setCheckable(true);
 -    connect(m_autoCenteringAct, SIGNAL(triggered(bool)),
 -        this, SIGNAL(autoCenteringTriggered(bool)));
 -
+     /// @todo remove when not needed!
+     m_searchLocationAct = new QAction(tr("Location search"), this);
+     connect(m_searchLocationAct, SIGNAL(triggered()),
+             this, SLOT(startLocationSearch()));
+ 
      // build the actual menu
      m_viewMenu = menuBar()->addMenu(tr("Main"));
      m_viewMenu->addAction(m_loginAct);
      m_viewMenu->addAction(m_toSettingsAct);
      m_viewMenu->addAction(m_gpsToggleAct);
 -    m_viewMenu->addAction(m_autoCenteringAct);
+     m_viewMenu->addAction(m_searchLocationAct); /// @todo remove when not needed!
      m_viewMenu->setObjectName(tr("Menu"));
  }
  

diff --cc src/ui/mainwindow.h
Simple merge