diff --git a/Changelog b/Changelog
index 87f41bf28..2113d9150 100644
--- a/Changelog
+++ b/Changelog
@@ -17,6 +17,7 @@
- FEATURE: Search engine can now use a SOCKS5 proxy
- BUGFIX: Search engine loads new proxy settings without program restart
- BUGFIX: Use XDG folders (.cache, .local) instead of .qbittorrent
+ - BUGFIX: Added legal notice on startup that the user must accept
- COSMETIC: Use checkboxes to filter torrent content instead of comboboxes
- COSMETIC: Use alternating row colors in transfer list (set in program preferences)
- COSMETIC: Added a spin box to speed limiting dialog for manual input
diff --git a/src/lang/qbittorrent_bg.ts b/src/lang/qbittorrent_bg.ts
index 58f2beaa2..25e967dc9 100644
--- a/src/lang/qbittorrent_bg.ts
+++ b/src/lang/qbittorrent_bg.ts
@@ -2890,6 +2890,42 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5503,32 +5539,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_ca.ts b/src/lang/qbittorrent_ca.ts
index 1f7b59aad..7b8e2d491 100644
--- a/src/lang/qbittorrent_ca.ts
+++ b/src/lang/qbittorrent_ca.ts
@@ -2802,6 +2802,42 @@ Està segur que vol sortir?
La contrasenya d'Interfície d'Usuari Web ha de ser d'almenys 3 caràcters.
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5422,32 +5458,32 @@ Log:
UsageDisplay
-
+
Us:
-
+
Mostra la versió del programa
-
+
Desactivar pantalla d'inici
-
+
Mostra missatge d'ajuda
-
+
Canviar el port d'IU Web (actual:%1)
-
+
[arxius o URLs] : la descàrrega de torrents necessita aprovació per l'usuari (opcional)
diff --git a/src/lang/qbittorrent_cs.ts b/src/lang/qbittorrent_cs.ts
index e18bda557..633249106 100644
--- a/src/lang/qbittorrent_cs.ts
+++ b/src/lang/qbittorrent_cs.ts
@@ -1956,6 +1956,42 @@ Opravdu chcete ukončit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -4289,32 +4325,32 @@ p, li { white-space: pre-wrap; }
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_da.ts b/src/lang/qbittorrent_da.ts
index 1a5640f12..f3d4def14 100644
--- a/src/lang/qbittorrent_da.ts
+++ b/src/lang/qbittorrent_da.ts
@@ -2032,6 +2032,42 @@ Er du sikker på at du vil afslutte qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -4438,32 +4474,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_de.ts b/src/lang/qbittorrent_de.ts
index e1cfb5d79..4d08db9ba 100644
--- a/src/lang/qbittorrent_de.ts
+++ b/src/lang/qbittorrent_de.ts
@@ -2859,6 +2859,42 @@ Sind Sie sicher, daß sie qBittorrent beenden möchten?
Das Passwort für das Webinterface muss mindestens 3 Zeichen lang sein.
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5452,32 +5488,32 @@ Changelog:
UsageDisplay
-
+
Verwendung:
-
+
zeigt die Programmversion
-
+
deaktiviere Splash Screen
-
+
zeigt diese Hilfsausgabe
-
+
verändert den Webinterface Port (momentan: %1)
-
+
[Dateien oder URLs]: lädt vom Benutzer übergebene Torrents (optional)
diff --git a/src/lang/qbittorrent_el.ts b/src/lang/qbittorrent_el.ts
index b0a4d4867..47aa53028 100644
--- a/src/lang/qbittorrent_el.ts
+++ b/src/lang/qbittorrent_el.ts
@@ -2946,6 +2946,42 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5579,32 +5615,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_en.ts b/src/lang/qbittorrent_en.ts
index f2a81da27..def65b956 100644
--- a/src/lang/qbittorrent_en.ts
+++ b/src/lang/qbittorrent_en.ts
@@ -946,6 +946,42 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -3018,32 +3054,32 @@ p, li { white-space: pre-wrap; }
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_es.ts b/src/lang/qbittorrent_es.ts
index bebc46d5b..16fa40c0a 100644
--- a/src/lang/qbittorrent_es.ts
+++ b/src/lang/qbittorrent_es.ts
@@ -2802,6 +2802,42 @@ Are you sure you want to quit qBittorrent?
La contraseña de Interfaz de Usuario Web debe ser de al menos 3 caracteres.
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5426,32 +5462,32 @@ Log:
UsageDisplay
-
+
Uso:
-
+
Muestra la versión del programa
-
+
Desactivar pantalla de inicio
-
+
Muestra mensaje de ayuda
-
+
Cambiar el puerto de IU Web (actual:%1)
-
+
[archivos o URLs] : la descarga de torrents necesita aprobación por el usuario (opcional)
diff --git a/src/lang/qbittorrent_fi.ts b/src/lang/qbittorrent_fi.ts
index 6a656507f..c59c327aa 100644
--- a/src/lang/qbittorrent_fi.ts
+++ b/src/lang/qbittorrent_fi.ts
@@ -2541,6 +2541,42 @@ Haluatko varmasti lopettaa qBittorrentin?
Web-käyttöliittymän salasanan pitää olla vähintään kolme merkkiä pitkä.
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5067,32 +5103,32 @@ Muutoshistoria:
UsageDisplay
-
+
Käyttö:
-
+
näyttää ohjelman version
-
+
poista aloituskuva käytöstä
-
+
näyttää tämän avusteen
-
+
vaihtaa web-äyttöliittymän portin (nykyinen: %1)
-
+
[tiedostot tai URL:it]: lataa käyttäjän antamat torrentit (valinnainen)
diff --git a/src/lang/qbittorrent_fr.ts b/src/lang/qbittorrent_fr.ts
index 550deb107..6fd4e86b5 100644
--- a/src/lang/qbittorrent_fr.ts
+++ b/src/lang/qbittorrent_fr.ts
@@ -3051,6 +3051,42 @@ Etes-vous certain de vouloir quitter qBittorrent ?
Le mot de passe pour l'interface Web doit contenir au moins 3 caractères.
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5749,32 +5785,32 @@ Changements:
UsageDisplay
-
+
Utilisation :
-
+
affichage la version du programme
-
+
désactive l'écran de démarrage
-
+
affiche ce message d'aide
-
+
change le port de l'interface Web (actuel : %1)
-
+
[Fichiers ou URLs] : télécharge les torrents passés en paramètre (optionnel)
diff --git a/src/lang/qbittorrent_hu.ts b/src/lang/qbittorrent_hu.ts
index 8961d9984..bf12ab6ac 100644
--- a/src/lang/qbittorrent_hu.ts
+++ b/src/lang/qbittorrent_hu.ts
@@ -2386,6 +2386,42 @@ Bizotos, hogy bezárod a qBittorrentet?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -4827,32 +4863,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_it.ts b/src/lang/qbittorrent_it.ts
index e628b14e6..195d22ed7 100644
--- a/src/lang/qbittorrent_it.ts
+++ b/src/lang/qbittorrent_it.ts
@@ -2713,6 +2713,42 @@ Sei sicuro di voler chiudere qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5252,32 +5288,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_ja.ts b/src/lang/qbittorrent_ja.ts
index a7b4ad998..6a2b120cd 100644
--- a/src/lang/qbittorrent_ja.ts
+++ b/src/lang/qbittorrent_ja.ts
@@ -2186,6 +2186,42 @@ qBittorrent を終了してもよろしいですか?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -4687,32 +4723,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_ko.ts b/src/lang/qbittorrent_ko.ts
index 946227346..d79191350 100644
--- a/src/lang/qbittorrent_ko.ts
+++ b/src/lang/qbittorrent_ko.ts
@@ -2866,6 +2866,42 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -5470,32 +5506,32 @@ Changelog:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_nb.ts b/src/lang/qbittorrent_nb.ts
index af8c546d1..2aa5e23d6 100644
--- a/src/lang/qbittorrent_nb.ts
+++ b/src/lang/qbittorrent_nb.ts
@@ -1904,6 +1904,42 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -4275,32 +4311,32 @@ Endringer:
UsageDisplay
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/lang/qbittorrent_nl.ts b/src/lang/qbittorrent_nl.ts
index 000eebcb8..65a764a2d 100644
--- a/src/lang/qbittorrent_nl.ts
+++ b/src/lang/qbittorrent_nl.ts
@@ -2614,6 +2614,35 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_pl.ts b/src/lang/qbittorrent_pl.ts
index 2ebfa1b81..6fbea55b0 100644
--- a/src/lang/qbittorrent_pl.ts
+++ b/src/lang/qbittorrent_pl.ts
@@ -2692,6 +2692,35 @@ Czy napewno zamknąć qBittorrent?
Pobrano
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_pt.ts b/src/lang/qbittorrent_pt.ts
index eef82663a..585151c33 100644
--- a/src/lang/qbittorrent_pt.ts
+++ b/src/lang/qbittorrent_pt.ts
@@ -2568,6 +2568,35 @@ Está certo que quer sair do qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_pt_BR.ts b/src/lang/qbittorrent_pt_BR.ts
index eef82663a..585151c33 100644
--- a/src/lang/qbittorrent_pt_BR.ts
+++ b/src/lang/qbittorrent_pt_BR.ts
@@ -2568,6 +2568,35 @@ Está certo que quer sair do qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ro.ts b/src/lang/qbittorrent_ro.ts
index bd380a52b..17b70b8a5 100644
--- a/src/lang/qbittorrent_ro.ts
+++ b/src/lang/qbittorrent_ro.ts
@@ -2506,6 +2506,35 @@ Sunteți siguri că doriți să închideți qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_ru.ts b/src/lang/qbittorrent_ru.ts
index 7e6a05013..4fabb9466 100644
--- a/src/lang/qbittorrent_ru.ts
+++ b/src/lang/qbittorrent_ru.ts
@@ -2671,6 +2671,35 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_sk.ts b/src/lang/qbittorrent_sk.ts
index cf62054ba..4cca1d49e 100644
--- a/src/lang/qbittorrent_sk.ts
+++ b/src/lang/qbittorrent_sk.ts
@@ -2594,6 +2594,35 @@ Ste si istý, že chcete ukončiť Bittorrent?
Stiahnuté
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_sr.ts b/src/lang/qbittorrent_sr.ts
index 3ef3a52f4..4a66d66c0 100644
--- a/src/lang/qbittorrent_sr.ts
+++ b/src/lang/qbittorrent_sr.ts
@@ -1435,6 +1435,42 @@ Are you sure you want to quit qBittorrent?
Веб КИ лозинка мора имати најмање 3 карактера.
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
@@ -3608,32 +3644,32 @@ p, li { white-space: pre-wrap; }
UsageDisplay
-
+
Начин употребе:
-
+
прикажи верзију програма
-
+
онемогући уводни екран
-
+
прикажи ову поруку о помоћи
-
+
промени Веб КИ порт (тренутно: %1)
-
+
[фајлови или urls]:преузимање торента које чини корисник (опционо)
diff --git a/src/lang/qbittorrent_sv.ts b/src/lang/qbittorrent_sv.ts
index 5d090bc02..67d9737ba 100644
--- a/src/lang/qbittorrent_sv.ts
+++ b/src/lang/qbittorrent_sv.ts
@@ -1651,6 +1651,35 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_tr.ts b/src/lang/qbittorrent_tr.ts
index d0e05bfb1..e8eb32916 100644
--- a/src/lang/qbittorrent_tr.ts
+++ b/src/lang/qbittorrent_tr.ts
@@ -2653,6 +2653,35 @@ qBittorrent'ten çıkmak istediğinize emin misiniz?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_uk.ts b/src/lang/qbittorrent_uk.ts
index d1426e845..14a9e0e63 100644
--- a/src/lang/qbittorrent_uk.ts
+++ b/src/lang/qbittorrent_uk.ts
@@ -2384,6 +2384,35 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_zh.ts b/src/lang/qbittorrent_zh.ts
index 5bf8eff61..5f97f9256 100644
--- a/src/lang/qbittorrent_zh.ts
+++ b/src/lang/qbittorrent_zh.ts
@@ -2797,6 +2797,35 @@ Are you sure you want to quit qBittorrent?
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/lang/qbittorrent_zh_TW.ts b/src/lang/qbittorrent_zh_TW.ts
index df93b4fb7..326d24cf5 100644
--- a/src/lang/qbittorrent_zh_TW.ts
+++ b/src/lang/qbittorrent_zh_TW.ts
@@ -1746,6 +1746,35 @@ Are you sure you want to quit qBittorrent?
已下載
+
+ LegalNotice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MainWindow
diff --git a/src/main.cpp b/src/main.cpp
index 973803aba..62dba3fcc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,6 +34,7 @@
#ifndef DISABLE_GUI
#include
+#include
#include
#include
#include "qgnomelook.h"
@@ -49,6 +50,8 @@
#include "ico.h"
#else
#include
+#include
+#include
#include "headlessloader.h"
#endif
@@ -73,7 +76,7 @@ QApplication *app;
#endif
class UsageDisplay: public QObject {
- Q_OBJECT
+ Q_OBJECT
public:
static void displayUsage(char* prg_name) {
@@ -88,6 +91,39 @@ public:
}
};
+class LegalNotice: public QObject {
+ Q_OBJECT
+
+public:
+ static bool userAgreesWithNotice() {
+ QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+ if(settings.value(QString::fromUtf8("LegalNotice/Accepted"), false).toBool()) // Already accepted once
+ return true;
+#ifdef DISABLE_GUI
+ std::cout << std::endl << "*** " << tr("Legal Notice").toLocal8Bit().data() << " ***" << std::endl;
+ std::cout << tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by mean of upload. And of course, any content you share if your sole responsatibility.\n\nYou probably knew this, so we won't tell you again.").toLocal8Bit().data() << std::endl << std::endl;
+ std::cout << tr("Press any key to accept and continue...").toLocal8Bit().data() << std::endl;
+ getchar(); // Read pressed key
+ // Save the answer
+ settings.setValue(QString::fromUtf8("LegalNotice/Accepted"), true);
+ return true;
+#else
+ QMessageBox msgBox;
+ msgBox.setText(tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by mean of upload. And of course, any content you share if your sole responsatibility.\n\nYou probably knew this, so we won't tell you again."));
+ msgBox.setWindowTitle(tr("Legal notice"));
+ msgBox.addButton(tr("Cancel"), QMessageBox::RejectRole);
+ QAbstractButton *agree_button =(QAbstractButton*)msgBox.addButton(tr("I Agree"), QMessageBox::AcceptRole);
+ msgBox.exec();
+ if(msgBox.clickedButton() == agree_button) {
+ // Save the answer
+ settings.setValue(QString::fromUtf8("LegalNotice/Accepted"), true);
+ return true;
+ }
+ return false;
+#endif
+ }
+};
+
#include "main.moc"
#ifndef Q_WS_WIN
@@ -262,6 +298,13 @@ int main(int argc, char *argv[]){
}
app->installTranslator(&translator);
app->setApplicationName(QString::fromUtf8("qBittorrent"));
+ if(!LegalNotice::userAgreesWithNotice()) {
+#ifndef DISABLE_GUI
+ delete splash;
+#endif
+ delete app;
+ return 0;
+ }
#ifndef DISABLE_GUI
app->setQuitOnLastWindowClosed(false);
#endif