version 2.5

Merge branch 'master' of git.labolyon.fr:dtux/RsyncUI
corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar
2023-02-22 00:57:07 +01:00 · 2023-02-22 00:53:29 +01:00 · 2023-02-22 00:52:53 +01:00 · 2023-02-22 00:48:16 +01:00 · 2023-02-16 21:33:53 +01:00 · 2023-02-16 21:28:58 +01:00
14 changed files with 764 additions and 234 deletions
--- a/README_FR.md
+++ b/README_FR.md
@ -3,3 +3,45 @@
 client Rsync - QT5 - KDE

 # Compilation:
+
+$ qmake
+$ make
+$ make install
+
+# Lancement
+
+Lancez le programme en cliquant sur l'icone ou en tapant dans un terminal:
+$ RsyncUI
+
+# Utilisation
+
+Entrez le nom du serveur et le numéro port dans les champs de saisie dédiés.(par défaut le port est 873)
+La liste des services s'affiche dans le cadre services, cliquez sur celui que vous voulez consulter.
+La liste des dossiers et des fichiers s'affichent.
+Un clic gauche sur un fichier l'ajoute à la file des téléchargements, sur un dossier, ça l'ouvre.
+Un clic droit sur un dossier ouvre un menu contextuel permettant de télécharger le dossier entier.
+Une notification s'affiche lors du début, de la fin, et lorsque l'on stoppe un téléchargement. 
+Le gadget de fermeture ferme la fenêtre mais ne quitte pas l'application, pour afficher à nouveau la fenêtre, cliquez sur l'icône dans la boite à miniatures.
+
+## File de téléchargement
+
+Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmation apparait.
+
+## Barre d'outils
+
+1er icône: Changer le dossier de destination
+    Permet de changer le dossier de téléchargement par défaut pour chaque service de chaque serveur.
+
+2ème icône: Paramètres de l'application
+ - Limite de bande passante
+    Permet de limiter le débit de téléchargement en Ko, Mo, Go, To et Po.
+    Si la valeur est 0 alors pas de limite de la vitesse de téléchargement.
+ - Affichage de la barre d'outils
+    Permet de choisir le style d'affichage des icônes de la barre d'outils
+ - Enregistrement automatique
+    Enregistre automatiquement la liste des téléchargements en cours.(activé par défaut)
+3ème icône: À propos
+    Affiche les propriétés de l'application.
+4ème icône: À propos de QT   
+5 ème icône: Quitter
+    Permet de quitter le programme.
--- a/RsyncUI.desktop
+++ b/RsyncUI.desktop
@ -6,7 +6,7 @@ Comment=Client for rsync servers
 Comment[fr]=Client pour serveur rsync
 Version=1.0
 Exec=RsyncUI
-Icon=
+Icon=/usr/share/icons/RsyncUI.png
 Type=Application
 Terminal=false
 StartupNotify=true
--- a/RsyncUI.pro
+++ b/RsyncUI.pro
@ -27,6 +27,7 @@ HEADERS += \
    tools.h

 FORMS += \
+    about.ui \
    configuration.ui \
    mainwindow.ui

--- a/RsyncUI.pro.user
+++ b/RsyncUI.pro.user
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-02-10T14:36:52. -->
+<!-- Written by QtCreator 4.14.2, 2023-02-22T00:23:04. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
@ -141,7 +141,7 @@
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
@ -183,7 +183,7 @@
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
--- a/RsyncUI.spec
+++ b/RsyncUI.spec
@ -2,7 +2,7 @@

 Name: rsyncui
 Summary: Client for rsync server
-Version: 1.9.2
+Version: 2.5
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access
--- a/RsyncUI_fr_FR.ts
+++ b/RsyncUI_fr_FR.ts
@ -74,268 +74,356 @@
        <translation>Fenêtre principale</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="83"/>
+        <location filename="mainwindow.ui" line="87"/>
        <source>Server</source>
        <oldsource>Serveur</oldsource>
        <translation>Serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="105"/>
+        <location filename="mainwindow.ui" line="109"/>
        <source>Enter server&apos;s URL</source>
        <translation>Entrez l&apos;adresse du serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="121"/>
+        <location filename="mainwindow.ui" line="125"/>
        <source>Port</source>
        <translation>Port</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="149"/>
+        <location filename="mainwindow.ui" line="153"/>
        <source>Enter rsync port on server</source>
        <translation>Entrez le port du serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="186"/>
+        <location filename="mainwindow.ui" line="190"/>
        <source>Press button to connect to rsync server</source>
        <extracomment>Connect to server</extracomment>
        <translation>Cliquez pour se connecter au serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="192"/>
+        <location filename="mainwindow.ui" line="196"/>
        <source>Connection</source>
        <translation>Connexion</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="195"/>
+        <location filename="mainwindow.ui" line="199"/>
        <source>Return</source>
        <translation>Retour</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="221"/>
+        <location filename="mainwindow.ui" line="225"/>
        <source>Click to view the list of files of this folder</source>
        <translation>Cliquez pour afficher la liste des documents</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="256"/>
+        <location filename="mainwindow.ui" line="260"/>
        <source>Click to add to download queue</source>
        <translation>Cliquez pour ajouter à la file de téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="334"/>
+        <location filename="mainwindow.ui" line="338"/>
        <source>Click on file to stop downloading</source>
        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="357"/>
+        <location filename="mainwindow.ui" line="364"/>
        <source>%p%</source>
        <extracomment>Downloading</extracomment>
        <translation>Téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="368"/>
+        <location filename="mainwindow.ui" line="375"/>
        <source>toolBar</source>
        <translation>Barre d&apos;outils</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="440"/>
+        <location filename="mainwindow.ui" line="448"/>
        <source>Download</source>
        <translation>Télécharger</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="443"/>
+        <location filename="mainwindow.ui" line="451"/>
        <source>Click on menu button to download the entire folder</source>
        <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="405"/>
-        <location filename="mainwindow.ui" line="408"/>
+        <location filename="mainwindow.ui" line="460"/>
+        <source>Exit</source>
+        <translation>Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="463"/>
+        <source>Terminate the program</source>
+        <translation>Terminer le programme</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="466"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="413"/>
+        <location filename="mainwindow.ui" line="416"/>
        <source>Change save folder</source>
        <translation>Changer le dossier de destination</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="425"/>
        <source>About</source>
        <translation>À propos</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="434"/>
        <source>About Qt</source>
        <translation>À propos de Qt</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="443"/>
        <source>Settings</source>
        <translation>Paramètres</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="102"/>
        <source>KB</source>
        <translation>Ko</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="102"/>
        <source>MB</source>
        <translation>Mo</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="102"/>
        <source>GB</source>
        <translation>Go</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="102"/>
        <source>TB</source>
        <translation>To</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="102"/>
        <source>PB</source>
        <translation>Po</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="50"/>
-        <source>Client for rsync server
+        <location filename="mainwindow.cpp" line="57"/>
+        <source>You click on file to enqueue it, and RyncUI Download one file a time</source>
+        <oldsource>Client for rsync server&lt;br&gt;&lt;br&gt;You click on file to enqueue it, and RyncUI Download one file a time</oldsource>
+        <translation>&lt;h3&gt;Utilisation&lt;/h3&gt;
+Entrez le nom du serveur et le numéro du port dans les champs de saisie dédiés.(par défaut le port est 873)
+La liste des services s&apos;affiche dans le cadre services, cliquez sur celui que vous voulez consulter.
+La liste des dossiers et des fichiers s&apos;affichent.
+Un clic gauche sur un fichier l&apos;ajoute à la file des téléchargements, sur un dossier, ça l&apos;ouvre.
+Un clic droit sur un dossier ouvre un menu contextuel permettant de télécharger le dossier entier.
+Une notification s&apos;affiche lors du début, de la fin, et lorsque l&apos;on stoppe un téléchargement.
+Le gadget de fermeture ferme la fenêtre mais ne quitte pas l&apos;application, pour afficher à nouveau la fenêtre, cliquez sur l&apos;icône dans la boite à miniatures.

-You click on file to enqueue it, and RyncUI Download one file a time</source>
-        <translation>Client pour serveur rsync
+&lt;h3&gt;File de téléchargement&lt;/h3&gt;
+Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmation apparait.

-Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement</translation>
+&lt;h3&gt;Barre d&apos;outils&lt;/h3&gt;
+&lt;b&gt;1er icône: Changer le dossier de destination&lt;/b&gt;&lt;br&gt;
+    Permet de changer le dossier de téléchargement par défaut pour chaque service de chaque serveur.&lt;br&gt;
+&lt;b&gt;2ème icône: Paramètres de l&apos;application&lt;/b&gt;&lt;br&gt;
+    Limite de bande passante: permet de limiter le débit de téléchargement en Ko, Mo, Go, To et Po.&lt;br&gt;
+    Si la valeur est 0 alors pas de limite de la vitesse de téléchargement.&lt;br&gt;
+ - Affichage de la barre d&apos;outils&lt;br&gt;
+    Permet de choisir le style d&apos;affichage des icônes de la barre d&apos;outils&lt;br&gt;
+ - Enregistrement automatique&lt;br&gt;
+    Enregistre automatiquement la liste des téléchargements en cours.(activé par défaut)&lt;br&gt;
+&lt;b&gt;3ème icône: À propos&lt;/b&gt;&lt;br&gt;
+    affiche les propriétés de l&apos;application, ainsi que l&apos;aide.&lt;br&gt;
+&lt;b&gt;4ème icône: À propos de QT&lt;/b&gt;&lt;br&gt;
+    affiche les propriétés de QT&lt;br&gt;
+&lt;b&gt;5ème icône: Quitter&lt;/b&gt;&lt;br&gt;
+    Permet de quitter le programme</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="62"/>
+        <source>&lt;h2&gt;Client for rsync server&lt;2&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation type="vanished">&lt;h2&gt;Client pour  serveur rsync&lt;2&gt;&lt;br&gt;&lt;br&gt;éaa</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="73"/>
        <source>Path</source>
        <translation>Chemin</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="62"/>
+        <location filename="mainwindow.cpp" line="73"/>
        <source>Size</source>
        <translation>Taille</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="62"/>
+        <location filename="mainwindow.cpp" line="73"/>
        <source>Type</source>
        <translation>Type</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="92"/>
+        <location filename="mainwindow.cpp" line="117"/>
        <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
        <translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="393"/>
+        <location filename="mainwindow.cpp" line="146"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="203"/>
+        <source>Clicking Save button, You can save the list of downloads
+</source>
+        <translation>Vous pouvez enregistrer la liste des téléchargements en cliquant sur &quot;enregister&quot;
+</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="209"/>
+        <source>Exiting will stop downloading, and will clear the download queue.
+Do you want to exit ?</source>
+        <translation>Si vous sortez, les téléchargements seront arrêter.
+Voulez-vous vraiment sortir ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="247"/>
+        <source>The program will keep running in the system tray. To terminate the program, choose &lt;b&gt;Quit&lt;/b&gt; in the context menu of the system tray entry.</source>
+        <translation>Le programme continue dans la boîte à miniatures. Pour quitter le programme cliquez sur l&apos;icône &lt;b&gt;Quitter&lt;/b&gt; ou dans les menu contextuel.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="540"/>
        <source>server does not exists</source>
        <translation>Le serveur n&apos;existe pas</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="421"/>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="567"/>
+        <location filename="mainwindow.cpp" line="587"/>
        <source>Dir</source>
        <translation>dossier</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="424"/>
-        <location filename="mainwindow.cpp" line="487"/>
+        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="657"/>
        <source>File</source>
        <translation>Doc</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="561"/>
+        <location filename="mainwindow.cpp" line="668"/>
+        <source>File is partially downloaded. Do you want to resume download ? if no, the file will be deleted from destination directory</source>
+        <translation>Le document est déjà partiellement téléchargé. Voulez vous continuer le téléchargemnt ? Si non, il sera supprimer du dossier de destination</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="685"/>
+        <source>File is already downloaded. Do you want to reload it ? The old file will be deleted</source>
+        <translation>Le document est déjà téléchargé. Voulez-vous le télécharger à nouveau ? L&apos;ancien fichier sera effacé</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="722"/>
+        <source>File is already downloading</source>
+        <translation>Le document est déjà en téléchargement</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="745"/>
+        <source>Starting downloading
+</source>
+        <translation>Démarrage du téléchargement
+</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="760"/>
+        <source>finished</source>
+        <translation>Terminé</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="768"/>
        <source>Rsync process crashed</source>
        <translation>Le processus rsync à planté</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="699"/>
+        <location filename="mainwindow.cpp" line="780"/>
+        <source>stopped by user</source>
+        <translation>stoppé par l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="784"/>
+        <source>Download </source>
+        <translation>Téléchargement </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="52"/>
        <source>Version</source>
        <translation>Version</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="700"/>
+        <location filename="mainwindow.cpp" line="51"/>
+        <source>&lt;h2&gt;Client for rsync server&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;Client pour serveur rsync&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="53"/>
        <source>Licence</source>
        <translation>License</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="701"/>
+        <location filename="mainwindow.cpp" line="54"/>
        <source>Author</source>
        <translation>Auteur</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="702"/>
+        <location filename="mainwindow.cpp" line="55"/>
        <source>EMail</source>
        <translation>Courriel</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="703"/>
+        <location filename="mainwindow.cpp" line="56"/>
        <source>Source code</source>
        <translation>Code source</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="725"/>
+        <location filename="mainwindow.cpp" line="955"/>
        <source>Since the save path is linked to service, you need to select a service before you can select a folder</source>
        <translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="728"/>
+        <location filename="mainwindow.cpp" line="960"/>
        <source>Choose folder where to save file</source>
        <translation>Choisissez un dossier où enregistrer le document</translation>
    </message>
    <message>
-        <source>Choose directory to save file</source>
-        <translation type="vanished">Choisissez le dossier où enregistrer</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="620"/>
+        <location filename="mainwindow.cpp" line="851"/>
        <source>Do you want to stop downloading and delete this file from download queue ?</source>
        <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
    </message>
    <message>
-        <source>A list of interrupted downloads exists, do you want to continue downloading ? or you can delete the list</source>
-        <translation type="vanished">Voulez-vous reprendre les téléchargements interrompus la fois précédente? ou vous pouvez supprimer la liste</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="vanished">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="135"/>
-        <source>Exiting will stop downloading, and will clear the download queue.
-You can save the list of downloads
-Do you want to exit ?</source>
-        <translatorcomment>i</translatorcomment>
-        <translation>Si vous sortez, les téléchargements seront arrêter, mais vous pouvez enregistrer la liste pour la prochaine fois.
-Voulez-vous vraiment sortir ?</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="632"/>
+        <location filename="mainwindow.cpp" line="865"/>
        <source>Do you want to delete this file from download queue ?</source>
        <translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="118"/>
+        <location filename="mainwindow.h" line="128"/>
        <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program.</source>
        <translation>Le processus échoué, soit le programme est manquant, soit vous n&apos;avez pas l&apos;autorisation de l&apos;exécuter.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="119"/>
+        <location filename="mainwindow.h" line="129"/>
        <source>The process crashed some time after starting successfully.</source>
        <translation>Le processus à planté après avoir démarré avec succès.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="120"/>
+        <location filename="mainwindow.h" line="130"/>
        <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
        <translation>La fonction waitFor...() a dépassé la limite de temps, you pouvez essayer de la relancer.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="121"/>
+        <location filename="mainwindow.h" line="131"/>
        <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
        <translation>Une erreur est survenue lors de l&apos;envoi des données vers le processus. Le processus est peut être arrté ou il a fermé son canal d&apos;entrée.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="122"/>
+        <location filename="mainwindow.h" line="132"/>
        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
        <translation>Une erreur est survenue lors de la lecturee de données, le processus est probablement arrêté.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="123"/>
+        <location filename="mainwindow.h" line="133"/>
        <source>An unknown error occurred. This is the default return value of error().</source>
        <translation>Une erreur inconnue est survenue. C&apos;est la valeur de retour par défaut de error().</translation>
    </message>
@ -428,4 +516,12 @@ Voulez-vous vraiment sortir ?</translation>
        <translation>Transfert partiel dû à la disparition des fichiers source. Des fichiers source ont disparu avec d&apos;avoir été transférés.</translation>
    </message>
 </context>
+<context>
+    <name>windowAbout</name>
+    <message>
+        <location filename="about.ui" line="23"/>
+        <source>About RsyncUI</source>
+        <translation>À propos de RsyncUI</translation>
+    </message>
+</context>
 </TS>
--- a/about.ui
+++ b/about.ui
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>windowAbout</class>
+ <widget class="QWidget" name="windowAbout">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>387</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>About RsyncUI</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>../../../../usr/share/icons/RsyncUI.png</normaloff>../../../../usr/share/icons/RsyncUI.png</iconset>
+  </property>
+  <property name="autoFillBackground">
+   <bool>true</bool>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetNoConstraint</enum>
+     </property>
+     <item>
+      <widget class="QTextEdit" name="TextAbout">
+       <property name="autoFormatting">
+        <set>QTextEdit::AutoAll</set>
+       </property>
+       <property name="undoRedoEnabled">
+        <bool>false</bool>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/downloadfile.cpp
+++ b/downloadfile.cpp
@ -27,7 +27,14 @@ downloadFile::downloadFile()
 //Slot activated when download is cancelled
 void MainWindow::cancelled(QProcess * process)
 {
+    bool n = 0;
+
    process->terminate();
+    n = process->waitForFinished(30000);
+    if (n == false)
+    {
+        process->kill();
+    }
 }

 // launch a rsync processus downloading a file
@ -42,7 +49,7 @@ void MainWindow::download()
    {
        param << "--bwlimit=" + QString::number(this->connexion.bandwidthLimit) + bwUnitChar[this->connexion.bandwidthLimitUnit];
    }
-    param << "--port=" + QString::number(this->connexion.port);
+    param << "--port=" + QString::number(this->downloading.port);
    param << "-aXP";
    param << this->downloading.server + "::" + this->downloading.service + "/" + this->downloading.path << this->downloading.savePath + "/";

@ -62,26 +69,50 @@ void MainWindow::readRsyncOutput()
    bool flag = false;
    int value;
    int pos;
+    static QString dlSpeed;
+    QStringList list;
+    static QString filename;
+    int i;
+    int listSize;

    while(!flag)
    {
+        list.clear();
        line = QString::fromUtf8(this->downloading.process->readLine());
        if (line.isEmpty())
        {
            flag = true;
            break;
-        }
+        }else
+        {
            pos = line.indexOf("%");
            if (pos != -1)
            {
-            line.resize(pos);
+                line = line.simplified();
+                list = line.split(" ");
+                listSize = list.count() / 4;
+                for (i = 0; i < listSize; i++)
+                {
+                    value = list.at(i *4 + 1).chopped(1).toInt();
+                    dlSpeed = list.at(i * 4 + 2);
+
+                    /*line.resize(pos);
                    pos = line.lastIndexOf(' ');
                    if (pos != -1)
                    {
                        line.remove(0, pos);
-                value = line.toInt();
+                        value = line.toInt();*/
                        // sending progress to Main window
                    emit progressSignal(value);
+                    emit fileName(filename + "   %p%" + "\t " + dlSpeed);
+                }
+            }else
+            {
+                if (!line.contains("receiving"))
+                {
+                    filename = line.remove(QChar('\n'), Qt::CaseInsensitive);
+                    emit fileName(filename + "   %p%\t " + dlSpeed);
+                }
            }
        }
    }
@ -96,6 +127,7 @@ void MainWindow::readRsyncOutput()
            );
 }*/

+// process raise error
 void MainWindow::downloadProcessStderr()
 {
    QByteArray errorLine;
--- a/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
+++ b/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
--- a/main.cpp
+++ b/main.cpp
@ -9,15 +9,20 @@ int main(int argc, char *argv[])

    QCoreApplication::setOrganizationName("RsyncUI");
    QCoreApplication::setApplicationName("RsyncUI");
+
    // Initialization of localization
    QLocale localeName = QLocale::system();
-    QString localeFile = "/usr/share/locale/" + localeName.name()  + "/LC_MESSAGES/RsyncUI_" + localeName.name() + ".qm";
-    if (myappTranslator.load(localeFile))
+    QString localeDir = "/usr/share/locale/" + localeName.name()  + "/LC_MESSAGES/"; //RsyncUI_" + localeName.name() + ".qm";
+    QString localeFilename = QCoreApplication::applicationName() + "_" + localeName.name();
+    QLocale locale = QLocale();
+
+    if (myappTranslator.load(localeFilename, localeDir))
    {
          a.installTranslator(&myappTranslator);
    }

    MainWindow w;
    w.show();
+    w.init();
    return a.exec();
 }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@ -33,45 +33,47 @@ MainWindow::MainWindow(QWidget *parent)
    : QMainWindow(parent)
    , ui(new Ui::MainWindow)
 {
-    QAbstractButton * reply;
-    QMessageBox msgBox;
    ui->setupUi(this);

    QCoreApplication::setOrganizationName("RsyncUI");
    QCoreApplication::setApplicationName("RsyncUI");

-    // context menu for treewidget
+    // context menu for treewidget (list of files)
    ui->treeWidget->addAction(ui->actionDownload);

-    // init shortcut
+    // init configuration window
    config.setupUi(&Configuration);

-    // init of About
-    this->about.description = tr("Client for rsync server\n\nYou click on file to enqueue it, and RyncUI Download one file a time");
+    // init about window
+    AboutW.setupUi(&aboutDialog);
+
+    // text of About
+    QString aboutText = tr("<h2>Client for rsync server</h2>") +
+                        "<b>" + tr("Version") + ":     " + this->about.version + "</b><br>" +
+                        "<b>" + tr("Licence") + ":     " + this->about.licence + "</b><br>" +
+                        "<b>" + tr("Author") + ":      " + this->about.author + "</b><br>" +
+                        "<b>" + tr("EMail") + ":      " + this->about.email + "</b><br>" +
+                        "<b>" + tr("Source code") + ": " + this->about.git + "</b><br>" +
+                        tr("You click on file to enqueue it, and RyncUI Download one file a time");
+
+    AboutW.TextAbout->setHtml(aboutText);

    // connectors
+    connect(this, &MainWindow::fileName, ui->progressBar, &QProgressBar::setFormat);
    connect(this, &MainWindow::progressSignal, ui->progressBar, &QProgressBar::setValue);
+    //connect(this, &MainWindow::speed, ui->progressBar, &MainWindow::setDlSpeed);
    //connect(this, &MainWindow::errorSignal, this, &MainWindow::downloadingErrorSlot);
    connect(this, &MainWindow::stopDownloading, this, &MainWindow::cancelled);
    connect(config.buttonBox, SIGNAL(accepted()), this, SLOT(on_buttonBox_accepted()));
    connect(config.comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged);

    // init of widgets
-    ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget);
-    ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive);
-    ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size")} );
+    ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget);               // attach search widget to treewidget
+    ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive);     // and set it case insensitive
+    ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size")} ); // set header of columns of tree widget

-    if (this->settings.contains("connexion/lastServer"))
-    {
-        ui->portEdit->setText(this->settings.value("connexion/port").toString());
-        ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
-    }else
-    {
-        ui->portEdit->text() = QString::number(this->connexion.port);
-        ui->khistorycombobox->clear();
-    }

-    // setting arrowcursor for treeWidget, listWidget and listDownload
+    // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
    ui->treeWidget->setCursor(Qt::ArrowCursor);
    ui->listWidget->setCursor(Qt::ArrowCursor);
    ui->listDownload->setCursor(Qt::ArrowCursor);
@ -81,42 +83,112 @@ MainWindow::MainWindow(QWidget *parent)

    loadSettings();

+    // if last server exists in settings
+    if (this->settings.contains("connexion/lastServer"))
+    {
+        // set window to precedent server/port configuration
+        ui->portEdit->setText(this->settings.value("connexion/port").toString());
+        ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
+    }else
+    {
+        ui->portEdit->setText(QString::number(this->connexion.port));
+        ui->khistorycombobox->clear();
+    }
+
    //setting configuration window
-    config.comboBox->setCurrentIndex(ui->toolBar->toolButtonStyle());
+    config.comboBox->setCurrentIndex(ui->toolBar->toolButtonStyle());       // setting combobox to saved settings
+
+    //setting unit of bandwidth limit
    config.UnitCombobox->addItems({tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB")});

+    initSystemTrayIcon();
+}
+
+void MainWindow::init()
+{
+    QAbstractButton * reply;
+    QMessageBox msgBox;
+
+    //if exists list of donwloads in saved settings
    if (this->settings.value("Downloads/rows").toInt() != 0)
    {
-        //this->settings.endArray();
+        // asking if we load the list and continue downloading
        msgBox.setWindowTitle("RsyncUI");
        msgBox.setInformativeText(tr("A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared" ));

-        //QPushButton *remove = msgBox.addButton(tr("Remove"), QMessageBox::ActionRole);
        QPushButton *yes = msgBox.addButton(QMessageBox::Yes);
-
        msgBox.addButton(QMessageBox::No);
        msgBox.setDefaultButton(QMessageBox::Yes);

        msgBox.exec();
        reply = msgBox.clickedButton();
+
+        // if response is yes then loading list
        if(reply == yes)
        {
            loadDownloadList();
        }
    }
+    // load list of services
    populateList();
 }

+void MainWindow::initSystemTrayIcon()
+{
+    QMenu *trayIconMenu;
+    QAction * quitAction;
+    QIcon icon;
+
+    icon.addFile(this->icon);
+    this->trayIcon = new QSystemTrayIcon;
+    this->trayIcon->setIcon(icon);
+
+    quitAction = new QAction(tr("&Quit"), this);
+    connect(quitAction, &QAction::triggered, this, &MainWindow::quitApp);
+
+    trayIconMenu = new QMenu(this);
+    trayIconMenu->addAction(quitAction);
+    trayIcon->setContextMenu(trayIconMenu);
+
+    connect(this->trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(on_trayIcon_clicked(QSystemTrayIcon::ActivationReason)));
+    this->trayIcon->show();
+}
+
+void MainWindow::on_trayIcon_clicked(QSystemTrayIcon::ActivationReason reason)
+{
+    if (reason == QSystemTrayIcon::Trigger)
+    {
+        if (this->isHidden())
+        {
+            this->show();
+        }else
+        {
+            this->hide();
+        }
+    }
+}
+
+void MainWindow::hideWindow()
+{
+    this->hide();
+}
+
+void MainWindow::showWindow()
+{
+    this->show();
+}
+
 MainWindow::~MainWindow()
 {
    delete ui;
+    QCoreApplication::quit();
 }

-// Closing window has been clicked
-void MainWindow::closeEvent (QCloseEvent *event)
+void MainWindow::quitApp()
 {
    QMessageBox::StandardButton reply;
    QMessageBox::StandardButtons param;
+    QString displayText;

    // saving settings
    saveSettings();
@ -128,34 +200,78 @@ void MainWindow::closeEvent (QCloseEvent *event)
        if (config.autosaveCheckbox->checkState() != Qt::Checked)
        {
            param |= QMessageBox::Save;
+            displayText = tr("Clicking Save button, You can save the list of downloads\n");
        }
+
        reply = QMessageBox::question(
                this,
                "RsyncUI",
-                tr("Exiting will stop downloading, and will clear the download queue.\nYou can save the list of downloads\nDo you want to exit ?"),
+                tr("Exiting will stop downloading, and will clear the download queue.\nDo you want to exit ?") + displayText,
                param,
                QMessageBox::No);
-        if (reply == QMessageBox::No)
+        this->downloading.quit = true;
+        if(reply == QMessageBox::Yes)
        {
-            // continuing
-            event->ignore();
-            return;
-        }else if(reply == QMessageBox::Yes)
+            if (this->downloading.process->state() != QProcess::NotRunning)
            {
                // emission of signal to downloading thread and stopping
                emit (stopDownloading(this->downloading.process));
-        }else
+            }
+        }else if (reply == QMessageBox::Save)
        {
-            saveDownloadList();
+            if (config.autosaveCheckbox->checkState() == Qt::Unchecked)
+            {
+
+                //saveDownloadList();
+                emit (stopDownloading(this->downloading.process));
+            }
+        }else if (reply == QMessageBox::No)
+        {
+            return;
        }
    }
-    event->accept();
+    QCoreApplication::quit();
+}
+
+// Close window has been clicked
+void MainWindow::closeEvent (QCloseEvent *event)
+{
+    QMessageBox msgBox;
+    QCheckBox *cb = new QCheckBox("Don't show this again ?");
+
+    if (!event->spontaneous() || !isVisible())
+           return;
+        if (trayIcon->isVisible() and this->settings.value("CloseCheckbox").toBool() == false)
+        {
+            msgBox.setWindowTitle("RsyncUI");
+            msgBox.setInformativeText(tr("The program will keep running in the "
+                                       "system tray. To terminate the program, "
+                                       "choose <b>Quit</b> in the context menu "
+                                       "of the system tray entry."));
+
+            msgBox.addButton(QMessageBox::Ok);
+            //msgBox.addButton(QMessageBox::No);
+            // msgBox.setDefaultButton(QMessageBox::Yes);
+            msgBox.setCheckBox(cb);
+            msgBox.exec();
+            msgBox.clickedButton();
+
+            // if response is yes then loading list
+            if (cb->isChecked())
+            {
+                this->settings.setValue("CloseCheckbox", true);
+            }
+            hide();
+
+
+            //event->accept();
+            event->ignore();
+       }
 }

 // Populate treeview with list of files
 void MainWindow::populateTree(QTreeWidgetItem * parent)
 {
-    stringstream ss;
    QString path;

    // Clear treewidget
@ -165,6 +281,7 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
        // setting cursor to "Wait"
        QGuiApplication::setOverrideCursor(Qt::WaitCursor);

+        // validating server's address
        if (validateServer(this->connexion.server))
        {
            // server is validated
@ -179,8 +296,6 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
 // Populate Listview with list of services
 void MainWindow::populateList()
 {
-    //stringstream ss;
-    QString str;
    QString server;
    int port;

@ -190,9 +305,11 @@ void MainWindow::populateList()
    {
        // clearing listwidget
        ui->listWidget->clear();
+
        this->connexion.server = server;
        this->connexion.port = port;

+        // setting cursor to "Wait"
        QGuiApplication::setOverrideCursor(Qt::WaitCursor);

        // verify if server is in history
@ -203,6 +320,8 @@ void MainWindow::populateList()
            port = this->settings.value(server).toUInt();
            ui->portEdit->setText(QString::number(port));
            this->connexion.port = port;
+
+            //display list of services
            listServices();
        }else
        {
@ -211,6 +330,7 @@ void MainWindow::populateList()
                if (validateServer(server))
                {
                    cout << server.toStdString() << endl;
+
                    // storing serverURL and port in settings
                    this->settings.setValue(server, port);
                    this->settings.sync();
@ -219,14 +339,13 @@ void MainWindow::populateList()
                    // storing in history of combobox
                    ui->khistorycombobox->addToHistory(server);

-                    // "waiting" cursor
                    // load and display rsync services of the rsync server
                    listServices();
                }
            }
        }
        this->settings.endGroup();
-        QGuiApplication::restoreOverrideCursor();  //setOverrideCursor(Qt::ArrowCursor);
+        QGuiApplication::restoreOverrideCursor();  //setting cursor to default
    }
 }

@ -247,26 +366,32 @@ void MainWindow::listServices()
    myProcess = new QProcess(this);
    myProcess->start(cmd, param);

+    // waiting for response of the server with a timeout of 10 seconds
    while(myProcess->waitForReadyRead(10000))
    {
        while(!flag)
        {
            line = QString::fromUtf8(myProcess->readLine());
+            // line empty then buffer is empty so returning to wait new datas
            if (line.isEmpty())
            {
                flag = true;
                break;
            }
+            // extracting name and comment of the service
            v = line.split("\t");
            v[0].replace(" ", "");
            v[1].replace("\n", "");
            service = v[0] + "\n\t" + v[1];

+            // adding to list of services
            ui->listWidget->addItem(service);
        }
+        // buffer empty go to waiting new datas
        flag =false;
    }

+    // verifying error code
    testRsyncReturn(myProcess);
 }

@ -276,31 +401,38 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
    QString cmd;
    QStringList param;
    QString line;
-    QString errorRsync;
    QString size;
    QString filename;
-    QString dir;
-    QTreeWidgetItem * item;
    QProcess * myProcess;
    bool isDir = false;
    bool flag = false;
+    int nChild = 0;

+    if (parent != NULL)
+    {
+        nChild = parent->childCount();
+    }
+    if (nChild == 0)
+    {
        cmd = "rsync";
        param << "--contimeout=10" << "--port=" + QString::number(portN) << server + "::" + path;

        myProcess = new QProcess(this);
        myProcess->start(cmd, param);

+        // waiting for responsiteme of the server with a timeout of 10 seconds
        while(myProcess->waitForReadyRead(100000))
        {
            while (!flag)
            {
                line = QString::fromUtf8(myProcess->readLine());
+                // line empty then buffer is empty so returning to wait new datas
                if (line.isEmpty())
                {
                    flag = true;
                    break;
                }
+                // extracting name, size and is dir/file
                line = line.simplified();
                size = line.section(" ", 1, 1);
                filename = line.section(" ", 4);
@ -315,25 +447,28 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
                    }
                    if (parent != NULL)
                    {
-                    item = addTreeChild(parent, filename, size, isDir);
+                        //adding item to tree
+                        addTreeChild(parent, filename, size, isDir);
                    }else
                    {
-                    item = addTreeRoot(filename, size, isDir);
+                        //adding item to tree (as directory)
+                        addTreeRoot(filename, size, isDir);
                    }
                }
            }
-        flag = false;
-    }

+            flag = false;
+        }
+        // buffer empty go to waiting new datas
        testRsyncReturn(myProcess);
    }
+}

 // Verify if server address is IP address
 bool MainWindow::isIpAddress(QString server)
 {
    QStringList r;
    int elementN;
-    QString qr;
    bool ok;

    r = server.split('.');
@ -360,9 +495,9 @@ bool MainWindow::validateServer(QString server)
    QString cmd;
    QStringList param;
    QString line;
-    QString errorDig;
    QProcess * myProcess;
    bool flag = false;
+    bool bflag = false;

    cmd = "dig";
    param << server;
@ -370,23 +505,35 @@ bool MainWindow::validateServer(QString server)
    myProcess = new QProcess(this);
    myProcess->start(cmd, param);

+    // maiking a dig on the server's address
    while(myProcess->waitForReadyRead())
+    {
+        while (!bflag)
        {
            line = QString::fromUtf8(myProcess->readAllStandardOutput());
-        if (line.indexOf(";; ANSWER SECTION:") != -1)
+            // line empty then buffer is empty so returning to wait new datas
+            if (line.isEmpty())
+            {
+                bflag = true;
+                break;
+            }else if (line.indexOf(";; ANSWER SECTION:") != -1)
            {
                flag = true;
            }
        }
+        bflag = false;
+    }

    //testRsyncReturn(myProcess);

    if ( flag == false)
    {
+        //server's address is not valid testing if ip address is valid
        flag = isIpAddress(server);
    }
    if ( flag == false)
    {
+        // server-s address not valid
        QMessageBox::warning(
            this,
            "RsyncUI",
@ -412,15 +559,15 @@ void MainWindow::on_connectButton_clicked()
 // add a dir in treeview
 QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir)
 {
-    // QTreeWidgetItem(QTreeWidget * parent, int type = Type)
    QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget);

-    // QTreeWidgetItem::setText(int column, const QString & text)
    if (isDir == true)
    {
+        // item is a dir
        treeItem->setText(1, tr("Dir"));
    }else
    {
+        // item is a file
        treeItem->setText(1,tr("File"));
    }
    treeItem->setText(0, name);
@ -432,15 +579,15 @@ QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool i
 // add a file in treeview
 QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir)
 {
-    // QTreeWidgetItem(QTreeWidget * parent, int type = Type)
    QTreeWidgetItem *treeItem = new QTreeWidgetItem();

-    // QTreeWidgetItem::setText(int column, const QString & text)
    if (isDir == true)
    {
+        // item is a dir
        treeItem->setText(1, tr("Dir"));
    }else
    {
+        // item is a file
        treeItem->setText(1,("File"));
    }
    treeItem->setText(0, name);
@ -454,13 +601,14 @@ QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name
 // Slot acivated when a service in the list is clicked
 void MainWindow::on_listWidget_clicked()
 {
-    QString service;
    QString str;

    this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0);
    str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
+    // if service exists in settings for this server
    if (this->settings.contains(str))
    {
+        // setting savePath from settings
        this->downloading.savePath = this->settings.value(str).toString();
    }
    populateTree(NULL);
@ -474,24 +622,16 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
    QTreeWidgetItem * itemR;
    QString path;
    QString str;
+    QMessageBox::StandardButton reply;
+    int sizeFromRsync;

    itemR = item;

+    // assembling path from treewidget
    path = item->text(0);
-    while(itemR->parent() != NULL)
-    {
-        itemR = itemR->parent();
-        path = itemR->text(0) + "/" + path;
-    };

-    if (item->text(1) == tr("File") or downloadDir == true)
-    {
-        // Item is a file
-
-        if(ui->listDownload->findItems(path, Qt::MatchStartsWith).empty())
-        {
    // exists saving path in settings ?
-            str = "Folder/" + this->connexion.server + "/" + this->downloading.service;
+    str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
    if(!this->settings.contains(str))
    {
        // saving path do not exists, asking for it
@ -500,23 +640,87 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
            cout << "no directory selectioned, ignoring download request";
            return;
        }
+    }else
+    {
+        this->downloading.savePath = this->settings.value(str).toString();
    }

+
+    while(itemR->parent() != NULL)
+    {
+        itemR = itemR->parent();
+        // concatening parent to path
+        path.prepend(itemR->text(0) + "/");
+        sizeFromRsync = itemR->text(1).toUInt();
+    };
+    QFileInfo info(path);
+    if (item->text(1) == tr("File") or downloadDir == true)
+    {
+        // Item is a file
+        // searching if file exists in savepath
+        if (QFile::exists(this->downloading.savePath + "/" + path))
+        {
+            if (info.size() >= sizeFromRsync)
+            {
+                reply = QMessageBox::question(
+                        this,
+                        "RsyncUI",
+                        tr("File is partially downloaded. Do you want to resume download ? if no, the file will be deleted from destination directory"),
+                        QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,
+                        QMessageBox::Cancel);
+
+                if (reply == QMessageBox::Cancel)
+                {
+                    return;
+                }else if(reply == QMessageBox::No)
+                {
+                    QFile::remove(this->downloading.savePath + "/" + path);
+                    return;
+                }
+            }else
+            {
+                reply = QMessageBox::question(
+                        this,
+                        "RsyncUI",
+                        tr("File is already downloaded. Do you want to reload it ? The old file will be deleted"),
+                        QMessageBox::Yes|QMessageBox::No,
+                        QMessageBox::No);
+
+                if (reply == QMessageBox::No)
+                {
+                    return;
+                }else
+                {
+                    QFile::remove(this->downloading.savePath + "/" + path);
+                }
+            }
+        }
+
+        if(ui->listDownload->findItems(path, Qt::MatchStartsWith).empty())
+        {
            // is there a downloading process ?
            if (this->downloading.process == nullptr)
            {
                // no downloading process launching it
                this->downloading.path = path;
                this->downloading.server = this->connexion.server;
+                this->downloading.port = this->connexion.port;
                this->downloading.service = this->connexion.service;
                startDownloading();
-                // wit 1 second to process start
+                // wait 1 second to process start
                //sleep(1);
            }

            // Adding download in download list
            str = path + " => " + this->connexion.server + "/" + this->connexion.service;
            ui->listDownload->addItem(str);
+        }else
+        {
+            QMessageBox::warning(
+                this,
+                "RsyncUI",
+                tr("File is already downloading" )
+            );
        }
    }else
    {
@ -537,7 +741,8 @@ void MainWindow::startDownloading()
    ui->progressBar->show();

    //QtConcurrent::run(&this->downloadO, &downloadFile::download, this);
-    download();
+    this->download();
+    this->trayIcon->showMessage("RsyncUI", tr("Starting downloading\n") + this->downloading.path, QSystemTrayIcon::Information);
 }

 // Slot stopping download
@ -550,9 +755,11 @@ void MainWindow::stoppingDownload()
 void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
    QString path;
-    int pos;
    QString str;
+    int pos;
+    QString aborted = tr("finished");

+    // test if process crashed
    if (exitStatus == QProcess::CrashExit)
    {
        QMessageBox::warning(
@ -560,25 +767,42 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
            "RsyncUI",
            tr("Rsync process crashed"));
    }
+    //test result code of command (if 20 then command stopped by user)
    if (exitCode != 0 and exitCode != 20)
    {
+        // displaying warning with exit code
        QMessageBox::warning(
            NULL,
            "RsyncUI",
            rsyncErrorStrings[exitCode]);
+    }else if (exitCode == 20)
+    {
+        aborted = tr("stopped by user");
    }

+
+    this->trayIcon->showMessage("RsyncUI", tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information);
+
+    // disconnecting signals to slots
    disconnect(this->downloading.process, 0, 0, 0);
+
+    // reset variables and window
    this->downloading.process = nullptr;
    ui->progressBar->hide();
    delete ui->listDownload->takeItem(0);
    this->downloading.clear();
+
+    // Some downloads staying in queue
    if (ui->listDownload->count() != 0)
    {
-        if (config.autosaveCheckbox->checkState() == Qt::Checked)
+        // autosave is activated
+        /*if (config.autosaveCheckbox->checkState() == Qt::Checked)
        {
+            // saving download list
            saveDownloadList();
-        }
+        }*/
+
+        // initializing download
        path = ui->listDownload->item(0)->text();
        pos = path.lastIndexOf("/");
        this->downloading.service = path.midRef(pos+1).toString();
@ -587,12 +811,17 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
        this->downloading.server = path.midRef(pos+4).toString();
        path.resize(pos);
        this->downloading.path = path;
+
+        // savepath exists in settings ?
        str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
        if (this->settings.contains(str))
        {
+            // setting savepath from saved settings
            this->downloading.savePath = this->settings.value(str).toString();
+            startDownloading();
        }else
        {
+            // no save path
            if(!on_DefaultSaveFolder_triggered())
            {
                cout << "Error no save path so deleting download";
@ -600,7 +829,10 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
                return;
            }
        }
-        startDownloading();
+    }
+    if(config.autosaveCheckbox->checkState() == Qt::Checked and this->downloading.quit == false)
+    {
+        saveDownloadList();
    }
 }

@ -608,12 +840,11 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
 // Slot activated when a line is clicked in queue list
 void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
 {
-    QFileDialog dialog;
    QMessageBox::StandardButton reply;

-    //cout << item->text().toStdString() << endl;
    if (item->listWidget()->row(item) == 0)
    {
+        // first line clicked on download list
        reply = QMessageBox::question(
                this,
                "RsyncUI",
@ -622,10 +853,12 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
                QMessageBox::No);
        if (reply == QMessageBox::Yes)
        {
+            // stopping download
            emit (stopDownloading(this->downloading.process));
        }
    }else
    {
+        // not first line on download list
        reply = QMessageBox::question(
                this,
                "RsyncUI",
@ -634,15 +867,18 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
                QMessageBox::No);
        if (reply == QMessageBox::Yes)
        {
+            // removing line from download list
            ui->listDownload->removeItemWidget(item);
            delete item;
+
+        }
+    }
    if (config.autosaveCheckbox->checkState() == Qt::Checked)
    {
+        // autosave acivated,so saving download list
        saveDownloadList();
    }
 }
-    }
-}

 // load settings
 void MainWindow::loadSettings()
@ -694,14 +930,7 @@ void MainWindow::saveSettings()
 // About
 void MainWindow::on_actionAbout_triggered()
 {
-    //TODO => initialisation
-    QString text =  this->about.description + "\n\n" +
-                    tr("Version") + ":     " + this->about.version + "\n" +
-                    tr("Licence") + ":     " + this->about.licence + "\n" +
-                    tr("Author") + ":      " + this->about.author + "\n" +
-                    tr("EMail") + ":      " + this->about.email + "\n" +
-                    tr("Source code") + ": " + this->about.git;
-    QMessageBox::about(this, this->about.title, text);
+    aboutDialog.show();
 }

 // About QT
@ -717,6 +946,7 @@ bool MainWindow::on_DefaultSaveFolder_triggered()
     QString folder;
     QString path;

+     // if service not selected display a message
     if (this->connexion.service.isEmpty())
     {
        QMessageBox::warning(
@ -725,12 +955,15 @@ bool MainWindow::on_DefaultSaveFolder_triggered()
                tr("Since the save path is linked to service, you need to select a service before you can select a folder"));
                return false;
     }
+
+     // Asking for directory to save files
     path =  dialog.getExistingDirectory(this, tr("Choose folder where to save file"), QDir::homePath(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
     if (!path.isEmpty())
     {
        this->downloading.savePath = path;
        if (!this->connexion.service.isEmpty() and !this->connexion.server.isEmpty())
        {
+            // saving save path in settings
            folder = "Folder/" + this->connexion.server + "/" + this->connexion.service;
            this->settings.setValue(folder, this->downloading.savePath);
            this->settings.sync();
@ -759,6 +992,7 @@ void MainWindow::on_buttonBox_accepted()
    bw = config.spinBox->text();
    if (bw.toInt() == 0)
    {
+        // bandwidth = 0
        this->connexion.bandwidthLimit = 0;
        this->connexion.bandwidthLimitUnit = 0;
    }else
@ -780,9 +1014,11 @@ void MainWindow::saveDownloadList()
 {
    int nRows;

+    // remove list of downloads
    this->settings.remove("Downloads/");
+
+    // Saving list of current downloads
    nRows = ui->listDownload->count();
-    //this->settings.beginWriteArray("Downloads/");
    this->settings.beginGroup("Downloads");
    this->settings.setValue("rows", nRows);
    for (int i = 0; i < nRows; i++)
@ -793,12 +1029,14 @@ void MainWindow::saveDownloadList()
    this->settings.sync();
 }

+// Loading download list
 void MainWindow::loadDownloadList()
 {
    QString path;
    QString str;
    int pos;

+    this->settings.sync();
    this->settings.beginGroup("Downloads");
    int size = this->settings.value("rows").toInt();
    for (int i = 0; i < size; ++i)
@ -807,14 +1045,13 @@ void MainWindow::loadDownloadList()
    }
    this->settings.endGroup();

-    this->settings.sync();
-
    path = ui->listDownload->item(0)->text();
    pos = path.lastIndexOf("/");
    this->downloading.service = path.midRef(pos+1).toString();
    path.resize(pos);
    pos = path.lastIndexOf(" => ");
    this->downloading.server = path.midRef(pos+4).toString();
+    this->downloading.port = this->settings.value("connexion/server/" + this->downloading.server).toInt();
    path.resize(pos);
    this->downloading.path = path;
    str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
@ -825,6 +1062,7 @@ void MainWindow::loadDownloadList()
    startDownloading();
 }

+// clear object downloading
 void Downloading::clear()
 {
    this->path.clear();
@ -833,6 +1071,7 @@ void Downloading::clear()
    this->service.clear();
 }

+// Context menu of file list clicked
 void MainWindow::on_actionDownload_triggered()
 {
    // action made in qt-designer and added in init function.
@ -852,7 +1091,18 @@ void MainWindow::on_actionDownload_triggered()
 }
 */

+// Change toolbar style
 void MainWindow::on_comboBox_currentIndexChanged(int index)
 {
    ui->toolBar->setToolButtonStyle((Qt::ToolButtonStyle)index);
 }
+
+void MainWindow::on_actionExit_triggered()
+{
+    quitApp();
+}
+
+void MainWindow::setDlSpeed(QString speed)
+{
+    speed.squeeze();
+}
--- a/mainwindow.h
+++ b/mainwindow.h
@ -4,11 +4,13 @@
 #define QT_USE_FAST_OPERATOR_PLUS
 #include "ui_mainwindow.h"
 #include "ui_configuration.h"
+#include "ui_about.h"
 #include "downloadfile.h"
 #include "tools.h"
 #include <QMainWindow>
 #include <string>
 #include <QTreeWidgetItem>
+#include <QList>
 #include <QListWidgetItem>
 #include <QProgressDialog>
 #include <QSettings>
@ -39,6 +41,9 @@
 #include <QProcess>
 #include <QToolBar>
 #include <QDir>
+#include <QSystemTrayIcon>
+#include <QMenu>
+#include<QTranslator>

 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@ -64,8 +69,9 @@ class Downloading
        QString service;
        QString path;
        QString savePath;
+        int port;
        QProcess * process = nullptr;
-
+        bool quit = false;
        void clear();
 };

@ -73,7 +79,7 @@ class About
 {
    public:
        QString title = "RsyncUI";
-        QString version = "1.9.2";
+        QString version = "2.5";
        QString author = "Daniel TARTAVEL-JEANNOT";
        QString licence = "GPL_V3";
        QString description;
@ -97,7 +103,11 @@ class MainWindow : public QMainWindow
        About about;
        QDialog Configuration;
        Ui::Configuration config;
+        QDialog aboutDialog;
+        Ui::windowAbout AboutW;
        std::vector <QString> serversList;
+        QSystemTrayIcon * trayIcon;
+        QString icon = "/usr/share/icons/RsyncUI.png";
        QList<QString> bwUnitText {
            "KB",
            "MB",
@ -139,6 +149,10 @@ class MainWindow : public QMainWindow
        void saveDownloadList();
        void loadDownloadList();
        void download();
+        void initSystemTrayIcon();
+        void hideWindow();
+        void showWindow();
+        void init();

    private slots:

@ -180,12 +194,21 @@ class MainWindow : public QMainWindow

        void cancelled(QProcess *);

+        void on_trayIcon_clicked(QSystemTrayIcon::ActivationReason reason);
+
+        void quitApp();
+
+        void on_actionExit_triggered();
+
+        void setDlSpeed(QString speed);
+
 signals:
        void stopDownloading(QProcess *);
        void progressSignal(int);
+        void speed(QString);
        void finishedSignal(bool = true);
+        void fileName(QString);
        //void errorSignal(QString);
-
 };

 #endif // MAINWINDOW_H
--- a/mainwindow.ui
+++ b/mainwindow.ui
@ -20,6 +20,10 @@
  <property name="windowTitle">
   <string>MainWindow</string>
  </property>
+  <property name="windowIcon">
+   <iconset theme="/usr/share/icons/RsyncUI.png">
+    <normaloff>.</normaloff>.</iconset>
+  </property>
  <property name="toolButtonStyle">
   <enum>Qt::ToolButtonTextUnderIcon</enum>
  </property>
@ -353,6 +357,9 @@
      <property name="value">
       <number>0</number>
      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
      <property name="format">
       <string extracomment="Downloading">%p%</string>
      </property>
@ -395,6 +402,7 @@
   <addaction name="action_Settings"/>
   <addaction name="actionAbout"/>
   <addaction name="actionAbout_Qt"/>
+   <addaction name="actionExit"/>
  </widget>
  <action name="DefaultSaveFolder">
   <property name="icon">
@ -443,6 +451,21 @@
    <string>Click on menu button to download the entire folder</string>
   </property>
  </action>
+  <action name="actionExit">
+   <property name="icon">
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Exit</string>
+   </property>
+   <property name="toolTip">
+    <string>Terminate the program</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
 </widget>
 <customwidgets>
  <customwidget>
--- a/tools.cpp
+++ b/tools.cpp
@ -43,6 +43,7 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
    return v;
 }

+// test return code of rsync
 bool testRsyncReturn(QProcess * myProcess)
 {
    if (myProcess->exitStatus() != 0)
Author	SHA1	Message	Date
Daniel Tartavel	10060ee2c4	version 2.5	2023-02-22 00:57:07 +01:00
Daniel Tartavel	e14d1539fe	Merge branch 'master' of git.labolyon.fr:dtux/RsyncUI	2023-02-22 00:53:29 +01:00
Daniel Tartavel	a8e888e20d	corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar	2023-02-22 00:52:53 +01:00
Daniel Tartavel	f3c361f155	corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar	2023-02-22 00:48:16 +01:00
Daniel Tartavel	e8743ff802	version 2.4.1	2023-02-16 21:33:53 +01:00
Daniel Tartavel	1145c74440	- resolved regression: no icon on menutray.	2023-02-16 21:28:58 +01:00
Daniel Tartavel	c42baaa2c8	changed qtcreator config	2023-02-15 14:25:21 +01:00
Daniel Tartavel	8419f8ad90	- resolved a bug in filelist: when clicking again on a directory add again files - resolved bug: at startup relaoding download do not start downloading - added downloading filename in progress bar	2023-02-15 13:49:31 +01:00
Daniel Tartavel	623ad81c6b	version 2.4	2023-02-15 13:48:38 +01:00
Daniel Tartavel	7e424a57b5	version 2.3.1	2023-02-13 17:25:31 +01:00
Daniel Tartavel	da94bcb44b	version 2.3	2023-02-13 16:55:13 +01:00
Daniel Tartavel	ca61c6013e	- added help in window About\nchanged About QMessageBox by a window	2023-02-13 16:54:56 +01:00
Daniel Tartavel	d681d65d9c	version 2.2	2023-02-12 19:11:26 +01:00
Daniel Tartavel	65896b087f	-corrected bug in localization	2023-02-12 19:11:06 +01:00
Daniel Tartavel	3e0bd57029	version 2.1.3	2023-02-12 17:56:12 +01:00
Daniel Tartavel	65c0318449	version 2.1.2	2023-02-12 17:50:13 +01:00
Daniel Tartavel	a2d9f93ace	added icon in system tray	2023-02-12 00:37:50 +01:00
Daniel Tartavel	4ead825bad	version 2.1.1	2023-02-11 13:42:46 +01:00
Daniel Tartavel	f73174216a	-corrected bug - added warning when selecting a file which is already in download queue	2023-02-11 13:40:46 +01:00
Daniel Tartavel	0b60543ff3	version 2.1	2023-02-11 01:15:41 +01:00
Daniel Tartavel	d52a0663e5	- added verification of already downloaded files	2023-02-11 01:14:14 +01:00
Daniel Tartavel	a3933ee1c9	version 2.0	2023-02-10 23:28:52 +01:00
Daniel Tartavel	9671a5cea8	completely migrate to QT and some bugs corrected	2023-02-10 23:27:44 +01:00