version 2.6

translation
Added support for password protected services
2023-03-01 14:25:31 +01:00 · 2023-03-01 14:25:06 +01:00 · 2023-03-01 14:12:38 +01:00 · 2023-02-27 23:48:05 +01:00 · 2023-02-22 00:57:07 +01:00 · 2023-02-22 00:53:29 +01:00
13 changed files with 610 additions and 186 deletions
--- a/RsyncUI.pro
+++ b/RsyncUI.pro
@ -29,6 +29,7 @@ HEADERS += \
 FORMS += \
    about.ui \
    configuration.ui \
+    login.ui \
    mainwindow.ui

 TRANSLATIONS += \
--- a/RsyncUI.pro.user
+++ b/RsyncUI.pro.user
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-02-13T00:55:51. -->
+<!-- Written by QtCreator 4.14.2, 2023-03-01T13:05:08. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
--- a/RsyncUI.spec
+++ b/RsyncUI.spec
@ -2,7 +2,7 @@

 Name: rsyncui
 Summary: Client for rsync server
-Version: 2.3
+Version: 2.6
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access
--- a/RsyncUI_fr_FR.ts
+++ b/RsyncUI_fr_FR.ts
@ -66,6 +66,34 @@
        <translation>Enregistrement automatique de la file d&apos;enregistrement</translation>
    </message>
 </context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="login.ui" line="17"/>
+        <source>RsyncUI request</source>
+        <translation>Requête RsyncUI</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="51"/>
+        <source>Login name</source>
+        <translation>Identifiant</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="79"/>
+        <source>Enter login</source>
+        <translation>Entrez votre identifiant</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="86"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="102"/>
+        <source>Enter password</source>
+        <translation>Entrez votre mot de passe</translation>
+    </message>
+</context>
 <context>
    <name>MainWindow</name>
    <message>
@ -74,141 +102,141 @@
        <translation>Fenêtre principale</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="86"/>
+        <location filename="mainwindow.ui" line="87"/>
        <source>Server</source>
        <oldsource>Serveur</oldsource>
        <translation>Serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="108"/>
+        <location filename="mainwindow.ui" line="109"/>
        <source>Enter server&apos;s URL</source>
        <translation>Entrez l&apos;adresse du serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="124"/>
+        <location filename="mainwindow.ui" line="125"/>
        <source>Port</source>
        <translation>Port</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="153"/>
        <source>Enter rsync port on server</source>
        <translation>Entrez le port du serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="189"/>
+        <location filename="mainwindow.ui" line="190"/>
        <source>Press button to connect to rsync server</source>
        <extracomment>Connect to server</extracomment>
        <translation>Cliquez pour se connecter au serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="195"/>
+        <location filename="mainwindow.ui" line="196"/>
        <source>Connection</source>
        <translation>Connexion</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="199"/>
        <source>Return</source>
        <translation>Retour</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
        <source>Click to view the list of files of this folder</source>
        <translation>Cliquez pour afficher la liste des documents</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="259"/>
+        <location filename="mainwindow.ui" line="260"/>
        <source>Click to add to download queue</source>
        <translation>Cliquez pour ajouter à la file de téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="338"/>
        <source>Click on file to stop downloading</source>
        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="360"/>
+        <location filename="mainwindow.ui" line="364"/>
        <source>%p%</source>
        <extracomment>Downloading</extracomment>
        <translation>Téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="375"/>
        <source>toolBar</source>
        <translation>Barre d&apos;outils</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="444"/>
+        <location filename="mainwindow.ui" line="448"/>
        <source>Download</source>
        <translation>Télécharger</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="451"/>
        <source>Click on menu button to download the entire folder</source>
        <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="455"/>
+        <location filename="mainwindow.ui" line="460"/>
        <source>Exit</source>
        <translation>Quitter</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="458"/>
+        <location filename="mainwindow.ui" line="463"/>
        <source>Terminate the program</source>
        <translation>Terminer le programme</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="461"/>
+        <location filename="mainwindow.ui" line="466"/>
        <source>Ctrl+Q</source>
        <translation>Ctrl+Q</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="409"/>
-        <location filename="mainwindow.ui" line="412"/>
+        <location filename="mainwindow.ui" line="413"/>
+        <location filename="mainwindow.ui" line="416"/>
        <source>Change save folder</source>
        <translation>Changer le dossier de destination</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="421"/>
+        <location filename="mainwindow.ui" line="425"/>
        <source>About</source>
        <translation>À propos</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="434"/>
        <source>About Qt</source>
        <translation>À propos de Qt</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="439"/>
+        <location filename="mainwindow.ui" line="443"/>
        <source>Settings</source>
        <translation>Paramètres</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>KB</source>
        <translation>Ko</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>MB</source>
        <translation>Mo</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>GB</source>
        <translation>Go</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>TB</source>
        <translation>To</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.cpp" line="107"/>
        <source>PB</source>
        <translation>Po</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="59"/>
+        <location filename="mainwindow.cpp" line="61"/>
        <source>You click on file to enqueue it, and RyncUI Download one file a time</source>
        <oldsource>Client for rsync server&lt;br&gt;&lt;br&gt;You click on file to enqueue it, and RyncUI Download one file a time</oldsource>
        <translation>&lt;h3&gt;Utilisation&lt;/h3&gt;
@ -241,180 +269,194 @@ Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmat
    Permet de quitter le programme</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="53"/>
        <source>&lt;h2&gt;Client for rsync server&lt;2&gt;&lt;br&gt;&lt;br&gt;</source>
-        <translation>&lt;h2&gt;Client pour  serveur rsync&lt;2&gt;&lt;br&gt;&lt;br&gt;éaa</translation>
+        <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="73"/>
+        <location filename="mainwindow.cpp" line="78"/>
        <source>Path</source>
        <translation>Chemin</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="78"/>
        <source>Size</source>
        <translation>Taille</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="78"/>
        <source>Type</source>
        <translation>Type</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="108"/>
+        <location filename="mainwindow.cpp" line="122"/>
        <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
        <translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="136"/>
+        <location filename="mainwindow.cpp" line="151"/>
        <source>&amp;Quit</source>
        <translation>&amp;Quitter</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="208"/>
        <source>Clicking Save button, You can save the list of downloads
 </source>
        <translation>Vous pouvez enregistrer la liste des téléchargements en cliquant sur &quot;enregister&quot;
 </translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="198"/>
+        <location filename="mainwindow.cpp" line="214"/>
        <source>Exiting will stop downloading, and will clear the download queue.
 Do you want to exit ?</source>
        <translation>Si vous sortez, les téléchargements seront arrêter.
 Voulez-vous vraiment sortir ?</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="226"/>
+        <location filename="mainwindow.cpp" line="252"/>
        <source>The program will keep running in the system tray. To terminate the program, choose &lt;b&gt;Quit&lt;/b&gt; in the context menu of the system tray entry.</source>
        <translation>Le programme continue dans la boîte à miniatures. Pour quitter le programme cliquez sur l&apos;icône &lt;b&gt;Quitter&lt;/b&gt; ou dans les menu contextuel.</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="511"/>
+        <location filename="mainwindow.cpp" line="492"/>
+        <source>The processus does&apos;nt respond: </source>
+        <translation>Le processus ne répond pas: </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="578"/>
        <source>server does not exists</source>
        <translation>Le serveur n&apos;existe pas</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="538"/>
-        <location filename="mainwindow.cpp" line="558"/>
+        <location filename="mainwindow.cpp" line="606"/>
+        <location filename="mainwindow.cpp" line="626"/>
        <source>Dir</source>
        <translation>dossier</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="542"/>
-        <location filename="mainwindow.cpp" line="626"/>
+        <location filename="mainwindow.cpp" line="610"/>
+        <location filename="mainwindow.cpp" line="740"/>
        <source>File</source>
        <translation>Doc</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="635"/>
+        <location filename="mainwindow.cpp" line="751"/>
+        <source>File is partially downloaded. Do you want to resume download ? if no, the file will be deleted from destination directory</source>
+        <translation>Le document est déjà partiellement téléchargé. Voulez vous continuer le téléchargemnt ? Si non, il sera supprimer du dossier de destination</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="768"/>
        <source>File is already downloaded. Do you want to reload it ? The old file will be deleted</source>
        <translation>Le document est déjà téléchargé. Voulez-vous le télécharger à nouveau ? L&apos;ancien fichier sera effacé</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="670"/>
+        <location filename="mainwindow.cpp" line="805"/>
        <source>File is already downloading</source>
        <translation>Le document est déjà en téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="693"/>
+        <location filename="mainwindow.cpp" line="830"/>
        <source>Starting downloading
 </source>
        <translation>Démarrage du téléchargement
 </translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="708"/>
+        <location filename="mainwindow.cpp" line="845"/>
        <source>finished</source>
        <translation>Terminé</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="853"/>
        <source>Rsync process crashed</source>
        <translation>Le processus rsync à planté</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="728"/>
+        <location filename="mainwindow.cpp" line="865"/>
        <source>stopped by user</source>
        <translation>stoppé par l&apos;utilisateur</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="732"/>
+        <location filename="mainwindow.cpp" line="871"/>
        <source>Download </source>
        <translation>Téléchargement </translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="54"/>
+        <location filename="mainwindow.cpp" line="56"/>
        <source>Version</source>
        <translation>Version</translation>
    </message>
    <message>
        <location filename="mainwindow.cpp" line="55"/>
+        <source>&lt;h2&gt;Client for rsync server&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;Client pour serveur rsync&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="57"/>
        <source>Licence</source>
        <translation>License</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="56"/>
+        <location filename="mainwindow.cpp" line="58"/>
        <source>Author</source>
        <translation>Auteur</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="57"/>
+        <location filename="mainwindow.cpp" line="59"/>
        <source>EMail</source>
        <translation>Courriel</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="58"/>
+        <location filename="mainwindow.cpp" line="60"/>
        <source>Source code</source>
        <translation>Code source</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1036"/>
        <source>Since the save path is linked to service, you need to select a service before you can select a folder</source>
        <translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="904"/>
+        <location filename="mainwindow.cpp" line="1041"/>
        <source>Choose folder where to save file</source>
        <translation>Choisissez un dossier où enregistrer le document</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="932"/>
        <source>Do you want to stop downloading and delete this file from download queue ?</source>
        <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="810"/>
+        <location filename="mainwindow.cpp" line="946"/>
        <source>Do you want to delete this file from download queue ?</source>
        <translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="125"/>
+        <location filename="mainwindow.h" line="137"/>
        <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program.</source>
        <translation>Le processus échoué, soit le programme est manquant, soit vous n&apos;avez pas l&apos;autorisation de l&apos;exécuter.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="126"/>
+        <location filename="mainwindow.h" line="138"/>
        <source>The process crashed some time after starting successfully.</source>
        <translation>Le processus à planté après avoir démarré avec succès.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="127"/>
+        <location filename="mainwindow.h" line="139"/>
        <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
        <translation>La fonction waitFor...() a dépassé la limite de temps, you pouvez essayer de la relancer.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="128"/>
+        <location filename="mainwindow.h" line="140"/>
        <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
        <translation>Une erreur est survenue lors de l&apos;envoi des données vers le processus. Le processus est peut être arrté ou il a fermé son canal d&apos;entrée.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="129"/>
+        <location filename="mainwindow.h" line="141"/>
        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
        <translation>Une erreur est survenue lors de la lecturee de données, le processus est probablement arrêté.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="130"/>
+        <location filename="mainwindow.h" line="142"/>
        <source>An unknown error occurred. This is the default return value of error().</source>
        <translation>Une erreur inconnue est survenue. C&apos;est la valeur de retour par défaut de error().</translation>
    </message>
--- a/downloadfile.cpp
+++ b/downloadfile.cpp
@ -27,7 +27,14 @@ downloadFile::downloadFile()
 //Slot activated when download is cancelled
 void MainWindow::cancelled(QProcess * process)
 {
+    bool n = 0;
+
    process->terminate();
+    n = process->waitForFinished(30000);
+    if (n == false)
+    {
+        process->close();
+    }
 }

 // launch a rsync processus downloading a file
@ -35,18 +42,26 @@ void MainWindow::download()
 {
    QString cmd;
    QStringList param;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

+    this->downloading.process = new QProcess(this);
+    if (!this->downloading.user.isEmpty())
+    {
+        this->downloading.server.prepend(this->connexion.user + "@");
+        env.insert("RSYNC_PASSWORD", this->downloading.password); // Add an environment variable
+        this->downloading.process->setProcessEnvironment(env);
+    }
    // Populating array with command and parameters for popen2
    cmd = "rsync";
    if (this->connexion.bandwidthLimit != 0)
    {
        param << "--bwlimit=" + QString::number(this->connexion.bandwidthLimit) + bwUnitChar[this->connexion.bandwidthLimitUnit];
    }
-    param << "--port=" + QString::number(this->connexion.port);
+    param << "--port=" + QString::number(this->downloading.port);
    param << "-aXP";
    param << this->downloading.server + "::" + this->downloading.service + "/" + this->downloading.path << this->downloading.savePath + "/";

-    this->downloading.process = new QProcess(this);
+

    connect(this->downloading.process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(downloadFinished(int, QProcess::ExitStatus)));
    //connect(this->downloading.process, SIGNAL(errorOccurred(QProcess::ProcessError error)), this, SLOT(downloadProcessError(QProcess::ProcessError error)));
@ -62,26 +77,50 @@ void MainWindow::readRsyncOutput()
    bool flag = false;
    int value;
    int pos;
+    static QString dlSpeed;
+    QStringList list;
+    static QString filename;
+    int i;
+    int listSize;

    while(!flag)
    {
+        list.clear();
        line = QString::fromUtf8(this->downloading.process->readLine());
        if (line.isEmpty())
        {
            flag = true;
            break;
-        }
-        pos = line.indexOf("%");
-        if (pos != -1)
+        }else
        {
-            line.resize(pos);
-            pos = line.lastIndexOf(' ');
+            pos = line.indexOf("%");
            if (pos != -1)
            {
-                line.remove(0, pos);
-                value = line.toInt();
-                // sending progress to Main window
-                emit progressSignal(value);
+                line = line.simplified();
+                list = line.split(" ");
+                listSize = list.count() / 4;
+                for (i = 0; i < listSize; i++)
+                {
+                    value = list.at(i *4 + 1).chopped(1).toInt();
+                    dlSpeed = list.at(i * 4 + 2);
+
+                    /*line.resize(pos);
+                    pos = line.lastIndexOf(' ');
+                    if (pos != -1)
+                    {
+                        line.remove(0, pos);
+                        value = line.toInt();*/
+                        // sending progress to Main window
+                    emit progressSignal(value);
+                    emit fileName(filename + "   %p%" + "\t " + dlSpeed);
+                }
+            }else
+            {
+                if (!line.contains("receiving"))
+                {
+                    filename = line.remove(QChar('\n'), Qt::CaseInsensitive);
+                    emit fileName(filename + "   %p%\t " + dlSpeed);
+                }
            }
        }
    }
--- a/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
+++ b/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
--- a/login.ui
+++ b/login.ui
@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LoginDialog</class>
+ <widget class="QDialog" name="LoginDialog">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>194</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>RsyncUI request</string>
+  </property>
+  <property name="modal">
+   <bool>true</bool>
+  </property>
+  <widget class="QDialogButtonBox" name="loginBox">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>150</y>
+     <width>341</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Horizontal</enum>
+   </property>
+   <property name="standardButtons">
+    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   </property>
+  </widget>
+  <widget class="QWidget" name="verticalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>381</width>
+     <height>121</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Login name</string>
+      </property>
+      <property name="textFormat">
+       <enum>Qt::PlainText</enum>
+      </property>
+      <property name="textInteractionFlags">
+       <set>Qt::NoTextInteraction</set>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="loginEdit">
+      <property name="mouseTracking">
+       <bool>false</bool>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::TabFocus</enum>
+      </property>
+      <property name="acceptDrops">
+       <bool>false</bool>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="maxLength">
+       <number>32767</number>
+      </property>
+      <property name="placeholderText">
+       <string>Enter login</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="label_2">
+      <property name="text">
+       <string>Password</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLineEdit" name="passwordEdit">
+      <property name="focusPolicy">
+       <enum>Qt::TabFocus</enum>
+      </property>
+      <property name="acceptDrops">
+       <bool>false</bool>
+      </property>
+      <property name="echoMode">
+       <enum>QLineEdit::Password</enum>
+      </property>
+      <property name="placeholderText">
+       <string>Enter password</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>loginBox</sender>
+   <signal>accepted()</signal>
+   <receiver>LoginDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>loginBox</sender>
+   <signal>rejected()</signal>
+   <receiver>LoginDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
--- a/main.cpp
+++ b/main.cpp
@ -23,5 +23,6 @@ int main(int argc, char *argv[])

    MainWindow w;
    w.show();
+    w.init();
    return a.exec();
 }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@ -33,8 +33,6 @@ MainWindow::MainWindow(QWidget *parent)
    : QMainWindow(parent)
    , ui(new Ui::MainWindow)
 {
-    QAbstractButton * reply;
-    QMessageBox msgBox;
    ui->setupUi(this);

    QCoreApplication::setOrganizationName("RsyncUI");
@ -49,6 +47,10 @@ MainWindow::MainWindow(QWidget *parent)
    // 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>" +
@ -61,28 +63,20 @@ MainWindow::MainWindow(QWidget *parent)
    AboutW.TextAbout->setHtml(aboutText);

    // 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()));

    // 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

-    // if last server exists in settings
-    if (this->settings.contains("connexion/lastServer"))
-    {
-        // set window to precedent server/port configuration
-        ui->portEdit->setText(this->settings.value("connexion/port").toString());
-        ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
-    }else
-    {
-        ui->portEdit->text() = QString::number(this->connexion.port);
-        ui->khistorycombobox->clear();
-    }

    // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
    ui->treeWidget->setCursor(Qt::ArrowCursor);
@ -94,12 +88,32 @@ MainWindow::MainWindow(QWidget *parent)

    loadSettings();

+    // if last server exists in settings
+    if (this->settings.contains("connexion/lastServer"))
+    {
+        // set window to precedent server/port configuration
+        ui->portEdit->setText(this->settings.value("connexion/port").toString());
+        ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
+    }else
+    {
+        ui->portEdit->setText(QString::number(this->connexion.port));
+        ui->khistorycombobox->clear();
+    }
+
    //setting configuration window
    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")});

+    initSystemTrayIcon();
+}
+
+void MainWindow::init()
+{
+    QAbstractButton * reply;
+    QMessageBox msgBox;
+
    //if exists list of donwloads in saved settings
    if (this->settings.value("Downloads/rows").toInt() != 0)
    {
@ -122,16 +136,17 @@ MainWindow::MainWindow(QWidget *parent)
    }
    // load list of services
    populateList();
-    initSystemTrayIcon();
 }

 void MainWindow::initSystemTrayIcon()
 {
    QMenu *trayIconMenu;
    QAction * quitAction;
+    QIcon icon;

+    icon.addFile(this->icon);
    this->trayIcon = new QSystemTrayIcon;
-    this->trayIcon->setIcon(this->windowIcon());
+    this->trayIcon->setIcon(icon);

    quitAction = new QAction(tr("&Quit"), this);
    connect(quitAction, &QAction::triggered, this, &MainWindow::quitApp);
@ -192,23 +207,34 @@ void MainWindow::quitApp()
            param |= QMessageBox::Save;
            displayText = tr("Clicking Save button, You can save the list of downloads\n");
        }
+
        reply = QMessageBox::question(
                this,
                "RsyncUI",
                tr("Exiting will stop downloading, and will clear the download queue.\nDo you want to exit ?") + displayText,
                param,
                QMessageBox::No);
-
+        this->downloading.quit = true;
        if(reply == QMessageBox::Yes)
        {
-            // emission of signal to downloading thread and stopping
-            emit (stopDownloading(this->downloading.process));
-        }else
+            if (this->downloading.process->state() != QProcess::NotRunning)
+            {
+                // emission of signal to downloading thread and stopping
+                emit (stopDownloading(this->downloading.process));
+            }
+        }else if (reply == QMessageBox::Save)
        {
-            saveDownloadList();
+            if (config.autosaveCheckbox->checkState() == Qt::Unchecked)
+            {
+
+                //saveDownloadList();
+                emit (stopDownloading(this->downloading.process));
+            }
+        }else if (reply == QMessageBox::No)
+        {
+            return;
        }
    }
-    //delete ui;
    QCoreApplication::quit();
 }

@ -263,9 +289,9 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
        // validating server's address
        if (validateServer(this->connexion.server))
        {
-            // server is validated
+            // server is validated, scanning directory
            path = ui->listWidget->currentItem()->text().section('\n', 0,  0) + "/";
-            scanDir(this->connexion.server, this->connexion.port, parent, path);
+           scanDir(this->connexion.server, this->connexion.port, parent, path);
        }
        // Restoring cursor
        QGuiApplication::restoreOverrideCursor();
@ -371,11 +397,12 @@ void MainWindow::listServices()
    }

    // verifying error code
-    testRsyncReturn(myProcess);
+    testRsyncReturn(this, myProcess);
+    myProcess->close();
 }

 // connect to rsync server to get list of files
-void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QString path)
+bool MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QString path)
 {
    QString cmd;
    QStringList param;
@ -385,54 +412,94 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
    QProcess * myProcess;
    bool isDir = false;
    bool flag = false;
-
-    cmd = "rsync";
-    param << "--contimeout=10" << "--port=" + QString::number(portN) << server + "::" + path;
+    bool readOk = false;
+    int nChild = 0;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

    myProcess = new QProcess(this);
-    myProcess->start(cmd, param);

-    // waiting for responsiteme of the server with a timeout of 10 seconds
-    while(myProcess->waitForReadyRead(100000))
+    if (parent != nullptr)
    {
-        while (!flag)
-        {
-            line = QString::fromUtf8(myProcess->readLine());
-            // line empty then buffer is empty so returning to wait new datas
-            if (line.isEmpty())
-            {
-                flag = true;
-                break;
-            }
-            // extracting name, size and is dir/file
-            line = line.simplified();
-            size = line.section(" ", 1, 1);
-            filename = line.section(" ", 4);
-            if (filename != '.')
-            {
-                if (line[0] == "d")
-                {
-                    isDir = true;
-                }else
-                {
-                    isDir = false;
-                }
-                if (parent != NULL)
-                {
-                    //adding item to tree
-                    addTreeChild(parent, filename, size, isDir);
-                }else
-                {
-                    //adding item to tree (as directory)
-                    addTreeRoot(filename, size, isDir);
-                }
-            }
-        }
-
-        flag = false;
+        nChild = parent->childCount();
    }
-    // buffer empty go to waiting new datas
-    testRsyncReturn(myProcess);
+    if (nChild == 0)
+    {
+        if (!this->connexion.user.isEmpty())
+        {
+            server.prepend(this->connexion.user + "@");
+            env.insert("RSYNC_PASSWORD", this->connexion.password); // Add an environment variable
+        }else
+        {
+            server.prepend("anonymous@");
+            env.insert("RSYNC_PASSWORD", "anonymous"); // Add an environment variable
+        }
+        myProcess->setProcessEnvironment(env);
+        cmd = "rsync";
+        param << "--contimeout=10" << "--port=" + QString::number(portN) << server + "::" + path;
+
+
+        myProcess->start(cmd, param);
+
+        // waiting for response of the server with a timeout of 10 seconds
+        do
+        {
+            readOk = myProcess->waitForReadyRead(10000);
+            if (readOk)
+            {
+                while (!flag)
+                {
+                    line = QString::fromUtf8(myProcess->readLine());
+                    // line empty then buffer is empty so returning to wait new datas
+                    if (line.isEmpty())
+                    {
+                        flag = true;
+                        break;
+                    }
+                    // extracting name, size and is dir/file
+                    line = line.simplified();
+                    size = line.section(" ", 1, 1);
+                    filename = line.section(" ", 4);
+                    if (filename != '.')
+                    {
+                        if (line[0] == "d")
+                        {
+                            isDir = true;
+                        }else
+                        {
+                            isDir = false;
+                        }
+                        if (parent != NULL)
+                        {
+                            //adding item to tree
+                            addTreeChild(parent, filename, size, isDir);
+                        }else
+                        {
+                            //adding item to tree (as directory)
+                            addTreeRoot(filename, size, isDir);
+                        }
+                    }
+                }
+                flag = false;
+            }else
+            {
+                if (myProcess->state() == QProcess::Running)
+                {
+                    if (myProcess->waitForFinished(10000) == 0)
+                    {
+                        QMessageBox::warning(
+                            this,
+                            "RsyncUI",
+                            tr("The processus does'nt respond: ") + myProcess->errorString());
+                    }
+                }
+            }
+        }while(readOk);
+        // buffer empty go to waiting new datas
+
+        testRsyncReturn(this, myProcess);
+        myProcess->close();
+    }
+    return 0;
 }

 // Verify if server address is IP address
@ -511,6 +578,7 @@ bool MainWindow::validateServer(QString server)
            tr("server does not exists" )
        );
    }
+    myProcess->close();
    return flag;
 }

@ -573,8 +641,11 @@ QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name
 void MainWindow::on_listWidget_clicked()
 {
    QString str;
+    QStringList logins;

-    this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0);
+    this->rescan = true;
+    this->connexion.user = nullptr;
+    this->connexion.password = nullptr;    this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0);
    str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
    // if service exists in settings for this server
    if (this->settings.contains(str))
@ -582,9 +653,50 @@ void MainWindow::on_listWidget_clicked()
        // 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();
+        //TODO choose login
+    if (logins.count() != 0)
+    {
+        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)
+{
+    QStringList logins;
+    bool returnValue;
+
+    if (object == false)
+    {
+        this->settings.beginGroup("Passwords/" + this->connexion.server + "/" + this->connexion.service);
+    }else
+    {
+        this->settings.beginGroup("Passwords/" + this->downloading.server + "/" + this->downloading.service);
+    }
+    logins = this->settings.allKeys();
+    //TODO choose login in case of multiples logins
+    if (logins.count() != 0)
+    {
+        this->downloading.user = logins[0];
+        this->downloading.password = this->settings.value(logins[0]).toString();
+        returnValue = true;
+    }else
+    {
+        this->downloading.user = nullptr;
+        this->downloading.password = nullptr;
+        returnValue = false;
+    }
+    this->settings.endGroup();
+    return returnValue;
+}
+
 //Slot activated when a file is clicked in the treeview
 void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadDir)
 {
@ -594,11 +706,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
    QString path;
    QString str;
    QMessageBox::StandardButton reply;
+    int sizeFromRsync;

    itemR = item;

    // assembling path from treewidget
    path = item->text(0);
+    sizeFromRsync = item->text(2).remove(',').toUInt();

    // exists saving path in settings ?
    str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
@ -622,26 +736,46 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
        // concatening parent to path
        path.prepend(itemR->text(0) + "/");
    };
-
+    QFileInfo info(this->downloading.savePath + "/" + path);
    if (item->text(1) == tr("File") or downloadDir == true)
    {
        // Item is a file
        // searching if file exists in savepath
        if (QFile::exists(this->downloading.savePath + "/" + path))
        {
-            reply = QMessageBox::question(
-                    this,
-                    "RsyncUI",
-                    tr("File is already downloaded. Do you want to reload it ? The old file will be deleted"),
-                    QMessageBox::Yes|QMessageBox::No,
-                    QMessageBox::No);
-
-            if (reply == QMessageBox::No)
+            if (info.size() < sizeFromRsync)
            {
-                return;
+                reply = QMessageBox::question(
+                        this,
+                        "RsyncUI",
+                        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);
+
+                if (reply == QMessageBox::Cancel)
+                {
+                    return;
+                }else if(reply == QMessageBox::No)
+                {
+                    QFile::remove(this->downloading.savePath + "/" + path);
+                    return;
+                }
            }else
            {
-                QFile::remove(this->downloading.savePath + "/" + path);
+                reply = QMessageBox::question(
+                        this,
+                        "RsyncUI",
+                        tr("File is already downloaded. Do you want to reload it ? The old file will be deleted"),
+                        QMessageBox::Yes|QMessageBox::No,
+                        QMessageBox::No);
+
+                if (reply == QMessageBox::No)
+                {
+                    return;
+                }else
+                {
+                    QFile::remove(this->downloading.savePath + "/" + path);
+                }
            }
        }

@ -653,6 +787,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
                // no downloading process launching it
                this->downloading.path = path;
                this->downloading.server = this->connexion.server;
+                this->downloading.port = this->connexion.port;
                this->downloading.service = this->connexion.service;
                startDownloading();
                // wait 1 second to process start
@ -685,11 +820,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
 // Launch the thread which download the file
 void MainWindow::startDownloading()
 {
+
    ui->progressBar->setValue(0);
    ui->progressBar->show();
+    getUserPassword(false);

    //QtConcurrent::run(&this->downloadO, &downloadFile::download, this);
-    download();
+    this->download();
    this->trayIcon->showMessage("RsyncUI", tr("Starting downloading\n") + this->downloading.path, QSystemTrayIcon::Information);
 }

@ -726,16 +863,18 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
    }else if (exitCode == 20)
    {
        aborted = tr("stopped by user");
+    }else if (exitCode == 5)                            // password asked
+    {
+        loginDialog.show();
    }

-
    this->trayIcon->showMessage("RsyncUI", tr("Download ") + aborted + "\n" + this->downloading.path, QSystemTrayIcon::Information);

    // disconnecting signals to slots
    disconnect(this->downloading.process, 0, 0, 0);

    // reset variables and window
-    this->downloading.process = nullptr;
+    this->downloading.process->close();
    ui->progressBar->hide();
    delete ui->listDownload->takeItem(0);
    this->downloading.clear();
@ -743,13 +882,6 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
    // Some downloads staying in queue
    if (ui->listDownload->count() != 0)
    {
-        // autosave is activated
-        if (config.autosaveCheckbox->checkState() == Qt::Checked)
-        {
-            // saving download list
-            saveDownloadList();
-        }
-
        // initializing download
        path = ui->listDownload->item(0)->text();
        pos = path.lastIndexOf("/");
@ -759,6 +891,7 @@ 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);

        // savepath exists in settings ?
        str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
@ -778,7 +911,10 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
            }
        }
    }
-    saveDownloadList();
+    if(config.autosaveCheckbox->checkState() == Qt::Checked and this->downloading.quit == false)
+    {
+        saveDownloadList();
+    }
 }


@ -815,13 +951,14 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
            // removing line from download list
            ui->listDownload->removeItemWidget(item);
            delete item;
-            if (config.autosaveCheckbox->checkState() == Qt::Checked)
-            {
-                // autosave acivated,so saving download list
-                saveDownloadList();
-            }
+
        }
    }
+    if (config.autosaveCheckbox->checkState() == Qt::Checked)
+    {
+        // autosave acivated,so saving download list
+        saveDownloadList();
+    }
 }

 // load settings
@ -995,6 +1132,7 @@ void MainWindow::loadDownloadList()
    path.resize(pos);
    pos = path.lastIndexOf(" => ");
    this->downloading.server = path.midRef(pos+4).toString();
+    this->downloading.port = this->settings.value("connexion/server/" + this->downloading.server).toInt();
    path.resize(pos);
    this->downloading.path = path;
    str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
@ -1012,6 +1150,11 @@ void Downloading::clear()
    this->server.clear();
    this->savePath.clear();
    this->service.clear();
+    this->user.clear();
+    this->password.clear();
+    this->port = 0;
+    this->process = nullptr;
+    this->quit = false;
 }

 // Context menu of file list clicked
@ -1044,3 +1187,28 @@ 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();
+}
+
--- a/mainwindow.h
+++ b/mainwindow.h
@ -5,11 +5,13 @@
 #include "ui_mainwindow.h"
 #include "ui_configuration.h"
 #include "ui_about.h"
+#include "ui_login.h"
 #include "downloadfile.h"
 #include "tools.h"
 #include <QMainWindow>
 #include <string>
 #include <QTreeWidgetItem>
+#include <QList>
 #include <QListWidgetItem>
 #include <QProgressDialog>
 #include <QSettings>
@ -42,7 +44,8 @@
 #include <QDir>
 #include <QSystemTrayIcon>
 #include <QMenu>
-#include<QTranslator>
+#include <QTranslator>
+#include <QInputDialog>

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

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

    private slots:

@ -196,12 +210,17 @@ class MainWindow : public QMainWindow

        void on_actionExit_triggered();

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

 #endif // MAINWINDOW_H
--- a/mainwindow.ui
+++ b/mainwindow.ui
@ -21,7 +21,8 @@
   <string>MainWindow</string>
  </property>
  <property name="windowIcon">
-   <iconset theme="/usr/share/icons/RsyncUI.png"/>
+   <iconset theme="/usr/share/icons/RsyncUI.png">
+    <normaloff>.</normaloff>.</iconset>
  </property>
  <property name="toolButtonStyle">
   <enum>Qt::ToolButtonTextUnderIcon</enum>
@ -274,10 +275,10 @@
            <bool>false</bool>
           </property>
           <property name="dragEnabled">
-            <bool>true</bool>
+            <bool>false</bool>
           </property>
           <property name="dragDropMode">
-            <enum>QAbstractItemView::DragOnly</enum>
+            <enum>QAbstractItemView::NoDragDrop</enum>
           </property>
           <property name="alternatingRowColors">
            <bool>true</bool>
@ -356,6 +357,9 @@
      <property name="value">
       <number>0</number>
      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
      <property name="format">
       <string extracomment="Downloading">%p%</string>
      </property>
@ -449,7 +453,8 @@
  </action>
  <action name="actionExit">
   <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
   </property>
   <property name="text">
    <string>Exit</string>
--- a/tools.cpp
+++ b/tools.cpp
@ -44,7 +44,7 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
 }

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

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

 int pclose2(FILE * fp, pid_t pid);

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

 #endif // TOOLS_H
Author	SHA1	Message	Date
Daniel Tartavel	3345a65b28	version 2.6	2023-03-01 14:25:31 +01:00
Daniel Tartavel	63f7aafc68	translation	2023-03-01 14:25:06 +01:00
Daniel Tartavel	f47160622c	Added support for password protected services	2023-03-01 14:12:38 +01:00
Daniel Tartavel	e7eafb3117	added password protected connexion correction bug on detection of already downloaded file	2023-02-27 23:48:05 +01:00
Daniel Tartavel	10060ee2c4	version 2.5	2023-02-22 00:57:07 +01:00
Daniel Tartavel	e14d1539fe	Merge branch 'master' of git.labolyon.fr:dtux/RsyncUI	2023-02-22 00:53:29 +01:00
Daniel Tartavel	a8e888e20d	corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar	2023-02-22 00:52:53 +01:00
Daniel Tartavel	f3c361f155	corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar	2023-02-22 00:48:16 +01:00
Daniel Tartavel	e8743ff802	version 2.4.1	2023-02-16 21:33:53 +01:00
Daniel Tartavel	1145c74440	- resolved regression: no icon on menutray.	2023-02-16 21:28:58 +01:00
Daniel Tartavel	c42baaa2c8	changed qtcreator config	2023-02-15 14:25:21 +01:00
Daniel Tartavel	8419f8ad90	- resolved a bug in filelist: when clicking again on a directory add again files - resolved bug: at startup relaoding download do not start downloading - added downloading filename in progress bar	2023-02-15 13:49:31 +01:00
Daniel Tartavel	623ad81c6b	version 2.4	2023-02-15 13:48:38 +01:00
Daniel Tartavel	7e424a57b5	version 2.3.1	2023-02-13 17:25:31 +01:00