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

Conflicts:
	res/languages/situare_fi.qm
	res/languages/situare_fi.ts

diff --git a/res/languages/situare_fi.qm b/res/languages/situare_fi.qm
index e6155f1..e127476 100644 (file)
Binary files a/res/languages/situare_fi.qm and b/res/languages/situare_fi.qm differ

diff --git a/res/languages/situare_fi.ts b/res/languages/situare_fi.ts
index c838fed..8f355b7 100644 (file)
--- a/res/languages/situare_fi.ts
+++ b/res/languages/situare_fi.ts
@@ -69,43 +69,43 @@
         <translation>Situare</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="402"/>
-        <location filename="../../src/ui/mainwindow.cpp" line="666"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="400"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="664"/>
         <source>Login</source>
         <translation>Kirjaudu</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="407"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="405"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="412"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="410"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="419"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="417"/>
         <source>Auto centering</source>
         <translation>Automaattinen keskitys</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="425"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="423"/>
         <source>Main</source>
         <translation>Päävalikko</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="430"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="428"/>
         <source>Menu</source>
         <translation>Valikko</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="538"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="536"/>
         <source>GPS timeout</source>
         <translation>GPS pyyntö aikakatkaistiin</translation>
     </message>
     <message>
-        <location filename="../../src/ui/mainwindow.cpp" line="660"/>
+        <location filename="../../src/ui/mainwindow.cpp" line="658"/>
         <source>Logout</source>
         <translation>Kirjaudu ulos</translation>
     </message>
@@ -165,126 +165,136 @@
 <context>
     <name>SituareEngine</name>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="133"/>
+        <location filename="../../src/engine/engine.cpp" line="136"/>
         <source>Auto centering disabled</source>
         <translation>Automaattinen keskitys pois päältä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="183"/>
+        <location filename="../../src/engine/engine.cpp" line="186"/>
         <source>Unable to start GPS</source>
         <translation>GPS käynnistys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="196"/>
+        <location filename="../../src/engine/engine.cpp" line="199"/>
         <source>Do you want to enable automatic location update with %1 min update interval?</source>
         <translation>Asetetaanko automaattinen paikan päivitys %1 minuutin välein päälle?</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="201"/>
+        <location filename="../../src/engine/engine.cpp" line="204"/>
         <source>Automatic location update enabled</source>
         <translation>Automaattinen paikan päivitys päällä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="230"/>
+        <location filename="../../src/engine/engine.cpp" line="233"/>
         <source>Unknown server error</source>
-        <translation type="unfinished"></translation>
+        <translation>Tuntematon palvelinvirhe</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="236"/>
         <source>Missing argument from request</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Pyynnöstä puuttuu parametri</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="238"/>
+        <location filename="../../src/engine/engine.cpp" line="239"/>
+        <source>Missing parameter from request</source>
+        <translation>Pyynnöstä puuttuu parametri</translation>
+    </message>
+    <message>
+        <location filename="../../src/engine/engine.cpp" line="241"/>
         <source>Connection refused by the server</source>
         <translation>Palvelin ei vastaa pyyntöihin</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="244"/>
+        <location filename="../../src/engine/engine.cpp" line="247"/>
         <source>Connection closed by the server</source>
         <translation>Palvelin sulki yhteyden</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="250"/>
+        <location filename="../../src/engine/engine.cpp" line="253"/>
         <source>Remote server not found</source>
         <translation>Palvelinta ei löydy</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="256"/>
+        <location filename="../../src/engine/engine.cpp" line="259"/>
         <source>Connection timed out</source>
         <translation>Yhteys aikakatkaistiin</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="262"/>
+        <location filename="../../src/engine/engine.cpp" line="265"/>
         <source>No network connection</source>
-        <translation>Ei verkkoyhteyttä</translation>
+        <translation type="unfinished">Ei verkkoyhteyttä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="266"/>
+        <location filename="../../src/engine/engine.cpp" line="269"/>
         <source>Session expired. Please login again</source>
         <translation>Istunto vanhentunut. Kirjaudu uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="274"/>
+        <location filename="../../src/engine/engine.cpp" line="277"/>
         <source>Invalid E-mail address or password</source>
         <translation>Virheellinen sähköpostiosoite tai salasana</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="279"/>
+        <location filename="../../src/engine/engine.cpp" line="282"/>
         <source>Update failed, please try again</source>
         <translation>Päivitys epäonnistui. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="283"/>
+        <location filename="../../src/engine/engine.cpp" line="286"/>
         <source>Data retrieval failed, please try again</source>
         <translation>Tiedon haku epäonnistui. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="286"/>
+        <location filename="../../src/engine/engine.cpp" line="292"/>
         <source>Address retrieval failed</source>
         <translation>Osoitteen haku epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="299"/>
+        <location filename="../../src/engine/engine.cpp" line="305"/>
         <source>Malformatted reply from server</source>
         <translation>Viallisesti muotoiltu serverin vastaus</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="305"/>
+        <location filename="../../src/engine/engine.cpp" line="311"/>
+        <source>Address server not responding</source>
+        <translation>Osoitepalvelin ei vastaa</translation>
+    </message>
+    <message>
+        <location filename="../../src/engine/engine.cpp" line="479"/>
+        <source>Automatic location update</source>
+        <translation>Automaattinen paikan päivitys</translation>
+    </message>
+    <message>
         <source>Geolocation server not responding</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Geolokaatio serveri ei vastaa</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="309"/>
         <source>Geolocation request failed, please try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Geolokaatio pyyntö epäonnistui.Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="313"/>
         <source>Invalid lat/lon value, please try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Virheellinen lat/lon arvo. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="462"/>
         <source>Automatic location update.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Automaattinen paikkatiedon päivitys.</translation>
     </message>
     <message>
         <source>Address retrieval failed, please try again</source>
         <translation type="obsolete">Osoitteen haku epäonnistui. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="289"/>
+        <location filename="../../src/engine/engine.cpp" line="295"/>
         <source>Image download failed</source>
         <translation>Kuvan haku epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="292"/>
+        <location filename="../../src/engine/engine.cpp" line="298"/>
         <source>Map image download failed</source>
         <translation>Karttakuvan lataaminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="296"/>
+        <location filename="../../src/engine/engine.cpp" line="302"/>
         <source>GPS initialization failed</source>
         <translation>GPS alustus epäonnistui</translation>
     </message>
@@ -297,14 +307,14 @@
         <translation type="obsolete">Virheellinen JSON, parsiminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="351"/>
-        <location filename="../../src/engine/engine.cpp" line="359"/>
+        <location filename="../../src/engine/engine.cpp" line="349"/>
+        <location filename="../../src/engine/engine.cpp" line="357"/>
         <source>GPS enabled</source>
         <translation>GPS päällä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="352"/>
-        <location filename="../../src/engine/engine.cpp" line="362"/>
+        <location filename="../../src/engine/engine.cpp" line="350"/>
+        <location filename="../../src/engine/engine.cpp" line="360"/>
         <source>Auto centering enabled</source>
         <translation>Automaattinen keskitys päällä</translation>
     </message>
@@ -347,7 +357,7 @@ Your message is saved to textbox until sending will succeed</source>
         <translation type="obsolete">Sijainnin päivitys epäonnistui\n\nVistisi on tallennettu kunnes pävitys on onnistunut</translation>
     </message>
     <message>
-        <location filename="../../src/ui/userinfo.cpp" line="357"/>
+        <location filename="../../src/ui/userinfo.cpp" line="353"/>
         <source>Location update failed, please try again</source>
         <translation>Paikkatiedon päivitys epäonnistui, yritä uudelleen</translation>
     </message>

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 64fa07f..19bafb1 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -233,10 +233,10 @@ void SituareEngine::error(const int context, const int error)
             m_ui->buildInformationBox(tr("Unknown server error"), true);
         }
         break;
-    case SituareError::ERROR_MISSING_ARGUMENT | QNetworkReply::ConnectionRefusedError :
+    case 1: //errors: SituareError::ERROR_MISSING_ARGUMENT and QNetworkReply::ConnectionRefusedError
         m_ui->toggleProgressIndicator(false);
         if(context == ErrorContext::SITUARE) {
-            m_ui->buildInformationBox(tr("Missing argument from request"), true);
+            m_ui->buildInformationBox(tr("Missing parameter from request"), true);
         } else if(context == ErrorContext::NETWORK) {
             m_ui->buildInformationBox(tr("Connection refused by the server"), true);
         }
@@ -286,6 +286,9 @@ void SituareEngine::error(const int context, const int error)
         m_ui->buildInformationBox(tr("Data retrieval failed, please try again"), true);
         break;
     case SituareError::ADDRESS_RETRIEVAL_FAILED:
+    case SituareError::ERROR_GEOLOCATION_REQUEST_FAIL:
+    case SituareError::ERROR_GEOLOCATION_LONLAT_INVALID:
+        m_ui->toggleProgressIndicator(false);
         m_ui->buildInformationBox(tr("Address retrieval failed"), true);
         break;
     case SituareError::IMAGE_DOWNLOAD_FAILED:
@@ -305,15 +308,7 @@ void SituareEngine::error(const int context, const int error)
         break;
     case SituareError::ERROR_GEOLOCATION_SERVER_UNAVAILABLE:
         m_ui->toggleProgressIndicator(false);
-        m_ui->buildInformationBox(tr("Geolocation server not responding"), true);
-        break;
-    case SituareError::ERROR_GEOLOCATION_REQUEST_FAIL:
-        m_ui->toggleProgressIndicator(false);
-        m_ui->buildInformationBox(tr("Geolocation request failed, please try again"), true);
-        break;
-    case SituareError::ERROR_GEOLOCATION_LONLAT_INVALID:
-        m_ui->toggleProgressIndicator(false);
-        m_ui->buildInformationBox(tr("Invalid lat/lon value, please try again"), true);
+        m_ui->buildInformationBox(tr("Address server not responding"), true);
         break;
     default:
         m_ui->toggleProgressIndicator(false);
@@ -481,7 +476,7 @@ void SituareEngine::requestAutomaticUpdateIfMoved(QPointF position)
     }
 
     if (m_automaticUpdateRequest && m_userMoved) {
-        requestUpdateLocation(tr("Automatic location update."));
+        requestUpdateLocation(tr("Automatic location update"));
         m_automaticUpdateRequest = false;
         m_userMoved = false;
     }

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index 874c854..42a0c01 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -169,23 +169,19 @@ void UserInfo::setMessageText(const QString &text)
     qDebug() << __PRETTY_FUNCTION__;
 
     m_messageText = text;
-    m_expandedMessageText = text;
-    int textWidth = fontMetrics().width(m_expandedMessageText);
-
-    if (textWidth > 150){
-        QStringList words = m_expandedMessageText.split(" ");
-
-        for (int i = 0; i < words.count();i++){
-            QString temp = words.at(i);
-
-            if(temp.length() >= LINE_LENGTH) {
-                temp.insert(LINE_LENGTH,QString("\n"));
-                words.replace(i,temp);
-            }
+    m_expandedMessageText.clear();
+    QString temp = "";
+    for(int i=0;i < text.length();i++) {
+        if(fontMetrics().width(temp.append(text.at(i))) > 170) {
+            temp.append("\n");
+            if(temp.startsWith(QString(" ")))
+                temp.remove(0, 1);
+
+            m_expandedMessageText.append(temp);
+            temp.clear();
         }
-        m_expandedMessageText = words.join(" ");
     }
-
+    m_expandedMessageText.append(temp);
     setText(false);
 }