From 20062a6a4bc2aec8ada645baa78ff68892ccd154 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Sat, 24 Mar 2018 17:52:47 +0000 Subject: New upstream version 1.4.0.6 --- CompilerInfo.h | 8 +--- Variable.h | 4 +- plugins-alternative/Listener/dbus/informations.xml | 2 +- .../PluginLoader/keybinding/informations.xml | 2 +- .../SessionLoader/KDE4/informations.xml | 2 +- plugins-alternative/Themes/Clean/informations.xml | 2 +- .../Themes/Teracopy/informations.xml | 2 +- .../Themes/Windows/informations.xml | 2 +- plugins/CopyEngine/Rsync/informations.xml | 2 +- .../Ultracopier/Languages/ar/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/de/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/el/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/en/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/es/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/fr/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/hi/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/hu/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/id/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/it/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/ja/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/ko/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/nl/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/no/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/pl/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/pt/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/ru/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/th/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/tr/translation.ts | 54 +++++++++++----------- .../Ultracopier/Languages/zh/translation.ts | 54 +++++++++++----------- plugins/CopyEngine/Ultracopier/TransferThread.cpp | 44 ++++++++++++------ plugins/CopyEngine/Ultracopier/TransferThread.h | 4 ++ plugins/CopyEngine/Ultracopier/informations.xml | 2 +- plugins/Languages/ar/informations.xml | 2 +- plugins/Languages/de/informations.xml | 2 +- plugins/Languages/el/informations.xml | 2 +- plugins/Languages/es/informations.xml | 2 +- plugins/Languages/fr/informations.xml | 2 +- plugins/Languages/hi/informations.xml | 2 +- plugins/Languages/hu/informations.xml | 2 +- plugins/Languages/id/informations.xml | 2 +- plugins/Languages/it/informations.xml | 2 +- plugins/Languages/ja/informations.xml | 2 +- plugins/Languages/ko/informations.xml | 2 +- plugins/Languages/nl/informations.xml | 2 +- plugins/Languages/no/informations.xml | 2 +- plugins/Languages/pl/informations.xml | 2 +- plugins/Languages/pt/informations.xml | 2 +- plugins/Languages/ru/informations.xml | 2 +- plugins/Languages/th/informations.xml | 2 +- plugins/Languages/tr/informations.xml | 2 +- plugins/Languages/zh/informations.xml | 2 +- plugins/Languages/zh_TW/informations.xml | 2 +- plugins/Listener/catchcopy-v0002/informations.xml | 2 +- .../PluginLoader/catchcopy-v0002/informations.xml | 2 +- plugins/SessionLoader/Windows/informations.xml | 2 +- plugins/Themes/Oxygen/informations.xml | 2 +- plugins/Themes/Supercopier/informations.xml | 2 +- resources/Languages/en/informations.xml | 2 +- 58 files changed, 611 insertions(+), 597 deletions(-) diff --git a/CompilerInfo.h b/CompilerInfo.h index 78ba379..0ec1e08 100644 --- a/CompilerInfo.h +++ b/CompilerInfo.h @@ -5,11 +5,7 @@ /// \def COMPILERINFO the string to identify the compiler #if defined(Q_CC_GNU) - #define COMPILERINFO std::string("GCC ")+std::to_string(__GNUC__)+"."+std::to_string(__GNUC_MINOR__)+"."+std::to_string(__GNUC_PATCHLEVEL__)+" build: "+__DATE__+" "+__TIME__ + #define COMPILERINFO std::string("GCC ")+std::to_string(__GNUC__)+"."+std::to_string(__GNUC_MINOR__)+"."+std::to_string(__GNUC_PATCHLEVEL__) #else - #if defined(__DATE__) && defined(__TIME__) - #define COMPILERINFO std::string("Unknown compiler: ")+__DATE__+" "+__TIME__ - #else - #define COMPILERINFO std::string("Unknown compiler") - #endif + #define COMPILERINFO std::string("Unknown compiler: ") #endif diff --git a/Variable.h b/Variable.h index b36b714..bd90181 100644 --- a/Variable.h +++ b/Variable.h @@ -12,9 +12,9 @@ #define ULTRACOPIER_DEBUG_MAX_ALL_SIZE 128 ///< \brief Max size (in MB) after the console/file output is dropped #define ULTRACOPIER_DEBUG_MAX_IMPORTANT_SIZE 150 ///< \brief Max size (in MB) after the console/file important output is dropped /// \brief the version -#define ULTRACOPIER_VERSION "1.4.0.5" +#define ULTRACOPIER_VERSION "1.4.0.6" /// \brief the windows version -#define ULTRACOPIER_WINDOWS_VERSION 1,4,0,5 +#define ULTRACOPIER_WINDOWS_VERSION 1,4,0,6 // define if the version is portable or not ////#define ULTRACOPIER_VERSION_PORTABLE ////#define ULTRACOPIER_VERSION_PORTABLEAPPS diff --git a/plugins-alternative/Listener/dbus/informations.xml b/plugins-alternative/Listener/dbus/informations.xml index 24e4958..a137400 100644 --- a/plugins-alternative/Listener/dbus/informations.xml +++ b/plugins-alternative/Listener/dbus/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 dbus diff --git a/plugins-alternative/PluginLoader/keybinding/informations.xml b/plugins-alternative/PluginLoader/keybinding/informations.xml index 7bdb880..784d801 100644 --- a/plugins-alternative/PluginLoader/keybinding/informations.xml +++ b/plugins-alternative/PluginLoader/keybinding/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 keybinding diff --git a/plugins-alternative/SessionLoader/KDE4/informations.xml b/plugins-alternative/SessionLoader/KDE4/informations.xml index 49cf5a4..113dbb7 100644 --- a/plugins-alternative/SessionLoader/KDE4/informations.xml +++ b/plugins-alternative/SessionLoader/KDE4/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 KDE4 diff --git a/plugins-alternative/Themes/Clean/informations.xml b/plugins-alternative/Themes/Clean/informations.xml index ae00137..34b7233 100644 --- a/plugins-alternative/Themes/Clean/informations.xml +++ b/plugins-alternative/Themes/Clean/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Clean diff --git a/plugins-alternative/Themes/Teracopy/informations.xml b/plugins-alternative/Themes/Teracopy/informations.xml index c9e02da..fcdb188 100644 --- a/plugins-alternative/Themes/Teracopy/informations.xml +++ b/plugins-alternative/Themes/Teracopy/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Teracopy diff --git a/plugins-alternative/Themes/Windows/informations.xml b/plugins-alternative/Themes/Windows/informations.xml index c4f7358..da9be60 100644 --- a/plugins-alternative/Themes/Windows/informations.xml +++ b/plugins-alternative/Themes/Windows/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Windows diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index ab11d2f..8494655 100644 --- a/plugins/CopyEngine/Rsync/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -14,7 +14,7 @@ - 1.4.0.5 + 1.4.0.6 Rsync diff --git a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts index f5de54d..86b3f56 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts @@ -690,101 +690,101 @@ TransferThread - - - - + + + + File not found Datei nicht gefunden - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening Interner Fehler: Bereits geöffnet - + Drive %1 Laufwerk %1 - + Unknown folder Unbekannter Ordner - + root Stammverzeichnis - + %1 - copy %1 - Kopie - + %1 - copy (%2) %1 - Kopie (%2) - + The source doesn't exist Quelle existiert nicht - - - + + + Unable to change the date - - + + The source file doesn't exist Quelldatei existiert nicht - + The checksums do not match Prüfsummen sind verschieden - + Internal error: The size transfered doesn't match Interner Fehler: Ubertragene Größe ungleich - - + + Unable to do the folder Ordner kann nicht erstellt werden - + Try rename with using special characters Versuche Umbenennung mit Sonderzeichen - + Another file exists at same place Andere Datei befindet sich am selben Ort - + Internal error: The destination is not closed Interner Fehler: Ziel ist nicht geschlossen - + Internal error: The buffer is not empty Interner Fehler: Puffer ist nicht leer diff --git a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts index 80cdab4..ec94fa5 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts index 902c4eb..115566a 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found Archivo no encontrado - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening Error interno: Ya la apertura - + Drive %1 Drive %1 - + Unknown folder Desconocido carpeta - + root raíz - + %1 - copy %1 - copia - + %1 - copy (%2) %1 - copia (%2) - + The source doesn't exist La fuente no existe - - - + + + Unable to change the date - - + + The source file doesn't exist El archivo de origen no existe - + The checksums do not match Las sumas de comprobación no coinciden - + Internal error: The size transfered doesn't match Error interno: El tamaño transferido no coincide - - + + Unable to do the folder Incapaz de hacer la carpeta - + Try rename with using special characters Trate de cambiar el nombre con el uso de caracteres especiales - + Another file exists at same place Otro archivo existe en el mismo lugar - + Internal error: The destination is not closed Error interno: El destino no está cerrado - + Internal error: The buffer is not empty Error interno: El buffer no está vacío diff --git a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts index 86b151e..2867c43 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts @@ -694,101 +694,101 @@ TransferThread - - - - + + + + File not found Fichier non trouvé - + Drive %1 Lecteur %1 - + Unknown folder Dossier inconnu - + root racine - + %1 - copy %1 - copie - + %1 - copy (%2) %1 - copie (%2) - + The source doesn't exist La source n'existe pas - - + + The source file doesn't exist Le fichier source n'existe pas - + The checksums do not match Les sommes de controle ne correspondent pas - + Internal error: The size transfered doesn't match Erreur interne: La taille transféré ne corresponds pas - - + + Unable to do the folder Impossible de créer le dossier - + Try rename with using special characters Essaie de renommage avec caratéres interdits - - + + Wrong modification date or unable to get it, you can disable time transfer to do it Mauvaise date de modification ou impossible de l'avoir, vous pouvez désactiver le transfert de celui-ci - - + + Internal error: Already opening Erreur interne: Déjà ouvert - + Another file exists at same place Un autre fichier exists à la même place - + Internal error: The destination is not closed Erreur interne: La destination n'est pas fermé - + Internal error: The buffer is not empty Erreur interne: Le buffer n'est pas vide - - - + + + Unable to change the date Impossible de changer la date diff --git a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts index 308f84e..26a9ce5 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found Fájl nem található - + Drive %1 %1 meghajtó - + Unknown folder Ismeretlen mappa - + root gyökér - + %1 - copy %1 - másolás - + %1 - copy (%2) %1 - másolás (%2) - + The source doesn't exist A forrás nem létezik - - + + Unable to do the folder Mappaművelet nem lehetséges - + Try rename with using special characters Átnevezés speciális karakterek használatával - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - - + + The source file doesn't exist A forrásfájl nem létezik - + Another file exists at same place Egy másik fájl létezik ugyanazon a helyen - + The checksums do not match A checksumok nem egyeznek meg - + Internal error: The destination is not closed Belső hiba: a cél nincs bezárva - + Internal error: The size transfered doesn't match Belső hiba: az átvitt méret nem egyezik meg - + Internal error: The buffer is not empty Belső hiba: a puffer nem üres - - - + + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts index 6d7a798..d251fe6 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts @@ -699,101 +699,101 @@ TransferThread - - - - + + + + File not found File non trovato - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 Unità %1 - + Unknown folder - + root root - + %1 - copy %1 - copia - + %1 - copy (%2) %1 - copia (%2) - - + + The source file doesn't exist - - + + Unable to do the folder Impossibile creare la cartella - + Try rename with using special characters - + The source doesn't exist - + Another file exists at same place Nello stesso percorso è presente un altro file - + The checksums do not match - + Internal error: The destination is not closed Errore interno: la cartella di destinazione non è chiusa - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty Errore interno: il buffer non è vuoto - - - + + + Unable to change the date Impossibile cambiare la data diff --git a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts index 0882054..0af0674 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts index 4898d1b..2880294 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pt/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts index 2710d22..0fbe59d 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ru/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy %1 - копия - + %1 - copy (%2) %1 - копия (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/th/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts index ba3b28f..72cc659 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/tr/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts index 0882054..0af0674 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/zh/translation.ts @@ -689,101 +689,101 @@ TransferThread - - - - + + + + File not found - - + + Wrong modification date or unable to get it, you can disable time transfer to do it - - + + Internal error: Already opening - + Drive %1 - + Unknown folder - + root - + %1 - copy - + %1 - copy (%2) - - + + The source file doesn't exist - - + + Unable to do the folder - + The source doesn't exist - + Another file exists at same place - + The checksums do not match - + Internal error: The destination is not closed - + Internal error: The size transfered doesn't match - + Internal error: The buffer is not empty - - - + + + Unable to change the date - + Try rename with using special characters diff --git a/plugins/CopyEngine/Ultracopier/TransferThread.cpp b/plugins/CopyEngine/Ultracopier/TransferThread.cpp index 371ada3..3b748a5 100644 --- a/plugins/CopyEngine/Ultracopier/TransferThread.cpp +++ b/plugins/CopyEngine/Ultracopier/TransferThread.cpp @@ -38,7 +38,8 @@ TransferThread::TransferThread() : deletePartiallyTransferredFiles (true), writeError (false), readError (false), - renameTheOriginalDestination (false) + renameTheOriginalDestination (false), + havePermission (false) { start(); moveToThread(this); @@ -285,6 +286,7 @@ void TransferThread::resetExtraVariable() writeIsOpenVariable = false; readIsOpeningVariable = false; writeIsOpeningVariable = false; + havePermission = false; } void TransferThread::preOperation() @@ -409,6 +411,9 @@ void TransferThread::tryOpen() readError=false; readThread.open(source.absoluteFilePath(),mode); readIsOpeningVariable=true; + + if(doRightTransfer) + havePermission=readFilePermissions(QFile(source.absoluteFilePath())); } else { @@ -1253,11 +1258,11 @@ void TransferThread::postOperation() writeError=true; return; } + //in normal mode, without copy/move syscall + if(!doFilePostOperation()) + return; } - if(!doFilePostOperation()) - return; - //remove source in moving mode if(mode==Ultracopier::Move && !canBeMovedDirectlyVariable) { @@ -1353,23 +1358,21 @@ bool TransferThread::doFilePostOperation() } if(doRightTransfer) { - QFile sourceFile(source.absoluteFilePath()); - QFile destinationFile(destination.absoluteFilePath()); - if(!destinationFile.setPermissions(sourceFile.permissions())) + //should be never used but... + /*source.refresh(); + if(source.exists())*/ + if(havePermission) { - if(sourceFile.error()!=QFile::NoError) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to get the source file permission"); - //emit errorOnFile(destination,tr("Unable to get the source file permission")); - //return false; - } - else + QFile destinationFile(destination.absoluteFilePath()); + if(!writeFilePermissions(destinationFile)) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Unable to set the destination file permission"); //emit errorOnFile(destination,tr("Unable to set the destination file permission")); //return false; } } + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] Try doRightTransfer when source not exists"); } } if(stopIt) @@ -1659,7 +1662,7 @@ void TransferThread::setTransferAlgorithm(const TransferAlgorithm &transferAlgor ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] transferAlgorithm==TransferAlgorithm_Parallel"); } -//fonction to edit the file date time +//fonction to read the file date time bool TransferThread::readFileDateTime(const QFileInfo &source) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"["+std::to_string(id)+"] readFileDateTime("+source.absoluteFilePath().toStdString()+")"); @@ -1790,6 +1793,17 @@ bool TransferThread::writeFileDateTime(const QFileInfo &destination) return false; } +bool TransferThread::readFilePermissions(const QFile &source) +{ + this->permissions=source.permissions(); + return true; +} + +bool TransferThread::writeFilePermissions(QFile &destination) +{ + return destination.setPermissions(this->permissions); +} + //skip the copy void TransferThread::skip() { diff --git a/plugins/CopyEngine/Ultracopier/TransferThread.h b/plugins/CopyEngine/Ultracopier/TransferThread.h index e1a3b3f..fb64d6a 100644 --- a/plugins/CopyEngine/Ultracopier/TransferThread.h +++ b/plugins/CopyEngine/Ultracopier/TransferThread.h @@ -256,6 +256,8 @@ private: #endif #endif #endif + QFileDevice::Permissions permissions; + bool havePermission; //different pre-operation bool isSame(); bool destinationExists(); @@ -268,6 +270,8 @@ private: //fonction to edit the file date time bool readFileDateTime(const QFileInfo &source); bool writeFileDateTime(const QFileInfo &destination); + bool readFilePermissions(const QFile &source); + bool writeFilePermissions(QFile &destination); void resetExtraVariable(); //error management function void resumeTransferAfterWriteError(); diff --git a/plugins/CopyEngine/Ultracopier/informations.xml b/plugins/CopyEngine/Ultracopier/informations.xml index 81172b8..41cc2d5 100644 --- a/plugins/CopyEngine/Ultracopier/informations.xml +++ b/plugins/CopyEngine/Ultracopier/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Ultracopier diff --git a/plugins/Languages/ar/informations.xml b/plugins/Languages/ar/informations.xml index ac75407..7199529 100644 --- a/plugins/Languages/ar/informations.xml +++ b/plugins/Languages/ar/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 ar diff --git a/plugins/Languages/de/informations.xml b/plugins/Languages/de/informations.xml index 30847fd..550d0e4 100644 --- a/plugins/Languages/de/informations.xml +++ b/plugins/Languages/de/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 de diff --git a/plugins/Languages/el/informations.xml b/plugins/Languages/el/informations.xml index 954fb54..a3948b7 100644 --- a/plugins/Languages/el/informations.xml +++ b/plugins/Languages/el/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 el diff --git a/plugins/Languages/es/informations.xml b/plugins/Languages/es/informations.xml index 774369f..5b912a8 100644 --- a/plugins/Languages/es/informations.xml +++ b/plugins/Languages/es/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 es diff --git a/plugins/Languages/fr/informations.xml b/plugins/Languages/fr/informations.xml index 40e7cb8..330cad2 100644 --- a/plugins/Languages/fr/informations.xml +++ b/plugins/Languages/fr/informations.xml @@ -15,7 +15,7 @@ - 1.4.0.5 + 1.4.0.6 fr diff --git a/plugins/Languages/hi/informations.xml b/plugins/Languages/hi/informations.xml index 8d853a5..974da16 100644 --- a/plugins/Languages/hi/informations.xml +++ b/plugins/Languages/hi/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 hi diff --git a/plugins/Languages/hu/informations.xml b/plugins/Languages/hu/informations.xml index e9493f3..212d8dc 100644 --- a/plugins/Languages/hu/informations.xml +++ b/plugins/Languages/hu/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 hu diff --git a/plugins/Languages/id/informations.xml b/plugins/Languages/id/informations.xml index 0d586d2..67a92d6 100644 --- a/plugins/Languages/id/informations.xml +++ b/plugins/Languages/id/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 id diff --git a/plugins/Languages/it/informations.xml b/plugins/Languages/it/informations.xml index 60ca04b..f985c6a 100644 --- a/plugins/Languages/it/informations.xml +++ b/plugins/Languages/it/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 it diff --git a/plugins/Languages/ja/informations.xml b/plugins/Languages/ja/informations.xml index bd080e6..f1aa35c 100644 --- a/plugins/Languages/ja/informations.xml +++ b/plugins/Languages/ja/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 jp diff --git a/plugins/Languages/ko/informations.xml b/plugins/Languages/ko/informations.xml index 5d122c3..b1cafef 100644 --- a/plugins/Languages/ko/informations.xml +++ b/plugins/Languages/ko/informations.xml @@ -13,7 +13,7 @@ - 1.4.0.5 + 1.4.0.6 ko diff --git a/plugins/Languages/nl/informations.xml b/plugins/Languages/nl/informations.xml index 471a878..b7ebcb0 100644 --- a/plugins/Languages/nl/informations.xml +++ b/plugins/Languages/nl/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 nl diff --git a/plugins/Languages/no/informations.xml b/plugins/Languages/no/informations.xml index 05ea2cd..96703ac 100644 --- a/plugins/Languages/no/informations.xml +++ b/plugins/Languages/no/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 no diff --git a/plugins/Languages/pl/informations.xml b/plugins/Languages/pl/informations.xml index ab9d8f6..04fd823 100644 --- a/plugins/Languages/pl/informations.xml +++ b/plugins/Languages/pl/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 pl diff --git a/plugins/Languages/pt/informations.xml b/plugins/Languages/pt/informations.xml index afb1209..1346bd8 100644 --- a/plugins/Languages/pt/informations.xml +++ b/plugins/Languages/pt/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 pt diff --git a/plugins/Languages/ru/informations.xml b/plugins/Languages/ru/informations.xml index ac65e41..7a0457e 100644 --- a/plugins/Languages/ru/informations.xml +++ b/plugins/Languages/ru/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 ru diff --git a/plugins/Languages/th/informations.xml b/plugins/Languages/th/informations.xml index 47ed375..7497803 100644 --- a/plugins/Languages/th/informations.xml +++ b/plugins/Languages/th/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 th diff --git a/plugins/Languages/tr/informations.xml b/plugins/Languages/tr/informations.xml index fcf4860..1cb158c 100644 --- a/plugins/Languages/tr/informations.xml +++ b/plugins/Languages/tr/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 tr diff --git a/plugins/Languages/zh/informations.xml b/plugins/Languages/zh/informations.xml index 99524dd..54e2c4e 100644 --- a/plugins/Languages/zh/informations.xml +++ b/plugins/Languages/zh/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 ch diff --git a/plugins/Languages/zh_TW/informations.xml b/plugins/Languages/zh_TW/informations.xml index bc97884..06330b8 100644 --- a/plugins/Languages/zh_TW/informations.xml +++ b/plugins/Languages/zh_TW/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 zh_tw diff --git a/plugins/Listener/catchcopy-v0002/informations.xml b/plugins/Listener/catchcopy-v0002/informations.xml index 44af89b..28fdfce 100644 --- a/plugins/Listener/catchcopy-v0002/informations.xml +++ b/plugins/Listener/catchcopy-v0002/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 catchcopy-v0002 diff --git a/plugins/PluginLoader/catchcopy-v0002/informations.xml b/plugins/PluginLoader/catchcopy-v0002/informations.xml index 2f6f2aa..8371a06 100644 --- a/plugins/PluginLoader/catchcopy-v0002/informations.xml +++ b/plugins/PluginLoader/catchcopy-v0002/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 catchcopy-v0002 diff --git a/plugins/SessionLoader/Windows/informations.xml b/plugins/SessionLoader/Windows/informations.xml index 92e932e..04eece4 100644 --- a/plugins/SessionLoader/Windows/informations.xml +++ b/plugins/SessionLoader/Windows/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Windows diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml index f5d999b..7f66317 100644 --- a/plugins/Themes/Oxygen/informations.xml +++ b/plugins/Themes/Oxygen/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Oxygen diff --git a/plugins/Themes/Supercopier/informations.xml b/plugins/Themes/Supercopier/informations.xml index 1258f0f..6233380 100644 --- a/plugins/Themes/Supercopier/informations.xml +++ b/plugins/Themes/Supercopier/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.5 + 1.4.0.6 Supercopier diff --git a/resources/Languages/en/informations.xml b/resources/Languages/en/informations.xml index 1b9a9d6..52bbd32 100644 --- a/resources/Languages/en/informations.xml +++ b/resources/Languages/en/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.5 + 1.4.0.6 en