adding saving of folder by server name\n modifying columns order\some bugs corrected

RsyncUI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-01-26T22:45:50. -->
+<!-- Written by QtCreator 4.14.2, 2023-01-28T00:30:34. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

configuration.ui

@@ -145,5 +145,22 @@
   </widget>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Configuration</receiver>
+   <slot>hide()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>220</x>
+     <y>126</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>199</x>
+     <y>81</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

languages/fr_FR/RsyncUI_fr_FR.ts

@@ -4,27 +4,57 @@
 <context>
     <name>Configuration</name>
     <message>
-        <location filename="../../configuration.ui" line="17"/>
+        <location filename="../../configuration.ui" line="20"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="../../configuration.ui" line="32"/>
-        <source>Enter the bandwidth limit</source>
-        <translation>Entrez la limite de bande passante</translation>
+        <location filename="../../configuration.ui" line="38"/>
+        <source>Toolbar view</source>
+        <translation>Toolbar</translation>
     </message>
     <message>
-        <location filename="../../configuration.ui" line="48"/>
+        <location filename="../../configuration.ui" line="45"/>
         <source>Bandwidth limit</source>
         <extracomment>Bandwidth limit</extracomment>
         <translation>Limite de bande passante</translation>
     </message>
     <message>
-        <location filename="../../configuration.ui" line="61"/>
+        <location filename="../../configuration.ui" line="52"/>
+        <source>Enter the bandwidth limit (0 to 1024)</source>
+        <translation>Entrez la limite de bande passante (0 à 1024)</translation>
+    </message>
+    <message>
+        <location filename="../../configuration.ui" line="74"/>
         <source>Select th unit of bandwidth limit in Bytes, KiloBytes, MegaBytes, GigaBytes or PetaBytes</source>
         <extracomment>Unit of bandwidth</extracomment>
         <translation>Sélectionnez l&apos;unité de limite de bande passante en otctets, Ko, Mo, Go, Po</translation>
     </message>
+    <message>
+        <location filename="../../configuration.ui" line="100"/>
+        <source>Icon only</source>
+        <translation>Icône seule</translation>
+    </message>
+    <message>
+        <location filename="../../configuration.ui" line="105"/>
+        <source>Text only</source>
+        <translation>Texte seul</translation>
+    </message>
+    <message>
+        <location filename="../../configuration.ui" line="110"/>
+        <source>Text beside icon</source>
+        <translation>Text à côté de l&apos;icône</translation>
+    </message>
+    <message>
+        <location filename="../../configuration.ui" line="115"/>
+        <source>Text under icon</source>
+        <translation>Texte sous l&apos;icöne</translation>
+    </message>
+    <message>
+        <location filename="../../configuration.ui" line="120"/>
+        <source>Text follow icon</source>
+        <translation>Texte suit l&apos;icône</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -34,77 +64,80 @@
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="80"/>
+        <location filename="../../mainwindow.ui" line="83"/>
         <source>Server</source>
         <oldsource>Serveur</oldsource>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="102"/>
+        <location filename="../../mainwindow.ui" line="105"/>
         <source>Enter server&apos;s URL</source>
         <translation>Entrez l&apos;adresse du serveur</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="118"/>
+        <location filename="../../mainwindow.ui" line="121"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="146"/>
+        <location filename="../../mainwindow.ui" line="149"/>
         <source>Enter rsync port on server</source>
-        <translation>Entrez le port du servuer rsync</translation>
+        <translation>Entrez le port du serveur rsync</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="183"/>
+        <location filename="../../mainwindow.ui" line="186"/>
         <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="189"/>
+        <location filename="../../mainwindow.ui" line="192"/>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="192"/>
+        <location filename="../../mainwindow.ui" line="195"/>
         <source>Return</source>
         <translation>Retour</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="218"/>
+        <location filename="../../mainwindow.ui" line="221"/>
         <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="253"/>
+        <location filename="../../mainwindow.ui" line="256"/>
         <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="331"/>
+        <location filename="../../mainwindow.ui" line="334"/>
         <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>
+        <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="354"/>
+        <location filename="../../mainwindow.ui" line="357"/>
         <source>%p%</source>
         <extracomment>Downloading</extracomment>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="371"/>
-        <location filename="../../mainwindow.ui" line="389"/>
+        <location filename="../../mainwindow.ui" line="368"/>
+        <source>toolBar</source>
+        <translation>Barre d&apos;outils</translation>
+    </message>
+    <message>
+        <location filename="../../mainwindow.ui" line="401"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="378"/>
         <source>help</source>
-        <translation>Aide</translation>
+        <translation type="vanished">Aide</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="394"/>
-        <location filename="../../mainwindow.ui" line="397"/>
+        <location filename="../../mainwindow.ui" line="409"/>
+        <location filename="../../mainwindow.ui" line="412"/>
         <source>Change save folder</source>
         <translation>Changer le dossier de destination</translation>
     </message>
@@ -113,22 +146,21 @@
         <translation type="vanished">Dossier d&apos;enregistrement</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="402"/>
         <source>Bandwidth limit</source>
-        <translation>Limite de bande passante</translation>
+        <translation type="vanished">Limite de bande passante</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="407"/>
+        <location filename="../../mainwindow.ui" line="420"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="412"/>
+        <location filename="../../mainwindow.ui" line="428"/>
         <source>About Qt</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.ui" line="417"/>
+        <location filename="../../mainwindow.ui" line="436"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
@@ -137,113 +169,126 @@
         <translation type="vanished">debug</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
+        <location filename="../../mainwindow.cpp" line="23"/>
         <source>Byte</source>
         <translation>Octet</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
+        <location filename="../../mainwindow.cpp" line="23"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
+        <location filename="../../mainwindow.cpp" line="23"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
+        <location filename="../../mainwindow.cpp" line="23"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
+        <location filename="../../mainwindow.cpp" line="23"/>
         <source>TB</source>
         <translation>To</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="21"/>
-        <location filename="../../mainwindow.cpp" line="587"/>
+        <location filename="../../mainwindow.cpp" line="23"/>
+        <location filename="../../mainwindow.cpp" line="614"/>
         <source>PB</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="24"/>
+        <location filename="../../mainwindow.cpp" line="26"/>
         <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>
+Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="35"/>
+        <location filename="../../mainwindow.cpp" line="38"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="35"/>
+        <location filename="../../mainwindow.cpp" line="38"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="35"/>
+        <location filename="../../mainwindow.cpp" line="38"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="76"/>
+        <location filename="../../mainwindow.cpp" line="80"/>
         <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="326"/>
+        <location filename="../../mainwindow.cpp" line="328"/>
         <source>server does not exists</source>
         <translation>Le serveur n&apos;existe pas</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="545"/>
+        <location filename="../../mainwindow.cpp" line="355"/>
+        <location filename="../../mainwindow.cpp" line="375"/>
+        <source>Dir</source>
+        <translation>Dossier</translation>
+    </message>
+    <message>
+        <location filename="../../mainwindow.cpp" line="358"/>
+        <location filename="../../mainwindow.cpp" line="378"/>
+        <location filename="../../mainwindow.cpp" line="424"/>
+        <source>File</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../../mainwindow.cpp" line="564"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="546"/>
+        <location filename="../../mainwindow.cpp" line="565"/>
         <source>Licence</source>
         <translation>License</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="547"/>
+        <location filename="../../mainwindow.cpp" line="566"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="548"/>
+        <location filename="../../mainwindow.cpp" line="567"/>
         <source>EMail</source>
         <translation>Courriel</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="549"/>
+        <location filename="../../mainwindow.cpp" line="568"/>
         <source>Source code</source>
         <translation>Code source</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="564"/>
+        <location filename="../../mainwindow.cpp" line="590"/>
         <source>Choose directory to save file</source>
         <translation>Choisissez le dossier où enregistrer</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="477"/>
+        <location filename="../../mainwindow.cpp" line="497"/>
         <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>
+        <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
     </message>
     <message>
         <source>Client for rsync server</source>
         <translation type="vanished">Client pour serveur rsync</translation>
     </message>
     <message>
-        <location filename="../../mainwindow.cpp" line="489"/>
+        <location filename="../../mainwindow.cpp" line="509"/>
         <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>

mainwindow.cpp

@@ -510,6 +510,7 @@ void MainWindow::loadSettings()
     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());
+    ui->toolBar->setToolButtonStyle((Qt::ToolButtonStyle)settings.value("toolbar/state").toInt());
 
     // loading connexion settings
     // loading servers history
@@ -539,6 +540,7 @@ void MainWindow::saveSettings()
     this->settings.setValue("splitter2/state", ui->splitter_2->saveState());
     this->settings.setValue("connexion/lastServer", QString::fromStdString(this->connexion.server));
     this->settings.setValue("connexion/lastPort", QString::number(this->connexion.port));
+    this->settings.setValue("toolbar/state", ui->toolBar->toolButtonStyle());
     this->settings.sync();
 }
 

tools.cpp

@@ -81,6 +81,8 @@ FILE * popen2(array<string,8> argv, string type, int & pid)
             }
 
             setpgid(child_pid, child_pid); //Needed so negative PIDs can kill children of /bin/sh
+            //TODO : change for execvp
+
             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);
         }