From: lampehe-local <henri.lampela@ixonos.com>
Date: Wed, 12 May 2010 12:53:04 +0000 (+0300)
Subject: Merge branch 'master' into fb_auth_window_removal
X-Git-Tag: v0.4~4^2~14
X-Git-Url: https://vcs.maemo.org/git/?p=situare;a=commitdiff_plain;h=67cfbe07b1210e0330ca899412780d6cb26e9e84

Merge branch 'master' into fb_auth_window_removal

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

67cfbe07b1210e0330ca899412780d6cb26e9e84
diff --cc src/ui/mainwindow.cpp
index e03c859,a95dbd1..79fd72c
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -91,23 -80,20 +91,20 @@@ void MainWindow::createMenus(
  
      m_toSettingsAct = new QAction(tr("Settings"), this);
      m_toSettingsAct->setObjectName(tr("Settings"));
-     connect(m_toSettingsAct, SIGNAL(triggered()),
-             this, SLOT(openSettingsDialog()));
-     m_gpsToggleAct = new QAction(tr("GPS enabled"), this);
+     connect(m_toSettingsAct, SIGNAL(triggered()), this, SLOT(openSettingsDialog()));
 -        m_gpsToggleAct = new QAction(tr("GPS"), this);
++    m_gpsToggleAct = new QAction(tr("GPS"), this);
      m_gpsToggleAct->setCheckable(true);
      m_gpsToggleAct->setChecked(true);
-     connect(m_gpsToggleAct, SIGNAL(toggled(bool)),
-             this, SLOT(gpsActionToggled(bool)));
-     m_autoCenteringAct = new QAction(tr("Auto centering enabled"), this);
+     connect(m_gpsToggleAct, SIGNAL(toggled(bool)), this, SLOT(gpsActionToggled(bool)));
+     m_autoCenteringAct = new QAction(tr("Auto centering"), this);
      m_autoCenteringAct->setCheckable(true);
      m_autoCenteringAct->setChecked(true);
-     connect(m_autoCenteringAct, SIGNAL(toggled(bool)),
-             this, SLOT(autoCenteringToggled(bool)));
+     connect(m_autoCenteringAct, SIGNAL(toggled(bool)), this, SLOT(autoCenteringToggled(bool)));    
  	
-     m_viewMenu = menuBar()->addMenu(tr("Main"));
+ 	m_viewMenu = menuBar()->addMenu(tr("Main"));
  
      m_viewMenu->addAction(m_toSettingsAct);
-     m_viewMenu->addAction(m_gpsToggleAct);
+ 	m_viewMenu->addAction(m_gpsToggleAct);
      m_viewMenu->addAction(m_autoCenteringAct);
      m_viewMenu->setObjectName(tr("Menu"));
  }