version 2.6

translation
Added support for password protected services
2023-03-01 14:25:31 +01:00 · 2023-03-01 14:25:06 +01:00 · 2023-03-01 14:12:38 +01:00 · 2023-02-27 23:48:05 +01:00 · 2023-02-22 00:57:07 +01:00 · 2023-02-22 00:53:29 +01:00
16 changed files with 1086 additions and 247 deletions
--- a/README_FR.md
+++ b/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.
--- a/RsyncUI.desktop
+++ b/RsyncUI.desktop
@ -6,7 +6,7 @@ Comment=Client for rsync servers
 Comment[fr]=Client pour serveur rsync
 Version=1.0
 Exec=RsyncUI
-Icon=
+Icon=/usr/share/icons/RsyncUI.png
 Type=Application
 Terminal=false
 StartupNotify=true
--- a/RsyncUI.pro
+++ b/RsyncUI.pro
@ -27,7 +27,9 @@ HEADERS += \
    tools.h

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

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

 Name: rsyncui
 Summary: Client for rsync server
-Version: 1.9.2
+Version: 2.6
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access
--- a/RsyncUI_fr_FR.ts
+++ b/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,268 +102,361 @@
        <translation>Fenêtre principale</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="83"/>
+        <location filename="mainwindow.ui" line="87"/>
        <source>Server</source>
        <oldsource>Serveur</oldsource>
        <translation>Serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="105"/>
+        <location filename="mainwindow.ui" line="109"/>
        <source>Enter server&apos;s URL</source>
        <translation>Entrez l&apos;adresse du serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="121"/>
+        <location filename="mainwindow.ui" line="125"/>
        <source>Port</source>
        <translation>Port</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="149"/>
+        <location filename="mainwindow.ui" line="153"/>
        <source>Enter rsync port on server</source>
        <translation>Entrez le port du serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="186"/>
+        <location filename="mainwindow.ui" line="190"/>
        <source>Press button to connect to rsync server</source>
        <extracomment>Connect to server</extracomment>
        <translation>Cliquez pour se connecter au serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="192"/>
+        <location filename="mainwindow.ui" line="196"/>
        <source>Connection</source>
        <translation>Connexion</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="195"/>
+        <location filename="mainwindow.ui" line="199"/>
        <source>Return</source>
        <translation>Retour</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="221"/>
+        <location filename="mainwindow.ui" line="225"/>
        <source>Click to view the list of files of this folder</source>
        <translation>Cliquez pour afficher la liste des documents</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="256"/>
+        <location filename="mainwindow.ui" line="260"/>
        <source>Click to add to download queue</source>
        <translation>Cliquez pour ajouter à la file de téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="334"/>
+        <location filename="mainwindow.ui" line="338"/>
        <source>Click on file to stop downloading</source>
        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="357"/>
+        <location filename="mainwindow.ui" line="364"/>
        <source>%p%</source>
        <extracomment>Downloading</extracomment>
        <translation>Téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="368"/>
+        <location filename="mainwindow.ui" line="375"/>
        <source>toolBar</source>
        <translation>Barre d&apos;outils</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="440"/>
+        <location filename="mainwindow.ui" line="448"/>
        <source>Download</source>
        <translation>Télécharger</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="443"/>
+        <location filename="mainwindow.ui" line="451"/>
        <source>Click on menu button to download the entire folder</source>
        <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="405"/>
-        <location filename="mainwindow.ui" line="408"/>
+        <location filename="mainwindow.ui" line="460"/>
+        <source>Exit</source>
+        <translation>Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="463"/>
+        <source>Terminate the program</source>
+        <translation>Terminer le programme</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="466"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="413"/>
+        <location filename="mainwindow.ui" line="416"/>
        <source>Change save folder</source>
        <translation>Changer le dossier de destination</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="425"/>
        <source>About</source>
        <translation>À propos</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="434"/>
        <source>About Qt</source>
        <translation>À propos de Qt</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="443"/>
        <source>Settings</source>
        <translation>Paramètres</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>KB</source>
        <translation>Ko</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>MB</source>
        <translation>Mo</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>GB</source>
        <translation>Go</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>TB</source>
        <translation>To</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>PB</source>
        <translation>Po</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="50"/>
-        <source>Client for rsync server
+        <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.

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

-Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement</translation>
+&lt;h3&gt;Barre d&apos;outils&lt;/h3&gt;
+&lt;b&gt;1er icône: Changer le dossier de destination&lt;/b&gt;&lt;br&gt;
+    Permet de changer le dossier de téléchargement par défaut pour chaque service de chaque serveur.&lt;br&gt;
+&lt;b&gt;2ème icône: Paramètres de l&apos;application&lt;/b&gt;&lt;br&gt;
+    Limite de bande passante: permet de limiter le débit de téléchargement en Ko, Mo, Go, To et Po.&lt;br&gt;
+    Si la valeur est 0 alors pas de limite de la vitesse de téléchargement.&lt;br&gt;
+ - Affichage de la barre d&apos;outils&lt;br&gt;
+    Permet de choisir le style d&apos;affichage des icônes de la barre d&apos;outils&lt;br&gt;
+ - Enregistrement automatique&lt;br&gt;
+    Enregistre automatiquement la liste des téléchargements en cours.(activé par défaut)&lt;br&gt;
+&lt;b&gt;3ème icône: À propos&lt;/b&gt;&lt;br&gt;
+    affiche les propriétés de l&apos;application, ainsi que l&apos;aide.&lt;br&gt;
+&lt;b&gt;4ème icône: À propos de QT&lt;/b&gt;&lt;br&gt;
+    affiche les propriétés de QT&lt;br&gt;
+&lt;b&gt;5ème icône: Quitter&lt;/b&gt;&lt;br&gt;
+    Permet de quitter le programme</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="62"/>
+        <source>&lt;h2&gt;Client for rsync server&lt;2&gt;&lt;br&gt;&lt;br&gt;</source>
+        <translation type="vanished">&lt;h2&gt;Client pour  serveur rsync&lt;2&gt;&lt;br&gt;&lt;br&gt;éaa</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="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="92"/>
+        <location filename="mainwindow.cpp" line="122"/>
        <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
        <translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="393"/>
+        <location filename="mainwindow.cpp" line="151"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="208"/>
+        <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="214"/>
+        <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="252"/>
+        <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="492"/>
+        <source>The processus does&apos;nt respond: </source>
+        <translation>Le processus ne répond pas: </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="578"/>
        <source>server does not exists</source>
        <translation>Le serveur n&apos;existe pas</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="421"/>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="606"/>
+        <location filename="mainwindow.cpp" line="626"/>
        <source>Dir</source>
        <translation>dossier</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="424"/>
-        <location filename="mainwindow.cpp" line="487"/>
+        <location filename="mainwindow.cpp" line="610"/>
+        <location filename="mainwindow.cpp" line="740"/>
        <source>File</source>
        <translation>Doc</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="561"/>
+        <location filename="mainwindow.cpp" line="751"/>
+        <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="768"/>
+        <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="805"/>
+        <source>File is already downloading</source>
+        <translation>Le document est déjà en téléchargement</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="830"/>
+        <source>Starting downloading
+</source>
+        <translation>Démarrage du téléchargement
+</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="845"/>
+        <source>finished</source>
+        <translation>Terminé</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="853"/>
        <source>Rsync process crashed</source>
        <translation>Le processus rsync à planté</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="699"/>
+        <location filename="mainwindow.cpp" line="865"/>
+        <source>stopped by user</source>
+        <translation>stoppé par l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="871"/>
+        <source>Download </source>
+        <translation>Téléchargement </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="56"/>
        <source>Version</source>
        <translation>Version</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="700"/>
+        <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="701"/>
+        <location filename="mainwindow.cpp" line="58"/>
        <source>Author</source>
        <translation>Auteur</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="702"/>
+        <location filename="mainwindow.cpp" line="59"/>
        <source>EMail</source>
        <translation>Courriel</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="703"/>
+        <location filename="mainwindow.cpp" line="60"/>
        <source>Source code</source>
        <translation>Code source</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="725"/>
+        <location filename="mainwindow.cpp" line="1036"/>
        <source>Since the save path is linked to service, you need to select a service before you can select a folder</source>
        <translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="728"/>
+        <location filename="mainwindow.cpp" line="1041"/>
        <source>Choose folder where to save file</source>
        <translation>Choisissez un dossier où enregistrer le document</translation>
    </message>
    <message>
-        <source>Choose directory to save file</source>
-        <translation type="vanished">Choisissez le dossier où enregistrer</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="620"/>
+        <location filename="mainwindow.cpp" line="932"/>
        <source>Do you want to stop downloading and delete this file from download queue ?</source>
        <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
    </message>
    <message>
-        <source>A list of interrupted downloads exists, do you want to continue downloading ? or you can delete the list</source>
-        <translation type="vanished">Voulez-vous reprendre les téléchargements interrompus la fois précédente? ou vous pouvez supprimer la liste</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="vanished">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="135"/>
-        <source>Exiting will stop downloading, and will clear the download queue.
-You can save the list of downloads
-Do you want to exit ?</source>
-        <translatorcomment>i</translatorcomment>
-        <translation>Si vous sortez, les téléchargements seront arrêter, mais vous pouvez enregistrer la liste pour la prochaine fois.
-Voulez-vous vraiment sortir ?</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="632"/>
+        <location filename="mainwindow.cpp" line="946"/>
        <source>Do you want to delete this file from download queue ?</source>
        <translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="118"/>
+        <location filename="mainwindow.h" line="137"/>
        <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program.</source>
        <translation>Le processus échoué, soit le programme est manquant, soit vous n&apos;avez pas l&apos;autorisation de l&apos;exécuter.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="119"/>
+        <location filename="mainwindow.h" line="138"/>
        <source>The process crashed some time after starting successfully.</source>
        <translation>Le processus à planté après avoir démarré avec succès.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="120"/>
+        <location filename="mainwindow.h" line="139"/>
        <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
        <translation>La fonction waitFor...() a dépassé la limite de temps, you pouvez essayer de la relancer.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="121"/>
+        <location filename="mainwindow.h" line="140"/>
        <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
        <translation>Une erreur est survenue lors de l&apos;envoi des données vers le processus. Le processus est peut être arrté ou il a fermé son canal d&apos;entrée.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="122"/>
+        <location filename="mainwindow.h" line="141"/>
        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
        <translation>Une erreur est survenue lors de la lecturee de données, le processus est probablement arrêté.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="123"/>
+        <location filename="mainwindow.h" line="142"/>
        <source>An unknown error occurred. This is the default return value of error().</source>
        <translation>Une erreur inconnue est survenue. C&apos;est la valeur de retour par défaut de error().</translation>
    </message>
@ -428,4 +549,12 @@ Voulez-vous vraiment sortir ?</translation>
        <translation>Transfert partiel dû à la disparition des fichiers source. Des fichiers source ont disparu avec d&apos;avoir été transférés.</translation>
    </message>
 </context>
+<context>
+    <name>windowAbout</name>
+    <message>
+        <location filename="about.ui" line="23"/>
+        <source>About RsyncUI</source>
+        <translation>À propos de RsyncUI</translation>
+    </message>
+</context>
 </TS>
--- a/about.ui
+++ b/about.ui
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>windowAbout</class>
+ <widget class="QWidget" name="windowAbout">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>387</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>About RsyncUI</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>../../../../usr/share/icons/RsyncUI.png</normaloff>../../../../usr/share/icons/RsyncUI.png</iconset>
+  </property>
+  <property name="autoFillBackground">
+   <bool>true</bool>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetNoConstraint</enum>
+     </property>
+     <item>
+      <widget class="QTextEdit" name="TextAbout">
+       <property name="autoFormatting">
+        <set>QTextEdit::AutoAll</set>
+       </property>
+       <property name="undoRedoEnabled">
+        <bool>false</bool>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/downloadfile.cpp
+++ b/downloadfile.cpp
@ -27,7 +27,14 @@ downloadFile::downloadFile()
 //Slot activated when download is cancelled
 void MainWindow::cancelled(QProcess * process)
 {
+    bool n = 0;
+
    process->terminate();
+    n = process->waitForFinished(30000);
+    if (n == false)
+    {
+        process->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,26 +77,50 @@ void MainWindow::readRsyncOutput()
    bool flag = false;
    int value;
    int pos;
+    static QString dlSpeed;
+    QStringList list;
+    static QString filename;
+    int i;
+    int listSize;

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

+// process raise error
 void MainWindow::downloadProcessStderr()
 {
    QByteArray errorLine;
--- a/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
+++ b/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
--- a/login.ui
+++ b/login.ui
@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LoginDialog</class>
+ <widget class="QDialog" name="LoginDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>194</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>RsyncUI request</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <widget class="QDialogButtonBox" name="loginBox">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>150</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+  <widget class="QWidget" name="verticalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>381</width>
+     <height>121</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Login name</string>
+      </property>
+      <property name="textFormat">
+       <enum>Qt::PlainText</enum>
+      </property>
+      <property name="textInteractionFlags">
+       <set>Qt::NoTextInteraction</set>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="loginEdit">
+      <property name="mouseTracking">
+       <bool>false</bool>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::TabFocus</enum>
+      </property>
+      <property name="acceptDrops">
+       <bool>false</bool>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="maxLength">
+       <number>32767</number>
+      </property>
+      <property name="placeholderText">
+       <string>Enter login</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="label_2">
+      <property name="text">
+       <string>Password</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="passwordEdit">
+      <property name="focusPolicy">
+       <enum>Qt::TabFocus</enum>
+      </property>
+      <property name="acceptDrops">
+       <bool>false</bool>
+      </property>
+      <property name="echoMode">
+       <enum>QLineEdit::Password</enum>
+      </property>
+      <property name="placeholderText">
+       <string>Enter password</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>loginBox</sender>
+   <signal>accepted()</signal>
+   <receiver>LoginDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>loginBox</sender>
+   <signal>rejected()</signal>
+   <receiver>LoginDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
--- a/main.cpp
+++ b/main.cpp
@ -9,15 +9,20 @@ int main(int argc, char *argv[])

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

    MainWindow w;
    w.show();
+    w.init();
    return a.exec();
 }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
--- a/mainwindow.h
+++ b/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 "ui_login.h"
 #include "downloadfile.h"
 #include "tools.h"
 #include <QMainWindow>
 #include <string>
 #include <QTreeWidgetItem>
+#include <QList>
 #include <QListWidgetItem>
 #include <QProgressDialog>
 #include <QSettings>
@ -39,6 +42,10 @@
 #include <QProcess>
 #include <QToolBar>
 #include <QDir>
+#include <QSystemTrayIcon>
+#include <QMenu>
+#include <QTranslator>
+#include <QInputDialog>

 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@ -53,6 +60,8 @@ class Connexion
        int bandwidthLimitUnit;
        QString server;
        QString service;
+        QString user;
+        QString password;
        int port = 873;
        bool comboboxChanged;
 };
@ -64,8 +73,11 @@ class Downloading
        QString service;
        QString path;
        QString savePath;
+        QString user;
+        QString password;
+        int port = 873;
        QProcess * process = nullptr;
-
+        bool quit = false;
        void clear();
 };

@ -73,7 +85,7 @@ class About
 {
    public:
        QString title = "RsyncUI";
-        QString version = "1.9.2";
+        QString version = "2.6";
        QString author = "Daniel TARTAVEL-JEANNOT";
        QString licence = "GPL_V3";
        QString description;
@ -92,12 +104,19 @@ class MainWindow : public QMainWindow
        QProgressDialog *progress;
        Connexion connexion;
        Downloading downloading;
-        //downloadFile downloadO;
        QSettings settings;
        About about;
        QDialog Configuration;
        Ui::Configuration config;
+        QDialog aboutDialog;
+        Ui::windowAbout AboutW;
+        QDialog loginDialog;
+        Ui::LoginDialog loginD;
        std::vector <QString> serversList;
+        QSystemTrayIcon * trayIcon;
+        QString icon = "/usr/share/icons/RsyncUI.png";
+        bool rescan = false;
+
        QList<QString> bwUnitText {
            "KB",
            "MB",
@ -131,7 +150,7 @@ class MainWindow : public QMainWindow
        bool isIpAddress(QString server);
        QTreeWidgetItem * addTreeRoot(QString name, QString description, bool isDir);
        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, bool isDir);
-        void scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
+        bool scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
        void startDownloading();
        void loadSettings();
        void saveSettings();
@ -139,6 +158,11 @@ class MainWindow : public QMainWindow
        void saveDownloadList();
        void loadDownloadList();
        void download();
+        void initSystemTrayIcon();
+        void hideWindow();
+        void showWindow();
+        void init();
+        bool getUserPassword(bool);

    private slots:

@ -180,12 +204,23 @@ class MainWindow : public QMainWindow

        void cancelled(QProcess *);

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

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

-bool testRsyncReturn(QProcess * myProcess)
+// test return code of rsync
+bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
 {
    if (myProcess->exitStatus() != 0)
    {
@ -54,6 +55,9 @@ bool testRsyncReturn(QProcess * myProcess)
                   QMessageBox::Ok,
                   QMessageBox::Ok);
        return true;
+    }else if (myProcess->exitCode() == 5)
+    {
+        w->loginDialog.show();
    }else if (myProcess->exitCode() != 0)
    {
        QMessageBox::warning(
@ -66,3 +70,5 @@ bool testRsyncReturn(QProcess * myProcess)
    }
    return false;
 }
+
+
--- a/tools.h
+++ b/tools.h
@ -1,6 +1,7 @@
 #ifndef TOOLS_H
 #define TOOLS_H

+#include "mainwindow.h"
 #include <string>
 #include <vector>
 #include <array>
@ -17,7 +18,6 @@ FILE * popen2(array<string,8> argv, string type, int & pid);

 int pclose2(FILE * fp, pid_t pid);

-bool testRsyncReturn(QProcess *);
-
+bool testRsyncReturn(MainWindow *, QProcess *);

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