diff --git a/CrewDatabase.cpp b/CrewDatabase.cpp index c4fb1f1..11e3a97 100755 --- a/CrewDatabase.cpp +++ b/CrewDatabase.cpp @@ -60,7 +60,9 @@ QStringList CrewDatabase::getCrews() QString CrewDatabase::getCrewName(int crewID) { - return crewDB->value(QString::number(crewID), crewID).toString(); + QString crewStr = crewDB->value(QString::number(crewID), crewID).toString(); + if (crewID == 0) crewStr = tr("No Crew", ""); + return crewStr; } void CrewDatabase::setCrewName(int crewID, QString crewName) diff --git a/ExportThread.cpp b/ExportThread.cpp index a2437bd..5c39bc0 100755 --- a/ExportThread.cpp +++ b/ExportThread.cpp @@ -137,7 +137,7 @@ void ExportThread::run() QString exportFilePath = exportDirectory + "/" + exportFileName; if (QFile::exists(exportFilePath)) {QFile::remove(exportFilePath);} - if (!picture->exportPicture(exportDirectory + "/" + exportFileName, true)) + if (!picture->exportPicture(exportDirectory + "/" + exportFileName, "G5E")) { failedCopyPictures.append(exportFileName); } diff --git a/PictureExport.cpp b/PictureExport.cpp index 3a25d26..ad20e9a 100755 --- a/PictureExport.cpp +++ b/PictureExport.cpp @@ -259,7 +259,7 @@ fileDialogPreSave: //Work? if (selectedFile.right(4) == ".g5e") { - bool isExported = picture->exportPicture(selectedFile, true); + bool isExported = picture->exportPicture(selectedFile, "G5E"); if (!isExported) { QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture")); @@ -280,7 +280,7 @@ fileDialogPreSave: //Work? { selectedFile.remove(".rem"); } - bool isCopied = picture->exportPicture(selectedFile, false); + bool isCopied = picture->exportPicture(selectedFile, "PGTA"); if (!isCopied) { QMessageBox::warning(parent, PictureDialog::tr("Export as GTA Snapmatic"), PictureDialog::tr("Failed to export current Snapmatic picture")); diff --git a/ProfileInterface.cpp b/ProfileInterface.cpp index 4cb0929..8a74524 100755 --- a/ProfileInterface.cpp +++ b/ProfileInterface.cpp @@ -701,7 +701,7 @@ bool ProfileInterface::importSnapmaticPicture(SnapmaticPicture *picture, bool wa if (warn) QMessageBox::warning(this, tr("Import"), tr("Failed to import the Snapmatic picture, the picture is already in the game")); return false; } - else if (picture->exportPicture(profileFolder + QDir::separator() + adjustedFileName, false)) + else if (picture->exportPicture(profileFolder + QDir::separator() + adjustedFileName, "PGTA")) { picture->setPicFilePath(profileFolder + QDir::separator() + adjustedFileName); pictureLoaded(picture, true); diff --git a/ProfileInterface.ui b/ProfileInterface.ui index 1186939..0e33355 100755 --- a/ProfileInterface.ui +++ b/ProfileInterface.ui @@ -27,7 +27,7 @@ <number>0</number> </property> <property name="bottomMargin"> - <number>0</number> + <number>9</number> </property> <item> <widget class="QStackedWidget" name="swProfile"> @@ -108,8 +108,8 @@ <rect> <x>0</x> <y>0</y> - <width>98</width> - <height>28</height> + <width>398</width> + <height>256</height> </rect> </property> <layout class="QVBoxLayout" name="vlProfile"> @@ -160,9 +160,6 @@ <property name="rightMargin"> <number>9</number> </property> - <property name="bottomMargin"> - <number>9</number> - </property> <item> <widget class="QLabel" name="labVersion"> <property name="text"> diff --git a/SavegameWidget.cpp b/SavegameWidget.cpp index e7940d3..200713d 100755 --- a/SavegameWidget.cpp +++ b/SavegameWidget.cpp @@ -151,9 +151,13 @@ void SavegameWidget::on_cmdView_clicked() SavegameDialog *savegameDialog = new SavegameDialog(this); savegameDialog->setSavegameData(sgdata, sgdPath, true); savegameDialog->setModal(true); +#ifdef Q_OS_ANDROID + // Android ... + savegameDialog->showMaximized(); +#else savegameDialog->show(); +#endif savegameDialog->exec(); - savegameDialog->deleteLater(); delete savegameDialog; } diff --git a/SnapmaticEditor.cpp b/SnapmaticEditor.cpp index 2daf948..b4cbb0a 100644 --- a/SnapmaticEditor.cpp +++ b/SnapmaticEditor.cpp @@ -26,14 +26,11 @@ #include <QDebug> #include <QFile> -SnapmaticEditor::SnapmaticEditor(QWidget *parent) : - QDialog(parent), +SnapmaticEditor::SnapmaticEditor(CrewDatabase *crewDB, QWidget *parent) : + QDialog(parent), crewDB(crewDB), ui(new Ui::SnapmaticEditor) { ui->setupUi(this); - ui->cbSelfie->setVisible(false); - ui->cbMugshot->setVisible(false); - ui->cbEditor->setVisible(false); ui->cmdApply->setDefault(true); if (QIcon::hasThemeIcon("dialog-apply")) @@ -54,63 +51,45 @@ SnapmaticEditor::~SnapmaticEditor() delete ui; } -void SnapmaticEditor::on_cbSelfie_toggled(bool checked) +void SnapmaticEditor::selfie_toggled(bool checked) { if (checked) { - ui->cbMugshot->setEnabled(false); - ui->cbEditor->setEnabled(false); + isSelfie = true; } - else if (!ui->cbDirector->isChecked()) + else { - ui->cbMugshot->setEnabled(true); - ui->cbEditor->setEnabled(true); + isSelfie = false; } } -void SnapmaticEditor::on_cbMugshot_toggled(bool checked) +void SnapmaticEditor::mugshot_toggled(bool checked) { if (checked) { - ui->cbSelfie->setEnabled(false); - ui->cbEditor->setEnabled(false); + isMugshot = true; ui->cbDirector->setEnabled(false); + ui->cbDirector->setChecked(false); } else { - ui->cbSelfie->setEnabled(true); - ui->cbEditor->setEnabled(true); + isMugshot = false; ui->cbDirector->setEnabled(true); } } -void SnapmaticEditor::on_cbDirector_toggled(bool checked) +void SnapmaticEditor::editor_toggled(bool checked) { if (checked) { - ui->cbMugshot->setEnabled(false); - ui->cbEditor->setEnabled(false); - } - else if (!ui->cbSelfie->isChecked()) - { - ui->cbMugshot->setEnabled(true); - ui->cbEditor->setEnabled(true); - } -} - -void SnapmaticEditor::on_cbEditor_toggled(bool checked) -{ - if (checked) - { - ui->cbSelfie->setEnabled(false); - ui->cbMugshot->setEnabled(false); + isEditor = true; ui->cbDirector->setEnabled(false); + ui->cbDirector->setChecked(false); } else { - ui->cbSelfie->setEnabled(true); - ui->cbMugshot->setEnabled(true); + isEditor = false; ui->cbDirector->setEnabled(true); } } @@ -119,9 +98,9 @@ void SnapmaticEditor::on_rbSelfie_toggled(bool checked) { if (checked) { - ui->cbMugshot->setChecked(false); - ui->cbEditor->setChecked(false); - ui->cbSelfie->setChecked(true); + mugshot_toggled(false); + editor_toggled(false); + selfie_toggled(true); } } @@ -129,10 +108,9 @@ void SnapmaticEditor::on_rbMugshot_toggled(bool checked) { if (checked) { - ui->cbSelfie->setChecked(false); - ui->cbEditor->setChecked(false); - ui->cbDirector->setChecked(false); - ui->cbMugshot->setChecked(true); + selfie_toggled(false); + editor_toggled(false); + mugshot_toggled(true); } } @@ -140,10 +118,9 @@ void SnapmaticEditor::on_rbEditor_toggled(bool checked) { if (checked) { - ui->cbSelfie->setChecked(false); - ui->cbMugshot->setChecked(false); - ui->cbDirector->setChecked(false); - ui->cbEditor->setChecked(true); + selfie_toggled(false); + mugshot_toggled(false); + editor_toggled(true); } } @@ -151,9 +128,9 @@ void SnapmaticEditor::on_rbCustom_toggled(bool checked) { if (checked) { - ui->cbSelfie->setChecked(false); - ui->cbMugshot->setChecked(false); - ui->cbEditor->setChecked(false); + selfie_toggled(false); + mugshot_toggled(false); + editor_toggled(false); } } @@ -162,20 +139,21 @@ void SnapmaticEditor::setSnapmaticPicture(SnapmaticPicture *picture) smpic = picture; localSpJson = smpic->getSnapmaticProperties(); ui->rbCustom->setChecked(true); - ui->cbSelfie->setChecked(localSpJson.isSelfie); - ui->cbMugshot->setChecked(localSpJson.isMug); - ui->cbEditor->setChecked(localSpJson.isFromRSEditor); + crewID = localSpJson.crewID; + isSelfie = localSpJson.isSelfie; + isMugshot = localSpJson.isMug; + isEditor = localSpJson.isFromRSEditor; ui->cbDirector->setChecked(localSpJson.isFromDirector); ui->cbMeme->setChecked(localSpJson.isMeme); - if (ui->cbSelfie->isChecked()) + if (isSelfie) { ui->rbSelfie->setChecked(true); } - else if (ui->cbMugshot->isChecked()) + else if (isMugshot) { ui->rbMugshot->setChecked(true); } - else if (ui->cbEditor->isChecked()) + else if (isEditor) { ui->rbEditor->setChecked(true); } @@ -183,6 +161,7 @@ void SnapmaticEditor::setSnapmaticPicture(SnapmaticPicture *picture) { ui->rbCustom->setChecked(true); } + setSnapmaticCrew(returnCrewName(crewID)); setSnapmaticTitle(picture->getPictureTitle()); } @@ -209,6 +188,18 @@ void SnapmaticEditor::setSnapmaticTitle(const QString &title) } } +void SnapmaticEditor::setSnapmaticCrew(const QString &crew) +{ + QString editStr = QString("<a href=\"g5e://editcrew\" style=\"text-decoration: none;\">%1</a>").arg(tr("Edit")); + QString crewStr = tr("Crew: %1 (%2)").arg(StringParser::escapeString(crew), editStr); + ui->labCrew->setText(crewStr); +} + +QString SnapmaticEditor::returnCrewName(int crewID_) +{ + return crewDB->getCrewName(crewID_); +} + void SnapmaticEditor::on_cmdCancel_clicked() { close(); @@ -220,9 +211,10 @@ void SnapmaticEditor::on_cmdApply_clicked() { qualifyAvatar(); } - localSpJson.isSelfie = ui->cbSelfie->isChecked(); - localSpJson.isMug = ui->cbMugshot->isChecked(); - localSpJson.isFromRSEditor = ui->cbEditor->isChecked(); + localSpJson.crewID = crewID; + localSpJson.isSelfie = isSelfie; + localSpJson.isMug = isMugshot; + localSpJson.isFromRSEditor = isEditor; localSpJson.isFromDirector = ui->cbDirector->isChecked(); localSpJson.isMeme = ui->cbMeme->isChecked(); if (smpic) @@ -301,3 +293,38 @@ void SnapmaticEditor::on_labTitle_linkActivated(const QString &link) } } } + +void SnapmaticEditor::on_labCrew_linkActivated(const QString &link) +{ + if (link == "g5e://editcrew") + { + bool ok; + int indexNum = 0; + QStringList itemList; + QStringList crewList = crewDB->getCrews(); + crewList.sort(); + foreach(const QString &crew, crewList) + { + itemList.append(QString("%1 (%2)").arg(crew, returnCrewName(crew.toInt()))); + } + if (crewList.contains(QString::number(crewID))) + { + indexNum = crewList.indexOf(QRegExp(QString::number(crewID))); + } + QString newCrew = QInputDialog::getItem(this, tr("Snapmatic Crew"), tr("New Snapmatic crew:"), itemList, indexNum, true, &ok, windowFlags()); + if (ok && !newCrew.isEmpty()) + { + if (newCrew.contains(" ")) newCrew = newCrew.split(" ").at(0); + if (newCrew.length() > 10) return; + foreach (const QChar &crewChar, newCrew) + { + if (!crewChar.isNumber()) + { + return; + } + } + crewID = newCrew.toInt(); + setSnapmaticCrew(returnCrewName(crewID)); + } + } +} diff --git a/SnapmaticEditor.h b/SnapmaticEditor.h index 4a2d6f4..d2f41ee 100644 --- a/SnapmaticEditor.h +++ b/SnapmaticEditor.h @@ -20,6 +20,7 @@ #define SNAPMATICEDITOR_H #include <QDialog> +#include "CrewDatabase.h" #include "SnapmaticPicture.h" namespace Ui { @@ -31,16 +32,14 @@ class SnapmaticEditor : public QDialog Q_OBJECT public: - explicit SnapmaticEditor(QWidget *parent = 0); + explicit SnapmaticEditor(CrewDatabase *crewDB, QWidget *parent = 0); void setSnapmaticPicture(SnapmaticPicture *picture); void setSnapmaticTitle(const QString &title); + void setSnapmaticCrew(const QString &crew = ""); + QString returnCrewName(int crewID); ~SnapmaticEditor(); private slots: - void on_cbSelfie_toggled(bool checked); - void on_cbMugshot_toggled(bool checked); - void on_cbDirector_toggled(bool checked); - void on_cbEditor_toggled(bool checked); void on_rbSelfie_toggled(bool checked); void on_rbMugshot_toggled(bool checked); void on_rbEditor_toggled(bool checked); @@ -49,12 +48,21 @@ private slots: void on_cmdApply_clicked(); void on_cbQualify_toggled(bool checked); void on_labTitle_linkActivated(const QString &link); + void on_labCrew_linkActivated(const QString &link); private: + CrewDatabase *crewDB; Ui::SnapmaticEditor *ui; SnapmaticProperties localSpJson; SnapmaticPicture *smpic; QString snapmaticTitle; + int crewID; + bool isSelfie; + bool isMugshot; + bool isEditor; + void selfie_toggled(bool checked); + void mugshot_toggled(bool checked); + void editor_toggled(bool checked); void qualifyAvatar(); }; diff --git a/SnapmaticEditor.ui b/SnapmaticEditor.ui index 0e361ff..46ffa60 100644 --- a/SnapmaticEditor.ui +++ b/SnapmaticEditor.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>350</height> + <height>362</height> </rect> </property> <property name="windowTitle"> @@ -81,13 +81,6 @@ <string>Snapmatic Properties</string> </property> <layout class="QGridLayout" name="gdProperties"> - <item row="5" column="1"> - <widget class="QCheckBox" name="cbEditor"> - <property name="text"> - <string>Editor</string> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QCheckBox" name="cbMeme"> <property name="text"> @@ -102,37 +95,30 @@ </property> </widget> </item> - <item row="4" column="1"> - <widget class="QCheckBox" name="cbSelfie"> - <property name="text"> - <string>Selfie</string> - </property> - </widget> - </item> - <item row="4" column="2"> - <widget class="QCheckBox" name="cbMugshot"> - <property name="text"> - <string>Mugshot</string> - </property> - </widget> - </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="gbTitle"> + <widget class="QGroupBox" name="gbValues"> <property name="title"> - <string>Snapmatic Title</string> + <string>Snapmatic Values</string> </property> <layout class="QVBoxLayout" name="vlTitle"> <item> - <widget class="UiModLabel" name="labTitle"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="UiModLabel" name="labCrew"> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> </property> + <property name="text"> + <string>Crew: %1 (%2)</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="UiModLabel" name="labTitle"> <property name="contextMenuPolicy"> <enum>Qt::NoContextMenu</enum> </property> @@ -146,12 +132,6 @@ </item> <item> <widget class="UiModLabel" name="labAppropriate"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> <property name="text"> <string>Appropriate: %1</string> </property> diff --git a/SnapmaticPicture.cpp b/SnapmaticPicture.cpp index ec7c737..b13aff0 100755 --- a/SnapmaticPicture.cpp +++ b/SnapmaticPicture.cpp @@ -69,6 +69,7 @@ void SnapmaticPicture::reset() // INIT PIC rawPicContent = ""; cachePicture = QImage(); + jpegRawContentSizeE = 0; jpegRawContentSize = 0; picExportFileName = ""; isCustomFormat = 0; @@ -105,7 +106,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo if (!picFile->open(QFile::ReadOnly)) { lastStep = "1;/1,OpenFile," + StringParser::convertDrawStringForLog(picFilePath); - picFile->deleteLater(); delete picFile; return false; } @@ -190,7 +190,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",1,NOHEADER"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -202,7 +201,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",2,NOHEADER"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -214,7 +212,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",2,NOJPEG"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -224,7 +221,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",2,NOPIC"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -232,6 +228,7 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo if (jpegRawContent.contains(QByteArray::fromHex("FFD9"))) { int jpegRawContentSizeT = jpegRawContent.indexOf(QByteArray::fromHex("FFD9")) + 2; + jpegRawContentSizeE = jpegRawContentSizeT; jpegRawContentSize = jpegRawContentSizeT; if (jpegRawContent.contains(QByteArray::fromHex("FF454F49"))) { @@ -267,7 +264,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",3,NOJSON"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -275,7 +271,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",3,CTJSON"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -287,7 +282,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",4,NOTITL"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -295,7 +289,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",4,CTTITL"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -306,7 +299,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",5,NODESC"; picStream->close(); - picStream->deleteLater(); delete picStream; return picOk; } @@ -314,7 +306,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo { lastStep = "2;/3,ReadingFile," + StringParser::convertDrawStringForLog(picFilePath) + ",5,CTDESC"; picStream->close(); - picStream->deleteLater(); delete picStream; return false; } @@ -324,7 +315,6 @@ bool SnapmaticPicture::readingPicture(bool writeEnabled_, bool cacheEnabled_, bo updateStrings(); picStream->close(); - picStream->deleteLater(); delete picStream; if (!writeEnabled) { rawPicContent.clear(); } return picOk; @@ -577,7 +567,6 @@ QImage SnapmaticPicture::getImage() if (!picFile->open(QFile::ReadOnly)) { lastStep = "1;/1,OpenFile," + StringParser::convertDrawStringForLog(picFilePath); - picFile->deleteLater(); delete picFile; return QImage(0, 0, QImage::Format_RGB888); } @@ -766,19 +755,12 @@ bool SnapmaticPicture::setSnapmaticProperties(SnapmaticProperties newSpJson) // FILE MANAGEMENT -bool SnapmaticPicture::exportPicture(const QString &fileName, bool customFormat) +bool SnapmaticPicture::exportPicture(const QString &fileName, const QString format) { QFile *picFile = new QFile(fileName); if (picFile->open(QIODevice::WriteOnly)) { - if (!customFormat) - { - // Classic straight export - picFile->write(rawPicContent); - picFile->close(); - picFile->deleteLater(); - } - else + if (format == "G5E") { // Modern compressed export QByteArray stockFileNameUTF8 = picFileName.toUtf8(); @@ -801,7 +783,31 @@ bool SnapmaticPicture::exportPicture(const QString &fileName, bool customFormat) picFile->write("COM"); // Before Compressed picFile->write(qCompress(rawPicContent, 9)); // Compressed Snapmatic picFile->close(); - picFile->deleteLater(); + delete picFile; + } + else if (format == "JPG") + { + // JPEG export + QBuffer snapmaticStream(&rawPicContent); + snapmaticStream.open(QIODevice::ReadOnly); + if (snapmaticStream.seek(jpegStreamEditorBegin)) + { + QByteArray jpegRawContent = snapmaticStream.read(jpegPicStreamLength); + if (jpegRawContentSizeE != 0) + { + jpegRawContent = jpegRawContent.left(jpegRawContentSizeE); + } + picFile->write(jpegRawContent); + } + picFile->close(); + delete picFile; + } + else + { + // Classic straight export + picFile->write(rawPicContent); + picFile->close(); + delete picFile; } return true; } diff --git a/SnapmaticPicture.h b/SnapmaticPicture.h index 37d8880..6567dad 100755 --- a/SnapmaticPicture.h +++ b/SnapmaticPicture.h @@ -75,7 +75,7 @@ public: void emitUpdate(); // FILE MANAGEMENT - bool exportPicture(const QString &fileName, bool customFormat = false); + bool exportPicture(const QString &fileName, const QString format = "PGTA"); void setPicFileName(const QString &picFileName); void setPicFilePath(const QString &picFilePath); bool deletePicFile(); @@ -122,6 +122,7 @@ private: bool cacheEnabled; bool isCustomFormat; int jpegRawContentSize; + int jpegRawContentSizeE; // PICTURE STREAM QByteArray rawPicContent; diff --git a/SnapmaticWidget.cpp b/SnapmaticWidget.cpp index c9fdc97..4f28c0c 100755 --- a/SnapmaticWidget.cpp +++ b/SnapmaticWidget.cpp @@ -125,11 +125,16 @@ void SnapmaticWidget::on_cmdView_clicked() if (navigationBar) picDialog->addPreviousNextButtons(); // show picture dialog +#ifdef Q_OS_ANDROID + // Android ... + picDialog->showMaximized(); +#else picDialog->show(); if (navigationBar) picDialog->stylizeDialog(); //picDialog->adaptNewDialogSize(); picDialog->setMinimumSize(picDialog->size()); picDialog->setMaximumSize(picDialog->size()); +#endif picDialog->exec(); delete picDialog; } @@ -283,7 +288,7 @@ void SnapmaticWidget::makePictureVisibleSlot() void SnapmaticWidget::editSnapmaticProperties() { - SnapmaticEditor *snapmaticEditor = new SnapmaticEditor(this); + SnapmaticEditor *snapmaticEditor = new SnapmaticEditor(crewDB, this); snapmaticEditor->setWindowFlags(snapmaticEditor->windowFlags()^Qt::WindowContextHelpButtonHint); snapmaticEditor->setSnapmaticPicture(smpic); snapmaticEditor->setModal(true); diff --git a/StringParser.cpp b/StringParser.cpp index 85ed417..ec55853 100755 --- a/StringParser.cpp +++ b/StringParser.cpp @@ -19,7 +19,9 @@ #include "StringParser.h" #include "config.h" #include <QTextDocument> +#ifndef GTA5VIEW_CMD #include <QApplication> +#endif #include <QTextCodec> #include <QByteArray> #include <QFileInfo> @@ -52,6 +54,7 @@ QString StringParser::convertLogStringForDraw(const QString &inputStr) return outputStr.replace("&c;",",").replace("&u;","&"); } +#ifndef GTA5VIEW_CMD QString StringParser::convertBuildedString(const QString &buildedStr) { QString outputStr = buildedStr; @@ -61,6 +64,7 @@ QString StringParser::convertBuildedString(const QString &buildedStr) outputStr.replace("$SEPARATOR", QDir::separator()); return outputStr; } +#endif QString StringParser::escapeString(const QString &toEscape) { diff --git a/StringParser.h b/StringParser.h index 3815a34..a9505f6 100755 --- a/StringParser.h +++ b/StringParser.h @@ -29,7 +29,9 @@ public: static QString parseTitleString(const QByteArray &commitBytes, int maxLength); static QString convertDrawStringForLog(const QString &inputStr); static QString convertLogStringForDraw(const QString &inputStr); +#ifndef GTA5VIEW_CMD static QString convertBuildedString(const QString &buildedStr); +#endif static QString escapeString(const QString &toEscape); }; diff --git a/UserInterface.cpp b/UserInterface.cpp index 0c51f88..d546bfd 100755 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -68,13 +68,13 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D } if (QIcon::hasThemeIcon("preferences-system")) { -#ifndef Q_WS_MAC // Setting icon for preferences/settings/options lead to a crash in Mac OS X +#ifndef Q_OS_MACOS // Setting icon for preferences/settings/options lead to a crash in Mac OS X ui->actionOptions->setIcon(QIcon::fromTheme("preferences-system")); #endif } if (QIcon::hasThemeIcon("application-exit")) { -#ifndef Q_WS_MAC // Setting icon for exit/quit lead to a crash in Mac OS X +#ifndef Q_OS_MACOS // Setting icon for exit/quit lead to a crash in Mac OS X ui->actionExit->setIcon(QIcon::fromTheme("application-exit")); #endif } @@ -249,7 +249,12 @@ void UserInterface::on_actionAbout_gta5sync_triggered() AboutDialog *aboutDialog = new AboutDialog(this); aboutDialog->setWindowIcon(windowIcon()); aboutDialog->setModal(true); +#ifdef Q_OS_ANDROID + // Android ... + aboutDialog->showMaximized(); +#else aboutDialog->show(); +#endif aboutDialog->exec(); delete aboutDialog; } @@ -300,7 +305,12 @@ void UserInterface::on_actionOptions_triggered() QObject::connect(optionsDialog, SIGNAL(settingsApplied(int, QString)), this, SLOT(settingsApplied(int, QString))); optionsDialog->setModal(true); +#ifdef Q_OS_ANDROID + // Android ... + optionsDialog->showMaximized(); +#else optionsDialog->show(); +#endif optionsDialog->exec(); delete optionsDialog; @@ -437,9 +447,14 @@ void UserInterface::openSnapmaticFile(SnapmaticPicture *picture) QObject::connect(threadDB, SIGNAL(playerNameFound(int, QString)), profileDB, SLOT(setPlayerName(int, QString))); QObject::connect(threadDB, SIGNAL(playerNameUpdated()), &picDialog, SLOT(playerNameUpdated())); +#ifdef Q_OS_ANDROID + // Android optimization should be put here + picDialog.showMaximized(); +#else picDialog.show(); picDialog.setMinimumSize(picDialog.size()); picDialog.setMaximumSize(picDialog.size()); +#endif picDialog.exec(); } @@ -449,7 +464,12 @@ void UserInterface::openSavegameFile(SavegameData *savegame) SavegameDialog sgdDialog(this); sgdDialog.setSavegameData(savegame, savegame->getSavegameFileName(), true); sgdDialog.setModal(true); +#ifdef Q_OS_ANDROID + // Android optimization should be put here + sgdDialog.showMaximized(); +#else sgdDialog.show(); +#endif sgdDialog.exec(); } diff --git a/config.h b/config.h index 4eba476..71257a2 100755 --- a/config.h +++ b/config.h @@ -50,7 +50,7 @@ #ifndef GTA5SYNC_APPVER #ifndef GTA5SYNC_DAILYB -#define GTA5SYNC_APPVER "1.4.0-dev2" +#define GTA5SYNC_APPVER "1.4.0-dev3" #else #define GTA5SYNC_APPVER QString("%1").arg(GTA5SYNC_DAILYB) #endif diff --git a/main.cpp b/main.cpp index c90f498..0a6593b 100755 --- a/main.cpp +++ b/main.cpp @@ -480,7 +480,11 @@ int main(int argc, char *argv[]) UserInterface uiWindow(&profileDB, &crewDB, &threadDB); uiWindow.setWindowIcon(IconLoader::loadingAppIcon()); uiWindow.setupDirEnv(); +#ifdef Q_OS_ANDROID + uiWindow.showMaximized(); +#else uiWindow.show(); +#endif threadLoop.exec(); diff --git a/res/app.rc b/res/app.rc index 9d25b64..1f7cbcb 100755 --- a/res/app.rc +++ b/res/app.rc @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Syping" VALUE "FileDescription", "gta5view\0" - VALUE "FileVersion", "1.4.0-dev2\0" + VALUE "FileVersion", "1.4.0-dev3\0" VALUE "InternalName", "gta5view\0" VALUE "LegalCopyright", "Copyright � 2016-2017 Syping\0" VALUE "OriginalFilename", "gta5view.exe\0" VALUE "ProductName", "gta5view\0" - VALUE "ProductVersion", "1.4.0-dev2\0" + VALUE "ProductVersion", "1.4.0-dev3\0" END END END diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 2a5912f..2dabad6 100755 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index 5210bf9..c0fc62b 100755 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -103,20 +103,34 @@ Copyright &copy; <a href="%5">%6</a> %7<br/>%8 i <translation type="obsolete"><span style=" font-weight:600;">gta5sync</span><br/><br/>Ein Projekt zum ansehen und synchronisieren von Grand Theft Auto 5 Snapmatic Bilder und Spielständen<br/><br/>Projektversion: %1<br/>Gebaut mit Qt %2<br/>Läuft auf Qt %3<br/><br/>Copyright &copy; <a href="https://github.com/Syping/">Syping</a> 2016<br/>gta5sync is lizenziert unter <a href="https://www.gnu.org/licenses/gpl-3.0.html#content">GNU GPLv3</a></translation> </message> <message> - <location filename="../AboutDialog.cpp" line="39"/> + <location filename="../AboutDialog.cpp" line="40"/> <source>A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames</source> <translation>Ein Projekt zum ansehen von Grand Theft Auto V<br/> Snapmatic Bilder und Spielständen</translation> </message> <message> - <location filename="../AboutDialog.cpp" line="37"/> + <location filename="../AboutDialog.cpp" line="38"/> <source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames</source> <translation>Ein Projekt zum ansehen und synchronisieren von<br/> Grand Theft Auto V Snapmatic Bilder und Spielständen</translation> </message> </context> +<context> + <name>CrewDatabase</name> + <message> + <location filename="../CrewDatabase.cpp" line="64"/> + <source>No Crew</source> + <translation>Keine Crew</translation> + </message> + <message> + <source>Free</source> + <comment>Crew Free (means no crew)</comment> + <translatorcomment>Crew Keine (bedeutet keine Crew)</translatorcomment> + <translation type="vanished">Keine</translation> + </message> +</context> <context> <name>ExportDialog</name> <message> @@ -421,26 +435,26 @@ Grand Theft Auto V Snapmatic Bilder und Spielständen</translation> <translation type="obsolete">%1 (%2 wenn verfügbar) [sys]</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="125"/> + <location filename="../OptionsDialog.cpp" line="129"/> <source>System</source> <comment>System like PC System</comment> <translation>System</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="125"/> + <location filename="../OptionsDialog.cpp" line="129"/> <source>%1 (%2 if available)</source> <comment>System like PC System = %1, System Language like Deutsch = %2</comment> <translation>%1 (%2 wenn verfügbar)</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="284"/> <location filename="../OptionsDialog.cpp" line="288"/> + <location filename="../OptionsDialog.cpp" line="292"/> <source>%1</source> <comment>%1</comment> <translation>%1</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="284"/> + <location filename="../OptionsDialog.cpp" line="288"/> <source>The new Custom Folder will initialize after you restart %1.</source> <translation>Der eigene Ordner wird initialisiert sobald du %1 neugestartet hast.</translation> </message> @@ -449,20 +463,20 @@ Grand Theft Auto V Snapmatic Bilder und Spielständen</translation> <translation type="vanished">Der eigene Ordner initialisiert sobald du %1 neugestartet hast.</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="288"/> + <location filename="../OptionsDialog.cpp" line="292"/> <source>The language change will take effect after you restart %1.</source> <translation>Die Änderung der Sprache nimmt Effekt sobald du %1 neugestartet hast.</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="298"/> + <location filename="../OptionsDialog.cpp" line="302"/> <source>No Profile</source> <comment>No Profile, as default</comment> <translation>Kein Profil</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="306"/> <location filename="../OptionsDialog.cpp" line="310"/> - <location filename="../OptionsDialog.cpp" line="312"/> + <location filename="../OptionsDialog.cpp" line="314"/> + <location filename="../OptionsDialog.cpp" line="316"/> <source>Profile: %1</source> <translation>Profil: %1</translation> </message> @@ -511,7 +525,6 @@ Grand Theft Auto V Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../PictureDialog.ui" line="167"/> - <location filename="../PictureExport.cpp" line="221"/> <source>&Export</source> <translation>&Exportieren</translation> </message> @@ -546,6 +559,7 @@ Grand Theft Auto V Snapmatic Bilder und Spielständen</translation> </message> <message> <location filename="../PictureExport.cpp" line="89"/> + <location filename="../PictureExport.cpp" line="221"/> <source>Export</source> <translation>Exportieren</translation> </message> @@ -559,17 +573,17 @@ Grand Theft Auto V Snapmatic Bilder und Spielständen</translation> <translation>Schließen</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="128"/> + <location filename="../PictureDialog.cpp" line="132"/> <source>Export as &JPG picture...</source> <translation>Exportiere als &JPG Bild...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="129"/> + <location filename="../PictureDialog.cpp" line="133"/> <source>Export as &GTA Snapmatic...</source> <translation>Exportiere als &GTA Snapmatic...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="343"/> + <location filename="../PictureDialog.cpp" line="347"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -578,19 +592,19 @@ Taste 2 - Overlay umschalten Pfeiltasten - Navigieren</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="402"/> - <location filename="../PictureDialog.cpp" line="474"/> + <location filename="../PictureDialog.cpp" line="406"/> + <location filename="../PictureDialog.cpp" line="478"/> <source>Snapmatic Picture Viewer</source> <translation>Snapmatic Bildansicht</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="402"/> - <location filename="../PictureDialog.cpp" line="474"/> + <location filename="../PictureDialog.cpp" line="406"/> + <location filename="../PictureDialog.cpp" line="478"/> <source>Failed at %1</source> <translation>Fehlgeschlagen bei %1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="529"/> + <location filename="../PictureDialog.cpp" line="533"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>Avatar Vorschaumodus @@ -627,19 +641,19 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Avatar Vorschaumodus<br>Drücke A für Standardansicht</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="463"/> - <location filename="../PictureDialog.cpp" line="473"/> + <location filename="../PictureDialog.cpp" line="467"/> + <location filename="../PictureDialog.cpp" line="477"/> <source>No player</source> <translation>Keine Spieler</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="466"/> - <location filename="../PictureDialog.cpp" line="473"/> + <location filename="../PictureDialog.cpp" line="470"/> + <location filename="../PictureDialog.cpp" line="477"/> <source>No crew</source> <translation>Keine Crew</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="473"/> + <location filename="../PictureDialog.cpp" line="477"/> <source>Unknown Location</source> <translation>Unbekannter Standort</translation> </message> @@ -786,27 +800,27 @@ Drücke A für Standardansicht</translation> <translation>Lade Datei %1 von %2 Dateien</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="169"/> + <location filename="../ProfileInterface.ui" line="166"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="195"/> + <location filename="../ProfileInterface.ui" line="192"/> <source>Import exported file</source> <translation>Importiere exportierte Datei</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="198"/> + <location filename="../ProfileInterface.ui" line="195"/> <source>&Import...</source> <translation>&Importieren...</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="214"/> + <location filename="../ProfileInterface.ui" line="211"/> <source>Close profile</source> <translation>Profil schließen</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="217"/> + <location filename="../ProfileInterface.ui" line="214"/> <source>&Close</source> <translation>S&chließen</translation> </message> @@ -827,29 +841,29 @@ Drücke A für Standardansicht</translation> <translation type="obsolete">Profil schließen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="111"/> + <location filename="../ProfileInterface.cpp" line="108"/> <source>Loading...</source> <translation>Lade...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="369"/> - <location filename="../ProfileInterface.cpp" line="406"/> + <location filename="../ProfileInterface.cpp" line="384"/> + <location filename="../ProfileInterface.cpp" line="421"/> <source>Import...</source> <translation>Importieren...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="370"/> - <location filename="../ProfileInterface.cpp" line="460"/> - <location filename="../ProfileInterface.cpp" line="465"/> - <location filename="../ProfileInterface.cpp" line="492"/> - <location filename="../ProfileInterface.cpp" line="508"/> - <location filename="../ProfileInterface.cpp" line="658"/> - <location filename="../ProfileInterface.cpp" line="663"/> - <location filename="../ProfileInterface.cpp" line="681"/> - <location filename="../ProfileInterface.cpp" line="686"/> - <location filename="../ProfileInterface.cpp" line="697"/> - <location filename="../ProfileInterface.cpp" line="734"/> - <location filename="../ProfileInterface.cpp" line="740"/> + <location filename="../ProfileInterface.cpp" line="385"/> + <location filename="../ProfileInterface.cpp" line="475"/> + <location filename="../ProfileInterface.cpp" line="480"/> + <location filename="../ProfileInterface.cpp" line="507"/> + <location filename="../ProfileInterface.cpp" line="523"/> + <location filename="../ProfileInterface.cpp" line="673"/> + <location filename="../ProfileInterface.cpp" line="678"/> + <location filename="../ProfileInterface.cpp" line="696"/> + <location filename="../ProfileInterface.cpp" line="701"/> + <location filename="../ProfileInterface.cpp" line="712"/> + <location filename="../ProfileInterface.cpp" line="749"/> + <location filename="../ProfileInterface.cpp" line="755"/> <source>Import</source> <translation>Importieren</translation> </message> @@ -858,41 +872,41 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Alle Profildateien (SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="373"/> + <location filename="../ProfileInterface.cpp" line="388"/> <source>Importable files (*.g5e *.jpg *.png SGTA* PGTA*)</source> <translation>Importfähige Dateien (*.g5e *.jpg *.png SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="375"/> - <location filename="../UserInterface.cpp" line="335"/> + <location filename="../ProfileInterface.cpp" line="390"/> + <location filename="../UserInterface.cpp" line="344"/> <source>Savegames files (SGTA*)</source> <translation>Spielstanddateien (SGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="376"/> - <location filename="../UserInterface.cpp" line="336"/> + <location filename="../ProfileInterface.cpp" line="391"/> + <location filename="../UserInterface.cpp" line="345"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Snapmatic Bilder (PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="377"/> + <location filename="../ProfileInterface.cpp" line="392"/> <source>All image files (*.jpg *.png)</source> <translation>Alle Bilddateien (*.jpg *.png)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="378"/> - <location filename="../UserInterface.cpp" line="337"/> + <location filename="../ProfileInterface.cpp" line="393"/> + <location filename="../UserInterface.cpp" line="346"/> <source>All files (**)</source> <translation>Alle Dateien (**)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="407"/> <location filename="../ProfileInterface.cpp" line="422"/> + <location filename="../ProfileInterface.cpp" line="437"/> <source>Import file %1 of %2 files</source> <translation>Importiere Datei %1 von %2 Dateien</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="460"/> + <location filename="../ProfileInterface.cpp" line="475"/> <source>Import failed with... %1</source> @@ -901,46 +915,46 @@ Drücke A für Standardansicht</translation> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="492"/> - <location filename="../UserInterface.cpp" line="377"/> + <location filename="../ProfileInterface.cpp" line="507"/> + <location filename="../UserInterface.cpp" line="386"/> <source>Failed to read Snapmatic picture</source> <translation>Fehler beim Lesen vom Snapmatic Bild</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="508"/> - <location filename="../UserInterface.cpp" line="393"/> + <location filename="../ProfileInterface.cpp" line="523"/> + <location filename="../UserInterface.cpp" line="402"/> <source>Failed to read Savegame file</source> <translation>Fehler beim Lesen von Spielstanddatei</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="658"/> + <location filename="../ProfileInterface.cpp" line="673"/> <source>Can't import %1 because of not valid file format</source> <translation>Kann %1 nicht importieren weil das Dateiformat nicht gültig ist</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="681"/> + <location filename="../ProfileInterface.cpp" line="696"/> <source>Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e</source> <translation>Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA oder endet mit .g5e</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="686"/> + <location filename="../ProfileInterface.cpp" line="701"/> <source>Failed to import the Snapmatic picture, the picture is already in the game</source> <translation>Fehlgeschlagen beim Importieren vom Snapmatic Bild, dieses Bild ist bereits im Spiel</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="841"/> + <location filename="../ProfileInterface.cpp" line="856"/> <source>%1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as:</source> <translation>%1Exportiere Snapmatic Bilder%2<br><br>JPG Bilder machen es möglich sie mit ein Bildansicht Programm zu öffnen<br>Das GTA Snapmatic Format macht es möglich sie wieder ins Game zu importieren<br><br>Exportieren als:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="465"/> - <location filename="../ProfileInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="425"/> + <location filename="../ProfileInterface.cpp" line="480"/> + <location filename="../ProfileInterface.cpp" line="678"/> + <location filename="../UserInterface.cpp" line="434"/> <source>No valid file is selected</source> <translation>Keine gültige Datei wurde ausgewählt</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="60"/> + <location filename="../ProfileInterface.cpp" line="61"/> <source>Enabled pictures: %1 of %2</source> <translation>Aktivierte Bilder: %1 von %2</translation> </message> @@ -949,35 +963,35 @@ Drücke A für Standardansicht</translation> <translation type="vanished">Fehlgeschlagen beim Importieren vom Snapmatic Bild, Datei beginnt nicht mit PGTA</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="697"/> + <location filename="../ProfileInterface.cpp" line="712"/> <source>Failed to import the Snapmatic picture, can't copy the file into profile</source> <translation>Fehlgeschlagen beim Importieren vom Snapmatic Bild, kann Snapmatic Bild nicht ins Profil kopieren </translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="734"/> + <location filename="../ProfileInterface.cpp" line="749"/> <source>Failed to import the Savegame, can't copy the file into profile</source> <translation>Fehlgeschlagen beim Importieren vom Spielstand, kann Spielstanddatei nicht ins Profil kopieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="740"/> + <location filename="../ProfileInterface.cpp" line="755"/> <source>Failed to import the Savegame, no Savegame slot is left</source> <translation>Fehlgeschlagen beim Importieren vom Spielstand, kein Spielstandslot mehr frei</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="826"/> - <location filename="../ProfileInterface.cpp" line="844"/> + <location filename="../ProfileInterface.cpp" line="841"/> + <location filename="../ProfileInterface.cpp" line="859"/> <source>JPG pictures and GTA Snapmatic</source> <translation>JPG Bilder und GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="827"/> - <location filename="../ProfileInterface.cpp" line="849"/> + <location filename="../ProfileInterface.cpp" line="842"/> + <location filename="../ProfileInterface.cpp" line="864"/> <source>JPG pictures only</source> <translation>Nur JPG Bilder</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="828"/> - <location filename="../ProfileInterface.cpp" line="853"/> + <location filename="../ProfileInterface.cpp" line="843"/> + <location filename="../ProfileInterface.cpp" line="868"/> <source>GTA Snapmatic only</source> <translation>Nur GTA Snapmatic</translation> </message> @@ -996,25 +1010,25 @@ Das GTA Snapmatic Format macht es möglich sie wieder ins Game zu importieren Exportieren als:</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="940"/> - <location filename="../ProfileInterface.cpp" line="983"/> + <location filename="../ProfileInterface.cpp" line="953"/> + <location filename="../ProfileInterface.cpp" line="995"/> <source>No Snapmatic pictures or Savegames files are selected</source> <translation>Keine Snapmatic Bilder oder Spielstände ausgewählt</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="948"/> - <location filename="../ProfileInterface.cpp" line="977"/> - <location filename="../ProfileInterface.cpp" line="983"/> + <location filename="../ProfileInterface.cpp" line="961"/> + <location filename="../ProfileInterface.cpp" line="989"/> + <location filename="../ProfileInterface.cpp" line="995"/> <source>Remove selected</source> <translation>Auswahl löschen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="948"/> + <location filename="../ProfileInterface.cpp" line="961"/> <source>You really want remove the selected Snapmatic picutres and Savegame files?</source> <translation>Möchtest du wirklich die ausgewählten Snapmatic Bilder und Spielstanddateien löschen?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="977"/> + <location filename="../ProfileInterface.cpp" line="989"/> <source>Failed at remove the complete selected Snapmatic pictures and/or Savegame files</source> <translation>Fehlgeschlagen beim kompletten entfernen der ausgewählten Snapmatic Bilder und/oder der Spielstanddateien</translation> </message> @@ -1035,10 +1049,10 @@ Exportieren als:</translation> <translation type="obsolete">Fehlgeschlagenen beim Import vom Spielstand weil kein Spielstandslot mehr übrig ist</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="803"/> - <location filename="../ProfileInterface.cpp" line="841"/> - <location filename="../ProfileInterface.cpp" line="918"/> - <location filename="../ProfileInterface.cpp" line="940"/> + <location filename="../ProfileInterface.cpp" line="818"/> + <location filename="../ProfileInterface.cpp" line="856"/> + <location filename="../ProfileInterface.cpp" line="933"/> + <location filename="../ProfileInterface.cpp" line="953"/> <source>Export selected</source> <translation>Auswahl exportieren</translation> </message> @@ -1059,12 +1073,12 @@ Exportieren als:</translation> <translation type="obsolete">Wie sollen wir mit den Snapmatic Bilder umgehen?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="884"/> + <location filename="../ProfileInterface.cpp" line="899"/> <source>Export selected...</source> <translation>Auswahl exportieren...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="885"/> + <location filename="../ProfileInterface.cpp" line="900"/> <source>Initializing export...</source> <translation>Initialisiere Export...</translation> </message> @@ -1073,7 +1087,7 @@ Exportieren als:</translation> <translation type="obsolete">Initialisierung...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="918"/> + <location filename="../ProfileInterface.cpp" line="933"/> <source>Export failed with... %1</source> @@ -1103,13 +1117,13 @@ Exportieren als:</translation> <translation>Exportiere Datei %1 von %2 Dateien</translation> </message> <message> - <location filename="../UserInterface.cpp" line="333"/> + <location filename="../UserInterface.cpp" line="342"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>Alle Profildateien (*.g5e SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="374"/> - <location filename="../UserInterface.cpp" line="334"/> + <location filename="../ProfileInterface.cpp" line="389"/> + <location filename="../UserInterface.cpp" line="343"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> @@ -1131,7 +1145,7 @@ Exportieren als:</translation> <name>SavegameDialog</name> <message> <location filename="../SavegameDialog.ui" line="14"/> - <location filename="../SavegameDialog.cpp" line="29"/> + <location filename="../SavegameDialog.cpp" line="33"/> <source>Savegame Viewer</source> <translation>Spielstandanzeiger</translation> </message> @@ -1163,7 +1177,7 @@ Exportieren als:</translation> <translation type="obsolete">Schließen</translation> </message> <message> - <location filename="../SavegameDialog.cpp" line="29"/> + <location filename="../SavegameDialog.cpp" line="33"/> <source>Failed at %1</source> <translation>Fehlgeschlagen bei %1</translation> </message> @@ -1266,34 +1280,34 @@ Exportieren als:</translation> <translation>Fehlgeschlagen beim Löschen %1 von deinen Spielständen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1106"/> + <location filename="../ProfileInterface.cpp" line="1118"/> <source>&View</source> <translation>A&nsehen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1108"/> + <location filename="../ProfileInterface.cpp" line="1120"/> <source>&Remove</source> <translation>Entfe&rnen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1112"/> - <location filename="../ProfileInterface.cpp" line="1123"/> + <location filename="../ProfileInterface.cpp" line="1124"/> + <location filename="../ProfileInterface.cpp" line="1135"/> <source>&Select</source> <translation>Au&swählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1113"/> + <location filename="../ProfileInterface.cpp" line="1125"/> <source>&Deselect</source> <translation>A&bwählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1114"/> - <location filename="../ProfileInterface.cpp" line="1124"/> + <location filename="../ProfileInterface.cpp" line="1126"/> + <location filename="../ProfileInterface.cpp" line="1136"/> <source>Select &All</source> <translation>&Alles auswählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1117"/> + <location filename="../ProfileInterface.cpp" line="1129"/> <source>&Deselect All</source> <translation>Alles a&bwählen</translation> </message> @@ -1332,7 +1346,7 @@ Exportieren als:</translation> <translation>Spielstand kopieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1107"/> + <location filename="../ProfileInterface.cpp" line="1119"/> <source>&Export</source> <translation>&Exportieren</translation> </message> @@ -1408,7 +1422,7 @@ Exportieren als:</translation> <message> <location filename="../SnapmaticEditor.ui" line="14"/> <location filename="../SnapmaticEditor.ui" line="81"/> - <location filename="../SnapmaticEditor.cpp" line="247"/> + <location filename="../SnapmaticEditor.cpp" line="239"/> <source>Snapmatic Properties</source> <translation>Snapmatic Eigenschaften</translation> </message> @@ -1419,13 +1433,11 @@ Exportieren als:</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="50"/> - <location filename="../SnapmaticEditor.ui" line="87"/> <source>Editor</source> <translation>Editor</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="57"/> - <location filename="../SnapmaticEditor.ui" line="108"/> <source>Selfie</source> <translation>Selbstporträt</translation> </message> @@ -1436,7 +1448,6 @@ Exportieren als:</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="71"/> - <location filename="../SnapmaticEditor.ui" line="115"/> <source>Mugshot</source> <translation>Fahndungsfoto</translation> </message> @@ -1445,56 +1456,66 @@ Exportieren als:</translation> <translation type="vanished">Eigenes</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="101"/> + <location filename="../SnapmaticEditor.ui" line="94"/> <source>Director</source> <translation>Director</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="94"/> + <location filename="../SnapmaticEditor.ui" line="87"/> <source>Meme</source> <translation>Meme</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="125"/> - <location filename="../SnapmaticEditor.cpp" line="297"/> + <location filename="../SnapmaticEditor.cpp" line="289"/> <source>Snapmatic Title</source> <translation>Snapmatic Titel</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="140"/> - <location filename="../SnapmaticEditor.cpp" line="200"/> + <location filename="../SnapmaticEditor.ui" line="104"/> + <source>Snapmatic Values</source> + <translation>Snapmatic Werte</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="113"/> + <location filename="../SnapmaticEditor.cpp" line="194"/> + <source>Crew: %1 (%2)</source> + <translation>Crew: %1 (%2)</translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="126"/> + <location filename="../SnapmaticEditor.cpp" line="179"/> <source>Title: %1 (%2)</source> <translation>Titel: %1 (%2)</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="156"/> - <location filename="../SnapmaticEditor.cpp" line="204"/> - <location filename="../SnapmaticEditor.cpp" line="208"/> + <location filename="../SnapmaticEditor.ui" line="136"/> + <location filename="../SnapmaticEditor.cpp" line="183"/> + <location filename="../SnapmaticEditor.cpp" line="187"/> <source>Appropriate: %1</source> <translation>Angemessen: %1</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="169"/> + <location filename="../SnapmaticEditor.ui" line="149"/> <source>Extras</source> <translation>Extras</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="175"/> + <location filename="../SnapmaticEditor.ui" line="155"/> <source>Qualify as Avatar automatically at apply</source> <translation>Beim Übernehmen als Avatar qualifizieren </translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="188"/> + <location filename="../SnapmaticEditor.ui" line="168"/> <source>Qualify as Avatar allows you to use this Snapmatic as a Social Club profile picture</source> <translation>Das Qualifizieren als Avatar erlaubt dir dieses Snapmatic als Social Club Profilbild zu nutzen</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="238"/> + <location filename="../SnapmaticEditor.ui" line="218"/> <source>&Apply</source> <translation>&Übernehmen</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="251"/> + <location filename="../SnapmaticEditor.ui" line="231"/> <source>&Cancel</source> <translation>Abbre&chen</translation> </message> @@ -1507,37 +1528,48 @@ Exportieren als:</translation> <translation type="vanished">Cancel</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="199"/> + <location filename="../SnapmaticEditor.cpp" line="178"/> + <location filename="../SnapmaticEditor.cpp" line="193"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="204"/> + <location filename="../SnapmaticEditor.cpp" line="183"/> <source>Yes</source> <comment>Yes, should work fine</comment> <translation>Ja</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="208"/> + <location filename="../SnapmaticEditor.cpp" line="187"/> <source>No</source> <comment>No, could lead to issues</comment> <translation>Nein</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="247"/> + <location filename="../SnapmaticEditor.cpp" line="239"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> <translation>Patchen von Snapmatic Eigenschaften fehlgeschlagen wegen I/O Fehler</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="297"/> + <location filename="../SnapmaticEditor.cpp" line="289"/> <source>New Snapmatic title:</source> <translation>Neuer Snapmatic Titel:</translation> </message> + <message> + <location filename="../SnapmaticEditor.cpp" line="314"/> + <source>Snapmatic Crew</source> + <translation>Snapmatic Crew</translation> + </message> + <message> + <location filename="../SnapmaticEditor.cpp" line="314"/> + <source>New Snapmatic crew:</source> + <translation>Neue Snapmatic Crew:</translation> + </message> </context> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="370"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>PHOTO - %1</source> <translation>FOTO - %1</translation> </message> @@ -1576,18 +1608,18 @@ Exportieren als:</translation> </message> <message> <location filename="../SnapmaticWidget.ui" line="149"/> - <location filename="../SnapmaticWidget.cpp" line="150"/> - <location filename="../SnapmaticWidget.cpp" line="163"/> + <location filename="../SnapmaticWidget.cpp" line="159"/> + <location filename="../SnapmaticWidget.cpp" line="168"/> <source>Delete picture</source> <translation>Bild löschen</translation> </message> <message> - <location filename="../SnapmaticWidget.cpp" line="150"/> + <location filename="../SnapmaticWidget.cpp" line="159"/> <source>Are you sure to delete %1 from your Snapmatic pictures?</source> <translation>Bist du sicher %1 von deinen Snapmatic Bilder zu löschen?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1065"/> + <location filename="../ProfileInterface.cpp" line="1077"/> <source>Edi&t</source> <translation>Bearbei&ten</translation> </message> @@ -1600,7 +1632,7 @@ Exportieren als:</translation> <translation type="vanished">&Im Spiel deaktivieren</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1075"/> + <location filename="../ProfileInterface.cpp" line="1087"/> <source>&Export</source> <translation>&Exportieren</translation> </message> @@ -1613,12 +1645,12 @@ Exportieren als:</translation> <translation type="obsolete">Exportiere als &GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1068"/> + <location filename="../ProfileInterface.cpp" line="1080"/> <source>Show &In-game</source> <translation>&Im Spiel anzeigen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1072"/> + <location filename="../ProfileInterface.cpp" line="1084"/> <source>Hide &In-game</source> <translation>&Im Spiel ausblenden</translation> </message> @@ -1631,49 +1663,49 @@ Exportieren als:</translation> <translation type="vanished">FOTO - %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1074"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>&Edit Properties...</source> <translation>&Eigenschaften bearbeiten...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1076"/> + <location filename="../ProfileInterface.cpp" line="1088"/> <source>Export as &JPG picture...</source> <translation>Exportiere als &JPG Bild...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1077"/> + <location filename="../ProfileInterface.cpp" line="1089"/> <source>Export as &GTA Snapmatic...</source> <translation>Exportiere als &GTA Snapmatic...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1078"/> + <location filename="../ProfileInterface.cpp" line="1090"/> <source>&View</source> <translation>A&nsehen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1081"/> + <location filename="../ProfileInterface.cpp" line="1093"/> <source>&Remove</source> <translation>Entfe&rnen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1085"/> - <location filename="../ProfileInterface.cpp" line="1096"/> + <location filename="../ProfileInterface.cpp" line="1097"/> + <location filename="../ProfileInterface.cpp" line="1108"/> <source>&Select</source> <translation>Au&swählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1086"/> + <location filename="../ProfileInterface.cpp" line="1098"/> <source>&Deselect</source> <translation>A&bwählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1087"/> - <location filename="../ProfileInterface.cpp" line="1097"/> + <location filename="../ProfileInterface.cpp" line="1099"/> + <location filename="../ProfileInterface.cpp" line="1109"/> <source>Select &All</source> <translation>Alles &auswählen</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1090"/> + <location filename="../ProfileInterface.cpp" line="1102"/> <source>&Deselect All</source> <translation>Alles a&bwählen</translation> </message> @@ -1721,7 +1753,7 @@ Exportieren als:</translation> <translation type="obsolete">Bist du sicher %1 von deinen Snapmatic Bilder zu löschen?</translation> </message> <message> - <location filename="../SnapmaticWidget.cpp" line="163"/> + <location filename="../SnapmaticWidget.cpp" line="168"/> <source>Failed at deleting %1 from your Snapmatic pictures</source> <translation>Fehlgeschlagen beim Löschen %1 von deinen Snapmatic Bildern</translation> </message> @@ -2001,15 +2033,15 @@ Exportieren als:</translation> </message> <message> <location filename="../UserInterface.cpp" line="62"/> - <location filename="../UserInterface.cpp" line="214"/> + <location filename="../UserInterface.cpp" line="213"/> <source>Select Profile</source> <translation>Profil auswählen</translation> </message> <message> <location filename="../UserInterface.ui" line="306"/> - <location filename="../OptionsDialog.cpp" line="444"/> + <location filename="../OptionsDialog.cpp" line="448"/> <location filename="../UserInterface.cpp" line="93"/> - <location filename="../UserInterface.cpp" line="474"/> + <location filename="../UserInterface.cpp" line="488"/> <source>Select GTA V Folder...</source> <translation>Wähle GTA V Ordner...</translation> </message> @@ -2018,7 +2050,7 @@ Exportieren als:</translation> <translation type="vanished">Wähle GTA V &Ordner...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="330"/> + <location filename="../UserInterface.cpp" line="339"/> <source>Open File...</source> <translation>Datei öffnen...</translation> </message> @@ -2039,15 +2071,15 @@ Exportieren als:</translation> <translation>&Über %1</translation> </message> <message> - <location filename="../UserInterface.cpp" line="377"/> - <location filename="../UserInterface.cpp" line="393"/> - <location filename="../UserInterface.cpp" line="420"/> - <location filename="../UserInterface.cpp" line="425"/> + <location filename="../UserInterface.cpp" line="386"/> + <location filename="../UserInterface.cpp" line="402"/> + <location filename="../UserInterface.cpp" line="429"/> + <location filename="../UserInterface.cpp" line="434"/> <source>Open File</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../UserInterface.cpp" line="420"/> + <location filename="../UserInterface.cpp" line="429"/> <source>Can't open %1 because of not valid file format</source> <translation>Kann nicht %1 öffnen weil Dateiformat nicht gültig ist</translation> </message> diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index 89f9aab..2fcb28e 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -67,20 +67,28 @@ Copyright &copy; <a href="%5">%6</a> %7<br/> <translation>&Fermer</translation> </message> <message> - <location filename="../AboutDialog.cpp" line="39"/> + <location filename="../AboutDialog.cpp" line="40"/> <source>A project for viewing Grand Theft Auto V Snapmatic<br/> Pictures and Savegames</source> <translation>Un outil pour gérer les photos Snapmatic<br/> et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> <message> - <location filename="../AboutDialog.cpp" line="37"/> + <location filename="../AboutDialog.cpp" line="38"/> <source>A project for viewing and sync Grand Theft Auto V Snapmatic<br/> Pictures and Savegames</source> <translation>Un outil pour gérer et synchroniser les photos Snapmatic<br/> et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> </context> +<context> + <name>CrewDatabase</name> + <message> + <location filename="../CrewDatabase.cpp" line="64"/> + <source>No Crew</source> + <translation type="unfinished"></translation> + </message> +</context> <context> <name>ExportDialog</name> <message> @@ -344,44 +352,44 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation>&Annuler</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="125"/> + <location filename="../OptionsDialog.cpp" line="129"/> <source>%1 (%2 if available)</source> <comment>System like PC System = %1, System Language like Deutsch = %2</comment> <translation>%1 (%2 si disponible)</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="125"/> + <location filename="../OptionsDialog.cpp" line="129"/> <source>System</source> <comment>System like PC System</comment> <translation>Système</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="284"/> <location filename="../OptionsDialog.cpp" line="288"/> + <location filename="../OptionsDialog.cpp" line="292"/> <source>%1</source> <comment>%1</comment> <translation>%1</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="284"/> + <location filename="../OptionsDialog.cpp" line="288"/> <source>The new Custom Folder will initialize after you restart %1.</source> <translation>Le répertoire personnalisé sera actif au prochain lancement de %1.</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="288"/> + <location filename="../OptionsDialog.cpp" line="292"/> <source>The language change will take effect after you restart %1.</source> <translation>Le changement de langue sera actif au prochain lancement de %1.</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="298"/> + <location filename="../OptionsDialog.cpp" line="302"/> <source>No Profile</source> <comment>No Profile, as default</comment> <translation>Aucun profil</translation> </message> <message> - <location filename="../OptionsDialog.cpp" line="306"/> <location filename="../OptionsDialog.cpp" line="310"/> - <location filename="../OptionsDialog.cpp" line="312"/> + <location filename="../OptionsDialog.cpp" line="314"/> + <location filename="../OptionsDialog.cpp" line="316"/> <source>Profile: %1</source> <translation>Profil : %1</translation> </message> @@ -411,7 +419,6 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> </message> <message> <location filename="../PictureDialog.ui" line="167"/> - <location filename="../PictureExport.cpp" line="221"/> <source>&Export</source> <translation>&Exporter</translation> </message> @@ -487,17 +494,17 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation>Fichier invalide</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="128"/> + <location filename="../PictureDialog.cpp" line="132"/> <source>Export as &JPG picture...</source> <translation>Exporter comme image &JPG...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="129"/> + <location filename="../PictureDialog.cpp" line="133"/> <source>Export as &GTA Snapmatic...</source> <translation>Exporter comme &GTA Snapmatic...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="343"/> + <location filename="../PictureDialog.cpp" line="347"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -506,19 +513,19 @@ Touche 2 - Activer/désactiver l'overlay Touches fléchées - Naviguer</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="402"/> - <location filename="../PictureDialog.cpp" line="474"/> + <location filename="../PictureDialog.cpp" line="406"/> + <location filename="../PictureDialog.cpp" line="478"/> <source>Snapmatic Picture Viewer</source> <translation>Visionneuse de photo Snapmatic</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="402"/> - <location filename="../PictureDialog.cpp" line="474"/> + <location filename="../PictureDialog.cpp" line="406"/> + <location filename="../PictureDialog.cpp" line="478"/> <source>Failed at %1</source> <translation>Echec de %1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="529"/> + <location filename="../PictureDialog.cpp" line="533"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>Mode Aperçu Avatar @@ -529,19 +536,19 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Aperçu avatar<br>Appuyer sur A pour la vue par défaut</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="463"/> - <location filename="../PictureDialog.cpp" line="473"/> + <location filename="../PictureDialog.cpp" line="467"/> + <location filename="../PictureDialog.cpp" line="477"/> <source>No player</source> <translation>Aucun joueur</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="466"/> - <location filename="../PictureDialog.cpp" line="473"/> + <location filename="../PictureDialog.cpp" line="470"/> + <location filename="../PictureDialog.cpp" line="477"/> <source>No crew</source> <translation>Aucun crew</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="473"/> + <location filename="../PictureDialog.cpp" line="477"/> <source>Unknown Location</source> <translation>Emplacement inconnu</translation> </message> @@ -552,6 +559,7 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../PictureExport.cpp" line="89"/> + <location filename="../PictureExport.cpp" line="221"/> <source>Export</source> <translation>Exporter</translation> </message> @@ -594,27 +602,27 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Chargement du fichier %1 sur %2</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="169"/> + <location filename="../ProfileInterface.ui" line="166"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="195"/> + <location filename="../ProfileInterface.ui" line="192"/> <source>Import exported file</source> <translation>Importer un profil</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="198"/> + <location filename="../ProfileInterface.ui" line="195"/> <source>&Import...</source> <translation>&Importer...</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="214"/> + <location filename="../ProfileInterface.ui" line="211"/> <source>Close profile</source> <translation>Fermer</translation> </message> <message> - <location filename="../ProfileInterface.ui" line="217"/> + <location filename="../ProfileInterface.ui" line="214"/> <source>&Close</source> <translation>&Fermer</translation> </message> @@ -626,34 +634,34 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Copie du fichier %1 sur %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="60"/> + <location filename="../ProfileInterface.cpp" line="61"/> <source>Enabled pictures: %1 of %2</source> <translation>Photos activées : %1 sur %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="111"/> + <location filename="../ProfileInterface.cpp" line="108"/> <source>Loading...</source> <translation>Chargement...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="369"/> - <location filename="../ProfileInterface.cpp" line="406"/> + <location filename="../ProfileInterface.cpp" line="384"/> + <location filename="../ProfileInterface.cpp" line="421"/> <source>Import...</source> <translation>Importer...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="370"/> - <location filename="../ProfileInterface.cpp" line="460"/> - <location filename="../ProfileInterface.cpp" line="465"/> - <location filename="../ProfileInterface.cpp" line="492"/> - <location filename="../ProfileInterface.cpp" line="508"/> - <location filename="../ProfileInterface.cpp" line="658"/> - <location filename="../ProfileInterface.cpp" line="663"/> - <location filename="../ProfileInterface.cpp" line="681"/> - <location filename="../ProfileInterface.cpp" line="686"/> - <location filename="../ProfileInterface.cpp" line="697"/> - <location filename="../ProfileInterface.cpp" line="734"/> - <location filename="../ProfileInterface.cpp" line="740"/> + <location filename="../ProfileInterface.cpp" line="385"/> + <location filename="../ProfileInterface.cpp" line="475"/> + <location filename="../ProfileInterface.cpp" line="480"/> + <location filename="../ProfileInterface.cpp" line="507"/> + <location filename="../ProfileInterface.cpp" line="523"/> + <location filename="../ProfileInterface.cpp" line="673"/> + <location filename="../ProfileInterface.cpp" line="678"/> + <location filename="../ProfileInterface.cpp" line="696"/> + <location filename="../ProfileInterface.cpp" line="701"/> + <location filename="../ProfileInterface.cpp" line="712"/> + <location filename="../ProfileInterface.cpp" line="749"/> + <location filename="../ProfileInterface.cpp" line="755"/> <source>Import</source> <translation>Importer</translation> </message> @@ -662,31 +670,31 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Fichiers de profil GTA (SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="375"/> - <location filename="../UserInterface.cpp" line="335"/> + <location filename="../ProfileInterface.cpp" line="390"/> + <location filename="../UserInterface.cpp" line="344"/> <source>Savegames files (SGTA*)</source> <translation>Fichiers de sauvegarde GTA (SGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="376"/> - <location filename="../UserInterface.cpp" line="336"/> + <location filename="../ProfileInterface.cpp" line="391"/> + <location filename="../UserInterface.cpp" line="345"/> <source>Snapmatic pictures (PGTA*)</source> <translation>Photos Snapmatic (PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="378"/> - <location filename="../UserInterface.cpp" line="337"/> + <location filename="../ProfileInterface.cpp" line="393"/> + <location filename="../UserInterface.cpp" line="346"/> <source>All files (**)</source> <translation>Tous les fichiers (**)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="407"/> <location filename="../ProfileInterface.cpp" line="422"/> + <location filename="../ProfileInterface.cpp" line="437"/> <source>Import file %1 of %2 files</source> <translation>Importation du fichier %1 sur %2</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="460"/> + <location filename="../ProfileInterface.cpp" line="475"/> <source>Import failed with... %1</source> @@ -695,26 +703,26 @@ Appuyer sur 1 pour le mode par défaut</translation> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="465"/> - <location filename="../ProfileInterface.cpp" line="663"/> - <location filename="../UserInterface.cpp" line="425"/> + <location filename="../ProfileInterface.cpp" line="480"/> + <location filename="../ProfileInterface.cpp" line="678"/> + <location filename="../UserInterface.cpp" line="434"/> <source>No valid file is selected</source> <translation>Fichier invalide</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="492"/> - <location filename="../UserInterface.cpp" line="377"/> + <location filename="../ProfileInterface.cpp" line="507"/> + <location filename="../UserInterface.cpp" line="386"/> <source>Failed to read Snapmatic picture</source> <translation>Impossible d'ouvrir la photo Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="508"/> - <location filename="../UserInterface.cpp" line="393"/> + <location filename="../ProfileInterface.cpp" line="523"/> + <location filename="../UserInterface.cpp" line="402"/> <source>Failed to read Savegame file</source> <translation>Impossible de lire le fichier de sauvegarde</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="658"/> + <location filename="../ProfileInterface.cpp" line="673"/> <source>Can't import %1 because of not valid file format</source> <translation>Impossible d'importer %1, format invalide</translation> </message> @@ -723,83 +731,83 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Impossible d'importer la photo Snapmatic,nom de fichier incorrect (PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="373"/> + <location filename="../ProfileInterface.cpp" line="388"/> <source>Importable files (*.g5e *.jpg *.png SGTA* PGTA*)</source> <translation>Fichiers importables (*.g5e *.jpg *.png SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="377"/> + <location filename="../ProfileInterface.cpp" line="392"/> <source>All image files (*.jpg *.png)</source> <translation>Tous les fichiers image (*.jpg *.png)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="681"/> + <location filename="../ProfileInterface.cpp" line="696"/> <source>Failed to import the Snapmatic picture, file not begin with PGTA or end with .g5e</source> <translation>Impossible d'importer la photo Snapmatic,nom de fichier incorrect (PGTA*, *.g5e)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="686"/> + <location filename="../ProfileInterface.cpp" line="701"/> <source>Failed to import the Snapmatic picture, the picture is already in the game</source> <translation>Impossible d'importer la photo Snapmatic, un fichier du même nom existe déjà</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="697"/> + <location filename="../ProfileInterface.cpp" line="712"/> <source>Failed to import the Snapmatic picture, can't copy the file into profile</source> <translation>Impossible d'importer la photo Snapmatic, impossible de copier le fichier dans le profil</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="734"/> + <location filename="../ProfileInterface.cpp" line="749"/> <source>Failed to import the Savegame, can't copy the file into profile</source> <translation>Impossible d'importer la sauvegarde, impossible de copier le fichier dans le profil</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="740"/> + <location filename="../ProfileInterface.cpp" line="755"/> <source>Failed to import the Savegame, no Savegame slot is left</source> <translation>Impossible d'importer la sauvegarde, aucun emplacement libre</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="803"/> - <location filename="../ProfileInterface.cpp" line="841"/> - <location filename="../ProfileInterface.cpp" line="918"/> - <location filename="../ProfileInterface.cpp" line="940"/> + <location filename="../ProfileInterface.cpp" line="818"/> + <location filename="../ProfileInterface.cpp" line="856"/> + <location filename="../ProfileInterface.cpp" line="933"/> + <location filename="../ProfileInterface.cpp" line="953"/> <source>Export selected</source> <translation>Exporter la sélection</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="826"/> - <location filename="../ProfileInterface.cpp" line="844"/> + <location filename="../ProfileInterface.cpp" line="841"/> + <location filename="../ProfileInterface.cpp" line="859"/> <source>JPG pictures and GTA Snapmatic</source> <translation>Images JPG et GTA Snapmatic</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="827"/> - <location filename="../ProfileInterface.cpp" line="849"/> + <location filename="../ProfileInterface.cpp" line="842"/> + <location filename="../ProfileInterface.cpp" line="864"/> <source>JPG pictures only</source> <translation>Images JPG seulement</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="828"/> - <location filename="../ProfileInterface.cpp" line="853"/> + <location filename="../ProfileInterface.cpp" line="843"/> + <location filename="../ProfileInterface.cpp" line="868"/> <source>GTA Snapmatic only</source> <translation>GTA Snapmatic seulement</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="841"/> + <location filename="../ProfileInterface.cpp" line="856"/> <source>%1Export Snapmatic pictures%2<br><br>JPG pictures make it possible to open the picture with a Image Viewer<br>GTA Snapmatic make it possible to import the picture into the game<br><br>Export as:</source> <translation>%1Exporter les photos Snapmatic%2<br><br>Les fichiers JPG permettent d'ouvrir les photos avec une visionneuse d'images<br>Les GTA Snapmatic permettent d'importer les photos dans le jeu<br><br>Exporter comme :</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="884"/> + <location filename="../ProfileInterface.cpp" line="899"/> <source>Export selected...</source> <translation>Exporter la sélection...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="885"/> + <location filename="../ProfileInterface.cpp" line="900"/> <source>Initializing export...</source> <translation>Initialisation de l'export...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="918"/> + <location filename="../ProfileInterface.cpp" line="933"/> <source>Export failed with... %1</source> @@ -808,36 +816,36 @@ Appuyer sur 1 pour le mode par défaut</translation> %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="940"/> - <location filename="../ProfileInterface.cpp" line="983"/> + <location filename="../ProfileInterface.cpp" line="953"/> + <location filename="../ProfileInterface.cpp" line="995"/> <source>No Snapmatic pictures or Savegames files are selected</source> <translation>Aucun fichier de sauvegarde ou photo Snapmatic sélectionné</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="948"/> - <location filename="../ProfileInterface.cpp" line="977"/> - <location filename="../ProfileInterface.cpp" line="983"/> + <location filename="../ProfileInterface.cpp" line="961"/> + <location filename="../ProfileInterface.cpp" line="989"/> + <location filename="../ProfileInterface.cpp" line="995"/> <source>Remove selected</source> <translation>Supprimer la sélection</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="948"/> + <location filename="../ProfileInterface.cpp" line="961"/> <source>You really want remove the selected Snapmatic picutres and Savegame files?</source> <translation>Supprimer la sélection ?</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="977"/> + <location filename="../ProfileInterface.cpp" line="989"/> <source>Failed at remove the complete selected Snapmatic pictures and/or Savegame files</source> <translation>Impossible de supprimer la sélection</translation> </message> <message> - <location filename="../UserInterface.cpp" line="333"/> + <location filename="../UserInterface.cpp" line="342"/> <source>All profile files (*.g5e SGTA* PGTA*)</source> <translation>Tous les fichiers de profil (*.g5e SGTA* PGTA*)</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="374"/> - <location filename="../UserInterface.cpp" line="334"/> + <location filename="../ProfileInterface.cpp" line="389"/> + <location filename="../UserInterface.cpp" line="343"/> <source>GTA V Export (*.g5e)</source> <translation>GTA V Export (*.g5e)</translation> </message> @@ -859,7 +867,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <name>SavegameDialog</name> <message> <location filename="../SavegameDialog.ui" line="14"/> - <location filename="../SavegameDialog.cpp" line="29"/> + <location filename="../SavegameDialog.cpp" line="33"/> <source>Savegame Viewer</source> <translation>Gestionnaire de sauvegardes</translation> </message> @@ -879,7 +887,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>&Fermer</translation> </message> <message> - <location filename="../SavegameDialog.cpp" line="29"/> + <location filename="../SavegameDialog.cpp" line="33"/> <source>Failed at %1</source> <translation>Échec de %1</translation> </message> @@ -930,7 +938,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Supprimer</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1107"/> + <location filename="../ProfileInterface.cpp" line="1119"/> <source>&Export</source> <translation>&Exporter</translation> </message> @@ -1013,34 +1021,34 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Impossible de supprimer %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1106"/> + <location filename="../ProfileInterface.cpp" line="1118"/> <source>&View</source> <translation>&Voir</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1108"/> + <location filename="../ProfileInterface.cpp" line="1120"/> <source>&Remove</source> <translation>&Supprimer</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1112"/> - <location filename="../ProfileInterface.cpp" line="1123"/> + <location filename="../ProfileInterface.cpp" line="1124"/> + <location filename="../ProfileInterface.cpp" line="1135"/> <source>&Select</source> <translation>&Sélectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1113"/> + <location filename="../ProfileInterface.cpp" line="1125"/> <source>&Deselect</source> <translation>&Déselectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1114"/> - <location filename="../ProfileInterface.cpp" line="1124"/> + <location filename="../ProfileInterface.cpp" line="1126"/> + <location filename="../ProfileInterface.cpp" line="1136"/> <source>Select &All</source> <translation>Sélectionner to&ut</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1117"/> + <location filename="../ProfileInterface.cpp" line="1129"/> <source>&Deselect All</source> <translation>&Déselectionner tout</translation> </message> @@ -1050,7 +1058,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <message> <location filename="../SnapmaticEditor.ui" line="14"/> <location filename="../SnapmaticEditor.ui" line="81"/> - <location filename="../SnapmaticEditor.cpp" line="247"/> + <location filename="../SnapmaticEditor.cpp" line="239"/> <source>Snapmatic Properties</source> <translation>Propriétés Snapmatic</translation> </message> @@ -1061,13 +1069,11 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="50"/> - <location filename="../SnapmaticEditor.ui" line="87"/> <source>Editor</source> <translation>Éditeur</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="57"/> - <location filename="../SnapmaticEditor.ui" line="108"/> <source>Selfie</source> <translation>Selfie</translation> </message> @@ -1078,7 +1084,6 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../SnapmaticEditor.ui" line="71"/> - <location filename="../SnapmaticEditor.ui" line="115"/> <source>Mugshot</source> <translation>Photo d'identité</translation> </message> @@ -1087,93 +1092,114 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation type="vanished">Personnalisé</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="101"/> + <location filename="../SnapmaticEditor.ui" line="94"/> <source>Director</source> <translation>Director</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="94"/> + <location filename="../SnapmaticEditor.ui" line="87"/> <source>Meme</source> <translation>Meme</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="125"/> - <location filename="../SnapmaticEditor.cpp" line="297"/> + <location filename="../SnapmaticEditor.cpp" line="289"/> <source>Snapmatic Title</source> <translation>Titre Snapmatic</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="140"/> - <location filename="../SnapmaticEditor.cpp" line="200"/> + <location filename="../SnapmaticEditor.ui" line="104"/> + <source>Snapmatic Values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="113"/> + <location filename="../SnapmaticEditor.cpp" line="194"/> + <source>Crew: %1 (%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.ui" line="126"/> + <location filename="../SnapmaticEditor.cpp" line="179"/> <source>Title: %1 (%2)</source> <translation>Titre : %1 (%2)</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="156"/> - <location filename="../SnapmaticEditor.cpp" line="204"/> - <location filename="../SnapmaticEditor.cpp" line="208"/> + <location filename="../SnapmaticEditor.ui" line="136"/> + <location filename="../SnapmaticEditor.cpp" line="183"/> + <location filename="../SnapmaticEditor.cpp" line="187"/> <source>Appropriate: %1</source> <translation>Valide : %1</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="169"/> + <location filename="../SnapmaticEditor.ui" line="149"/> <source>Extras</source> <translation>Extras</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="175"/> + <location filename="../SnapmaticEditor.ui" line="155"/> <source>Qualify as Avatar automatically at apply</source> <translation>Qualifier comme Avatar</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="188"/> + <location filename="../SnapmaticEditor.ui" line="168"/> <source>Qualify as Avatar allows you to use this Snapmatic as a Social Club profile picture</source> <translation>Qualifier comme Avatar permet d'utiliser cette image en tant que photo de profil sur le Social Club</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="238"/> + <location filename="../SnapmaticEditor.ui" line="218"/> <source>&Apply</source> <translation>A&ppliquer</translation> </message> <message> - <location filename="../SnapmaticEditor.ui" line="251"/> + <location filename="../SnapmaticEditor.ui" line="231"/> <source>&Cancel</source> <translation>A&nnuler</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="199"/> + <location filename="../SnapmaticEditor.cpp" line="178"/> + <location filename="../SnapmaticEditor.cpp" line="193"/> <source>Edit</source> <translation>Éditer</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="204"/> + <location filename="../SnapmaticEditor.cpp" line="183"/> <source>Yes</source> <comment>Yes, should work fine</comment> <translatorcomment>Oui, devrait fonctionner</translatorcomment> <translation>Oui</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="208"/> + <location filename="../SnapmaticEditor.cpp" line="187"/> <source>No</source> <comment>No, could lead to issues</comment> <translatorcomment>Non, pourrait causer des erreurs</translatorcomment> <translation>Non</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="247"/> + <location filename="../SnapmaticEditor.cpp" line="239"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> <translation>La modification des propriétés Snapmatic a échoué : erreur d'entrée/sortie</translation> </message> <message> - <location filename="../SnapmaticEditor.cpp" line="297"/> + <location filename="../SnapmaticEditor.cpp" line="289"/> <source>New Snapmatic title:</source> <translation>Nouveau titre Snapmatic :</translation> </message> + <message> + <location filename="../SnapmaticEditor.cpp" line="314"/> + <source>Snapmatic Crew</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../SnapmaticEditor.cpp" line="314"/> + <source>New Snapmatic crew:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SnapmaticPicture</name> <message> - <location filename="../SnapmaticPicture.cpp" line="370"/> + <location filename="../SnapmaticPicture.cpp" line="363"/> <source>PHOTO - %1</source> <translation>PHOTO - %1</translation> </message> @@ -1222,8 +1248,8 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../SnapmaticWidget.ui" line="149"/> - <location filename="../SnapmaticWidget.cpp" line="150"/> - <location filename="../SnapmaticWidget.cpp" line="163"/> + <location filename="../SnapmaticWidget.cpp" line="159"/> + <location filename="../SnapmaticWidget.cpp" line="168"/> <source>Delete picture</source> <translation>Supprimer la photo</translation> </message> @@ -1233,79 +1259,79 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Supprimer</translation> </message> <message> - <location filename="../SnapmaticWidget.cpp" line="150"/> + <location filename="../SnapmaticWidget.cpp" line="159"/> <source>Are you sure to delete %1 from your Snapmatic pictures?</source> <translation>Supprimer %1 ?</translation> </message> <message> - <location filename="../SnapmaticWidget.cpp" line="163"/> + <location filename="../SnapmaticWidget.cpp" line="168"/> <source>Failed at deleting %1 from your Snapmatic pictures</source> <translation>Impossible de supprimer %1</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1065"/> + <location filename="../ProfileInterface.cpp" line="1077"/> <source>Edi&t</source> <translation>Édi&ter</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1068"/> + <location filename="../ProfileInterface.cpp" line="1080"/> <source>Show &In-game</source> <translation>&Visible en jeu</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1072"/> + <location filename="../ProfileInterface.cpp" line="1084"/> <source>Hide &In-game</source> <translation>&Invisible en jeu</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1074"/> + <location filename="../ProfileInterface.cpp" line="1086"/> <source>&Edit Properties...</source> <translation>Modifier les &propriétés...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1075"/> + <location filename="../ProfileInterface.cpp" line="1087"/> <source>&Export</source> <translation>&Exporter</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1076"/> + <location filename="../ProfileInterface.cpp" line="1088"/> <source>Export as &JPG picture...</source> <translation>Exporter comme image &JPG...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1077"/> + <location filename="../ProfileInterface.cpp" line="1089"/> <source>Export as &GTA Snapmatic...</source> <translation>Exporter comme &GTA Snapmatic...</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1078"/> + <location filename="../ProfileInterface.cpp" line="1090"/> <source>&View</source> <translation>&Voir</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1081"/> + <location filename="../ProfileInterface.cpp" line="1093"/> <source>&Remove</source> <translation>S&upprimer</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1085"/> - <location filename="../ProfileInterface.cpp" line="1096"/> + <location filename="../ProfileInterface.cpp" line="1097"/> + <location filename="../ProfileInterface.cpp" line="1108"/> <source>&Select</source> <translation>&Sélectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1086"/> + <location filename="../ProfileInterface.cpp" line="1098"/> <source>&Deselect</source> <translation>&Déselectionner</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1087"/> - <location filename="../ProfileInterface.cpp" line="1097"/> + <location filename="../ProfileInterface.cpp" line="1099"/> + <location filename="../ProfileInterface.cpp" line="1109"/> <source>Select &All</source> <translation>Sélectionner &tout</translation> </message> <message> - <location filename="../ProfileInterface.cpp" line="1090"/> + <location filename="../ProfileInterface.cpp" line="1102"/> <source>&Deselect All</source> <translation>&Déselectionner tout</translation> </message> @@ -1468,9 +1494,9 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../UserInterface.ui" line="306"/> - <location filename="../OptionsDialog.cpp" line="444"/> + <location filename="../OptionsDialog.cpp" line="448"/> <location filename="../UserInterface.cpp" line="93"/> - <location filename="../UserInterface.cpp" line="474"/> + <location filename="../UserInterface.cpp" line="488"/> <source>Select GTA V Folder...</source> <translation>Modifier l'emplacement de GTA V...</translation> </message> @@ -1518,25 +1544,25 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../UserInterface.cpp" line="62"/> - <location filename="../UserInterface.cpp" line="214"/> + <location filename="../UserInterface.cpp" line="213"/> <source>Select Profile</source> <translation>Sélectionner un profil</translation> </message> <message> - <location filename="../UserInterface.cpp" line="330"/> + <location filename="../UserInterface.cpp" line="339"/> <source>Open File...</source> <translation>Ouvrir...</translation> </message> <message> - <location filename="../UserInterface.cpp" line="377"/> - <location filename="../UserInterface.cpp" line="393"/> - <location filename="../UserInterface.cpp" line="420"/> - <location filename="../UserInterface.cpp" line="425"/> + <location filename="../UserInterface.cpp" line="386"/> + <location filename="../UserInterface.cpp" line="402"/> + <location filename="../UserInterface.cpp" line="429"/> + <location filename="../UserInterface.cpp" line="434"/> <source>Open File</source> <translation>Ouvrir</translation> </message> <message> - <location filename="../UserInterface.cpp" line="420"/> + <location filename="../UserInterface.cpp" line="429"/> <source>Can't open %1 because of not valid file format</source> <translation>Impossible d'ouvrir %1, format invalide</translation> </message>