add unlimited buffer and import as-is
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Syping 2020-11-16 15:29:31 +01:00
parent f6f75c1f89
commit 2b2cfc210f
13 changed files with 1242 additions and 799 deletions

View file

@ -188,27 +188,27 @@ Pictures and Savegames</source>
<translation>Редактор картинок Snapmatic</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="640"/>
<location filename="../ImportDialog.cpp" line="685"/>
<source>Overwrite Image...</source>
<translation>Перезаписать картинку...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="642"/>
<location filename="../ImportDialog.cpp" line="687"/>
<source>Apply changes</source>
<translation>Применить изменения</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="641"/>
<location filename="../ImportDialog.cpp" line="686"/>
<source>&amp;Overwrite</source>
<translation>&amp;Перезаписать</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="644"/>
<location filename="../ImportDialog.cpp" line="689"/>
<source>Discard changes</source>
<translation>Отменить изменения</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="643"/>
<location filename="../ImportDialog.cpp" line="688"/>
<source>&amp;Close</source>
<translation>&amp;Закрыть</translation>
</message>
@ -260,9 +260,9 @@ Pictures and Savegames</source>
</message>
<message>
<location filename="../ImportDialog.ui" line="150"/>
<location filename="../ImportDialog.cpp" line="87"/>
<location filename="../ImportDialog.cpp" line="315"/>
<location filename="../ImportDialog.cpp" line="728"/>
<location filename="../ImportDialog.cpp" line="86"/>
<location filename="../ImportDialog.cpp" line="351"/>
<location filename="../ImportDialog.cpp" line="777"/>
<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>
@ -288,8 +288,13 @@ Pictures and Savegames</source>
<translation>Убрать фоновую картинку</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="318"/>
<location filename="../ImportDialog.cpp" line="793"/>
<location filename="../ImportDialog.ui" line="345"/>
<source>Import as-is, don&apos;t change the picture at all, guarantee to break Snapmatic unless you know what you doing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="353"/>
<location filename="../ImportDialog.cpp" line="842"/>
<source>Background Image: %1</source>
<translation>Фоновая картинка: %1</translation>
</message>
@ -306,32 +311,62 @@ Pictures and Savegames</source>
<translation>Задать цвет в зоне аватарки</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="305"/>
<location filename="../ImportDialog.ui" line="303"/>
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="311"/>
<source>Resolution:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="324"/>
<source>Snapmatic resolution</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="335"/>
<source>Avoid compression and expand buffer instead, improves picture quality, but may break Snapmatic</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="338"/>
<source>Unlimited Buffer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="348"/>
<source>Import as-is</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="362"/>
<source>Import options</source>
<translation>Опции импорта</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="308"/>
<location filename="../ImportDialog.ui" line="365"/>
<source>&amp;Options</source>
<translation>&amp;Опции</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="337"/>
<location filename="../ImportDialog.ui" line="394"/>
<source>Import picture</source>
<translation>Импортировать картинку</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="340"/>
<location filename="../ImportDialog.ui" line="397"/>
<source>&amp;OK</source>
<translation>&amp;ОК</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="353"/>
<location filename="../ImportDialog.ui" line="410"/>
<source>Discard picture</source>
<translation>Отклонить картинку</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="356"/>
<location filename="../ImportDialog.ui" line="413"/>
<source>&amp;Cancel</source>
<translatorcomment>Я не уверен насчет горячих клавиш...
</translatorcomment>
@ -339,141 +374,143 @@ Pictures and Savegames</source>
</message>
<message>
<location filename="../ImportDialog.ui" line="203"/>
<location filename="../ImportDialog.cpp" line="88"/>
<location filename="../ImportDialog.cpp" line="323"/>
<location filename="../ImportDialog.cpp" line="808"/>
<location filename="../ImportDialog.cpp" line="87"/>
<location filename="../ImportDialog.cpp" line="357"/>
<location filename="../ImportDialog.cpp" line="857"/>
<source>Background Image:</source>
<translation>Фоновая картинка:</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="120"/>
<location filename="../ImportDialog.cpp" line="126"/>
<source>&amp;Import new Picture...</source>
<translation>&amp;Импортировать картинку...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="121"/>
<location filename="../ImportDialog.cpp" line="127"/>
<source>&amp;Crop Picture...</source>
<translation>Об&amp;резать картинку...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="123"/>
<location filename="../ImportDialog.cpp" line="129"/>
<source>&amp;Load Settings...</source>
<translation>&amp;Загрузить настройки...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="124"/>
<location filename="../ImportDialog.cpp" line="130"/>
<source>&amp;Save Settings...</source>
<translation>&amp;Сохранить настройки...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="198"/>
<location filename="../ImportDialog.cpp" line="195"/>
<location filename="../ProfileInterface.cpp" line="721"/>
<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="225"/>
<location filename="../ImportDialog.cpp" line="218"/>
<location filename="../ProfileInterface.cpp" line="740"/>
<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="318"/>
<location filename="../ImportDialog.cpp" line="353"/>
<source>Storage</source>
<comment>Background Image: Storage</comment>
<translation>Хранилище</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="355"/>
<location filename="../ImportDialog.cpp" line="398"/>
<source>Crop Picture...</source>
<translation>Обрезать картинку...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="397"/>
<location filename="../ImportDialog.cpp" line="440"/>
<source>&amp;Crop</source>
<translation>Об&amp;резать</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="398"/>
<location filename="../ImportDialog.cpp" line="441"/>
<source>Crop Picture</source>
<translation>Обрезать картинку</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="485"/>
<location filename="../ImportDialog.cpp" line="533"/>
<location filename="../ImportDialog.cpp" line="528"/>
<location filename="../ImportDialog.cpp" line="576"/>
<source>Please import a new picture first</source>
<translation>Импортируй сначала новую картинку</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="490"/>
<location filename="../ImportDialog.cpp" line="500"/>
<location filename="../ImportDialog.cpp" line="533"/>
<location filename="../ImportDialog.cpp" line="543"/>
<source>Default</source>
<comment>Default as Default Profile</comment>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="491"/>
<location filename="../ImportDialog.cpp" line="492"/>
<location filename="../ImportDialog.cpp" line="493"/>
<location filename="../ImportDialog.cpp" line="494"/>
<location filename="../ImportDialog.cpp" line="495"/>
<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="520"/>
<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="539"/>
<location filename="../ImportDialog.cpp" line="540"/>
<location filename="../ImportDialog.cpp" line="541"/>
<location filename="../ImportDialog.cpp" line="542"/>
<location filename="../ImportDialog.cpp" line="547"/>
<location filename="../ImportDialog.cpp" line="551"/>
<location filename="../ImportDialog.cpp" line="555"/>
<location filename="../ImportDialog.cpp" line="559"/>
<location filename="../ImportDialog.cpp" line="563"/>
<location filename="../ImportDialog.cpp" line="581"/>
<location filename="../ImportDialog.cpp" line="582"/>
<location filename="../ImportDialog.cpp" line="583"/>
<location filename="../ImportDialog.cpp" line="584"/>
<location filename="../ImportDialog.cpp" line="585"/>
<location filename="../ImportDialog.cpp" line="590"/>
<location filename="../ImportDialog.cpp" line="594"/>
<location filename="../ImportDialog.cpp" line="598"/>
<location filename="../ImportDialog.cpp" line="602"/>
<location filename="../ImportDialog.cpp" line="606"/>
<source>Profile %1</source>
<comment>Profile %1 as Profile 1</comment>
<translation>Профиль %1</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="485"/>
<location filename="../ImportDialog.cpp" line="496"/>
<location filename="../ImportDialog.cpp" line="528"/>
<location filename="../ImportDialog.cpp" line="539"/>
<source>Load Settings...</source>
<translation>Загрузить настройки...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="496"/>
<location filename="../ImportDialog.cpp" line="543"/>
<location filename="../ImportDialog.cpp" line="539"/>
<location filename="../ImportDialog.cpp" line="586"/>
<source>Please select your settings profile</source>
<translation>Пожалуйста, выбери профиль для настроек</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="533"/>
<location filename="../ImportDialog.cpp" line="543"/>
<location filename="../ImportDialog.cpp" line="576"/>
<location filename="../ImportDialog.cpp" line="586"/>
<source>Save Settings...</source>
<translation>Сохранить настройки...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="675"/>
<location filename="../ImportDialog.cpp" line="727"/>
<location filename="../ImportDialog.cpp" line="909"/>
<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="675"/>
<location filename="../ImportDialog.cpp" line="727"/>
<location filename="../ImportDialog.cpp" line="909"/>
<source>Snapmatic Avatar Zone</source>
<translation>Зона Snapmatic Аватарки</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="724"/>
<location filename="../ImportDialog.cpp" line="773"/>
<source>Select Colour...</source>
<translation>Выбрать цвет...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="793"/>
<location filename="../ImportDialog.cpp" line="842"/>
<source>File</source>
<comment>Background Image: File</comment>
<translation>Файл</translation>
@ -1311,8 +1348,8 @@ Press 1 for Default View</source>
<translation>&lt;h4&gt;Нижеследующие картинки Snapmatic были восстановлены&lt;/h4&gt;%1</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="426"/>
<location filename="../ImportDialog.cpp" line="747"/>
<location filename="../ImportDialog.cpp" line="469"/>
<location filename="../ImportDialog.cpp" line="796"/>
<location filename="../ProfileInterface.cpp" line="496"/>
<location filename="../ProfileInterface.cpp" line="497"/>
<location filename="../ProfileInterface.cpp" line="541"/>
@ -1334,12 +1371,12 @@ Press 1 for Default View</source>
<translation>Импортировать...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="427"/>
<location filename="../ImportDialog.cpp" line="458"/>
<location filename="../ImportDialog.cpp" line="467"/>
<location filename="../ImportDialog.cpp" line="748"/>
<location filename="../ImportDialog.cpp" line="779"/>
<location filename="../ImportDialog.cpp" line="788"/>
<location filename="../ImportDialog.cpp" line="470"/>
<location filename="../ImportDialog.cpp" line="501"/>
<location filename="../ImportDialog.cpp" line="510"/>
<location filename="../ImportDialog.cpp" line="797"/>
<location filename="../ImportDialog.cpp" line="828"/>
<location filename="../ImportDialog.cpp" line="837"/>
<source>Import</source>
<translation>Импортировать</translation>
</message>
@ -1356,8 +1393,8 @@ Press 1 for Default View</source>
<translation>Картинка Snapmatic (PGTA*)</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="438"/>
<location filename="../ImportDialog.cpp" line="759"/>
<location filename="../ImportDialog.cpp" line="481"/>
<location filename="../ImportDialog.cpp" line="808"/>
<location filename="../ProfileInterface.cpp" line="517"/>
<location filename="../UserInterface.cpp" line="477"/>
<source>All files (**)</source>
@ -1408,22 +1445,22 @@ Press 1 for Default View</source>
<translation>Файлы для импорта (%1)</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="437"/>
<location filename="../ImportDialog.cpp" line="758"/>
<location filename="../ImportDialog.cpp" line="480"/>
<location filename="../ImportDialog.cpp" line="807"/>
<location filename="../ProfileInterface.cpp" line="516"/>
<source>All image files (%1)</source>
<translation>Все файлы изображений (%1)</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="458"/>
<location filename="../ImportDialog.cpp" line="779"/>
<location filename="../ImportDialog.cpp" line="501"/>
<location filename="../ImportDialog.cpp" line="828"/>
<location filename="../ProfileInterface.cpp" line="786"/>
<source>Can&apos;t import %1 because file can&apos;t be open</source>
<translation>Не удалось открыть %1, файл не может быть открыт</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="467"/>
<location filename="../ImportDialog.cpp" line="788"/>
<location filename="../ImportDialog.cpp" line="510"/>
<location filename="../ImportDialog.cpp" line="837"/>
<location filename="../ProfileInterface.cpp" line="796"/>
<source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
<translation>Не получилось импортировать %1, файл не может быть правильно обработан</translation>
@ -2055,7 +2092,7 @@ Press 1 for Default View</source>
<context>
<name>SnapmaticPicture</name>
<message>
<location filename="../SnapmaticPicture.cpp" line="159"/>
<location filename="../SnapmaticPicture.cpp" line="154"/>
<source>PHOTO - %1</source>
<translation>ФОТО - %1</translation>
</message>
@ -2065,56 +2102,56 @@ Press 1 for Default View</source>
<translation>Открыть файл %1</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="330"/>
<location filename="../SnapmaticPicture.cpp" line="329"/>
<source>header not exists</source>
<translation>Отсутствует шапка (header)</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="334"/>
<location filename="../SnapmaticPicture.cpp" line="333"/>
<source>header is malformed</source>
<translation>Шапка (header) повреждена</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="338"/>
<location filename="../SnapmaticPicture.cpp" line="337"/>
<source>picture not exists (%1)</source>
<translation>Картинки не существует (%1)</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="342"/>
<location filename="../SnapmaticPicture.cpp" line="341"/>
<source>JSON not exists (%1)</source>
<translation>JSON не существует (%1)</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="346"/>
<location filename="../SnapmaticPicture.cpp" line="345"/>
<source>title not exists (%1)</source>
<translation>Заголовок отсутствует (%1)</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="350"/>
<location filename="../SnapmaticPicture.cpp" line="349"/>
<source>description not exists (%1)</source>
<translation>Описание отсутствует (%1)</translation>
</message>
<message>
<location filename="../SnapmaticPicture.cpp" line="364"/>
<location filename="../SnapmaticPicture.cpp" line="363"/>
<source>reading file %1 because of %2</source>
<comment>Example for %2: JSON is malformed error</comment>
<translation>Чтение из файла %1 из-за %2</translation>
</message>
<message>
<location filename="../JsonEditorDialog.cpp" line="177"/>
<location filename="../SnapmaticPicture.cpp" line="354"/>
<location filename="../SnapmaticPicture.cpp" line="353"/>
<source>JSON is incomplete and malformed</source>
<translation>JSON не полный и повреждён</translation>
</message>
<message>
<location filename="../JsonEditorDialog.cpp" line="181"/>
<location filename="../SnapmaticPicture.cpp" line="358"/>
<location filename="../SnapmaticPicture.cpp" line="357"/>
<source>JSON is incomplete</source>
<translation>JSON частично отсутствует</translation>
</message>
<message>
<location filename="../JsonEditorDialog.cpp" line="185"/>
<location filename="../SnapmaticPicture.cpp" line="362"/>
<location filename="../SnapmaticPicture.cpp" line="361"/>
<source>JSON is malformed</source>
<translation>JSON повреждён</translation>
</message>