version 2.11.1

README_FR.md

@@ -22,6 +22,7 @@ Un clic gauche sur un fichier l'ajoute à la file des téléchargements, sur un
 Un clic droit sur un dossier ouvre un menu contextuel permettant de télécharger le dossier entier.
 Une notification s'affiche lors du début, de la fin, et lorsque l'on stoppe un téléchargement. 
 Le gadget de fermeture ferme la fenêtre mais ne quitte pas l'application, pour afficher à nouveau la fenêtre, cliquez sur l'icône dans la boite à miniatures.
+Un identifiant et un mot de passe lorsqu'un service est protégé par mot de passe, celui-ci est enregistré dans le portefeuille système(gome-keyring ou kwallet)
 
 ## File de téléchargement
 
@@ -30,7 +31,7 @@ Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmat
 ## 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.
+ - 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
@@ -41,7 +42,7 @@ Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmat
  - 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.
+ - Affiche les propriétés de l'application.
 4ème icône: À propos de QT   
 5ème icône: Quitter
     Permet de quitter le programme.

RsyncUI.pro

@@ -6,11 +6,14 @@ QT	+= KConfigCore KConfigGui
 QT	+= KCoreAddons
 QT	+= KDBusAddons
 
-#LIBS += -lKF5WindowSystem
+LIBS += -lqt5keychain
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 CONFIG += c++11
 
+DEFINES += QTKEYCHAIN_NO_EXPORT
+
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
@@ -19,24 +22,26 @@ SOURCES += \
     downloadfile.cpp \
     main.cpp \
     mainwindow.cpp \
+    password.cpp \
     tools.cpp
 
 HEADERS += \
     downloadfile.h \
     mainwindow.h \
+    password.h \
     tools.h
 
 FORMS += \
     about.ui \
     configuration.ui \
-    login.ui \
     mainwindow.ui
 
 TRANSLATIONS += \
     RsyncUI_fr_FR.ts
 
 INCLUDEPATH += \
-    /usr/include/KF5
+    /usr/include/KF5 \
+    /usr/include/qt5keychain/
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
@@ -62,3 +67,4 @@ desktopfile.path = /usr/share/applications
 desktopfile.files = RsyncUI.desktop
 icon.path = /usr/share/icons/
 icon.files = RsyncUI.png
+-lqt5keychain

RsyncUI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-03-02T17:04:47. -->
+<!-- Written by QtCreator 4.14.2, 2023-03-11T18:47:01. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

RsyncUI.spec

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

RsyncUI_fr_FR.ts

@@ -149,96 +149,99 @@
         <translation>Cliquez pour ajouter à la file de téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="338"/>
+        <location filename="mainwindow.ui" line="329"/>
+        <source>Filter...</source>
+        <translation>Filtrer...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="341"/>
         <source>Click on file to stop downloading</source>
         <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="364"/>
+        <location filename="mainwindow.ui" line="367"/>
         <source>%p%</source>
         <extracomment>Downloading</extracomment>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="375"/>
+        <location filename="mainwindow.ui" line="378"/>
         <source>toolBar</source>
         <translation>Barre d&apos;outils</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="449"/>
+        <location filename="mainwindow.ui" line="452"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="452"/>
+        <location filename="mainwindow.ui" line="455"/>
         <source>Click on menu button to download the entire folder</source>
         <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="461"/>
+        <location filename="mainwindow.ui" line="464"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>Terminate the program</source>
         <translation>Terminer le programme</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="467"/>
+        <location filename="mainwindow.ui" line="470"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="475"/>
+        <location filename="mainwindow.ui" line="479"/>
         <source>hidden service</source>
-        <translation>entre
+        <translation>Service caché</translation>
-
-Service caché</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="414"/>
         <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="420"/>
         <source>Change save folder</source>
         <translation>Changer le dossier de destination</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
+        <location filename="mainwindow.ui" line="429"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="435"/>
+        <location filename="mainwindow.ui" line="438"/>
         <source>About Qt</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="444"/>
+        <location filename="mainwindow.ui" line="447"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="107"/>
+        <location filename="mainwindow.h" line="123"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="107"/>
+        <location filename="mainwindow.h" line="124"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="107"/>
+        <location filename="mainwindow.h" line="125"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="107"/>
+        <location filename="mainwindow.h" line="126"/>
         <source>TB</source>
         <translation>To</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="107"/>
+        <location filename="mainwindow.h" line="127"/>
         <source>PB</source>
         <translation>Po</translation>
     </message>
@@ -275,10 +278,6 @@ Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmat
 &lt;b&gt;5ème icône: Quitter&lt;/b&gt;&lt;br&gt;
     Permet de quitter le programme</translation>
     </message>
-    <message>
-        <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>
@@ -295,106 +294,140 @@ Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmat
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="122"/>
+        <location filename="mainwindow.cpp" line="78"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>KB/s</source>
+        <translation>Ko/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>MB/s</source>
+        <translation>Mo/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>GB/s</source>
+        <translation>Go/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>TB/s</source>
+        <translation>To/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>PB/s</source>
+        <translation>Po/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="123"/>
         <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
         <translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="151"/>
+        <location filename="mainwindow.cpp" line="152"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="208"/>
+        <location filename="mainwindow.cpp" line="209"/>
         <source>Clicking Save button, You can save the list of downloads
 </source>
         <translation>Vous pouvez enregistrer la liste des téléchargements en cliquant sur &quot;enregister&quot;
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="214"/>
+        <location filename="mainwindow.cpp" line="215"/>
         <source>Exiting will stop downloading, and will clear the download queue.
 Do you want to exit ?</source>
         <translation>Si vous sortez, les téléchargements seront arrêter.
 Voulez-vous vraiment sortir ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="252"/>
+        <location filename="mainwindow.cpp" line="253"/>
         <source>The program will keep running in the system tray. To terminate the program, choose &lt;b&gt;Quit&lt;/b&gt; in the context menu of the system tray entry.</source>
         <translation>Le programme continue dans la boîte à miniatures. Pour quitter le programme cliquez sur l&apos;icône &lt;b&gt;Quitter&lt;/b&gt; ou dans les menu contextuel.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="501"/>
+        <location filename="mainwindow.cpp" line="513"/>
         <source>The processus does&apos;nt respond: </source>
         <translation>Le processus ne répond pas: </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="587"/>
+        <location filename="mainwindow.cpp" line="599"/>
         <source>server does not exists</source>
         <translation>Le serveur n&apos;existe pas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="615"/>
+        <location filename="mainwindow.cpp" line="633"/>
-        <location filename="mainwindow.cpp" line="637"/>
+        <location filename="mainwindow.cpp" line="745"/>
         <source>Dir</source>
         <translation>dossier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="620"/>
-        <location filename="mainwindow.cpp" line="642"/>
-        <location filename="mainwindow.cpp" line="743"/>
         <source>File</source>
-        <translation>Doc</translation>
+        <translation type="vanished">Doc</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="771"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>File is partially downloaded. Do you want to resume download ? if no, the file will be deleted from destination directory</source>
         <translation>Le document est déjà partiellement téléchargé. Voulez vous continuer le téléchargemnt ? Si non, il sera supprimer du dossier de destination</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
+        <location filename="mainwindow.cpp" line="790"/>
         <source>File is already downloaded. Do you want to reload it ? The old file will be deleted</source>
         <translation>Le document est déjà téléchargé. Voulez-vous le télécharger à nouveau ? L&apos;ancien fichier sera effacé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="825"/>
+        <location filename="mainwindow.cpp" line="827"/>
         <source>File is already downloading</source>
         <translation>Le document est déjà en téléchargement</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="850"/>
+        <location filename="mainwindow.cpp" line="852"/>
         <source>Starting downloading
 </source>
         <translation>Démarrage du téléchargement
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="865"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="877"/>
         <source>Rsync process crashed</source>
         <translation>Le processus rsync à planté</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="884"/>
         <source>stopped by user</source>
         <translation>stoppé par l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="895"/>
+        <source>
+Do you want to retry?</source>
+        <translation>
+Voulez-vous ré-essayer?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="904"/>
         <source>Download </source>
         <translation>Téléchargement </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1240"/>
+        <location filename="mainwindow.cpp" line="1257"/>
         <source>RsyncUI Request</source>
         <translation>Requête RsyncUI</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1241"/>
+        <location filename="mainwindow.cpp" line="1258"/>
         <source>Hidden service name</source>
         <translation>Nom du servcice caché</translation>
     </message>
@@ -429,52 +462,57 @@ Voulez-vous vraiment sortir ?</translation>
         <translation>Code source</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1056"/>
+        <location filename="mainwindow.cpp" line="1073"/>
         <source>Since the save path is linked to service, you need to select a service before you can select a folder</source>
         <translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1061"/>
+        <location filename="mainwindow.cpp" line="1078"/>
         <source>Choose folder where to save file</source>
         <translation>Choisissez un dossier où enregistrer le document</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="952"/>
+        <location filename="mainwindow.cpp" line="969"/>
         <source>Do you want to stop downloading and delete this file from download queue ?</source>
         <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="966"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>Do you want to delete this file from download queue ?</source>
         <translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
     </message>
     <message>
-        <location filename="mainwindow.h" line="137"/>
+        <location filename="mainwindow.h" line="122"/>
+        <source>B</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="139"/>
         <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program.</source>
         <translation>Le processus échoué, soit le programme est manquant, soit vous n&apos;avez pas l&apos;autorisation de l&apos;exécuter.</translation>
     </message>
     <message>
-        <location filename="mainwindow.h" line="138"/>
+        <location filename="mainwindow.h" line="140"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation>Le processus à planté après avoir démarré avec succès.</translation>
     </message>
     <message>
-        <location filename="mainwindow.h" line="139"/>
+        <location filename="mainwindow.h" line="141"/>
         <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
         <translation>La fonction waitFor...() a dépassé la limite de temps, you pouvez essayer de la relancer.</translation>
     </message>
     <message>
-        <location filename="mainwindow.h" line="140"/>
+        <location filename="mainwindow.h" line="142"/>
         <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
         <translation>Une erreur est survenue lors de l&apos;envoi des données vers le processus. Le processus est peut être arrté ou il a fermé son canal d&apos;entrée.</translation>
     </message>
     <message>
-        <location filename="mainwindow.h" line="141"/>
+        <location filename="mainwindow.h" line="143"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
         <translation>Une erreur est survenue lors de la lecturee de données, le processus est probablement arrêté.</translation>
     </message>
     <message>
-        <location filename="mainwindow.h" line="142"/>
+        <location filename="mainwindow.h" line="144"/>
         <source>An unknown error occurred. This is the default return value of error().</source>
         <translation>Une erreur inconnue est survenue. C&apos;est la valeur de retour par défaut de error().</translation>
     </message>

downloadfile.cpp

@@ -125,26 +125,3 @@ void MainWindow::readRsyncOutput()
         }
     }
 }
-
-/*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
-            );
-}
-

login.ui

@@ -1,144 +0,0 @@
-<?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>

main.cpp

@@ -21,6 +21,9 @@ int main(int argc, char *argv[])
           a.installTranslator(&myappTranslator);
     }
 
+    static const QString appName = "RsyncUI";
+
+    //Password passwdJob;
     MainWindow w;
     w.show();
     w.init();

mainwindow.cpp

@@ -1,12 +1,13 @@
 #include "mainwindow.h"
 #include <QComboBox>
+#include <QTextBlock>
 
 using namespace std;
 
 bool display = false;
-//extern QDialog Configuration;
 extern Ui::Configuration config;
 extern bool testRsyncReturn(QProcess *);
+extern QApplication a;
 
 QMap<int, QString> rsyncErrorStrings {
     {0, QTranslator::tr("Success. The rsync command completed successfully without any errors.")},
@@ -38,19 +39,16 @@ MainWindow::MainWindow(QWidget *parent)
     QCoreApplication::setOrganizationName("RsyncUI");
     QCoreApplication::setApplicationName("RsyncUI");
 
+    this->setWindowTitle(a.applicationName());
+
     // context menu for treewidget (list of files)
     ui->treeWidget->addAction(ui->actionDownload);
-
     // init configuration window
     config.setupUi(&Configuration);
 
     // init about window
     AboutW.setupUi(&aboutDialog);
 
-    //init login dialog
-    loginD.setupUi(&loginDialog);
-    loginD.loginEdit->setFocus();
-
     // text of About
     QString aboutText = tr("<h2>Client for rsync server</h2>") +
                         "<b>" + tr("Version") + ":     " + this->about.version + "</b><br>" +
@@ -65,19 +63,17 @@ MainWindow::MainWindow(QWidget *parent)
     // connectors
     connect(this, &MainWindow::fileName, ui->progressBar, &QProgressBar::setFormat);
     connect(this, &MainWindow::progressSignal, ui->progressBar, &QProgressBar::setValue);
-    //connect(this, &MainWindow::speed, ui->progressBar, &MainWindow::setDlSpeed);
-    //connect(this, &MainWindow::errorSignal, this, &MainWindow::downloadingErrorSlot);
     connect(this, &MainWindow::stopDownloading, this, &MainWindow::cancelled);
     connect(config.buttonBox, SIGNAL(accepted()), this, SLOT(on_buttonBox_accepted()));
     connect(config.comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged);
-    connect(loginD.loginBox, SIGNAL(accepted()), this, SLOT(on_loginBox_accepted()));
+
+    loadSettings();
 
     // init of widgets
     ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget);               // attach search widget to treewidget
     ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive);     // and set it case insensitive
-    ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size")} ); // set header of columns of tree widget
+    ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size"), tr("Date"), "fullSize"} ); // set header of columns of tree widget
-
+    //ui->treeWidget->header()->setContextMenuPolicy();
-
     // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
     ui->treeWidget->setCursor(Qt::ArrowCursor);
     ui->listWidget->setCursor(Qt::ArrowCursor);
@@ -86,7 +82,6 @@ MainWindow::MainWindow(QWidget *parent)
     // Hiding progress bar
     ui->progressBar->hide();
 
-    loadSettings();
 
     // if last server exists in settings
     if (this->settings.contains("connexion/lastServer"))
@@ -104,7 +99,10 @@ MainWindow::MainWindow(QWidget *parent)
     config.comboBox->setCurrentIndex(ui->toolBar->toolButtonStyle());       // setting combobox to saved settings
 
     //setting unit of bandwidth limit
-    config.UnitCombobox->addItems({tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB")});
+    config.UnitCombobox->addItems({tr("KB/s"), tr("MB/s"), tr("GB/s"), tr("TB/s"), tr("PB/s")});
+
+    // hide fullsize column of treeview
+    ui->treeWidget->setColumnHidden(4, true);
 
     initSystemTrayIcon();
 }
@@ -118,7 +116,7 @@ void MainWindow::init()
     if (this->settings.value("Downloads/rows").toInt() != 0)
     {
         // asking if we load the list and continue downloading
-        msgBox.setWindowTitle("RsyncUI");
+        msgBox.setWindowTitle(a.applicationName());
         msgBox.setInformativeText(tr("A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared" ));
 
         QPushButton *yes = msgBox.addButton(QMessageBox::Yes);
@@ -135,7 +133,7 @@ void MainWindow::init()
         }
     }
     // load list of services
-    populateList();
+    populateList(ui->khistorycombobox->currentIndex());
 }
 
 void MainWindow::initSystemTrayIcon()
@@ -210,7 +208,7 @@ void MainWindow::quitApp()
 
         reply = QMessageBox::question(
                 this,
-                "RsyncUI",
+                a.applicationName(),
                 tr("Exiting will stop downloading, and will clear the download queue.\nDo you want to exit ?") + displayText,
                 param,
                 QMessageBox::No);
@@ -248,7 +246,7 @@ void MainWindow::closeEvent (QCloseEvent *event)
            return;
         if (trayIcon->isVisible() and this->settings.value("CloseCheckbox").toBool() == false)
         {
-            msgBox.setWindowTitle("RsyncUI");
+            msgBox.setWindowTitle(a.applicationName());
             msgBox.setInformativeText(tr("The program will keep running in the "
                                        "system tray. To terminate the program, "
                                        "choose <b>Quit</b> in the context menu "
@@ -275,7 +273,7 @@ void MainWindow::closeEvent (QCloseEvent *event)
 }
 
 // Populate treeview with list of files
-void MainWindow::populateTree(QTreeWidgetItem * parent)
+void MainWindow::populateTree()
 {
     QString path;
 
@@ -291,7 +289,10 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
         {
             // server is validated, scanning directory
             path = this->connexion.service + "/";
-           scanDir(this->connexion.server, this->connexion.port, parent, path);
+            while (this->rescan)
+            {
+                scanDir(this->connexion.server, this->connexion.port, nullptr, path);
+            }
         }
         // Restoring cursor
         QGuiApplication::restoreOverrideCursor();
@@ -299,14 +300,15 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
 }
 
 // Populate Listview with list of services
-void MainWindow::populateList()
+void MainWindow::populateList(int item)
 {
     QString server;
+    QString service;
     QStringList hidden;
     int port;
     int i;
 
-    server = ui->khistorycombobox->currentText();
+    server = ui->khistorycombobox->itemText(item);
     port = ui->portEdit->text().toUInt();
     if ((server != this->connexion.server) or (port != this->connexion.port))
     {
@@ -352,17 +354,73 @@ void MainWindow::populateList()
             }
         }
         this->settings.endGroup();
-        this->settings.beginGroup("Hidden/");
+        this->settings.beginGroup("Hidden/" + server);
         hidden = this->settings.allKeys();
+        if (hidden.count() > 0)
+        {
             for (i = 0; i < hidden.size(); i++)
             {
-            ui->listWidget->addItem(this->settings.value(hidden.at(i)).toString() + "\n\t");
+                service = hidden[i];
+                //TODO detect if service is already present
+                if (testServicePresence(service, false))
+                {
+                    ui->listWidget->addItem(service + "\n\t");
+                }
+            }
         }
-        QGuiApplication::restoreOverrideCursor();  //setting cursor to default
         this->settings.endGroup();
+        QGuiApplication::restoreOverrideCursor();  //setting cursor to default
     }
 }
 
+// Test if service is already present on the server
+bool MainWindow::testServicePresence(QString service, bool askPassword)
+{
+    QString cmd;
+    QStringList param;
+    QString line;
+    QString errorRsync;
+    QStringList v;
+    QProcess *myProcess;
+    bool returnValue = false;
+    QEventLoop loop;
+
+    cmd  = "/usr/bin/rsync";
+    param << "--contimeout=10" << "-nq" << "--port=" + QString::number(this->connexion.port) << this->connexion.server + "::" + service;
+    myProcess = new QProcess(this);
+    myProcess->setProcessChannelMode(QProcess::MergedChannels);
+    myProcess->start(cmd, param);
+    myProcess->waitForStarted();
+    myProcess->write("\n");
+    //myProcess->waitForFinished(12000);
+    while(myProcess->waitForReadyRead(10000))
+    {
+        while(1)
+        {
+            // line empty then buffer is empty so returning to wait new datas
+            line = QString::fromUtf8(myProcess->readLine());
+            if (line.isEmpty())
+            {
+                break;
+            }
+            if (line.contains("auth failed"))
+            {
+                if (askPassword)
+                {
+                    getUserPassword(&this->connexion);
+                }
+                returnValue = true;
+            }
+        }
+    }
+    if (myProcess->exitCode() == 0)
+    {
+       returnValue = true;
+    }
+    myProcess->close();
+    return returnValue;
+}
+
 //list services of the rsync server
 void MainWindow::listServices()
 {
@@ -376,7 +434,7 @@ void MainWindow::listServices()
     bool flag = false;
 
     cmd  = "/usr/bin/rsync";
-    param << "--contimeout=10" << "--port=" + QString::number(this->connexion.port) << this->connexion.server + "::";
+    param << "--contimeout=20" << "--port=" + QString::number(this->connexion.port) << this->connexion.server + "::";
     myProcess = new QProcess(this);
     myProcess->start(cmd, param);
 
@@ -415,17 +473,23 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
 {
     QString cmd;
     QStringList param;
+    QStringList sizeA;
     QString line;
     QString size;
+    QString fullsize;
     QString filename;
+    QString fileType;
+    QString date;
     QProcess * myProcess;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     bool isDir = false;
     bool flag = false;
     bool readOk = false;
+    bool passwdOk = false;
     int nChild = 0;
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 
     myProcess = new QProcess(this);
+    myProcess->setProcessChannelMode(QProcess::MergedChannels);
 
     if (parent != nullptr)
     {
@@ -444,7 +508,7 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
         }
         myProcess->setProcessEnvironment(env);
         cmd = "rsync";
-        param << "--contimeout=10" << "--port=" + QString::number(portN) << server + "::" + path;
+        param << "--contimeout=20" << "--port=" + QString::number(portN) << server + "::" + path;
 
 
         myProcess->start(cmd, param);
@@ -464,12 +528,32 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
                         flag = true;
                         break;
                     }
-                    // extracting name, size and is dir/file
+                    if (line.contains("auth failed"))
+                    {
+                        myProcess->readAllStandardOutput();
+                        getUserPassword(&this->connexion);
+                        this->rescan = true;
+                        return 0;
+                    }
+
+                    // extracting name, size and if is dir/file
                     line = line.simplified();
-                    size = line.section(" ", 1, 1);
                     filename = line.section(" ", 4);
                     if (filename != '.')
                     {
+                        size = line.section(" ", 1, 1);
+                        fullsize = size;
+                        fullsize.remove(",");
+                        sizeA = size.split(',');
+                        if (sizeA.count() <= 1)
+                        {
+                            size = sizeA.at(0) + " " + UnitText[0] + " ";
+                        }else
+                        {        myProcess->setProcessEnvironment(env);
+
+                            size = sizeA.at(0) + "," + sizeA.at(1).left(2) + " " + UnitText[sizeA.count()-1] + " ";
+                        }
+
                         if (line[0] == "d")
                         {
                             isDir = true;
@@ -477,15 +561,16 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
                         {
                             isDir = false;
                         }
-                        if (parent != NULL)
+                        date = line.section(' ', 2, 2);
+                        fileType = getFileType(filename);
+                        addTreeItem(filename, size, fullsize, fileType, date, isDir, parent);
+                        if (passwdOk == false and !this->connexion.password.isEmpty())
                         {
-                            //adding item to tree
+                            this->settings.setValue("Passwords/" + this->connexion.server + "/" + this->connexion.service + "/" + this->connexion.user, true);
-                            addTreeChild(parent, filename, size, isDir);
+                            setPassword(this->connexion.user, this->connexion.password);
-                        }else
+                            this->settings.sync();
-                        {
-                            //adding item to tree (as directory)
-                            addTreeRoot(filename, size, isDir);
                         }
+                        this->rescan = false;
                     }
                 }
                 flag = false;
@@ -497,7 +582,7 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
                     {
                         QMessageBox::warning(
                             this,
-                            "RsyncUI",
+                            a.applicationName(),
                             tr("The processus does'nt respond: ") + myProcess->errorString());
                     }
                 }
@@ -583,7 +668,7 @@ bool MainWindow::validateServer(QString server)
         // server-s address not valid
         QMessageBox::warning(
             this,
-            "RsyncUI",
+            a.applicationName(),
             tr("server does not exists" )
         );
     }
@@ -592,23 +677,31 @@ bool MainWindow::validateServer(QString server)
 }
 
 // slot activated when combobox is changed
-void MainWindow::on_khistorycombobox_currentIndexChanged(int i)
+void MainWindow::on_khistorycombobox_currentIndexChanged(int item)
 {
     this->connexion.comboboxChanged = true;
-    populateList();
+    populateList(item);
 }
 
 // slot activated when button connection is clicked
 void MainWindow::on_connectButton_clicked()
 {
-   populateList();
+    populateList(ui->khistorycombobox->currentIndex());
 }
 
-// add a dir in treeview
+// add parent in treeview
-QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir)
+void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir=false, QTreeWidgetItem *parent=nullptr)
 {
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget);
+    QFont * font = new QFont();
 
+    QTreeWidgetItem *treeItem;
+    if (parent != nullptr)
+    {
+        treeItem = new QTreeWidgetItem();
+    }else
+    {
+        treeItem = new QTreeWidgetItem(ui->treeWidget);
+    }
     if (isDir == true)
     {
         // item is a dir
@@ -617,42 +710,43 @@ QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool i
     }else
     {
         // item is a file
-        treeItem->setText(1,tr("File"));
+        if (QFile::exists(this->downloading.savePath + "/" + name))
-        //treeItem->setIcon(0, QIcon::fromTheme("document"));
-    }
-    treeItem->setText(0, name);
-    treeItem->setText(2, fileSize);
-
-    return treeItem;
-}
-
-// add a file in treeview
-QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir)
         {
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem();
+            QBrush b (Qt::green);
-
+            treeItem->setForeground(0, b);
-    if (isDir == true)
+            treeItem->setFont(0, *font);
-    {
-        // item is a dir
-        treeItem->setText(1, tr("Dir"));
-        treeItem->setIcon(0, QIcon::fromTheme("folder"));
         }else
         {
-        // item is a file
+            this->settings.beginGroup("Downloaded/");
-        treeItem->setText(1,tr("File"));
+            if (this->settings.contains(name))
+            {
+                QBrush b (Qt::red);
+                treeItem->setForeground(0, b);
+                treeItem->setFont(0, *font);
+            }
+            this->settings.endGroup();
+        }
+        treeItem->setText(1,type);
     }
     treeItem->setText(0, name);
     treeItem->setText(2, fileSize);
+    treeItem->setText(3, date);
+    treeItem->setText(4, fullsize);
 
+    treeItem->setTextAlignment(2, Qt::AlignRight);
+
+    if (parent != nullptr)
+    {
         // QTreeWidgetItem::addChild(QTreeWidgetItem * child)
         parent->addChild(treeItem);
-    return treeItem;
+    }
 }
 
 // Slot activated when a service in the list is clicked
 void MainWindow::on_listWidget_clicked()
 {
     this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0);
+    ui->treeWidget->clear();
     preparePopulateTree();
 }
 
@@ -671,45 +765,74 @@ void MainWindow::preparePopulateTree()
         // setting savePath from settings
         this->downloading.savePath = this->settings.value(str).toString();
     }
-    this->settings.beginGroup("Passwords/" + this->connexion.server + "/" + this->connexion.service);
+
-    logins = this->settings.allKeys();
+    //getUserPassword(&this->connexion);
-        //TODO choose login
+
-    if (logins.count() != 0)
+    populateTree();
-    {
-        this->connexion.user = logins[0];
-        this->connexion.password = this->settings.value(logins[0]).toString();
-    }
-    this->settings.endGroup();
-    populateTree(NULL);
 }
 
 // get password and user login
 // if object = false ==> searching from connexion object
 // else searching from downloading object
-bool MainWindow::getUserPassword(bool object = false)
+bool MainWindow::getUserPassword(Connexion * object)
 {
     QStringList logins;
-    bool returnValue;
+    QString login;
+    QString password;
+    QString server;
+    QString service;
+    int c;
 
-    if (object == false)
+    bool returnValue = false;
-    {
+    bool ok = false;
-        this->settings.beginGroup("Passwords/" + this->connexion.server + "/" + this->connexion.service);
+
-    }else
+    server = object->server;
-    {
+    service = object->service;
-        this->settings.beginGroup("Passwords/" + this->downloading.server + "/" + this->downloading.service);
+
-    }
+    object->user = "";
+    object->password = "";
+
+    this->settings.beginGroup("Passwords/" + server + "/" + service);
     logins = this->settings.allKeys();
-    //TODO choose login in case of multiples logins
+    c = logins.count();
-    if (logins.count() != 0)
+    if ( c != 1)
     {
-        this->downloading.user = logins[0];
+        //choose login in case of multiples logins
-        this->downloading.password = this->settings.value(logins[0]).toString();
+        login = QInputDialog::getItem(this,
-        returnValue = true;
+                                      "RsincUI",
+                                      tr("Select the user you want to connect with or enter a new one"),
+                                      logins,
+                                      0,
+                                      true,
+                                      &ok,
+                                      Qt::Popup,
+                                      Qt::ImhNoPredictiveText
+                    );
+        if (ok and !login.isEmpty())
+        {
+            if (!logins.contains(login))
+            {
+                password = QInputDialog::getText(this,
+                                                 a.applicationName() + tr(" Request"),
+                                                 tr("Enter password"), QLineEdit::Password,
+                                                 "", &ok, Qt::Popup,
+                                                 Qt::ImhNoPredictiveText);
+                if (!ok or password.isEmpty())
+                {
+                    password = "";
+                }
             }else
             {
-        this->downloading.user = nullptr;
+                password = getPassword(login);
-        this->downloading.password = nullptr;
+            }
-        returnValue = false;
+            object->user = login;
+            object->password = password;
+        }
+    }else
+    {
+        object->user = logins.at(0);
+        object->password = getPassword(object->user);
+        returnValue = true;
     }
     this->settings.endGroup();
     return returnValue;
@@ -718,7 +841,6 @@ bool MainWindow::getUserPassword(bool object = false)
 //Slot activated when a file is clicked in the treeview
 void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadDir)
 {
-    QFuture<void> future;
     QFileDialog dialog;
     QTreeWidgetItem * itemR;
     QString path;
@@ -730,7 +852,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
 
     // assembling path from treewidget
     path = item->text(0);
-    sizeFromRsync = item->text(2).remove(',').toUInt();
+    sizeFromRsync = item->text(4).toUInt();
 
     while(itemR->parent() != NULL)
     {
@@ -740,7 +862,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
     };
 
     cout << item->text(1).toStdString() <<endl;
-    if (item->text(1) == tr("File") or downloadDir == true)
+    if (item->text(1) != tr("Dir") or downloadDir == true)
     {
         // exists saving path in settings ?
         str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
@@ -767,7 +889,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
             {
                 reply = QMessageBox::question(
                         this,
-                        "RsyncUI",
+                        a.applicationName(),
                         tr("File is partially downloaded. Do you want to resume download ? if no, the file will be deleted from destination directory"),
                         QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,
                         QMessageBox::Cancel);
@@ -784,7 +906,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
             {
                 reply = QMessageBox::question(
                         this,
-                        "RsyncUI",
+                        a.applicationName(),
                         tr("File is already downloaded. Do you want to reload it ? The old file will be deleted"),
                         QMessageBox::Yes|QMessageBox::No,
                         QMessageBox::No);
@@ -821,16 +943,20 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
         {
             QMessageBox::warning(
                 this,
-                "RsyncUI",
+                a.applicationName(),
                 tr("File is already downloading" )
             );
         }
     }else
     {
         //Item is a Directory
+        while (this->rescan)
+        {
             scanDir(this->connexion.server, this->connexion.port, item,  this->connexion.service + "/" + path +"/");
             item->setExpanded(true);
         }
+    }
+
     if (config.autosaveCheckbox->checkState() == Qt::Checked)
     {
         saveDownloadList();
@@ -843,11 +969,11 @@ void MainWindow::startDownloading()
 
     ui->progressBar->setValue(0);
     ui->progressBar->show();
-    getUserPassword(false);
+    //getUserPassword();
 
     //QtConcurrent::run(&this->downloadO, &downloadFile::download, this);
     this->download();
-    this->trayIcon->showMessage("RsyncUI", tr("Starting downloading\n") + this->downloading.path, QSystemTrayIcon::Information);
+    this->trayIcon->showMessage(a.applicationName(), tr("Starting downloading\n") + this->downloading.path, QSystemTrayIcon::Information);
 }
 
 // Slot stopping download
@@ -863,40 +989,59 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
     QString str;
     int pos;
     QString aborted = tr("finished");
+    QMessageBox::StandardButton reply;
+    bool retry = false;
 
     // test if process crashed
     if (exitStatus == QProcess::CrashExit)
     {
         QMessageBox::warning(
             NULL,
-            "RsyncUI",
+            a.applicationName(),
             tr("Rsync process crashed"));
     }
     //test result code of command (if 20 then command stopped by user)
-    if (exitCode != 0 and exitCode != 20)
+    if (exitCode != 0 and this->stopDlAsked != true)
     {
-        // displaying warning with exit code
+        if (exitCode == 20)
-        QMessageBox::warning(
-            NULL,
-            "RsyncUI",
-            rsyncErrorStrings[exitCode]);
-    }else if (exitCode == 20)
         {
             aborted = tr("stopped by user");
         }else if (exitCode == 5)                            // password asked
         {
-        loginDialog.show();
+            getUserPassword(&this->downloading);
+            retry = true;
         }
 
-    this->trayIcon->showMessage("RsyncUI", tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information);
+        // displaying warning with exit code
+        reply = QMessageBox::warning(
+            this,
+            a.applicationName(),
+            rsyncErrorStrings[exitCode] + tr("\nDo you want to retry?"),
+            QMessageBox::Yes|QMessageBox::No,
+            QMessageBox::Yes);
+        if (reply == QMessageBox::Yes)
+        {
+            retry = true;
+        }
+    }
+    this->stopDlAsked = false;
+    this->trayIcon->showMessage(a.applicationName(), tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information);
 
     // disconnecting signals to slots
     disconnect(this->downloading.process, 0, 0, 0);
 
-    // reset variables and window
+    // reset variables and window, close process
     this->downloading.process->close();
     ui->progressBar->hide();
+
+    if (retry == false)
+    {
+        QString filename = ui->listDownload->item(0)->text();
+        pos = filename.contains(" => ");
+        filename.resize(pos);
+        this->settings.setValue("Downloaded/" + ui->listDownload->item(0)->text(), true);
         delete ui->listDownload->takeItem(0);
+    }
     this->downloading.clear();
 
     // Some downloads staying in queue
@@ -911,7 +1056,9 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
         this->downloading.server = path.midRef(pos+4).toString();
         path.resize(pos);
         this->downloading.path = path;
-        getUserPassword(true);
+
+        //getUserPassword(true);
+        testServicePresence(this->downloading.service, true);
 
         // savepath exists in settings ?
         str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
@@ -919,14 +1066,14 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
         {
             // setting savepath from saved settings
             this->downloading.savePath = this->settings.value(str).toString();
+            sleep(2);
             startDownloading();
         }else
         {
             // no save path
             if(!on_DefaultSaveFolder_triggered())
             {
-                cout << "Error no save path so deleting download";
+                cout << "Error no save path so removing download";
-                //downloadFinished();
                 return;
             }
         }
@@ -948,13 +1095,14 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
         // first line clicked on download list
         reply = QMessageBox::question(
                 this,
-                "RsyncUI",
+                a.applicationName(),
                 tr("Do you want to stop downloading and delete this file from download queue ?"),
                 QMessageBox::Yes|QMessageBox::No,
                 QMessageBox::No);
         if (reply == QMessageBox::Yes)
         {
             // stopping download
+            this->stopDlAsked = true;
             emit (stopDownloading(this->downloading.process));
         }
     }else
@@ -962,7 +1110,7 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
         // not first line on download list
         reply = QMessageBox::question(
                 this,
-                "RsyncUI",
+                a.applicationName(),
                 tr("Do you want to delete this file from download queue ?"),
                 QMessageBox::Yes|QMessageBox::No,
                 QMessageBox::No);
@@ -971,7 +1119,6 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
             // removing line from download list
             ui->listDownload->removeItemWidget(item);
             delete item;
-
         }
     }
     if (config.autosaveCheckbox->checkState() == Qt::Checked)
@@ -1052,7 +1199,7 @@ bool MainWindow::on_DefaultSaveFolder_triggered()
      {
         QMessageBox::warning(
                 NULL,
-                "RsyncUI",
+                a.applicationName(),
                 tr("Since the save path is linked to service, you need to select a service before you can select a folder"));
                 return false;
      }
@@ -1164,7 +1311,7 @@ void MainWindow::loadDownloadList()
 }
 
 // clear object downloading
-void Downloading::clear()
+void Connexion::clear()
 {
     this->path.clear();
     this->server.clear();
@@ -1190,7 +1337,7 @@ void MainWindow::on_actionDownload_triggered()
 {
     QMessageBox::warning(
                        this,
-                       "RsyncUI",
+                       a.applicationName(),
                        errorString,
                        QMessageBox::Ok,
                        QMessageBox::Ok);
@@ -1208,25 +1355,6 @@ void MainWindow::on_actionExit_triggered()
     quitApp();
 }
 
-void MainWindow::on_loginBox_accepted()
-{
-    if (!loginD.loginEdit->text().isEmpty())
-    {
-        this->connexion.user = loginD.loginEdit->text();
-        if (!loginD.passwordEdit->text().isEmpty())
-        {
-            this->connexion.password = loginD.passwordEdit->text();
-            this->settings.setValue("Passwords/" + this->connexion.server + "/" + this->connexion.service + "/" + this->connexion.user, this->connexion.password);
-            this->settings.sync();
-            if (this->rescan == true)
-            {
-                this->rescan = false;
-                populateTree(NULL);
-            }
-        }
-    }
-}
-
 void MainWindow::setDlSpeed(QString speed)
 {
     speed.squeeze();
@@ -1237,13 +1365,14 @@ void MainWindow::on_actionHiddenService_triggered()
     QInputDialog hiddenFolderDialog;
 
     bool ok;
-    QString text = QInputDialog::getText(this, tr("RsyncUI Request"),
+    QString text = QInputDialog::getText(this, a.applicationName() + tr(" Request"),
                                          tr("Hidden service name"), QLineEdit::Normal,
                                          "test", &ok);
     if (ok && !text.isEmpty())
     {
         this->connexion.service = text;
-        this->settings.setValue("Hidden/" + this->connexion.server, text);
+        this->settings.setValue("Hidden/" + this->connexion.server + '/' + text, true);
+        ui->listWidget->addItem(text + "\n\t");
         preparePopulateTree();
     }
 }

mainwindow.h

@@ -5,9 +5,9 @@
 #include "ui_mainwindow.h"
 #include "ui_configuration.h"
 #include "ui_about.h"
-#include "ui_login.h"
 #include "downloadfile.h"
 #include "tools.h"
+#include "password.h"
 #include <QMainWindow>
 #include <string>
 #include <QTreeWidgetItem>
@@ -25,8 +25,6 @@
 #include <cstdio>
 #include <QMessageBox>
 #include <boost/algorithm/string/replace.hpp>
-#include <QFuture>
-#include <qtconcurrentrun.h>
 #include <QFileDialog>
 #include <QThread>
 #include <QProgressDialog>
@@ -58,12 +56,18 @@ class Connexion
     public:
         int bandwidthLimit = 0;
         int bandwidthLimitUnit;
+        int contimeout = 20;
         QString server;
         QString service;
+        QString path;
+        QString savePath;
         QString user;
         QString password;
+        QProcess * process = nullptr;
         int port = 873;
         bool comboboxChanged;
+        bool quit = false;
+        void clear();
 };
 
 class Downloading
@@ -84,8 +88,7 @@ class Downloading
 class About
 {
     public:
-        QString title = "RsyncUI";
+        QString version = "2.11.1";
-        QString version = "2.8";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
         QString description;
@@ -101,28 +104,29 @@ class MainWindow : public QMainWindow
         Ui::MainWindow *ui;
         MainWindow(QWidget *parent = nullptr);
         ~MainWindow();
+        // passwdManager;
         QProgressDialog *progress;
         Connexion connexion;
-        Downloading downloading;
+        Connexion downloading;
         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;
+        bool stopDlAsked;
 
-        QList<QString> bwUnitText {
+        QList<QString> UnitText {
-            "KB",
+            tr("B"),
-            "MB",
+            tr("KB"),
-            "TB",
+            tr("MB"),
-            "GB",
+            tr("GB"),
-            "PB"
+            tr("TB"),
+            tr("PB")
             };
         QList<QChar> bwUnitChar{
             'K',
@@ -143,13 +147,12 @@ class MainWindow : public QMainWindow
         };
 
         void displayTree();
-        void populateTree(QTreeWidgetItem * parent);
+        void populateTree();
-        void populateList();
+        void populateList(int);
         void listServices();
         bool validateServer(QString server);
         bool isIpAddress(QString server);
-        QTreeWidgetItem * addTreeRoot(QString name, QString description, bool isDir);
+        void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QTreeWidgetItem *parent);
-        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, bool isDir);
         bool scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
         void startDownloading();
         void loadSettings();
@@ -162,8 +165,11 @@ class MainWindow : public QMainWindow
         void hideWindow();
         void showWindow();
         void init();
-        bool getUserPassword(bool);
+        bool getUserPassword(Connexion *);
         void preparePopulateTree();
+        bool testServicePresence(QString, bool=false);
+        void passwordStore (QString account, QString password);
+        QString passwordGet (QString account);
 
     private slots:
 
@@ -173,10 +179,6 @@ class MainWindow : public QMainWindow
 
         void downloadFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
-//       void downloadProcessError(QProcess::ProcessError error);
-
-        void downloadProcessStderr();
-
         void readRsyncOutput();
 
         void stoppingDownload();
@@ -213,8 +215,6 @@ class MainWindow : public QMainWindow
 
         void setDlSpeed(QString speed);
 
-        void on_loginBox_accepted();
-
         void on_actionHiddenService_triggered();
 
 signals:
@@ -223,7 +223,7 @@ signals:
         void speed(QString);
         void finishedSignal(bool = true);
         void fileName(QString);
-        //void errorSignal(QString);
+        void passwordReady();
 };
 
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -325,6 +325,9 @@
            <property name="inputMethodHints">
             <set>Qt::ImhNoAutoUppercase</set>
            </property>
+           <property name="placeholderText">
+            <string>Filter...</string>
+           </property>
           </widget>
          </item>
         </layout>
@@ -469,7 +472,8 @@
   </action>
   <action name="actionHiddenService">
    <property name="icon">
-    <iconset theme="folder-open"/>
+    <iconset theme="folder-open">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>hidden service</string>

password.cpp

@@ -0,0 +1,55 @@
+#include "mainwindow.h"
+#include "password.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+#include <QSettings>
+
+using namespace std;
+extern QApplication a;
+
+QString appName = "RsyncUI";
+
+static QSettings sett{appName, appName};
+
+void setPassword(QString account, QString pass)
+{
+    QKeychain::WritePasswordJob write(appName);
+    write.setSettings(&sett);
+   // write.setAutoDelete(false);
+    write.setKey(account);
+    write.setTextData(pass);
+
+    QEventLoop loop;
+    write.connect(&write, &QKeychain::WritePasswordJob::finished, &loop, &QEventLoop::quit);
+
+    write.start();
+    loop.exec();
+
+    if(write.error())
+        cout << "Error writing key1. Error: " << write.errorString().toStdString();
+}
+
+QString getPassword(const QString& name)
+{
+    QKeychain::ReadPasswordJob readPass(appName);
+    readPass.setSettings(&sett);
+   // readPass.setAutoDelete(false);
+    readPass.setKey(name);
+
+    QEventLoop loop;
+    readPass.connect(&readPass, &QKeychain::ReadPasswordJob::finished, &loop, &QEventLoop::quit);
+
+    readPass.start();
+    loop.exec();
+
+    if(readPass.error())
+    {
+        cout << "KeyHandler~Error reading decrypt Pass. Error: " + readPass.errorString() . toStdString() << endl;
+        return "";
+    }
+    else
+    {
+        QString data = readPass.textData();
+        return data;
+    }
+}

password.h

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

tools.cpp

@@ -6,6 +6,7 @@ using namespace std;
 #define WRITE  1
 
 extern QMap<int, QString> rsyncErrorStrings;
+extern QApplication a;
 
 //Take a string and explode it in array
 // s => string to explode
@@ -44,31 +45,28 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
 }
 
 // test return code of rsync
+// return true in case of error
 bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
 {
-    if (myProcess->exitStatus() != 0)
+    if (myProcess->exitStatus() != 0 and w->stopDlAsked != true)
     {
         QMessageBox::warning(
-                   NULL,
+                   w,
-                   "RsyncUI",
+                   a.applicationName(),
                    myProcess->errorString(),
                    QMessageBox::Ok,
                    QMessageBox::Ok);
         return true;
-    }else if (myProcess->exitCode() == 5)
-    {
-        w->loginDialog.show();
-    }else if (myProcess->exitCode() != 0)
-    {
-        QMessageBox::warning(
-                   NULL,
-                   "RsyncUI",
-                   rsyncErrorStrings[myProcess->exitCode()],
-                   QMessageBox::Ok,
-                   QMessageBox::Ok);
-        return true;
     }
+    w->stopDlAsked = false;
     return false;
 }
 
+QString getFileType(QString filename)
+{
+    QMimeDatabase db;
+    QMimeType mime = db.mimeTypeForFile(filename);
+    QString returnValue = mime.name().section('/',0 ,0);
+    return returnValue;
+}
 

tools.h

@@ -9,6 +9,8 @@
 #include <QMap>
 #include <QTranslator>
 #include <QProcess>
+#include <QMimeDatabase>
+#include <QMimeType>
 
 using namespace std;
 
@@ -19,5 +21,6 @@ FILE * popen2(array<string,8> argv, string type, int & pid);
 int pclose2(FILE * fp, pid_t pid);
 
 bool testRsyncReturn(MainWindow *, QProcess *);
+QString getFileType(QString finename);
 
 #endif // TOOLS_H