Modified menu buttons texts.

diff --git a/src/src.pro b/src/src.pro
index 926725e..bf3e3e7 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -96,13 +96,13 @@ maemo5 {
     QT += maemo5
     CONFIG += mobility
     MOBILITY = location
-    message(QJson built in)
+    message([QJson])
     message(Make sure you have QJson development headers installed)
     message(add: deb http://repository.maemo.org/extras-devel fremantle free non-free)
-    message(to scratchbox's sources.list in /etc/apt)
+    message(to Scratchbox's sources.list in /etc/apt)
     message(run: apt-get update)
     message(install headers with: apt-get install libqjson-dev)
-    message(QtMobility)
+    message([QtMobility])
     message(Make sure you have QtMobility development headers installed)
     message(install headers with: apt-get install libqtm-dev)
 }

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 92ec8b4..a95dbd1 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -81,11 +81,11 @@ 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);
+        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);
+    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)));    
@@ -119,13 +119,11 @@ void MainWindow::gpsActionToggled(bool checked)
 
     if (checked) {
         emit enableGPS(true);
-        m_gpsToggleAct->setText(tr("GPS enabled"));
         showMaemoInformationBox(tr("GPS enabled"));
         m_autoCenteringAct->setVisible(true);
     }
     else {
         emit enableGPS(false);
-        m_gpsToggleAct->setText(tr("GPS disabled"));
         showMaemoInformationBox(tr("GPS disabled"));
         m_autoCenteringAct->setVisible(false);
 
@@ -152,12 +150,10 @@ void MainWindow::autoCenteringToggled(bool checked)
 
     if (checked) {
         emit enableAutoCentering(true);
-        m_autoCenteringAct->setText(tr("Auto centering enabled"));
         showMaemoInformationBox(tr("Auto centering enabled"));
     }
     else {
         emit enableAutoCentering(false);
-        m_autoCenteringAct->setText(tr("Auto centering disabled"));
         showMaemoInformationBox(tr("Auto centering disabled"));
     }
 }