removed includes of unused libraries and code correction

correction bug on detection of already downloaded file

README_FR.md

@@ -2,4 +2,47 @@
 
 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.
+Un identifiant et un mot de passe lorsqu'un service est protégé par mot de passe, celui-ci est enregistré dans le portefeuille système(gome-keyring ou kwallet)
+
+## 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.desktop

@@ -6,7 +6,7 @@ Comment=Client for rsync servers
 Comment[fr]=Client pour serveur rsync
 Version=1.0
 Exec=RsyncUI
-Icon=
+Icon=/usr/share/icons/RsyncUI.png
 Type=Application
 Terminal=false
 StartupNotify=true

RsyncUI.pro

@@ -6,11 +6,14 @@ QT	+= KConfigCore KConfigGui
 QT	+= KCoreAddons
 QT	+= KDBusAddons
 
-#LIBS += -lKF5WindowSystem
+LIBS += -lqt5keychain
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 CONFIG += c++11
 
+DEFINES += QTKEYCHAIN_NO_EXPORT
+
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
@@ -19,30 +22,32 @@ 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
 
 TRANSLATIONS += \
-    languages/fr_FR/RsyncUI_fr_FR.ts
+    RsyncUI_fr_FR.ts
 
 INCLUDEPATH += \
-    /usr/include/KF5
+    /usr/include/KF5 \
+    /usr/include/qt5keychain/
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /usr/bin/
 !isEmpty(target.path): INSTALLS += target
 
-lang.path = /languages/fr_FR/
-lang.files = languages/fr_FR/*
 INSTALLS += lang
 INSTALLS += documentation
 INSTALLS += desktopfile
@@ -53,9 +58,13 @@ RESOURCES +=
 DISTFILES += \
 	RsyncUI.desktop
 
+lang.path = /languages/
+lang.path = /usr/share/locale/
+lang.files = languages/*
 documentation.path = /usr/share/doc/RsyncUI
 documentation.files = README*
 desktopfile.path = /usr/share/applications
 desktopfile.files = RsyncUI.desktop
 icon.path = /usr/share/icons/
 icon.files = RsyncUI.png
+-lqt5keychain

RsyncUI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-02-02T16:28:47. -->
+<!-- Written by QtCreator 4.14.2, 2023-03-09T22:37:54. -->
 <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: 1.8.5
+Version: 2.10.1
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access
@@ -48,25 +48,12 @@ and download files.
 %make_build
 
 %install
-#INSTALL_ROOT=%{BUILDROOT} make install
+INSTALL_ROOT=%{buildroot} make install
 
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}/applications/
-mkdir -p %{buildroot}%{_datadir}/icons/
-install -p -m 755 %{oname} %{buildroot}%{_bindir}/%{oname}
-install -p -m 644 %{oname}.desktop %{buildroot}%{_datadir}/applications/
-install -p -m 644 %{oname}.png  %{buildroot}%{_datadir}/icons/
-
-pushd languages
-for locale in *;
-do
-	mkdir -p %{buildroot}%{_datadir}/locale/$locale/LC_MESSAGES
-	install -m 644 $locale/*.qm "%{buildroot}%{_datadir}/locale/$locale/LC_MESSAGES/"
-done
-popd
 %find_lang %{oname} --with-qt
 
 %files -f %{oname}.lang
 %{_bindir}/%{oname}
 %{_datadir}/applications/%{oname}.desktop
 %{_datadir}/icons/%{oname}.png
+%{_docdir}/%{oname}/README*

RsyncUI_fr_FR.ts

@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
+<context>
+    <name>Configuration</name>
+    <message>
+        <location filename="configuration.ui" line="20"/>
+        <source>Configuration</source>
+        <translation>Configuration</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="106"/>
+        <source>Text follow style</source>
+        <translation>Le texte suit le style</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="121"/>
+        <source>Toolbar view</source>
+        <translation>Toolbar</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="114"/>
+        <source>Bandwidth limit</source>
+        <extracomment>Bandwidth limit</extracomment>
+        <translation>Limite de bande passante</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="63"/>
+        <source>Enter the bandwidth limit (0 to 1024)</source>
+        <translation>Entrez la limite de bande passante (0 à 1024)</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="44"/>
+        <source>Select th unit of bandwidth limit in Bytes, KiloBytes, MegaBytes, GigaBytes or PetaBytes</source>
+        <extracomment>Unit of bandwidth</extracomment>
+        <translation>Sélectionnez l&apos;unité de limite de bande passante en otctets, Ko, Mo, Go, Po</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="86"/>
+        <source>Icon only</source>
+        <translation>Icône seule</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="91"/>
+        <source>Text only</source>
+        <translation>Texte seul</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="96"/>
+        <source>Text beside icon</source>
+        <translation>Text à côté de l&apos;icône</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="101"/>
+        <source>Text under icon</source>
+        <translation>Texte sous l&apos;icöne</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="159"/>
+        <source>Automatic saving of download queue</source>
+        <translation>Enregistrement automatique de la file</translation>
+    </message>
+    <message>
+        <location filename="configuration.ui" line="165"/>
+        <source>Auto save download queue</source>
+        <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>
+        <location filename="mainwindow.ui" line="21"/>
+        <source>MainWindow</source>
+        <translation>Fenêtre principale</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="87"/>
+        <source>Server</source>
+        <oldsource>Serveur</oldsource>
+        <translation>Serveur</translation>
+    </message>
+    <message>
+        <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="125"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <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="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="196"/>
+        <source>Connection</source>
+        <translation>Connexion</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="199"/>
+        <source>Return</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <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="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="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="367"/>
+        <source>%p%</source>
+        <extracomment>Downloading</extracomment>
+        <translation>Téléchargement</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="378"/>
+        <source>toolBar</source>
+        <translation>Barre d&apos;outils</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="452"/>
+        <source>Download</source>
+        <translation>Télécharger</translation>
+    </message>
+    <message>
+        <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="464"/>
+        <source>Exit</source>
+        <translation>Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="467"/>
+        <source>Terminate the program</source>
+        <translation>Terminer le programme</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="470"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="479"/>
+        <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="429"/>
+        <source>About</source>
+        <translation>À propos</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="438"/>
+        <source>About Qt</source>
+        <translation>À propos de Qt</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="447"/>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="123"/>
+        <source>KB</source>
+        <translation>Ko</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="124"/>
+        <source>MB</source>
+        <translation>Mo</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="125"/>
+        <source>GB</source>
+        <translation>Go</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="126"/>
+        <source>TB</source>
+        <translation>To</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="127"/>
+        <source>PB</source>
+        <translation>Po</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="61"/>
+        <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.
+
+&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.
+
+&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="78"/>
+        <source>Path</source>
+        <translation>Chemin</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="78"/>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="78"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <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="152"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <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="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="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="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="633"/>
+        <location filename="mainwindow.cpp" line="745"/>
+        <source>Dir</source>
+        <translation>dossier</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="vanished">Doc</translation>
+    </message>
+    <message>
+        <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="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="852"/>
+        <source>Starting downloading
+</source>
+        <translation>Démarrage du téléchargement
+</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="867"/>
+        <source>finished</source>
+        <translation>Terminé</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="877"/>
+        <source>Rsync process crashed</source>
+        <translation>Le processus rsync à planté</translation>
+    </message>
+    <message>
+        <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="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="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="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="58"/>
+        <source>Author</source>
+        <translation>Auteur</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="59"/>
+        <source>EMail</source>
+        <translation>Courriel</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="60"/>
+        <source>Source code</source>
+        <translation>Code source</translation>
+    </message>
+    <message>
+        <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="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="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="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="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="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="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="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="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>
+</context>
+<context>
+    <name>QTranslator</name>
+    <message>
+        <location filename="mainwindow.cpp" line="12"/>
+        <source>Success. The rsync command completed successfully without any errors.</source>
+        <translation>Succès. La command rsync s&apos;est terminée sans erreurs.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="13"/>
+        <source>Syntax or usage error. There was a problem with the syntax of the rsync command or with the options specified.</source>
+        <translation>Erreur de syntaxe ou d&apos;usage. il y a un problème avec la synaxe de rsync ou avec les paramètres spécifiés.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="14"/>
+        <source>Protocol incompatibility. There was a problem with the protocol version or negotiation between the rsync client and server.</source>
+        <translation>Incompatibilité de protocole. Il y a eu un problème avec la version du protocole ou la négotiation avec le serveur rsync.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="15"/>
+        <source>Errors selecting input/output files, dirs. There was a problem with the source or destination file or directory specified in the rsync command.</source>
+        <translation>Erreurs dans la sélection des fichiers ou dossiers. il y a eu une problème avec le fichier/dossier source ou destination spécifié.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="16"/>
+        <source>Requested action not supported: An attempt was made to use an unsupported action or option.</source>
+        <translation>Action non suportée. Une tentative d&apos;utiliser une action, ou une option, non supportée à été faite.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="17"/>
+        <source>Error starting client-server protocol. There was an error starting the client-server protocol.</source>
+        <translation>Erreur de démarrage du protocole client-seveur. Il ya eu une erreur en démarrant le protocole slient-serveur.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="18"/>
+        <source>Daemon unable to append to log-file. The rsync daemon was unable to write to its log file.</source>
+        <translation>Le démon rsyncd n&apos;arrive pas écrire dans son fichier de log.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="19"/>
+        <source>Error in socket I/O. There was an error with the socket input/output.</source>
+        <translation>Erreur d&apos;entrée/sortie socket. Il y a eu une erreur d&apos;entrée/sortie sur le socket.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="20"/>
+        <source>Error in file I/O. There was an error reading or writing to a file.</source>
+        <translation>Erreur de &apos;entrée/sortie. Il y a eu une erreur de lecture/écriture sur un fichier.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="21"/>
+        <source>Error in rsync protocol data stream. There was an error in the rsync protocol data stream.</source>
+        <translation>Erreur dans le protocole de flux de données de rsync.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="22"/>
+        <source>Errors with program diagnostics. There was an error generating program diagnostics.</source>
+        <translation>Erreur avec les diagnostiques du programme.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="23"/>
+        <source>Error in IPC code. There was an error in the inter-process communication (IPC) code.</source>
+        <translation>Erreur dans le code IPC. IL y a eu une erreur dans la communication inter-processus.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="24"/>
+        <source>Received SIGUSR1 or SIGINT. The rsync process was interrupted by a signal.</source>
+        <translation>Reçu les signaux SIGUSR1 ou SIGINT. Le processus rsync a été interrompu par un signal.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="25"/>
+        <source>Some error returned by waitpid(). An error occurred while waiting for a child process to complete.</source>
+        <translation>Erreurs retournées par waitpid().Une erreur est survenue pendant l&apos;attente de la complétion du processus fils.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="26"/>
+        <source>Error allocating core memory buffers. There was an error allocating memory buffers.</source>
+        <translation>Erreur d&apos;allocation des buffers mémoire.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="27"/>
+        <source>Partial transfer due to error. The rsync command completed with an error, but some files may have been transferred successfully.</source>
+        <translation>Transfert partiel due à une erreur. La command rsync s&apos;est terminée avec une erreur, mais des fichiers on été transférés avec succès.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="28"/>
+        <source>Partial transfer due to vanished source files. Some source files disappeared before they could be transferred.</source>
+        <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>

configuration.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>491</width>
-    <height>163</height>
+    <height>196</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -24,44 +24,14 @@
     <rect>
      <x>9</x>
      <y>9</y>
-     <width>381</width>
+     <width>464</width>
-     <height>101</height>
+     <height>109</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
     <property name="sizeConstraint">
      <enum>QLayout::SetDefaultConstraint</enum>
     </property>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Toolbar view</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="label1">
-      <property name="text">
-       <string extracomment="Bandwidth limit">Bandwidth limit</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QSpinBox" name="spinBox">
-      <property name="toolTip">
-       <string>Enter the bandwidth limit (0 to 1024)</string>
-      </property>
-      <property name="toolTipDuration">
-       <number>5000</number>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-      <property name="maximum">
-       <number>1024</number>
-      </property>
-     </widget>
-    </item>
     <item row="0" column="2">
      <widget class="QComboBox" name="UnitCombobox">
       <property name="sizePolicy">
@@ -87,6 +57,22 @@
       </property>
      </widget>
     </item>
+    <item row="0" column="1">
+     <widget class="QSpinBox" name="spinBox">
+      <property name="toolTip">
+       <string>Enter the bandwidth limit (0 to 1024)</string>
+      </property>
+      <property name="toolTipDuration">
+       <number>5000</number>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="maximum">
+       <number>1024</number>
+      </property>
+     </widget>
+    </item>
     <item row="1" column="1">
      <widget class="QComboBox" name="comboBox">
       <property name="maxVisibleItems">
@@ -117,18 +103,32 @@
       </item>
       <item>
        <property name="text">
-        <string>Text follow icon</string>
+        <string>Text follow style</string>
        </property>
       </item>
      </widget>
     </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="label1">
+      <property name="text">
+       <string extracomment="Bandwidth limit">Bandwidth limit</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="label_2">
+      <property name="text">
+       <string>Toolbar view</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>60</x>
+     <x>150</x>
-     <y>110</y>
+     <y>160</y>
      <width>321</width>
      <height>34</height>
     </rect>
@@ -143,6 +143,34 @@
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
    </property>
   </widget>
+  <widget class="QWidget" name="verticalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>120</y>
+     <width>461</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QCheckBox" name="autosaveCheckbox">
+      <property name="toolTip">
+       <string>Automatic saving of download queue</string>
+      </property>
+      <property name="toolTipDuration">
+       <number>5000</number>
+      </property>
+      <property name="text">
+       <string>Auto save download queue</string>
+      </property>
+      <property name="checked">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <resources/>
  <connections>

downloadfile.cpp

@@ -25,85 +25,103 @@ downloadFile::downloadFile()
 }
 
 //Slot activated when download is cancelled
-void downloadFile::cancelled(int pid)
+void MainWindow::cancelled(QProcess * process)
 {
-    if (pid == 0)
+    bool n = 0;
+
+    process->terminate();
+    n = process->waitForFinished(30000);
+    if (n == false)
     {
-        perror("Pid = 0 : I do not kill");      // Error rsync process not launched so it can't be killed
+        process->close();
-    }else if (kill(pid, SIGTERM) == -1)
-    {
-        //TODO managing error of kill
     }
 }
 
 // launch a rsync processus downloading a file
-void downloadFile::download(MainWindow *mw)
+void MainWindow::download()
 {
-    string line;
+    QString cmd;
-    string errorRsync;
+    QStringList param;
-    int pos;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    array<string,8> argv;
-    stringstream output;
-    vector<string> v;
-    int value;
-    char buffer[4096];
-    Downloading d;
 
-    d = mw->downloading;
+    this->downloading.process = new QProcess(this);
-
+    if (!this->downloading.user.isEmpty())
-    // Populating array with command and parameters for popen2
-    argv[0] = "/usr/bin/rsync";
-    if (mw->connexion.bandwidthLimit == 0)
     {
-        argv[1] = "--bwlimit=1000P";
+        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->downloading.port);
+    param << "-aXP";
+    param << this->downloading.server + "::" + this->downloading.service + "/" + this->downloading.path << this->downloading.savePath + "/";
+
+
+
+    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)));
+    //connect(this->downloading.process, SIGNAL(readyReadStandardError()), this, SLOT(downloadProcessStderr()));
+    connect(this->downloading.process, SIGNAL(readyReadStandardOutput()), this, SLOT(readRsyncOutput()));
+
+    this->downloading.process->start(cmd, param);
+}
+
+void MainWindow::readRsyncOutput()
+{
+    QString line;
+    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
         {
-        argv[1] = "--bwlimit=" + to_string(mw->connexion.bandwidthLimit) + mw->connexion.bandwidthLimitUnit;
+            pos = line.indexOf("%");
-    }
-    argv[2] = "--port=" + to_string(mw->connexion.port);
-    argv[3] = "-aP";
-    argv[4] = d.server + "::" + d.service + "/" + d.path;
-    argv[5] = d.savePath + "/";
-    argv[6].clear();
-
-    //launching downloading thread
-    FILE * fp = popen2(argv, "r", mw->pid);
-    if (fp <= (FILE *) 0)
-    {
-        sprintf(buffer, "popen2() failed!: returning code:%d", fileno(fp));
-        throw runtime_error(buffer);
-        return;
-    }
-
-    // waiting rsync output
-    while (fgets(buffer, 4096, fp) != nullptr)
-    {
-        // Downloading is cancelled, we return
-        if (this->canceled == true)
-        {
-            return;
-        }
-        line = buffer;
-
-        // extracting percentage of completion
-        pos = line.find('%');
             if (pos != -1)
             {
-            line.erase(pos);
+                line = line.simplified();
-            pos = line.find_last_of(' ');
+                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.erase(0, pos);
+                        line.remove(0, pos);
-                value = stoi(line);
+                        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);
+                }
             }
         }
-        // download ended
     }
-    pclose2(fp, mw->pid);
-
-    // ProgressBar to 100% and emit signal finished to main application
-    emit progressSignal(100);
-    emit finishedSignal(true);
 }

downloadfile.h

@@ -13,15 +13,8 @@ class downloadFile : public QObject
     Q_OBJECT
 public:
     downloadFile();
-    void download(MainWindow *parent = nullptr);
     bool canceled;
 
-signals:
-    void progressSignal(int);
-    void finishedSignal(bool = true);
-
-public slots:
-    void cancelled(int pid);
 };
 
 #endif // DOWNLOADFILE_H

languages/fr_FR/RsyncUI_fr_FR.ts

@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fr_FR">
-<context>
-    <name>Configuration</name>
-    <message>
-        <location filename="../../configuration.ui" line="20"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="38"/>
-        <source>Toolbar view</source>
-        <translation>Toolbar</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="45"/>
-        <source>Bandwidth limit</source>
-        <extracomment>Bandwidth limit</extracomment>
-        <translation>Limite de bande passante</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="52"/>
-        <source>Enter the bandwidth limit (0 to 1024)</source>
-        <translation>Entrez la limite de bande passante (0 à 1024)</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="74"/>
-        <source>Select th unit of bandwidth limit in Bytes, KiloBytes, MegaBytes, GigaBytes or PetaBytes</source>
-        <extracomment>Unit of bandwidth</extracomment>
-        <translation>Sélectionnez l&apos;unité de limite de bande passante en otctets, Ko, Mo, Go, Po</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="100"/>
-        <source>Icon only</source>
-        <translation>Icône seule</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="105"/>
-        <source>Text only</source>
-        <translation>Texte seul</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="110"/>
-        <source>Text beside icon</source>
-        <translation>Text à côté de l&apos;icône</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="115"/>
-        <source>Text under icon</source>
-        <translation>Texte sous l&apos;icöne</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="120"/>
-        <source>Text follow icon</source>
-        <translation>Texte suit l&apos;icône</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../../mainwindow.ui" line="21"/>
-        <source>MainWindow</source>
-        <translation>Fenêtre principale</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="83"/>
-        <source>Server</source>
-        <oldsource>Serveur</oldsource>
-        <translation>Serveur</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="105"/>
-        <source>Enter server&apos;s URL</source>
-        <translation>Entrez l&apos;adresse du serveur</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="121"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="149"/>
-        <source>Enter rsync port on server</source>
-        <translation>Entrez le port du serveur rsync</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="186"/>
-        <source>Press button to connect to rsync server</source>
-        <extracomment>Connect to server</extracomment>
-        <translation>Cliquez pour se connecter au serveur rsync</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="192"/>
-        <source>Connection</source>
-        <translation>Connexion</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="195"/>
-        <source>Return</source>
-        <translation>Retour</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="221"/>
-        <source>Click to view the list of files of this folder</source>
-        <translation>Cliquez pour afficher la liste des documents</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="256"/>
-        <source>Click to add to download queue</source>
-        <translation>Cliquez pour ajouter à la file de téléchargement</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="334"/>
-        <source>Click on file to stop downloading</source>
-        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="357"/>
-        <source>%p%</source>
-        <extracomment>Downloading</extracomment>
-        <translation>Téléchargement</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="368"/>
-        <source>toolBar</source>
-        <translation>Barre d&apos;outils</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="440"/>
-        <source>Download</source>
-        <translation>Télécharger</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="443"/>
-        <source>Click on menu button to download the entire folder</source>
-        <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="405"/>
-        <location filename="../../mainwindow.ui" line="408"/>
-        <source>Change save folder</source>
-        <translation>Changer le dossier de destination</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="417"/>
-        <source>About</source>
-        <translation>À propos</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="426"/>
-        <source>About Qt</source>
-        <translation>À propos de Qt</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="435"/>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="28"/>
-        <source>Byte</source>
-        <translation>Octet</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="28"/>
-        <source>KB</source>
-        <translation>Ko</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="28"/>
-        <source>MB</source>
-        <translation>Mo</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="28"/>
-        <source>GB</source>
-        <translation>Go</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="28"/>
-        <source>TB</source>
-        <translation>To</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="28"/>
-        <location filename="../../mainwindow.cpp" line="698"/>
-        <source>PB</source>
-        <translation>Po</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="31"/>
-        <source>Client for rsync server
-
-You click on file to enqueue it, and RyncUI Download one file a time</source>
-        <translation>Client pour serveur rsync
-
-Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="42"/>
-        <source>Path</source>
-        <translation>Chemin</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="42"/>
-        <source>Size</source>
-        <translation>Taille</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="42"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="361"/>
-        <source>server does not exists</source>
-        <translation>Le serveur n&apos;existe pas</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="388"/>
-        <location filename="../../mainwindow.cpp" line="408"/>
-        <source>Dir</source>
-        <translation>Dir</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="391"/>
-        <location filename="../../mainwindow.cpp" line="456"/>
-        <source>File</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="634"/>
-        <source>Version</source>
-        <translation>Version</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="635"/>
-        <source>Licence</source>
-        <translation>License</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="636"/>
-        <source>Author</source>
-        <translation>Auteur</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="637"/>
-        <source>EMail</source>
-        <translation>Courriel</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="638"/>
-        <source>Source code</source>
-        <translation>Code source</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="663"/>
-        <source>Choose directory to save file</source>
-        <translation>Choisissez le dossier où enregistrer</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="563"/>
-        <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="66"/>
-        <source>A list of interrupted downloads exists, do you want to continue downloading ? or you can delete the list</source>
-        <translation>Voulez-vous reprendre les téléchargements interrompus la fois précédente? ou vous pouvez supprimer la liste</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="68"/>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="107"/>
-        <source>Exiting will stop downloading, and will clear the download queue.
-You can save the list of downloads
-Do you want to exit ?</source>
-        <translation>Si vous sortez, les téléchargements seront arrêter, mais vous pouvez enregistrer la liste pour la prochaine fois</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="575"/>
-        <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>
-</context>
-</TS>

main.cpp

@@ -9,15 +9,23 @@ int main(int argc, char *argv[])
 
     QCoreApplication::setOrganizationName("RsyncUI");
     QCoreApplication::setApplicationName("RsyncUI");
+
     // Initialization of localization
     QLocale localeName = QLocale::system();
-    QString localeFile = "/usr/share/locale/" + localeName.name()  + "/LC_MESSAGES/RsyncUI_" + localeName.name() + ".qm";
+    QString localeDir = "/usr/share/locale/" + localeName.name()  + "/LC_MESSAGES/"; //RsyncUI_" + localeName.name() + ".qm";
-    if (myappTranslator.load(localeFile))
+    QString localeFilename = QCoreApplication::applicationName() + "_" + localeName.name();
+    QLocale locale = QLocale();
+
+    if (myappTranslator.load(localeFilename, localeDir))
     {
           a.installTranslator(&myappTranslator);
     }
 
+    static const QString appName = "RsyncUI";
+
+    //Password passwdJob;
     MainWindow w;
     w.show();
+    w.init();
     return a.exec();
 }

mainwindow.h

@@ -4,11 +4,14 @@
 #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 "password.h"
 #include <QMainWindow>
 #include <string>
 #include <QTreeWidgetItem>
+#include <QList>
 #include <QListWidgetItem>
 #include <QProgressDialog>
 #include <QSettings>
@@ -22,8 +25,6 @@
 #include <cstdio>
 #include <QMessageBox>
 #include <boost/algorithm/string/replace.hpp>
-#include <QFuture>
-#include <qtconcurrentrun.h>
 #include <QFileDialog>
 #include <QThread>
 #include <QProgressDialog>
@@ -36,38 +37,58 @@
 #include <QComboBox>
 #include <QStringBuilder>
 #include <pwd.h>
+#include <QProcess>
+#include <QToolBar>
+#include <QDir>
+#include <QSystemTrayIcon>
+#include <QMenu>
+#include <QTranslator>
+#include <QInputDialog>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
 QT_END_NAMESPACE
 
+extern QMap<int, QString> rsyncErrorStrings;
+
 class Connexion
 {
     public:
         int bandwidthLimit = 0;
-        std::string bandwidthLimitUnit = "";
+        int bandwidthLimitUnit;
-        std::string server;
+        int contimeout = 20;
-        std::string service;
+        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
 {
     public:
-        std::string server;
+        QString server;
-        std::string service;
+        QString service;
-        std::string path;
+        QString path;
-        std::string savePath;
+        QString savePath;
-
+        QString user;
+        QString password;
+        int port = 873;
+        QProcess * process = nullptr;
+        bool quit = false;
         void clear();
 };
 
 class About
 {
     public:
-        QString title = "RsyncUI";
+        QString version = "2.10.1";
-        QString version = "1.8.7";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
         QString description;
@@ -83,39 +104,72 @@ class MainWindow : public QMainWindow
         Ui::MainWindow *ui;
         MainWindow(QWidget *parent = nullptr);
         ~MainWindow();
+        // passwdManager;
         QProgressDialog *progress;
-        int pid = 0;
         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;
-        map<char, int> bwUnixIndex {
+        QSystemTrayIcon * trayIcon;
-            {'B', 0},
+        QString icon = "/usr/share/icons/RsyncUI.png";
-            {'K', 1},
+        bool rescan = false;
-            {'M', 2},
+        bool stopDlAsked;
-            {'G', 3},
+
-            {'P', 4}
+        QList<QString> UnitText {
+            tr("B"),
+            tr("KB"),
+            tr("MB"),
+            tr("GB"),
+            tr("TB"),
+            tr("PB")
+            };
+        QList<QChar> bwUnitChar{
+            'K',
+            'M',
+            'T',
+            'G',
+            'P'
+        };
+
+        QVector<QString> downloadProcessErrorString =
+        {
+            tr("The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program."),
+            tr("The process crashed some time after starting successfully."),
+            tr("The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again."),
+            tr("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."),
+            tr("An error occurred when attempting to read from the process. For example, the process may not be running."),
+            tr("An unknown error occurred. This is the default return value of error().")
         };
 
         void displayTree();
-        void populateTree(QTreeWidgetItem * parent);
+        void populateTree();
-        void populateList();
+        void populateList(int);
         void listServices();
-        bool validateServer(std::string server);
+        bool validateServer(QString server);
-        bool isIpAddress(std::string 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(std::string server, int portN, QTreeWidgetItem *parent = NULL, std::string path = "" );
         void startDownloading();
         void loadSettings();
         void saveSettings();
         void closeEvent (QCloseEvent *event);
         void saveDownloadList();
         void loadDownloadList();
+        void download();
+        void initSystemTrayIcon();
+        void hideWindow();
+        void showWindow();
+        void init();
+        bool getUserPassword(Connexion *);
+        void preparePopulateTree();
+        bool testServicePresence(QString, bool=false);
+        void passwordStore (QString account, QString password);
+        QString passwordGet (QString account);
 
     private slots:
 
@@ -123,7 +177,9 @@ class MainWindow : public QMainWindow
 
         void on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadDir = false);
 
-        void downloadFinished();
+        void downloadFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
+        void readRsyncOutput();
 
         void stoppingDownload();
 
@@ -143,11 +199,31 @@ class MainWindow : public QMainWindow
 
         void on_actionDownload_triggered();
 
-public slots:
+        //void downloadingErrorSlot(QString);
+
+        void on_comboBox_currentIndexChanged(int index);
+
         void on_buttonBox_accepted();
 
-    signals:
+        void cancelled(QProcess *);
-        void stopDownloading(int);
+
+        void on_trayIcon_clicked(QSystemTrayIcon::ActivationReason reason);
+
+        void quitApp();
+
+        void on_actionExit_triggered();
+
+        void setDlSpeed(QString speed);
+
+        void on_actionHiddenService_triggered();
+
+signals:
+        void stopDownloading(QProcess *);
+        void progressSignal(int);
+        void speed(QString);
+        void finishedSignal(bool = true);
+        void fileName(QString);
+        void passwordReady();
 };
 
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -20,6 +20,10 @@
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
+  <property name="windowIcon">
+   <iconset theme="/usr/share/icons/RsyncUI.png">
+    <normaloff>.</normaloff>.</iconset>
+  </property>
   <property name="toolButtonStyle">
    <enum>Qt::ToolButtonTextUnderIcon</enum>
   </property>
@@ -271,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>
@@ -321,6 +325,9 @@
            <property name="inputMethodHints">
             <set>Qt::ImhNoAutoUppercase</set>
            </property>
+           <property name="placeholderText">
+            <string>Filter...</string>
+           </property>
           </widget>
          </item>
         </layout>
@@ -353,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>
@@ -392,9 +402,11 @@
     <bool>false</bool>
    </attribute>
    <addaction name="DefaultSaveFolder"/>
+   <addaction name="actionHiddenService"/>
    <addaction name="action_Settings"/>
    <addaction name="actionAbout"/>
    <addaction name="actionAbout_Qt"/>
+   <addaction name="actionExit"/>
   </widget>
   <action name="DefaultSaveFolder">
    <property name="icon">
@@ -443,6 +455,30 @@
     <string>Click on menu button to download the entire folder</string>
    </property>
   </action>
+  <action name="actionExit">
+   <property name="icon">
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>Exit</string>
+   </property>
+   <property name="toolTip">
+    <string>Terminate the program</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <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,55 @@
+#include "mainwindow.h"
+#include "password.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+#include <QSettings>
+
+using namespace std;
+extern QApplication a;
+
+QString appName = "RsyncUI";
+
+static QSettings sett{appName, appName};
+
+void setPassword(QString account, QString pass)
+{
+    QKeychain::WritePasswordJob write(appName);
+    write.setSettings(&sett);
+   // write.setAutoDelete(false);
+    write.setKey(account);
+    write.setTextData(pass);
+
+    QEventLoop loop;
+    write.connect(&write, &QKeychain::WritePasswordJob::finished, &loop, &QEventLoop::quit);
+
+    write.start();
+    loop.exec();
+
+    if(write.error())
+        cout << "Error writing key1. Error: " << write.errorString().toStdString();
+}
+
+QString getPassword(const QString& name)
+{
+    QKeychain::ReadPasswordJob readPass(appName);
+    readPass.setSettings(&sett);
+   // readPass.setAutoDelete(false);
+    readPass.setKey(name);
+
+    QEventLoop loop;
+    readPass.connect(&readPass, &QKeychain::ReadPasswordJob::finished, &loop, &QEventLoop::quit);
+
+    readPass.start();
+    loop.exec();
+
+    if(readPass.error())
+    {
+        cout << "KeyHandler~Error reading decrypt Pass. Error: " + readPass.errorString() . toStdString() << endl;
+        return "";
+    }
+    else
+    {
+        QString data = readPass.textData();
+        return data;
+    }
+}

password.h

@@ -0,0 +1,35 @@
+#ifndef PASSWORD_H
+#define PASSWORD_H
+
+#include "mainwindow.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+
+extern QApplication a;
+
+void setPassword(QString account, QString pass);
+QString getPassword(const QString& name);
+
+/*class Password : QObject
+{
+    public:
+        QString appName;
+        QKeychain::WritePasswordJob * passwdJob;
+        QKeychain::ReadPasswordJob * readPass;
+        MainWindow * mw;
+        QString password;
+        QSettings passwdSettings{a.applicationName(),a.applicationName()};
+
+        Password();
+        ~Password();
+
+        void store(QString, QString);
+        QString read(QString);
+        bool remove(QString);
+
+    private slots:
+        void storeFinished();
+        void readFinished();
+};*/
+
+#endif // PASSWORD_H

tools.cpp

@@ -5,6 +5,9 @@ using namespace std;
 #define READ   0
 #define WRITE  1
 
+extern QMap<int, QString> rsyncErrorStrings;
+extern QApplication a;
+
 //Take a string and explode it in array
 // s => string to explode
 // c => character separator
@@ -41,90 +44,29 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
     return v;
 }
 
-// open a pipe, fork and return pid of child
+// test return code of rsync
-// argv => array of string with command in first and parameters following
+// return true in case of error
-FILE * popen2(array<string,8> argv, string type, int & pid)
+bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
 {
-    pid_t child_pid;
+    if (myProcess->exitStatus() != 0 and w->stopDlAsked != true)
-    int fd[2];
-    QString message;
-    string command;
-
-    if (pipe(fd) == -1)
     {
-        message = "Open pipe failed" + QString::fromStdString(strerror(errno));
         QMessageBox::warning(
-        NULL,
+                   w,
-        "RsyncUI",
+                   a.applicationName(),
-        message);
+                   myProcess->errorString(),
-        exit(-1);
+                   QMessageBox::Ok,
-    }else
+                   QMessageBox::Ok);
-    {
+        return true;
-        if((child_pid = fork()) == -1)
-        {
-            perror("fork");
-            exit(1);
     }
-
+    w->stopDlAsked = false;
-        /* child process */
+    return false;
-        if (child_pid == 0)
-        {
-            if (type == "r")
-            {
-                close(fd[READ]);    //Close the READ end of the pipe since the child's fd is write-only
-                dup2(fd[WRITE], 1); //Redirect stdout to pipe
-            }
-            else
-            {
-                close(fd[WRITE]);    //Close the WRITE end of the pipe since the child's fd is read-only
-                dup2(fd[READ], 0);   //Redirect stdin to pipe
-            }
-
-            setpgid(child_pid, child_pid); //Needed so negative PIDs can kill children of /bin/sh
-            //TODO : change for execvp
-
-            if (execlp(argv[0].c_str(), argv[0].c_str(), argv[1].c_str(), argv[2].c_str(), argv[3].c_str(), argv[4].c_str(), argv[5].c_str(), NULL ) == -1)
-            exit (0);
-        }
-        else
-        {
-            if (type == "r")
-            {
-                close(fd[WRITE]); //Close the WRITE end of the pipe since parent's fd is read-only
-            }
-            else
-            {
-                close(fd[READ]); //Close the READ end of the pipe since parent's fd is write-only
-            }
-        }
-
-        pid = child_pid;
-        if (type == "r")
-        {
-            return fdopen(fd[READ], "r");
-        }
-        return fdopen(fd[WRITE], "w");
-    }
-    return 0;
 }
 
-// close pipe open by popen2 while pid is finished
+QString getFileType(QString filename)
-// fp => file pointer
-// pid => pid of the processus open bu popen2
-
-int pclose2(FILE * fp, pid_t pid)
 {
-    int stat;
+    QMimeDatabase db;
-
+    QMimeType mime = db.mimeTypeForFile(filename);
-    fclose(fp);
+    QString returnValue = mime.name().section('/',0 ,0);
-    while (waitpid(pid, &stat, 0) == -1)
+    return returnValue;
-    {
-        if (errno != EINTR)
-        {
-            stat = -1;
-            break;
-        }
-    }
-    return stat;
 }
 

tools.h

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