version 2.9.2

correction bug on detection of already downloaded file

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

@@ -19,14 +19,17 @@ SOURCES += \
     downloadfile.cpp \
     main.cpp \
     mainwindow.cpp \
+    password.cpp \
     tools.cpp
 
 HEADERS += \
     downloadfile.h \
     mainwindow.h \
+    password.h \
     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-12T17:55:57. -->
+<!-- Written by QtCreator 4.14.2, 2023-03-08T15:56:52. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

RsyncUI.spec

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

RsyncUI_fr_FR.ts

@@ -66,6 +66,34 @@
         <translation>Enregistrement automatique de la file d&apos;enregistrement</translation>
     </message>
 </context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="login.ui" line="17"/>
+        <source>RsyncUI request</source>
+        <translation>Requête RsyncUI</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="51"/>
+        <source>Login name</source>
+        <translation>Identifiant</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="79"/>
+        <source>Enter login</source>
+        <translation>Entrez votre identifiant</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="86"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="102"/>
+        <source>Enter password</source>
+        <translation>Entrez votre mot de passe</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
@@ -74,318 +102,417 @@
         <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="329"/>
+        <source>Filter...</source>
+        <translation>Filtrer...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="341"/>
         <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="367"/>
         <source>%p%</source>
         <extracomment>Downloading</extracomment>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="378"/>
         <source>toolBar</source>
         <translation>Barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="444"/>
+        <location filename="mainwindow.ui" line="452"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="455"/>
         <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="464"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="458"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>Terminate the program</source>
         <translation>Terminer le programme</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="461"/>
+        <location filename="mainwindow.ui" line="470"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="479"/>
-        <location filename="mainwindow.ui" line="412"/>
+        <source>hidden service</source>
+        <translation>Service caché</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="420"/>
         <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="429"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="438"/>
         <source>About Qt</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="439"/>
+        <location filename="mainwindow.ui" line="447"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.h" line="123"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.h" line="124"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.h" line="125"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.h" line="126"/>
         <source>TB</source>
         <translation>To</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.h" line="127"/>
         <source>PB</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="50"/>
+        <location filename="mainwindow.cpp" line="61"/>
-        <source>Client for rsync server
+        <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>
+&lt;h3&gt;File de téléchargement&lt;/h3&gt;
-        <translation>Client pour serveur rsync
+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"/>
+        <location filename="mainwindow.cpp" line="78"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="62"/>
+        <location filename="mainwindow.cpp" line="78"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="62"/>
+        <location filename="mainwindow.cpp" line="78"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="97"/>
+        <location filename="mainwindow.cpp" line="78"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>KB/s</source>
+        <translation>Ko/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>MB/s</source>
+        <translation>Mo/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>GB/s</source>
+        <translation>Go/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>TB/s</source>
+        <translation>To/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>PB/s</source>
+        <translation>Po/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="123"/>
         <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="152"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
+        <location filename="mainwindow.cpp" line="209"/>
         <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="215"/>
         <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="215"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <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="500"/>
+        <location filename="mainwindow.cpp" line="513"/>
+        <source>The processus does&apos;nt respond: </source>
+        <translation>Le processus ne répond pas: </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="599"/>
         <source>server does not exists</source>
         <translation>Le serveur n&apos;existe pas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="527"/>
+        <location filename="mainwindow.cpp" line="633"/>
-        <location filename="mainwindow.cpp" line="547"/>
+        <location filename="mainwindow.cpp" line="745"/>
         <source>Dir</source>
         <translation>dossier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="531"/>
-        <location filename="mainwindow.cpp" line="615"/>
         <source>File</source>
-        <translation>Doc</translation>
+        <translation type="vanished">Doc</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="624"/>
+        <location filename="mainwindow.cpp" line="773"/>
+        <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="790"/>
         <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="659"/>
+        <location filename="mainwindow.cpp" line="827"/>
         <source>File is already downloading</source>
         <translation>Le document est déjà en téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="852"/>
         <source>Starting downloading
 </source>
         <translation>Démarrage du téléchargement
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="877"/>
         <source>Rsync process crashed</source>
         <translation>Le processus rsync à planté</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="717"/>
+        <location filename="mainwindow.cpp" line="884"/>
         <source>stopped by user</source>
         <translation>stoppé par l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="721"/>
+        <location filename="mainwindow.cpp" line="895"/>
+        <source>
+Do you want to retry?</source>
+        <translation>
+Voulez-vous ré-essayer?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="904"/>
         <source>Download </source>
         <translation>Téléchargement </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="867"/>
+        <location filename="mainwindow.cpp" line="1257"/>
+        <source>RsyncUI Request</source>
+        <translation>Requête RsyncUI</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1258"/>
+        <source>Hidden service name</source>
+        <translation>Nom du servcice caché</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="56"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="868"/>
+        <location filename="mainwindow.cpp" line="55"/>
+        <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="57"/>
         <source>Licence</source>
         <translation>License</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="869"/>
+        <location filename="mainwindow.cpp" line="58"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="59"/>
         <source>EMail</source>
         <translation>Courriel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="871"/>
+        <location filename="mainwindow.cpp" line="60"/>
         <source>Source code</source>
         <translation>Code source</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1073"/>
         <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="899"/>
+        <location filename="mainwindow.cpp" line="1078"/>
         <source>Choose folder where to save file</source>
         <translation>Choisissez un dossier où enregistrer le document</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="785"/>
+        <location filename="mainwindow.cpp" line="969"/>
         <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="799"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <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="122"/>
+        <source>B</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="139"/>
         <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="123"/>
+        <location filename="mainwindow.h" line="140"/>
         <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="124"/>
+        <location filename="mainwindow.h" line="141"/>
         <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="125"/>
+        <location filename="mainwindow.h" line="142"/>
         <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="126"/>
+        <location filename="mainwindow.h" line="143"/>
         <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="127"/>
+        <location filename="mainwindow.h" line="144"/>
         <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>
@@ -478,4 +605,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->close();
+    }
 }
 
 // launch a rsync processus downloading a file
@@ -35,18 +42,26 @@ void MainWindow::download()
 {
     QString cmd;
     QStringList param;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 
+    this->downloading.process = new QProcess(this);
+    if (!this->downloading.user.isEmpty())
+    {
+        this->downloading.server.prepend(this->connexion.user + "@");
+        env.insert("RSYNC_PASSWORD", this->downloading.password); // Add an environment variable
+        this->downloading.process->setProcessEnvironment(env);
+    }
     // Populating array with command and parameters for popen2
     cmd = "rsync";
     if (this->connexion.bandwidthLimit != 0)
     {
         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 + "/";
 
-    this->downloading.process = new QProcess(this);
+
 
     connect(this->downloading.process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(downloadFinished(int, QProcess::ExitStatus)));
     //connect(this->downloading.process, SIGNAL(errorOccurred(QProcess::ProcessError error)), this, SLOT(downloadProcessError(QProcess::ProcessError error)));
@@ -62,50 +77,51 @@ 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);
+            pos = line.indexOf("%");
-            pos = line.lastIndexOf(' ');
             if (pos != -1)
             {
-                line.remove(0, pos);
+                line = line.simplified();
-                value = line.toInt();
+                list = line.split(" ");
-                // sending progress to Main window
+                listSize = list.count() / 4;
-                emit progressSignal(value);
+                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);
+                }
             }
         }
     }
 }
-
-/*void MainWindow::downloadProcessError(QProcess::ProcessError error)
-{
-    QMessageBox::warning(
-                this,
-                "RsyncUI",
-                downloadProcessErrorString[error].toStdString().c_str()
-            );
-}*/
-
-// process raise error
-void MainWindow::downloadProcessStderr()
-{
-    QByteArray errorLine;
-
-    errorLine = this->downloading.process->readAllStandardError();
-    QMessageBox::warning(
-                this,
-                "RsyncUI",
-                errorLine
-            );
-}
-

main.cpp

@@ -23,5 +23,6 @@ int main(int argc, char *argv[])
 
     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,20 +44,44 @@ MainWindow::MainWindow(QWidget *parent)
     // init configuration window
     config.setupUi(&Configuration);
 
-    // init of About
+    // init about window
-    this->about.description = tr("Client for rsync server\n\nYou click on file to enqueue it, and RyncUI Download one file a time");
+    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::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);
+//    connect(loginD.loginBox, SIGNAL(accepted()), this, SLOT(on_loginBox_accepted()));
+//    connect(this, SIGNAL(passwordReady()), this, SLOT(waitPasswword()));
+
+    loadSettings();
 
     // init of widgets
     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
+    ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size"), tr("Date"), "fullSize"} ); // set header of columns of tree widget
+    //ui->treeWidget->header()->setContextMenuPolicy();
+    // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
+    ui->treeWidget->setCursor(Qt::ArrowCursor);
+    ui->listWidget->setCursor(Qt::ArrowCursor);
+    ui->listDownload->setCursor(Qt::ArrowCursor);
+
+    // Hiding progress bar
+    ui->progressBar->hide();
+
 
     // if last server exists in settings
     if (this->settings.contains("connexion/lastServer"))
@@ -69,25 +91,26 @@ MainWindow::MainWindow(QWidget *parent)
         ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
     }else
     {
-        ui->portEdit->text() = QString::number(this->connexion.port);
+        ui->portEdit->setText(QString::number(this->connexion.port));
         ui->khistorycombobox->clear();
     }
 
-    // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
-    ui->treeWidget->setCursor(Qt::ArrowCursor);
-    ui->listWidget->setCursor(Qt::ArrowCursor);
-    ui->listDownload->setCursor(Qt::ArrowCursor);
-
-    // Hiding progress bar
-    ui->progressBar->hide();
-
-    loadSettings();
-
     //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")});
+    config.UnitCombobox->addItems({tr("KB/s"), tr("MB/s"), tr("GB/s"), tr("TB/s"), tr("PB/s")});
+
+    // hide fullsize column of treeview
+    ui->treeWidget->setColumnHidden(4, true);
+
+    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 +134,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 +205,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
+            if (this->downloading.process->state() != QProcess::NotRunning)
-            emit (stopDownloading(this->downloading.process));
+            {
-        }else
+                // 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();
 }
 
@@ -238,7 +273,7 @@ void MainWindow::closeEvent (QCloseEvent *event)
 }
 
 // Populate treeview with list of files
-void MainWindow::populateTree(QTreeWidgetItem * parent)
+void MainWindow::populateTree()
 {
     QString path;
 
@@ -252,9 +287,9 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
         // validating server's address
         if (validateServer(this->connexion.server))
         {
-            // server is validated
+            // server is validated, scanning directory
-            path = ui->listWidget->currentItem()->text().section('\n', 0,  0) + "/";
+            path = this->connexion.service + "/";
-            scanDir(this->connexion.server, this->connexion.port, parent, path);
+            scanDir(this->connexion.server, this->connexion.port, nullptr, path);
         }
         // Restoring cursor
         QGuiApplication::restoreOverrideCursor();
@@ -265,7 +300,10 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
 void MainWindow::populateList()
 {
     QString server;
+    QString service;
+    QStringList hidden;
     int port;
+    int i;
 
     server = ui->khistorycombobox->currentText();
     port = ui->portEdit->text().toUInt();
@@ -313,10 +351,70 @@ void MainWindow::populateList()
             }
         }
         this->settings.endGroup();
+        this->settings.beginGroup("Hidden/" + server);
+        hidden = this->settings.allKeys();
+        this->settings.endGroup();
+        for (i = 0; i < hidden.size(); i++)
+        {
+            service = hidden.at(i);
+            //TODO detect if service is already present
+            if (testServicePresence(service, false))
+            {
+                ui->listWidget->addItem(service + "\n\t");
+            }
+        }
         QGuiApplication::restoreOverrideCursor();  //setting cursor to default
     }
 }
 
+// Test if service is already present on the server
+bool MainWindow::testServicePresence(QString service, bool askPassword)
+{
+    QString cmd;
+    QStringList param;
+    QString line;
+    QString errorRsync;
+    QStringList v;
+    QProcess *myProcess;
+    bool returnValue = false;
+    QEventLoop loop;
+
+    cmd  = "/usr/bin/rsync";
+    param << "--contimeout=10" << "-nq" << "--port=" + QString::number(this->connexion.port) << this->connexion.server + "::" + service;
+    myProcess = new QProcess(this);
+    myProcess->setProcessChannelMode(QProcess::MergedChannels);
+    myProcess->start(cmd, param);
+    myProcess->waitForStarted();
+    myProcess->write("\n");
+    //myProcess->waitForFinished(12000);
+    while(myProcess->waitForReadyRead(10000))
+    {
+        while(1)
+        {
+            // line empty then buffer is empty so returning to wait new datas
+            line = QString::fromUtf8(myProcess->readLine());
+            if (line.isEmpty())
+            {
+                break;
+            }
+            if (line.contains("auth failed"))
+            {
+                if (askPassword)
+                {
+                    getUserPassword(&this->connexion);
+                }
+                returnValue = true;
+            }
+        }
+    }
+    if (myProcess->exitCode() == 0)
+    {
+       returnValue = true;
+    }
+    myProcess->close();
+    return returnValue;
+}
+
 //list services of the rsync server
 void MainWindow::listServices()
 {
@@ -330,7 +428,7 @@ void MainWindow::listServices()
     bool flag = false;
 
     cmd  = "/usr/bin/rsync";
-    param << "--contimeout=10" << "--port=" + QString::number(this->connexion.port) << this->connexion.server + "::";
+    param << "--contimeout=20" << "--port=" + QString::number(this->connexion.port) << this->connexion.server + "::";
     myProcess = new QProcess(this);
     myProcess->start(cmd, param);
 
@@ -360,68 +458,134 @@ void MainWindow::listServices()
     }
 
     // verifying error code
-    testRsyncReturn(myProcess);
+    testRsyncReturn(this, myProcess);
+    myProcess->close();
 }
 
 // connect to rsync server to get list of files
-void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QString path)
+bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QString path)
 {
     QString cmd;
     QStringList param;
+    QStringList sizeA;
     QString line;
     QString size;
+    QString fullsize;
     QString filename;
+    QString fileType;
+    QString date;
     QProcess * myProcess;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     bool isDir = false;
     bool flag = false;
-
+    bool readOk = false;
-    cmd = "rsync";
+    bool passwdOk = false;
-    param << "--contimeout=10" << "--port=" + QString::number(portN) << server + "::" + path;
+    int nChild = 0;
 
     myProcess = new QProcess(this);
-    myProcess->start(cmd, param);
+    myProcess->setProcessChannelMode(QProcess::MergedChannels);
 
-    // waiting for responsiteme of the server with a timeout of 10 seconds
+    if (parent != nullptr)
-    while(myProcess->waitForReadyRead(100000))
     {
-        while (!flag)
+        nChild = parent->childCount();
-        {
-            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
+    if (nChild == 0)
-    testRsyncReturn(myProcess);
+    {
+        if (!this->connexion.user.isEmpty())
+        {
+            server.prepend(this->connexion.user + "@");
+            env.insert("RSYNC_PASSWORD", this->connexion.password); // Add an environment variable
+        }else
+        {
+            server.prepend("anonymous@");
+            env.insert("RSYNC_PASSWORD", "anonymous"); // Add an environment variable
+        }
+        myProcess->setProcessEnvironment(env);
+        cmd = "rsync";
+        param << "--contimeout=20" << "--port=" + QString::number(portN) << server + "::" + path;
+
+
+        myProcess->start(cmd, param);
+
+        // waiting for response of the server with a timeout of 10 seconds
+        do
+        {
+            readOk = myProcess->waitForReadyRead(10000);
+            if (readOk)
+            {
+                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;
+                    }
+                    if (line.contains("auth failed"))
+                    {
+                        myProcess->readAllStandardOutput();
+                        getUserPassword(&this->connexion);
+                        this->rescan = true;
+                        return 0;
+                    }
+
+                    // extracting name, size and if is dir/file
+                    line = line.simplified();
+                    filename = line.section(" ", 4);
+                    if (filename != '.')
+                    {
+                        size = line.section(" ", 1, 1);
+                        fullsize = size;
+                        fullsize.remove(",");
+                        sizeA = size.split(',');
+                        if (sizeA.count() <= 1)
+                        {
+                            size = sizeA.at(0) + " " + UnitText[0] + " ";
+                        }else
+                        {        myProcess->setProcessEnvironment(env);
+
+                            size = sizeA.at(0) + "," + sizeA.at(1).left(2) + " " + UnitText[sizeA.count()-1] + " ";
+                        }
+
+                        if (line[0] == "d")
+                        {
+                            isDir = true;
+                        }else
+                        {
+                            isDir = false;
+                        }
+                        date = line.section(' ', 2, 2);
+                        fileType = getFileType(filename);
+                        addTreeItem(filename, size, fullsize, fileType, date, isDir, parent);
+                        if (passwdOk == false and !this->connexion.password.isEmpty())
+                        {
+                            this->settings.setValue("Passwords/" + this->connexion.server + "/" + this->connexion.service + "/" + this->connexion.user, this->connexion.password);
+                            this->settings.sync();
+                        }
+                    }
+                }
+                flag = false;
+            }else
+            {
+                if (myProcess->state() == QProcess::Running)
+                {
+                    if (myProcess->waitForFinished(10000) == 0)
+                    {
+                        QMessageBox::warning(
+                            this,
+                            "RsyncUI",
+                            tr("The processus does'nt respond: ") + myProcess->errorString());
+                    }
+                }
+            }
+        }while(readOk);
+        // buffer empty go to waiting new datas
+
+        testRsyncReturn(this, myProcess);
+        myProcess->close();
+    }
+    return 0;
 }
 
 // Verify if server address is IP address
@@ -500,6 +664,7 @@ bool MainWindow::validateServer(QString server)
             tr("server does not exists" )
         );
     }
+    myProcess->close();
     return flag;
 }
 
@@ -516,54 +681,57 @@ void MainWindow::on_connectButton_clicked()
    populateList();
 }
 
-// add a dir in treeview
+// add parent in treeview
-QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir)
+void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir=false, QTreeWidgetItem *parent=nullptr)
 {
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget);
+    QTreeWidgetItem *treeItem;
-
+    if (parent != nullptr)
+    {
+        treeItem = new QTreeWidgetItem();
+    }else
+    {
+        treeItem = new QTreeWidgetItem(ui->treeWidget);
+    }
     if (isDir == true)
     {
         // item is a dir
         treeItem->setText(1, tr("Dir"));
+        treeItem->setIcon(0, QIcon::fromTheme("folder"));
     }else
     {
         // item is a file
-        treeItem->setText(1,tr("File"));
+        treeItem->setText(1,type);
     }
     treeItem->setText(0, name);
     treeItem->setText(2, fileSize);
+    treeItem->setText(3, date);
+    treeItem->setText(4, fullsize);
 
-    return treeItem;
+    treeItem->setTextAlignment(2, Qt::AlignRight);
-}
 
-// add a file in treeview
+    if (parent != nullptr)
-QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir)
-{
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem();
-
-    if (isDir == true)
     {
-        // item is a dir
+        // QTreeWidgetItem::addChild(QTreeWidgetItem * child)
-        treeItem->setText(1, tr("Dir"));
+        parent->addChild(treeItem);
-    }else
-    {
-        // item is a file
-        treeItem->setText(1,("File"));
     }
-    treeItem->setText(0, name);
-    treeItem->setText(2, fileSize);
-
-    // QTreeWidgetItem::addChild(QTreeWidgetItem * child)
-    parent->addChild(treeItem);
-    return treeItem;
 }
 
-// Slot acivated when a service in the list is clicked
+// Slot activated when a service in the list is clicked
 void MainWindow::on_listWidget_clicked()
 {
-    QString str;
-
     this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0);
+    ui->treeWidget->clear();
+    preparePopulateTree();
+}
+
+void MainWindow::preparePopulateTree()
+{
+    QString str;
+    QStringList logins;
+
+    this->rescan = true;
+    this->connexion.user = nullptr;
+    this->connexion.password = nullptr;
     str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
     // if service exists in settings for this server
     if (this->settings.contains(str))
@@ -571,7 +739,75 @@ void MainWindow::on_listWidget_clicked()
         // setting savePath from settings
         this->downloading.savePath = this->settings.value(str).toString();
     }
-    populateTree(NULL);
+
+    getUserPassword(&this->connexion);
+
+    populateTree();
+}
+
+// get password and user login
+// if object = false ==> searching from connexion object
+// else searching from downloading object
+bool MainWindow::getUserPassword(Connexion * object)
+{
+    QStringList logins;
+    QString login;
+    QString password;
+    QString server;
+    QString service;
+
+    bool returnValue = false;
+    bool ok = false;
+
+    server = object->server;
+    service = object->service;
+
+    object->user = "";
+    object->password = "";
+
+    this->settings.beginGroup("Passwords/" + server + "/" + service);
+    logins = this->settings.allKeys();
+    if (logins.count() != 1)
+    {
+        //choose login in case of multiples logins
+        login = QInputDialog::getItem(this,
+                                      "RsincUI",
+                                      tr("Select the user you want to connect with or enter a new one"),
+                                      logins,
+                                      0,
+                                      true,
+                                      &ok,
+                                      Qt::Popup,
+                                      Qt::ImhNoPredictiveText
+                    );
+        if (ok and !login.isEmpty())
+        {
+            if (!logins.contains(login))
+            {
+                password = QInputDialog::getText(this,
+                                                 tr("RsyncUI Request"),
+                                                 tr("Enter password"), QLineEdit::Password,
+                                                 "", &ok, Qt::Popup,
+                                                 Qt::ImhNoPredictiveText);
+                if (!ok or password.isEmpty())
+                {
+                    password = "";
+                }
+            }else
+            {
+                password = this->settings.value(login).toString();
+            }
+            object->user = login;
+            object->password = password;
+        }
+    }else
+    {
+        object->user = logins.at(0);
+        object->password = this->settings.value(object->user).toString();
+        returnValue = true;
+    }
+    this->settings.endGroup();
+    return returnValue;
 }
 
 //Slot activated when a file is clicked in the treeview
@@ -583,27 +819,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
     QString path;
     QString str;
     QMessageBox::StandardButton reply;
+    int sizeFromRsync;
 
     itemR = item;
 
     // assembling path from treewidget
     path = item->text(0);
-
+    sizeFromRsync = item->text(4).toUInt();
-    // exists saving path in settings ?
-    str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
-    if(!this->settings.contains(str))
-    {
-        // saving path do not exists, asking for it
-        if(!on_DefaultSaveFolder_triggered())
-        {
-            cout << "no directory selectioned, ignoring download request";
-            return;
-        }
-    }else
-    {
-        this->downloading.savePath = this->settings.value(str).toString();
-    }
-
 
     while(itemR->parent() != NULL)
     {
@@ -612,25 +834,63 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
         path.prepend(itemR->text(0) + "/");
     };
 
-    if (item->text(1) == tr("File") or downloadDir == true)
+    cout << item->text(1).toStdString() <<endl;
+    if (item->text(1) != tr("Dir") or downloadDir == true)
     {
+        // exists saving path in settings ?
+        str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
+        if(!this->settings.contains(str))
+        {
+            // saving path do not exists, asking for it
+            if(!on_DefaultSaveFolder_triggered())
+            {
+                cout << "no directory selectioned, ignoring download request";
+                return;
+            }
+        }else
+        {
+            this->downloading.savePath = this->settings.value(str).toString();
+        }
+
         // 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)
+            QFileInfo info(this->downloading.savePath + "/" + path);
+            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);
+                }
             }
         }
 
@@ -642,6 +902,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
@@ -674,11 +935,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
 // Launch the thread which download the file
 void MainWindow::startDownloading()
 {
+
     ui->progressBar->setValue(0);
     ui->progressBar->show();
+    //getUserPassword();
 
     //QtConcurrent::run(&this->downloadO, &downloadFile::download, this);
-    download();
+    this->download();
     this->trayIcon->showMessage("RsyncUI", tr("Starting downloading\n") + this->downloading.path, QSystemTrayIcon::Information);
 }
 
@@ -695,6 +958,8 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
     QString str;
     int pos;
     QString aborted = tr("finished");
+    QMessageBox::StandardButton reply;
+    bool retry = false;
 
     // test if process crashed
     if (exitStatus == QProcess::CrashExit)
@@ -705,40 +970,48 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
             tr("Rsync process crashed"));
     }
     //test result code of command (if 20 then command stopped by user)
-    if (exitCode != 0 and exitCode != 20)
+    if (exitCode != 0)
     {
-        // displaying warning with exit code
+        if (exitCode == 20)
-        QMessageBox::warning(
+        {
-            NULL,
+            aborted = tr("stopped by user");
-            "RsyncUI",
+        }else if (exitCode == 5)                            // password asked
-            rsyncErrorStrings[exitCode]);
+        {
-    }else if (exitCode == 20)
+            getUserPassword(&this->downloading);
-    {
+            retry = true;
-        aborted = tr("stopped by user");
+        }
-    }
 
+        // displaying warning with exit code
+        reply = QMessageBox::warning(
+            this,
+            "RsyncUI",
+            rsyncErrorStrings[exitCode] + tr("\nDo you want to retry?"),
+            QMessageBox::Yes|QMessageBox::No,
+            QMessageBox::Yes);
+        if (reply == QMessageBox::Yes)
+        {
+            retry = true;
+        }
+    }
 
     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
+    // reset variables and window, close process
-    this->downloading.process = nullptr;
+    this->downloading.process->close();
     ui->progressBar->hide();
-    delete ui->listDownload->takeItem(0);
+
+    if (retry == false)
+    {
+        delete ui->listDownload->takeItem(0);
+    }
     this->downloading.clear();
 
     // Some downloads staying in queue
     if (ui->listDownload->count() != 0)
     {
-        // autosave is activated
-        if (config.autosaveCheckbox->checkState() == Qt::Checked)
-        {
-            // saving download list
-            saveDownloadList();
-        }
-
         // initializing download
         path = ui->listDownload->item(0)->text();
         pos = path.lastIndexOf("/");
@@ -749,6 +1022,9 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
         path.resize(pos);
         this->downloading.path = path;
 
+        //getUserPassword(true);
+        testServicePresence(this->downloading.service, true);
+
         // savepath exists in settings ?
         str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
         if (this->settings.contains(str))
@@ -767,7 +1043,10 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
             }
         }
     }
-    saveDownloadList();
+    if(config.autosaveCheckbox->checkState() == Qt::Checked and this->downloading.quit == false)
+    {
+        saveDownloadList();
+    }
 }
 
 
@@ -804,13 +1083,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
@@ -863,13 +1143,7 @@ void MainWindow::saveSettings()
 // About
 void MainWindow::on_actionAbout_triggered()
 {
-    QString text =  this->about.description + "\n\n" +
+    aboutDialog.show();
-                    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);
 }
 
 // About QT
@@ -990,6 +1264,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;
@@ -1001,12 +1276,17 @@ void MainWindow::loadDownloadList()
 }
 
 // clear object downloading
-void Downloading::clear()
+void Connexion::clear()
 {
     this->path.clear();
     this->server.clear();
     this->savePath.clear();
     this->service.clear();
+    this->user.clear();
+    this->password.clear();
+    this->port = 0;
+    this->process = nullptr;
+    this->quit = false;
 }
 
 // Context menu of file list clicked
@@ -1029,7 +1309,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);
@@ -1039,3 +1319,52 @@ void MainWindow::on_actionExit_triggered()
 {
     quitApp();
 }
+
+void MainWindow::on_loginBox_accepted()
+{
+    /*Connexion * conn = this->passwordConnexion;
+
+    if (!loginD.loginEdit->currentText().isEmpty())
+    {
+        QString path;
+        conn->user = loginD.loginEdit->currentText();
+        path = "Passwords/" + conn->server + "/" + conn->service + "/" + conn->user;
+
+        if (!loginD.passwordEdit->text().isEmpty())
+        {
+            conn->password = loginD.passwordEdit->text();
+            this->settings.setValue("Passwords/" + conn->server + "/" + conn->service + "/" + conn->user, conn->password);
+            this->settings.sync();
+            if (this->rescan == true)
+            {
+                this->rescan = false;
+                populateTree();
+            }
+        }else if (this->settings.contains(path))
+        {
+            conn->password = this->settings.value(path).toString();
+        }
+    }
+    emit passwordReady();*/
+}
+
+void MainWindow::setDlSpeed(QString speed)
+{
+    speed.squeeze();
+}
+
+void MainWindow::on_actionHiddenService_triggered()
+{
+    QInputDialog hiddenFolderDialog;
+
+    bool ok;
+    QString text = QInputDialog::getText(this, tr("RsyncUI Request"),
+                                         tr("Hidden service name"), QLineEdit::Normal,
+                                         "test", &ok);
+    if (ok && !text.isEmpty())
+    {
+        this->connexion.service = text;
+        this->settings.setValue("Hidden/" + this->connexion.server + "/" + text, true);
+        preparePopulateTree();
+    }
+}

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>
@@ -41,7 +43,8 @@
 #include <QDir>
 #include <QSystemTrayIcon>
 #include <QMenu>
-#include<QTranslator>
+#include <QTranslator>
+#include <QInputDialog>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -54,10 +57,18 @@ class Connexion
     public:
         int bandwidthLimit = 0;
         int bandwidthLimitUnit;
+        int contimeout = 20;
         QString server;
         QString service;
+        QString path;
+        QString savePath;
+        QString user;
+        QString password;
+        QProcess * process = nullptr;
         int port = 873;
         bool comboboxChanged;
+        bool quit = false;
+        void clear();
 };
 
 class Downloading
@@ -67,8 +78,11 @@ class Downloading
         QString service;
         QString path;
         QString savePath;
+        QString user;
+        QString password;
+        int port = 873;
         QProcess * process = nullptr;
-
+        bool quit = false;
         void clear();
 };
 
@@ -76,7 +90,7 @@ class About
 {
     public:
         QString title = "RsyncUI";
-        QString version = "2.2";
+        QString version = "2.9.2";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
         QString description;
@@ -94,20 +108,26 @@ class MainWindow : public QMainWindow
         ~MainWindow();
         QProgressDialog *progress;
         Connexion connexion;
-        Downloading downloading;
+        Connexion downloading;
-        //downloadFile downloadO;
         QSettings settings;
         About about;
         QDialog Configuration;
         Ui::Configuration config;
+        QDialog aboutDialog;
+        Ui::windowAbout AboutW;
         std::vector <QString> serversList;
         QSystemTrayIcon * trayIcon;
-        QList<QString> bwUnitText {
+        QString icon = "/usr/share/icons/RsyncUI.png";
-            "KB",
+        bool rescan = false;
-            "MB",
+        bool passwordReturned;
-            "TB",
+
-            "GB",
+        QList<QString> UnitText {
-            "PB"
+            tr("B"),
+            tr("KB"),
+            tr("MB"),
+            tr("GB"),
+            tr("TB"),
+            tr("PB")
             };
         QList<QChar> bwUnitChar{
             'K',
@@ -128,14 +148,13 @@ class MainWindow : public QMainWindow
         };
 
         void displayTree();
-        void populateTree(QTreeWidgetItem * parent);
+        void populateTree();
         void populateList();
         void listServices();
         bool validateServer(QString server);
         bool isIpAddress(QString server);
-        QTreeWidgetItem * addTreeRoot(QString name, QString description, bool isDir);
+        void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QTreeWidgetItem *parent);
-        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, bool isDir);
+        bool scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
-        void scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
         void startDownloading();
         void loadSettings();
         void saveSettings();
@@ -146,6 +165,10 @@ class MainWindow : public QMainWindow
         void initSystemTrayIcon();
         void hideWindow();
         void showWindow();
+        void init();
+        bool getUserPassword(Connexion *);
+        void preparePopulateTree();
+        bool testServicePresence(QString, bool=false);
 
     private slots:
 
@@ -155,10 +178,6 @@ class MainWindow : public QMainWindow
 
         void downloadFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
-//       void downloadProcessError(QProcess::ProcessError error);
-
-        void downloadProcessStderr();
-
         void readRsyncOutput();
 
         void stoppingDownload();
@@ -193,12 +212,19 @@ class MainWindow : public QMainWindow
 
         void on_actionExit_triggered();
 
-signals:
+        void setDlSpeed(QString speed);
+
+        void on_loginBox_accepted();
+
+        void on_actionHiddenService_triggered();
+
+    signals:
         void stopDownloading(QProcess *);
         void progressSignal(int);
+        void speed(QString);
         void finishedSignal(bool = true);
-        //void errorSignal(QString);
+        void fileName(QString);
-
+        void passwordReady();
 };
 
 #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>
@@ -274,10 +275,10 @@
             <bool>false</bool>
            </property>
            <property name="dragEnabled">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="dragDropMode">
-            <enum>QAbstractItemView::DragOnly</enum>
+            <enum>QAbstractItemView::NoDragDrop</enum>
            </property>
            <property name="alternatingRowColors">
             <bool>true</bool>
@@ -324,6 +325,9 @@
            <property name="inputMethodHints">
             <set>Qt::ImhNoAutoUppercase</set>
            </property>
+           <property name="placeholderText">
+            <string>Filter...</string>
+           </property>
           </widget>
          </item>
         </layout>
@@ -356,6 +360,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 @@
     <bool>false</bool>
    </attribute>
    <addaction name="DefaultSaveFolder"/>
+   <addaction name="actionHiddenService"/>
    <addaction name="action_Settings"/>
    <addaction name="actionAbout"/>
    <addaction name="actionAbout_Qt"/>
@@ -449,7 +457,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>
@@ -461,6 +470,15 @@
     <string>Ctrl+Q</string>
    </property>
   </action>
+  <action name="actionHiddenService">
+   <property name="icon">
+    <iconset theme="folder-open">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>hidden service</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

password.cpp

@@ -0,0 +1,59 @@
+#include "mainwindow.h"
+#include "password.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+
+using namespace std;
+
+/*Password::Password()
+{
+    this->passwdJob->setObjectName(this->appName);
+    this->passwdJob->setAutoDelete(false);
+    this->passwdJob->connect(this->passwdJob, SIGNAL(finished(QKeychain::Job*)), this, SLOT(finished(QKeychain::Job*)));
+    //this->readPass->connect(this->readPass, SIGNAL(finished()))
+}
+
+void Password::store (QString account, QString password)
+{
+    this->passwdJob->setKey(account);
+    this->passwdJob->setTextData(password);
+    this->passwdJob->start();
+}
+
+QString Password::read(QString account)
+{
+    this->readPass->setObjectName("");
+    this->readPass->setKey(account);
+    this->readPass->start();
+}
+
+bool Password::remove(QString)
+{
+
+
+}
+
+void Password::finished(QKeychain::Job * passwdJob)
+{
+    if(passwdJob->error()) {
+    QMessageBox::warning(
+        NULL,
+        "RsyncUI",
+        QString(this->mw->tr("Error: Unable to save password!")) + QString(passwdJob->error()));
+    }
+}
+
+void Password::readReturn()
+{
+    if(this->readPass->error())
+        {
+        QMessageBox::warning(
+            NULL,
+            "RsyncUI",
+            QString(this->mw->tr("Error: Unable to read password!")) + QString(readPass->error()));
+        }else
+        {
+            this->password = readPass->textData();
+         }
+}
+*/

password.h

@@ -0,0 +1,29 @@
+#ifndef PASSWORD_H
+#define PASSWORD_H
+
+#include "mainwindow.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+
+class Password : QObject
+{
+    public:
+        QString appName;
+        QKeychain::WritePasswordJob * passwdJob;
+        QKeychain::ReadPasswordJob * readPass;
+        MainWindow * mw;
+        QString password;
+
+        Password();
+        ~Password();
+
+        void store(QString, QString);
+        QString read(QString);
+        bool remove(QString);
+
+    private slots:
+        void finished(QKeychain::Job*);
+        void readReturn();
+};
+
+#endif // PASSWORD_H

tools.cpp

@@ -44,26 +44,27 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
 }
 
 // test return code of rsync
-bool testRsyncReturn(QProcess * myProcess)
+// return true in case of error
+bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
 {
     if (myProcess->exitStatus() != 0)
     {
         QMessageBox::warning(
-                   NULL,
+                   w,
                    "RsyncUI",
                    myProcess->errorString(),
                    QMessageBox::Ok,
                    QMessageBox::Ok);
         return true;
-    }else if (myProcess->exitCode() != 0)
-    {
-        QMessageBox::warning(
-                   NULL,
-                   "RsyncUI",
-                   rsyncErrorStrings[myProcess->exitCode()],
-                   QMessageBox::Ok,
-                   QMessageBox::Ok);
-        return true;
     }
     return false;
 }
+
+QString getFileType(QString filename)
+{
+    QMimeDatabase db;
+    QMimeType mime = db.mimeTypeForFile(filename);
+    QString returnValue = mime.name().section('/',0 ,0);
+    return returnValue;
+}
+

tools.h

@@ -1,6 +1,7 @@
 #ifndef TOOLS_H
 #define TOOLS_H
 
+#include "mainwindow.h"
 #include <string>
 #include <vector>
 #include <array>
@@ -8,6 +9,8 @@
 #include <QMap>
 #include <QTranslator>
 #include <QProcess>
+#include <QMimeDatabase>
+#include <QMimeType>
 
 using namespace std;
 
@@ -17,7 +20,7 @@ FILE * popen2(array<string,8> argv, string type, int & pid);
 
 int pclose2(FILE * fp, pid_t pid);
 
-bool testRsyncReturn(QProcess *);
+bool testRsyncReturn(MainWindow *, QProcess *);
-
+QString getFileType(QString finename);
 
 #endif // TOOLS_H