version 2.5

again files
- resolved bug: at startup relaoding download do not start downloading
- added downloading filename in progress bar

README_FR.md

@@ -2,4 +2,46 @@
 
 client Rsync - QT5 - KDE
 
-#Compilation:
+# 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.

RsyncUI.pro

@@ -27,6 +27,7 @@ HEADERS += \
     tools.h
 
 FORMS += \
+    about.ui \
     configuration.ui \
     mainwindow.ui
 

RsyncUI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-02-11T01:13:28. -->
+<!-- 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">

RsyncUI.spec

@@ -2,7 +2,7 @@
 
 Name: rsyncui
 Summary: Client for rsync server
-Version: 2.1.3
+Version: 2.5
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access

RsyncUI_fr_FR.ts

@@ -74,296 +74,356 @@
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="86"/>
+        <location filename="mainwindow.ui" line="87"/>
         <source>Server</source>
         <oldsource>Serveur</oldsource>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="108"/>
+        <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="124"/>
+        <location filename="mainwindow.ui" line="125"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <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="189"/>
+        <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="195"/>
+        <location filename="mainwindow.ui" line="196"/>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="199"/>
         <source>Return</source>
         <translation>Retour</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <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="259"/>
+        <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="337"/>
+        <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="360"/>
+        <location filename="mainwindow.ui" line="364"/>
         <source>%p%</source>
         <extracomment>Downloading</extracomment>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="375"/>
         <source>toolBar</source>
         <translation>Barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="444"/>
+        <location filename="mainwindow.ui" line="448"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <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="455"/>
+        <location filename="mainwindow.ui" line="460"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="458"/>
+        <location filename="mainwindow.ui" line="463"/>
         <source>Terminate the program</source>
         <translation>Terminer le programme</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="461"/>
+        <location filename="mainwindow.ui" line="466"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
-        <location filename="mainwindow.ui" line="412"/>
+        <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="421"/>
+        <location filename="mainwindow.ui" line="425"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="434"/>
         <source>About Qt</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="439"/>
+        <location filename="mainwindow.ui" line="443"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.cpp" line="102"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.cpp" line="102"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.cpp" line="102"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.cpp" line="102"/>
         <source>TB</source>
         <translation>To</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <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="97"/>
+        <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="125"/>
+        <location filename="mainwindow.cpp" line="146"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
+        <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="187"/>
+        <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="216"/>
+        <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="502"/>
+        <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="529"/>
-        <location filename="mainwindow.cpp" line="549"/>
+        <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="533"/>
-        <location filename="mainwindow.cpp" line="617"/>
+        <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="626"/>
+        <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="661"/>
+        <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="705"/>
+        <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="861"/>
+        <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="862"/>
+        <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="863"/>
+        <location filename="mainwindow.cpp" line="54"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="864"/>
+        <location filename="mainwindow.cpp" line="55"/>
         <source>EMail</source>
         <translation>Courriel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="865"/>
+        <location filename="mainwindow.cpp" line="56"/>
         <source>Source code</source>
         <translation>Code source</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <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="893"/>
+        <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>
-        <location filename="mainwindow.cpp" line="779"/>
+        <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>
-        <location filename="mainwindow.cpp" line="793"/>
+        <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="121"/>
+        <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="122"/>
+        <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="123"/>
+        <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="124"/>
+        <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="125"/>
+        <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="126"/>
+        <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>
@@ -456,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>

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>

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;
-        }
-        pos = line.indexOf("%");
-        if (pos != -1)
+        }else
         {
-            line.resize(pos);
-            pos = line.lastIndexOf(' ');
+            pos = line.indexOf("%");
             if (pos != -1)
             {
-                line.remove(0, pos);
-                value = line.toInt();
-                // sending progress to Main window
-                emit progressSignal(value);
+                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();*/
+                        // 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);
+                }
             }
         }
     }

main.cpp

@@ -12,13 +12,17 @@ int main(int argc, char *argv[])
 
     // 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();
 }

mainwindow.cpp

@@ -33,8 +33,6 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
 {
-    QAbstractButton * reply;
-    QMessageBox msgBox;
     ui->setupUi(this);
 
     QCoreApplication::setOrganizationName("RsyncUI");
@@ -46,11 +44,24 @@ MainWindow::MainWindow(QWidget *parent)
     // 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()));
@@ -61,17 +72,6 @@ MainWindow::MainWindow(QWidget *parent)
     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 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->text() = QString::number(this->connexion.port);
-        ui->khistorycombobox->clear();
-    }
 
     // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
     ui->treeWidget->setCursor(Qt::ArrowCursor);
@@ -83,12 +83,32 @@ 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());       // 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)
     {
@@ -111,16 +131,17 @@ MainWindow::MainWindow(QWidget *parent)
     }
     // load list of services
     populateList();
-    initSystemTrayIcon();
 }
 
 void MainWindow::initSystemTrayIcon()
 {
     QMenu *trayIconMenu;
     QAction * quitAction;
+    QIcon icon;
 
+    icon.addFile(this->icon);
     this->trayIcon = new QSystemTrayIcon;
-    this->trayIcon->setIcon(this->windowIcon());
+    this->trayIcon->setIcon(icon);
 
     quitAction = new QAction(tr("&Quit"), this);
     connect(quitAction, &QAction::triggered, this, &MainWindow::quitApp);
@@ -181,23 +202,34 @@ void MainWindow::quitApp()
             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.\nDo you want to exit ?") + displayText,
                 param,
                 QMessageBox::No);
-
+        this->downloading.quit = true;
         if(reply == QMessageBox::Yes)
         {
-            // emission of signal to downloading thread and stopping
-            emit (stopDownloading(this->downloading.process));
-        }else
+            if (this->downloading.process->state() != QProcess::NotRunning)
+            {
+                // emission of signal to downloading thread and stopping
+                emit (stopDownloading(this->downloading.process));
+            }
+        }else if (reply == QMessageBox::Save)
         {
-            saveDownloadList();
+            if (config.autosaveCheckbox->checkState() == Qt::Unchecked)
+            {
+
+                //saveDownloadList();
+                emit (stopDownloading(this->downloading.process));
+            }
+        }else if (reply == QMessageBox::No)
+        {
+            return;
         }
     }
-    delete ui;
     QCoreApplication::quit();
 }
 
@@ -206,7 +238,6 @@ void MainWindow::closeEvent (QCloseEvent *event)
 {
     QMessageBox msgBox;
     QCheckBox *cb = new QCheckBox("Don't show this again ?");
-    QAbstractButton * reply;
 
     if (!event->spontaneous() || !isVisible())
            return;
@@ -223,7 +254,7 @@ void MainWindow::closeEvent (QCloseEvent *event)
             // msgBox.setDefaultButton(QMessageBox::Yes);
             msgBox.setCheckBox(cb);
             msgBox.exec();
-            reply = msgBox.clickedButton();
+            msgBox.clickedButton();
 
             // if response is yes then loading list
             if (cb->isChecked())
@@ -372,58 +403,65 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
     QString line;
     QString size;
     QString filename;
-    QTreeWidgetItem * item;
     QProcess * myProcess;
     bool isDir = false;
     bool flag = false;
+    int nChild = 0;
 
-    cmd = "rsync";
-    param << "--contimeout=10" << "--port=" + QString::number(portN) << server + "::" + path;
-
-    myProcess = new QProcess(this);
-    myProcess->start(cmd, param);
-
-    // waiting for response of the server with a timeout of 10 seconds
-    while(myProcess->waitForReadyRead(100000))
+    if (parent != NULL)
     {
-        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);
-            if (filename != '.')
-            {
-                if (line[0] == "d")
-                {
-                    isDir = true;
-                }else
-                {
-                    isDir = false;
-                }
-                if (parent != NULL)
-                {
-                    //adding item to tree
-                    item = addTreeChild(parent, filename, size, isDir);
-                }else
-                {
-                    //adding item to tree (as directory)
-                    item = addTreeRoot(filename, size, isDir);
-                }
-            }
-        }
-
-        flag = false;
+        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);
+                if (filename != '.')
+                {
+                    if (line[0] == "d")
+                    {
+                        isDir = true;
+                    }else
+                    {
+                        isDir = false;
+                    }
+                    if (parent != NULL)
+                    {
+                        //adding item to tree
+                        addTreeChild(parent, filename, size, isDir);
+                    }else
+                    {
+                        //adding item to tree (as directory)
+                        addTreeRoot(filename, size, isDir);
+                    }
+                }
+            }
+
+            flag = false;
+        }
+        // buffer empty go to waiting new datas
+        testRsyncReturn(myProcess);
     }
-    // buffer empty go to waiting new datas
-    testRsyncReturn(myProcess);
 }
 
 // Verify if server address is IP address
@@ -585,6 +623,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
     QString path;
     QString str;
     QMessageBox::StandardButton reply;
+    int sizeFromRsync;
 
     itemR = item;
 
@@ -612,27 +651,48 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
         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))
         {
-            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)
+            if (info.size() >= sizeFromRsync)
             {
-                return;
+                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
             {
-                QFile::remove(this->downloading.savePath + "/" + path);
+                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);
+                }
             }
         }
 
@@ -644,6 +704,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
                 // 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();
                 // wait 1 second to process start
@@ -680,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
@@ -695,6 +757,7 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
     QString path;
     QString str;
     int pos;
+    QString aborted = tr("finished");
 
     // test if process crashed
     if (exitStatus == QProcess::CrashExit)
@@ -712,8 +775,14 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
             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);
 
@@ -727,11 +796,11 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
     if (ui->listDownload->count() != 0)
     {
         // autosave is activated
-        if (config.autosaveCheckbox->checkState() == Qt::Checked)
+        /*if (config.autosaveCheckbox->checkState() == Qt::Checked)
         {
             // saving download list
             saveDownloadList();
-        }
+        }*/
 
         // initializing download
         path = ui->listDownload->item(0)->text();
@@ -761,7 +830,10 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
             }
         }
     }
-    saveDownloadList();
+    if(config.autosaveCheckbox->checkState() == Qt::Checked and this->downloading.quit == false)
+    {
+        saveDownloadList();
+    }
 }
 
 
@@ -798,13 +870,14 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
             // removing line from download list
             ui->listDownload->removeItemWidget(item);
             delete item;
-            if (config.autosaveCheckbox->checkState() == Qt::Checked)
-            {
-                // autosave acivated,so saving download list
-                saveDownloadList();
-            }
+
         }
     }
+    if (config.autosaveCheckbox->checkState() == Qt::Checked)
+    {
+        // autosave acivated,so saving download list
+        saveDownloadList();
+    }
 }
 
 // load settings
@@ -857,13 +930,7 @@ void MainWindow::saveSettings()
 // About
 void MainWindow::on_actionAbout_triggered()
 {
-    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
@@ -984,6 +1051,7 @@ void MainWindow::loadDownloadList()
     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;
@@ -1023,7 +1091,7 @@ void MainWindow::on_actionDownload_triggered()
 }
 */
 
-// Chnage toolbar style
+// Change toolbar style
 void MainWindow::on_comboBox_currentIndexChanged(int index)
 {
     ui->toolBar->setToolButtonStyle((Qt::ToolButtonStyle)index);
@@ -1033,3 +1101,8 @@ void MainWindow::on_actionExit_triggered()
 {
     quitApp();
 }
+
+void MainWindow::setDlSpeed(QString speed)
+{
+    speed.squeeze();
+}

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>
@@ -67,8 +69,9 @@ class Downloading
         QString service;
         QString path;
         QString savePath;
+        int port;
         QProcess * process = nullptr;
-
+        bool quit = false;
         void clear();
 };
 
@@ -76,7 +79,7 @@ class About
 {
     public:
         QString title = "RsyncUI";
-        QString version = "2.1.3";
+        QString version = "2.5";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
         QString description;
@@ -100,8 +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",
@@ -146,6 +152,7 @@ class MainWindow : public QMainWindow
         void initSystemTrayIcon();
         void hideWindow();
         void showWindow();
+        void init();
 
     private slots:
 
@@ -193,12 +200,15 @@ class MainWindow : public QMainWindow
 
         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

mainwindow.ui

@@ -21,7 +21,8 @@
    <string>MainWindow</string>
   </property>
   <property name="windowIcon">
-   <iconset theme="/usr/share/icons/RsyncUI.png"/>
+   <iconset theme="/usr/share/icons/RsyncUI.png">
+    <normaloff>.</normaloff>.</iconset>
   </property>
   <property name="toolButtonStyle">
    <enum>Qt::ToolButtonTextUnderIcon</enum>
@@ -356,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>
@@ -449,7 +453,8 @@
   </action>
   <action name="actionExit">
    <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Exit</string>