version 2.1.3

- added  warning when selecting a file which is already in download
  queue

README_FR.md

@@ -0,0 +1,5 @@
+# RsyncUI
+
+client Rsync - QT5 - KDE
+
+#Compilation:

RsyncUI.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+
+Name=RsyncUI
+GenericName=rsync client
+Comment=Client for rsync servers
+Comment[fr]=Client pour serveur rsync
+Version=1.0
+Exec=RsyncUI
+Icon=/usr/share/icons/RsyncUI.png
+Type=Application
+Terminal=false
+StartupNotify=true
+Categories=Network
+Keywords=internet,rsync
+

RsyncUI.pro

@@ -31,7 +31,7 @@ FORMS += \
     mainwindow.ui
 
 TRANSLATIONS += \
-    languages/fr_FR/RsyncUI_fr_FR.ts
+    RsyncUI_fr_FR.ts
 
 INCLUDEPATH += \
     /usr/include/KF5
@@ -41,6 +41,22 @@ 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
+INSTALLS += icon
+
+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

RsyncUI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-01-11T01:16:59. -->
+<!-- Written by QtCreator 4.14.2, 2023-02-11T01:13:28. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

RsyncUI.spec

@@ -0,0 +1,59 @@
+%define oname RsyncUI
+
+Name: rsyncui
+Summary: Client for rsync server
+Version: 2.1.3
+Release: %mkrel 1
+License: GPLv3
+Group: Networking/Remote access
+Source0: %{oname}-%{version}.tar.gz
+Packager: dtux@free.fr
+Distribution: Mageia
+Url: https://www.librepc.fr
+Vendor: DTux
+BuildRequires:      qmake
+BuildRequires:      make
+BuildRequires:      pkgconfig(Qt5Core)
+BuildRequires:      pkgconfig(Qt5Gui)
+BuildRequires:      pkgconfig(Qt5Concurrent)
+BuildRequires:      pkgconfig(Qt5Widgets)
+BuildRequires:      pkgconfig(Qt5Xml)
+BuildRequires:      pkgconfig(libmagic)
+BuildRequires:      cmake(KF5Completion)
+BuildRequires:      cmake(KF5CoreAddons)
+BuildRequires:      cmake(KF5I18n)
+BuildRequires:      cmake(KF5DBusAddons)
+BuildRequires:      cmake(KF5Config)
+BuildRequires:      cmake(KF5ItemViews)
+BuildRequires:      pstreams-devel
+BuildRequires:      boost-devel
+
+#Requires:       kitemviews
+#Requires:       kcompletion
+#Requires:       kcoreaddons
+#Requires:       kdbusaddons
+Requires:       rsync
+Requires:       bind-utils
+
+%global debug_package %{nil}
+
+%description
+RsyncUI can connect to an rsync server, get the list of services,
+and download files.
+
+%prep
+%setup -q  -n %{oname}
+
+%build
+%make_build
+
+%install
+INSTALL_ROOT=%{buildroot} make install
+
+%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,459 @@
+<?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>MainWindow</name>
+    <message>
+        <location filename="mainwindow.ui" line="21"/>
+        <source>MainWindow</source>
+        <translation>Fenêtre principale</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="86"/>
+        <source>Server</source>
+        <oldsource>Serveur</oldsource>
+        <translation>Serveur</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="108"/>
+        <source>Enter server&apos;s URL</source>
+        <translation>Entrez l&apos;adresse du serveur</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="124"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="152"/>
+        <source>Enter rsync port on server</source>
+        <translation>Entrez le port du serveur rsync</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="189"/>
+        <source>Press button to connect to rsync server</source>
+        <extracomment>Connect to server</extracomment>
+        <translation>Cliquez pour se connecter au serveur rsync</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="195"/>
+        <source>Connection</source>
+        <translation>Connexion</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="198"/>
+        <source>Return</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="224"/>
+        <source>Click to view the list of files of this folder</source>
+        <translation>Cliquez pour afficher la liste des documents</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="259"/>
+        <source>Click to add to download queue</source>
+        <translation>Cliquez pour ajouter à la file de téléchargement</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="337"/>
+        <source>Click on file to stop downloading</source>
+        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="360"/>
+        <source>%p%</source>
+        <extracomment>Downloading</extracomment>
+        <translation>Téléchargement</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="371"/>
+        <source>toolBar</source>
+        <translation>Barre d&apos;outils</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="444"/>
+        <source>Download</source>
+        <translation>Télécharger</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="447"/>
+        <source>Click on menu button to download the entire folder</source>
+        <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="455"/>
+        <source>Exit</source>
+        <translation>Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="458"/>
+        <source>Terminate the program</source>
+        <translation>Terminer le programme</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="461"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="412"/>
+        <source>Change save folder</source>
+        <translation>Changer le dossier de destination</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="421"/>
+        <source>About</source>
+        <translation>À propos</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="430"/>
+        <source>About Qt</source>
+        <translation>À propos de Qt</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="439"/>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="90"/>
+        <source>KB</source>
+        <translation>Ko</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="90"/>
+        <source>MB</source>
+        <translation>Mo</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="90"/>
+        <source>GB</source>
+        <translation>Go</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="90"/>
+        <source>TB</source>
+        <translation>To</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="90"/>
+        <source>PB</source>
+        <translation>Po</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="50"/>
+        <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="62"/>
+        <source>Path</source>
+        <translation>Chemin</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="62"/>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="62"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="97"/>
+        <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
+        <translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="125"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="182"/>
+        <source>Clicking Save button, You can save the list of downloads
+</source>
+        <translation>Vous pouvez enregistrer la liste des téléchargements en cliquant sur &quot;enregister&quot;
+</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="187"/>
+        <source>Exiting will stop downloading, and will clear the download queue.
+Do you want to exit ?</source>
+        <translation>Si vous sortez, les téléchargements seront arrêter.
+Voulez-vous vraiment sortir ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="216"/>
+        <source>The program will keep running in the system tray. To terminate the program, choose &lt;b&gt;Quit&lt;/b&gt; in the context menu of the system tray entry.</source>
+        <translation>Le programme continue dans la boîte à miniatures. Pour quitter le programme cliquez sur l&apos;icône &lt;b&gt;Quitter&lt;/b&gt; ou dans les menu contextuel.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="502"/>
+        <source>server does not exists</source>
+        <translation>Le serveur n&apos;existe pas</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="529"/>
+        <location filename="mainwindow.cpp" line="549"/>
+        <source>Dir</source>
+        <translation>dossier</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="533"/>
+        <location filename="mainwindow.cpp" line="617"/>
+        <source>File</source>
+        <translation>Doc</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="626"/>
+        <source>File is already downloaded. Do you want to reload it ? The old file will be deleted</source>
+        <translation>Le document est déjà téléchargé. Voulez-vous le télécharger à nouveau ? L&apos;ancien fichier sera effacé</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="661"/>
+        <source>File is already downloading</source>
+        <translation>Le document est déjà en téléchargement</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="705"/>
+        <source>Rsync process crashed</source>
+        <translation>Le processus rsync à planté</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="861"/>
+        <source>Version</source>
+        <translation>Version</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="862"/>
+        <source>Licence</source>
+        <translation>License</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="863"/>
+        <source>Author</source>
+        <translation>Auteur</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="864"/>
+        <source>EMail</source>
+        <translation>Courriel</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="865"/>
+        <source>Source code</source>
+        <translation>Code source</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="888"/>
+        <source>Since the save path is linked to service, you need to select a service before you can select a folder</source>
+        <translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="893"/>
+        <source>Choose folder where to save file</source>
+        <translation>Choisissez un dossier où enregistrer le document</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="779"/>
+        <source>Do you want to stop downloading and delete this file from download queue ?</source>
+        <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="793"/>
+        <source>Do you want to delete this file from download queue ?</source>
+        <translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="121"/>
+        <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program.</source>
+        <translation>Le processus échoué, soit le programme est manquant, soit vous n&apos;avez pas l&apos;autorisation de l&apos;exécuter.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="122"/>
+        <source>The process crashed some time after starting successfully.</source>
+        <translation>Le processus à planté après avoir démarré avec succès.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="123"/>
+        <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
+        <translation>La fonction waitFor...() a dépassé la limite de temps, you pouvez essayer de la relancer.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="124"/>
+        <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
+        <translation>Une erreur est survenue lors de l&apos;envoi des données vers le processus. Le processus est peut être arrté ou il a fermé son canal d&apos;entrée.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="125"/>
+        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
+        <translation>Une erreur est survenue lors de la lecturee de données, le processus est probablement arrêté.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="126"/>
+        <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>
+</TS>

configuration.ui

@@ -9,10 +9,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>127</height>
+    <width>491</width>
+    <height>196</height>
    </rect>
   </property>
+  <property name="contextMenuPolicy">
+   <enum>Qt::DefaultContextMenu</enum>
+  </property>
   <property name="windowTitle">
    <string>Configuration</string>
   </property>
@@ -21,34 +24,14 @@
     <rect>
      <x>9</x>
      <y>9</y>
-     <width>381</width>
-     <height>61</height>
+     <width>464</width>
+     <height>109</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="1">
-     <widget class="QSpinBox" name="spinBox">
-      <property name="toolTip">
-       <string>Enter the bandwidth limit</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="0">
-     <widget class="QLabel" name="label1">
-      <property name="text">
-       <string extracomment="Bandwidth limit">Bandwidth limit</string>
-      </property>
-     </widget>
-    </item>
+    <property name="sizeConstraint">
+     <enum>QLayout::SetDefaultConstraint</enum>
+    </property>
     <item row="0" column="2">
      <widget class="QComboBox" name="UnitCombobox">
       <property name="sizePolicy">
@@ -74,17 +57,85 @@
       </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">
+       <number>6</number>
+      </property>
+      <property name="maxCount">
+       <number>6</number>
+      </property>
+      <item>
+       <property name="text">
+        <string>Icon only</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Text only</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Text beside icon</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Text under icon</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <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>70</x>
-     <y>80</y>
+     <x>150</x>
+     <y>160</y>
      <width>321</width>
      <height>34</height>
     </rect>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::NoContextMenu</enum>
+   </property>
    <property name="orientation">
     <enum>Qt::Horizontal</enum>
    </property>
@@ -92,38 +143,50 @@
     <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>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>Configuration</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>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>Configuration</receiver>
-   <slot>reject()</slot>
+   <slot>hide()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
+     <x>220</x>
+     <y>126</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
+     <x>199</x>
+     <y>81</y>
     </hint>
    </hints>
   </connection>

downloadfile.cpp

@@ -19,76 +19,93 @@
 
 using namespace std;
 
+// Initialization de la class
 downloadFile::downloadFile()
 {
 }
 
-void downloadFile::cancelled(int pid)
+//Slot activated when download is cancelled
+void MainWindow::cancelled(QProcess * process)
 {
-    if (kill(pid, SIGTERM) == -1)
-    {
-        //TODO gestion erreur kill
-    }
+    process->terminate();
 }
 
-void downloadFile::download(MainWindow *mw)
+// launch a rsync processus downloading a file
+void MainWindow::download()
 {
-    string line;
-    string errorRsync;
-    int pos;
-    array<string, 7> argv;
-    stringstream output;
-    vector<string> v;
+    QString cmd;
+    QStringList param;
+
+    // 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 << "-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)));
+    //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;
-    char buffer[4096];
+    int pos;
 
-    argv[0] = "/usr/bin/rsync";
-    if (mw->connexion.bandwidthLimit == 0)
+    while(!flag)
     {
-        argv[1] = "--bwlimit=1000P";
-    }else
-    {
-        output << mw->connexion.bandwidthLimit;
-        argv[1] = "--bwlimit=" + output.str() +  mw->connexion.bandwidthLimitUnit;
-    }
-    argv[2] = "--port=" + to_string(mw->connexion.port);
-    argv[3] = "-P";
-    argv[4] = mw->connexion.server + "::" + mw->downloading.service + "/" + mw->downloading.path;
-    argv[5] = mw->downloading.savePath + "/";
-    argv[6] = "";
-
-    //launching downloading thread
-    FILE * fp = popen2(argv, "r", mw->downloading.pid);
-    if (!fp)
-    {
-        throw runtime_error("popen2() failed!");
-        return;
-    }
-
-    while (fgets(buffer, 4096, fp) != nullptr)
-    {
-        if (this->canceled == true)
+        line = QString::fromUtf8(this->downloading.process->readLine());
+        if (line.isEmpty())
         {
-            return;
+            flag = true;
+            break;
         }
-        line = buffer;
-        pos = line.find('%');
+        pos = line.indexOf("%");
         if (pos != -1)
         {
-            line.erase(pos);
-            pos = line.find_last_of(' ');
+            line.resize(pos);
+            pos = line.lastIndexOf(' ');
             if (pos != -1)
             {
-                line.erase(0, pos);
-                value = stoi(line);
+                line.remove(0, pos);
+                value = line.toInt();
+                // sending progress to Main window
                 emit progressSignal(value);
             }
         }
     }
-    pclose2(fp, mw->downloading.pid);
-
-    // ProgressBar to 100% and emit signal finished to main application
-    emit progressSignal(100);
-    emit finishedSignal(true);
+}
+
+/*void MainWindow::downloadProcessError(QProcess::ProcessError error)
+{
+    QMessageBox::warning(
+                this,
+                "RsyncUI",
+                downloadProcessErrorString[error].toStdString().c_str()
+            );
+}*/
+
+// process raise error
+void MainWindow::downloadProcessStderr()
+{
+    QByteArray errorLine;
+
+    errorLine = this->downloading.process->readAllStandardError();
+    QMessageBox::warning(
+                this,
+                "RsyncUI",
+                errorLine
+            );
 }
 

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,233 +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="17"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="32"/>
-        <source>Enter the bandwidth limit</source>
-        <translation>Entrez la limite de bande passante
-</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="48"/>
-        <source>Bandwidth limit</source>
-        <extracomment>Bandwidth limit</extracomment>
-        <translation>Limite de bande passante</translation>
-    </message>
-    <message>
-        <location filename="../../configuration.ui" line="61"/>
-        <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>
-</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="80"/>
-        <source>Server</source>
-        <oldsource>Serveur</oldsource>
-        <translation>Serveur</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="102"/>
-        <source>Enter server&apos;s URL</source>
-        <translation>Entrez l&apos;adresse du serveur</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="118"/>
-        <source>Port</source>
-        <translation>Port</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="143"/>
-        <source>Enter rsync port on server</source>
-        <translation>Entrez le port du servuer rsync</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="177"/>
-        <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="183"/>
-        <source>Connection</source>
-        <translation>Connexion</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="186"/>
-        <source>Return</source>
-        <translation>Retour</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="209"/>
-        <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="238"/>
-        <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="307"/>
-        <source>Click on file to stop downloading</source>
-        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enleveer de la file</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="327"/>
-        <source>%p%</source>
-        <extracomment>Downloading</extracomment>
-        <translation>Téléchargement</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="344"/>
-        <location filename="../../mainwindow.ui" line="362"/>
-        <source>Menu</source>
-        <translation>Menu</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="351"/>
-        <source>help</source>
-        <translation>Aide</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="367"/>
-        <location filename="../../mainwindow.ui" line="370"/>
-        <source>Change save folder</source>
-        <translation>Changer le dossier de destination</translation>
-    </message>
-    <message>
-        <source>Default save folder</source>
-        <translation type="vanished">Dossier d&apos;enregistrement</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="375"/>
-        <source>Bandwidth limit</source>
-        <translation>Limite de bande passante</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="380"/>
-        <source>About</source>
-        <translation>À propos</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="385"/>
-        <source>About Qt</source>
-        <translation>À propos de Qt</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.ui" line="390"/>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <source>debug</source>
-        <translation type="vanished">debug</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <source>Byte</source>
-        <translation>Octet</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <source>KB</source>
-        <translation>Ko</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <source>MB</source>
-        <translation>Mo</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <source>GB</source>
-        <translation>Go</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <source>TB</source>
-        <translation>To</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <location filename="../../mainwindow.cpp" line="517"/>
-        <source>PB</source>
-        <translation>Po</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="35"/>
-        <source>Path</source>
-        <translation>Chemin</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="35"/>
-        <source>Size</source>
-        <translation>Taille</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="68"/>
-        <source>Exiting will stop downloading, and will clear the download queue.
- Do you want to exit ?</source>
-        <translation>Soritr stoppera le téléchargement et effacera la file des téléchargements.
-Voulez-vous vraiment sortir du programme ?</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="297"/>
-        <source>server does not exists</source>
-        <translation>Le serveur n&apos;existe pas</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="479"/>
-        <source>Licence</source>
-        <translation>License</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="480"/>
-        <source>Author</source>
-        <translation>Auteur</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="481"/>
-        <source>EMail</source>
-        <translation>Courriel</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="482"/>
-        <source>Source code</source>
-        <translation>Code source</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="495"/>
-        <source>Choose directory to save file</source>
-        <translation>Choisissez le dossier où enregistrer</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="413"/>
-        <source>Do you want to stop downloading and delete this file from download queue ?</source>
-        <translation>Vouslez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
-    </message>
-    <message>
-        <source>Client for rsync server</source>
-        <translation type="vanished">Client pour serveur rsync</translation>
-    </message>
-    <message>
-        <location filename="../../mainwindow.cpp" line="425"/>
-        <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

@@ -2,12 +2,15 @@
 
 #include <QTranslator>
 
-
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     QTranslator myappTranslator;
 
+    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))

mainwindow.h

@@ -1,6 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
-
+#define QT_USE_FAST_CONCATENATION
+#define QT_USE_FAST_OPERATOR_PLUS
 #include "ui_mainwindow.h"
 #include "ui_configuration.h"
 #include "downloadfile.h"
@@ -31,38 +32,54 @@
 #include <QShortcut>
 #include <QCloseEvent>
 #include <unistd.h>
+#include <magic.h>
+#include <QComboBox>
+#include <QStringBuilder>
+#include <pwd.h>
+#include <QProcess>
+#include <QToolBar>
+#include <QDir>
+#include <QSystemTrayIcon>
+#include <QMenu>
+#include<QTranslator>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
 QT_END_NAMESPACE
 
+extern QMap<int, QString> rsyncErrorStrings;
+
 class Connexion
 {
     public:
         int bandwidthLimit = 0;
-        std::string bandwidthLimitUnit = "";
-        std::string server;
+        int bandwidthLimitUnit;
+        QString server;
+        QString service;
         int port = 873;
+        bool comboboxChanged;
 };
 
 class Downloading
 {
     public:
-        std::string service;
-        std::string path;
-        std::string defaultSavePath;
-        std::string savePath;
-        QString dirPath;
-        int pid = 0;
+        QString server;
+        QString service;
+        QString path;
+        QString savePath;
+        QProcess * process = nullptr;
+
+        void clear();
 };
 
 class About
 {
     public:
         QString title = "RsyncUI";
+        QString version = "2.1.3";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
-        QString description = "Client for rsync server\n\nYou click on file to enqueue it, and RyncUI Download one file a time";
+        QString description;
         QString email = "dtux@free.fr";
         QString git = "https://git.labolyon.fr/dtux/RsyncUI/issues";
 };
@@ -76,36 +93,73 @@ class MainWindow : public QMainWindow
         MainWindow(QWidget *parent = nullptr);
         ~MainWindow();
         QProgressDialog *progress;
-        void displayTree();
-        void populateTree();
-        void populateList();
-        void listServices();
-        bool validateServer(std::string server);
-        bool isIpAddress(std::string server);
-        QTreeWidgetItem * addTreeRoot(QString name, QString description);
-        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size);
-        void scanDir(std::string server, int portN, QTreeWidgetItem *parent = NULL, std::string path = "" );
-        void startDownloading();
-        void loadSettings();
-        void saveSettings();
-        void closeEvent (QCloseEvent *event);
-
         Connexion connexion;
         Downloading downloading;
-        downloadFile downloadO;
+        //downloadFile downloadO;
         QSettings settings;
         About about;
         QDialog Configuration;
         Ui::Configuration config;
         std::vector <QString> serversList;
+        QSystemTrayIcon * trayIcon;
+        QList<QString> bwUnitText {
+            "KB",
+            "MB",
+            "TB",
+            "GB",
+            "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 populateList();
+        void listServices();
+        bool validateServer(QString server);
+        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 = "" );
+        void startDownloading();
+        void loadSettings();
+        void saveSettings();
+        void closeEvent (QCloseEvent *event);
+        void saveDownloadList();
+        void loadDownloadList();
+        void download();
+        void initSystemTrayIcon();
+        void hideWindow();
+        void showWindow();
 
     private slots:
 
         void on_listWidget_clicked();
 
-        void on_treeWidget_itemClicked(QTreeWidgetItem *item);
+        void on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadDir = false);
 
-        void downloadFinished();
+        void downloadFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
+//       void downloadProcessError(QProcess::ProcessError error);
+
+        void downloadProcessStderr();
+
+        void readRsyncOutput();
 
         void stoppingDownload();
 
@@ -117,19 +171,34 @@ class MainWindow : public QMainWindow
 
         void on_khistorycombobox_currentIndexChanged(int);
 
-        void on_DefaultSaveFolder_triggered();
+        bool on_DefaultSaveFolder_triggered();
 
         void on_connectButton_clicked();
 
         void on_action_Settings_triggered();
 
+        void on_actionDownload_triggered();
+
+        //void downloadingErrorSlot(QString);
+
+        void on_comboBox_currentIndexChanged(int index);
 
-    public slots:
         void on_buttonBox_accepted();
 
-    signals:
-        void stopDownloading(int);
-       // void accepted();
+        void cancelled(QProcess *);
+
+        void on_trayIcon_clicked(QSystemTrayIcon::ActivationReason reason);
+
+        void quitApp();
+
+        void on_actionExit_triggered();
+
+signals:
+        void stopDownloading(QProcess *);
+        void progressSignal(int);
+        void finishedSignal(bool = true);
+        //void errorSignal(QString);
+
 };
 
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -20,6 +20,12 @@
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
+  <property name="windowIcon">
+   <iconset theme="/usr/share/icons/RsyncUI.png"/>
+  </property>
+  <property name="toolButtonStyle">
+   <enum>Qt::ToolButtonTextUnderIcon</enum>
+  </property>
   <property name="documentMode">
    <bool>false</bool>
   </property>
@@ -57,7 +63,7 @@
     <cursorShape>IBeamCursor</cursorShape>
    </property>
    <property name="focusPolicy">
-    <enum>Qt::TabFocus</enum>
+    <enum>Qt::WheelFocus</enum>
    </property>
    <property name="acceptDrops">
     <bool>true</bool>
@@ -139,6 +145,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="toolTip">
          <string>Enter rsync port on server</string>
         </property>
@@ -173,6 +182,9 @@
       </item>
       <item>
        <widget class="QPushButton" name="connectButton">
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="toolTip">
          <string extracomment="Connect to server">Press button to connect to rsync server</string>
         </property>
@@ -205,6 +217,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="toolTip">
          <string>Click to view the list of files of this folder</string>
         </property>
@@ -214,6 +229,9 @@
         <property name="editTriggers">
          <set>QAbstractItemView::SelectedClicked</set>
         </property>
+        <property name="tabKeyNavigation">
+         <bool>true</bool>
+        </property>
         <property name="resizeMode">
          <enum>QListView::Adjust</enum>
         </property>
@@ -231,8 +249,11 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::WheelFocus</enum>
+           </property>
            <property name="contextMenuPolicy">
-            <enum>Qt::NoContextMenu</enum>
+            <enum>Qt::ActionsContextMenu</enum>
            </property>
            <property name="toolTip">
             <string>Click to add to download queue</string>
@@ -241,11 +262,14 @@
             <number>5000</number>
            </property>
            <property name="whatsThis">
-            <string extracomment="Click to add to download queue"/>
+            <string/>
            </property>
            <property name="editTriggers">
             <set>QAbstractItemView::NoEditTriggers</set>
            </property>
+           <property name="tabKeyNavigation">
+            <bool>true</bool>
+           </property>
            <property name="showDropIndicator" stdset="0">
             <bool>false</bool>
            </property>
@@ -270,6 +294,9 @@
            <property name="sortingEnabled">
             <bool>true</bool>
            </property>
+           <property name="animated">
+            <bool>true</bool>
+           </property>
            <property name="columnCount">
             <number>1</number>
            </property>
@@ -303,9 +330,15 @@
        </widget>
       </widget>
       <widget class="QListWidget" name="listDownload">
+       <property name="focusPolicy">
+        <enum>Qt::WheelFocus</enum>
+       </property>
        <property name="toolTip">
         <string>Click on file to stop downloading</string>
        </property>
+       <property name="toolTipDuration">
+        <number>5000</number>
+       </property>
        <property name="dragEnabled">
         <bool>true</bool>
        </property>
@@ -330,39 +363,48 @@
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>500</width>
-     <height>30</height>
-    </rect>
+  <widget class="QToolBar" name="toolBar">
+   <property name="contextMenuPolicy">
+    <enum>Qt::NoContextMenu</enum>
    </property>
-   <widget class="QMenu" name="menu">
-    <property name="title">
-     <string>Menu</string>
-    </property>
-    <addaction name="DefaultSaveFolder"/>
-    <addaction name="action_Settings"/>
-   </widget>
-   <widget class="QMenu" name="menuhelp">
-    <property name="title">
-     <string>help</string>
-    </property>
-    <addaction name="actionAbout"/>
-    <addaction name="actionAbout_Qt"/>
-   </widget>
-   <addaction name="menu"/>
-   <addaction name="menuhelp"/>
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <property name="layoutDirection">
+    <enum>Qt::LeftToRight</enum>
+   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="movable">
+    <bool>true</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::AllToolBarAreas</set>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonTextUnderIcon</enum>
+   </property>
+   <property name="floatable">
+    <bool>true</bool>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="DefaultSaveFolder"/>
+   <addaction name="action_Settings"/>
+   <addaction name="actionAbout"/>
+   <addaction name="actionAbout_Qt"/>
+   <addaction name="actionExit"/>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionMenu">
-   <property name="text">
-    <string>Menu</string>
-   </property>
-  </action>
   <action name="DefaultSaveFolder">
+   <property name="icon">
+    <iconset theme="system-file-manager">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
     <string>Change save folder</string>
    </property>
@@ -370,26 +412,55 @@
     <string>Change save folder</string>
    </property>
   </action>
-  <action name="actionBandwidth_limit">
-   <property name="text">
-    <string>Bandwidth limit</string>
-   </property>
-  </action>
   <action name="actionAbout">
+   <property name="icon">
+    <iconset theme="help-about">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
     <string>About</string>
    </property>
   </action>
   <action name="actionAbout_Qt">
+   <property name="icon">
+    <iconset theme="help-browser">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
     <string>About Qt</string>
    </property>
   </action>
   <action name="action_Settings">
+   <property name="icon">
+    <iconset theme="preferences-other">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
     <string>Settings</string>
    </property>
   </action>
+  <action name="actionDownload">
+   <property name="text">
+    <string>Download</string>
+   </property>
+   <property name="toolTip">
+    <string>Click on menu button to download the entire folder</string>
+   </property>
+  </action>
+  <action name="actionExit">
+   <property name="icon">
+    <iconset theme="application-exit"/>
+   </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>

tools.cpp

@@ -5,6 +5,12 @@ using namespace std;
 #define READ   0
 #define WRITE  1
 
+extern QMap<int, QString> rsyncErrorStrings;
+
+//Take a string and explode it in array
+// s => string to explode
+// c => character separator
+// n => number of results in array, the last is the rest of string to end
 const vector<string> explode(const string& s, const char& c, int n = 0)
 {
     string buff;
@@ -37,85 +43,27 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
     return v;
 }
 
-FILE * popen2(char * const argv, string type, int & pid)
+// test return code of rsync
+bool testRsyncReturn(QProcess * myProcess)
 {
-    pid_t child_pid;
-    int fd[2];
-    QString message;
-    string command;
-
-    if (pipe(fd) == -1)
+    if (myProcess->exitStatus() != 0)
     {
-        message = "Open pipe failed" + QString::fromStdString(strerror(errno));
         QMessageBox::warning(
-        NULL,
-        "RsyncUI",
-        message);
-    }else
+                   NULL,
+                   "RsyncUI",
+                   myProcess->errorString(),
+                   QMessageBox::Ok,
+                   QMessageBox::Ok);
+        return true;
+    }else if (myProcess->exitCode() != 0)
     {
-        if((child_pid = fork()) == -1)
-        {
-            perror("fork");
-            exit(1);
-        }
-
-        /* child process */
-        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
-            //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)
-            if (execvp(command.c_str(), &argv))
-            {
-                perror("execl error => ");
-            }
-            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");
+        QMessageBox::warning(
+                   NULL,
+                   "RsyncUI",
+                   rsyncErrorStrings[myProcess->exitCode()],
+                   QMessageBox::Ok,
+                   QMessageBox::Ok);
+        return true;
     }
-    return 0;
+    return false;
 }
-
-int pclose2(FILE * fp, pid_t pid)
-{
-    int stat;
-
-    fclose(fp);
-    while (waitpid(pid, &stat, 0) == -1)
-    {
-        if (errno != EINTR)
-        {
-            stat = -1;
-            break;
-        }
-    }
-    return stat;
-}
-

tools.h

@@ -4,13 +4,20 @@
 #include <string>
 #include <vector>
 #include <array>
+#include <QString>
+#include <QMap>
+#include <QTranslator>
+#include <QProcess>
 
 using namespace std;
 
 const vector<string> explode(const string& s, const char& c, int n);
 
-FILE * popen2(char * const argv, string type, int & pid);
+FILE * popen2(array<string,8> argv, string type, int & pid);
 
 int pclose2(FILE * fp, pid_t pid);
 
+bool testRsyncReturn(QProcess *);
+
+
 #endif // TOOLS_H