correct version string

RsyncUI.pro.user

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

downloadfile.cpp

@@ -19,59 +19,70 @@
 
 using namespace std;
 
+// Initialization de la class
 downloadFile::downloadFile()
 {
 }
 
+//Slot activated when download is cancelled
 void downloadFile::cancelled(int pid)
 {
-    if (kill(pid, SIGTERM) == -1)
+    if (pid == 0)
     {
-        //TODO gestion erreur kill
+        perror("Pid = 0 : I do not kill");      // Error rsync process not launched so it can't be killed
+    }else if (kill(pid, SIGTERM) == -1)
+    {
+        //TODO managing error of kill
     }
 }
 
+// launch a rsync processus downloading a file
 void downloadFile::download(MainWindow *mw)
 {
     string line;
     string errorRsync;
     int pos;
-    array<string, 7> argv;
+    array<string,8> argv;
     stringstream output;
     vector<string> v;
     int value;
     char buffer[4096];
 
+    // Populating array with command and parameters for popen2
     argv[0] = "/usr/bin/rsync";
     if (mw->connexion.bandwidthLimit == 0)
     {
         argv[1] = "--bwlimit=1000P";
     }else
     {
-        output << mw->connexion.bandwidthLimit;
-        argv[1] = "--bwlimit=" + output.str() +  mw->connexion.bandwidthLimitUnit;
+        argv[1] = "--bwlimit=" + to_string(mw->connexion.bandwidthLimit) + mw->connexion.bandwidthLimitUnit;
     }
     argv[2] = "--port=" + to_string(mw->connexion.port);
     argv[3] = "-P";
     argv[4] = mw->connexion.server + "::" + mw->downloading.service + "/" + mw->downloading.path;
     argv[5] = mw->downloading.savePath + "/";
-    argv[6] = "";
+    argv[6].clear();
 
     //launching downloading thread
     FILE * fp = popen2(argv, "r", mw->downloading.pid);
-    if (!fp)
+    if (fp <= (FILE *) 0)
     {
-        throw runtime_error("popen2() failed!");
+        sprintf(buffer, "popen2() failed!: returning code:%d", fileno(fp));
+        throw runtime_error(buffer);
         return;
     }
 
+    // waiting rsync output
     while (fgets(buffer, 4096, fp) != nullptr)
     {
+        // Downloading is cancelled, we return
         if (this->canceled == true)
         {
             return;
         }
         line = buffer;
+
+        // extracting percentage of completion
         pos = line.find('%');
         if (pos != -1)
         {
@@ -81,9 +92,11 @@ void downloadFile::download(MainWindow *mw)
             {
                 line.erase(0, pos);
                 value = stoi(line);
+                // sending progress to Main window
                 emit progressSignal(value);
             }
         }
+        // download ended
     }
     pclose2(fp, mw->downloading.pid);
 
@@ -91,4 +104,3 @@ void downloadFile::download(MainWindow *mw)
     emit progressSignal(100);
     emit finishedSignal(true);
 }
-

languages/fr_FR/RsyncUI_fr_FR.ts

@@ -11,8 +11,7 @@
     <message>
         <location filename="../../configuration.ui" line="32"/>
         <source>Enter the bandwidth limit</source>
-        <translation>Entrez la limite de bande passante
-</translation>
+        <translation>Entrez la limite de bande passante</translation>
     </message>
     <message>
         <location filename="../../configuration.ui" line="48"/>
@@ -51,61 +50,61 @@
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="143"/>
+        <location filename="../../mainwindow.ui" line="146"/>
         <source>Enter rsync port on server</source>
         <translation>Entrez le port du servuer rsync</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="177"/>
+        <location filename="../../mainwindow.ui" line="183"/>
         <source>Press button to connect to rsync server</source>
         <extracomment>Connect to server</extracomment>
         <translation>Cliquez pour se connecter au serveur rsync</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="183"/>
+        <location filename="../../mainwindow.ui" line="189"/>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="186"/>
+        <location filename="../../mainwindow.ui" line="192"/>
         <source>Return</source>
         <translation>Retour</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="209"/>
+        <location filename="../../mainwindow.ui" line="218"/>
         <source>Click to view the list of files of this folder</source>
         <translation>Cliquez pour afficher la liste des documents</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="238"/>
+        <location filename="../../mainwindow.ui" line="253"/>
         <source>Click to add to download queue</source>
         <translation>Cliquez pour ajouter à la file de téléchargement</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="307"/>
+        <location filename="../../mainwindow.ui" line="331"/>
         <source>Click on file to stop downloading</source>
         <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enleveer de la file</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="327"/>
+        <location filename="../../mainwindow.ui" line="354"/>
         <source>%p%</source>
         <extracomment>Downloading</extracomment>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="344"/>
-        <location filename="../../mainwindow.ui" line="362"/>
+        <location filename="../../mainwindow.ui" line="371"/>
+        <location filename="../../mainwindow.ui" line="389"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="351"/>
+        <location filename="../../mainwindow.ui" line="378"/>
         <source>help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="367"/>
-        <location filename="../../mainwindow.ui" line="370"/>
+        <location filename="../../mainwindow.ui" line="394"/>
+        <location filename="../../mainwindow.ui" line="397"/>
         <source>Change save folder</source>
         <translation>Changer le dossier de destination</translation>
     </message>
@@ -114,22 +113,22 @@
         <translation type="vanished">Dossier d&apos;enregistrement</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="375"/>
+        <location filename="../../mainwindow.ui" line="402"/>
         <source>Bandwidth limit</source>
         <translation>Limite de bande passante</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="380"/>
+        <location filename="../../mainwindow.ui" line="407"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="385"/>
+        <location filename="../../mainwindow.ui" line="412"/>
         <source>About Qt</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="390"/>
+        <location filename="../../mainwindow.ui" line="417"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
@@ -164,10 +163,19 @@
     </message>
     <message>
         <location filename="../../mainwindow.cpp" line="21"/>
-        <location filename="../../mainwindow.cpp" line="517"/>
+        <location filename="../../mainwindow.cpp" line="587"/>
         <source>PB</source>
         <translation>Po</translation>
     </message>
+    <message>
+        <location filename="../../mainwindow.cpp" line="24"/>
+        <source>Client for rsync server
+
+You click on file to enqueue it, and RyncUI Download one file a time</source>
+        <translation>Client pour serveur rsync
+
+Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement.</translation>
+    </message>
     <message>
         <location filename="../../mainwindow.cpp" line="35"/>
         <source>Path</source>
@@ -179,44 +187,54 @@
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="68"/>
+        <location filename="../../mainwindow.cpp" line="35"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../../mainwindow.cpp" line="76"/>
         <source>Exiting will stop downloading, and will clear the download queue.
  Do you want to exit ?</source>
         <translation>Soritr stoppera le téléchargement et effacera la file des téléchargements.
 Voulez-vous vraiment sortir du programme ?</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="297"/>
+        <location filename="../../mainwindow.cpp" line="326"/>
         <source>server does not exists</source>
         <translation>Le serveur n&apos;existe pas</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="479"/>
+        <location filename="../../mainwindow.cpp" line="545"/>
+        <source>Version</source>
+        <translation>Version</translation>
+    </message>
+    <message>
+        <location filename="../../mainwindow.cpp" line="546"/>
         <source>Licence</source>
         <translation>License</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="480"/>
+        <location filename="../../mainwindow.cpp" line="547"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="481"/>
+        <location filename="../../mainwindow.cpp" line="548"/>
         <source>EMail</source>
         <translation>Courriel</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="482"/>
+        <location filename="../../mainwindow.cpp" line="549"/>
         <source>Source code</source>
         <translation>Code source</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="495"/>
+        <location filename="../../mainwindow.cpp" line="564"/>
         <source>Choose directory to save file</source>
         <translation>Choisissez le dossier où enregistrer</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="413"/>
+        <location filename="../../mainwindow.cpp" line="477"/>
         <source>Do you want to stop downloading and delete this file from download queue ?</source>
         <translation>Vouslez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
     </message>
@@ -225,7 +243,7 @@ Voulez-vous vraiment sortir du programme ?</translation>
         <translation type="vanished">Client pour serveur rsync</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="425"/>
+        <location filename="../../mainwindow.cpp" line="489"/>
         <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>

main.cpp

@@ -2,12 +2,14 @@
 
 #include <QTranslator>
 
-
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     QTranslator myappTranslator;
 
+    QCoreApplication::setOrganizationName("RsyncUI");
+    QCoreApplication::setApplicationName("RsyncUI");
+    // Initialization of localization
     QLocale localeName = QLocale::system();
     QString localeFile = "/usr/share/locale/" + localeName.name()  + "/LC_MESSAGES/RsyncUI_" + localeName.name() + ".qm";
     if (myappTranslator.load(localeFile))

mainwindow.cpp

@@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent)
     config.UnitCombobox->addItems({tr("Byte"), tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB")});
 
     // init of About
-    this->about.description = tr(this->about.description.toStdString().c_str());
+    this->about.description = tr("Client for rsync server\n\nYou click on file to enqueue it, and RyncUI Download one file a time");
 
     // connectors
     connect(&downloadO, &downloadFile::progressSignal, ui->progressBar, &QProgressBar::setValue);
@@ -32,7 +32,7 @@ MainWindow::MainWindow(QWidget *parent)
     // init of widgets
     ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget);
     ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive);
-    ui->treeWidget->setHeaderLabels({tr("Path"), tr("Size")} );
+    ui->treeWidget->setHeaderLabels({tr("Type"), tr("Path"), tr("Size")} );
     if (this->settings.contains("connexion/lastServer"))
     {
         ui->portEdit->setText(this->settings.value("connexion/port").toString());
@@ -43,7 +43,12 @@ MainWindow::MainWindow(QWidget *parent)
         ui->khistorycombobox->clear();
     }
 
+    // setting arrowcursor for treeWidget, listWidget and listDownload
+    ui->treeWidget->setCursor(Qt::ArrowCursor);
+    ui->listWidget->setCursor(Qt::ArrowCursor);
+    ui->listDownload->setCursor(Qt::ArrowCursor);
 
+    // Hiding progress bar
     ui->progressBar->hide();
 
     populateList();
@@ -54,15 +59,18 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+// Closing window has been clicked
 void MainWindow::closeEvent (QCloseEvent *event)
 {
     QMessageBox::StandardButton reply;
 
+    // saving settings
     saveSettings();
 
-    if (ui->listDownload->count() != 0)
+    if (ui->listDownload->count() != 0)         // some downloads waiting
     {
-       reply = QMessageBox::question(
+        //  Asking for stopping or continuing
+        reply = QMessageBox::question(
                 this,
                 "RsyncUI",
                 tr("Exiting will stop downloading, and will clear the download queue.\n Do you want to exit ?"),
@@ -70,10 +78,12 @@ void MainWindow::closeEvent (QCloseEvent *event)
                 QMessageBox::No);
         if (reply == QMessageBox::No)
         {
+            // continuing
             event->ignore();
             return;
         }else
         {
+            // emission of signal to downloading thread and stopping
             emit (stopDownloading(this->downloading.pid));
             waitpid(this->downloading.pid, NULL, WUNTRACED);
         }
@@ -81,24 +91,31 @@ void MainWindow::closeEvent (QCloseEvent *event)
     event->accept();
 }
 
-void MainWindow::populateTree()
+// Populate treeview with list of files
+void MainWindow::populateTree(QTreeWidgetItem * parent)
 {
     stringstream ss;
     vector<string> path;
 
+    // Clear treewidget
     ui->treeWidget->clear();
     if (!this->connexion.server.empty() and this->connexion.port > 0 and this->connexion.port < 65536)
     {
+        // setting cursor to "Wait"
         QGuiApplication::setOverrideCursor(Qt::WaitCursor);
+
         if (validateServer(this->connexion.server))
         {
+            // server is validated
             path = explode(ui->listWidget->currentItem()->text().toStdString(), '\n', 2);
-            scanDir(this->connexion.server, this->connexion.port, NULL, path[0].append("/") );
+            scanDir(this->connexion.server, this->connexion.port, parent, path[0].append("/") );
         }
-        QGuiApplication::restoreOverrideCursor();   //setOverrideCursor(Qt::ArrowCursor);
+        // Restoring cursor
+        QGuiApplication::restoreOverrideCursor();
     }
 }
 
+// Populate Listview with list of services
 void MainWindow::populateList()
 {
     stringstream ss;
@@ -110,13 +127,16 @@ void MainWindow::populateList()
     port = ui->portEdit->text().toUInt();
     if ((server.toStdString() != this->connexion.server) or (port != this->connexion.port))
     {
+        // clearing listwidget
         ui->listWidget->clear();
         this->connexion.server.assign(server.toStdString());
         this->connexion.port = port;
 
+        // verify if server is in history
         this->settings.beginGroup("connexion/server");
         if (this->settings.contains(server))
         {
+            // server is in history and completing port value
             port = this->settings.value(server).toUInt();
             ui->portEdit->setText(QString::number(port));
             this->connexion.port = port;
@@ -126,7 +146,7 @@ void MainWindow::populateList()
         {
             if (validateServer(server.toStdString()))
             {
-                //this->settings.beginGroup("connexion/server");
+
                 if (!this->settings.contains(server))
                 {
                     cout << server.toStdString() << endl;
@@ -149,6 +169,7 @@ void MainWindow::populateList()
     }
 }
 
+//list services of the rsync server
 void MainWindow::listServices()
 {
     char cmd[4096];
@@ -169,6 +190,7 @@ void MainWindow::listServices()
     }
 }
 
+// connect to rsync server to get list of files
 void MainWindow::scanDir(string server, int portN, QTreeWidgetItem *parent, string path)
 {
     char cmd[4096];
@@ -176,37 +198,41 @@ void MainWindow::scanDir(string server, int portN, QTreeWidgetItem *parent, stri
     string errorRsync;
     vector<string> v;
     QTreeWidgetItem * item;
-    char npath[4096];
+    bool isDir = false;
 
     sprintf(cmd, "rsync --contimeout=10 -P \"%s::%s\" --port %d ", server.c_str(), path.c_str(), portN );
     redi::ipstream in(cmd, redi::pstreams::pstdout | redi::pstreams::pstderr);
 
     while (getline(in.out(), line))
     {
-
         v = explode(line, ' ', 5);
         if (v.size() == 5)
         {
             if (v[4].at(0) != '.' and (v[0].at(0) == '-' or v[0].at(0) == 'd'))
             {
-                if (parent != NULL)
-                {
-                    item = addTreeChild(parent,QString::fromStdString(v[4]), QString::fromStdString(v[1]));
-                }else
-                {
-                    item = addTreeRoot(QString::fromStdString(v[4]), QString::fromStdString(v[1]));
-                }
                 if (v[0].at(0) == 'd')
                 {
-                   sprintf(npath, "%s%s/", path.c_str(), v[4].c_str());
-                   scanDir(server, portN, item, npath);
+                   isDir = true;
+                }else
+                {
+                    isDir = false;
                 }
+                if (parent != NULL)
+                {
+                    item = addTreeChild(parent,QString::fromStdString(v[4]), QString::fromStdString(v[1]), isDir);
+                }else
+                {
+                    item = addTreeRoot(QString::fromStdString(v[4]), QString::fromStdString(v[1]), isDir);
+                }
+
             }
         }
     }
+
     // if reading stdout stopped at EOF then reset the state:
     if (in.eof() && in.fail())
         in.clear();
+
     // read child's stderr
     while (getline(in.err(), line))
     {
@@ -214,6 +240,7 @@ void MainWindow::scanDir(string server, int portN, QTreeWidgetItem *parent, stri
         errorRsync.append(line);
         errorRsync.append("\n");
     }
+
     if ( !errorRsync.empty())
     {
         QMessageBox::warning(
@@ -224,6 +251,7 @@ void MainWindow::scanDir(string server, int portN, QTreeWidgetItem *parent, stri
 
 }
 
+// Verify if server address is IP address
 bool MainWindow::isIpAddress(string server)
 {
     vector<string> r;
@@ -249,6 +277,7 @@ bool MainWindow::isIpAddress(string server)
     }
 }
 
+// validate address server
 bool MainWindow::validateServer(string server)
 {
     char cmd[512];
@@ -300,79 +329,111 @@ bool MainWindow::validateServer(string server)
     return flag;
 }
 
-void MainWindow::displayTree()
-{
-  populateTree();
-
-}
-
+// slot activated when combobox is changed
 void MainWindow::on_khistorycombobox_currentIndexChanged(int i)
 {
     on_connectButton_clicked();
 }
 
+// slot activated when button connection is clicked
 void MainWindow::on_connectButton_clicked()
 {
    populateList();
 }
 
-QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize)
+// add a dir in treeview
+QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir)
 {
     // QTreeWidgetItem(QTreeWidget * parent, int type = Type)
     QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget);
 
     // QTreeWidgetItem::setText(int column, const QString & text)
-    treeItem->setText(0, name);
-    treeItem->setText(1, fileSize);
+    if (isDir == true)
+    {
+        treeItem->setText(0, "Dir");
+    }else
+    {
+        treeItem->setText(0,"File");
+    }
+    treeItem->setText(1, name);
+    treeItem->setText(2, fileSize);
+
     return treeItem;
 }
 
-QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize)
+// add a file in treeview
+QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir)
 {
     // QTreeWidgetItem(QTreeWidget * parent, int type = Type)
     QTreeWidgetItem *treeItem = new QTreeWidgetItem();
 
     // QTreeWidgetItem::setText(int column, const QString & text)
-    treeItem->setText(0, name);
-    treeItem->setText(1, fileSize);
+    if (isDir == true)
+    {
+        treeItem->setText(0, "Dir");
+    }else
+    {
+        treeItem->setText(0,"File");
+    }
+    treeItem->setText(1, name);
+    treeItem->setText(2, fileSize);
 
     // QTreeWidgetItem::addChild(QTreeWidgetItem * child)
     parent->addChild(treeItem);
     return treeItem;
 }
 
+// Slot acivated when a service in the list is clicked
 void MainWindow::on_listWidget_clicked()
 {
     vector<string> v;
     v = explode(ui->listWidget->currentItem()->text().toStdString(), '\n', 2);
     this->downloading.service = v[0];
-    populateTree();
+    populateTree(NULL);
 }
 
+//Slot activated when a file is clicked in the treeview
 void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item)
 {
     QFuture<void> future;
     QFileDialog dialog;
+    QTreeWidgetItem * itemR;
+    string path;
 
-    item = ui->treeWidget->currentItem();
-    this->downloading.path = item->text(0).toStdString();
-    while(item->parent() != NULL)
+    //item = ui->treeWidget->currentItem();
+    itemR = item;
+
+    path = item->text(1).toStdString();
+    while(itemR->parent() != NULL)
     {
-        item = item->parent();
-        this->downloading.path = item->text(0).toStdString() + "/" + this->downloading.path;
+        itemR = itemR->parent();
+        path = itemR->text(1).toStdString() + "/" + path;
     };
 
-    if (this->downloading.savePath.empty())
+    if (item->text(0) == "File")
     {
-        on_DefaultSaveFolder_triggered();
-    }
-    if (!this->downloading.savePath.empty() && this->downloading.pid == 0)
+        // Item is a file
+        this->downloading.path = path;
+        if (this->downloading.savePath.empty())
+        {
+            on_DefaultSaveFolder_triggered();
+        }else if (this->downloading.pid == 0)
+        {
+            startDownloading();
+            sleep(1);
+
+        }
+        ui->listDownload->addItem(QString::fromStdString(this->downloading.path));
+    }else
     {
-        startDownloading();
+        //Item is a Directory
+        scanDir(this->connexion.server, this->connexion.port, item,  this->downloading.service + "/" + path +"/");
+        item->setExpanded(true);
     }
-    ui->listDownload->addItem(QString::fromStdString(this->downloading.path));
+
 }
 
+// Launch the thread which download the file
 void MainWindow::startDownloading()
 {
     ui->progressBar->setValue(0);
@@ -382,11 +443,13 @@ void MainWindow::startDownloading()
 
 }
 
+// Slot stopping download
 void MainWindow::stoppingDownload()
 {
     emit (stopDownloading(this->downloading.pid));
 }
 
+// when download is finished, launch download of next file in queue
 void MainWindow::downloadFinished()
 {
     ui->progressBar->hide();
@@ -399,6 +462,7 @@ void MainWindow::downloadFinished()
     }
 }
 
+// Slot activated when a line is clicked in queue list
 void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
 {
     QFileDialog dialog;
@@ -433,12 +497,13 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
     }
 }
 
+// load settings
 void MainWindow::loadSettings()
 {
-    // restoring geometry and state of wondow and widgets
+    // restoring geometry and state of window and widgets
     this->restoreGeometry(settings.value("window/geometry").toByteArray());
     this->restoreState(settings.value("window/state").toByteArray());
-    ui->treeWidget->header()->restoreState(settings.value("treeView/state").toByteArray());
+    ui->treeWidget->header()->restoreState(settings.value("treeWidget/state").toByteArray());
     ui->splitter->restoreState(settings.value("splitter/state").toByteArray());
     ui->splitter_2->restoreState(settings.value("splitter2/state").toByteArray());
 
@@ -460,12 +525,12 @@ void MainWindow::loadSettings()
     this->connexion.bandwidthLimitUnit = this->settings.value("bandwidthlimitunit").toString().toStdString();
 }
 
-
+// save settings
 void MainWindow::saveSettings()
 {
     this->settings.setValue("window/geometry", saveGeometry());
     this->settings.setValue("window/state", saveState());
-    this->settings.setValue("treeView/state", ui->treeWidget->header()->saveState());
+    this->settings.setValue("treeWidget/state", ui->treeWidget->header()->saveState());
     this->settings.setValue("splitter/state", ui->splitter->saveState());
     this->settings.setValue("splitter2/state", ui->splitter_2->saveState());
     this->settings.setValue("connexion/lastServer", QString::fromStdString(this->connexion.server));
@@ -473,38 +538,43 @@ void MainWindow::saveSettings()
     this->settings.sync();
 }
 
+// About
 void MainWindow::on_actionAbout_triggered()
 {
     QString text =  this->about.description + "\n\n" +
-                    tr("Licence" ) + ":     " + this->about.licence + "\n" +
+                    tr("Version") + ":     " + this->about.version + "\n" +
+                    tr("Licence") + ":     " + this->about.licence + "\n" +
                     tr("Author") + ":      " + this->about.author + "\n" +
                     tr("EMail") + ":      " + this->about.email + "\n" +
                     tr("Source code") + ": " + this->about.git;
     QMessageBox::about(this, this->about.title, text);
 }
 
+// About QT
 void MainWindow::on_actionAbout_Qt_triggered()
 {
     QMessageBox::aboutQt(this);
 }
 
+// Activated when menu "change folder" is clicked
 void MainWindow::on_DefaultSaveFolder_triggered()
 {
      QFileDialog dialog;
 
-     this->downloading.savePath = dialog.getExistingDirectory(this, tr("Choose directory to save file"), this->downloading.dirPath, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toStdString();
- //    this->downloading.dirPath =  this->downloading.savePath.c_str();
+     this->downloading.savePath = dialog.getExistingDirectory(this, tr("Choose directory to save file"), QString::fromStdString(this->downloading.savePath), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toStdString();
      this->settings.setValue("Folder/",  this->downloading.savePath.c_str());
      this->settings.sync();
 }
 
+// Activated when menu "settings" is clicked
 void MainWindow::on_action_Settings_triggered()
 {
-    config.UnitCombobox->setCurrentText(QString::fromStdString(this->connexion.bandwidthLimitUnit));
+    config.UnitCombobox->setCurrentIndex(bwUnixIndex[this->connexion.bandwidthLimitUnit[0]]);
     config.spinBox->setValue(this->connexion.bandwidthLimit);
     Configuration.show();
 }
 
+// Acivated when "Ok" is clicked in Configuration window
 void MainWindow::on_buttonBox_accepted()
 {
     QString unit;
@@ -518,7 +588,7 @@ void MainWindow::on_buttonBox_accepted()
     }else
     {
         this->connexion.bandwidthLimit = config.spinBox->value();
-        this->connexion.bandwidthLimitUnit = config.UnitCombobox->currentText().toStdString();
+        this->connexion.bandwidthLimitUnit = config.UnitCombobox->currentText().toStdString()[0];
     }
     this->settings.setValue("bandwidthlimit", this->connexion.bandwidthLimit);
     this->settings.setValue("bandwidthlimitunit", this->connexion.bandwidthLimitUnit.c_str());

mainwindow.h

@@ -31,6 +31,7 @@
 #include <QShortcut>
 #include <QCloseEvent>
 #include <unistd.h>
+#include <magic.h>
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@@ -52,7 +53,6 @@ class Downloading
         std::string path;
         std::string defaultSavePath;
         std::string savePath;
-        QString dirPath;
         int pid = 0;
 };
 
@@ -60,9 +60,10 @@ class About
 {
     public:
         QString title = "RsyncUI";
+        QString version = "1.6";
         QString author = "Daniel TARTAVEL-JEANNOT";
         QString licence = "GPL_V3";
-        QString description = "Client for rsync server\n\nYou click on file to enqueue it, and RyncUI Download one file a time";
+        QString description;
         QString email = "dtux@free.fr";
         QString git = "https://git.labolyon.fr/dtux/RsyncUI/issues";
 };
@@ -77,13 +78,13 @@ class MainWindow : public QMainWindow
         ~MainWindow();
         QProgressDialog *progress;
         void displayTree();
-        void populateTree();
+        void populateTree(QTreeWidgetItem * parent);
         void populateList();
         void listServices();
         bool validateServer(std::string server);
         bool isIpAddress(std::string server);
-        QTreeWidgetItem * addTreeRoot(QString name, QString description);
-        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size);
+        QTreeWidgetItem * addTreeRoot(QString name, QString description, bool isDir);
+        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, bool isDir);
         void scanDir(std::string server, int portN, QTreeWidgetItem *parent = NULL, std::string path = "" );
         void startDownloading();
         void loadSettings();
@@ -98,6 +99,13 @@ class MainWindow : public QMainWindow
         QDialog Configuration;
         Ui::Configuration config;
         std::vector <QString> serversList;
+        map<char, int> bwUnixIndex {
+            {'B', 0},
+            {'K', 1},
+            {'M', 2},
+            {'G', 3},
+            {'P', 4}
+        };
 
     private slots:
 

mainwindow.ui

@@ -57,7 +57,7 @@
     <cursorShape>IBeamCursor</cursorShape>
    </property>
    <property name="focusPolicy">
-    <enum>Qt::TabFocus</enum>
+    <enum>Qt::WheelFocus</enum>
    </property>
    <property name="acceptDrops">
     <bool>true</bool>
@@ -139,6 +139,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="toolTip">
          <string>Enter rsync port on server</string>
         </property>
@@ -173,6 +176,9 @@
       </item>
       <item>
        <widget class="QPushButton" name="connectButton">
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="toolTip">
          <string extracomment="Connect to server">Press button to connect to rsync server</string>
         </property>
@@ -205,6 +211,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
         <property name="toolTip">
          <string>Click to view the list of files of this folder</string>
         </property>
@@ -214,6 +223,9 @@
         <property name="editTriggers">
          <set>QAbstractItemView::SelectedClicked</set>
         </property>
+        <property name="tabKeyNavigation">
+         <bool>true</bool>
+        </property>
         <property name="resizeMode">
          <enum>QListView::Adjust</enum>
         </property>
@@ -231,6 +243,9 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::WheelFocus</enum>
+           </property>
            <property name="contextMenuPolicy">
             <enum>Qt::NoContextMenu</enum>
            </property>
@@ -241,11 +256,14 @@
             <number>5000</number>
            </property>
            <property name="whatsThis">
-            <string extracomment="Click to add to download queue"/>
+            <string/>
            </property>
            <property name="editTriggers">
             <set>QAbstractItemView::NoEditTriggers</set>
            </property>
+           <property name="tabKeyNavigation">
+            <bool>true</bool>
+           </property>
            <property name="showDropIndicator" stdset="0">
             <bool>false</bool>
            </property>
@@ -270,6 +288,9 @@
            <property name="sortingEnabled">
             <bool>true</bool>
            </property>
+           <property name="animated">
+            <bool>true</bool>
+           </property>
            <property name="columnCount">
             <number>1</number>
            </property>
@@ -303,9 +324,15 @@
        </widget>
       </widget>
       <widget class="QListWidget" name="listDownload">
+       <property name="focusPolicy">
+        <enum>Qt::WheelFocus</enum>
+       </property>
        <property name="toolTip">
         <string>Click on file to stop downloading</string>
        </property>
+       <property name="toolTipDuration">
+        <number>5000</number>
+       </property>
        <property name="dragEnabled">
         <bool>true</bool>
        </property>

tools.cpp

@@ -5,6 +5,10 @@ using namespace std;
 #define READ   0
 #define WRITE  1
 
+//Take a string and explode it in array
+// s => string to explode
+// c => character separator
+// n => number of results in array, the last is the rest of string to end
 const vector<string> explode(const string& s, const char& c, int n = 0)
 {
     string buff;
@@ -37,7 +41,9 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
     return v;
 }
 
-FILE * popen2(char * const argv, string type, int & pid)
+// open a pipe, fork and return pid of child
+// argv => array of string with command in first and parameters following
+FILE * popen2(array<string,8> argv, string type, int & pid)
 {
     pid_t child_pid;
     int fd[2];
@@ -51,6 +57,7 @@ FILE * popen2(char * const argv, string type, int & pid)
         NULL,
         "RsyncUI",
         message);
+        exit(-1);
     }else
     {
         if((child_pid = fork()) == -1)
@@ -74,11 +81,7 @@ FILE * popen2(char * const argv, string type, int & pid)
             }
 
             setpgid(child_pid, child_pid); //Needed so negative PIDs can kill children of /bin/sh
-            //if (execlp(argv[0].c_str(), argv[0].c_str(), argv[1].c_str(), argv[2].c_str(), argv[3].c_str(), argv[4].c_str(), argv[5].c_str(), NULL ) == -1)
-            if (execvp(command.c_str(), &argv))
-            {
-                perror("execl error => ");
-            }
+            if (execlp(argv[0].c_str(), argv[0].c_str(), argv[1].c_str(), argv[2].c_str(), argv[3].c_str(), argv[4].c_str(), argv[5].c_str(), NULL ) == -1)
             exit (0);
         }
         else
@@ -103,6 +106,10 @@ FILE * popen2(char * const argv, string type, int & pid)
     return 0;
 }
 
+// close pipe open by popen2 while pid is finished
+// fp => file pointer
+// pid => pid of the processus open bu popen2
+
 int pclose2(FILE * fp, pid_t pid)
 {
     int stat;

tools.h

@@ -9,7 +9,7 @@ using namespace std;
 
 const vector<string> explode(const string& s, const char& c, int n);
 
-FILE * popen2(char * const argv, string type, int & pid);
+FILE * popen2(array<string,8> argv, string type, int & pid);
 
 int pclose2(FILE * fp, pid_t pid);