add ability to change picture while import process

5 years ago · 7b68bb10b5
parent 2487a188d5
commit 7b68bb10b5
21 changed files with 1019 additions and 267 deletions
--- a/ImageEditorDialog.cpp
+++ b/ImageEditorDialog.cpp
@ -151,7 +151,7 @@ fileDialogPreOpen: //Work?
                delete importImage;
                goto fileDialogPreOpen;
            }
-            ImportDialog *importDialog = new ImportDialog(this);
+            ImportDialog *importDialog = new ImportDialog(profileName, this);
            importDialog->setImage(importImage);
            importDialog->setModal(true);
            importDialog->show();
--- a/ImageEditorDialog.ui
+++ b/ImageEditorDialog.ui
@ -55,6 +55,9 @@
       <layout class="QHBoxLayout" name="hlButtons">
        <item>
         <widget class="QPushButton" name="cmdReplace">
+          <property name="toolTip">
+           <string>Import picture</string>
+          </property>
          <property name="text">
           <string>&amp;Import...</string>
          </property>
@ -75,6 +78,9 @@
        </item>
        <item>
         <widget class="QPushButton" name="cmdSave">
+          <property name="toolTip">
+           <string>Apply changes</string>
+          </property>
          <property name="text">
           <string>&amp;Overwrite</string>
          </property>
@ -82,6 +88,9 @@
        </item>
        <item>
         <widget class="QPushButton" name="cmdClose">
+          <property name="toolTip">
+           <string>Discard changes</string>
+          </property>
          <property name="text">
           <string>&amp;Close</string>
          </property>
--- a/ImportDialog.cpp
+++ b/ImportDialog.cpp
@ -43,14 +43,16 @@
 #define snapmaticAvatarPlacementW 145
 #define snapmaticAvatarPlacementH 66

-ImportDialog::ImportDialog(QWidget *parent) :
-    QDialog(parent),
+ImportDialog::ImportDialog(QString profileName, QWidget *parent) :
+    QDialog(parent), profileName(profileName),
    ui(new Ui::ImportDialog)
 {
    // Set Window Flags
    setWindowFlags(windowFlags()^Qt::WindowContextHelpButtonHint);

    ui->setupUi(this);
+    ui->cmdOK->setDefault(true);
+    ui->cmdOK->setFocus();
    importAgreed = false;
    watermarkAvatar = true;
    watermarkPicture = false;
@ -103,6 +105,11 @@ ImportDialog::ImportDialog(QWidget *parent) :
    }
 #endif

+    // Options menu
+    optionsMenu = new QMenu(this);
+    optionsMenu->addAction(tr("&Import new Picture..."), this, SLOT(importNewPicture()));
+    ui->cmdOptions->setMenu(optionsMenu);
+
    setMaximumSize(sizeHint());
    setMinimumSize(sizeHint());
    setFixedSize(sizeHint());
@ -110,6 +117,7 @@ ImportDialog::ImportDialog(QWidget *parent) :

 ImportDialog::~ImportDialog()
 {
+    delete optionsMenu;
    delete ui;
 }

@ -247,6 +255,75 @@ void ImportDialog::processWatermark(QPainter *snapmaticPainter)
    snapmaticPainter->drawImage(0, 0, textWatermark);
 }

+void ImportDialog::importNewPicture()
+{
+    QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
+    settings.beginGroup("FileDialogs");
+    bool dontUseNativeDialog = settings.value("DontUseNativeDialog", false).toBool();
+    settings.beginGroup("ImportCopy");
+
+fileDialogPreOpen: //Work?
+    QFileDialog fileDialog(this);
+    fileDialog.setFileMode(QFileDialog::ExistingFile);
+    fileDialog.setViewMode(QFileDialog::Detail);
+    fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
+    fileDialog.setOption(QFileDialog::DontUseNativeDialog, dontUseNativeDialog);
+    fileDialog.setWindowFlags(fileDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
+    fileDialog.setWindowTitle(QApplication::translate("ProfileInterface", "Import..."));
+    fileDialog.setLabelText(QFileDialog::Accept, QApplication::translate("ProfileInterface", "Import"));
+
+    // Getting readable Image formats
+    QString imageFormatsStr = " ";
+    for (QByteArray imageFormat : QImageReader::supportedImageFormats())
+    {
+        imageFormatsStr += QString("*.") % QString::fromUtf8(imageFormat).toLower() % " ";
+    }
+
+    QStringList filters;
+    filters << QApplication::translate("ProfileInterface", "All image files (%1)").arg(imageFormatsStr.trimmed());
+    filters << QApplication::translate("ProfileInterface", "All files (**)");
+    fileDialog.setNameFilters(filters);
+
+    QList<QUrl> sidebarUrls = SidebarGenerator::generateSidebarUrls(fileDialog.sidebarUrls());
+
+    fileDialog.setSidebarUrls(sidebarUrls);
+    fileDialog.setDirectory(settings.value(profileName % "+Directory", StandardPaths::documentsLocation()).toString());
+    fileDialog.restoreGeometry(settings.value(profileName % "+Geometry", "").toByteArray());
+
+    if (fileDialog.exec())
+    {
+        QStringList selectedFiles = fileDialog.selectedFiles();
+        if (selectedFiles.length() == 1)
+        {
+            QString selectedFile = selectedFiles.at(0);
+            QString selectedFileName = QFileInfo(selectedFile).fileName();
+
+            QFile snapmaticFile(selectedFile);
+            if (!snapmaticFile.open(QFile::ReadOnly))
+            {
+                QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be open").arg("\""+selectedFileName+"\""));
+                goto fileDialogPreOpen;
+            }
+            QImage *importImage = new QImage();
+            QImageReader snapmaticImageReader;
+            snapmaticImageReader.setDecideFormatFromContent(true);
+            snapmaticImageReader.setDevice(&snapmaticFile);
+            if (!snapmaticImageReader.read(importImage))
+            {
+                QMessageBox::warning(this, QApplication::translate("ProfileInterface", "Import"), QApplication::translate("ProfileInterface", "Can't import %1 because file can't be parsed properly").arg("\""+selectedFileName+"\""));
+                delete importImage;
+                goto fileDialogPreOpen;
+            }
+            setImage(importImage);
+        }
+    }
+
+    settings.setValue(profileName % "+Geometry", fileDialog.saveGeometry());
+    settings.setValue(profileName % "+Directory", fileDialog.directory().absolutePath());
+    settings.endGroup();
+    settings.endGroup();
+}
+
 QImage ImportDialog::image()
 {
    return newImage;
@ -272,16 +349,22 @@ void ImportDialog::setImage(QImage *image_)
    }
    else if (image_->width() > snapmaticResolutionW && image_->width() > image_->height())
    {
+        insideAvatarZone = false;
+        ui->cbAvatar->setChecked(false);
        workImage = image_->scaledToWidth(snapmaticResolutionW, Qt::SmoothTransformation);
        delete image_;
    }
    else if (image_->height() > snapmaticResolutionH && image_->height() > image_->width())
    {
+        insideAvatarZone = false;
+        ui->cbAvatar->setChecked(false);
        workImage = image_->scaledToHeight(snapmaticResolutionH, Qt::SmoothTransformation);
        delete image_;
    }
    else
    {
+        insideAvatarZone = false;
+        ui->cbAvatar->setChecked(false);
        workImage = *image_;
        delete image_;
    }
@ -306,7 +389,7 @@ void ImportDialog::on_cbIgnore_toggled(bool checked)

 void ImportDialog::on_cbAvatar_toggled(bool checked)
 {
-    if (workImage.width() == workImage.height() && !checked)
+    if (!workImage.isNull() && workImage.width() == workImage.height() && !checked)
    {
        if (QMessageBox::No == QMessageBox::warning(this, tr("Snapmatic Avatar Zone"), tr("Are you sure to use a square image outside of the Avatar Zone?\nWhen you want to use it as Avatar the image will be detached!"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No))
        {
--- a/ImportDialog.h
+++ b/ImportDialog.h
@ -20,6 +20,7 @@
 #define IMPORTDIALOG_H

 #include <QDialog>
+#include <QMenu>

 namespace Ui {
 class ImportDialog;
@ -30,7 +31,7 @@ class ImportDialog : public QDialog
    Q_OBJECT

 public:
-    explicit ImportDialog(QWidget *parent = 0);
+    explicit ImportDialog(QString profileName, QWidget *parent = 0);
    ~ImportDialog();
    QImage image();
    QString getImageTitle();
@ -39,6 +40,7 @@ public:

 private slots:
    void processImage();
+    void importNewPicture();
    void on_cbIgnore_toggled(bool checked);
    void on_cbAvatar_toggled(bool checked);
    void on_cmdCancel_clicked();
@ -52,6 +54,7 @@ private slots:
    void on_cbWatermark_toggled(bool checked);

 private:
+    QString profileName;
    Ui::ImportDialog *ui;
    QImage avatarAreaImage;
    QString backgroundPath;
@ -60,6 +63,7 @@ private:
    QImage workImage;
    QImage newImage;
    QColor selectedColour;
+    QMenu *optionsMenu;
    bool insideAvatarZone;
    bool watermarkPicture;
    bool watermarkAvatar;
--- a/ImportDialog.ui
+++ b/ImportDialog.ui
@ -141,7 +141,7 @@
        </property>
        <layout class="QVBoxLayout" name="vlBackground">
         <item>
-          <layout class="QHBoxLayout" name="hlColor">
+          <layout class="QHBoxLayout" name="hlColour">
           <item>
            <layout class="QHBoxLayout" name="hlColourManage">
             <item>
@ -170,6 +170,9 @@
               </property>
               <item>
                <widget class="QToolButton" name="cmdColourChange">
+                 <property name="toolTip">
+                  <string>Select background colour</string>
+                 </property>
                 <property name="text">
                  <string>...</string>
                 </property>
@ -220,6 +223,9 @@
               </property>
               <item>
                <widget class="QToolButton" name="cmdBackgroundChange">
+                 <property name="toolTip">
+                  <string>Select background image</string>
+                 </property>
                 <property name="text">
                  <string>...</string>
                 </property>
@ -227,6 +233,9 @@
               </item>
               <item>
                <widget class="QToolButton" name="cmdBackgroundWipe">
+                 <property name="toolTip">
+                  <string>Remove background image</string>
+                 </property>
                 <property name="text">
                  <string>X</string>
                 </property>
@ -290,6 +299,16 @@
      </item>
      <item>
       <layout class="QHBoxLayout" name="hlButtons">
+        <item>
+         <widget class="QPushButton" name="cmdOptions">
+          <property name="toolTip">
+           <string>Import options</string>
+          </property>
+          <property name="text">
+           <string>&amp;Options</string>
+          </property>
+         </widget>
+        </item>
        <item>
         <spacer name="hsButtons">
          <property name="orientation">
--- a/JsonEditorDialog.ui
+++ b/JsonEditorDialog.ui
@ -112,6 +112,9 @@
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
+       <property name="toolTip">
+        <string>Apply changes</string>
+       </property>
       <property name="text">
        <string>&amp;Save</string>
       </property>
@ -125,6 +128,9 @@
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
+       <property name="toolTip">
+        <string>Discard changes</string>
+       </property>
       <property name="text">
        <string>&amp;Close</string>
       </property>
--- a/MapLocationDialog.ui
+++ b/MapLocationDialog.ui
@ -134,6 +134,9 @@ color: rgb(255, 255, 255);
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
+         <property name="toolTip">
+          <string>Close viewer</string>
+         </property>
         <property name="text">
          <string>&amp;Close</string>
         </property>
@ -160,6 +163,9 @@ color: rgb(255, 255, 255);
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
+         <property name="toolTip">
+          <string>Apply new position</string>
+         </property>
         <property name="text">
          <string>&amp;Apply</string>
         </property>
@ -173,6 +179,9 @@ color: rgb(255, 255, 255);
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
+         <property name="toolTip">
+          <string>Revert old position</string>
+         </property>
         <property name="text">
          <string>&amp;Revert</string>
         </property>
@ -186,8 +195,11 @@ color: rgb(255, 255, 255);
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
+         <property name="toolTip">
+          <string>Select new position</string>
+         </property>
         <property name="text">
-          <string>&amp;Set</string>
+          <string>&amp;Select</string>
         </property>
         <property name="autoDefault">
          <bool>false</bool>
@ -199,6 +211,9 @@ color: rgb(255, 255, 255);
         <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
+         <property name="toolTip">
+          <string>Quit select position</string>
+         </property>
         <property name="text">
          <string>&amp;Done</string>
         </property>
--- a/ProfileInterface.cpp
+++ b/ProfileInterface.cpp
@ -737,7 +737,7 @@ bool ProfileInterface::importFile(QString selectedFile, QDateTime importDateTime
                        delete picture;
                        return false;
                    }
-                    ImportDialog *importDialog = new ImportDialog(this);
+                    ImportDialog *importDialog = new ImportDialog(profileName, this);
                    importDialog->setImage(snapmaticImage);
                    importDialog->setModal(true);
                    importDialog->show();
@ -922,7 +922,7 @@ bool ProfileInterface::importImage(QImage *snapmaticImage, QDateTime importDateT
    if (picture->readingPicture(true, false, true, false))
    {
        bool success = false;
-        ImportDialog *importDialog = new ImportDialog(this);
+        ImportDialog *importDialog = new ImportDialog(profileName, this);
        importDialog->setImage(snapmaticImage);
        importDialog->setModal(true);
        importDialog->show();
--- a/res/gta5sync.ts
+++ b/res/gta5sync.ts
@ -172,16 +172,31 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="59"/>
+        <source>Import picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="62"/>
        <source>&amp;Import...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImageEditorDialog.ui" line="79"/>
+        <location filename="../ImageEditorDialog.ui" line="82"/>
+        <source>Apply changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="85"/>
        <source>&amp;Overwrite</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImageEditorDialog.ui" line="86"/>
+        <location filename="../ImageEditorDialog.ui" line="92"/>
+        <source>Discard changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="95"/>
        <source>&amp;Close</source>
        <translation type="unfinished"></translation>
    </message>
@ -221,7 +236,7 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="111"/>
-        <location filename="../ImportDialog.ui" line="269"/>
+        <location filename="../ImportDialog.ui" line="278"/>
        <source>Ignore Aspect Ratio</source>
        <translation type="unfinished"></translation>
    </message>
@ -237,91 +252,121 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="150"/>
-        <location filename="../ImportDialog.cpp" line="82"/>
-        <location filename="../ImportDialog.cpp" line="364"/>
+        <location filename="../ImportDialog.cpp" line="84"/>
+        <location filename="../ImportDialog.cpp" line="447"/>
        <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="174"/>
-        <location filename="../ImportDialog.ui" line="224"/>
+        <source>Select background colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="177"/>
+        <location filename="../ImportDialog.ui" line="230"/>
        <source>...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="200"/>
-        <location filename="../ImportDialog.cpp" line="83"/>
-        <location filename="../ImportDialog.cpp" line="444"/>
+        <location filename="../ImportDialog.ui" line="203"/>
+        <location filename="../ImportDialog.cpp" line="85"/>
+        <location filename="../ImportDialog.cpp" line="527"/>
        <source>Background Image:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="231"/>
+        <location filename="../ImportDialog.ui" line="227"/>
+        <source>Select background image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="237"/>
+        <source>Remove background image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="240"/>
        <source>X</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="259"/>
+        <location filename="../ImportDialog.ui" line="268"/>
        <source>Force Colour in Avatar Zone</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="315"/>
+        <location filename="../ImportDialog.ui" line="305"/>
+        <source>Import options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="308"/>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="334"/>
        <source>Import picture</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="318"/>
+        <location filename="../ImportDialog.ui" line="337"/>
        <source>&amp;OK</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="331"/>
+        <location filename="../ImportDialog.ui" line="350"/>
        <source>Discard picture</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="334"/>
+        <location filename="../ImportDialog.ui" line="353"/>
        <source>&amp;Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="175"/>
+        <location filename="../ImportDialog.cpp" line="110"/>
+        <source>&amp;Import new Picture...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="183"/>
        <location filename="../ProfileInterface.cpp" line="668"/>
        <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="202"/>
+        <location filename="../ImportDialog.cpp" line="210"/>
        <location filename="../ProfileInterface.cpp" line="687"/>
        <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="311"/>
+        <location filename="../ImportDialog.cpp" line="394"/>
        <source>Snapmatic Avatar Zone</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="311"/>
+        <location filename="../ImportDialog.cpp" line="394"/>
        <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="360"/>
+        <location filename="../ImportDialog.cpp" line="443"/>
        <source>Select Colour...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="429"/>
+        <location filename="../ImportDialog.cpp" line="512"/>
        <source>Background Image: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="429"/>
+        <location filename="../ImportDialog.cpp" line="512"/>
        <source>File</source>
        <comment>Background Image: File</comment>
        <translation type="unfinished"></translation>
@ -336,11 +381,21 @@ When you want to use it as Avatar the image will be detached!</source>
    </message>
    <message>
        <location filename="../JsonEditorDialog.ui" line="116"/>
+        <source>Apply changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../JsonEditorDialog.ui" line="119"/>
        <source>&amp;Save</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../JsonEditorDialog.ui" line="129"/>
+        <location filename="../JsonEditorDialog.ui" line="132"/>
+        <source>Discard changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../JsonEditorDialog.ui" line="135"/>
        <source>&amp;Close</source>
        <translation type="unfinished"></translation>
    </message>
@ -359,26 +414,51 @@ When you want to use it as Avatar the image will be detached!</source>
    </message>
    <message>
        <location filename="../MapLocationDialog.ui" line="138"/>
+        <source>Close viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="141"/>
        <source>&amp;Close</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="164"/>
+        <location filename="../MapLocationDialog.ui" line="167"/>
+        <source>Apply new position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="170"/>
        <source>&amp;Apply</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="177"/>
+        <location filename="../MapLocationDialog.ui" line="183"/>
+        <source>Revert old position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="186"/>
        <source>&amp;Revert</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="190"/>
-        <source>&amp;Set</source>
+        <location filename="../MapLocationDialog.ui" line="199"/>
+        <source>Select new position</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="203"/>
+        <location filename="../MapLocationDialog.ui" line="202"/>
+        <source>&amp;Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="215"/>
+        <source>Quit select position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="218"/>
        <source>&amp;Done</source>
        <translation type="unfinished"></translation>
    </message>
@ -1028,7 +1108,8 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="109"/>
-        <location filename="../ImportDialog.cpp" line="383"/>
+        <location filename="../ImportDialog.cpp" line="272"/>
+        <location filename="../ImportDialog.cpp" line="466"/>
        <location filename="../ProfileInterface.cpp" line="482"/>
        <location filename="../ProfileInterface.cpp" line="548"/>
        <location filename="../ProfileInterface.cpp" line="857"/>
@ -1039,9 +1120,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="384"/>
-        <location filename="../ImportDialog.cpp" line="415"/>
-        <location filename="../ImportDialog.cpp" line="424"/>
+        <location filename="../ImportDialog.cpp" line="273"/>
+        <location filename="../ImportDialog.cpp" line="304"/>
+        <location filename="../ImportDialog.cpp" line="313"/>
+        <location filename="../ImportDialog.cpp" line="467"/>
+        <location filename="../ImportDialog.cpp" line="498"/>
+        <location filename="../ImportDialog.cpp" line="507"/>
        <location filename="../ProfileInterface.cpp" line="483"/>
        <location filename="../ProfileInterface.cpp" line="527"/>
        <location filename="../ProfileInterface.cpp" line="582"/>
@ -1061,14 +1145,16 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="120"/>
-        <location filename="../ImportDialog.cpp" line="394"/>
+        <location filename="../ImportDialog.cpp" line="283"/>
+        <location filename="../ImportDialog.cpp" line="477"/>
        <location filename="../ProfileInterface.cpp" line="502"/>
        <source>All image files (%1)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="121"/>
-        <location filename="../ImportDialog.cpp" line="395"/>
+        <location filename="../ImportDialog.cpp" line="284"/>
+        <location filename="../ImportDialog.cpp" line="478"/>
        <location filename="../ProfileInterface.cpp" line="503"/>
        <location filename="../UserInterface.cpp" line="463"/>
        <source>All files (**)</source>
@ -1076,14 +1162,16 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
-        <location filename="../ImportDialog.cpp" line="415"/>
+        <location filename="../ImportDialog.cpp" line="304"/>
+        <location filename="../ImportDialog.cpp" line="498"/>
        <location filename="../ProfileInterface.cpp" line="725"/>
        <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="150"/>
-        <location filename="../ImportDialog.cpp" line="424"/>
+        <location filename="../ImportDialog.cpp" line="313"/>
+        <location filename="../ImportDialog.cpp" line="507"/>
        <location filename="../ProfileInterface.cpp" line="735"/>
        <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
        <translation type="unfinished"></translation>
--- a/res/gta5sync_de.qm
+++ b/res/gta5sync_de.qm
--- a/res/gta5sync_de.ts
+++ b/res/gta5sync_de.ts
@ -188,16 +188,31 @@ Snapmatic Bilder und Spielständen</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="59"/>
+        <source>Import picture</source>
+        <translation>Bild importieren</translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="62"/>
        <source>&amp;Import...</source>
        <translation>&amp;Importieren...</translation>
    </message>
    <message>
-        <location filename="../ImageEditorDialog.ui" line="79"/>
+        <location filename="../ImageEditorDialog.ui" line="82"/>
+        <source>Apply changes</source>
+        <translation>Änderungen übernehmen</translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="85"/>
        <source>&amp;Overwrite</source>
        <translation>&amp;Überschreiben</translation>
    </message>
    <message>
-        <location filename="../ImageEditorDialog.ui" line="86"/>
+        <location filename="../ImageEditorDialog.ui" line="92"/>
+        <source>Discard changes</source>
+        <translation>Änderungen verwerfen</translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="95"/>
        <source>&amp;Close</source>
        <translation>S&amp;chließen</translation>
    </message>
@ -221,7 +236,7 @@ Snapmatic Bilder und Spielständen</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="111"/>
-        <location filename="../ImportDialog.ui" line="269"/>
+        <location filename="../ImportDialog.ui" line="278"/>
        <source>Ignore Aspect Ratio</source>
        <translation>Seitenverhältnis ignorieren</translation>
    </message>
@ -247,92 +262,122 @@ Snapmatic Bilder und Spielständen</translation>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="150"/>
-        <location filename="../ImportDialog.cpp" line="82"/>
-        <location filename="../ImportDialog.cpp" line="364"/>
+        <location filename="../ImportDialog.cpp" line="84"/>
+        <location filename="../ImportDialog.cpp" line="447"/>
        <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="174"/>
-        <location filename="../ImportDialog.ui" line="224"/>
+        <source>Select background colour</source>
+        <translation>Hintergrundfarbe auswählen</translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="177"/>
+        <location filename="../ImportDialog.ui" line="230"/>
        <source>...</source>
        <translation>...</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="429"/>
+        <location filename="../ImportDialog.ui" line="227"/>
+        <source>Select background image</source>
+        <translation>Hintergrundbild auswählen</translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="237"/>
+        <source>Remove background image</source>
+        <translation>Hintergrundbild entfernen</translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="512"/>
        <source>Background Image: %1</source>
        <translation>Hintergrundbild: %1</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="231"/>
+        <location filename="../ImportDialog.ui" line="240"/>
        <source>X</source>
        <translation>X</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="259"/>
+        <location filename="../ImportDialog.ui" line="268"/>
        <source>Force Colour in Avatar Zone</source>
        <translation>Erzwinge Farbe in Avatar Zone</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="315"/>
+        <location filename="../ImportDialog.ui" line="305"/>
+        <source>Import options</source>
+        <translation>Import Optionen</translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="308"/>
+        <source>&amp;Options</source>
+        <translation>&amp;Optionen</translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="334"/>
        <source>Import picture</source>
        <translation>Bild importieren</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="318"/>
+        <location filename="../ImportDialog.ui" line="337"/>
        <source>&amp;OK</source>
        <translation>&amp;OK</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="331"/>
+        <location filename="../ImportDialog.ui" line="350"/>
        <source>Discard picture</source>
        <translation>Bild verwerfen</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="334"/>
+        <location filename="../ImportDialog.ui" line="353"/>
        <source>&amp;Cancel</source>
        <translation>Abbre&amp;chen</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="200"/>
-        <location filename="../ImportDialog.cpp" line="83"/>
-        <location filename="../ImportDialog.cpp" line="444"/>
+        <location filename="../ImportDialog.ui" line="203"/>
+        <location filename="../ImportDialog.cpp" line="85"/>
+        <location filename="../ImportDialog.cpp" line="527"/>
        <source>Background Image:</source>
        <translation>Hintergrundbild:</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="175"/>
+        <location filename="../ImportDialog.cpp" line="110"/>
+        <source>&amp;Import new Picture...</source>
+        <translation>Neues Bild &amp;importieren...</translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.cpp" line="183"/>
        <location filename="../ProfileInterface.cpp" line="668"/>
        <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="202"/>
+        <location filename="../ImportDialog.cpp" line="210"/>
        <location filename="../ProfileInterface.cpp" line="687"/>
        <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="311"/>
+        <location filename="../ImportDialog.cpp" line="394"/>
        <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="311"/>
+        <location filename="../ImportDialog.cpp" line="394"/>
        <source>Snapmatic Avatar Zone</source>
        <translation>Snapmatic Avatar Zone</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="360"/>
+        <location filename="../ImportDialog.cpp" line="443"/>
        <source>Select Colour...</source>
        <translation>Farbe auswählen...</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="429"/>
+        <location filename="../ImportDialog.cpp" line="512"/>
        <source>File</source>
        <comment>Background Image: File</comment>
        <translation>Datei</translation>
@ -347,11 +392,21 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
    </message>
    <message>
        <location filename="../JsonEditorDialog.ui" line="116"/>
+        <source>Apply changes</source>
+        <translation>Änderungen übernehmen</translation>
+    </message>
+    <message>
+        <location filename="../JsonEditorDialog.ui" line="119"/>
        <source>&amp;Save</source>
        <translation>&amp;Speichern</translation>
    </message>
    <message>
-        <location filename="../JsonEditorDialog.ui" line="129"/>
+        <location filename="../JsonEditorDialog.ui" line="132"/>
+        <source>Discard changes</source>
+        <translation>Änderungen verwerfen</translation>
+    </message>
+    <message>
+        <location filename="../JsonEditorDialog.ui" line="135"/>
        <source>&amp;Close</source>
        <translation>S&amp;chließen</translation>
    </message>
@ -370,26 +425,51 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
    </message>
    <message>
        <location filename="../MapLocationDialog.ui" line="138"/>
+        <source>Close viewer</source>
+        <translation>Ansicht schließen</translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="141"/>
        <source>&amp;Close</source>
        <translation>S&amp;chließen</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="164"/>
+        <location filename="../MapLocationDialog.ui" line="167"/>
+        <source>Apply new position</source>
+        <translation>Neue Position festlegen</translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="170"/>
        <source>&amp;Apply</source>
        <translation>&amp;Übernehmen</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="177"/>
+        <location filename="../MapLocationDialog.ui" line="183"/>
+        <source>Revert old position</source>
+        <translation>Alte Position wiederherstellen</translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="186"/>
        <source>&amp;Revert</source>
        <translation>&amp;Zurücksetzen</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="190"/>
-        <source>&amp;Set</source>
-        <translation>&amp;Ändern</translation>
+        <location filename="../MapLocationDialog.ui" line="199"/>
+        <source>Select new position</source>
+        <translation>Neue Position auswählen</translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="202"/>
+        <source>&amp;Select</source>
+        <translation>Au&amp;swählen</translation>
+    </message>
+    <message>
+        <location filename="../MapLocationDialog.ui" line="215"/>
+        <source>Quit select position</source>
+        <translation>Position auswählen verlassen</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.ui" line="203"/>
+        <location filename="../MapLocationDialog.ui" line="218"/>
        <source>&amp;Done</source>
        <translation>&amp;Fertig</translation>
    </message>
@ -1055,7 +1135,8 @@ Drücke 1 für Standardmodus</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="109"/>
-        <location filename="../ImportDialog.cpp" line="383"/>
+        <location filename="../ImportDialog.cpp" line="272"/>
+        <location filename="../ImportDialog.cpp" line="466"/>
        <location filename="../ProfileInterface.cpp" line="482"/>
        <location filename="../ProfileInterface.cpp" line="548"/>
        <location filename="../ProfileInterface.cpp" line="857"/>
@ -1066,9 +1147,12 @@ Drücke 1 für Standardmodus</translation>
        <location filename="../ImageEditorDialog.cpp" line="110"/>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
        <location filename="../ImageEditorDialog.cpp" line="150"/>
-        <location filename="../ImportDialog.cpp" line="384"/>
-        <location filename="../ImportDialog.cpp" line="415"/>
-        <location filename="../ImportDialog.cpp" line="424"/>
+        <location filename="../ImportDialog.cpp" line="273"/>
+        <location filename="../ImportDialog.cpp" line="304"/>
+        <location filename="../ImportDialog.cpp" line="313"/>
+        <location filename="../ImportDialog.cpp" line="467"/>
+        <location filename="../ImportDialog.cpp" line="498"/>
+        <location filename="../ImportDialog.cpp" line="507"/>
        <location filename="../ProfileInterface.cpp" line="483"/>
        <location filename="../ProfileInterface.cpp" line="527"/>
        <location filename="../ProfileInterface.cpp" line="582"/>
@ -1105,14 +1189,16 @@ Drücke 1 für Standardmodus</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="120"/>
-        <location filename="../ImportDialog.cpp" line="394"/>
+        <location filename="../ImportDialog.cpp" line="283"/>
+        <location filename="../ImportDialog.cpp" line="477"/>
        <location filename="../ProfileInterface.cpp" line="502"/>
        <source>All image files (%1)</source>
        <translation>Alle Bilddateien (%1)</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="121"/>
-        <location filename="../ImportDialog.cpp" line="395"/>
+        <location filename="../ImportDialog.cpp" line="284"/>
+        <location filename="../ImportDialog.cpp" line="478"/>
        <location filename="../ProfileInterface.cpp" line="503"/>
        <location filename="../UserInterface.cpp" line="463"/>
        <source>All files (**)</source>
@ -1147,14 +1233,16 @@ Drücke 1 für Standardmodus</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
-        <location filename="../ImportDialog.cpp" line="415"/>
+        <location filename="../ImportDialog.cpp" line="304"/>
+        <location filename="../ImportDialog.cpp" line="498"/>
        <location filename="../ProfileInterface.cpp" line="725"/>
        <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="150"/>
-        <location filename="../ImportDialog.cpp" line="424"/>
+        <location filename="../ImportDialog.cpp" line="313"/>
+        <location filename="../ImportDialog.cpp" line="507"/>
        <location filename="../ProfileInterface.cpp" line="735"/>
        <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>
--- a/res/gta5sync_en_US.qm
+++ b/res/gta5sync_en_US.qm
--- a/res/gta5sync_en_US.ts
+++ b/res/gta5sync_en_US.ts
@ -178,16 +178,31 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="59"/>
+        <source>Import picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="62"/>
        <source>&amp;Import...</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../ImageEditorDialog.ui" line="79"/>
+        <location filename="../ImageEditorDialog.ui" line="82"/>
+        <source>Apply changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="85"/>
        <source>&amp;Overwrite</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../ImageEditorDialog.ui" line="86"/>
+        <location filename="../ImageEditorDialog.ui" line="92"/>
+        <source>Discard changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImageEditorDialog.ui" line="95"/>
        <source>&amp;Close</source>
        <translation></translation>
    </message>
@ -211,14 +226,19 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="150"/>
-        <location filename="../ImportDialog.cpp" line="82"/>
-        <location filename="../ImportDialog.cpp" line="364"/>
+        <location filename="../ImportDialog.cpp" line="84"/>
+        <location filename="../ImportDialog.cpp" line="447"/>
        <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="174"/>
-        <location filename="../ImportDialog.ui" line="224"/>
+        <source>Select background colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="177"/>
+        <location filename="../ImportDialog.ui" line="230"/>
        <source>...</source>
        <translation></translation>
    </message>
@ -234,7 +254,7 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="111"/>
-        <location filename="../ImportDialog.ui" line="269"/>
+        <location filename="../ImportDialog.ui" line="278"/>
        <source>Ignore Aspect Ratio</source>
        <translation></translation>
    </message>
@ -249,79 +269,104 @@ Pictures and Savegames</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="429"/>
+        <location filename="../ImportDialog.cpp" line="512"/>
        <source>Background Image: %1</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="231"/>
+        <location filename="../ImportDialog.ui" line="227"/>
+        <source>Select background image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="237"/>
+        <source>Remove background image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="240"/>
        <source>X</source>
        <translation></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="259"/>
+        <location filename="../ImportDialog.ui" line="268"/>
        <source>Force Colour in Avatar Zone</source>
        <translation>Force Color in Avatar Zone</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.ui" line="315"/>
+        <location filename="../ImportDialog.ui" line="305"/>
+        <source>Import options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ImportDialog.ui" line="308"/>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <mess