version 2.9

RsyncUI.pro

@@ -19,11 +19,13 @@ SOURCES += \
     downloadfile.cpp \
     main.cpp \
     mainwindow.cpp \
+    password.cpp \
     tools.cpp
 
 HEADERS += \
     downloadfile.h \
     mainwindow.h \
+    password.h \
     tools.h
 
 FORMS += \

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-05T10:17:18. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

RsyncUI.spec

@@ -2,7 +2,7 @@
 
 Name: rsyncui
 Summary: Client for rsync server
-Version: 2.8
+Version: 2.9
 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>

mainwindow.cpp

@@ -65,19 +65,18 @@ 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 +85,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 +102,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();
 }
@@ -275,7 +276,7 @@ void MainWindow::closeEvent (QCloseEvent *event)
 }
 
 // Populate treeview with list of files
-void MainWindow::populateTree(QTreeWidgetItem * parent)
+void MainWindow::populateTree()
 {
     QString path;
 
@@ -291,7 +292,7 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
         {
             // server is validated, scanning directory
             path = this->connexion.service + "/";
-           scanDir(this->connexion.server, this->connexion.port, parent, path);
+           scanDir(this->connexion.server, this->connexion.port, nullptr, path);
         }
         // Restoring cursor
         QGuiApplication::restoreOverrideCursor();
@@ -356,6 +357,7 @@ void MainWindow::populateList()
         hidden = this->settings.allKeys();
         for (i = 0; i < hidden.size(); i++)
         {
+            //TODO detect if service is already present
             ui->listWidget->addItem(this->settings.value(hidden.at(i)).toString() + "\n\t");
         }
         QGuiApplication::restoreOverrideCursor();  //setting cursor to default
@@ -376,7 +378,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,9 +417,13 @@ 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;
     bool isDir = false;
     bool flag = false;
@@ -444,7 +450,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 +470,24 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
                         flag = true;
                         break;
                     }
-                    // extracting name, size and is dir/file
+                    // 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
+                        {
+                            size = sizeA.at(0) + "," + sizeA.at(1).left(2) + " " + UnitText[sizeA.count()-1] + " ";
+                        }
+
                         if (line[0] == "d")
                         {
                             isDir = true;
@@ -477,15 +495,9 @@ bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
                         {
                             isDir = false;
                         }
-                        if (parent != NULL)
+                        date = line.section(' ', 2, 2);
-                        {
+                        fileType = getFileType(filename);
-                            //adding item to tree
+                        addTreeItem(filename, size, fullsize, fileType, date, isDir, parent);
-                            addTreeChild(parent, filename, size, isDir);
-                        }else
-                        {
-                            //adding item to tree (as directory)
-                            addTreeRoot(filename, size, isDir);
-                        }
                     }
                 }
                 flag = false;
@@ -604,11 +616,17 @@ void MainWindow::on_connectButton_clicked()
    populateList();
 }
 
-// add a dir in treeview
+// add parent in treeview
-QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir)
+void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir=false, QTreeWidgetItem *parent=nullptr)
 {
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget);
+    QTreeWidgetItem *treeItem;
-
+    if (parent != nullptr)
+    {
+        treeItem = new QTreeWidgetItem();
+    }else
+    {
+        treeItem = new QTreeWidgetItem(ui->treeWidget);
+    }
     if (isDir == true)
     {
         // item is a dir
@@ -617,36 +635,20 @@ QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool i
     }else
     {
         // item is a file
-        treeItem->setText(1,tr("File"));
+        treeItem->setText(1,type);
-        //treeItem->setIcon(0, QIcon::fromTheme("document"));
     }
     treeItem->setText(0, name);
     treeItem->setText(2, fileSize);
+    treeItem->setText(3, date);
+    treeItem->setText(4, fullsize);
 
-    return treeItem;
+    treeItem->setTextAlignment(2, Qt::AlignRight);
-}
 
-// add a file in treeview
+    if (parent != nullptr)
-QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir)
-{
-    QTreeWidgetItem *treeItem = new QTreeWidgetItem();
-
-    if (isDir == true)
     {
-        // item is a dir
+        // QTreeWidgetItem::addChild(QTreeWidgetItem * child)
-        treeItem->setText(1, tr("Dir"));
+        parent->addChild(treeItem);
-        treeItem->setIcon(0, QIcon::fromTheme("folder"));
-    }else
-    {
-        // item is a file
-        treeItem->setText(1,tr("File"));
     }
-    treeItem->setText(0, name);
-    treeItem->setText(2, fileSize);
-
-    // QTreeWidgetItem::addChild(QTreeWidgetItem * child)
-    parent->addChild(treeItem);
-    return treeItem;
 }
 
 // Slot activated when a service in the list is clicked
@@ -680,7 +682,7 @@ void MainWindow::preparePopulateTree()
         this->connexion.password = this->settings.value(logins[0]).toString();
     }
     this->settings.endGroup();
-    populateTree(NULL);
+    populateTree();
 }
 
 // get password and user login
@@ -730,7 +732,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 +742,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;
@@ -863,6 +865,8 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
     QString str;
     int pos;
     QString aborted = tr("finished");
+    QMessageBox::StandardButton reply;
+    bool retry = false;
 
     // test if process crashed
     if (exitStatus == QProcess::CrashExit)
@@ -873,19 +877,28 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
             tr("Rsync process crashed"));
     }
     //test result code of command (if 20 then command stopped by user)
-    if (exitCode != 0 and exitCode != 20)
+    if (exitCode != 0)
     {
+        if (exitCode == 20)
+        {
+            aborted = tr("stopped by user");
+        }else if (exitCode == 5)                            // password asked
+        {
+            loginDialog.show();
+            retry = true;
+        }
+
         // displaying warning with exit code
-        QMessageBox::warning(
+        reply = QMessageBox::warning(
-            NULL,
+            this,
             "RsyncUI",
-            rsyncErrorStrings[exitCode]);
+            rsyncErrorStrings[exitCode] + tr("\nDo you want to retry?"),
-    }else if (exitCode == 20)
+            QMessageBox::Yes|QMessageBox::No,
-    {
+            QMessageBox::Yes);
-        aborted = tr("stopped by user");
+        if (reply == QMessageBox::Yes)
-    }else if (exitCode == 5)                            // password asked
+        {
-    {
+            retry = true;
-        loginDialog.show();
+        }
     }
 
     this->trayIcon->showMessage("RsyncUI", tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information);
@@ -896,7 +909,11 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
     // reset variables and window
     this->downloading.process->close();
     ui->progressBar->hide();
-    delete ui->listDownload->takeItem(0);
+
+    if (retry == false)
+    {
+        delete ui->listDownload->takeItem(0);
+    }
     this->downloading.clear();
 
     // Some downloads staying in queue
@@ -1221,7 +1238,7 @@ void MainWindow::on_loginBox_accepted()
             if (this->rescan == true)
             {
                 this->rescan = false;
-                populateTree(NULL);
+                populateTree();
             }
         }
     }

mainwindow.h

@@ -58,6 +58,7 @@ class Connexion
     public:
         int bandwidthLimit = 0;
         int bandwidthLimitUnit;
+        int contimeout = 20;
         QString server;
         QString service;
         QString user;
@@ -85,7 +86,7 @@ class About
 {
     public:
         QString title = "RsyncUI";
-        QString version = "2.8";
+        QString version = "2.9";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
         QString description;
@@ -117,12 +118,13 @@ class MainWindow : public QMainWindow
         QString icon = "/usr/share/icons/RsyncUI.png";
         bool rescan = false;
 
-        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 +145,14 @@ class MainWindow : public QMainWindow
         };
 
         void displayTree();
-        void populateTree(QTreeWidgetItem * parent);
+        void populateTree();
         void populateList();
         void listServices();
         bool validateServer(QString server);
         bool isIpAddress(QString server);
-        QTreeWidgetItem * addTreeRoot(QString name, QString description, bool isDir);
+        void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QTreeWidgetItem *parent);
-        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, bool isDir);
+        //QTreeWidgetItem * addTreeRoot(QString name, QString size, QString fullsize, bool isDir);
+        //QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, QString fullsize, bool isDir);
         bool scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
         void startDownloading();
         void loadSettings();
@@ -217,7 +220,7 @@ class MainWindow : public QMainWindow
 
         void on_actionHiddenService_triggered();
 
-signals:
+    signals:
         void stopDownloading(QProcess *);
         void progressSignal(int);
         void speed(QString);

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

password.h

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

tools.cpp

@@ -71,4 +71,10 @@ bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
     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