backup

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index ac8989b..f5bad41 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -568,6 +568,9 @@ void SituareEngine::signalsFromSituareService()
     connect(m_situareService, SIGNAL(error(int)),
             this, SLOT(error(int)));
 
+    connect(m_situareService, SIGNAL(error(int)),
+            m_ui, SIGNAL(messageSendingFailed(int)));
+
     connect(m_situareService, SIGNAL(reverseGeoReady(QString)),
             m_ui, SIGNAL(reverseGeoReady(QString)));
 
@@ -579,9 +582,6 @@ void SituareEngine::signalsFromSituareService()
 
     connect(m_situareService, SIGNAL(updateWasSuccessful()),
             m_ui, SIGNAL(updateWasSuccessful()));
-
-    connect(m_situareService, SIGNAL(error(int)),
-            m_ui, SIGNAL(messageSendingFailed(int)));
 }
 
 void SituareEngine::updateWasSuccessful()

diff --git a/src/src.pro b/src/src.pro
index 288513a..5a88115 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -100,7 +100,7 @@ HEADERS += ui/mainwindow.h \
 QT += network \
     webkit
 
-DEFINES += QT_NO_DEBUG_OUTPUT
+#DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {
     SOURCES += network/networkhandlerprivatestub.cpp \

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 309b0c2..89c5e75 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -765,8 +765,7 @@ void MainWindow::setGPSButtonEnabled(bool enabled)
 
     m_gpsToggleAct->setChecked(enabled);
 
-    if(m_loggedIn)
-        setOwnLocationCrosshairVisibility(!enabled);
+    setOwnLocationCrosshairVisibility(!enabled);
 
     m_autoCenteringAct->setVisible(enabled);
 }
@@ -880,14 +879,14 @@ void MainWindow::toggleProgressIndicator(bool value)
 void MainWindow::updateItemVisibility(bool show)
 {
     qDebug() << __PRETTY_FUNCTION__;
-
-    setOwnLocationCrosshairVisibility(show);
     
     if(show) {
         m_friendsListPanel->show();
         m_friendsListPanelSidebar->show();
         m_userPanel->show();
         m_userPanelSidebar->show();
+        if(!m_gpsToggleAct->isChecked())
+            setOwnLocationCrosshairVisibility(show);
 
     } else {
         m_friendsListPanel->closePanel();
@@ -896,6 +895,7 @@ void MainWindow::updateItemVisibility(bool show)
         m_userPanel->closePanel();
         m_userPanel->hide();
         m_userPanelSidebar->hide();
+        setOwnLocationCrosshairVisibility(false);
     }
 }
 

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index a609dd9..22f1e21 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -337,8 +337,9 @@ void UserInfo::verifyMessageUpdateFailure(const int error)
     if (!m_messageUpdateVerified) {
 
         if (m_messageText != m_backupMessage && !m_backupMessage.isEmpty())
-            emit notificateUpdateFailing(tr("Location update failed\n\nYour message is saved to "
-                                            "textbox until sending will succeed"), true);
+//            emit notificateUpdateFailing(tr("Location update failed\n\nYour message is saved to "
+//                                            "textbox until sending will succeed"), true);
+            emit notificateUpdateFailing(tr("Location update failed, please try again"), false);
     }
 
     m_messageUpdateVerified = true;