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

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

diff --cc src/src.pro
index a97d212,a8dd472..74ea089
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -23,8 -23,8 +23,9 @@@ SOURCES += main.cpp 
      ui/infotab.cpp \
      ui/updatelocation/updatelocationdialog.cpp \
      ui/updatelocation/texteditautoresizer.cpp \
 +    engine/engine.cpp \
-     user/user.cpp
+     user/user.cpp \
+     ui/settingsdialog.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
      ui/listviewscreen.h \
@@@ -44,8 -44,8 +45,9 @@@
      facebookservice/facebookcredentials.h \
      facebookservice/facebookauthentication.h \
      facebookservice/facebookcommon.h \
 +    engine/engine.h \
-     user/user.h
+     user/user.h \
+     ui/settingsdialog.h
  QT += network \
      webkit
  

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

diff --cc src/ui/mainwindow.cpp
index 3fec4ce,1560569..c1f8b11
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -24,9 -24,9 +24,10 @@@
  #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)
@@@ -120,8 -116,29 +126,18 @@@ void MainWindow::switchView(int nextInd
              break;
      }
  }
+ 
 +void MainWindow::openLocationUpdateDialog()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +    m_locationDialog->exec();
 +}
++
+ void MainWindow::openSettingsDialog()
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+     SettingsDialog *dialog = new SettingsDialog(this);
+     dialog->show();
+ }
+ 
 -void MainWindow::loginScreenClosed()
 -{
 -    qDebug() << __PRETTY_FUNCTION__ << m_loggedIn;
 -    if (m_loggedIn) {
 -        this->show();
 -        return;
 -    }
 -    else {
 -        this->close();
 -    }
 -}
+ 
 -void MainWindow::loginOK()
 -{
 -    qDebug() << __PRETTY_FUNCTION__ << m_loggedIn;
 -    m_loggedIn = true;
 -    m_facebookAuthenticator->close();
 -}

diff --cc src/ui/mainwindow.h
index 4a94811,bd79de8..331d149
--- 1/src/ui/mainwindow.h
--- 2/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@@ -64,8 -59,14 +64,13 @@@ public
  /*******************************************************************************
   * MEMBER FUNCTIONS AND SLOTS
   ******************************************************************************/
 -
  public slots:
      /**
+     * @brief Public slot, which open settings dialog
+     */
+      void openSettingsDialog();
+ 
+     /**
      * @brief Public slot, which initiates toListViewAct action to switch view
      */
      void toListView();
@@@ -107,9 -117,9 +112,10 @@@ 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