ImportDialog improved

2018-07-25 20:52:30 +02:00 · 2018-07-25 20:52:30 +02:00 · b02f06ae97
commit b02f06ae97
parent 193bb60caa
16 changed files with 1060 additions and 278 deletions
--- a/res/gta5sync_ru.ts
+++ b/res/gta5sync_ru.ts
@ -98,7 +98,8 @@ Pictures and Savegames</source>
    <message>
        <location filename="../config.h" line="88"/>
        <source>Custom</source>
-        <translatorcomment>Не известен контекст</translatorcomment>
+        <translatorcomment>Не известен контекст
+</translatorcomment>
        <translation>Своя</translation>
    </message>
 </context>
@ -116,7 +117,8 @@ Pictures and Savegames</source>
    <message>
        <location filename="../ExportDialog.ui" line="14"/>
        <source>Dialog</source>
-        <translatorcomment>Возможно не это имелось ввиду, немецкого перевода нету</translatorcomment>
+        <translatorcomment>Возможно не это имелось ввиду, немецкого перевода нету
+</translatorcomment>
        <translation>Диалоговое окно</translation>
    </message>
    <message>
@ -189,14 +191,14 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="14"/>
-        <location filename="../ImportDialog.cpp" line="465"/>
+        <location filename="../ImportDialog.cpp" line="635"/>
        <source>Overwrite Image...</source>
        <translation>Перезаписать картинку...</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="59"/>
        <source>Import picture</source>
-        <translation type="unfinished">Импортировать картинку</translation>
+        <translation>Импортировать картинку</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="62"/>
@ -205,25 +207,25 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="82"/>
-        <location filename="../ImportDialog.cpp" line="467"/>
+        <location filename="../ImportDialog.cpp" line="637"/>
        <source>Apply changes</source>
-        <translation type="unfinished">Применить изменения</translation>
+        <translation>Применить изменения</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="85"/>
-        <location filename="../ImportDialog.cpp" line="466"/>
+        <location filename="../ImportDialog.cpp" line="636"/>
        <source>&amp;Overwrite</source>
        <translation>&amp;Перезаписать</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="92"/>
-        <location filename="../ImportDialog.cpp" line="469"/>
+        <location filename="../ImportDialog.cpp" line="639"/>
        <source>Discard changes</source>
-        <translation type="unfinished">Отвергнуть изменения</translation>
+        <translation>Отменить изменения</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="95"/>
-        <location filename="../ImportDialog.cpp" line="468"/>
+        <location filename="../ImportDialog.cpp" line="638"/>
        <source>&amp;Close</source>
        <translation>&amp;Закрыть</translation>
    </message>
@ -277,15 +279,16 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="150"/>
-        <location filename="../ImportDialog.cpp" line="86"/>
-        <location filename="../ImportDialog.cpp" line="553"/>
+        <location filename="../ImportDialog.cpp" line="94"/>
+        <location filename="../ImportDialog.cpp" line="311"/>
+        <location filename="../ImportDialog.cpp" line="723"/>
        <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
        <translation>Цвет фона: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="174"/>
        <source>Select background colour</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите цвет фона</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="177"/>
@ -296,7 +299,7 @@ Pictures and Savegames</source>
    <message>
        <location filename="../ImportDialog.ui" line="227"/>
        <source>Select background image</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать фоновое изображение</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="237"/>
@ -304,14 +307,16 @@ Pictures and Savegames</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="618"/>
+        <location filename="../ImportDialog.cpp" line="314"/>
+        <location filename="../ImportDialog.cpp" line="788"/>
        <source>Background Image: %1</source>
        <translation>Фоновая картинка: %1</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="240"/>
        <source>X</source>
-        <translatorcomment>latin X</translatorcomment>
+        <translatorcomment>latin X
+</translatorcomment>
        <translation>X</translation>
    </message>
    <message>
@ -347,73 +352,147 @@ Pictures and Savegames</source>
    <message>
        <location filename="../ImportDialog.ui" line="356"/>
        <source>&amp;Cancel</source>
-        <translatorcomment>Я не уверен насчет горячих клавиш...</translatorcomment>
+        <translatorcomment>Я не уверен насчет горячих клавиш...
+</translatorcomment>
        <translation>От&amp;мена</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="203"/>
-        <location filename="../ImportDialog.cpp" line="87"/>
-        <location filename="../ImportDialog.cpp" line="633"/>
+        <location filename="../ImportDialog.cpp" line="95"/>
+        <location filename="../ImportDialog.cpp" line="319"/>
+        <location filename="../ImportDialog.cpp" line="803"/>
        <source>Background Image:</source>
        <translation>Фоновая картинка:</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="112"/>
+        <location filename="../ImportDialog.cpp" line="120"/>
        <source>&amp;Import new Picture...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="113"/>
+        <location filename="../ImportDialog.cpp" line="121"/>
        <source>&amp;Crop Picture...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="186"/>
+        <location filename="../ImportDialog.cpp" line="123"/>
+        <source>&amp;Load Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="124"/>
+        <source>&amp;Save Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="197"/>
        <location filename="../ProfileInterface.cpp" line="668"/>
        <source>Custom Avatar</source>
        <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
        <translation>Свой Аватар</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="213"/>
+        <location filename="../ImportDialog.cpp" line="224"/>
        <location filename="../ProfileInterface.cpp" line="687"/>
        <source>Custom Picture</source>
        <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
        <translation>Своя Картинка</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="271"/>
+        <location filename="../ImportDialog.cpp" line="314"/>
+        <source>Storage</source>
+        <comment>Background Image: Storage</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="351"/>
        <source>Crop Picture...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="313"/>
+        <location filename="../ImportDialog.cpp" line="393"/>
        <source>&amp;Crop</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="314"/>
+        <location filename="../ImportDialog.cpp" line="394"/>
        <source>Crop Picture</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../ImportDialog.cpp" line="481"/>
+        <location filename="../ImportDialog.cpp" line="529"/>
+        <source>Please import a new picture first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="486"/>
+        <location filename="../ImportDialog.cpp" line="496"/>
+        <source>Default</source>
+        <comment>Default as Default Profile</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="487"/>
+        <location filename="../ImportDialog.cpp" line="488"/>
+        <location filename="../ImportDialog.cpp" line="489"/>
+        <location filename="../ImportDialog.cpp" line="490"/>
+        <location filename="../ImportDialog.cpp" line="491"/>
        <location filename="../ImportDialog.cpp" line="500"/>
+        <location filename="../ImportDialog.cpp" line="504"/>
+        <location filename="../ImportDialog.cpp" line="508"/>
+        <location filename="../ImportDialog.cpp" line="512"/>
+        <location filename="../ImportDialog.cpp" line="516"/>
+        <location filename="../ImportDialog.cpp" line="534"/>
+        <location filename="../ImportDialog.cpp" line="535"/>
+        <location filename="../ImportDialog.cpp" line="536"/>
+        <location filename="../ImportDialog.cpp" line="537"/>
+        <location filename="../ImportDialog.cpp" line="538"/>
+        <location filename="../ImportDialog.cpp" line="543"/>
+        <location filename="../ImportDialog.cpp" line="547"/>
+        <location filename="../ImportDialog.cpp" line="551"/>
+        <location filename="../ImportDialog.cpp" line="555"/>
+        <location filename="../ImportDialog.cpp" line="559"/>
+        <source>Profile %1</source>
+        <comment>Profile %1 as Profile 1</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="481"/>
+        <location filename="../ImportDialog.cpp" line="492"/>
+        <source>Load Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="492"/>
+        <location filename="../ImportDialog.cpp" line="539"/>
+        <source>Please select your settings profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="529"/>
+        <location filename="../ImportDialog.cpp" line="539"/>
+        <source>Save Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="670"/>
        <source>Are you sure to use a square image outside of the Avatar Zone?
 When you want to use it as Avatar the image will be detached!</source>
        <translation>Ты точно хочешь использовать квадратное изображение вне зоны аватарки? Если это аватар, то изображение будет обрезано!</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="500"/>
+        <location filename="../ImportDialog.cpp" line="670"/>
        <source>Snapmatic Avatar Zone</source>
        <translation>Зона Snapmatic Аватарки</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="549"/>
+        <location filename="../ImportDialog.cpp" line="719"/>
        <source>Select Colour...</source>
        <translation>Выбрать цвет...</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="618"/>
+        <location filename="../ImportDialog.cpp" line="788"/>
        <source>File</source>
        <comment>Background Image: File</comment>
        <translation>Файл</translation>
@ -429,7 +508,7 @@ When you want to use it as Avatar the image will be detached!</source>
    <message>
        <location filename="../JsonEditorDialog.ui" line="116"/>
        <source>Apply changes</source>
-        <translation type="unfinished">Применить изменения</translation>
+        <translation>Применить изменения</translation>
    </message>
    <message>
        <location filename="../JsonEditorDialog.ui" line="119"/>
@ -439,7 +518,7 @@ When you want to use it as Avatar the image will be detached!</source>
    <message>
        <location filename="../JsonEditorDialog.ui" line="132"/>
        <source>Discard changes</source>
-        <translation type="unfinished">Отвергнуть изменения</translation>
+        <translation>Отменить изменения</translation>
    </message>
    <message>
        <location filename="../JsonEditorDialog.ui" line="135"/>
@ -462,7 +541,7 @@ When you want to use it as Avatar the image will be detached!</source>
    <message>
        <location filename="../MapLocationDialog.ui" line="138"/>
        <source>Close viewer</source>
-        <translation type="unfinished">Закрыть просмотрщик</translation>
+        <translation>Закрыть просмотрщик</translation>
    </message>
    <message>
        <location filename="../MapLocationDialog.ui" line="141"/>
@ -675,7 +754,8 @@ Y: %2</translation>
    <message>
        <location filename="../OptionsDialog.ui" line="434"/>
        <source>Hardware, Application and OS Specification</source>
-        <translatorcomment>Application = gta5view</translatorcomment>
+        <translatorcomment>Application = gta5view
+</translatorcomment>
        <translation>Железо, выпуск программы, тип ОС</translation>
    </message>
    <message>
@ -708,7 +788,8 @@ Y: %2</translation>
    <message>
        <location filename="../OptionsDialog.ui" line="558"/>
        <source>Language for Areas</source>
-        <translatorcomment>Язык для местоположений?</translatorcomment>
+        <translatorcomment>Язык для местоположений?
+</translatorcomment>
        <translation>Язык перевода местоположений</translation>
    </message>
    <message>
@ -785,7 +866,7 @@ Y: %2</translation>
        <location filename="../OptionsDialog.cpp" line="153"/>
        <source>%1 (Next Closest Language)</source>
        <comment>First language a person can talk with a different person/application. &quot;Native&quot; or &quot;Not Native&quot;.</comment>
-        <translation></translation>
+        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../OptionsDialog.cpp" line="153"/>
@ -1168,13 +1249,14 @@ Press 1 for Default View</source>
    <message>
        <location filename="../ProfileInterface.cpp" line="409"/>
        <source>&lt;h4&gt;Following Snapmatic Pictures got repaired&lt;/h4&gt;%1</source>
-        <translatorcomment>Change wording if the %1 is not a multiline beginning at new line</translatorcomment>
+        <translatorcomment>Change wording if the %1 is not a multiline beginning at new line
+</translatorcomment>
        <translation>&lt;h4&gt;Нижеследующие картинки Snapmatic были восстановлены&lt;/h4&gt;%1</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="109"/>
-        <location filename="../ImportDialog.cpp" line="342"/>
-        <location filename="../ImportDialog.cpp" line="572"/>
+        <location filename="../ImportDialog.cpp" line="422"/>
+        <location filename="../ImportDialog.cpp" line="742"/>
        <location filename="../ProfileInterface.cpp" line="482"/>
        <location filename="../ProfileInterface.cpp" line="548"/>
        <location filename="../ProfileInterface.cpp" line="857"/>
@ -1185,12 +1267,12 @@ Press 1 for Default View</source>
        <location filename="../ImageEditorDialog.cpp" line="110"/>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
        <location filename="../ImageEditorDialog.cpp" line="150"/>
-        <location filename="../ImportDialog.cpp" line="343"/>
-        <location filename="../ImportDialog.cpp" line="374"/>
-        <location filename="../ImportDialog.cpp" line="383"/>
-        <location filename="../ImportDialog.cpp" line="573"/>
-        <location filename="../ImportDialog.cpp" line="604"/>
-        <location filename="../ImportDialog.cpp" line="613"/>
+        <location filename="../ImportDialog.cpp" line="423"/>
+        <location filename="../ImportDialog.cpp" line="454"/>
+        <location filename="../ImportDialog.cpp" line="463"/>
+        <location filename="../ImportDialog.cpp" line="743"/>
+        <location filename="../ImportDialog.cpp" line="774"/>
+        <location filename="../ImportDialog.cpp" line="783"/>
        <location filename="../ProfileInterface.cpp" line="483"/>
        <location filename="../ProfileInterface.cpp" line="527"/>
        <location filename="../ProfileInterface.cpp" line="582"/>
@ -1222,8 +1304,8 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="121"/>
-        <location filename="../ImportDialog.cpp" line="354"/>
-        <location filename="../ImportDialog.cpp" line="584"/>
+        <location filename="../ImportDialog.cpp" line="434"/>
+        <location filename="../ImportDialog.cpp" line="754"/>
        <location filename="../ProfileInterface.cpp" line="503"/>
        <location filename="../UserInterface.cpp" line="463"/>
        <source>All files (**)</source>
@ -1275,24 +1357,24 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="120"/>
-        <location filename="../ImportDialog.cpp" line="353"/>
-        <location filename="../ImportDialog.cpp" line="583"/>
+        <location filename="../ImportDialog.cpp" line="433"/>
+        <location filename="../ImportDialog.cpp" line="753"/>
        <location filename="../ProfileInterface.cpp" line="502"/>
        <source>All image files (%1)</source>
        <translation>Все файлы изображений (%1)</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
-        <location filename="../ImportDialog.cpp" line="374"/>
-        <location filename="../ImportDialog.cpp" line="604"/>
+        <location filename="../ImportDialog.cpp" line="454"/>
+        <location filename="../ImportDialog.cpp" line="774"/>
        <location filename="../ProfileInterface.cpp" line="725"/>
        <source>Can&apos;t import %1 because file can&apos;t be open</source>
        <translation>Не удалось открыть %1, файл не может быть открыт</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="150"/>
-        <location filename="../ImportDialog.cpp" line="383"/>
-        <location filename="../ImportDialog.cpp" line="613"/>
+        <location filename="../ImportDialog.cpp" line="463"/>
+        <location filename="../ImportDialog.cpp" line="783"/>
        <location filename="../ProfileInterface.cpp" line="735"/>
        <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
        <translation>Не получилось импортировать %1, файл не может быть правильно обработан</translation>
@ -1843,11 +1925,21 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../SnapmaticEditor.ui" line="240"/>
+        <source>Apply changes</source>
+        <translation type="unfinished">Применить изменения</translation>
+    </message>
+    <message>
+        <location filename="../SnapmaticEditor.ui" line="243"/>
        <source>&amp;Apply</source>
        <translation>&amp;Применить</translation>
    </message>
    <message>
-        <location filename="../SnapmaticEditor.ui" line="253"/>
+        <location filename="../SnapmaticEditor.ui" line="256"/>
+        <source>Discard changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../SnapmaticEditor.ui" line="259"/>
        <source>&amp;Cancel</source>
        <translation>&amp;Отмена</translation>
    </message>
@ -2124,7 +2216,7 @@ Press 1 for Default View</source>
    <message>
        <location filename="../main.cpp" line="173"/>
        <source>&amp;OK</source>
-        <translation type="unfinished">&amp;ОК</translation>
+        <translation>&amp;ОК</translation>
    </message>
 </context>
 <context>