diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2022-06-26 21:42:44 +0100 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2022-06-26 21:42:44 +0100 |
commit | cec2190aa2a5d65d3e09ae26dd5aafeaa5007862 (patch) | |
tree | 3adfa5ef0125e39dc1d388bdf885c0529c6fceb1 /plugins/Themes/Oxygen | |
parent | 08b0288421b2cd69bbfd8a8a109572f04df69bbe (diff) |
New upstream version 2.2.6.0
Diffstat (limited to 'plugins/Themes/Oxygen')
37 files changed, 1044 insertions, 686 deletions
diff --git a/plugins/Themes/Oxygen/Languages/ar/translation.qm b/plugins/Themes/Oxygen/Languages/ar/translation.qm Binary files differindex 2ac6267..c225865 100755 --- a/plugins/Themes/Oxygen/Languages/ar/translation.qm +++ b/plugins/Themes/Oxygen/Languages/ar/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/ar/translation.ts b/plugins/Themes/Oxygen/Languages/ar/translation.ts index 24a1bd9..4c10ecb 100644 --- a/plugins/Themes/Oxygen/Languages/ar/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ar/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation>شراء النسخة النهائية لتمويل التنمية</translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>الملف %1/%2 ، الحجم: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>قائمة النسخ</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>قائمة النقل</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation>عدم الإغلاق في حاله العثور على أخطاء</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>لا تغلق أبدا</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>إغلاق دائم</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>اسم الملف ، 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>تحديد لون</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation>%1 %2% من %3</translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>عدم الإغلاق في حاله العثور على أخطاء</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>لا تغلق أبدا</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>إغلاق دائم</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>تحديد لون</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation>إظهار التقدم المزدوج</translation> </message> @@ -301,32 +301,42 @@ <translation>حفظ الموضع</translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>المعلومات</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>عرض</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>السرعة مع شريط التقدم</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>تدرج اللون</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>انقر لتحرير اللون</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>إظهار التقدم في العنوان</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/de/translation.qm b/plugins/Themes/Oxygen/Languages/de/translation.qm Binary files differindex 6bbb305..e53bc42 100755 --- a/plugins/Themes/Oxygen/Languages/de/translation.qm +++ b/plugins/Themes/Oxygen/Languages/de/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/de/translation.ts b/plugins/Themes/Oxygen/Languages/de/translation.ts index 68c3f7c..2ab23ab 100644 --- a/plugins/Themes/Oxygen/Languages/de/translation.ts +++ b/plugins/Themes/Oxygen/Languages/de/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <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="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>Datei %1/%2, Größe:%3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Zu kopierende Dateien</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Zu verschiebende Dateien</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation>Nicht schließen, wenn Fehler aufgetreten sind</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Niemals schließen</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>Immer schließen</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Dateiname, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>Farbe auswählen</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation>%1 %2% von %3</translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>Nicht schließen, wenn Fehler aufgetreten sind</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Niemals schließen</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>Immer schließen</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>Wählen Sie eine Farbe</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation></translation> </message> @@ -291,7 +291,12 @@ <translation>Minimiert starten</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Zum Bearbeiten der Farbe klicken</translation> </message> @@ -306,31 +311,36 @@ <translation>Speichere Fensterposition</translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Informationen</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>Anzeige</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>Geschwindigkeit als Fortschrittsbalken anzeigen</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Farbe des Fortschrittsbalken</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>Fortschritt im Fenstertitel zeigen</translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation>Fenster immer im Vordergrund halten</translation> diff --git a/plugins/Themes/Oxygen/Languages/el/translation.ts b/plugins/Themes/Oxygen/Languages/el/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/el/translation.ts +++ b/plugins/Themes/Oxygen/Languages/el/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/en/translation.qm b/plugins/Themes/Oxygen/Languages/en/translation.qm Binary files differindex d925dd6..922339a 100755 --- a/plugins/Themes/Oxygen/Languages/en/translation.qm +++ b/plugins/Themes/Oxygen/Languages/en/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/en/translation.ts b/plugins/Themes/Oxygen/Languages/en/translation.ts index 4bb21ad..ff5d6da 100755 --- a/plugins/Themes/Oxygen/Languages/en/translation.ts +++ b/plugins/Themes/Oxygen/Languages/en/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/es/translation.qm b/plugins/Themes/Oxygen/Languages/es/translation.qm Binary files differindex 5d258b3..d48e432 100755 --- a/plugins/Themes/Oxygen/Languages/es/translation.qm +++ b/plugins/Themes/Oxygen/Languages/es/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/es/translation.ts b/plugins/Themes/Oxygen/Languages/es/translation.ts index 00d805d..03e2307 100755 --- a/plugins/Themes/Oxygen/Languages/es/translation.ts +++ b/plugins/Themes/Oxygen/Languages/es/translation.ts @@ -4,86 +4,86 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <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="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Registra tu clave</translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <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="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Lista de copia</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Lista de movimiento</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation>No cierre si se encuentran errores</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Nunca cierre</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>Siempre cerrar</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Nombre de archivo, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> - <translation type="unfinished"></translation> + <translation>%1 %2% de %3</translation> </message> </context> <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>No cierre si se encuentran errores</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Nunca cierre</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>Siempre cerrar</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>Seleccione un color</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation>Mostrar progresión dual</translation> </message> @@ -288,10 +288,15 @@ <message> <location filename="../../themesOptions.ui" line="53"/> <source>Start minimized</source> - <translation type="unfinished"></translation> + <translation>Iniciar minimizado</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation>Informacións</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Haga clic para editar el color</translation> </message> @@ -303,12 +308,7 @@ <message> <location filename="../../themesOptions.ui" line="190"/> <source>Save position</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Informations</translation> + <translation>Guardar posicion</translation> </message> <message> <location filename="../../themesOptions.ui" line="251"/> @@ -316,21 +316,31 @@ <translation>Visualización</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>Velocidad con barra de progreso</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Progresión de color</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>Mostrar progresión en el título</translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation>Margen general</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation>Espaciado general</translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation>Siempre visible</translation> diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.qm b/plugins/Themes/Oxygen/Languages/fr/translation.qm Binary files differindex 3db8765..1b4fb0b 100755 --- a/plugins/Themes/Oxygen/Languages/fr/translation.qm +++ b/plugins/Themes/Oxygen/Languages/fr/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.ts b/plugins/Themes/Oxygen/Languages/fr/translation.ts index 3eb2e67..5af9a4d 100755 --- a/plugins/Themes/Oxygen/Languages/fr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/fr/translation.ts @@ -4,14 +4,14 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="+328"/> + <location filename="../../interface.cpp" line="+341"/> <source>Buy the Ultimate version to fund development</source> <translation>Achetez la version Ultimate pour financer le développement</translation> </message> <message> <location line="+0"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Enregistrez votre clé</translation> </message> <message> <location line="+99"/> @@ -29,7 +29,7 @@ <translation>Liste de déplacements</translation> </message> <message> - <location line="+428"/> + <location line="+441"/> <source>Don't close if errors are found</source> <translation>Garder ouvert s'il y a des erreurs</translation> </message> @@ -49,7 +49,7 @@ <translation>Nom de fichier, 0Ko</translation> </message> <message> - <location line="+194"/> + <location line="+274"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -66,7 +66,7 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="+284"/> + <location filename="../../ThemesFactory.cpp" line="+294"/> <source>Don't close if errors are found</source> <translation>Garder ouvert s'il y a des erreurs</translation> </message> @@ -81,7 +81,7 @@ <translation>Toujours fermer</translation> </message> <message> - <location line="+196"/> + <location line="+214"/> <location line="+15"/> <location line="+15"/> <source>Select a color</source> @@ -250,12 +250,12 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="+267"/> + <location filename="../../themesOptions.ui" line="+402"/> <source>Show dual progression</source> <translation>Afficher une double progression</translation> </message> <message> - <location line="-48"/> + <location line="-183"/> <source>Show speed as main information</source> <translation>Afficher la vitesse comme information principale</translation> </message> @@ -291,12 +291,17 @@ <translation>Démarrer minimisé</translation> </message> <message> - <location line="+253"/> + <location line="+160"/> + <source>Information</source> + <translation>Informations</translation> + </message> + <message> + <location line="+56"/> <source>Click to edit the color</source> <translation>Cliquer pour éditer la couleur</translation> </message> <message> - <location line="-159"/> + <location line="-122"/> <source> KB/s</source> <translation> Ko/s</translation> </message> @@ -306,32 +311,37 @@ <translation>Sauvegarder la position</translation> </message> <message> - <location line="+23"/> - <source>Informations</source> - <translation>Informations</translation> - </message> - <message> - <location line="+38"/> + <location line="+61"/> <source>Display</source> <translation>Affichage</translation> </message> <message> - <location line="+6"/> + <location line="+117"/> <source>Speed with progress bar</source> <translation>Vitesse avec barre de progression</translation> </message> <message> - <location line="+30"/> + <location line="+10"/> <source>Progression color</source> <translation>Couleur de progression</translation> </message> <message> - <location line="-10"/> + <location line="+10"/> <source>Show progression in the title</source> <translation>Afficher la progression dans le titre</translation> </message> <message> - <location line="-94"/> + <location line="+7"/> + <source>General margin</source> + <translation>Marge générale</translation> + </message> + <message> + <location line="+30"/> + <source>General spacing</source> + <translation>Espacement général</translation> + </message> + <message> + <location line="-242"/> <source>Always on top</source> <translation>Toujours au 1er plan</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/hi/translation.ts b/plugins/Themes/Oxygen/Languages/hi/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/hi/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hi/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.qm b/plugins/Themes/Oxygen/Languages/hu/translation.qm Binary files differindex 55200d4..e02fee6 100755 --- a/plugins/Themes/Oxygen/Languages/hu/translation.qm +++ b/plugins/Themes/Oxygen/Languages/hu/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.ts b/plugins/Themes/Oxygen/Languages/hu/translation.ts index ec2d5d1..419d18f 100755 --- a/plugins/Themes/Oxygen/Languages/hu/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hu/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <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="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <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="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Lista másolása</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Lista mozgatása</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don'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="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Sose zárja be</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation>Mindig zárja be</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Fájlnév, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don'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="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Sose zárja be</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation>Mindig zárja be</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation>Válassz egy színt</translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation>Páros folyamat mutatása</translation> </message> @@ -291,7 +291,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Kattints a szín szerkesztéséhez</translation> </message> @@ -306,31 +311,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Információk</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>Megjelenítés</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation>Sebesség folyamatsávval</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Folyamat színe</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation>Folyamat mutatása a címsorban</translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation>Mindig legfelül</translation> diff --git a/plugins/Themes/Oxygen/Languages/id/translation.ts b/plugins/Themes/Oxygen/Languages/id/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/id/translation.ts +++ b/plugins/Themes/Oxygen/Languages/id/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/it/translation.qm b/plugins/Themes/Oxygen/Languages/it/translation.qm Binary files differindex 003803d..8eff0a1 100755 --- a/plugins/Themes/Oxygen/Languages/it/translation.qm +++ b/plugins/Themes/Oxygen/Languages/it/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/it/translation.ts b/plugins/Themes/Oxygen/Languages/it/translation.ts index f9216f9..10c71f0 100644 --- a/plugins/Themes/Oxygen/Languages/it/translation.ts +++ b/plugins/Themes/Oxygen/Languages/it/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> - <translation>Acquista versione ultimate per finanziare lo sviluppo</translation> + <translation>Acquista versione Ultimate per finanziare lo sviluppo</translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> - <translation type="unfinished"></translation> + <translation>Registrate la vostra chiave</translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>File %1/%2, dimensione: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation>Lista di copia</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation>Lista di spostamento</translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> - <translation>Non chiudere se vengono trovati errori</translation> + <translation>Non chiudere se vengono rilevati errori</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation>Non chiudere mai</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> - <translation>Chiudere sempre</translation> + <translation>Chiudi sempre</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Nome file, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> - <translation>Selezionare colore</translation> + <translation>Seleziona colore</translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation>%1 %2% di %3</translation> </message> @@ -66,26 +66,26 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation>Non chiudere se vengono rilevati errori</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation>Non chiudere mai</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> - <translation>Chiudere sempre</translation> + <translation>Chiudi sempre</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> - <translation>Selezionare colore</translation> + <translation>Seleziona colore</translation> </message> </context> <context> @@ -103,22 +103,22 @@ <message> <location filename="../../interface.ui" line="235"/> <source>&More</source> - <translation>Avanzate</translation> + <translation>&Altro</translation> </message> <message> <location filename="../../interface.ui" line="255"/> <source>&Pause</source> - <translation>Pausa</translation> + <translation>&Pausa</translation> </message> <message> <location filename="../../interface.ui" line="269"/> <source>&Skip</source> - <translation>Salta</translation> + <translation>&Salta</translation> </message> <message> <location filename="../../interface.ui" line="280"/> <source>&Cancel</source> - <translation>Annulla</translation> + <translation>&Annulla</translation> </message> <message> <location filename="../../interface.ui" line="127"/> @@ -138,22 +138,22 @@ <message> <location filename="../../interface.ui" line="361"/> <source>Move the selected items to the top</source> - <translation>Metti elementi selezionati in cima</translation> + <translation>Sposta elementi selezionati in cima</translation> </message> <message> <location filename="../../interface.ui" line="387"/> <source>Move up the selected items</source> - <translation>Sposta elementi selezionati in sù</translation> + <translation>Sposta in su gli elementi selezionati</translation> </message> <message> <location filename="../../interface.ui" line="413"/> <source>Move down the selected items</source> - <translation>Sposta elementi selezionati in giù</translation> + <translation>Sposta in giù gli elementi selezionati</translation> </message> <message> <location filename="../../interface.ui" line="439"/> <source>Move the selected items to the bottom</source> - <translation>Metti elementi selezionati in coda</translation> + <translation>Sposta elementi selezionati in fondo</translation> </message> <message> <location filename="../../interface.ui" line="465"/> @@ -163,7 +163,7 @@ <message> <location filename="../../interface.ui" line="494"/> <source>Delete the selected items</source> - <translation>Elimina elementi selezionati</translation> + <translation>Elimina gli elementi selezionati</translation> </message> <message> <location filename="../../interface.ui" line="520"/> @@ -199,7 +199,7 @@ <message> <location filename="../../interface.ui" line="692"/> <source>Export the errors into transfer list</source> - <translation>Esporta errori in lista di trasferimento</translation> + <translation>Esporta nella lista di trasferimento gli errori</translation> </message> <message> <location filename="../../interface.ui" line="731"/> @@ -229,30 +229,30 @@ <message> <location filename="../../interface.ui" line="814"/> <source>Move file(s)</source> - <translation>Spostare file</translation> + <translation>Sposta (i) file</translation> </message> <message> <location filename="../../interface.ui" line="823"/> <source>Move folder</source> - <translation>Spostare cartella/e</translation> + <translation>Sposta cartella</translation> </message> <message> <location filename="../../interface.ui" line="832"/> <source>Copy file(s)</source> - <translation>Copiare file</translation> + <translation>Copia (i) file</translation> </message> <message> <location filename="../../interface.ui" line="841"/> <source>Copy folder</source> - <translation>Copiare cartella/e</translation> + <translation>Copia cartella</translation> </message> </context> <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> - <translation>Mostrare progressione duale</translation> + <translation>Visualizza progressione duale</translation> </message> <message> <location filename="../../themesOptions.ui" line="219"/> @@ -262,12 +262,12 @@ <message> <location filename="../../themesOptions.ui" line="44"/> <source>Use</source> - <translation>Funzionalità</translation> + <translation>Utilizza</translation> </message> <message> <location filename="../../themesOptions.ui" line="173"/> <source>Start with the "more button" pushed</source> - <translation>Avvio con bottone "Avanzate" premuto</translation> + <translation>Avvia con pulsante "Altro" attivo</translation> </message> <message> <location filename="../../themesOptions.ui" line="67"/> @@ -291,7 +291,12 @@ <translation>Avvia ridotto a icona</translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation>Cliccare per modificare colore</translation> </message> @@ -306,29 +311,34 @@ <translation>Salva posizione</translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation>Informazioni</translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation>Visualizzazione</translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> - <translation>Velocità in barra progresso</translation> + <translation>Velocità nella barra di progresso</translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation>Colore progressione</translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> - <translation>Mostra percentuale di progresso nel titolo</translation> + <translation>Visualizza progresso nel titolo</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation>Margine generale</translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation>Spaziatura generale</translation> </message> <message> <location filename="../../themesOptions.ui" line="183"/> diff --git a/plugins/Themes/Oxygen/Languages/ja/translation.ts b/plugins/Themes/Oxygen/Languages/ja/translation.ts index 88a695a..4973600 100755 --- a/plugins/Themes/Oxygen/Languages/ja/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ja/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.qm b/plugins/Themes/Oxygen/Languages/ko/translation.qm Binary files differindex 3738845..aeaedce 100755 --- a/plugins/Themes/Oxygen/Languages/ko/translation.qm +++ b/plugins/Themes/Oxygen/Languages/ko/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.ts b/plugins/Themes/Oxygen/Languages/ko/translation.ts index 4838264..3b5c3b3 100644 --- a/plugins/Themes/Oxygen/Languages/ko/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ko/translation.ts @@ -4,7 +4,7 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="+328"/> + <location filename="../../interface.cpp" line="+341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished">개발 지원을 위해 Ultimate 버전 구입</translation> </message> @@ -29,7 +29,7 @@ <translation type="unfinished">이동 목록</translation> </message> <message> - <location line="+428"/> + <location line="+441"/> <source>Don't close if errors are found</source> <translation type="unfinished">오류가 발견될 경우 닫지 않음</translation> </message> @@ -49,7 +49,7 @@ <translation type="unfinished">파일 이름, 0KB</translation> </message> <message> - <location line="+194"/> + <location line="+274"/> <location line="+12"/> <location line="+12"/> <source>Select a color</source> @@ -66,7 +66,7 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="+284"/> + <location filename="../../ThemesFactory.cpp" line="+294"/> <source>Don't close if errors are found</source> <translation type="unfinished">오류가 발견된 경우 닫지 않음</translation> </message> @@ -81,7 +81,7 @@ <translation type="unfinished">항상 닫기</translation> </message> <message> - <location line="+196"/> + <location line="+214"/> <location line="+15"/> <location line="+15"/> <source>Select a color</source> @@ -250,12 +250,12 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="+267"/> + <location filename="../../themesOptions.ui" line="+402"/> <source>Show dual progression</source> <translation type="unfinished">이중 진행 표시</translation> </message> <message> - <location line="-48"/> + <location line="-183"/> <source>Show speed as main information</source> <translation type="unfinished">주요 정보로 속도 표시</translation> </message> @@ -291,12 +291,17 @@ <translation type="unfinished">최소화된 시작</translation> </message> <message> - <location line="+253"/> + <location line="+160"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+56"/> <source>Click to edit the color</source> <translation type="unfinished">색상 편집 클릭</translation> </message> <message> - <location line="-159"/> + <location line="-122"/> <source> KB/s</source> <translation type="unfinished"> KB/초</translation> </message> @@ -306,32 +311,37 @@ <translation type="unfinished">위치 저장</translation> </message> <message> - <location line="+23"/> - <source>Informations</source> - <translation type="unfinished">정보</translation> - </message> - <message> - <location line="+38"/> + <location line="+61"/> <source>Display</source> <translation type="unfinished">표시</translation> </message> <message> - <location line="+6"/> + <location line="+117"/> <source>Speed with progress bar</source> <translation type="unfinished">진행 표시줄이 있는 속도</translation> </message> <message> - <location line="+30"/> + <location line="+10"/> <source>Progression color</source> <translation type="unfinished">진행 색상</translation> </message> <message> - <location line="-10"/> + <location line="+10"/> <source>Show progression in the title</source> <translation type="unfinished">제목에 진행률 표시</translation> </message> <message> - <location line="-94"/> + <location line="+7"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+30"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-242"/> <source>Always on top</source> <translation type="unfinished">항상 위에 놓기</translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/nl/translation.ts b/plugins/Themes/Oxygen/Languages/nl/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/nl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/nl/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/no/translation.ts +++ b/plugins/Themes/Oxygen/Languages/no/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/pl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pl/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/pt/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pt/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.qm b/plugins/Themes/Oxygen/Languages/ru/translation.qm Binary files differindex ff20604..e2563ef 100755 --- a/plugins/Themes/Oxygen/Languages/ru/translation.qm +++ b/plugins/Themes/Oxygen/Languages/ru/translation.qm diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.ts b/plugins/Themes/Oxygen/Languages/ru/translation.ts index 1ee6073..66a6a4c 100755 --- a/plugins/Themes/Oxygen/Languages/ru/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ru/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation>Файл %1/%2, размер: %3/%4</translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished">Копировать список</translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished">Не закрывать, если найдены ошибки</translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished">Никогда не закрывать</translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished">Всегда закрывайте</translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation>Имя файла, 0KB</translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished">Не закрывать, если найдены ошибки</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished">Никогда не закрывать</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished">Всегда закрывайте</translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -291,7 +291,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> @@ -306,31 +311,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../../themesOptions.ui" line="183"/> <source>Always on top</source> <translation type="unfinished"></translation> diff --git a/plugins/Themes/Oxygen/Languages/th/translation.ts b/plugins/Themes/Oxygen/Languages/th/translation.ts index e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/th/translation.ts +++ b/plugins/Themes/Oxygen/Languages/th/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 e7d9002..79e2ba9 100755 --- a/plugins/Themes/Oxygen/Languages/tr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/tr/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</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 88a695a..4973600 100755 --- a/plugins/Themes/Oxygen/Languages/zh/translation.ts +++ b/plugins/Themes/Oxygen/Languages/zh/translation.ts @@ -4,61 +4,61 @@ <context> <name>Themes</name> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Buy the Ultimate version to fund development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="328"/> + <location filename="../../interface.cpp" line="341"/> <source>Register your key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="427"/> + <location filename="../../interface.cpp" line="440"/> <source>File %1/%2, size: %3/%4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="661"/> + <location filename="../../interface.cpp" line="674"/> <source>Copy list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="663"/> + <location filename="../../interface.cpp" line="676"/> <source>Move list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1091"/> + <location filename="../../interface.cpp" line="1117"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1092"/> + <location filename="../../interface.cpp" line="1118"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1093"/> + <location filename="../../interface.cpp" line="1119"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1095"/> + <location filename="../../interface.cpp" line="1121"/> <source>File Name, 0KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1289"/> - <location filename="../../interface.cpp" line="1301"/> - <location filename="../../interface.cpp" line="1313"/> + <location filename="../../interface.cpp" line="1395"/> + <location filename="../../interface.cpp" line="1407"/> + <location filename="../../interface.cpp" line="1419"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../interface.cpp" line="1388"/> - <location filename="../../interface.cpp" line="1392"/> - <location filename="../../interface.cpp" line="1394"/> + <location filename="../../interface.cpp" line="1494"/> + <location filename="../../interface.cpp" line="1498"/> + <location filename="../../interface.cpp" line="1500"/> <source>%1 %2% of %3</source> <translation type="unfinished"></translation> </message> @@ -66,24 +66,24 @@ <context> <name>ThemesFactory</name> <message> - <location filename="../../ThemesFactory.cpp" line="284"/> + <location filename="../../ThemesFactory.cpp" line="294"/> <source>Don't close if errors are found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="285"/> + <location filename="../../ThemesFactory.cpp" line="295"/> <source>Never close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="286"/> + <location filename="../../ThemesFactory.cpp" line="296"/> <source>Always close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ThemesFactory.cpp" line="482"/> - <location filename="../../ThemesFactory.cpp" line="497"/> - <location filename="../../ThemesFactory.cpp" line="512"/> + <location filename="../../ThemesFactory.cpp" line="510"/> + <location filename="../../ThemesFactory.cpp" line="525"/> + <location filename="../../ThemesFactory.cpp" line="540"/> <source>Select a color</source> <translation type="unfinished"></translation> </message> @@ -250,7 +250,7 @@ <context> <name>themesOptions</name> <message> - <location filename="../../themesOptions.ui" line="267"/> + <location filename="../../themesOptions.ui" line="402"/> <source>Show dual progression</source> <translation type="unfinished"></translation> </message> @@ -301,32 +301,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="213"/> - <source>Informations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../themesOptions.ui" line="251"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="257"/> + <location filename="../../themesOptions.ui" line="368"/> <source>Speed with progress bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="287"/> + <location filename="../../themesOptions.ui" line="378"/> <source>Progression color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="306"/> + <location filename="../../themesOptions.ui" line="395"/> + <source>General margin</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="425"/> + <source>General spacing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="269"/> <source>Click to edit the color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../themesOptions.ui" line="277"/> + <location filename="../../themesOptions.ui" line="213"/> + <source>Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../themesOptions.ui" line="388"/> <source>Show progression in the title</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/Themes/Oxygen/ThemesFactory.cpp b/plugins/Themes/Oxygen/ThemesFactory.cpp index 8d3c090..f944deb 100755 --- a/plugins/Themes/Oxygen/ThemesFactory.cpp +++ b/plugins/Themes/Oxygen/ThemesFactory.cpp @@ -41,7 +41,9 @@ PluginInterface_Themes * ThemesFactory::getInstance() ui->checkBoxStartWithMoreButtonPushed->isChecked(), ui->minimizeToSystray->isChecked(), ui->startMinimized->isChecked(), - ui->savePosition->isChecked() + ui->savePosition->isChecked(), + ui->generalMargin->value(), + ui->generalSpacing->value() ); #ifdef ULTRACOPIER_PLUGIN_DEBUG if(!connect(newInterface,&Themes::debugInformation,this,&PluginInterface_ThemesFactory::debugInformation)) @@ -106,6 +108,8 @@ void ThemesFactory::setResources(OptionInterface * optionsEngine,const std::stri KeysList.push_back(std::pair<std::string, std::string>("savePosition","false")); KeysList.push_back(std::pair<std::string, std::string>("savePositionX","0")); KeysList.push_back(std::pair<std::string, std::string>("savePositionY","0")); + KeysList.push_back(std::pair<std::string, std::string>("generalMargin","0")); + KeysList.push_back(std::pair<std::string, std::string>("generalSpacing","0")); optionsEngine->addOptionGroup(KeysList); connect(optionsEngine,&OptionInterface::resetOptions,this,&ThemesFactory::resetOptions); updateSpeed(); @@ -135,6 +139,8 @@ QWidget * ThemesFactory::options() ui->minimizeToSystray->setChecked(stringtobool(optionsEngine->getOptionValue("minimizeToSystray"))); ui->startMinimized->setChecked(stringtobool(optionsEngine->getOptionValue("startMinimized"))); ui->savePosition->setChecked(stringtobool(optionsEngine->getOptionValue("savePosition"))); + ui->generalMargin->setValue(stringtoint8(optionsEngine->getOptionValue("generalMargin"))); + ui->generalSpacing->setValue(stringtoint8(optionsEngine->getOptionValue("generalSpacing"))); progressColorWrite=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorWrite"))).value<QColor>(); progressColorRead=QVariant(QString::fromStdString(optionsEngine->getOptionValue("progressColorRead"))).value<QColor>(); @@ -186,6 +192,10 @@ QWidget * ThemesFactory::options() abort(); if(!connect(ui->savePosition,&QCheckBox::stateChanged,this,&ThemesFactory::savePositionHaveChanged)) abort(); + if(!connect(ui->generalSpacing,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &ThemesFactory::uigeneralSpacing)) + abort(); + if(!connect(ui->generalMargin,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &ThemesFactory::uigeneralMargin)) + abort(); } else ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); @@ -382,6 +392,24 @@ void ThemesFactory::uiUpdateSpeed() ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); } +void ThemesFactory::uigeneralSpacing() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralSpacing: "+std::to_string(currentSpeed)); + if(optionsEngine!=NULL) + optionsEngine->setOptionValue("generalSpacing",std::to_string(ui->generalSpacing->value())); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); +} + +void ThemesFactory::uigeneralMargin() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralMargin: "+std::to_string(currentSpeed)); + if(optionsEngine!=NULL) + optionsEngine->setOptionValue("generalMargin",std::to_string(ui->generalMargin->value())); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"internal error, crash prevented"); +} + void ThemesFactory::updateSpeed() { if(optionsEngine==NULL) diff --git a/plugins/Themes/Oxygen/ThemesFactory.h b/plugins/Themes/Oxygen/ThemesFactory.h index e29d430..fed4313 100755 --- a/plugins/Themes/Oxygen/ThemesFactory.h +++ b/plugins/Themes/Oxygen/ThemesFactory.h @@ -71,6 +71,8 @@ private slots: void startMinimized(bool checked); void savePositionBeforeClose(QObject *obj); void savePositionHaveChanged(bool checked); + void uigeneralMargin(); + void uigeneralSpacing(); public slots: void resetOptions(); void newLanguageLoaded(); diff --git a/plugins/Themes/Oxygen/TransferModel.cpp b/plugins/Themes/Oxygen/TransferModel.cpp index 607658c..d06c8b3 100755 --- a/plugins/Themes/Oxygen/TransferModel.cpp +++ b/plugins/Themes/Oxygen/TransferModel.cpp @@ -502,15 +502,15 @@ TransferModel::currentTransfertItem TransferModel::getCurrentTransfertItem() con returnItem.progressBar_write=0; } break; - //should never pass here + //should never pass here -> why? case Ultracopier::PostOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: PostOperation").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=65535; returnItem.progressBar_write=65535; break; - //should never pass here + //should never pass here -> why? case Ultracopier::PreOperation: - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: %2").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,QStringLiteral("wrong action type for file %1: actionType: PreOperation").arg(itemTransfer.generalData.id).arg(itemTransfer.actionType).toStdString()); returnItem.progressBar_read=0; returnItem.progressBar_write=0; break; diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml index c944d32..68cc747 100755 --- 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>2.2.4.7</version> + <version>2.2.6.0</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 fa3b013..416443e 100755 --- a/plugins/Themes/Oxygen/interface.cpp +++ b/plugins/Themes/Oxygen/interface.cpp @@ -19,6 +19,9 @@ #endif #include <windows.h> #endif +#ifdef ULTRACOPIER_PLUGIN_DEBUG +#include <sys/stat.h> +#endif #include "interface.h" #include "ui_interface.h" @@ -56,7 +59,9 @@ Themes::Themes(const bool &alwaysOnTop, const bool &moreButtonPushed, const bool &minimizeToSystray, const bool &startMinimized, - const bool &savePosition) : + const bool &savePosition, + const qint8 &generalMargin, + const qint8 &generalSpacing) : duration(0), durationStarted(false), ui(new Ui::interfaceCopy()), @@ -105,6 +110,8 @@ Themes::Themes(const bool &alwaysOnTop, uiOptions->showDualProgression->setChecked(showDualProgression); uiOptions->startMinimized->setEnabled(false); uiOptions->alwaysOnTop->setChecked(alwaysOnTop); + uiOptions->generalMargin->setValue(generalMargin); + uiOptions->generalSpacing->setValue(generalSpacing); uiOptions->minimizeToSystray->setChecked(minimizeToSystray); //uiOptions->setupUi(ui->tabWidget->widget(ui->tabWidget->count()-1)); uiOptions->labelStartWithMoreButtonPushed->setVisible(false); @@ -133,6 +140,9 @@ Themes::Themes(const bool &alwaysOnTop, uiOptions->checkBoxShowSpeed->setChecked(checkBoxShowSpeed); menu=new QMenu(this); ui->add->setMenu(menu); + ui->interfaceLayout->setSpacing(uiOptions->generalSpacing->value()); + const quint8 &margin=uiOptions->generalMargin->value(); + ui->interfaceLayout->setContentsMargins(margin, margin, margin, margin); //connect the options checkBoxShowSpeed_toggled(uiOptions->checkBoxShowSpeed->isChecked()); @@ -145,11 +155,14 @@ Themes::Themes(const bool &alwaysOnTop, connect(uiOptions->progressColorRemaining,&QAbstractButton::clicked,this,&Themes::progressColorRemaining_clicked); connect(uiOptions->alwaysOnTop,&QAbstractButton::clicked,this,&Themes::alwaysOnTop_clickedSlot); - isInPause(false); - connect(uiOptions->limitSpeed, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &Themes::uiUpdateSpeed); connect(uiOptions->checkBox_limitSpeed,&QAbstractButton::toggled, this, &Themes::uiUpdateSpeed); + isInPause(false); + + connect(uiOptions->generalMargin, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &Themes::uigeneralMargin); + connect(uiOptions->generalSpacing, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &Themes::uigeneralSpacing); + connect(ui->actionAddFile,&QAction::triggered,this,&Themes::forcedModeAddFile); connect(ui->actionAddFileToCopy,&QAction::triggered,this,&Themes::forcedModeAddFileToCopy); connect(ui->actionAddFileToMove,&QAction::triggered,this,&Themes::forcedModeAddFileToMove); @@ -537,7 +550,7 @@ void Themes::detectedSpeed(const uint64_t &speed)//in byte per seconds tempSpeed=999999999; if(tempSpeed>(quint64)ui->progressBarCurrentSpeed->maximum()) { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set max speed to: "+std::to_string(tempSpeed)); + //ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"set max speed to: "+std::to_string(tempSpeed)); ui->progressBarCurrentSpeed->setMaximum(tempSpeed); } ui->progressBarCurrentSpeed->setValue(tempSpeed); @@ -917,6 +930,19 @@ void Themes::uiUpdateSpeed() emit newSpeedLimitation(currentSpeed); } +void Themes::uigeneralSpacing() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralSpacing"+std::to_string(uiOptions->generalSpacing->value())); + ui->interfaceLayout->setSpacing(uiOptions->generalSpacing->value()); +} + +void Themes::uigeneralMargin() +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"emit uigeneralMargin"+std::to_string(uiOptions->generalMargin->value())); + const quint8 &margin=uiOptions->generalMargin->value(); + ui->interfaceLayout->setContentsMargins(margin, margin, margin, margin); +} + void Themes::updateSpeed() { ui->label_Slider_speed->setVisible(uiOptions->checkBoxShowSpeed->isChecked()); @@ -1210,6 +1236,26 @@ void Themes::on_moreButton_toggled(bool checked) this->adjustSize(); } +#ifdef ULTRACOPIER_PLUGIN_DEBUG +bool stringStartWithInter(std::string const &fullString, std::string const &starting) +{ + if (fullString.length() >= starting.length()) { + return (fullString.substr(0,starting.length())==starting); + } else { + return false; + } +} + +#ifdef WIDESTRING +#define INTERNALTYPEPATH std::wstring +#define INTERNALTYPECHAR wchar_t +#else +#define INTERNALTYPEPATH std::string +#define INTERNALTYPECHAR char +#endif + +#endif + /* drag event processing need setAcceptDrops(true); into the constructor @@ -1224,6 +1270,13 @@ void Themes::dropEvent(QDropEvent *event) const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) { + if(event->dropAction()!=Qt::CopyAction) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"event->dropAction()!=Qt::CopyAction ignore"); + //drag'n'drop with shift pressed send the file to trash + event->ignore(); + return; + } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); std::vector<std::string> urls; unsigned int index=0; @@ -1235,6 +1288,51 @@ void Themes::dropEvent(QDropEvent *event) urls.push_back(urlString); index++; } + + #ifdef ULTRACOPIER_PLUGIN_DEBUG + { + + unsigned int index=0; + while(index<urls.size()) + { + std::string source=urls.at(index); + //can be: file://192.168.0.99/share/file.txt + //can be: file:///C:/file.txt + //can be: file:///home/user/fileatrootunderunix + #ifndef Q_OS_WIN + if(stringStartWithInter(source,"file:///")) + source.replace(0,7,""); + #else + if(stringStartWithInter(source,"file:///")) + source.replace(0,8,""); + else if(stringStartWithInter(source,"file://")) + source.replace(0,5,""); + else if(stringStartWithInter(source,"file:/")) + source.replace(0,6,""); + #endif + if(index<99) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,urls.at(index)+" -> "+source); + index++; + + #ifndef __WIN32__ + struct stat sb; + if (::stat(source.c_str(), &sb) == -1) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 0"); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 1"); + #else + DWORD dwAttrib = GetFileAttributesA(source.c_str()); + if(dwAttrib != INVALID_FILE_ATTRIBUTES && + (dwAttrib & FILE_ATTRIBUTE_NORMAL || dwAttrib & FILE_ATTRIBUTE_ARCHIVE) + ) + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 1"); + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"source is_file: 0"); + #endif + } + } + #endif + emit urlDropped(urls); event->acceptProposedAction(); } @@ -1248,7 +1346,10 @@ void Themes::dragEnterEvent(QDragEnterEvent* event) if(mimeData->hasUrls()) { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"hasUrls"); - event->acceptProposedAction(); + if(event->dropAction()==Qt::CopyAction) + event->acceptProposedAction(); + else + event->ignore();//drag'n'drop with shift pressed send the file to trash } } @@ -1257,7 +1358,12 @@ void Themes::dragMoveEvent(QDragMoveEvent* event) // if some actions should not be usable, like move, this code must be adopted const QMimeData* mimeData = event->mimeData(); if(mimeData->hasUrls()) - event->acceptProposedAction(); + { + if(event->dropAction()==Qt::CopyAction) + event->acceptProposedAction(); + else + event->ignore();//drag'n'drop with shift pressed send the file to trash + } } void Themes::dragLeaveEvent(QDragLeaveEvent* event) diff --git a/plugins/Themes/Oxygen/interface.h b/plugins/Themes/Oxygen/interface.h index b534b68..e263ad1 100755 --- a/plugins/Themes/Oxygen/interface.h +++ b/plugins/Themes/Oxygen/interface.h @@ -53,7 +53,7 @@ public: const bool &moreButtonPushed, const bool &minimizeToSystray, const bool &startMinimized, - const bool &savePosition); + const bool &savePosition, const qint8 &generalMargin, const qint8 &generalSpacing); ~Themes(); //send information about the copy /// \brief to set the action in progress @@ -129,6 +129,8 @@ private slots: void forcedModeAddFileToMove(); void forcedModeAddFolderToMove(); void uiUpdateSpeed(); + void uigeneralSpacing(); + void uigeneralMargin(); void on_pushButtonCloseSearch_clicked(); //close the search box void closeTheSearchBox(); diff --git a/plugins/Themes/Oxygen/interface.ui b/plugins/Themes/Oxygen/interface.ui index f3761bd..0e087a6 100755 --- a/plugins/Themes/Oxygen/interface.ui +++ b/plugins/Themes/Oxygen/interface.ui @@ -17,7 +17,7 @@ <iconset resource="interfaceResources.qrc"> <normaloff>:/Themes/Oxygen/resources/main.png</normaloff>:/Themes/Oxygen/resources/main.png</iconset> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="interfaceLayout"> <property name="spacing"> <number>2</number> </property> diff --git a/plugins/Themes/Oxygen/themesOptions.ui b/plugins/Themes/Oxygen/themesOptions.ui index 366ca68..e8db25b 100755 --- a/plugins/Themes/Oxygen/themesOptions.ui +++ b/plugins/Themes/Oxygen/themesOptions.ui @@ -29,15 +29,15 @@ <item> <widget class="QToolBox" name="toolBox"> <property name="currentIndex"> - <number>0</number> + <number>2</number> </property> <widget class="QWidget" name="page"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>509</width> - <height>292</height> + <width>551</width> + <height>279</height> </rect> </property> <attribute name="label"> @@ -205,12 +205,12 @@ <rect> <x>0</x> <y>0</y> - <width>509</width> - <height>292</height> + <width>519</width> + <height>293</height> </rect> </property> <attribute name="label"> - <string>Informations</string> + <string>Information</string> </attribute> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> @@ -243,51 +243,14 @@ <rect> <x>0</x> <y>0</y> - <width>509</width> - <height>292</height> + <width>519</width> + <height>293</height> </rect> </property> <attribute name="label"> <string>Display</string> </attribute> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="labelSpeedWithProgressBar"> - <property name="text"> - <string>Speed with progress bar</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="speedWithProgressBar"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="labelDualProgression"> - <property name="text"> - <string>Show dual progression</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="showDualProgression"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Show progression in the title</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QCheckBox" name="showProgressionInTheTitle"/> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="labelProgressionColor"> - <property name="text"> - <string>Progression color</string> - </property> - </widget> - </item> <item row="3" column="1"> <widget class="QFrame" name="frameProgressionColor"> <property name="minimumSize"> @@ -399,7 +362,48 @@ </layout> </widget> </item> + <item row="0" column="0"> + <widget class="QLabel" name="labelSpeedWithProgressBar"> + <property name="text"> + <string>Speed with progress bar</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="showProgressionInTheTitle"/> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="labelProgressionColor"> + <property name="text"> + <string>Progression color</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="showDualProgression"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Show progression in the title</string> + </property> + </widget> + </item> <item row="4" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>General margin</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="labelDualProgression"> + <property name="text"> + <string>Show dual progression</string> + </property> + </widget> + </item> + <item row="6" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -412,6 +416,22 @@ </property> </spacer> </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="speedWithProgressBar"/> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>General spacing</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QSpinBox" name="generalMargin"/> + </item> + <item row="5" column="1"> + <widget class="QSpinBox" name="generalSpacing"/> + </item> </layout> </widget> </widget> |