Merge branch 'duke' of https://github.com/myhush/silentdragon into duke

application.qrc

@@ -13,18 +13,19 @@
         <file>res/logobig.gif</file>
     </qresource>
     <qresource prefix="/translations">
-        <file>res/zec_qt_wallet_de.qm</file>
-        <file>res/zec_qt_wallet_es.qm</file>
-        <file>res/zec_qt_wallet_fi.qm</file>
-        <file>res/zec_qt_wallet_fr.qm</file>
-        <file>res/zec_qt_wallet_hr.qm</file>
-        <file>res/zec_qt_wallet_it.qm</file>
-        <file>res/zec_qt_wallet_nl.qm</file>
-        <file>res/zec_qt_wallet_pt.qm</file>
-        <file>res/zec_qt_wallet_ru.qm</file>
-        <file>res/zec_qt_wallet_tr.qm</file>
-        <file>res/zec_qt_wallet_uk.qm</file>
-        <file>res/zec_qt_wallet_zh.qm</file>
+        <file>res/silentdragon_de.qm</file>
+        <file>res/silentdragon_es.qm</file>
+        <file>res/silentdragon_fi.qm</file>
+        <file>res/silentdragon_fr.qm</file>
+        <file>res/silentdragon_hr.qm</file>
+        <file>res/silentdragon_it.qm</file>
+        <file>res/silentdragon_nl.qm</file>
+        <file>res/silentdragon_pt.qm</file>
+        <file>res/silentdragon_ru.qm</file>
+        <file>res/silentdragon_sr.qm</file>
+        <file>res/silentdragon_tr.qm</file>
+        <file>res/silentdragon_uk.qm</file>
+        <file>res/silentdragon_zh.qm</file>
     </qresource>
     <qresource prefix="/css">
         <file>res/css/blue.css</file>

res/zec_qt_wallet_de.ts → res/silentdragon_de.ts

@@ -1212,7 +1212,7 @@ If all else fails, please run hushd manually.</source>
         <translation>Dies kann einige Stunden dauern, machen Sie sich einen Kaffee</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>Es gab einen Fehler! : </translation>
     </message>
@@ -1378,7 +1378,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation>Verbindungsfehler</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Transaktionsfehler</translation>

res/zec_qt_wallet_es.ts → res/silentdragon_es.ts

@@ -1278,12 +1278,12 @@ Por favor, especificar el host/puerta y usario/contraseña en el menú Editar-&g
 	</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>¡Hubo un error! :</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation> Error De Transacción</translation>

res/zec_qt_wallet_fi.ts → res/silentdragon_fi.ts

@@ -1168,7 +1168,7 @@ Integroitua hushdia ei käynnistetä, koska --ei-integroitu ohitettiin</translat
         <translation>MT at </translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>Tapahtui virhe! : </translation>
     </message>
@@ -1341,7 +1341,7 @@ Aseta isäntä/portti ja käyttäjänimi/salasana Muokkaa-&gt; Asetukset-valikos
         <translation>Yhteysvirhe</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Tapahtumavirhe</translation>

res/zec_qt_wallet_fr.ts → res/silentdragon_fr.ts

@@ -1193,7 +1193,7 @@ If all else fails, please run hushd manually.</source>
         <translation>Cela peut prendre plusieurs heures. Prenez du pop-corn</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>Il y avait une erreur! :</translation>
     </message>
@@ -1359,7 +1359,7 @@ Veuillez configurer l&apos;hôte/port et utilisateur/mot de passe dans le menu E
         <translation>Erreur de connection</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Erreur de transaction</translation>

res/zec_qt_wallet_hr.ts → res/silentdragon_hr.ts

@@ -1196,13 +1196,13 @@ Molimo postavite host/port i korisnčko ime/lozinku u Edit-&gt;Settings meniju.<
         <translation>Greška sa vezom</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Greška u transakciji</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>Dogodila se greška! : </translation>
     </message>

res/zec_qt_wallet_it.ts → res/silentdragon_it.ts

@@ -1172,7 +1172,7 @@ If all else fails, please run hushd manually.</source>
         <translation>Potrebbero essere necessarie alcune ore, prendi dei popcorn</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>C&apos;era un errore! :</translation>
     </message>
@@ -1337,7 +1337,7 @@ Impostare host/porta e utente/password nel menu Modifica-&gt; Impostazioni.</tra
         <translation>Errore di Connessione</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Errore di transazione</translation>

res/zec_qt_wallet_pt.ts → res/silentdragon_pt.ts

@@ -1159,7 +1159,7 @@ Se tudo mais falhar, execute o hushd manualmente.</translation>
         <translation>Isso pode levar várias horas, pegue um pouco de pipoca</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>Havia um erro! :</translation>
     </message>
@@ -1323,7 +1323,7 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar&gt;Preferências
         <translation>Erro na Conexão</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Erro na transação</translation>

res/zec_qt_wallet_ru.ts → res/silentdragon_ru.ts

@@ -1286,7 +1286,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1450,7 +1450,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation>Ошибка соединения</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>&quot;&gt;Ошибка транзакции</translation>

res/zec_qt_wallet_tr.ts → res/silentdragon_tr.ts

@@ -1155,7 +1155,7 @@ Hepsi başarısız olursa, lütfen hushd&apos;i manuel olarak çalıştırın.</
         <translation>MB saniyede </translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation>Bir hata oluştu! : </translation>
     </message>
@@ -1328,7 +1328,7 @@ Lütfen Düzenle-&gt;Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıc
         <translation>Bağlantı Hatası</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>İşlem Hatası</translation>

res/zec_qt_wallet_uk.ts → res/silentdragon_uk.ts

@@ -1286,7 +1286,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1450,7 +1450,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation>Помилка з&apos;єднання</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>Помилка транзакції</translation>

res/zec_qt_wallet_zh.ts → res/silentdragon_zh.ts

@@ -1357,7 +1357,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <source>There was an error! : </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1372,7 +1372,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
         <translation>连接错误</translation>
     </message>
     <message>
-        <location filename="../src/connection.cpp" line="791"/>
+        <location filename="../src/connection.cpp" line="797"/>
         <location filename="../src/sendtab.cpp" line="727"/>
         <source>Transaction Error</source>
         <translation>交易错误</translation>

silentdragon.pro

@@ -106,18 +106,19 @@ FORMS += \
     src/requestdialog.ui
 
 
-TRANSLATIONS = res/zec_qt_wallet_de.ts \
-               res/zec_qt_wallet_es.ts \
-               res/zec_qt_wallet_fi.ts \
-               res/zec_qt_wallet_fr.ts \
-               res/zec_qt_wallet_hr.ts \
-               res/zec_qt_wallet_it.ts \
-               res/zec_qt_wallet_nl.ts \
-               res/zec_qt_wallet_pt.ts \
-               res/zec_qt_wallet_ru.ts \
-               res/zec_qt_wallet_tr.ts \
-               res/zec_qt_wallet_uk.ts \
-               res/zec_qt_wallet_zh.ts
+TRANSLATIONS = res/silentdragon_de.ts \
+               res/silentdragon_es.ts \
+               res/silentdragon_fi.ts \
+               res/silentdragon_fr.ts \
+               res/silentdragon_hr.ts \
+               res/silentdragon_it.ts \
+               res/silentdragon_nl.ts \
+               res/silentdragon_pt.ts \
+               res/silentdragon_ru.ts \
+               res/silentdragon_sr.ts \
+               res/silentdragon_tr.ts \
+               res/silentdragon_uk.ts \
+               res/silentdragon_zh.ts
 
 include(singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication

src/main.cpp

@@ -180,7 +180,7 @@ public:
         qDebug() << "Loading locale " << locale;
         
         QTranslator translator;
-        translator.load(QString(":/translations/res/zec_qt_wallet_") + locale);
+        translator.load(QString(":/translations/res/silentdragon_") + locale);
         a.installTranslator(&translator);
 
         QIcon icon(":/icons/res/icon.ico");

src/scripts/dotranslations.sh

@@ -11,7 +11,7 @@ $QT_STATIC/bin/lrelease silentdragon.pro
 # Then update the qt base translations. First, get all languages
 ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do 
     if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then
-        $QT_STATIC/bin/lconvert -o res/zec_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/zec_qt_wallet_$language.qm
-        mv res/zec_$language.qm res/zec_qt_wallet_$language.qm
+        $QT_STATIC/bin/lconvert -o res/zec_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragon_$language.qm
+        mv res/zec_$language.qm res/silentdragon_$language.qm
     fi
 done

src/settings.cpp

@@ -364,27 +364,24 @@ PaymentURI Settings::parseURI(QString uri) {
         ans.error = "Could not understand address";
         return ans;
     }
-    uri = uri.right(uri.length() - ans.addr.length());
-
-    if (!uri.isEmpty()) {
-        uri = uri.right(uri.length() - 1); // Eat the "?"
-
-        QStringList args = uri.split("&");
-        for (QString arg: args) {
-            QStringList kv = arg.split("=");
-            if (kv.length() != 2) {
-                ans.error = "No value argument was seen";
-                return ans;
-            }
-
-            if (kv[0].toLower() == "amt" || kv[0].toLower() == "amount") {
-                ans.amt = kv[1];
-            } else if (kv[0].toLower() == "memo" || kv[0].toLower() == "message" || kv[0].toLower() == "msg") {
-                ans.memo = QUrl::fromPercentEncoding(kv[1].toUtf8());
-            } else {
-                // Ignore unknown fields, since some developers use it to pass extra data.
-            }
-        }
+
+    uri = uri.right(uri.length() - ans.addr.length()-1);  // swallow '?'
+    QUrlQuery query(uri);
+    
+    // parse out amt / amount
+    if (query.hasQueryItem("amt")) {
+        ans.amt  = query.queryItemValue("amt");
+    } else if (query.hasQueryItem("amount")) {
+        ans.amt  = query.queryItemValue("amount");
+    }
+    
+    // parse out memo / msg / message
+    if (query.hasQueryItem("memo")) {
+        ans.memo  = query.queryItemValue("memo");
+    } else if (query.hasQueryItem("msg")) {
+        ans.memo  = query.queryItemValue("msg");
+    } else if  (query.hasQueryItem("message")) {
+        ans.memo  = query.queryItemValue("message");
     }
 
     return ans;