Merge branch 'image_fetcher'

Conflicts:
	src/ui/updatelocation/updatelocationdialog.cpp
	src/ui/updatelocation/updatelocationdialog.h

diff --cc src/src.pro
Simple merge

diff --cc src/ui/listviewscreen.cpp
Simple merge

diff --cc src/ui/mainwindow.cpp
index c1f8b11,035ba02..c67b106
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -24,10 -24,8 +24,9 @@@
  #include "mainwindow.h"
  #include "listviewscreen.h"
  #include "mapviewscreen.h"
 +#include "settingsdialog.h"
  #include "facebookservice/facebookauthentication.h"
  #include "situareservice/situareservice.h"
- #include "engine/engine.h"
  
  MainWindow::MainWindow(QWidget *parent)
      : QMainWindow(parent)
@@@ -130,14 -116,7 +123,16 @@@ void MainWindow::switchView(int nextInd
  void MainWindow::openLocationUpdateDialog()
  {
      qDebug() << __PRETTY_FUNCTION__;
+ 
+     emit requestReverseGeo();
      m_locationDialog->exec();
  }
 +
 +void MainWindow::openSettingsDialog()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +    SettingsDialog *dialog = new SettingsDialog(this);
 +    dialog->show();
 +}
 +
 +

diff --cc src/ui/mainwindow.h
index 331d149,b0f28e7..1aa7ecd
--- 1/src/ui/mainwindow.h
--- 2/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@@ -112,10 -140,7 +145,8 @@@ private
      QStackedWidget *m_situareViews; ///< Stacked widget that hold both view widgets
      QAction *m_toListViewAct; ///< Action to trigger switch to list view
      QAction *m_toMapViewAct; ///< Action to trigger switch to map view
 +    QAction *m_toSettingsAct; ///< Action to trigger switch to settings dialog
      QMenu *m_viewMenu; ///< Object that hold the view menu items
- 
-     UpdateLocationDialog *m_locationDialog; ///< Message dialog
  };
  
  #endif // MAINWINDOW_H

diff --cc src/ui/updatelocation/updatelocationdialog.cpp
Simple merge

diff --cc src/ui/updatelocation/updatelocationdialog.h
Simple merge