summaryrefslogtreecommitdiff
path: root/plugins/Themes
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2018-02-23 23:49:48 +0000
committerThomas Preud'homme <robotux@celest.fr>2018-02-23 23:49:48 +0000
commitbd56579c7d9de94c17287adefa118290e6b7ba33 (patch)
tree666d7d0b6945b442573b7a3145969f66a53aa460 /plugins/Themes
parentb3c8bdcc0d1e4b2ab298847a7902b6d60410a5bc (diff)
New upstream version 1.4.0.3
Diffstat (limited to 'plugins/Themes')
-rw-r--r--plugins/Themes/Oxygen/Languages/ar/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/de/translation.ts58
-rw-r--r--plugins/Themes/Oxygen/Languages/el/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/en/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/es/translation.ts62
-rw-r--r--plugins/Themes/Oxygen/Languages/fr/translation.ts36
-rw-r--r--plugins/Themes/Oxygen/Languages/hi/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/hu/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/id/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/it/translation.ts62
-rw-r--r--plugins/Themes/Oxygen/Languages/ja/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/ko/translation.ts28
-rw-r--r--plugins/Themes/Oxygen/Languages/nl/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/no/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/pl/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/pt/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/ru/translation.ts58
-rw-r--r--plugins/Themes/Oxygen/Languages/th/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/tr/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/Languages/zh/translation.ts46
-rw-r--r--plugins/Themes/Oxygen/ThemesFactory.cpp143
-rw-r--r--plugins/Themes/Oxygen/ThemesFactory.h8
-rw-r--r--plugins/Themes/Oxygen/TransferModel.cpp168
-rw-r--r--plugins/Themes/Oxygen/TransferModel.h44
-rw-r--r--plugins/Themes/Oxygen/documentation.dox5
-rw-r--r--plugins/Themes/Oxygen/informations.xml2
-rw-r--r--plugins/Themes/Oxygen/interface.cpp343
-rw-r--r--plugins/Themes/Oxygen/interface.h34
-rw-r--r--plugins/Themes/Oxygen/interface.pro59
-rw-r--r--plugins/Themes/Oxygen/interfaceInclude.pri51
-rw-r--r--plugins/Themes/Supercopier/informations.xml26
-rw-r--r--plugins/Themes/Supercopier/interface.pro10
-rw-r--r--plugins/Themes/Supercopier/interfaceResources.qrc24
-rw-r--r--plugins/Themes/Supercopier/interfaceResources_unix.qrc7
-rw-r--r--plugins/Themes/Supercopier/interfaceResources_windows.qrc7
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/add.pngbin0 -> 246 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.pngbin0 -> 545 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.pngbin0 -> 281 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/options.pngbin0 -> 275 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.pngbin0 -> 147 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.pngbin0 -> 148 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.pngbin0 -> 147 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.pngbin0 -> 148 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.pngbin0 -> 141 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.pngbin0 -> 139 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/add.pngbin0 -> 240 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/cancel.pngbin0 -> 284 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/export-transfer-list.pngbin0 -> 264 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/import-transfer-list.pngbin0 -> 316 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/main.pngbin0 -> 148 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/moveDown.pngbin0 -> 191 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/moveUp.pngbin0 -> 190 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/player_end.pngbin0 -> 226 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/player_pause.pngbin0 -> 207 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/player_play.pngbin0 -> 208 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/progressbarleft.pngbin0 -> 133 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/progressbarright.pngbin0 -> 132 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/putOnBottom.pngbin0 -> 206 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/putOnTop.pngbin0 -> 208 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/remove.pngbin0 -> 254 bytes
-rw-r--r--plugins/Themes/Supercopier/resources/search.pngbin0 -> 237 bytes
61 files changed, 1064 insertions, 815 deletions
diff --git a/plugins/Themes/Oxygen/Languages/ar/translation.ts b/plugins/Themes/Oxygen/Languages/ar/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/ar/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/ar/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/de/translation.ts b/plugins/Themes/Oxygen/Languages/de/translation.ts
index 34c8bef..74d215d 100644
--- a/plugins/Themes/Oxygen/Languages/de/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/de/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation>Kaufe die Ultimate Version um die Entwicklung zu finanzieren</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation>Datei %1/%2, Größe:%3/%4</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation>Zu kopierende Dateien</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation>Zu verschiebende Dateien</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation>Nicht schließen, wenn Fehler aufgetreten sind</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation>Niemals schließen</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation>Immer schließen</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation>Dateiname, 0KB</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation>Farbe auswählen</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation>Nicht schließen, wenn Fehler aufgetreten sind</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation>Niemals schließen</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation>Immer schließen</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation>Wählen Sie eine Farbe</translation>
</message>
@@ -116,10 +122,6 @@
<translation>Abbrechen (&amp;C)</translation>
</message>
<message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Kopiergeschwindigkeit begrenzen bei:</translation>
- </message>
- <message>
<location filename="../../interface.ui" line="329"/>
<source>Transfer list</source>
<translation>Dateiliste</translation>
@@ -295,14 +297,6 @@
<translation>Zum Bearbeiten der Farbe klicken</translation>
</message>
<message>
- <source>At the end of the copy: </source>
- <translation type="obsolete">Am Ende der Kopie: </translation>
- </message>
- <message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Kopiergeschwindigkeit begrenzen bei:</translation>
- </message>
- <message>
<location filename="../../themesOptions.ui" line="147"/>
<source> KB/s</source>
<translation> KB/s</translation>
diff --git a/plugins/Themes/Oxygen/Languages/el/translation.ts b/plugins/Themes/Oxygen/Languages/el/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/el/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/el/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/en/translation.ts b/plugins/Themes/Oxygen/Languages/en/translation.ts
index 717ea08..6cbd884 100644
--- a/plugins/Themes/Oxygen/Languages/en/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/en/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/es/translation.ts b/plugins/Themes/Oxygen/Languages/es/translation.ts
index a6ded18..46b67a9 100644
--- a/plugins/Themes/Oxygen/Languages/es/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/es/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation>Comprar la versión Ultimate para financiar el desarrollo</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation>El archivo %1/%2, el tamaño: %3/%4</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation>Lista de copia</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation>Lista de movimiento</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation>No cierre si se encuentran errores</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation>Nunca cierre</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation>Siempre cerrar</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation>Nombre de archivo, 0KB</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation>Seleccione un color</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation>No cierre si se encuentran errores</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation>Nunca cierre</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation>Siempre cerrar</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation>Seleccione un color</translation>
</message>
@@ -96,10 +102,6 @@
<translation>Para:</translation>
</message>
<message>
- <source>Close at the end of the transfers</source>
- <translation type="obsolete">Cerca al final de las transferencias</translation>
- </message>
- <message>
<location filename="../../interface.ui" line="226"/>
<source>&amp;More</source>
<translation>&amp;Más</translation>
@@ -120,10 +122,6 @@
<translation>&amp;Cancelar</translation>
</message>
<message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Limitar la velocidad de copia en:</translation>
- </message>
- <message>
<location filename="../../interface.ui" line="118"/>
<source>Close on transfer completion</source>
<translation>Cerca de finalización de transferencia</translation>
@@ -299,14 +297,6 @@
<translation>Haga clic para editar el color</translation>
</message>
<message>
- <source>At the end of the copy: </source>
- <translation type="obsolete">Al final de la copia: </translation>
- </message>
- <message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Limitar la velocidad de copia en:</translation>
- </message>
- <message>
<location filename="../../themesOptions.ui" line="147"/>
<source> KB/s</source>
<translation> KB/s</translation>
diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.ts b/plugins/Themes/Oxygen/Languages/fr/translation.ts
index 628347d..9a89964 100644
--- a/plugins/Themes/Oxygen/Languages/fr/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/fr/translation.ts
@@ -4,17 +4,23 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="+240"/>
+ <location filename="../../interface.cpp" line="+298"/>
+ <location line="+11"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Buy the Ultimate version to fund development</source>
<translation>Achetez la version Ultimate pour financer le développement</translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+85"/>
<source>File %1/%2, size: %3/%4</source>
<translation>Fichier %1/%2, taille: %3/%4</translation>
</message>
<message>
- <location line="+214"/>
+ <location line="+234"/>
<source>Copy list</source>
<translation>Liste de copies</translation>
</message>
@@ -44,7 +50,7 @@
<translation>Nom de fichier, 0Ko</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+187"/>
<location line="+12"/>
<location line="+12"/>
<source>Select a color</source>
@@ -61,7 +67,7 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="+223"/>
+ <location filename="../../ThemesFactory.cpp" line="+224"/>
<source>Don&apos;t close if errors are found</source>
<translation>Garder ouvert s&apos;il y a des erreurs</translation>
</message>
@@ -96,10 +102,6 @@
<translation>Vers:</translation>
</message>
<message>
- <source>Close at the end of the transfers</source>
- <translation type="obsolete">Fermer à la fin des transferts</translation>
- </message>
- <message>
<location line="+161"/>
<source>&amp;More</source>
<translation>Pl&amp;us</translation>
@@ -120,10 +122,6 @@
<translation>&amp;Annuler</translation>
</message>
<message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Limiter la vitesse de copie à:</translation>
- </message>
- <message>
<location line="-153"/>
<source>Close on transfer completion</source>
<translation>Fermer à la fin des transferts</translation>
@@ -299,18 +297,6 @@
<translation>Cliquer pour éditer la couleur</translation>
</message>
<message>
- <source>At the end of the copy: </source>
- <translation type="obsolete">À la fin de la copie:</translation>
- </message>
- <message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Limiter la vitesse de copie à:</translation>
- </message>
- <message>
- <source>Limit copy speed to:</source>
- <translation type="obsolete">Limiter la vitesse de copie à:</translation>
- </message>
- <message>
<location line="-145"/>
<source> KB/s</source>
<translation> Ko/s</translation>
diff --git a/plugins/Themes/Oxygen/Languages/hi/translation.ts b/plugins/Themes/Oxygen/Languages/hi/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/hi/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/hi/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.ts b/plugins/Themes/Oxygen/Languages/hu/translation.ts
index ce37a23..ecf3eb5 100644
--- a/plugins/Themes/Oxygen/Languages/hu/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/hu/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation>Vásárold meg az Ultimate verziót a fejlesztés támogatásához</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation>Fájl %1/%2, méret: %3/%4</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation>Lista másolása</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation>Lista mozgatása</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation>Ne zárja be, ha hiba történik</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation>Sose zárja be</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation>Mindig zárja be</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation>Fájlnév, 0KB</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation>Válassz egy színt</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation>Ne zárja be, ha hiba történik</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation>Sose zárja be</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation>Mindig zárja be</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation>Válassz egy színt</translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/id/translation.ts b/plugins/Themes/Oxygen/Languages/id/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/id/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/id/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/it/translation.ts b/plugins/Themes/Oxygen/Languages/it/translation.ts
index d9e20f0..5ca6a07 100644
--- a/plugins/Themes/Oxygen/Languages/it/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/it/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation>Acquista la versione Ultimate per finanziare lo sviluppo del programma</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation>File %1/%2, dimensione: %3/%4</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation>Lista della copia</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation>Lista dello spostamento</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation>Non chiudere se vengono rilevati errori</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation>Non chiudere mai</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation>Chiudere sempre</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation>Nome del file, 0KB</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation>Scegliere un colore</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation>%1 %2% di %3</translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation>Non chiudere se vengono rilevati errori</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation>Non chiudere mai</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation>Chiudere sempre</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation>Scegliere un colore</translation>
</message>
@@ -96,10 +102,6 @@
<translation>a:</translation>
</message>
<message>
- <source>Close at the end of the transfers</source>
- <translation type="obsolete">Chiudi alla fine dei trasferimenti</translation>
- </message>
- <message>
<location filename="../../interface.ui" line="226"/>
<source>&amp;More</source>
<translation>Altr&amp;o</translation>
@@ -120,10 +122,6 @@
<translation>&amp;Annulla</translation>
</message>
<message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Ridurre la velocità di copia a:</translation>
- </message>
- <message>
<location filename="../../interface.ui" line="118"/>
<source>Close on transfer completion</source>
<translation>Arresta il sistema a trasferimento comletato</translation>
@@ -299,14 +297,6 @@
<translation>Clicca per modificare il colore</translation>
</message>
<message>
- <source>At the end of the copy: </source>
- <translation type="obsolete">Alla fine della copia: </translation>
- </message>
- <message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Ridurre la velocità di copia a:</translation>
- </message>
- <message>
<location filename="../../themesOptions.ui" line="147"/>
<source> KB/s</source>
<translation> KB/s</translation>
diff --git a/plugins/Themes/Oxygen/Languages/ja/translation.ts b/plugins/Themes/Oxygen/Languages/ja/translation.ts
index 1ee75a9..facdce1 100644
--- a/plugins/Themes/Oxygen/Languages/ja/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/ja/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.ts b/plugins/Themes/Oxygen/Languages/ko/translation.ts
index 2d9b2f8..86a2b04 100644
--- a/plugins/Themes/Oxygen/Languages/ko/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/ko/translation.ts
@@ -4,17 +4,23 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="+240"/>
+ <location filename="../../interface.cpp" line="+298"/>
+ <location line="+11"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+70"/>
+ <location line="+85"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished">파일 %1/%2, 크기: %3/%4</translation>
</message>
<message>
- <location line="+214"/>
+ <location line="+234"/>
<source>Copy list</source>
<translation type="unfinished">복사 목록</translation>
</message>
@@ -44,7 +50,7 @@
<translation type="unfinished">파일명, 0KB</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+187"/>
<location line="+12"/>
<location line="+12"/>
<source>Select a color</source>
@@ -61,7 +67,7 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="+223"/>
+ <location filename="../../ThemesFactory.cpp" line="+224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished">오류 발견시 종료 안함</translation>
</message>
@@ -116,10 +122,6 @@
<translation type="unfinished">&amp;취소</translation>
</message>
<message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">복사 속도 제한:</translation>
- </message>
- <message>
<location line="+58"/>
<source>Transfer list</source>
<translation type="unfinished"></translation>
@@ -295,14 +297,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>At the end of the copy: </source>
- <translation type="obsolete">복사 종료시:</translation>
- </message>
- <message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">복사 속도 제한:</translation>
- </message>
- <message>
<location line="-145"/>
<source> KB/s</source>
<translation type="unfinished"> KB/초</translation>
diff --git a/plugins/Themes/Oxygen/Languages/nl/translation.ts b/plugins/Themes/Oxygen/Languages/nl/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/nl/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/nl/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/no/translation.ts b/plugins/Themes/Oxygen/Languages/no/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/no/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/no/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/pl/translation.ts b/plugins/Themes/Oxygen/Languages/pl/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/pl/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/pl/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/pt/translation.ts b/plugins/Themes/Oxygen/Languages/pt/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/pt/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/pt/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.ts b/plugins/Themes/Oxygen/Languages/ru/translation.ts
index 9ffa0a1..ac18a39 100644
--- a/plugins/Themes/Oxygen/Languages/ru/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/ru/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation>Файл %1/%2, размер: %3/%4</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished">Копировать список</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished">Не закрывать, если найдены ошибки</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished">Никогда не закрывать</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished">Всегда закрывайте</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation>Имя файла, 0KB</translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished">Не закрывать, если найдены ошибки</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished">Никогда не закрывать</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished">Всегда закрывайте</translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
@@ -116,10 +122,6 @@
<translation>отменить</translation>
</message>
<message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Предельная скорость копирования по адресу:</translation>
- </message>
- <message>
<location filename="../../interface.ui" line="118"/>
<source>Close on transfer completion</source>
<translation type="unfinished"></translation>
@@ -295,14 +297,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>At the end of the copy: </source>
- <translation type="obsolete">В конце копии: </translation>
- </message>
- <message>
- <source>Limit copy speed at:</source>
- <translation type="obsolete">Предельная скорость копирования по адресу:</translation>
- </message>
- <message>
<location filename="../../themesOptions.ui" line="147"/>
<source> KB/s</source>
<translation type="unfinished"> Кб/с</translation>
diff --git a/plugins/Themes/Oxygen/Languages/th/translation.ts b/plugins/Themes/Oxygen/Languages/th/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/th/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/th/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/tr/translation.ts b/plugins/Themes/Oxygen/Languages/tr/translation.ts
index ae86b54..483e140 100644
--- a/plugins/Themes/Oxygen/Languages/tr/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/tr/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/Languages/zh/translation.ts b/plugins/Themes/Oxygen/Languages/zh/translation.ts
index 1ee75a9..facdce1 100644
--- a/plugins/Themes/Oxygen/Languages/zh/translation.ts
+++ b/plugins/Themes/Oxygen/Languages/zh/translation.ts
@@ -4,56 +4,62 @@
<context>
<name>Themes</name>
<message>
- <location filename="../../interface.cpp" line="240"/>
+ <location filename="../../interface.cpp" line="298"/>
+ <location filename="../../interface.cpp" line="309"/>
+ <source>%1 is deprecated, Use %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../interface.cpp" line="311"/>
<source>Buy the Ultimate version to fund development</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="310"/>
+ <location filename="../../interface.cpp" line="396"/>
<source>File %1/%2, size: %3/%4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="524"/>
+ <location filename="../../interface.cpp" line="630"/>
<source>Copy list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="526"/>
+ <location filename="../../interface.cpp" line="632"/>
<source>Move list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="947"/>
+ <location filename="../../interface.cpp" line="1053"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="948"/>
+ <location filename="../../interface.cpp" line="1054"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="949"/>
+ <location filename="../../interface.cpp" line="1055"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="951"/>
+ <location filename="../../interface.cpp" line="1057"/>
<source>File Name, 0KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1134"/>
- <location filename="../../interface.cpp" line="1146"/>
- <location filename="../../interface.cpp" line="1158"/>
+ <location filename="../../interface.cpp" line="1244"/>
+ <location filename="../../interface.cpp" line="1256"/>
+ <location filename="../../interface.cpp" line="1268"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../interface.cpp" line="1233"/>
- <location filename="../../interface.cpp" line="1237"/>
- <location filename="../../interface.cpp" line="1239"/>
+ <location filename="../../interface.cpp" line="1343"/>
+ <location filename="../../interface.cpp" line="1347"/>
+ <location filename="../../interface.cpp" line="1349"/>
<source>%1 %2% of %3</source>
<translation type="unfinished"></translation>
</message>
@@ -61,24 +67,24 @@
<context>
<name>ThemesFactory</name>
<message>
- <location filename="../../ThemesFactory.cpp" line="223"/>
+ <location filename="../../ThemesFactory.cpp" line="224"/>
<source>Don&apos;t close if errors are found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="224"/>
+ <location filename="../../ThemesFactory.cpp" line="225"/>
<source>Never close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="225"/>
+ <location filename="../../ThemesFactory.cpp" line="226"/>
<source>Always close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../ThemesFactory.cpp" line="421"/>
- <location filename="../../ThemesFactory.cpp" line="436"/>
- <location filename="../../ThemesFactory.cpp" line="451"/>
+ <location filename="../../ThemesFactory.cpp" line="422"/>
+ <location filename="../../ThemesFactory.cpp" line="437"/>
+ <location filename="../../ThemesFactory.cpp" line="452"/>
<source>Select a color</source>
<translation type="unfinished"></translation>
</message>
diff --git a/plugins/Themes/Oxygen/ThemesFactory.cpp b/plugins/Themes/Oxygen/ThemesFactory.cpp
index 595ed71..28961f0 100644
--- a/plugins/Themes/Oxygen/ThemesFactory.cpp
+++ b/plugins/Themes/Oxygen/ThemesFactory.cpp
@@ -5,6 +5,7 @@
#include <QColorDialog>
#include "ThemesFactory.h"
+#include "../../../cpp11addition.h"
ThemesFactory::ThemesFactory()
{
@@ -25,7 +26,7 @@ ThemesFactory::~ThemesFactory()
PluginInterface_Themes * ThemesFactory::getInstance()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, currentSpeed: %1").arg(currentSpeed));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, currentSpeed: "+std::to_string(currentSpeed));
Themes * newInterface=new Themes(
ui->alwaysOnTop->isChecked(),
@@ -48,11 +49,11 @@ PluginInterface_Themes * ThemesFactory::getInstance()
return newInterface;
}
-void ThemesFactory::setResources(OptionInterface * optionsEngine,const QString &
+void ThemesFactory::setResources(OptionInterface * optionsEngine,const std::string &
#ifdef ULTRACOPIER_PLUGIN_DEBUG
writePath
#endif
- ,const QString &
+ ,const std::string &
#ifdef ULTRACOPIER_PLUGIN_DEBUG
pluginPath
#endif
@@ -65,20 +66,20 @@ void ThemesFactory::setResources(OptionInterface * optionsEngine,const QString &
{
this->optionsEngine=optionsEngine;
//load the options
- QList<QPair<QString, QVariant> > KeysList;
- KeysList.append(qMakePair(QStringLiteral("checkBoxShowSpeed"),QVariant(false)));
- KeysList.append(qMakePair(QStringLiteral("moreButtonPushed"),QVariant(false)));
- KeysList.append(qMakePair(QStringLiteral("speedWithProgressBar"),QVariant(true)));
- KeysList.append(qMakePair(QStringLiteral("currentSpeed"),QVariant(0)));
- KeysList.append(qMakePair(QStringLiteral("comboBox_copyEnd"),QVariant(0)));
- KeysList.append(qMakePair(QStringLiteral("showDualProgression"),QVariant(false)));
- KeysList.append(qMakePair(QStringLiteral("showProgressionInTheTitle"),QVariant(true)));
- KeysList.append(qMakePair(QStringLiteral("progressColorWrite"),QVariant(QApplication::palette().color(QPalette::Highlight))));
- KeysList.append(qMakePair(QStringLiteral("progressColorRead"),QVariant(QApplication::palette().color(QPalette::AlternateBase))));
- KeysList.append(qMakePair(QStringLiteral("progressColorRemaining"),QVariant(QApplication::palette().color(QPalette::Base))));
- KeysList.append(qMakePair(QStringLiteral("alwaysOnTop"),QVariant(false)));
- KeysList.append(qMakePair(QStringLiteral("minimizeToSystray"),QVariant(false)));
- KeysList.append(qMakePair(QStringLiteral("startMinimized"),QVariant(false)));
+ std::vector<std::pair<std::string, std::string> > KeysList;
+ KeysList.push_back(std::pair<std::string, std::string>("checkBoxShowSpeed","false"));
+ KeysList.push_back(std::pair<std::string, std::string>("moreButtonPushed","false"));
+ KeysList.push_back(std::pair<std::string, std::string>("speedWithProgressBar","true"));
+ KeysList.push_back(std::pair<std::string, std::string>("currentSpeed","0"));
+ KeysList.push_back(std::pair<std::string, std::string>("comboBox_copyEnd","0"));
+ KeysList.push_back(std::pair<std::string, std::string>("showDualProgression","false"));
+ KeysList.push_back(std::pair<std::string, std::string>("showProgressionInTheTitle","true"));
+ KeysList.push_back(std::pair<std::string, std::string>("progressColorWrite",QApplication::palette().color(QPalette::Highlight).name().toStdString()));
+ KeysList.push_back(std::pair<std::string, std::string>("progressColorRead",QApplication::palette().color(QPalette::AlternateBase).name().toStdString()));
+ KeysList.push_back(std::pair<std::string, std::string>("progressColorRemaining",QApplication::palette().color(QPalette::Base).name().toStdString()));
+ KeysList.push_back(std::pair<std::string, std::string>("alwaysOnTop","false"));
+ KeysList.push_back(std::pair<std::string, std::string>("minimizeToSystray","false"));
+ KeysList.push_back(std::pair<std::string, std::string>("startMinimized","false"));
optionsEngine->addOptionGroup(KeysList);
connect(optionsEngine,&OptionInterface::resetOptions,this,&ThemesFactory::resetOptions);
updateSpeed();
@@ -95,22 +96,22 @@ QWidget * ThemesFactory::options()
if(optionsEngine!=NULL)
{
bool ok;
- currentSpeed=optionsEngine->getOptionValue(QStringLiteral("currentSpeed")).toUInt(&ok);
+ currentSpeed=stringtouint32(optionsEngine->getOptionValue("currentSpeed"),&ok);
if(!ok)
currentSpeed=0;
- ui->comboBox_copyEnd->setCurrentIndex(optionsEngine->getOptionValue(QStringLiteral("comboBox_copyEnd")).toUInt());
- ui->speedWithProgressBar->setChecked(optionsEngine->getOptionValue(QStringLiteral("speedWithProgressBar")).toBool());
- ui->checkBoxShowSpeed->setChecked(optionsEngine->getOptionValue(QStringLiteral("checkBoxShowSpeed")).toBool());
- ui->checkBoxStartWithMoreButtonPushed->setChecked(optionsEngine->getOptionValue(QStringLiteral("moreButtonPushed")).toBool());
- ui->showDualProgression->setChecked(optionsEngine->getOptionValue(QStringLiteral("showDualProgression")).toBool());
- ui->showProgressionInTheTitle->setChecked(optionsEngine->getOptionValue(QStringLiteral("showProgressionInTheTitle")).toBool());
- ui->alwaysOnTop->setChecked(optionsEngine->getOptionValue(QStringLiteral("alwaysOnTop")).toBool());
- ui->minimizeToSystray->setChecked(optionsEngine->getOptionValue(QStringLiteral("minimizeToSystray")).toBool());
- ui->startMinimized->setChecked(optionsEngine->getOptionValue(QStringLiteral("startMinimized")).toBool());
-
- progressColorWrite=optionsEngine->getOptionValue(QStringLiteral("progressColorWrite")).value<QColor>();
- progressColorRead=optionsEngine->getOptionValue(QStringLiteral("progressColorRead")).value<QColor>();
- progressColorRemaining=optionsEngine->getOptionValue(QStringLiteral("progressColorRemaining")).value<QColor>();
+ ui->comboBox_copyEnd->setCurrentIndex(stringtouint32(optionsEngine->getOptionValue("comboBox_copyEnd")));
+ ui->speedWithProgressBar->setChecked(stringtobool(optionsEngine->getOptionValue("speedWithProgressBar")));
+ ui->checkBoxShowSpeed->setChecked(stringtobool(optionsEngine->getOptionValue("checkBoxShowSpeed")));
+ ui->checkBoxStartWithMoreButtonPushed->setChecked(stringtobool(optionsEngine->getOptionValue("moreButtonPushed")));
+ ui->showDualProgression->setChecked(stringtobool(optionsEngine->getOptionValue("showDualProgression")));
+ ui->showProgressionInTheTitle->setChecked(stringtobool(optionsEngine->getOptionValue("showProgressionInTheTitle")));
+ ui->alwaysOnTop->setChecked(stringtobool(optionsEngine->getOptionValue("alwaysOnTop")));
+ ui->minimizeToSystray->setChecked(stringtobool(optionsEngine->getOptionValue("minimizeToSystray")));
+ ui->startMinimized->setChecked(stringtobool(optionsEngine->getOptionValue("startMinimized")));
+
+ progressColorWrite=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorWrite"))).value<QColor>();
+ progressColorRead=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorRead"))).value<QColor>();
+ progressColorRemaining=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorRemaining"))).value<QColor>();
QPixmap pixmap(75,20);
pixmap.fill(progressColorWrite);
@@ -146,33 +147,37 @@ QWidget * ThemesFactory::options()
return tempWidget;
}
-QIcon ThemesFactory::getIcon(const QString &fileName) const
+QIcon ThemesFactory::getIcon(const std::string &fileName) const
{
- if(fileName==QStringLiteral("SystemTrayIcon/exit.png"))
+ if(fileName=="SystemTrayIcon/exit.png")
{
- QIcon tempIcon=QIcon::fromTheme(QStringLiteral("application-exit"));
+ QIcon tempIcon=QIcon::fromTheme("application-exit");
if(!tempIcon.isNull())
return tempIcon;
}
- else if(fileName==QStringLiteral("SystemTrayIcon/add.png"))
+ else if(fileName=="SystemTrayIcon/add.png")
{
- QIcon tempIcon=QIcon::fromTheme(QStringLiteral("list-add"));
+ QIcon tempIcon=QIcon::fromTheme("list-add");
if(!tempIcon.isNull())
return tempIcon;
}
- else if(fileName==QStringLiteral("SystemTrayIcon/informations.png"))
+ else if(fileName=="SystemTrayIcon/informations.png")
{
- QIcon tempIcon=QIcon::fromTheme(QStringLiteral("help-about"));
+ QIcon tempIcon=QIcon::fromTheme("help-about");
if(!tempIcon.isNull())
return tempIcon;
}
- else if(fileName==QStringLiteral("SystemTrayIcon/options.png"))
+ else if(fileName=="SystemTrayIcon/options.png")
{
- QIcon tempIcon=QIcon::fromTheme(QStringLiteral("applications-system"));
+ QIcon tempIcon=QIcon::fromTheme("applications-system");
if(!tempIcon.isNull())
return tempIcon;
}
- return QIcon(QStringLiteral(":/Themes/Oxygen/resources/")+fileName);
+ #ifdef SUPERCOPIER
+ return QIcon(":/Themes/Supercopier/resources/"+QString::fromStdString(fileName));
+ #else
+ return QIcon(":/Themes/Oxygen/resources/"+QString::fromStdString(fileName));
+ #endif
}
void ThemesFactory::resetOptions()
@@ -185,7 +190,7 @@ void ThemesFactory::checkBoxShowSpeedHaveChanged(bool toggled)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("checkBoxShowSpeed"),toggled);
+ optionsEngine->setOptionValue("checkBoxShowSpeed",std::to_string(toggled));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -194,7 +199,7 @@ void ThemesFactory::checkBoxStartWithMoreButtonPushedHaveChanged(bool toggled)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("moreButtonPushed"),toggled);
+ optionsEngine->setOptionValue("moreButtonPushed",std::to_string(toggled));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -203,7 +208,7 @@ void ThemesFactory::comboBox_copyEnd(int value)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("comboBox_copyEnd"),value);
+ optionsEngine->setOptionValue("comboBox_copyEnd",std::to_string(value));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -212,7 +217,7 @@ void ThemesFactory::speedWithProgressBar(bool toggled)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("speedWithProgressBar"),toggled);
+ optionsEngine->setOptionValue("speedWithProgressBar",std::to_string(toggled));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -237,7 +242,7 @@ void ThemesFactory::minimizeToSystray(bool checked)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("minimizeToSystray"),checked);
+ optionsEngine->setOptionValue("minimizeToSystray",std::to_string(checked));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -246,7 +251,7 @@ void ThemesFactory::alwaysOnTop(bool checked)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("alwaysOnTop"),checked);
+ optionsEngine->setOptionValue("alwaysOnTop",std::to_string(checked));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -255,7 +260,7 @@ void ThemesFactory::showDualProgression(bool checked)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("showDualProgression"),checked);
+ optionsEngine->setOptionValue("showDualProgression",std::to_string(checked));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -264,7 +269,7 @@ void ThemesFactory::startMinimized(bool checked)
{
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"the checkbox have changed");
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("startMinimized"),checked);
+ optionsEngine->setOptionValue("startMinimized",std::to_string(checked));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -275,7 +280,7 @@ void ThemesFactory::on_SliderSpeed_valueChanged(int value)
return;
if(!ui->checkBoxShowSpeed->isChecked())
return;
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("value: %1").arg(value));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"value: "+std::to_string(value));
switch(value)
{
case 0:
@@ -298,7 +303,7 @@ void ThemesFactory::on_SliderSpeed_valueChanged(int value)
break;
}
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
updateSpeed();
@@ -314,9 +319,9 @@ void ThemesFactory::uiUpdateSpeed()
currentSpeed=0;
else
currentSpeed=ui->limitSpeed->value();
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("emit newSpeedLimitation(%1)").arg(currentSpeed));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit newSpeedLimitation: "+std::to_string(currentSpeed));
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -333,12 +338,12 @@ void ThemesFactory::updateSpeed()
if(ui->checkBoxShowSpeed->isChecked())
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("checked, currentSpeed: %1").arg(currentSpeed));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"checked, currentSpeed: "+std::to_string(currentSpeed));
ui->limitSpeed->setEnabled(false);
if(currentSpeed==0)
{
ui->SliderSpeed->setValue(0);
- ui->label_SpeedMaxValue->setText(facilityEngine->translateText("Unlimited"));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->translateText("Unlimited")));
}
else if(currentSpeed<=1024)
{
@@ -346,12 +351,12 @@ void ThemesFactory::updateSpeed()
{
currentSpeed=1024;
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
ui->SliderSpeed->setValue(1);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*1));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*1)));
}
else if(currentSpeed<=1024*4)
{
@@ -359,12 +364,12 @@ void ThemesFactory::updateSpeed()
{
currentSpeed=1024*4;
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
ui->SliderSpeed->setValue(2);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*4));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*4)));
}
else if(currentSpeed<=1024*16)
{
@@ -372,12 +377,12 @@ void ThemesFactory::updateSpeed()
{
currentSpeed=1024*16;
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
ui->SliderSpeed->setValue(3);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*16));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*16)));
}
else if(currentSpeed<=1024*64)
{
@@ -385,12 +390,12 @@ void ThemesFactory::updateSpeed()
{
currentSpeed=1024*64;
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
ui->SliderSpeed->setValue(4);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*64));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*64)));
}
else
{
@@ -398,12 +403,12 @@ void ThemesFactory::updateSpeed()
{
currentSpeed=1024*128;
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("currentSpeed"),currentSpeed);
+ optionsEngine->setOptionValue("currentSpeed",std::to_string(currentSpeed));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
ui->SliderSpeed->setValue(5);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*128));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*128)));
}
}
else
@@ -426,7 +431,7 @@ void ThemesFactory::progressColorWrite_clicked()
pixmap.fill(progressColorWrite);
ui->progressColorWrite->setIcon(pixmap);
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("progressColorWrite"),progressColorWrite);
+ optionsEngine->setOptionValue("progressColorWrite",progressColorWrite.name().toStdString());
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -441,7 +446,7 @@ void ThemesFactory::progressColorRead_clicked()
pixmap.fill(progressColorRead);
ui->progressColorRead->setIcon(pixmap);
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("progressColorRead"),progressColorRead);
+ optionsEngine->setOptionValue("progressColorRead",progressColorRead.name().toStdString());
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -456,7 +461,7 @@ void ThemesFactory::progressColorRemaining_clicked()
pixmap.fill(progressColorRemaining);
ui->progressColorRemaining->setIcon(pixmap);
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("progressColorRemaining"),progressColorRemaining);
+ optionsEngine->setOptionValue("progressColorRemaining",progressColorRemaining.name().toStdString());
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
@@ -470,7 +475,7 @@ void ThemesFactory::updateProgressionColorBar()
void ThemesFactory::setShowProgressionInTheTitle()
{
if(optionsEngine!=NULL)
- optionsEngine->setOptionValue(QStringLiteral("showProgressionInTheTitle"),ui->showProgressionInTheTitle->isChecked());
+ optionsEngine->setOptionValue("showProgressionInTheTitle",std::to_string(ui->showProgressionInTheTitle->isChecked()));
else
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented");
}
diff --git a/plugins/Themes/Oxygen/ThemesFactory.h b/plugins/Themes/Oxygen/ThemesFactory.h
index 895e32d..f5e304f 100644
--- a/plugins/Themes/Oxygen/ThemesFactory.h
+++ b/plugins/Themes/Oxygen/ThemesFactory.h
@@ -38,11 +38,11 @@ public:
/// \brief to return the instance of the copy engine
PluginInterface_Themes * getInstance();
/// \brief set the resources, to store options, to have facilityInterface
- void setResources(OptionInterface * optionsEngine,const QString &
+ void setResources(OptionInterface * optionsEngine,const std::string &
#ifdef ULTRACOPIER_PLUGIN_DEBUG
writePath
#endif
- ,const QString &
+ ,const std::string &
#ifdef ULTRACOPIER_PLUGIN_DEBUG
pluginPath
#endif
@@ -50,7 +50,7 @@ public:
/// \brief to get the default options widget
QWidget * options();
/// \brief to get a resource icon
- QIcon getIcon(const QString &fileName) const;
+ QIcon getIcon(const std::string &fileName) const;
private slots:
void checkBoxShowSpeedHaveChanged(bool toggled);
void checkBoxStartWithMoreButtonPushedHaveChanged(bool toggled);
@@ -77,7 +77,7 @@ private:
Ui::themesOptions *ui;
QWidget *tempWidget;
FacilityInterface * facilityEngine;
- qint32 currentSpeed;///< in KB/s, assume as 0KB/s as default like every where
+ int32_t currentSpeed;///< in KB/s, assume as 0KB/s as default like every where
QColor progressColorWrite,progressColorRead,progressColorRemaining;
signals:
void reloadLanguage() const;
diff --git a/plugins/Themes/Oxygen/TransferModel.cpp b/plugins/Themes/Oxygen/TransferModel.cpp
index ff09d93..2959598 100644
--- a/plugins/Themes/Oxygen/TransferModel.cpp
+++ b/plugins/Themes/Oxygen/TransferModel.cpp
@@ -1,4 +1,5 @@
#include "TransferModel.h"
+#include "../../../cpp11addition.h"
#define COLUMN_COUNT 3
@@ -35,24 +36,24 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const
int row,column;
row=index.row();
column=index.column();
- if(index.parent()!=QModelIndex() || row < 0 || row >= transfertItemList.count() || column < 0 || column >= COLUMN_COUNT)
+ if(index.parent()!=QModelIndex() || row < 0 || (unsigned int)row >= transfertItemList.size() || column < 0 || column >= COLUMN_COUNT)
return QVariant();
const TransfertItem& item = transfertItemList.at(row);
if(role==Qt::UserRole)
- return item.id;
+ return (quint64)item.id;
else if(role==Qt::DisplayRole)
{
switch(column)
{
case 0:
- return item.source;
+ return QString::fromStdString(item.source);
break;
case 1:
- return item.size;
+ return QString::fromStdString(item.size);
break;
case 2:
- return item.destination;
+ return QString::fromStdString(item.destination);
break;
default:
return QVariant();
@@ -63,9 +64,9 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const
switch(column)
{
case 0:
- if(stopId.contains(item.id))
+ if(stopId.find(item.id)!=stopId.cend())
return *stop;
- else if(startId.contains(item.id))
+ else if(startId.find(item.id)!=startId.cend())
return *start;
else
return QVariant();
@@ -76,7 +77,8 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const
}
else if(role==Qt::BackgroundRole)
{
- if(!search_text.isEmpty() && (item.source.indexOf(search_text,0,Qt::CaseInsensitive)!=-1 || item.destination.indexOf(search_text,0,Qt::CaseInsensitive)!=-1))
+ if(!search_text.empty() && (item.source.find(search_text)!=std::string::npos ||
+ item.destination.find(search_text)!=std::string::npos))
{
if(haveSearchItem && searchId==item.id)
return QColor(255,150,150,100);
@@ -91,13 +93,13 @@ QVariant TransferModel::data( const QModelIndex& index, int role ) const
int TransferModel::rowCount( const QModelIndex& parent ) const
{
- return parent == QModelIndex() ? transfertItemList.count() : 0;
+ return parent == QModelIndex() ? transfertItemList.size() : 0;
}
-quint64 TransferModel::firstId() const
+uint64_t TransferModel::firstId() const
{
- if(transfertItemList.count()>0)
- return transfertItemList.first().id;
+ if(transfertItemList.size()>0)
+ return transfertItemList.front().id;
else
return 0;
}
@@ -109,11 +111,11 @@ QVariant TransferModel::headerData( int section, Qt::Orientation orientation, in
if ( role == Qt::DisplayRole && orientation == Qt::Horizontal && section >= 0 && section < COLUMN_COUNT ) {
switch ( section ) {
case 0:
- return facilityEngine->translateText(QStringLiteral("Source"));
+ return QString::fromStdString(facilityEngine->translateText("Source"));
case 1:
- return facilityEngine->translateText(QStringLiteral("Size"));
+ return QString::fromStdString(facilityEngine->translateText("Size"));
case 2:
- return facilityEngine->translateText(QStringLiteral("Destination"));
+ return QString::fromStdString(facilityEngine->translateText("Destination"));
}
}
@@ -124,7 +126,7 @@ bool TransferModel::setData( const QModelIndex& index, const QVariant& value, in
{
row=index.row();
column=index.column();
- if(index.parent()!=QModelIndex() || row < 0 || row >= transfertItemList.count() || column < 0 || column >= COLUMN_COUNT)
+ if(index.parent()!=QModelIndex() || row < 0 || (unsigned int)row >= transfertItemList.size() || column < 0 || column >= COLUMN_COUNT)
return false;
TransfertItem& item = transfertItemList[row];
@@ -138,17 +140,17 @@ bool TransferModel::setData( const QModelIndex& index, const QVariant& value, in
switch(column)
{
case 0:
- item.source=value.toString();
+ item.source=value.toString().toStdString();
emit dataChanged(index,index);
return true;
break;
case 1:
- item.size=value.toString();
+ item.size=value.toString().toStdString();
emit dataChanged(index,index);
return true;
break;
case 2:
- item.destination=value.toString();
+ item.destination=value.toString().toStdString();
emit dataChanged(index,index);
return true;
break;
@@ -164,7 +166,7 @@ bool TransferModel::setData( const QModelIndex& index, const QVariant& value, in
Return[1]: totalSize
Return[2]: currentFile
*/
-QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnActionOnCopyList>& returnActions)
+std::vector<uint64_t> TransferModel::synchronizeItems(const std::vector<Ultracopier::ReturnActionOnCopyList>& returnActions)
{
const QModelIndexList oldIndexes = persistentIndexList();
QModelIndexList newIndexes=oldIndexes;
@@ -191,7 +193,7 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
newItem.source=action.addAction.sourceFullPath;
newItem.size=facilityEngine->sizeToString(action.addAction.size);
newItem.destination=action.addAction.destinationFullPath;
- transfertItemList<<newItem;
+ transfertItemList.push_back(newItem);
totalFile++;
totalSize+=action.addAction.size;
}
@@ -201,30 +203,32 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
//bool current_entry=
if(action.userAction.position<0)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
- if(action.userAction.position>(transfertItemList.size()-1))
+ if((unsigned int)action.userAction.position>(transfertItemList.size()-1))
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
if(action.userAction.moveAt<0)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
- if(action.userAction.moveAt>(transfertItemList.size()-1))
+ if((unsigned int)action.userAction.moveAt>(transfertItemList.size()-1))
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, position is wrong: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
if(action.userAction.position==action.userAction.moveAt)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, move at same position: %2").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("id: %1, move at same position: %2").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
- transfertItemList.move(action.userAction.position,action.userAction.moveAt);
+ const TransfertItem transfertItem=transfertItemList.at(action.userAction.position);
+ transfertItemList.erase(transfertItemList.cbegin()+action.userAction.position);
+ transfertItemList.insert(transfertItemList.cbegin()+action.userAction.moveAt,transfertItem);
//newIndexes.move(action.userAction.position,action.userAction.moveAt);
}
break;
@@ -234,19 +238,19 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
currentIndexSearch--;
if(action.userAction.position<0)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
- if(action.userAction.position>(transfertItemList.size()-1))
+ if((unsigned int)action.userAction.position>(transfertItemList.size()-1))
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("id: %1, position is wrong: %3").arg(action.addAction.id).arg(action.userAction.position).toStdString());
break;
}
- transfertItemList.removeAt(action.userAction.position);
+ transfertItemList.erase(transfertItemList.cbegin()+action.userAction.position);
currentFile++;
- startId.remove(action.addAction.id);
- stopId.remove(action.addAction.id);
- internalRunningOperation.remove(action.addAction.id);
+ startId.erase(action.addAction.id);
+ stopId.erase(action.addAction.id);
+ internalRunningOperation.erase(action.addAction.id);
//newIndexes.remove(action.userAction.moveAt);
}
break;
@@ -262,20 +266,20 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
break;
case Ultracopier::Transfer:
{
- if(!startId.contains(action.addAction.id))
- startId << action.addAction.id;
- stopId.remove(action.addAction.id);
- if(internalRunningOperation.contains(action.addAction.id))
+ if(startId.find(action.addAction.id)==startId.cend())
+ startId.insert(action.addAction.id);
+ stopId.erase(action.addAction.id);
+ if(internalRunningOperation.find(action.addAction.id)!=internalRunningOperation.cend())
internalRunningOperation[action.addAction.id].actionType=action.type;
else
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to found entry for file %1: actionType: Transfer").arg(action.addAction.id));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unable to found entry for file %1: actionType: Transfer").arg(action.addAction.id).toStdString());
}
break;
case Ultracopier::PostOperation:
{
- if(!stopId.contains(action.addAction.id))
- stopId << action.addAction.id;
- startId.remove(action.addAction.id);
+ if(stopId.find(action.addAction.id)==stopId.cend())
+ stopId.insert(action.addAction.id);
+ startId.erase(action.addAction.id);
}
break;
case Ultracopier::CustomOperation:
@@ -284,18 +288,21 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
//without progression
if(custom_with_progression)
{
- if(startId.remove(action.addAction.id))
- if(!stopId.contains(action.addAction.id))
- stopId << action.addAction.id;
+ if(startId.find(action.addAction.id)!=startId.cend())
+ {
+ startId.erase(action.addAction.id);
+ if(stopId.find(action.addAction.id)==stopId.cend())
+ stopId.insert(action.addAction.id);
+ }
}
//with progression
else
{
- stopId.remove(action.addAction.id);
- if(!startId.contains(action.addAction.id))
- startId << action.addAction.id;
+ stopId.erase(action.addAction.id);
+ if(startId.find(action.addAction.id)==startId.cend())
+ startId.insert(action.addAction.id);
}
- if(internalRunningOperation.contains(action.addAction.id))
+ if(internalRunningOperation.find(action.addAction.id)!=internalRunningOperation.cend())
{
ItemOfCopyListWithMoreInformations &item=internalRunningOperation[action.addAction.id];
item.actionType=action.type;
@@ -316,7 +323,7 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
{
const QSet<quint64> ids = oldMapping.values().toSet();
- for ( int i = 0; i < transfertItemList.count(); i++ ) {
+ for ( unsigned int i = 0; i < transfertItemList.size(); i++ ) {
const TransferModel::TransfertItem& item = transfertItemList.at(i);
if ( ids.contains( item.id ) ) {
@@ -333,7 +340,14 @@ QList<quint64> TransferModel::synchronizeItems(const QList<Ultracopier::ReturnAc
changePersistentIndexList( oldIndexes, newIndexes );
emit layoutChanged();
- return QList<quint64>() << totalFile << totalSize << currentFile;
+ {
+ std::vector<uint64_t> newList;
+ newList.resize(3);
+ newList[0]=totalFile;
+ newList[1]=totalSize;
+ newList[2]=currentFile;
+ return newList;
+ }
}
void TransferModel::setFacilityEngine(FacilityInterface * facilityEngine)
@@ -341,14 +355,14 @@ void TransferModel::setFacilityEngine(FacilityInterface * facilityEngine)
this->facilityEngine=facilityEngine;
}
-int TransferModel::search(const QString &text,bool searchNext)
+int TransferModel::search(const std::string &text, bool searchNext)
{
emit layoutAboutToBeChanged();
search_text=text;
emit layoutChanged();
if(transfertItemList.size()==0)
return -1;
- if(text.isEmpty())
+ if(text.empty())
return -1;
if(searchNext)
{
@@ -360,7 +374,9 @@ int TransferModel::search(const QString &text,bool searchNext)
loop_size=transfertItemList.size();
while(index_for_loop<loop_size)
{
- if(transfertItemList.at(currentIndexSearch).source.indexOf(search_text,0,Qt::CaseInsensitive)!=-1 || transfertItemList.at(currentIndexSearch).destination.indexOf(search_text,0,Qt::CaseInsensitive)!=-1)
+ const TransfertItem &transfertItem=transfertItemList.at(currentIndexSearch);
+ if(transfertItem.source.find(search_text)!=std::string::npos ||
+ transfertItem.destination.find(search_text)!=std::string::npos)
{
haveSearchItem=true;
searchId=transfertItemList.at(currentIndexSearch).id;
@@ -375,14 +391,14 @@ int TransferModel::search(const QString &text,bool searchNext)
return -1;
}
-int TransferModel::searchPrev(const QString &text)
+int TransferModel::searchPrev(const std::string &text)
{
emit layoutAboutToBeChanged();
search_text=text;
emit layoutChanged();
if(transfertItemList.size()==0)
return -1;
- if(text.isEmpty())
+ if(text.empty())
return -1;
if(currentIndexSearch==0)
currentIndexSearch=loop_size-1;
@@ -392,7 +408,9 @@ int TransferModel::searchPrev(const QString &text)
loop_size=transfertItemList.size();
while(index_for_loop<loop_size)
{
- if(transfertItemList.at(currentIndexSearch).source.indexOf(search_text,0,Qt::CaseInsensitive)!=-1 || transfertItemList.at(currentIndexSearch).destination.indexOf(search_text,0,Qt::CaseInsensitive)!=-1)
+ const TransfertItem &transfertItem=transfertItemList.at(currentIndexSearch);
+ if(transfertItem.source.find(search_text)!=std::string::npos ||
+ transfertItem.destination.find(search_text)!=std::string::npos)
{
haveSearchItem=true;
searchId=transfertItemList.at(currentIndexSearch).id;
@@ -408,19 +426,19 @@ int TransferModel::searchPrev(const QString &text)
return -1;
}
-void TransferModel::setFileProgression(QList<Ultracopier::ProgressionItem> &progressionList)
+void TransferModel::setFileProgression(std::vector<Ultracopier::ProgressionItem> &progressionList)
{
loop_size=progressionList.size();
index_for_loop=0;
while(index_for_loop<loop_size)
{
- if(internalRunningOperation.contains(progressionList.at(index_for_loop).id))
+ if(internalRunningOperation.find(progressionList.at(index_for_loop).id)!=internalRunningOperation.cend())
{
internalRunningOperation[progressionList.at(index_for_loop).id].generalData.size=progressionList.at(index_for_loop).total;
internalRunningOperation[progressionList.at(index_for_loop).id].currentReadProgression=progressionList.at(index_for_loop).currentRead;
internalRunningOperation[progressionList.at(index_for_loop).id].currentWriteProgression=progressionList.at(index_for_loop).currentWrite;
#ifdef ULTRACOPIER_PLUGIN_DEBUG
- progressionList.removeAt(index_for_loop);
+ progressionList.erase(progressionList.cbegin()+index_for_loop);
index_for_loop--;
loop_size--;
#endif
@@ -429,7 +447,7 @@ void TransferModel::setFileProgression(QList<Ultracopier::ProgressionItem> &prog
}
#ifdef ULTRACOPIER_PLUGIN_DEBUG
if(progressionList.size()>0)
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("progression remaning items"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"progression remaning items");
#endif
}
@@ -441,15 +459,15 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con
returnItem.haveItem=startId.size()>0;
if(returnItem.haveItem)
{
- if(!internalRunningOperation.contains(*startId.constBegin()))
+ if(internalRunningOperation.find(*startId.cbegin())==internalRunningOperation.cend())
{
returnItem.haveItem=false;
return returnItem;
}
- const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.value(*startId.constBegin());
+ const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.at(*startId.cbegin());
returnItem.from=itemTransfer.generalData.sourceFullPath;
returnItem.to=itemTransfer.generalData.destinationFullPath;
- returnItem.current_file=itemTransfer.generalData.destinationFileName+QStringLiteral(", ")+facilityEngine->sizeToString(itemTransfer.generalData.size);
+ returnItem.current_file=itemTransfer.generalData.destinationFileName+", "+facilityEngine->sizeToString(itemTransfer.generalData.size);
returnItem.id=itemTransfer.generalData.id;
switch(itemTransfer.actionType)
{
@@ -481,20 +499,20 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con
break;
//should never pass here
case Ultracopier::PostOperation:
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString());
returnItem.progressBar_read=65535;
returnItem.progressBar_write=65535;
break;
//should never pass here
case Ultracopier::PreOperation:
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString());
returnItem.progressBar_read=0;
returnItem.progressBar_write=0;
break;
default:
returnItem.progressBar_read=0;
returnItem.progressBar_write=0;
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString());
break;
}
}
@@ -503,15 +521,15 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con
returnItem.haveItem=stopId.size()>0;
if(returnItem.haveItem)
{
- if(!internalRunningOperation.contains(*stopId.constBegin()))
+ if(internalRunningOperation.find(*stopId.cbegin())==internalRunningOperation.cend())
{
returnItem.haveItem=false;
return returnItem;
}
- const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.value(*stopId.constBegin());
+ const ItemOfCopyListWithMoreInformations &itemTransfer=internalRunningOperation.at(*stopId.cbegin());
returnItem.from=itemTransfer.generalData.sourceFullPath;
returnItem.to=itemTransfer.generalData.destinationFullPath;
- returnItem.current_file=itemTransfer.generalData.destinationFileName+QStringLiteral(", ")+facilityEngine->sizeToString(itemTransfer.generalData.size);
+ returnItem.current_file=itemTransfer.generalData.destinationFileName+", "+facilityEngine->sizeToString(itemTransfer.generalData.size);
returnItem.id=itemTransfer.generalData.id;
switch(itemTransfer.actionType)
{
@@ -542,20 +560,20 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con
}
break;
case Ultracopier::PostOperation:
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString());
returnItem.progressBar_read=65535;
returnItem.progressBar_write=65535;
break;
//should never pass here
case Ultracopier::PreOperation:
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString());
returnItem.progressBar_read=0;
returnItem.progressBar_write=0;
break;
default:
returnItem.progressBar_read=65535;
returnItem.progressBar_write=65535;
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("unknow action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString());
break;
}
}
diff --git a/plugins/Themes/Oxygen/TransferModel.h b/plugins/Themes/Oxygen/TransferModel.h
index d2a4a1c..e572f9e 100644
--- a/plugins/Themes/Oxygen/TransferModel.h
+++ b/plugins/Themes/Oxygen/TransferModel.h
@@ -9,6 +9,10 @@
#include <QSet>
#include <QIcon>
#include <QString>
+#include <unordered_map>
+#include <unordered_set>
+#include <set>
+#include <vector>
#include "StructEnumDefinition.h"
#include "Environment.h"
@@ -23,15 +27,15 @@ public:
/// \brief the transfer item displayed
struct TransfertItem
{
- quint64 id;
- QString source;
- QString size;
- QString destination;
+ uint64_t id;
+ std::string source;
+ std::string size;
+ std::string destination;
};
/// \brief the transfer item with progression
struct ItemOfCopyListWithMoreInformations
{
- quint64 currentReadProgression,currentWriteProgression;
+ uint64_t currentReadProgression,currentWriteProgression;
Ultracopier::ItemOfCopyList generalData;
Ultracopier::ActionTypeCopyList actionType;
bool custom_with_progression;
@@ -39,11 +43,11 @@ public:
/// \brief returned first transfer item
struct currentTransfertItem
{
- quint64 id;
+ uint64_t id;
bool haveItem;
- QString from;
- QString to;
- QString current_file;
+ std::string from;
+ std::string to;
+ std::string current_file;
int progressBar_read,progressBar_write;
};
@@ -55,37 +59,37 @@ public:
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
- QList<quint64> synchronizeItems(const QList<Ultracopier::ReturnActionOnCopyList>& returnActions);
+ std::vector<uint64_t> synchronizeItems(const std::vector<Ultracopier::ReturnActionOnCopyList>& returnActions);
void setFacilityEngine(FacilityInterface * facilityEngine);
- int search(const QString &text,bool searchNext);
- int searchPrev(const QString &text);
+ int search(const std::string &text,bool searchNext);
+ int searchPrev(const std::string &text);
- void setFileProgression(QList<Ultracopier::ProgressionItem> &progressionList);
+ void setFileProgression(std::vector<Ultracopier::ProgressionItem> &progressionList);
currentTransfertItem getCurrentTransfertItem() const;
- quint64 firstId() const;
+ uint64_t firstId() const;
protected:
- QList<TransfertItem> transfertItemList;///< To have a transfer list for the user
- QSet<quint64> startId,stopId;///< To show what is started, what is stopped
- QHash<quint64,ItemOfCopyListWithMoreInformations> internalRunningOperation;///< to have progression and stat
+ std::vector<TransfertItem> transfertItemList;///< To have a transfer list for the user
+ std::set<uint64_t> startId,stopId;///< To show what is started, what is stopped
+ std::unordered_map<uint64_t,ItemOfCopyListWithMoreInformations> internalRunningOperation;///< to have progression and stat
private:
int loop_size,index_for_loop;
int sub_loop_size,sub_index_for_loop;
int row,column;
FacilityInterface * facilityEngine;
- QString search_text;
+ std::string search_text;
/// \brief index from start the search, decresed by remove before it
int currentIndexSearch;
bool haveSearchItem;
- quint64 searchId;
+ uint64_t searchId;
static QIcon *start;
static QIcon *stop;
signals:
#ifdef ULTRACOPIER_PLUGIN_DEBUG
/// \brief To debug source
- void debugInformation(const Ultracopier::DebugLevel &level,QString fonction,QString text,QString file,int ligne) const;
+ void debugInformation(const Ultracopier::DebugLevel &level,std::string fonction,std::string text,std::string file,int ligne) const;
#endif
};
diff --git a/plugins/Themes/Oxygen/documentation.dox b/plugins/Themes/Oxygen/documentation.dox
index 629330b..d94ce0b 100644
--- a/plugins/Themes/Oxygen/documentation.dox
+++ b/plugins/Themes/Oxygen/documentation.dox
@@ -10,7 +10,7 @@
\section mainpage_overview Overview
- It's the default interface for Ultracopier. The first version, it's greatly inspirated by Supercopier. But have well evolued.\n
+ It's the default interface for Ultracopier.\n
More informations on <a href="http://ultracopier-wiki.first-world.info/">the wiki of ultracopier</a>.
\section mainpage_platforms Platforms
@@ -20,7 +20,7 @@
\section mainpage_downloads Downloads
- You can found link on <a href="http://ultracopier.first-world.info/">Ultracopier (Supercopier/Teracopy)</a> project page, via git, snapshot sources, ...
+ You can find the link on <a href="http://ultracopier.first-world.info/">Ultracopier</a> project page, via git, snapshot sources, ...
\section license GPL Version 3
The code source is under GPL3. The image is extacted from Oxygen icon pack of KDE4.\n
@@ -29,4 +29,3 @@
And 16x16/categories/applications-development.png -> SystemTrayIcon/options.png
*/
-
diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml
index d81313d..6cfe489 100644
--- a/plugins/Themes/Oxygen/informations.xml
+++ b/plugins/Themes/Oxygen/informations.xml
@@ -17,7 +17,7 @@
<description xml:lang="en"><![CDATA[Oxygen style for Ultracopier]]></description>
<description xml:lang="fr"><![CDATA[Style oxygen pour Ultracopier]]></description>
<!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
- <version>1.2.3.6</version>
+ <version>1.4.0.3</version>
<!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
<name>Oxygen</name>
<!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
diff --git a/plugins/Themes/Oxygen/interface.cpp b/plugins/Themes/Oxygen/interface.cpp
index 703f3b2..84b4dd6 100644
--- a/plugins/Themes/Oxygen/interface.cpp
+++ b/plugins/Themes/Oxygen/interface.cpp
@@ -8,7 +8,10 @@
#include <QColorDialog>
#include <QRect>
#include <QPainter>
+#include <QDebug>
#include <cmath>
+#include <chrono>
+#include <ctime>
#ifdef Q_OS_WIN
#ifndef NOMINMAX
#define NOMINMAX
@@ -158,6 +161,12 @@ Themes::Themes(const bool &alwaysOnTop,
/// \note important for drag and drop, \see dropEvent()
setAcceptDrops(true);
+ #ifdef SUPERCOPIER
+ const QString themePath=":/Themes/Supercopier/";
+ #else
+ const QString themePath=":/Themes/Oxygen/";
+ #endif
+
// try set the OS icon
if(!iconLoaded)
{
@@ -166,10 +175,10 @@ Themes::Themes(const bool &alwaysOnTop,
editDelete=QIcon::fromTheme(QStringLiteral("edit-delete"));
player_pause=QIcon::fromTheme(QStringLiteral("media-playback-pause"));
if(player_pause.isNull())
- player_pause=QIcon(QStringLiteral(":/Themes/Oxygen/resources/player_pause.png"));
+ player_pause=QIcon(themePath+QStringLiteral("resources/player_pause.png"));
player_play=QIcon::fromTheme(QStringLiteral("media-playback-play"));
if(player_play.isNull())
- player_play=QIcon(QStringLiteral(":/Themes/Oxygen/resources/player_play.png"));
+ player_play=QIcon(themePath+QStringLiteral("resources/player_play.png"));
skinIcon=QIcon::fromTheme(QStringLiteral("media-skip-forward"));
editFind=QIcon::fromTheme(QStringLiteral("edit-find"));
documentOpen=QIcon::fromTheme(QStringLiteral("document-open"));
@@ -208,14 +217,68 @@ Themes::Themes(const bool &alwaysOnTop,
ui->actionAddFolderToMove->setIcon(listAdd);
}
#ifdef Q_OS_WIN32
- pixmapTop=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Uncaught_Windows.png"));
- pixmapBottom=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Caught_Windows.png"));
+ pixmapTop=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Uncaught_Windows.png"));
+ pixmapBottom=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Caught_Windows.png"));
#else
- pixmapTop=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Uncaught_Unix.png"));
- pixmapBottom=QPixmap(QStringLiteral(":/Themes/Oxygen/resources/SystemTrayIcon/systray_Caught_Unix.png"));
+ pixmapTop=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Uncaught_Unix.png"));
+ pixmapBottom=QPixmap(themePath+QStringLiteral("resources/SystemTrayIcon/systray_Caught_Unix.png"));
#endif
- shutdown=facilityEngine->haveFunctionality(QStringLiteral("shutdown"));
+ #ifdef SUPERCOPIER
+ /*QIcon icon;
+ icon.addFile(themePath+QStringLiteral("resources/main.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->interfaceCopy->setWindowIcon(icon);*/
+ QIcon icon1;
+ icon1.addFile(themePath+QStringLiteral("resources/add.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->actionAddFile->setIcon(icon1);
+ QIcon icon2;
+ icon2.addFile(themePath+QStringLiteral("resources/SystemTrayIcon/exit.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->shutdown->setIcon(icon2);
+ QIcon icon3;
+ icon3.addFile(themePath+QStringLiteral("resources/moveDown.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->moreButton->setIcon(icon3);
+ ui->pushDown->setIcon(icon3);
+ if(!QFile::exists(themePath+QStringLiteral("resources/moveDown.png")))
+ {
+ qDebug() << "File not found, can't continue: " << themePath+QStringLiteral("resources/moveDown.png");
+ abort();
+ }
+ QIcon icon4;
+ icon4.addFile(themePath+QStringLiteral("resources/player_pause.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->pauseButton->setIcon(icon4);
+ QIcon icon5;
+ icon5.addFile(themePath+QStringLiteral("resources/player_end.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->skipButton->setIcon(icon5);
+ QIcon icon6;
+ icon6.addFile(themePath+QStringLiteral("resources/cancel.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->cancelButton->setIcon(icon6);
+ QIcon icon7;
+ icon7.addFile(themePath+QStringLiteral("resources/putOnTop.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->putOnTop->setIcon(icon7);
+ QIcon icon8;
+ icon8.addFile(themePath+QStringLiteral("resources/moveUp.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->pushUp->setIcon(icon8);
+ QIcon icon9;
+ icon9.addFile(themePath+QStringLiteral("resources/putOnBottom.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->putOnBottom->setIcon(icon9);
+ QIcon icon10;
+ icon10.addFile(themePath+QStringLiteral("resources/remove.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->del->setIcon(icon10);
+ QIcon icon11;
+ icon11.addFile(themePath+QStringLiteral("resources/search.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->searchButton->setIcon(icon11);
+ QIcon icon12;
+ icon12.addFile(themePath+QStringLiteral("resources/export-transfer-list.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->exportTransferList->setIcon(icon12);
+ QIcon icon13;
+ icon13.addFile(themePath+QStringLiteral("resources/import-transfer-list.png"), QSize(), QIcon::Normal, QIcon::Off);
+ ui->importTransferList->setIcon(icon13);
+ QIcon icon14;
+ icon14.addFile(themePath+QStringLiteral("resources/main.png"), QSize(), QIcon::Normal, QIcon::Off);
+ this->setWindowIcon(icon14);
+ #endif
+
+ shutdown=facilityEngine->haveFunctionality("shutdown");
ui->shutdown->setVisible(shutdown);
selectionModel=ui->TransferList->selectionModel();
@@ -231,13 +294,43 @@ Themes::Themes(const bool &alwaysOnTop,
uiOptions->alwaysOnTop->hide();
#endif*/
#ifdef ULTRACOPIER_VERSION_ULTIMATE
- ui->ad_ultimate->hide();
+ #ifdef SUPERCOPIER
+ ui->ad_ultimate->setText(tr("%1 is deprecated, Use %2").arg("<span style=\"color:#ee0000\">Super</span><span style=\"color:#0000cc\">Copier</span>").arg("<a href=\"http://ultracopier.first-world.info/\">Ultracopier</a>"));
+ #else
+ #ifdef Q_OS_MACOS
+ ui->ad_ultimate->setText(tr("This will be the last version for Mac, but you can compile from source"));
+ #else
+ ui->ad_ultimate->hide();
+ #endif
+ #endif
#else
- QString ultimateUrl=facilityEngine->ultimateUrl();
+ QString ultimateUrl=QString::fromStdString(facilityEngine->ultimateUrl());
if(ultimateUrl.isEmpty())
ui->ad_ultimate->hide();
else
- ui->ad_ultimate->setText(QStringLiteral("<a href=\"%1\">%2</a>").arg(ultimateUrl).arg(tr("Buy the Ultimate version to fund development")));
+ ui->ad_ultimate->setText(
+ #ifdef SUPERCOPIER
+ tr("%1 is deprecated, Use %2").arg("<span style=\"color:#ee0000\">Super</span><span style=\"color:#0000cc\">copier</span>").arg("<a href=\"http://ultracopier.first-world.info/\">Ultracopier</a><br />")+
+ #endif
+ #ifdef Q_OS_MACOS
+ tr("This will be the last version for Mac, but you can compile from source")+
+ #endif
+ QStringLiteral("<a href=\"%1\">%2</a>").arg(ultimateUrl).arg(tr("Buy the Ultimate version to fund development")));
+ #endif
+
+ #ifdef SUPERCOPIER
+ uiOptions->labelDualProgression->hide();
+ uiOptions->showDualProgression->hide();
+ ui->progressBar_all->setMaximumHeight(17);
+ ui->progressBar_file->setMaximumHeight(17);
+ ui->progressBarCurrentSpeed->setMaximumHeight(17);
+ ui->progressBar_all->setMinimumHeight(17);
+ ui->progressBar_file->setMinimumHeight(17);
+ ui->progressBarCurrentSpeed->setMinimumHeight(17);
+ ui->progressBar_all->setStyleSheet(QStringLiteral("QProgressBar{color:#fff;font-weight:bold;border:1px solid black;text-align:center;background-image:url(:/Themes/Supercopier/resources/progressbarright.png);}QProgressBar::chunk{background-image: url(:/Themes/Supercopier/resources/progressbarleft.png);}"));
+ ui->progressBar_file->setStyleSheet(QStringLiteral("QProgressBar{color:#fff;font-weight:bold;border:1px solid black;text-align:center;background-image:url(:/Themes/Supercopier/resources/progressbarright.png);}QProgressBar::chunk{background-image: url(:/Themes/Supercopier/resources/progressbarleft.png);}"));
+ ui->progressBarCurrentSpeed->setStyleSheet(QStringLiteral("QProgressBar{color:#fff;font-weight:bold;border:1px solid black;text-align:center;background-image:url(:/Themes/Supercopier/resources/progressbarright.png);}QProgressBar::chunk{background-image: url(:/Themes/Supercopier/resources/progressbarleft.png);}"));
+ this->setWindowTitle("Supercopier");
#endif
show();
@@ -248,7 +341,7 @@ Themes::Themes(const bool &alwaysOnTop,
Themes::~Themes()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
//disconnect(ui->actionAddFile);
//disconnect(ui->actionAddFolder);
delete selectionModel;
@@ -268,14 +361,14 @@ void Themes::getOptionsEngineEnabled(const bool &isEnabled)
QScrollArea *scrollArea=new QScrollArea(ui->tabWidget);
scrollArea->setWidgetResizable(true);
scrollArea->setWidget(&optionEngineWidget);
- ui->tabWidget->addTab(scrollArea,facilityEngine->translateText(QStringLiteral("Copy engine")));
+ ui->tabWidget->addTab(scrollArea,QString::fromStdString(facilityEngine->translateText("Copy engine")));
}
}
void Themes::closeEvent(QCloseEvent *event)
{
event->ignore();
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
this->hide();
if(uiOptions->minimizeToSystray->isChecked())
{
@@ -290,7 +383,7 @@ void Themes::updateSysTrayIcon()
{
if(totalSize==0)
{
- sysTrayIcon->setIcon(dynaIcon(0,QStringLiteral("-")));
+ sysTrayIcon->setIcon(dynaIcon(0,"-"));
return;
}
quint64 currentNew=currentSize*100;
@@ -307,12 +400,17 @@ void Themes::updateOverallInformation()
{
if(uiOptions->showProgressionInTheTitle->isChecked())
updateTitle();
- ui->overall->setText(tr("File %1/%2, size: %3/%4").arg(currentFile).arg(totalFile).arg(facilityEngine->sizeToString(currentSize)).arg(facilityEngine->sizeToString(totalSize)));
+ ui->overall->setText(tr("File %1/%2, size: %3/%4")
+ .arg(currentFile)
+ .arg(totalFile)
+ .arg(QString::fromStdString(facilityEngine->sizeToString(currentSize)))
+ .arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))
+ );
}
void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("start: ")+QString::number(action));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"start: "+std::to_string(action));
this->action=action;
switch(action)
{
@@ -332,7 +430,7 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action)
{
if(shutdown && ui->shutdown->isChecked())
{
- facilityEngine->callFunctionality(QStringLiteral("shutdown"));
+ facilityEngine->callFunctionality("shutdown");
return;
}
switch(uiOptions->comboBox_copyEnd->currentIndex())
@@ -352,9 +450,16 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action)
stat = status_stopped;
if(durationStarted)
{
- Ultracopier::TimeDecomposition time=facilityEngine->secondsToTimeDecomposition(duration.elapsed()/1000);
- ui->labelTimeRemaining->setText(QStringLiteral("<html><body style=\"white-space:nowrap;\">")+facilityEngine->translateText(QStringLiteral("Completed in %1")).arg(
- QString::number(time.hour)+QStringLiteral(":")+QString::number(time.minute).rightJustified(2,'0')+QStringLiteral(":")+QString::number(time.second).rightJustified(2,'0')
+ Ultracopier::TimeDecomposition time=facilityEngine->secondsToTimeDecomposition(
+ (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()-
+ duration)
+ /1000);
+ ui->labelTimeRemaining->setText(QStringLiteral("<html><body style=\"white-space:nowrap;\">")+
+ QString::fromStdString(facilityEngine->translateText("Completed in %1")).arg(
+ QString::number(time.hour)+QStringLiteral(":")+
+ QString::number(time.minute).rightJustified(2,'0')+
+ QStringLiteral(":")+
+ QString::number(time.second).rightJustified(2,'0')
)+QStringLiteral("</body></html>"));
}
}
@@ -370,11 +475,11 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action)
ui->pauseButton->setEnabled(true);
if(!durationStarted)
{
- duration.start();
+ duration=std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
durationStarted=true;
}
haveStarted=true;
- ui->cancelButton->setText(facilityEngine->translateText(QStringLiteral("Quit")));
+ ui->cancelButton->setText(QString::fromStdString(facilityEngine->translateText("Quit")));
updatePause();
break;
case Ultracopier::Listing:
@@ -389,17 +494,17 @@ void Themes::actionInProgess(const Ultracopier::EngineActionInProgress &action)
}
}
-void Themes::newFolderListing(const QString &path)
+void Themes::newFolderListing(const std::string &path)
{
- QString newPath=path;
+ QString newPath=QString::fromStdString(path);
if(newPath.size()>(64+3))
newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32);
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
if(action==Ultracopier::Listing)
ui->from->setText(newPath);
}
-void Themes::detectedSpeed(const quint64 &speed)//in byte per seconds
+void Themes::detectedSpeed(const uint64_t &speed)//in byte per seconds
{
if(uiOptions->speedWithProgressBar->isChecked())
{
@@ -408,19 +513,23 @@ void Themes::detectedSpeed(const quint64 &speed)//in byte per seconds
tempSpeed=999999999;
if(tempSpeed>(quint64)ui->progressBarCurrentSpeed->maximum())
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set max speed to: %1").arg(tempSpeed));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set max speed to: "+std::to_string(tempSpeed));
ui->progressBarCurrentSpeed->setMaximum(tempSpeed);
}
ui->progressBarCurrentSpeed->setValue(tempSpeed);
- ui->progressBarCurrentSpeed->setFormat(facilityEngine->speedToString(speed));
+ ui->progressBarCurrentSpeed->setFormat(QString::fromStdString(facilityEngine->speedToString(speed)));
}
else
- ui->currentSpeed->setText(facilityEngine->speedToString(speed));
+ ui->currentSpeed->setText(QString::fromStdString(facilityEngine->speedToString(speed)));
}
void Themes::remainingTime(const int &remainingSeconds)
{
- QString labelTimeRemaining(QStringLiteral("<html><body style=\"white-space:nowrap;\">")+facilityEngine->translateText(QStringLiteral("Time remaining:"))+QStringLiteral(" "));
+ QString labelTimeRemaining(QStringLiteral(
+ "<html><body style=\"white-space:nowrap;\">")+
+ QString::fromStdString(facilityEngine->translateText("Time remaining:"))+
+ QStringLiteral(" ")
+ );
if(remainingSeconds==-1)
labelTimeRemaining+=QStringLiteral("&#8734;");
else
@@ -438,9 +547,13 @@ void Themes::errorDetected()
}
/// \brief new error
-void Themes::errorToRetry(const QString &source,const QString &destination,const QString &error)
+void Themes::errorToRetry(const std::string &source,const std::string &destination,const std::string &error)
{
- ui->errorList->addTopLevelItem(new QTreeWidgetItem(QStringList() << source << destination << error));
+ ui->errorList->addTopLevelItem(new QTreeWidgetItem(QStringList()
+ << QString::fromStdString(source)
+ << QString::fromStdString(destination)
+ << QString::fromStdString(error)
+ ));
}
/** \brief support speed limitation */
@@ -459,7 +572,7 @@ void Themes::setSupportSpeedLimitation(const bool &supportSpeedLimitationBool)
}
//get information about the copy
-void Themes::setGeneralProgression(const quint64 &current,const quint64 &total)
+void Themes::setGeneralProgression(const uint64_t &current,const uint64_t &total)
{
currentSize=current;
totalSize=total;
@@ -477,22 +590,22 @@ void Themes::setGeneralProgression(const quint64 &current,const quint64 &total)
updateSysTrayIcon();
}
-void Themes::setFileProgression(const QList<Ultracopier::ProgressionItem> &progressionList)
+void Themes::setFileProgression(const std::vector<Ultracopier::ProgressionItem> &progressionList)
{
- QList<Ultracopier::ProgressionItem> progressionListBis=progressionList;
+ std::vector<Ultracopier::ProgressionItem> progressionListBis=progressionList;
transferModel.setFileProgression(progressionListBis);
updateCurrentFileInformation();
}
//edit the transfer list
/// \todo check and re-enable to selection
-void Themes::getActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &returnActions)
+void Themes::getActionOnList(const std::vector<Ultracopier::ReturnActionOnCopyList> &returnActions)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start, returnActions.size(): ")+QString::number(returnActions.size()));
- QList<quint64> returnValue=transferModel.synchronizeItems(returnActions);
- totalFile+=returnValue.first();
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start, returnActions.size(): "+std::to_string(returnActions.size()));
+ std::vector<uint64_t> returnValue=transferModel.synchronizeItems(returnActions);
+ totalFile+=returnValue.front();
totalSize+=returnValue.at(1);
- currentFile+=returnValue.last();
+ currentFile+=returnValue.back();
if(transferModel.rowCount()==0)
{
ui->skipButton->setEnabled(false);
@@ -505,19 +618,19 @@ void Themes::getActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &r
else
ui->skipButton->setEnabled(true);
updateOverallInformation();
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("transferModel.rowCount(): ")+QString::number(transferModel.rowCount()));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"transferModel.rowCount(): "+std::to_string(transferModel.rowCount()));
}
void Themes::setCopyType(const Ultracopier::CopyType &type)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
this->type=type;
updateModeAndType();
}
void Themes::forceCopyMode(const Ultracopier::CopyMode &mode)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
modeIsForced=true;
this->mode=mode;
if(mode==Ultracopier::Copy)
@@ -536,13 +649,13 @@ void Themes::setTransferListOperation(const Ultracopier::TransferListOperation &
void Themes::haveExternalOrder()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
// ui->moreButton->toggle();
}
void Themes::isInPause(const bool &isInPause)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("isInPause: ")+QString::number(isInPause));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"isInPause: "+std::to_string(isInPause));
//resume in auto the pause
storeIsInPause=isInPause;
updatePause();
@@ -554,14 +667,14 @@ void Themes::updatePause()
{
ui->pauseButton->setIcon(player_play);
if(stat == status_started)
- ui->pauseButton->setText(facilityEngine->translateText(QStringLiteral("Resume")));
+ ui->pauseButton->setText(QString::fromStdString(facilityEngine->translateText("Resume")));
else
- ui->pauseButton->setText(facilityEngine->translateText(QStringLiteral("Start")));
+ ui->pauseButton->setText(QString::fromStdString(facilityEngine->translateText("Start")));
}
else
{
ui->pauseButton->setIcon(player_pause);
- ui->pauseButton->setText(facilityEngine->translateText(QStringLiteral("Pause")));
+ ui->pauseButton->setText(QString::fromStdString(facilityEngine->translateText("Pause")));
}
}
@@ -570,15 +683,15 @@ void Themes::updateCurrentFileInformation()
TransferModel::currentTransfertItem transfertItem=transferModel.getCurrentTransfertItem();
if(transfertItem.haveItem)
{
- QString newPath=transfertItem.from;
+ QString newPath=QString::fromStdString(transfertItem.from);
if(newPath.size()>(64+3))
newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32);
ui->from->setText(newPath);
- newPath=transfertItem.to;
+ newPath=QString::fromStdString(transfertItem.to);
if(newPath.size()>(64+3))
newPath=newPath.mid(0,32)+QStringLiteral("...")+newPath.mid(newPath.size()-32,32);
ui->to->setText(newPath);
- ui->current_file->setText(transfertItem.current_file);
+ ui->current_file->setText(QString::fromStdString(transfertItem.current_file));
if(transfertItem.progressBar_read!=-1)
{
ui->progressBar_file->setRange(0,65535);
@@ -624,14 +737,14 @@ void Themes::updateCurrentFileInformation()
void Themes::on_putOnTop_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
selectedItems=selectionModel->selectedRows();
- QList<int> ids;
+ std::vector<uint64_t> ids;
int index=0;
const int &loop_size=selectedItems.size();
while(index<loop_size)
{
- ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong();
+ ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong());
index++;
}
if(ids.size()>0)
@@ -640,14 +753,14 @@ void Themes::on_putOnTop_clicked()
void Themes::on_pushUp_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
selectedItems=selectionModel->selectedRows();
- QList<int> ids;
+ std::vector<uint64_t> ids;
int index=0;
const int &loop_size=selectedItems.size();
while(index<loop_size)
{
- ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong();
+ ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong());
index++;
}
if(ids.size()>0)
@@ -656,14 +769,14 @@ void Themes::on_pushUp_clicked()
void Themes::on_pushDown_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
selectedItems=selectionModel->selectedRows();
- QList<int> ids;
+ std::vector<uint64_t> ids;
int index=0;
const int &loop_size=selectedItems.size();
while(index<loop_size)
{
- ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong();
+ ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong());
index++;
}
if(ids.size()>0)
@@ -672,14 +785,14 @@ void Themes::on_pushDown_clicked()
void Themes::on_putOnBottom_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
selectedItems=selectionModel->selectedRows();
- QList<int> ids;
+ std::vector<uint64_t> ids;
int index=0;
const int &loop_size=selectedItems.size();
while(index<loop_size)
{
- ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong();
+ ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong());
index++;
}
if(ids.size()>0)
@@ -688,14 +801,14 @@ void Themes::on_putOnBottom_clicked()
void Themes::on_del_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
selectedItems=selectionModel->selectedRows();
- QList<int> ids;
+ std::vector<uint64_t> ids;
int index=0;
const int &loop_size=selectedItems.size();
while(index<loop_size)
{
- ids << transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong();
+ ids.push_back(transferModel.data(selectedItems.at(index),Qt::UserRole).toULongLong());
index++;
}
if(ids.size()>0)
@@ -704,7 +817,7 @@ void Themes::on_del_clicked()
void Themes::on_cancelButton_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
this->hide();
emit cancel();
}
@@ -712,7 +825,7 @@ void Themes::on_cancelButton_clicked()
void Themes::speedWithProgressBar_toggled(bool checked)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
ui->progressBarCurrentSpeed->setVisible(checked);
ui->currentSpeed->setVisible(!checked);
}
@@ -720,13 +833,13 @@ void Themes::speedWithProgressBar_toggled(bool checked)
void Themes::showDualProgression_toggled(bool checked)
{
Q_UNUSED(checked);
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
updateProgressionColorBar();
}
void Themes::checkBoxShowSpeed_toggled(bool checked)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
Q_UNUSED(checked);
updateSpeed();
}
@@ -756,7 +869,7 @@ void Themes::on_SliderSpeed_valueChanged(int value)
currentSpeed=1024*128;
break;
}
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("value: %1").arg(value));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"value: "+std::to_string(value));
emit newSpeedLimitation(currentSpeed);
updateSpeed();
}
@@ -769,7 +882,7 @@ void Themes::uiUpdateSpeed()
currentSpeed=0;
else
currentSpeed=uiOptions->limitSpeed->value();
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("emit newSpeedLimitation(%1)").arg(currentSpeed));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit newSpeedLimitation"+std::to_string(currentSpeed));
emit newSpeedLimitation(currentSpeed);
}
@@ -783,12 +896,12 @@ void Themes::updateSpeed()
if(uiOptions->checkBoxShowSpeed->isChecked())
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("checked, currentSpeed: %1").arg(currentSpeed));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"checked, currentSpeed: "+std::to_string(currentSpeed));
uiOptions->limitSpeed->setEnabled(false);
if(currentSpeed==0)
{
ui->SliderSpeed->setValue(0);
- ui->label_SpeedMaxValue->setText(facilityEngine->translateText(QStringLiteral("Unlimited")));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->translateText("Unlimited")));
}
else if(currentSpeed<=1024)
{
@@ -798,7 +911,7 @@ void Themes::updateSpeed()
emit newSpeedLimitation(currentSpeed);
}
ui->SliderSpeed->setValue(1);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*1));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*1)));
}
else if(currentSpeed<=1024*4)
{
@@ -808,7 +921,7 @@ void Themes::updateSpeed()
emit newSpeedLimitation(currentSpeed);
}
ui->SliderSpeed->setValue(2);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*4));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*4)));
}
else if(currentSpeed<=1024*16)
{
@@ -818,7 +931,7 @@ void Themes::updateSpeed()
emit newSpeedLimitation(currentSpeed);
}
ui->SliderSpeed->setValue(3);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*16));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*16)));
}
else if(currentSpeed<=1024*64)
{
@@ -828,7 +941,7 @@ void Themes::updateSpeed()
emit newSpeedLimitation(currentSpeed);
}
ui->SliderSpeed->setValue(4);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*64));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*64)));
}
else
{
@@ -838,7 +951,7 @@ void Themes::updateSpeed()
emit newSpeedLimitation(currentSpeed);
}
ui->SliderSpeed->setValue(5);
- ui->label_SpeedMaxValue->setText(facilityEngine->speedToString((double)(1024*1024)*128));
+ ui->label_SpeedMaxValue->setText(QString::fromStdString(facilityEngine->speedToString((double)(1024*1024)*128)));
}
}
else
@@ -853,7 +966,7 @@ void Themes::updateSpeed()
void Themes::on_pauseButton_clicked()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
if(storeIsInPause)
emit resume();
else
@@ -865,14 +978,14 @@ void Themes::on_skipButton_clicked()
TransferModel::currentTransfertItem transfertItem=transferModel.getCurrentTransfertItem();
if(transfertItem.haveItem)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("skip at running: %1").arg(transfertItem.id));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"skip at running: "+std::to_string(transfertItem.id));
emit skip(transfertItem.id);
}
else
{
if(transferModel.rowCount()>1)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("skip at idle: %1").arg(transferModel.firstId()));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"skip at idle: "+std::to_string(transferModel.firstId()));
emit skip(transferModel.firstId());
}
else
@@ -903,43 +1016,43 @@ void Themes::updateModeAndType()
void Themes::forcedModeAddFile()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
emit userAddFile(mode);
}
void Themes::forcedModeAddFolder()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
emit userAddFolder(mode);
}
void Themes::forcedModeAddFileToCopy()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
emit userAddFile(Ultracopier::Copy);
}
void Themes::forcedModeAddFolderToCopy()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
emit userAddFolder(Ultracopier::Copy);
}
void Themes::forcedModeAddFileToMove()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
emit userAddFile(Ultracopier::Move);
}
void Themes::forcedModeAddFolderToMove()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
emit userAddFolder(Ultracopier::Move);
}
void Themes::newLanguageLoaded()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
if(modeIsForced)
forceCopyMode(mode);
ui->retranslateUi(this);
@@ -954,7 +1067,8 @@ void Themes::newLanguageLoaded()
updateOverallInformation();
updateSpeed();
if(ui->tabWidget->count()>=4)
- ui->tabWidget->setTabText(ui->tabWidget->count()-1,facilityEngine->translateText(QStringLiteral("Copy engine")));
+ ui->tabWidget->setTabText(ui->tabWidget->count()-1,
+ QString::fromStdString(facilityEngine->translateText("Copy engine")));
on_moreButton_toggled(ui->moreButton->isChecked());
}
@@ -995,7 +1109,7 @@ void Themes::searchBoxShortcut()
//hilight the search
void Themes::hilightTheSearch(bool searchNext)
{
- int result=transferModel.search(ui->lineEditSearch->text(),searchNext);
+ int result=transferModel.search(ui->lineEditSearch->text().toStdString(),searchNext);
if(ui->lineEditSearch->text().isEmpty())
ui->lineEditSearch->setStyleSheet("");
else
@@ -1017,7 +1131,7 @@ void Themes::hilightTheSearchSlot()
void Themes::on_pushButtonSearchPrev_clicked()
{
- int result=transferModel.searchPrev(ui->lineEditSearch->text());
+ int result=transferModel.searchPrev(ui->lineEditSearch->text().toStdString());
if(ui->lineEditSearch->text().isEmpty())
ui->lineEditSearch->setStyleSheet("");
else
@@ -1075,24 +1189,27 @@ void dragLeaveEvent(QDragLeaveEvent* event);
*/
void Themes::dropEvent(QDropEvent *event)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
const QMimeData* mimeData = event->mimeData();
if(mimeData->hasUrls())
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("hasUrls"));
- emit urlDropped(mimeData->urls());
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls");
+ std::vector<std::string> urls;
+ foreach (QUrl url, mimeData->urls())
+ urls.push_back(url.toString().toStdString());
+ emit urlDropped(urls);
event->acceptProposedAction();
}
}
void Themes::dragEnterEvent(QDragEnterEvent* event)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
// if some actions should not be usable, like move, this code must be adopted
const QMimeData* mimeData = event->mimeData();
if(mimeData->hasUrls())
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("hasUrls"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls");
event->acceptProposedAction();
}
}
@@ -1107,7 +1224,7 @@ void Themes::dragMoveEvent(QDragMoveEvent* event)
void Themes::dragLeaveEvent(QDragLeaveEvent* event)
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
event->accept();
}
@@ -1184,7 +1301,7 @@ void Themes::alwaysOnTop_clicked(bool reshow)
flags=flags | Qt::WindowStaysOnTopHint;
else
flags=flags & ~Qt::WindowStaysOnTopHint;
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"uiOptions->alwaysOnTop->isChecked(): "+QString::number(uiOptions->alwaysOnTop->isChecked())+", flags: "+QString::number(flags));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"uiOptions->alwaysOnTop->isChecked(): "+std::to_string(uiOptions->alwaysOnTop->isChecked())+", flags: "+std::to_string(flags));
setWindowFlags(flags);
if(reshow)
show();
@@ -1197,7 +1314,7 @@ void Themes::alwaysOnTop_clickedSlot()
void Themes::updateProgressionColorBar()
{
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("start"));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start");
uiOptions->labelProgressionColor->setVisible(uiOptions->showDualProgression->isChecked());
uiOptions->frameProgressionColor->setVisible(uiOptions->showDualProgression->isChecked());
if(!uiOptions->showDualProgression->isChecked())
@@ -1230,25 +1347,25 @@ void Themes::updateTitle()
if(uiOptions->showProgressionInTheTitle->isChecked() && totalSize>0)
{
if(!modeIsForced)
- this->setWindowTitle(tr("%1 %2% of %3").arg(facilityEngine->translateText(QStringLiteral("Transfer"))).arg((currentSize*100)/totalSize).arg(facilityEngine->sizeToString(totalSize))+QStringLiteral(" - ")+facilityEngine->softwareName());
+ this->setWindowTitle(tr("%1 %2% of %3").arg(QString::fromStdString(facilityEngine->translateText("Transfer"))).arg((currentSize*100)/totalSize).arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName()));
else
{
if(mode==Ultracopier::Copy)
- this->setWindowTitle(tr("%1 %2% of %3").arg(facilityEngine->translateText(QStringLiteral("Copy"))).arg((currentSize*100)/totalSize).arg(facilityEngine->sizeToString(totalSize))+QStringLiteral(" - ")+facilityEngine->softwareName());
+ this->setWindowTitle(tr("%1 %2% of %3").arg(QString::fromStdString(facilityEngine->translateText("Copy"))).arg((currentSize*100)/totalSize).arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName()));
else
- this->setWindowTitle(tr("%1 %2% of %3").arg(facilityEngine->translateText(QStringLiteral("Move"))).arg((currentSize*100)/totalSize).arg(facilityEngine->sizeToString(totalSize))+QStringLiteral(" - ")+facilityEngine->softwareName());
+ this->setWindowTitle(tr("%1 %2% of %3").arg(QString::fromStdString(facilityEngine->translateText("Move"))).arg((currentSize*100)/totalSize).arg(QString::fromStdString(facilityEngine->sizeToString(totalSize)))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName()));
}
}
else
{
if(!modeIsForced)
- this->setWindowTitle(QStringLiteral("%1").arg(facilityEngine->translateText(QStringLiteral("Transfer")))+QStringLiteral(" - ")+facilityEngine->softwareName());
+ this->setWindowTitle(QStringLiteral("%1").arg(QString::fromStdString(facilityEngine->translateText("Transfer")))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName()));
else
{
if(mode==Ultracopier::Copy)
- this->setWindowTitle(QStringLiteral("%1").arg(facilityEngine->translateText(QStringLiteral("Copy")))+QStringLiteral(" - ")+facilityEngine->softwareName());
+ this->setWindowTitle(QStringLiteral("%1").arg(QString::fromStdString(facilityEngine->translateText("Copy")))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName()));
else
- this->setWindowTitle(QStringLiteral("%1").arg(facilityEngine->translateText(QStringLiteral("Move")))+QStringLiteral(" - ")+facilityEngine->softwareName());
+ this->setWindowTitle(QStringLiteral("%1").arg(QString::fromStdString(facilityEngine->translateText("Move")))+QStringLiteral(" - ")+QString::fromStdString(facilityEngine->softwareName()));
}
}
}
@@ -1263,7 +1380,7 @@ Do by mongaulois, remake by alpha_one_x86.
\return QIcon of the final image
\note Can be used as it: dynaIcon(75,"...")
*/
-QIcon Themes::dynaIcon(int percent,QString text) const
+QIcon Themes::dynaIcon(int percent,std::string text) const
{
#ifdef ULTRACOPIER_PLUGIN_DEBUG
if(pixmapTop.isNull() || pixmapBottom.isNull())
@@ -1320,13 +1437,13 @@ QIcon Themes::dynaIcon(int percent,QString text) const
qint8 textxOffset=0;
qint8 textyOffset=0;
- if(text.isEmpty())
+ if(text.empty())
{
if(percent!=100)
- text=QString::number(percent);
+ text=std::to_string(percent);
else
{
- text=QStringLiteral(":)");
+ text=":)";
#ifdef Q_OS_WIN32
textyOffset-=2;
#else
@@ -1352,9 +1469,9 @@ QIcon Themes::dynaIcon(int percent,QString text) const
textyOffset+=3;
#endif
painter.setPen(QPen(Qt::black));
- painter.drawText(3+textxOffset,13+textyOffset,text);
+ painter.drawText(3+textxOffset,13+textyOffset,QString::fromStdString(text));
painter.setPen(QPen(Qt::white));
- painter.drawText(2+textxOffset,12+textyOffset,text);
+ painter.drawText(2+textxOffset,12+textyOffset,QString::fromStdString(text));
}
return QIcon(resultImage);
}
@@ -1371,7 +1488,7 @@ void Themes::catchAction(QSystemTrayIcon::ActivationReason reason)
ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"Double Click detected");
}
else
- ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("reason: %1").arg(reason));
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"reason: "+std::to_string(reason));
}
void Themes::on_exportErrorToTransferList_clicked()
diff --git a/plugins/Themes/Oxygen/interface.h b/plugins/Themes/Oxygen/interface.h
index ee3cadd..acca141 100644
--- a/plugins/Themes/Oxygen/interface.h
+++ b/plugins/Themes/Oxygen/interface.h
@@ -58,28 +58,28 @@ public:
/// \brief to set the action in progress
void actionInProgess(const Ultracopier::EngineActionInProgress &);
/// \brief the new folder is listing
- void newFolderListing(const QString &path);
+ void newFolderListing(const std::string &path);
/** \brief show the detected speed
* in byte per seconds */
- void detectedSpeed(const quint64 &speed);
+ void detectedSpeed(const uint64_t &speed);
/** \brief show the remaining time
* time in seconds */
void remainingTime(const int &remainingSeconds);
/// \brief set the current collision action
- void newCollisionAction(const QString &action);
+ void newCollisionAction(const std::string &action);
/// \brief set the current error action
- void newErrorAction(const QString &action);
+ void newErrorAction(const std::string &action);
/// \brief set one error is detected
void errorDetected();
/// \brief new error
- void errorToRetry(const QString &source,const QString &destination,const QString &error);
+ void errorToRetry(const std::string &source,const std::string &destination,const std::string &error);
/** \brief support speed limitation */
void setSupportSpeedLimitation(const bool &supportSpeedLimitationBool);
//get information about the copy
/// \brief show the general progression
- void setGeneralProgression(const quint64 &current,const quint64 &total);
+ void setGeneralProgression(const uint64_t &current,const uint64_t &total);
/// \brief show the file progression
- void setFileProgression(const QList<Ultracopier::ProgressionItem> &progressionList);
+ void setFileProgression(const std::vector<Ultracopier::ProgressionItem> &progressionList);
/// \brief set the copyType -> file or folder
void setCopyType(const Ultracopier::CopyType &);
/// \brief set the copyMove -> copy or move, to force in copy or move, else support both
@@ -88,7 +88,7 @@ public:
void setTransferListOperation(const Ultracopier::TransferListOperation &transferListOperation);
//edit the transfer list
/// \brief get action on the transfer list (add/move/remove)
- void getActionOnList(const QList<Ultracopier::ReturnActionOnCopyList> &returnActions);
+ void getActionOnList(const std::vector<Ultracopier::ReturnActionOnCopyList> &returnActions);
/** \brief set if the order is external (like file manager copy)
* to notify the interface, which can hide add folder/filer button */
void haveExternalOrder();
@@ -150,24 +150,24 @@ private slots:
void catchAction(QSystemTrayIcon::ActivationReason reason);
void on_exportErrorToTransferList_clicked();
private:
- QTime duration;
+ uint64_t duration;
bool durationStarted;
QPixmap pixmapTop,pixmapBottom;
QColor progressColorWrite,progressColorRead,progressColorRemaining;
Ui::interfaceCopy *ui;
Ui::themesOptions *uiOptions;
- quint64 currentFile;
- quint64 totalFile;
- quint64 currentSize;
- quint64 totalSize;
- quint8 getOldProgression;
+ uint64_t currentFile;
+ uint64_t totalFile;
+ uint64_t currentSize;
+ uint64_t totalSize;
+ uint8_t getOldProgression;
QSystemTrayIcon *sysTrayIcon;
void updateOverallInformation();
void updateCurrentFileInformation();
QMenu *menu;
Ultracopier::EngineActionInProgress action;
void closeEvent(QCloseEvent *event);
- qint32 currentSpeed;///< in KB/s, assume as 0KB/s as default like every where
+ int32_t currentSpeed;///< in KB/s, assume as 0KB/s as default like every where
void updateSpeed();
bool storeIsInPause;
bool modeIsForced;
@@ -212,11 +212,11 @@ private:
//have functionality
bool shutdown;
void updatePause();
- QIcon dynaIcon(int percent,QString text="") const;
+ QIcon dynaIcon(int percent,std::string text="") const;
void updateSysTrayIcon();
signals:
/// \brief To debug source
- void debugInformation(const Ultracopier::DebugLevel &level,const QString &fonction,const QString &text,const QString &file,const int &ligne) const;
+ void debugInformation(const Ultracopier::DebugLevel &level,const std::string &fonction,const std::string &text,const std::string &file,const int &ligne) const;
};
#endif // INTERFACE_H
diff --git a/plugins/Themes/Oxygen/interface.pro b/plugins/Themes/Oxygen/interface.pro
index 8ddf147..9b4923d 100644
--- a/plugins/Themes/Oxygen/interface.pro
+++ b/plugins/Themes/Oxygen/interface.pro
@@ -1,59 +1,8 @@
-CONFIG += c++11
-QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra"
-mac:QMAKE_CXXFLAGS+="-stdlib=libc++"
-
-QT += widgets
-TEMPLATE = lib
-CONFIG += plugin
-HEADERS = ThemesFactory.h \
- StructEnumDefinition.h \
- DebugEngineMacro.h \
- Environment.h \
- Variable.h \
- ../../../interface/PluginInterface_Themes.h \
- ../../../interface/FacilityInterface.h \
- ../../../interface/OptionInterface.h \
- TransferModel.h \
- interface.h
-SOURCES = ThemesFactory.cpp \
- TransferModel.cpp \
- interface.cpp
-TARGET = $$qtLibraryTarget(interface)
-TRANSLATIONS += Languages/ar/translation.ts \
- Languages/de/translation.ts \
- Languages/el/translation.ts \
- Languages/en/translation.ts \
- Languages/es/translation.ts \
- Languages/fr/translation.ts \
- Languages/hi/translation.ts \
- Languages/hu/translation.ts \
- Languages/id/translation.ts \
- Languages/it/translation.ts \
- Languages/ja/translation.ts \
- Languages/ko/translation.ts \
- Languages/nl/translation.ts \
- Languages/no/translation.ts \
- Languages/pl/translation.ts \
- Languages/pt/translation.ts \
- Languages/ru/translation.ts \
- Languages/th/translation.ts \
- Languages/tr/translation.ts \
- Languages/zh/translation.ts
-
-win32 {
- RESOURCES +=
-}
-!win32 {
- RESOURCES +=
-}
+include($$PWD/../Oxygen/interfaceInclude.pri)
!CONFIG(static) {
RESOURCES += \
- interfaceResources.qrc \
- interfaceResources_unix.qrc \
- interfaceResources_windows.qrc
+ $$PWD/../Oxygen/interfaceResources.qrc \
+ $$PWD/../Oxygen/interfaceResources_unix.qrc \
+ $$PWD/../Oxygen/interfaceResources_windows.qrc
}
-
-FORMS += \
- interface.ui \
- themesOptions.ui
diff --git a/plugins/Themes/Oxygen/interfaceInclude.pri b/plugins/Themes/Oxygen/interfaceInclude.pri
new file mode 100644
index 0000000..5f7317b
--- /dev/null
+++ b/plugins/Themes/Oxygen/interfaceInclude.pri
@@ -0,0 +1,51 @@
+CONFIG += c++11
+QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra"
+mac:QMAKE_CXXFLAGS+="-stdlib=libc++"
+
+QT += widgets
+TEMPLATE = lib
+CONFIG += plugin
+HEADERS = \
+ $$PWD/ThemesFactory.h \
+ $$PWD/StructEnumDefinition.h \
+ $$PWD/DebugEngineMacro.h \
+ $$PWD/Environment.h \
+ $$PWD/Variable.h \
+ $$PWD/../../../interface/PluginInterface_Themes.h \
+ $$PWD/../../../interface/FacilityInterface.h \
+ $$PWD/../../../interface/OptionInterface.h \
+ $$PWD/../../../cpp11addition.h \
+ $$PWD/TransferModel.h \
+ $$PWD/interface.h
+SOURCES = \
+ $$PWD/ThemesFactory.cpp \
+ $$PWD/TransferModel.cpp \
+ $$PWD/interface.cpp \
+ $$PWD/../../../cpp11addition.cpp \
+ $$PWD/../../../cpp11additionstringtointcpp.cpp
+TARGET = $$qtLibraryTarget(interface)
+TRANSLATIONS += \
+ $$PWD/Languages/ar/translation.ts \
+ $$PWD/Languages/de/translation.ts \
+ $$PWD/Languages/el/translation.ts \
+ $$PWD/Languages/en/translation.ts \
+ $$PWD/Languages/es/translation.ts \
+ $$PWD/Languages/fr/translation.ts \
+ $$PWD/Languages/hi/translation.ts \
+ $$PWD/Languages/hu/translation.ts \
+ $$PWD/Languages/id/translation.ts \
+ $$PWD/Languages/it/translation.ts \
+ $$PWD/Languages/ja/translation.ts \
+ $$PWD/Languages/ko/translation.ts \
+ $$PWD/Languages/nl/translation.ts \
+ $$PWD/Languages/no/translation.ts \
+ $$PWD/Languages/pl/translation.ts \
+ $$PWD/Languages/pt/translation.ts \
+ $$PWD/Languages/ru/translation.ts \
+ $$PWD/Languages/th/translation.ts \
+ $$PWD/Languages/tr/translation.ts \
+ $$PWD/Languages/zh/translation.ts
+
+FORMS += \
+ $$PWD/interface.ui \
+ $$PWD/themesOptions.ui
diff --git a/plugins/Themes/Supercopier/informations.xml b/plugins/Themes/Supercopier/informations.xml
new file mode 100644
index 0000000..476e5f5
--- /dev/null
+++ b/plugins/Themes/Supercopier/informations.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package>
+ <title xml:lang="en"><![CDATA[Supercopier style for Ultracopier]]></title><!-- english is required -->
+ <title xml:lang="fr"><![CDATA[Style supercopier pour Ultracopier]]></title>
+ <!-- What kind of plugin this is -->
+ <category>Themes</category>
+ <!-- Who wrote this plugin -->
+ <author><![CDATA[BRULE Herman, alpha_one_x86 (alpha_one_x86@first-world.info)]]></author>
+ <!-- URL of page or site for this plugin (may provide additional information, bug reports, feature requests). -->
+ <website xml:lang="en"><![CDATA[http://ultracopier.first-world.info/]]></website><!-- not required -->
+ <website xml:lang="fr"><![CDATA[http://ultracopier-fr.first-world.info/]]></website><!-- not required -->
+ <!-- the date-time format should be in timestamps format -->
+ <pubDate>1287496800</pubDate>
+ <!-- the architecture code of this plugin, found PlatformMacro.h into ultracopier source -->
+ <architecture>windows-x86</architecture>
+ <!-- Detailed description -->
+ <description xml:lang="en"><![CDATA[Supercopier style for Ultracopier]]></description>
+ <description xml:lang="fr"><![CDATA[Style supercopier pour Ultracopier]]></description>
+ <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number -->
+ <version>1.4.0.3</version>
+ <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. -->
+ <name>Supercopier</name>
+ <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. -->
+ <dependencies><![CDATA[
+ ]]></dependencies>
+</package>
diff --git a/plugins/Themes/Supercopier/interface.pro b/plugins/Themes/Supercopier/interface.pro
new file mode 100644
index 0000000..1b0ef2e
--- /dev/null
+++ b/plugins/Themes/Supercopier/interface.pro
@@ -0,0 +1,10 @@
+DEFINES+=SUPERCOPIER
+
+include($$PWD/../Oxygen/interfaceInclude.pri)
+
+!CONFIG(static) {
+RESOURCES += \
+ $$PWD/../Supercopier/interfaceResources.qrc \
+ $$PWD/../Supercopier/interfaceResources_unix.qrc \
+ $$PWD/../Supercopier/interfaceResources_windows.qrc
+}
diff --git a/plugins/Themes/Supercopier/interfaceResources.qrc b/plugins/Themes/Supercopier/interfaceResources.qrc
new file mode 100644
index 0000000..d8990aa
--- /dev/null
+++ b/plugins/Themes/Supercopier/interfaceResources.qrc
@@ -0,0 +1,24 @@
+<RCC>
+ <qresource prefix="/Themes/Supercopier">
+ <file>resources/add.png</file>
+ <file>resources/cancel.png</file>
+ <file>resources/main.png</file>
+ <file>resources/moveDown.png</file>
+ <file>resources/moveUp.png</file>
+ <file>resources/player_end.png</file>
+ <file>resources/player_pause.png</file>
+ <file>resources/player_play.png</file>
+ <file>resources/putOnBottom.png</file>
+ <file>resources/putOnTop.png</file>
+ <file>resources/remove.png</file>
+ <file>resources/search.png</file>
+ <file>resources/export-transfer-list.png</file>
+ <file>resources/import-transfer-list.png</file>
+ <file>resources/SystemTrayIcon/add.png</file>
+ <file>resources/SystemTrayIcon/exit.png</file>
+ <file>resources/SystemTrayIcon/informations.png</file>
+ <file>resources/SystemTrayIcon/options.png</file>
+ <file>resources/progressbarleft.png</file>
+ <file>resources/progressbarright.png</file>
+ </qresource>
+</RCC>
diff --git a/plugins/Themes/Supercopier/interfaceResources_unix.qrc b/plugins/Themes/Supercopier/interfaceResources_unix.qrc
new file mode 100644
index 0000000..2cf979f
--- /dev/null
+++ b/plugins/Themes/Supercopier/interfaceResources_unix.qrc
@@ -0,0 +1,7 @@
+<RCC>
+ <qresource prefix="/Themes/Supercopier">
+ <file>resources/SystemTrayIcon/systray_Caught_Unix.png</file>
+ <file>resources/SystemTrayIcon/systray_Semiuncaught_Unix.png</file>
+ <file>resources/SystemTrayIcon/systray_Uncaught_Unix.png</file>
+ </qresource>
+</RCC>
diff --git a/plugins/Themes/Supercopier/interfaceResources_windows.qrc b/plugins/Themes/Supercopier/interfaceResources_windows.qrc
new file mode 100644
index 0000000..abbedba
--- /dev/null
+++ b/plugins/Themes/Supercopier/interfaceResources_windows.qrc
@@ -0,0 +1,7 @@
+<RCC>
+ <qresource prefix="/Themes/Supercopier">
+ <file>resources/SystemTrayIcon/systray_Caught_Windows.png</file>
+ <file>resources/SystemTrayIcon/systray_Semiuncaught_Windows.png</file>
+ <file>resources/SystemTrayIcon/systray_Uncaught_Windows.png</file>
+ </qresource>
+</RCC>
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/add.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/add.png
new file mode 100644
index 0000000..d41fce6
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/add.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.png
new file mode 100644
index 0000000..9599bba
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/exit.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.png
new file mode 100644
index 0000000..86c9ba6
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/informations.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/options.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/options.png
new file mode 100644
index 0000000..cf699d5
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/options.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.png
new file mode 100644
index 0000000..be2ba20
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Unix.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.png
new file mode 100644
index 0000000..9c597af
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Caught_Windows.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.png
new file mode 100644
index 0000000..be2ba20
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Unix.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.png
new file mode 100644
index 0000000..9c597af
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Semiuncaught_Windows.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.png
new file mode 100644
index 0000000..4da8cc0
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Unix.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.png b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.png
new file mode 100644
index 0000000..8bfbcf9
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/SystemTrayIcon/systray_Uncaught_Windows.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/add.png b/plugins/Themes/Supercopier/resources/add.png
new file mode 100644
index 0000000..af8a401
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/add.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/cancel.png b/plugins/Themes/Supercopier/resources/cancel.png
new file mode 100644
index 0000000..1e7579c
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/cancel.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/export-transfer-list.png b/plugins/Themes/Supercopier/resources/export-transfer-list.png
new file mode 100644
index 0000000..2bcc455
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/export-transfer-list.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/import-transfer-list.png b/plugins/Themes/Supercopier/resources/import-transfer-list.png
new file mode 100644
index 0000000..d208342
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/import-transfer-list.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/main.png b/plugins/Themes/Supercopier/resources/main.png
new file mode 100644
index 0000000..9bec399
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/main.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/moveDown.png b/plugins/Themes/Supercopier/resources/moveDown.png
new file mode 100644
index 0000000..7f4ff27
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/moveDown.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/moveUp.png b/plugins/Themes/Supercopier/resources/moveUp.png
new file mode 100644
index 0000000..9397b76
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/moveUp.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/player_end.png b/plugins/Themes/Supercopier/resources/player_end.png
new file mode 100644
index 0000000..9730302
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/player_end.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/player_pause.png b/plugins/Themes/Supercopier/resources/player_pause.png
new file mode 100644
index 0000000..429ae43
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/player_pause.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/player_play.png b/plugins/Themes/Supercopier/resources/player_play.png
new file mode 100644
index 0000000..a28ac73
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/player_play.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/progressbarleft.png b/plugins/Themes/Supercopier/resources/progressbarleft.png
new file mode 100644
index 0000000..bbee9c8
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/progressbarleft.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/progressbarright.png b/plugins/Themes/Supercopier/resources/progressbarright.png
new file mode 100644
index 0000000..93e5781
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/progressbarright.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/putOnBottom.png b/plugins/Themes/Supercopier/resources/putOnBottom.png
new file mode 100644
index 0000000..9ac517c
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/putOnBottom.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/putOnTop.png b/plugins/Themes/Supercopier/resources/putOnTop.png
new file mode 100644
index 0000000..5682829
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/putOnTop.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/remove.png b/plugins/Themes/Supercopier/resources/remove.png
new file mode 100644
index 0000000..3a2a9f1
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/remove.png
Binary files differ
diff --git a/plugins/Themes/Supercopier/resources/search.png b/plugins/Themes/Supercopier/resources/search.png
new file mode 100644
index 0000000..567f498
--- /dev/null
+++ b/plugins/Themes/Supercopier/resources/search.png
Binary files differ