diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts
index 04d355ebc..0960e9bc0 100644
--- a/localization/rssguard_cs.ts
+++ b/localization/rssguard_cs.ts
@@ -1063,23 +1063,23 @@ or this functionality is not implemented yet.
FormEditGmailAccountUsername
-
+ Uživatelské jménoOAuth 2.0 settings
-
+ Nastaveni OAuth 2.0Application ID
-
+ ID aplikaceApplication key
-
+ Klíč aplikaceRedirect URL
-
+ Přesměrovací URLPredefined settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!
@@ -1087,31 +1087,31 @@ or this functionality is not implemented yet.
Only download newest X messages per feed
-
+ Stahovat pouze X nejnovějších zpráv z kanálu message(s)
-
+ zpráv&Login
-
+ &Přihlásit seNot tested yet.
-
+ Neotestováno.User-visible username
-
+ Uživatelské jménoYou are already logged in.
-
+ Již jste přihlášen.Access granted.
-
+ Přístup povolen.No username entered.
@@ -1123,11 +1123,11 @@ or this functionality is not implemented yet.
You did not grant access.
-
+ Přístup NEpovolen.There was error during testing.
-
+ Byla chyba během testování.There is error. %1
@@ -1139,7 +1139,7 @@ or this functionality is not implemented yet.
Your access was approved.
-
+ Přístup byl povolen.Add new Gmail account
@@ -1151,11 +1151,11 @@ or this functionality is not implemented yet.
Empty value is entered.
-
+ Zadána prázdná hodnota.Some value is entered.
-
+ Zadána nějaká hodnota.
@@ -1190,7 +1190,7 @@ or this functionality is not implemented yet.
message(s)
- zpráv
+ zpráv&Login
@@ -2801,7 +2801,7 @@ Nyní ho můžete nainstalovat.
GmailNetworkFactoryLogged in successfully
-
+ Přihlášeno úspěšně.Your login to Gmail was authorized.
@@ -2809,19 +2809,19 @@ Nyní ho můžete nainstalovat.
Inoreader: authentication error
-
+ Inroeader: chyba autentizaceClick this to login again. Error is: '%1'
-
+ Pro opětovné přihlášení klikněte zde.Inoreader: authorization denied
-
+ Inoreader: přistup nepovolenClick this to login again.
-
+ Klikně sem pro opětovné přihlášení.No subject
@@ -2849,15 +2849,16 @@ Nyní ho můžete nainstalovat.
Authentication status: %1
Login tokens expiration: %2
-
+ Status autentizace: %1
+Tokeny vyprší: %2logged-in
-
+ přihlášenNOT logged-in
-
+ NEpřihlášen
@@ -3434,7 +3435,7 @@ Je vyžadování verze API minimálně %1.
Not supported
-
+ NepodporovánoThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_da.ts b/localization/rssguard_da.ts
index 881726fc2..1ea473354 100644
--- a/localization/rssguard_da.ts
+++ b/localization/rssguard_da.ts
@@ -1057,7 +1057,7 @@ or this functionality is not implemented yet.
FormEditGmailAccountUsername
-
+ BrugernavnOAuth 2.0 settings
@@ -3411,7 +3411,7 @@ Mindst API niveau %1 er påkrævet.
Not supported
-
+ UsupporteretThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_de.ts b/localization/rssguard_de.ts
index f5ac354a4..6de012e9e 100644
--- a/localization/rssguard_de.ts
+++ b/localization/rssguard_de.ts
@@ -1060,23 +1060,23 @@ or this functionality is not implemented yet.
FormEditGmailAccountUsername
-
+ BenutzernameOAuth 2.0 settings
-
+ OAuth 2.0 EinstellungenApplication ID
-
+ Applikations IDApplication key
-
+ Applikations SchlüsselRedirect URL
-
+ URL umleitenPredefined settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!
@@ -1084,31 +1084,31 @@ or this functionality is not implemented yet.
Only download newest X messages per feed
-
+ Nur die neuesten X messages pro Feed herunterladen message(s)
-
+ Nachricht(en)&Login
-
+ &LoginNot tested yet.
-
+ Noch nicht getestet.User-visible username
-
+ Nutzer sichtbarer BenutzernameYou are already logged in.
-
+ Sie sind bereits angemeldet.Access granted.
-
+ Zugang gewährt.No username entered.
@@ -1120,11 +1120,11 @@ or this functionality is not implemented yet.
You did not grant access.
-
+ Sie haben keinen Zugang gewährt.There was error during testing.
-
+ Ein Fehler ist während des Tests aufgetreten.There is error. %1
@@ -1136,7 +1136,7 @@ or this functionality is not implemented yet.
Your access was approved.
-
+ Ihr Zugang wurde genehmigt.Add new Gmail account
@@ -1148,11 +1148,11 @@ or this functionality is not implemented yet.
Empty value is entered.
-
+ Leerer Wert wurde eingegeben.Some value is entered.
-
+ Ein Wert wurde eingegeben.
@@ -2797,7 +2797,7 @@ Sie können es jetzt installieren.
GmailNetworkFactoryLogged in successfully
-
+ Erfolgreich eingeloggtYour login to Gmail was authorized.
@@ -2805,19 +2805,19 @@ Sie können es jetzt installieren.
Inoreader: authentication error
-
+ Inoreader: Fehler bei der AuthentifizierungClick this to login again. Error is: '%1'
-
+ Klicken Sie hier um sich wieder anzumelden. Der Fehler ist: '%1'Inoreader: authorization denied
-
+ Inoreader: Authorisierung abgelehntClick this to login again.
-
+ Drücken Sie hier um sich neu anzumelden.No subject
@@ -2845,15 +2845,16 @@ Sie können es jetzt installieren.
Authentication status: %1
Login tokens expiration: %2
-
+ Authentifikationsstatus: %1
+Ablauf des Login tokens: %2logged-in
-
+ angemeldetNOT logged-in
-
+ NICHT angemeldet
@@ -3428,7 +3429,7 @@ Das API muss mindestens in Version %1 verfügbar sein.
Not supported
-
+ Nicht unterstütztThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_es.ts b/localization/rssguard_es.ts
index bf2c4c8dd..2d6d2ca64 100755
--- a/localization/rssguard_es.ts
+++ b/localization/rssguard_es.ts
@@ -1061,7 +1061,7 @@ o debido a que esta función aún no está implementada.
FormEditGmailAccountUsername
-
+ Nombre de usuarioOAuth 2.0 settings
@@ -3430,7 +3430,7 @@ Se necesita como mínimo una API de nivel %1.
Not supported
-
+ No admitidoThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_fr.ts b/localization/rssguard_fr.ts
index 5293f830d..422097778 100644
--- a/localization/rssguard_fr.ts
+++ b/localization/rssguard_fr.ts
@@ -1059,7 +1059,7 @@ ou cette fonctionnalité n'est pas encore implémentée.
FormEditGmailAccountUsername
-
+ Nom d'utilisateurOAuth 2.0 settings
@@ -3412,7 +3412,7 @@ At least API level %1 is required.
Not supported
-
+ Non supportéThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_he.ts b/localization/rssguard_he.ts
index ba7d3f956..adc4be3d0 100644
--- a/localization/rssguard_he.ts
+++ b/localization/rssguard_he.ts
@@ -1057,7 +1057,7 @@ or this functionality is not implemented yet.
FormEditGmailAccountUsername
-
+ שם משתמשOAuth 2.0 settings
diff --git a/localization/rssguard_id.ts b/localization/rssguard_id.ts
index bd73dd3f8..e8a08ea6d 100644
--- a/localization/rssguard_id.ts
+++ b/localization/rssguard_id.ts
@@ -1060,19 +1060,19 @@ atau fungsi ini belum diimplementasikan.
FormEditGmailAccountUsername
-
+ Nama penggunaOAuth 2.0 settings
-
+ Pengaturan OAuth 2.0Application ID
-
+ ID aplikasiApplication key
-
+ Kunci aplikasiRedirect URL
@@ -1088,7 +1088,7 @@ atau fungsi ini belum diimplementasikan.
message(s)
-
+ pesan&Login
@@ -1096,7 +1096,7 @@ atau fungsi ini belum diimplementasikan.
Not tested yet.
-
+ Belum terujiUser-visible username
@@ -3424,7 +3424,7 @@ Setidaknya API level %1 dibutuhkan.
Not supported
-
+ Tidak didukungThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_it.ts b/localization/rssguard_it.ts
index a2534c774..526c2e5fc 100644
--- a/localization/rssguard_it.ts
+++ b/localization/rssguard_it.ts
@@ -1061,7 +1061,7 @@ oppure questa funzionalità non è ancora implementata.
FormEditGmailAccountUsername
-
+ Nome utenteOAuth 2.0 settings
@@ -3426,7 +3426,7 @@ Tiny Tiny RSS è un lettore e aggregatore di fonti di notizie (RSS/Atom) open so
Not supported
-
+ Non supportatoThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_ja.ts b/localization/rssguard_ja.ts
index ae523a11f..9f728b5ae 100644
--- a/localization/rssguard_ja.ts
+++ b/localization/rssguard_ja.ts
@@ -1057,7 +1057,7 @@ or this functionality is not implemented yet.
FormEditGmailAccountUsername
-
+ ユーザー名OAuth 2.0 settings
@@ -3407,7 +3407,7 @@ At least API level %1 is required.
Not supported
-
+ サポートされていませんThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts
index 703962750..2decc264e 100644
--- a/localization/rssguard_lt.ts
+++ b/localization/rssguard_lt.ts
@@ -1063,99 +1063,99 @@ arba šis funkcionalumas dar nėra įgyvendintas.
FormEditGmailAccountUsername
-
+ Naudotojo vardasOAuth 2.0 settings
-
+ OAuth 2.0 nustatymaiApplication ID
-
+ Programos IDApplication key
-
+ Programos raktasRedirect URL
-
+ Peradresavimo URLPredefined settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!
-
+ Iš anksto apibrėžtų nustatymų NEREIKIA keisti iš numatytųjų reikšmių. Keiskite šias reikšmes tik tuo atveju, jeigu esate patyręs naudotojas ir žinote ką darote!Only download newest X messages per feed
-
+ Atsisiųsti kiekvienam kanalui tik X naujausių žinučių message(s)
-
+ žinutės(-ių)&Login
-
+ &PrisijungtiNot tested yet.
-
+ Kol kas neišbandyta.User-visible username
-
+ Naudotojui matomas naudotojo vardasYou are already logged in.
-
+ Jūs jau esate prisijungę.Access granted.
-
+ Prieiga suteikta.No username entered.
-
+ Neįvestas naudotojo vardas. Some username entered.
-
+ Įvestas kažkoks naudotojo vardas. You did not grant access.
-
+ Jūs nesuteikėte prieigos.There was error during testing.
-
+ Išbandymo metu buvo klaida.There is error. %1
-
+ Yra klaida. %1 Tested successfully.You may be prompted to login once more.
-
+ Išbandyta sėkmingai.Jūsų gali būti paprašyta prisijungti dar kartą.Your access was approved.
-
+ Jūsų prieiga buvo patvirtinta.Add new Gmail account
-
+ Pridėti naują Gmail paskyrąEdit existing Gmail account
-
+ Taisyti esamą Gmail paskyrąEmpty value is entered.
-
+ Įvesta tuščia reikšmė.Some value is entered.
-
+ Įvesta kažkokia reikšmė.
@@ -2803,63 +2803,64 @@ Jūs dabar galite jį įdiegti.
GmailNetworkFactoryLogged in successfully
-
+ Sėkmingai prisijungtaYour login to Gmail was authorized.
-
+ Jums buvo suteikta prieigos teisė prie Gmail.Inoreader: authentication error
-
+ Inoreader: atpažinimo klaidaClick this to login again. Error is: '%1'
-
+ Spustelėkite tai, norėdami prisijungti dar kartą. Klaida yra: "%1"Inoreader: authorization denied
-
+ Inoreader: prieigos teisių suteikimas atmestasClick this to login again.
-
+ Spustelėkite tai, norėdami prisijungti dar kartą.No subject
-
+ Nėra temosGmailServiceRootInbox
-
+ GautiejiSent
-
+ IšsiųstiDrafts
-
+ JuodraščiaiSpam
-
+ ŠlamštasAuthentication status: %1
Login tokens expiration: %2
-
+ Atpažinimo būsena: %1
+Prisijungimo prieigos raktai nustoja galioti: %2logged-in
-
+ prisijungtaNOT logged-in
-
+ NEPRISIJUNGTA
@@ -3319,7 +3320,7 @@ Prisijungimo prieigos raktai nustoja galioti: %2
You have to login first
-
+ Iš pradžių, turite prisijungti
@@ -3436,15 +3437,15 @@ Reikalingas bent API lygis %1.
Not supported
-
+ NepalaikomaThis plugin is not supported in NonWebEngine variant of this program.
-
+ Šis įskiepis nėra palaikomas šios programos NonWebEngine variante.Simple Gmail integration via JSON API. Allows sending e-mails too.
-
+ Paprasta Gmail integracija per JSON API. Taip pat leidžia siųsti el. laiškus.
diff --git a/localization/rssguard_nl.ts b/localization/rssguard_nl.ts
index 1672f331d..147d0dcb0 100644
--- a/localization/rssguard_nl.ts
+++ b/localization/rssguard_nl.ts
@@ -1062,7 +1062,7 @@ of deze functie bestaat nog niet.
FormEditGmailAccountUsername
-
+ GebruikersnaamOAuth 2.0 settings
@@ -3432,7 +3432,7 @@ Een API niveau van tenminste %1 is vereist.
Not supported
-
+ Niet ondersteundThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_pl.ts b/localization/rssguard_pl.ts
index cece1fa3c..a313f8d19 100644
--- a/localization/rssguard_pl.ts
+++ b/localization/rssguard_pl.ts
@@ -1063,7 +1063,7 @@ lub ta funkcja nie jest jeszcze zaimplementowana,
FormEditGmailAccountUsername
-
+ Nazwa użytkownikaOAuth 2.0 settings
@@ -3434,7 +3434,7 @@ Minimalny wymagany poziom API to %1.
Not supported
-
+ NiewspieraneThis plugin is not supported in NonWebEngine variant of this program.
diff --git a/localization/rssguard_pt.ts b/localization/rssguard_pt.ts
index 239c91d0a..7ed6265e1 100644
--- a/localization/rssguard_pt.ts
+++ b/localization/rssguard_pt.ts
@@ -1062,99 +1062,99 @@ ou esta função ainda não foi implementada.
FormEditGmailAccountUsername
-
+ UsuárioOAuth 2.0 settings
-
+ Configurações OAuth 2.0Application ID
-
+ ID do AplicativoApplication key
-
+ Chave do aplicativoRedirect URL
-
+ URL de RedirecionamentoPredefined settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!
-
+ Configurações predefinidas NÃO precisam ser alteradas dos seus valores padrão. Mude estes valores apenas de você for um usuário avançado e sabe o que está fazendo!Only download newest X messages per feed
-
+ Somente baixar as X mensagens mais novas por feed message(s)
-
+ mensagem(ns)&Login
-
+ &LoginNot tested yet.
-
+ Ainda não testado.User-visible username
-
+ Nome de usuário visível ao usuárioYou are already logged in.
-
+ Você já está logado.Access granted.
-
+ Acesso garantido.No username entered.
-
+ Nenhum nome de usuário inserido.Some username entered.
-
+ Algum nome de usuário inserido.You did not grant access.
-
+ O acesso não foi garantido.There was error during testing.
-
+ Ocorreu um erro durante o teste.There is error. %1
-
+ Há um erro. %1Tested successfully.You may be prompted to login once more.
-
+ Testado com sucesso. Você será solicitado para fazer login mais uma vez.Your access was approved.
-
+ Seu acesso foi aprovado.Add new Gmail account
-
+ Adicionar nova conta do GmailEdit existing Gmail account
-
+ Editar conta existente do GmailEmpty value is entered.
-
+ Valor em branco inserido.Some value is entered.
-
+ Algum valor foi inserido.
@@ -2802,63 +2802,64 @@ Você pode instalá-lo agora.
GmailNetworkFactoryLogged in successfully
-
+ Logado com sucessoYour login to Gmail was authorized.
-
+ Seu login no Gmail foi autorizado.Inoreader: authentication error
-
+ Inoreader: erro de autenticaçãoClick this to login again. Error is: '%1'
-
+ Clique aqui para fazer login novamente. O erro é: '%1'Inoreader: authorization denied
-
+ Inoreader: autorização negadaClick this to login again.
-
+ Clique aqui para fazer login novamente.No subject
-
+ Nenhum assuntoGmailServiceRootInbox
-
+ Caixa de entradaSent
-
+ EnviadoDrafts
-
+ RascunhosSpam
-
+ SpamAuthentication status: %1
Login tokens expiration: %2
-
+ Status da autenticação: %1
+Expiração dos tokens de login: %2logged-in
-
+ logadoNOT logged-in
-
+ NÃO logado
@@ -3318,7 +3319,7 @@ Expiração dos tokens de login: %2
You have to login first
-
+ Você precisa fazer login primeiro
@@ -3433,15 +3434,15 @@ Pelo menos o API nível %1 é necessário.
Not supported
-
+ Não suportadoThis plugin is not supported in NonWebEngine variant of this program.
-
+ Este plugin não é suportado na variante NonWebEngine deste programa.Simple Gmail integration via JSON API. Allows sending e-mails too.
-
+ Integração simples do Gmail via API JSON. Permite também o envio de e-mails.
diff --git a/localization/rssguard_sv.ts b/localization/rssguard_sv.ts
index 886be7d12..4e32e50ac 100644
--- a/localization/rssguard_sv.ts
+++ b/localization/rssguard_sv.ts
@@ -1062,99 +1062,99 @@ att funktionen inte är implementerad än.
FormEditGmailAccountUsername
-
+ AnvändarnamnOAuth 2.0 settings
-
+ OAuth 2.0 inställningarApplication ID
-
+ Applikation-IDApplication key
-
+ ApplikationsnyckelRedirect URL
-
+ Omdirigera URLPredefined settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!
-
+ Fördefinierade inställningar BEHÖVER INTE ändras från standardinställning. Ändra dessa inställningar, endast om du räknar dig som avancerad användare och vet vad du gör!Only download newest X messages per feed
-
+ Ladda endast ner X nyaste meddelanden per flöde message(s)
-
+ meddelande(n)&Login
-
+ &Logga inNot tested yet.
-
+ Inte testat ännu.User-visible username
-
+ Användarsynligt användarnamnYou are already logged in.
-
+ Du är redan inloggad.Access granted.
-
+ Åtkomst beviljad.No username entered.
-
+ Inget användarnamn angivetSome username entered.
-
+ Användarnamn angivetYou did not grant access.
-
+ Du beviljade inte åtkomst.There was error during testing.
-
+ Fel uppstod vid testning.There is error. %1
-
+ Det finns fel. %1Tested successfully.You may be prompted to login once more.
-
+ Testat korrekt. Du kan behöva logga in en gång till.Your access was approved.
-
+ Åtkomst beviljades.Add new Gmail account
-
+ Lägg till nytt Gmail-kontoEdit existing Gmail account
-
+ Lägg till befintligt Gmail-kontoEmpty value is entered.
-
+ Ett tomt värde angavs.Some value is entered.
-
+ Ett värde angavs.
@@ -2801,63 +2801,64 @@ Du kan installera det nu.
GmailNetworkFactoryLogged in successfully
-
+ InloggadYour login to Gmail was authorized.
-
+ Din inloggning till Gmail godkändes.Inoreader: authentication error
-
+ Inoreader: Autentiseringsfel Click this to login again. Error is: '%1'
-
+ Klicka här för att logga in igen. Felet är: "%1"Inoreader: authorization denied
-
+ Inoreader: Autentisering nekadesClick this to login again.
-
+ Klicka här för att logga in igen.No subject
-
+ Inget ämneGmailServiceRootInbox
-
+ InkorgSent
-
+ SkickatDrafts
-
+ UtkastSpam
-
+ SkräpAuthentication status: %1
Login tokens expiration: %2
-
+ Autentiseringsstatus: %1
+Inloggningstoken upphör: %2logged-in
-
+ inloggadNOT logged-in
-
+ INTE inloggad
@@ -3317,7 +3318,7 @@ Inloggningstoken upphör: %2
You have to login first
-
+ Du måste logga in först
@@ -3430,15 +3431,15 @@ Minst API-nivå %1 krävs.
Not supported
-
+ Stöds ejThis plugin is not supported in NonWebEngine variant of this program.
-
+ Insticksmodulen stöds inte i NonWebEngine-varianten av detta program.Simple Gmail integration via JSON API. Allows sending e-mails too.
-
+ Enkel Gmail-integrering via JSON API. Låter dig skicka e-post också.
diff --git a/localization/rssguard_zh.ts b/localization/rssguard_zh.ts
index f124c08f8..8fd69166c 100755
--- a/localization/rssguard_zh.ts
+++ b/localization/rssguard_zh.ts
@@ -1060,7 +1060,7 @@ or this functionality is not implemented yet.
FormEditGmailAccountUsername
-
+ 用户名OAuth 2.0 settings
@@ -3410,7 +3410,7 @@ At least API level %1 is required.
Not supported
-
+ 不支持This plugin is not supported in NonWebEngine variant of this program.
diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
index dcc142593..3a06e7662 100755
--- a/src/definitions/definitions.h
+++ b/src/definitions/definitions.h
@@ -34,8 +34,7 @@
#define DEFAULT_LOCALE "en"
#define DEFAULT_FEED_ENCODING "UTF-8"
#define DEFAULT_FEED_TYPE "RSS"
-#define URL_REGEXP \
- "^(http|https|feed|ftp):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?$"
+#define URL_REGEXP "^(http|https|feed|ftp):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?$"
#define TEXT_TITLE_LIMIT 30
#define RESELECT_MESSAGE_THRESSHOLD 500
#define ICON_SIZE_SETTINGS 16
diff --git a/src/network-web/downloader.cpp b/src/network-web/downloader.cpp
index 2a45910f4..490ebe44c 100755
--- a/src/network-web/downloader.cpp
+++ b/src/network-web/downloader.cpp
@@ -175,6 +175,8 @@ void Downloader::progressInternal(qint64 bytes_received, qint64 bytes_total) {
QList Downloader::decodeMultipartAnswer(QNetworkReply* reply) {
QByteArray data = reply->readAll();
+ IOFactory::writeFile("b.json", data);
+
if (data.isEmpty()) {
return QList();
}
diff --git a/src/services/gmail/gui/formdownloadattachment.cpp b/src/services/gmail/gui/formdownloadattachment.cpp
index 2458cb1d7..3853792a4 100755
--- a/src/services/gmail/gui/formdownloadattachment.cpp
+++ b/src/services/gmail/gui/formdownloadattachment.cpp
@@ -18,7 +18,7 @@ FormDownloadAttachment::FormDownloadAttachment(const QString& target_file, Downl
GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("mail-attachment")), tr("Downloading attachment..."));
connect(m_ui.m_btnBox->button(QDialogButtonBox::StandardButton::Abort), &QPushButton::clicked, downloader, &Downloader::cancel);
- connect(downloader, &Downloader::completed, [downloader, target_file](QNetworkReply::NetworkError status, QByteArray contents) {
+ connect(downloader, &Downloader::completed, [this, downloader, target_file](QNetworkReply::NetworkError status, QByteArray contents) {
if (status == QNetworkReply::NetworkError::NoError) {
QString data = QJsonDocument::fromJson(contents).object()["data"].toString();
@@ -29,9 +29,11 @@ FormDownloadAttachment::FormDownloadAttachment(const QString& target_file, Downl
}
downloader->deleteLater();
+ close();
});
- connect(downloader, &Downloader::completed, this, &FormDownloadAttachment::close);
connect(downloader, &Downloader::progress, [this](qint64 bytes_received, qint64 bytes_total) {
+ m_ui.m_lblInfo->setText(tr("Downloaded: %1 kB").arg(bytes_received / 1000.0));
+
if (m_ui.m_progressBar->maximum() == 0) {
return;
}
diff --git a/src/services/gmail/gui/formdownloadattachment.ui b/src/services/gmail/gui/formdownloadattachment.ui
index cf9936107..ce09cdd20 100755
--- a/src/services/gmail/gui/formdownloadattachment.ui
+++ b/src/services/gmail/gui/formdownloadattachment.ui
@@ -21,7 +21,7 @@
-
+ Qt::Vertical
@@ -34,7 +34,7 @@
-
+ Qt::Horizontal
@@ -44,6 +44,13 @@
+
+
+
+
+
+
+
diff --git a/src/services/gmail/network/gmailnetworkfactory.cpp b/src/services/gmail/network/gmailnetworkfactory.cpp
index 40f85bba9..684c58d4b 100755
--- a/src/services/gmail/network/gmailnetworkfactory.cpp
+++ b/src/services/gmail/network/gmailnetworkfactory.cpp
@@ -416,7 +416,7 @@ bool GmailNetworkFactory::fillFullMessage(Message& msg, const QJsonObject& json,
}
}
}
- else {
+ else if (!filename.isEmpty()) {
// We have attachment.
msg.m_enclosures.append(Enclosure(filename + QL1S(GMAIL_ATTACHMENT_SEP) + body["attachmentId"].toString(),
filename + QString(" (%1 KB)").arg(QString::number(body["size"].toInt() / 1000.0))));