add watermark

This commit is contained in:
Syping 2018-07-09 20:39:27 +02:00
parent 714be43280
commit 5f35428cd0
38 changed files with 351 additions and 222 deletions

View file

@ -52,6 +52,8 @@ ImportDialog::ImportDialog(QWidget *parent) :
ui->setupUi(this);
importAgreed = false;
watermarkAvatar = true;
watermarkPicture = false;
insideAvatarZone = false;
avatarAreaImage = QImage(":/img/avatarareaimport.png");
selectedColour = QColor::fromRgb(0, 0, 0, 255);
@ -169,6 +171,7 @@ void ImportDialog::processImage()
snapmaticImage = snapmaticImage.scaled(snapmaticAvatarResolution, snapmaticAvatarResolution, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
}
snapmaticPainter.drawImage(snapmaticAvatarPlacementW + diffWidth, snapmaticAvatarPlacementH + diffHeight, snapmaticImage);
if (ui->cbWatermark->isChecked()) { processWatermark(&snapmaticPainter); }
imageTitle = tr("Custom Avatar", "Custom Avatar Description in SC, don't use Special Character!");
}
else
@ -195,6 +198,7 @@ void ImportDialog::processImage()
snapmaticImage = snapmaticImage.scaled(snapmaticResolutionW, snapmaticResolutionH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
}
snapmaticPainter.drawImage(0 + diffWidth, 0 + diffHeight, snapmaticImage);
if (ui->cbWatermark->isChecked()) { processWatermark(&snapmaticPainter); }
imageTitle = tr("Custom Picture", "Custom Picture Description in SC, don't use Special Character!");
}
snapmaticPainter.end();
@ -202,6 +206,47 @@ void ImportDialog::processImage()
ui->labPicture->setPixmap(snapmaticPixmap.scaled(snapmaticResolutionLW, snapmaticResolutionLH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
}
void ImportDialog::processWatermark(QPainter *snapmaticPainter)
{
bool blackWatermark = false;
bool redWatermark = false;
if (selectedColour.red() > 127)
{
if (selectedColour.green() > 127 || selectedColour.blue() > 127)
{
redWatermark = true;
}
}
else
{
redWatermark = true;
}
if (selectedColour.lightness() > 127)
{
blackWatermark = true;
}
// draw watermark
if (redWatermark)
{
snapmaticPainter->drawImage(0, 0, QImage(":/img/watermark_2r.png"));
}
else
{
QImage viewWatermark = QImage(":/img/watermark_2b.png");
if (!blackWatermark)
{
viewWatermark.invertPixels(QImage::InvertRgb);
}
snapmaticPainter->drawImage(0, 0, viewWatermark);
}
QImage textWatermark = QImage(":/img/watermark_1b.png");
if (!blackWatermark)
{
textWatermark.invertPixels(QImage::InvertRgb);
}
snapmaticPainter->drawImage(0, 0, textWatermark);
}
QImage ImportDialog::image()
{
return newImage;
@ -271,6 +316,16 @@ void ImportDialog::on_cbAvatar_toggled(bool checked)
}
}
insideAvatarZone = ui->cbAvatar->isChecked();
watermarkBlock = true;
if (insideAvatarZone)
{
ui->cbWatermark->setChecked(watermarkAvatar);
}
else
{
ui->cbWatermark->setChecked(watermarkPicture);
}
watermarkBlock = false;
processImage();
}
@ -402,3 +457,19 @@ void ImportDialog::on_cbForceAvatarColour_toggled(bool checked)
Q_UNUSED(checked)
processImage();
}
void ImportDialog::on_cbWatermark_toggled(bool checked)
{
if (!watermarkBlock)
{
if (insideAvatarZone)
{
watermarkAvatar = checked;
}
else
{
watermarkPicture = checked;
}
processImage();
}
}

View file

@ -49,6 +49,7 @@ private slots:
void on_cmdBackgroundWipe_clicked();
void on_cbStretch_toggled(bool checked);
void on_cbForceAvatarColour_toggled(bool checked);
void on_cbWatermark_toggled(bool checked);
private:
Ui::ImportDialog *ui;
@ -60,9 +61,13 @@ private:
QImage newImage;
QColor selectedColour;
bool insideAvatarZone;
bool watermarkPicture;
bool watermarkAvatar;
bool watermarkBlock;
bool importAgreed;
int snapmaticResolutionLW;
int snapmaticResolutionLH;
void processWatermark(QPainter *snapmaticPainter);
};
#endif // IMPORTDIALOG_H

View file

@ -7,13 +7,13 @@
<x>0</x>
<y>0</y>
<width>516</width>
<height>425</height>
<height>512</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>516</width>
<height>425</height>
<height>512</height>
</size>
</property>
<property name="windowTitle">
@ -85,7 +85,7 @@
</property>
<layout class="QVBoxLayout" name="vlSettings">
<item>
<layout class="QHBoxLayout" name="hlCheckboxes">
<layout class="QHBoxLayout" name="hlCheckboxesTop">
<item>
<widget class="QCheckBox" name="cbAvatar">
<property name="sizePolicy">
@ -114,6 +114,23 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="hlCheckboxesButtom">
<item>
<widget class="QCheckBox" name="cbWatermark">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Watermark</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 585 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 822 B

After

Width:  |  Height:  |  Size: 776 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

@ -20,8 +20,9 @@
<file>pointmaker-24.png</file>
<file>pointmaker-32.png</file>
<file>savegame.png</file>
<file>watermark.png</file>
<file>watermarkdark.png</file>
<file>watermark_1b.png</file>
<file>watermark_2b.png</file>
<file>watermark_2r.png</file>
</qresource>
<qresource prefix="/global">
<file>global.rcc</file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 B

After

Width:  |  Height:  |  Size: 87 B

View file

@ -238,102 +238,107 @@ Pictures and Savegames</source>
</message>
<message>
<location filename="../ImportDialog.ui" line="111"/>
<location filename="../ImportDialog.ui" line="252"/>
<location filename="../ImportDialog.ui" line="269"/>
<source>Ignore Aspect Ratio</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="123"/>
<location filename="../ImportDialog.ui" line="128"/>
<source>Watermark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="140"/>
<source>Background</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="133"/>
<location filename="../ImportDialog.cpp" line="80"/>
<location filename="../ImportDialog.cpp" line="309"/>
<location filename="../ImportDialog.ui" line="150"/>
<location filename="../ImportDialog.cpp" line="82"/>
<location filename="../ImportDialog.cpp" line="364"/>
<source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="157"/>
<location filename="../ImportDialog.ui" line="207"/>
<location filename="../ImportDialog.ui" line="174"/>
<location filename="../ImportDialog.ui" line="224"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="183"/>
<location filename="../ImportDialog.cpp" line="81"/>
<location filename="../ImportDialog.cpp" line="389"/>
<location filename="../ImportDialog.ui" line="200"/>
<location filename="../ImportDialog.cpp" line="83"/>
<location filename="../ImportDialog.cpp" line="444"/>
<source>Background Image:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="214"/>
<location filename="../ImportDialog.ui" line="231"/>
<source>X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="242"/>
<location filename="../ImportDialog.ui" line="259"/>
<source>Force Colour in Avatar Zone</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="298"/>
<location filename="../ImportDialog.ui" line="315"/>
<source>Import picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="301"/>
<location filename="../ImportDialog.ui" line="318"/>
<source>&amp;OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="314"/>
<location filename="../ImportDialog.ui" line="331"/>
<source>Discard picture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="317"/>
<location filename="../ImportDialog.ui" line="334"/>
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="172"/>
<location filename="../ImportDialog.cpp" line="175"/>
<location filename="../ProfileInterface.cpp" line="662"/>
<source>Custom Avatar</source>
<comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="198"/>
<location filename="../ImportDialog.cpp" line="202"/>
<location filename="../ProfileInterface.cpp" line="681"/>
<source>Custom Picture</source>
<comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<source>Snapmatic Avatar Zone</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<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 type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="305"/>
<location filename="../ImportDialog.cpp" line="360"/>
<source>Select Colour...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>Background Image: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>File</source>
<comment>Background Image: File</comment>
<translation type="unfinished"></translation>
@ -1040,7 +1045,7 @@ Press 1 for Default View</source>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="110"/>
<location filename="../ImportDialog.cpp" line="328"/>
<location filename="../ImportDialog.cpp" line="383"/>
<location filename="../ProfileInterface.cpp" line="476"/>
<location filename="../ProfileInterface.cpp" line="542"/>
<location filename="../ProfileInterface.cpp" line="851"/>
@ -1051,9 +1056,9 @@ Press 1 for Default View</source>
<location filename="../ImageEditorDialog.cpp" line="111"/>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="329"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="384"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="477"/>
<location filename="../ProfileInterface.cpp" line="521"/>
<location filename="../ProfileInterface.cpp" line="576"/>
@ -1073,14 +1078,14 @@ Press 1 for Default View</source>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="121"/>
<location filename="../ImportDialog.cpp" line="339"/>
<location filename="../ImportDialog.cpp" line="394"/>
<location filename="../ProfileInterface.cpp" line="496"/>
<source>All image files (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="122"/>
<location filename="../ImportDialog.cpp" line="340"/>
<location filename="../ImportDialog.cpp" line="395"/>
<location filename="../ProfileInterface.cpp" line="497"/>
<location filename="../UserInterface.cpp" line="457"/>
<source>All files (**)</source>
@ -1088,14 +1093,14 @@ Press 1 for Default View</source>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ProfileInterface.cpp" line="719"/>
<source>Can&apos;t import %1 because file can&apos;t be open</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="729"/>
<source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
<translation type="unfinished"></translation>

Binary file not shown.

View file

@ -238,7 +238,7 @@ Snapmatic Bilder und Spielständen</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="111"/>
<location filename="../ImportDialog.ui" line="252"/>
<location filename="../ImportDialog.ui" line="269"/>
<source>Ignore Aspect Ratio</source>
<translation>Seitenverhältnis ignorieren</translation>
</message>
@ -253,98 +253,103 @@ Snapmatic Bilder und Spielständen</translation>
<translation>Bild</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="123"/>
<location filename="../ImportDialog.ui" line="128"/>
<source>Watermark</source>
<translation>Wasserzeichen</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="140"/>
<source>Background</source>
<translation>Hintergrund</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="133"/>
<location filename="../ImportDialog.cpp" line="80"/>
<location filename="../ImportDialog.cpp" line="309"/>
<location filename="../ImportDialog.ui" line="150"/>
<location filename="../ImportDialog.cpp" line="82"/>
<location filename="../ImportDialog.cpp" line="364"/>
<source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
<translation>Hintergrundfarbe: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="157"/>
<location filename="../ImportDialog.ui" line="207"/>
<location filename="../ImportDialog.ui" line="174"/>
<location filename="../ImportDialog.ui" line="224"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>Background Image: %1</source>
<translation>Hintergrundbild: %1</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="214"/>
<location filename="../ImportDialog.ui" line="231"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="242"/>
<location filename="../ImportDialog.ui" line="259"/>
<source>Force Colour in Avatar Zone</source>
<translation>Erzwinge Farbe in Avatar Zone</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="298"/>
<location filename="../ImportDialog.ui" line="315"/>
<source>Import picture</source>
<translation>Bild importieren</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="301"/>
<location filename="../ImportDialog.ui" line="318"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="314"/>
<location filename="../ImportDialog.ui" line="331"/>
<source>Discard picture</source>
<translation>Bild verwerfen</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="317"/>
<location filename="../ImportDialog.ui" line="334"/>
<source>&amp;Cancel</source>
<translation>Abbre&amp;chen</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="183"/>
<location filename="../ImportDialog.cpp" line="81"/>
<location filename="../ImportDialog.cpp" line="389"/>
<location filename="../ImportDialog.ui" line="200"/>
<location filename="../ImportDialog.cpp" line="83"/>
<location filename="../ImportDialog.cpp" line="444"/>
<source>Background Image:</source>
<translation>Hintergrundbild:</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="172"/>
<location filename="../ImportDialog.cpp" line="175"/>
<location filename="../ProfileInterface.cpp" line="662"/>
<source>Custom Avatar</source>
<comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
<translation>Eigener Avatar</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="198"/>
<location filename="../ImportDialog.cpp" line="202"/>
<location filename="../ProfileInterface.cpp" line="681"/>
<source>Custom Picture</source>
<comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
<translation>Eigenes Bild</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<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>Bist du sicher ein Quadrat Bild außerhalb der Avatar Zone zu verwenden?
Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<source>Snapmatic Avatar Zone</source>
<translation>Snapmatic Avatar Zone</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="305"/>
<location filename="../ImportDialog.cpp" line="360"/>
<source>Select Colour...</source>
<translation>Farbe auswählen...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>File</source>
<comment>Background Image: File</comment>
<translation>Datei</translation>
@ -1067,7 +1072,7 @@ Drücke 1 für Standardmodus</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="110"/>
<location filename="../ImportDialog.cpp" line="328"/>
<location filename="../ImportDialog.cpp" line="383"/>
<location filename="../ProfileInterface.cpp" line="476"/>
<location filename="../ProfileInterface.cpp" line="542"/>
<location filename="../ProfileInterface.cpp" line="851"/>
@ -1078,9 +1083,9 @@ Drücke 1 für Standardmodus</translation>
<location filename="../ImageEditorDialog.cpp" line="111"/>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="329"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="384"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="477"/>
<location filename="../ProfileInterface.cpp" line="521"/>
<location filename="../ProfileInterface.cpp" line="576"/>
@ -1117,14 +1122,14 @@ Drücke 1 für Standardmodus</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="121"/>
<location filename="../ImportDialog.cpp" line="339"/>
<location filename="../ImportDialog.cpp" line="394"/>
<location filename="../ProfileInterface.cpp" line="496"/>
<source>All image files (%1)</source>
<translation>Alle Bilddateien (%1)</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="122"/>
<location filename="../ImportDialog.cpp" line="340"/>
<location filename="../ImportDialog.cpp" line="395"/>
<location filename="../ProfileInterface.cpp" line="497"/>
<location filename="../UserInterface.cpp" line="457"/>
<source>All files (**)</source>
@ -1159,14 +1164,14 @@ Drücke 1 für Standardmodus</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ProfileInterface.cpp" line="719"/>
<source>Can&apos;t import %1 because file can&apos;t be open</source>
<translation>Kann %1 nicht importieren weil die Datei nicht geöffnet werden kann</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="729"/>
<source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
<translation>Kann %1 nicht importieren weil die Datei nicht richtig gelesen werden kann</translation>

View file

@ -227,15 +227,15 @@ Pictures and Savegames</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="133"/>
<location filename="../ImportDialog.cpp" line="80"/>
<location filename="../ImportDialog.cpp" line="309"/>
<location filename="../ImportDialog.ui" line="150"/>
<location filename="../ImportDialog.cpp" line="82"/>
<location filename="../ImportDialog.cpp" line="364"/>
<source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
<translation>Background Color: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="157"/>
<location filename="../ImportDialog.ui" line="207"/>
<location filename="../ImportDialog.ui" line="174"/>
<location filename="../ImportDialog.ui" line="224"/>
<source>...</source>
<translation></translation>
</message>
@ -251,89 +251,94 @@ Pictures and Savegames</source>
</message>
<message>
<location filename="../ImportDialog.ui" line="111"/>
<location filename="../ImportDialog.ui" line="252"/>
<location filename="../ImportDialog.ui" line="269"/>
<source>Ignore Aspect Ratio</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="123"/>
<location filename="../ImportDialog.ui" line="128"/>
<source>Watermark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="140"/>
<source>Background</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>Background Image: %1</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="214"/>
<location filename="../ImportDialog.ui" line="231"/>
<source>X</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="242"/>
<location filename="../ImportDialog.ui" line="259"/>
<source>Force Colour in Avatar Zone</source>
<translation>Force Color in Avatar Zone</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="298"/>
<location filename="../ImportDialog.ui" line="315"/>
<source>Import picture</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="301"/>
<location filename="../ImportDialog.ui" line="318"/>
<source>&amp;OK</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="314"/>
<location filename="../ImportDialog.ui" line="331"/>
<source>Discard picture</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="317"/>
<location filename="../ImportDialog.ui" line="334"/>
<source>&amp;Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="183"/>
<location filename="../ImportDialog.cpp" line="81"/>
<location filename="../ImportDialog.cpp" line="389"/>
<location filename="../ImportDialog.ui" line="200"/>
<location filename="../ImportDialog.cpp" line="83"/>
<location filename="../ImportDialog.cpp" line="444"/>
<source>Background Image:</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="172"/>
<location filename="../ImportDialog.cpp" line="175"/>
<location filename="../ProfileInterface.cpp" line="662"/>
<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="198"/>
<location filename="../ImportDialog.cpp" line="202"/>
<location filename="../ProfileInterface.cpp" line="681"/>
<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="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<source>Snapmatic Avatar Zone</source>
<translation></translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<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="305"/>
<location filename="../ImportDialog.cpp" line="360"/>
<source>Select Colour...</source>
<translation>Select Color...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>File</source>
<comment>Background Image: File</comment>
<translation></translation>
@ -1060,7 +1065,7 @@ Press 1 for Default View</source>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="110"/>
<location filename="../ImportDialog.cpp" line="328"/>
<location filename="../ImportDialog.cpp" line="383"/>
<location filename="../ProfileInterface.cpp" line="476"/>
<location filename="../ProfileInterface.cpp" line="542"/>
<location filename="../ProfileInterface.cpp" line="851"/>
@ -1071,9 +1076,9 @@ Press 1 for Default View</source>
<location filename="../ImageEditorDialog.cpp" line="111"/>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="329"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="384"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="477"/>
<location filename="../ProfileInterface.cpp" line="521"/>
<location filename="../ProfileInterface.cpp" line="576"/>
@ -1116,14 +1121,14 @@ Press 1 for Default View</source>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="121"/>
<location filename="../ImportDialog.cpp" line="339"/>
<location filename="../ImportDialog.cpp" line="394"/>
<location filename="../ProfileInterface.cpp" line="496"/>
<source>All image files (%1)</source>
<translation></translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="122"/>
<location filename="../ImportDialog.cpp" line="340"/>
<location filename="../ImportDialog.cpp" line="395"/>
<location filename="../ProfileInterface.cpp" line="497"/>
<location filename="../UserInterface.cpp" line="457"/>
<source>All files (**)</source>
@ -1163,14 +1168,14 @@ Press 1 for Default View</source>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ProfileInterface.cpp" line="719"/>
<source>Can&apos;t import %1 because file can&apos;t be open</source>
<translation></translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="729"/>
<source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
<translation></translation>

View file

@ -238,7 +238,7 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="111"/>
<location filename="../ImportDialog.ui" line="252"/>
<location filename="../ImportDialog.ui" line="269"/>
<source>Ignore Aspect Ratio</source>
<translation>Déverrouiller le ratio d&apos;aspect</translation>
</message>
@ -253,98 +253,103 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation>
<translation>Image</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="123"/>
<location filename="../ImportDialog.ui" line="128"/>
<source>Watermark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="140"/>
<source>Background</source>
<translation>Fond</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="133"/>
<location filename="../ImportDialog.cpp" line="80"/>
<location filename="../ImportDialog.cpp" line="309"/>
<location filename="../ImportDialog.ui" line="150"/>
<location filename="../ImportDialog.cpp" line="82"/>
<location filename="../ImportDialog.cpp" line="364"/>
<source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
<translation>Couleur de fond : &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="157"/>
<location filename="../ImportDialog.ui" line="207"/>
<location filename="../ImportDialog.ui" line="174"/>
<location filename="../ImportDialog.ui" line="224"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>Background Image: %1</source>
<translation>Image de fond : %1</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="214"/>
<location filename="../ImportDialog.ui" line="231"/>
<source>X</source>
<translation>X</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="242"/>
<location filename="../ImportDialog.ui" line="259"/>
<source>Force Colour in Avatar Zone</source>
<translation>Forcer la couleur dans la Zone d&apos;Avatar</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="298"/>
<location filename="../ImportDialog.ui" line="315"/>
<source>Import picture</source>
<translation>Importer l&apos;image</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="301"/>
<location filename="../ImportDialog.ui" line="318"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="314"/>
<location filename="../ImportDialog.ui" line="331"/>
<source>Discard picture</source>
<translation>Supprimer l&apos;image</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="317"/>
<location filename="../ImportDialog.ui" line="334"/>
<source>&amp;Cancel</source>
<translation>A&amp;nnuler</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="183"/>
<location filename="../ImportDialog.cpp" line="81"/>
<location filename="../ImportDialog.cpp" line="389"/>
<location filename="../ImportDialog.ui" line="200"/>
<location filename="../ImportDialog.cpp" line="83"/>
<location filename="../ImportDialog.cpp" line="444"/>
<source>Background Image:</source>
<translation>Image de fond :</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="172"/>
<location filename="../ImportDialog.cpp" line="175"/>
<location filename="../ProfileInterface.cpp" line="662"/>
<source>Custom Avatar</source>
<comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
<translation>Avatar personnalisé</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="198"/>
<location filename="../ImportDialog.cpp" line="202"/>
<location filename="../ProfileInterface.cpp" line="681"/>
<source>Custom Picture</source>
<comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
<translation>Image personnalisé</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<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>Êtes-vous sûr d&apos;utiliser une image carrée en dehors de la Zone d&apos;Avatar ?
Si vous l&apos;utilisez comme Avatar, l&apos;image sera détachée !</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="266"/>
<location filename="../ImportDialog.cpp" line="311"/>
<source>Snapmatic Avatar Zone</source>
<translation>Zone d&apos;Avatar Snapmatic</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="305"/>
<location filename="../ImportDialog.cpp" line="360"/>
<source>Select Colour...</source>
<translation>Choisir une couleur...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>File</source>
<comment>Background Image: File</comment>
<translation>Fichier</translation>
@ -1078,7 +1083,7 @@ Appuyer sur 1 pour le mode par défaut</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="110"/>
<location filename="../ImportDialog.cpp" line="328"/>
<location filename="../ImportDialog.cpp" line="383"/>
<location filename="../ProfileInterface.cpp" line="476"/>
<location filename="../ProfileInterface.cpp" line="542"/>
<location filename="../ProfileInterface.cpp" line="851"/>
@ -1089,9 +1094,9 @@ Appuyer sur 1 pour le mode par défaut</translation>
<location filename="../ImageEditorDialog.cpp" line="111"/>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="329"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="384"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="477"/>
<location filename="../ProfileInterface.cpp" line="521"/>
<location filename="../ProfileInterface.cpp" line="576"/>
@ -1123,14 +1128,14 @@ Appuyer sur 1 pour le mode par défaut</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="121"/>
<location filename="../ImportDialog.cpp" line="339"/>
<location filename="../ImportDialog.cpp" line="394"/>
<location filename="../ProfileInterface.cpp" line="496"/>
<source>All image files (%1)</source>
<translation>Toutes les images (%1)</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="122"/>
<location filename="../ImportDialog.cpp" line="340"/>
<location filename="../ImportDialog.cpp" line="395"/>
<location filename="../ProfileInterface.cpp" line="497"/>
<location filename="../UserInterface.cpp" line="457"/>
<source>All files (**)</source>
@ -1177,14 +1182,14 @@ Appuyer sur 1 pour le mode par défaut</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="142"/>
<location filename="../ImportDialog.cpp" line="360"/>
<location filename="../ImportDialog.cpp" line="415"/>
<location filename="../ProfileInterface.cpp" line="719"/>
<source>Can&apos;t import %1 because file can&apos;t be open</source>
<translation>Impossible d&apos;importer %1, le fichier ne peut pas être ouvert</translation>
</message>
<message>
<location filename="../ImageEditorDialog.cpp" line="151"/>
<location filename="../ImportDialog.cpp" line="369"/>
<location filename="../ImportDialog.cpp" line="424"/>
<location filename="../ProfileInterface.cpp" line="729"/>
<source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
<translation>Impossible d&apos;importer %1, le fichier ne peut pas être parsé correctement</translation>

View file

@ -240,7 +240,7 @@ Pictures and Savegames</source>
</message>
<message>
<location filename="../ImportDialog.ui" line="111"/>
<location filename="../ImportDialog.ui" line="252"/>
<location filename="../ImportDialog.ui" line="269"/>
<source>Ignore Aspect Ratio</source>
<translation>Игнорировать соотн. сторон</translation>
</message>
@ -255,99 +255,104 @@ Pictures and Savegames</source>
<translation>Картинка</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="123"/>
<location filename="../ImportDialog.ui" line="128"/>
<source>Watermark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="140"/>
<source>Background</source>
<translation>Фон</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="133"/>
<location filename="../ImportDialog.cpp" line="80"/>
<location filename="../ImportDialog.cpp" line="309"/>
<location filename="../ImportDialog.ui" line="150"/>
<location filename="../ImportDialog.cpp" line="82"/>
<location filename="../ImportDialog.cpp" line="364"/>
<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="157"/>
<location filename="../ImportDialog.ui" line="207"/>
<location filename="../ImportDialog.ui" line="174"/>
<location filename="../ImportDialog.ui" line="224"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
<location filename="../ImportDialog.cpp" line="374"/>
<location filename="../ImportDialog.cpp" line="429"/>
<source>Background Image: %1</source>
<translation>Фоновая картинка: %1</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="214"/>
<location filename="../ImportDialog.ui" line="231"/>
<source>X</source>
<translatorcomment>latin X</translatorcomment>
<translation>X</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="242"/>
<location filename="../ImportDialog.ui" line="259"/>
<source>Force Colour in Avatar Zone</source>
<translation>Задать цвет в зоне аватарки</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="298"/>
<location filename="../ImportDialog.ui" line="315"/>
<source>Import picture</source>
<translation>Импортировать картинку</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="301"/>
<location filename="../ImportDialog.ui" line="318"/>
<source>&amp;OK</source>
<translation>&amp;ОК</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="314"/>
<location filename="../ImportDialog.ui" line="331"/>
<source>Discard picture</source>
<translation>Отклонить картинку</translation>
</message>
<message>
<location filename="../ImportDialog.ui" line="317"/>
<location filename="../ImportDialog.ui" line="334"/>
<source>&amp;Cancel</source>
<translatorcomment>Я не уверен насчет горячих клавиш...</translatorcomment>