diff --git a/PictureDialog.cpp b/PictureDialog.cpp index ccef442..6ae3323 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -44,6 +44,10 @@ #endif #endif +#ifdef Q_OS_MAC +#include <QStyleFactory> +#endif + #include <QStringBuilder> #include <QJsonDocument> #include <QApplication> @@ -63,6 +67,7 @@ #include <QPicture> #include <QBitmap> #include <QBuffer> +#include <QTimer> #include <QImage> #include <QDebug> #include <QList> @@ -143,7 +148,7 @@ void PictureDialog::setupPictureDialog() crewStr = ""; // Get Snapmatic Resolution - QSize snapmaticResolution = SnapmaticPicture::getSnapmaticResolution(); + const QSize snapmaticResolution = SnapmaticPicture::getSnapmaticResolution(); // Avatar area qreal screenRatio = AppEnv::screenRatio(); @@ -183,9 +188,6 @@ void PictureDialog::setupPictureDialog() // Global map globalMap = GlobalString::getGlobalMap(); - // Event connects - connect(ui->labJSON, SIGNAL(resized(QSize)), this, SLOT(adaptNewDialogSize(QSize))); - // Set Icon for Close Button if (QIcon::hasThemeIcon("dialog-close")) { ui->cmdClose->setIcon(QIcon::fromTheme("dialog-close")); @@ -203,8 +205,9 @@ void PictureDialog::setupPictureDialog() ui->jsonLayout->setContentsMargins(4 * screenRatio, 10 * screenRatio, 4 * screenRatio, 4 * screenRatio); // Pre-adapt window for DPI - setFixedWidth(snapmaticResolution.width() * screenRatio); - setFixedHeight(snapmaticResolution.height() * screenRatio); + const QSize windowSize(snapmaticResolution.width() * screenRatio, snapmaticResolution.height() * screenRatio); + setMinimumSize(windowSize); + setMaximumSize(windowSize); } PictureDialog::~PictureDialog() @@ -221,17 +224,6 @@ void PictureDialog::closeEvent(QCloseEvent *ev) void PictureDialog::addPreviousNextButtons() { -#ifdef Q_OS_WIN -#if QT_VERSION >= 0x050200 - QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this); - uiToolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); - uiToolbar->setObjectName("UiToolbar"); - uiToolbar->addAction(QIcon(":/img/back.svgz"), "", this, SLOT(previousPictureRequestedSlot())); - uiToolbar->addAction(QIcon(":/img/next.svgz"), "", this, SLOT(nextPictureRequestedSlot())); - layout()->setMenuBar(uiToolbar); - naviEnabled = true; -#endif -#else QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this); #if QT_VERSION < 0x050600 qreal screenRatio = AppEnv::screenRatio(); @@ -244,23 +236,23 @@ void PictureDialog::addPreviousNextButtons() uiToolbar->setObjectName("UiToolbar"); uiToolbar->addAction(QIcon(":/img/back.svgz"), "", this, SLOT(previousPictureRequestedSlot())); uiToolbar->addAction(QIcon(":/img/next.svgz"), "", this, SLOT(nextPictureRequestedSlot())); +#ifdef Q_OS_MAC +#if QT_VERSION >= 0x050000 + uiToolbar->setStyle(QStyleFactory::create("Fusion")); +#endif +#endif layout()->setMenuBar(uiToolbar); naviEnabled = true; -#endif } -void PictureDialog::adaptNewDialogSize(QSize newLabelSize) +void PictureDialog::adaptDialogSize() { - Q_UNUSED(newLabelSize) - int newDialogHeight = SnapmaticPicture::getSnapmaticResolution().height() * AppEnv::screenRatio(); - newDialogHeight = newDialogHeight + ui->jsonFrame->height(); - if (naviEnabled) newDialogHeight = newDialogHeight + layout()->menuBar()->height(); - setMaximumSize(width(), newDialogHeight); - setMinimumSize(width(), newDialogHeight); - setFixedHeight(newDialogHeight); - ui->labPicture->updateGeometry(); - ui->jsonFrame->updateGeometry(); - updateGeometry(); + int newDialogHeight = (SnapmaticPicture::getSnapmaticResolution().height() * AppEnv::screenRatio()) + ui->jsonFrame->heightForWidth(width()); + if (naviEnabled) + newDialogHeight = newDialogHeight + layout()->menuBar()->height(); + const QSize windowSize(width(), newDialogHeight); + setMinimumSize(windowSize); + setMaximumSize(windowSize); } void PictureDialog::styliseDialog() @@ -509,10 +501,11 @@ void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, bool readOk, } setWindowTitle(windowTitleStr.arg(picTitl)); ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, generatePlayersString(), generateCrewString(), picTitl, picAreaStr, created)); + QTimer::singleShot(0, this, SLOT(adaptDialogSize())); } else { ui->labJSON->setText(jsonDrawString.arg("0", "0", "0", tr("No Players"), tr("No Crew"), tr("Unknown Location"))); - // QMessageBox::warning(this, tr("Snapmatic Picture Viewer"), tr("Failed at %1").arg(picture->getLastStep())); + QTimer::singleShot(0, this, SLOT(adaptDialogSize())); } QObject::connect(smpic, SIGNAL(updated()), this, SLOT(updated())); QObject::connect(smpic, SIGNAL(customSignal(QString)), this, SLOT(customSignal(QString))); @@ -583,6 +576,7 @@ void PictureDialog::crewNameUpdated() if (crewIDStr == crewStr) { crewStr = crewDB->getCrewName(crewIDStr); ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, generatePlayersString(), generateCrewString(), picTitl, picAreaStr, created)); + QTimer::singleShot(0, this, SLOT(adaptDialogSize())); } } @@ -591,6 +585,7 @@ void PictureDialog::playerNameUpdated() SnapmaticPicture *picture = smpic; // used by macro if (plyrsList.count() >= 1) { ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, generatePlayersString(), generateCrewString(), picTitl, picAreaStr, created)); + QTimer::singleShot(0, this, SLOT(adaptDialogSize())); } } @@ -889,6 +884,7 @@ void PictureDialog::updated() } setWindowTitle(windowTitleStr.arg(picTitl)); ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, generatePlayersString(), generateCrewString(), picTitl, picAreaStr, created)); + QTimer::singleShot(0, this, SLOT(adaptDialogSize())); } void PictureDialog::customSignal(QString signal) diff --git a/PictureDialog.h b/PictureDialog.h index a24299b..3e81915 100644 --- a/PictureDialog.h +++ b/PictureDialog.h @@ -1,6 +1,6 @@ /***************************************************************************** * gta5view Grand Theft Auto V Profile Viewer -* Copyright (C) 2016-2017 Syping +* Copyright (C) 2016-2021 Syping * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -54,11 +54,11 @@ public: ~PictureDialog(); public slots: + void adaptDialogSize(); void crewNameUpdated(); void playerNameUpdated(); void dialogNextPictureRequested(); void dialogPreviousPictureRequested(); - void adaptNewDialogSize(QSize newLabelSize); void exportCustomContextMenuRequested(const QPoint &pos); private slots: diff --git a/PictureDialog.ui b/PictureDialog.ui index 7806064..f324d84 100644 --- a/PictureDialog.ui +++ b/PictureDialog.ui @@ -48,19 +48,6 @@ </property> </widget> </item> - <item> - <spacer name="vsJSONUpper"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> - </spacer> - </item> <item> <widget class="QFrame" name="jsonFrame"> <property name="frameShape"> diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 0a1feb4..621126d 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -192,21 +192,21 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation type="unfinished"></translation> @@ -985,7 +985,7 @@ Y: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -993,98 +993,98 @@ Y: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation type="unfinished"></translation> @@ -1848,7 +1848,7 @@ Press 1 for Default View</source> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -1941,7 +1941,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index cf9a8bf..4a6a335 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -177,8 +177,8 @@ Snapmatic Bilder und Spielständen</translation> <context> <name>ImageEditorDialog</name> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> @@ -210,13 +210,13 @@ Snapmatic Bilder und Spielständen</translation> <translation>S&chließen</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation>Patchen von Snapmatic Bild fehlgeschlagen wegen I/O Fehler</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation>Patchen von Snapmatic Bild fehlgeschlagen wegen Bild Fehler</translation> @@ -1017,7 +1017,7 @@ Y: %2</translation> <translation>Snapmatic Bildansicht - %1</translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -1028,22 +1028,22 @@ Y: %2</translation> <span style="font-weight:600">Erstellt: </span>%8</translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation>Bild verwalten</translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation>&Verwalten</translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation>Ansicht schließen</translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation>S&chließen</translation> </message> @@ -1054,37 +1054,37 @@ Y: %2</translation> <translation>Exportieren</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation>Als &Bild exportieren...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation>Als &Snapmatic exportieren...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation>Eigenschaften bearb&eiten...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation>Bild &überschreiben...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation>&Kartenansicht öffnen...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -1093,37 +1093,37 @@ Taste 2 - Overlay umschalten Pfeiltasten - Navigieren</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation>Snapmatic Bildansicht</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation>Fehlgeschlagen beim %1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation>Keine Crew</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation>Keine Spieler</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>Avatar Vorschaumodus Drücke 1 für Standardmodus</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation>Unbekannter Standort</translation> </message> @@ -1225,7 +1225,7 @@ Drücke 1 für Standardmodus</translation> <translation>Keine gültige Datei wurde ausgewählt</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation>&JSON Editor öffnen...</translation> @@ -1900,7 +1900,7 @@ Drücke 1 für Standardmodus</translation> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -2051,7 +2051,7 @@ Drücke 1 für Standardmodus</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index 47b7212..4ff7c89 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -167,8 +167,8 @@ Pictures and Savegames</source> <context> <name>ImageEditorDialog</name> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> @@ -200,13 +200,13 @@ Pictures and Savegames</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation type="unfinished"></translation> @@ -985,7 +985,7 @@ Y: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -993,92 +993,92 @@ Y: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation type="unfinished"></translation> @@ -1187,7 +1187,7 @@ Press 1 for Default View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation type="unfinished"></translation> @@ -1848,7 +1848,7 @@ Press 1 for Default View</source> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -1993,7 +1993,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index ff4513d..9e9b7c8 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -178,8 +178,8 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <context> <name>ImageEditorDialog</name> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> @@ -211,13 +211,13 @@ et les fichiers de sauvegarde de Grand Theft Auto V</translation> <translation>&Fermer</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation>Échec du patch Snapmatic : I/O Error</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation>Échec du patch Snapmatic : Image Error</translation> @@ -1018,7 +1018,7 @@ Y : %2</translation> <translation>Visionneuse de photo Snapmatic - %1</translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -1029,22 +1029,22 @@ Y : %2</translation> <span style="font-weight:600">Créé le : </span>%8</translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation>Gestion de l'image</translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation>&Gestion</translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation>Fermer la visionneuse</translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation>&Fermer</translation> </message> @@ -1135,37 +1135,37 @@ Y : %2</translation> <translation>Fichier invalide</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation>Exporter comme &image...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation>Exporter comme &Snapmatic...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation>&Remplacer l'image...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation>Modifier les &propriétés...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation>Ouvrir la &Visionneuse de Carte...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -1174,37 +1174,37 @@ Touche 2 - Activer/désactiver l'overlay Touches fléchées - Naviguer</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation>Visionneuse de photo Snapmatic</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation>Echec de %1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation>Aucun crew</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation>Aucun joueurs</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>Mode Aperçu Avatar Appuyer sur 1 pour le mode par défaut</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation>Emplacement inconnu</translation> </message> @@ -1226,7 +1226,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <translation>Échec de l'export de la photo Snapmatic</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation>Ouvrir l'éditeur &JSON...</translation> @@ -1910,7 +1910,7 @@ Appuyer sur 1 pour le mode par défaut</translation> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -2063,7 +2063,7 @@ Appuyer sur 1 pour le mode par défaut</translation> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_ko.ts b/res/gta5sync_ko.ts index 6db77d2..4052323 100644 --- a/res/gta5sync_ko.ts +++ b/res/gta5sync_ko.ts @@ -202,21 +202,21 @@ Pictures and Savegames</source> <translation>닫기(&C)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> <translation>스냅매틱 이미지 편집기</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation>I/O 오류로 인해 스냅매틱 이미지를 패치하지 못했습니다.</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation>이미지 오류로 인해 스냅매틱 이미지를 패치하지 못했습니다.</translation> @@ -1031,7 +1031,7 @@ Y: %2</translation> <translation>스냅매틱 이미지 뷰어 - %1</translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -1042,63 +1042,63 @@ Y: %2</translation> <span style="font-weight:600">생성 날짜: </span>%8</translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation>이미지 관리</translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation>관리(&M)</translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation>뷰어 닫기</translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation>닫기(&C)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation>내 PC에 이미지로 내보내기(&P)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation>내 PC에 스냅매틱으로 내보내기(&S)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation>속성 편집(&E)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation>이미지 덮어쓰기(&O)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation>지도 뷰어 열기(&M)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation>JSON 편집기 열기(&J)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -1107,35 +1107,35 @@ Arrow Keys - Navigate</source> 화살표키 - 이동</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation>스냅매틱 이미지 뷰어</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation>%1에서 실패했습니다.</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation>플레이어 없음</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation>조직 없음</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation>알 수 없는 위치</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>아바타 미리 보기 모드입니다. @@ -1928,7 +1928,7 @@ Press 1 for Default View</source> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -2021,7 +2021,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 589637e..a44bcfb 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -181,8 +181,8 @@ Pictures and Savegames</source> <context> <name>ImageEditorDialog</name> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> @@ -214,13 +214,13 @@ Pictures and Savegames</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation>Не удалось изменить картинку Snapmatic из-за ошибки ввода-вывода</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation>Не удалось изменить картинку Snapmatic из-за ошибки Image Error</translation> @@ -1023,7 +1023,7 @@ Y: %2</translation> <context> <name>PictureDialog</name> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -1034,12 +1034,12 @@ Y: %2</translation> <span style="font-weight:600">Сделано: </span>%8</translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation>&Управление</translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation>Настройки картинки</translation> </message> @@ -1049,12 +1049,12 @@ Y: %2</translation> <translation>Просмотрщик фотографий Snapmatic - %1</translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation>Закрыть просмотрщик</translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation>&Закрыть</translation> </message> @@ -1065,37 +1065,37 @@ Y: %2</translation> <translation>Экспортировать</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation>Экспортировать как &картинку...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation>Экспортировать как &Snapmatic...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation>&Перезаписать картинку...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation>&Изменить свойства...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation>Открыть &карту...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -1104,37 +1104,37 @@ Arrow Keys - Navigate</source> Стрелки - Навигация</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation>Просмотрщик фотографий Snapmatic</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation>Ошибка при %1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation>Вне банды</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation>Игроков нет</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>Режим просмотра аватарок Нажмите 1 для стандартного просмотра</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation>Неизвестное место</translation> </message> @@ -1236,7 +1236,7 @@ Press 1 for Default View</source> <translation>Картинки Snapmatic (PGTA*)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation>Открыть &редактор JSON...</translation> @@ -1915,7 +1915,7 @@ Press 1 for Default View</source> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -2066,7 +2066,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 12185ba..ff73fd7 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -205,21 +205,21 @@ Pictures and Savegames</source> <translation>&Закрити</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> <translation>Редактор Snapmatic зображень</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation>Виправлення Snapmatic зображення не вдалося через I/O Error</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation>Виправлення Snapmatic зображення не вдалося через помилку картинки</translation> @@ -1021,7 +1021,7 @@ Y: %2</translation> <translation>Переглядач зображень Snapmatic - %1</translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -1032,63 +1032,63 @@ Y: %2</translation> <span style="font-weight:600">Створено: </span>%8</translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation>Керування зображенням</translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation>&Керувати</translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation>Закрити переглядач</translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation>&Закрити</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation>Експортувати як &зображення...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation>Експортувати як &Snapmatic...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation>&Змінити властивості...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation>&Перезаписати зображення...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation>Відкрити &карту...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation>Відкрити редактор &JSON...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -1097,35 +1097,35 @@ Arrow Keys - Navigate</source> Стрілки - Навігація</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation>Переглядач фотографій Snapmatic</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation>Помилка на%1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation>Гравців немає</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation>Банди немає</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation>Невідома локація</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>Режим для аватарок @@ -1913,7 +1913,7 @@ Press 1 for Default View</source> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -2006,7 +2006,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source> diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 656ad1b..68a4143 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -201,21 +201,21 @@ Pictures and Savegames</source> <translation>關閉(&C)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="821"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Snapmatic Image Editor</source> <translation>Snapmatic 圖片編輯器</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="826"/> + <location filename="../PictureDialog.cpp" line="821"/> <location filename="../SnapmaticWidget.cpp" line="394"/> <source>Patching of Snapmatic Image failed because of I/O Error</source> <translation>I/O 錯誤,Snapmatic 圖片更新失敗</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="852"/> + <location filename="../PictureDialog.cpp" line="847"/> <location filename="../SnapmaticWidget.cpp" line="422"/> <source>Patching of Snapmatic Image failed because of Image Error</source> <translation>圖片錯誤,Snapmatic 圖片更新失敗</translation> @@ -1015,7 +1015,7 @@ Y: %2</translation> <translation>Snapmatic 圖片檢視器 - %1</translation> </message> <message> - <location filename="../PictureDialog.ui" line="114"/> + <location filename="../PictureDialog.ui" line="101"/> <source><span style="font-weight:600">Title: </span>%6<br/> <span style="font-weight:600">Location: </span>%7 (%1, %2, %3)<br/> <span style="font-weight:600">Players: </span>%4 (Crew %5)<br/> @@ -1026,63 +1026,63 @@ Y: %2</translation> <span style="font-weight:600">建立於: </span>%8</translation> </message> <message> - <location filename="../PictureDialog.ui" line="174"/> + <location filename="../PictureDialog.ui" line="161"/> <source>Manage picture</source> <translation>管理圖片</translation> </message> <message> - <location filename="../PictureDialog.ui" line="177"/> + <location filename="../PictureDialog.ui" line="164"/> <source>&Manage</source> <translation>管理(&M)</translation> </message> <message> - <location filename="../PictureDialog.ui" line="196"/> + <location filename="../PictureDialog.ui" line="183"/> <source>Close viewer</source> <translation>關閉檢視器</translation> </message> <message> - <location filename="../PictureDialog.ui" line="199"/> + <location filename="../PictureDialog.ui" line="186"/> <source>&Close</source> <translation>關閉(&C)</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="172"/> + <location filename="../PictureDialog.cpp" line="177"/> <location filename="../ProfileInterface.cpp" line="1707"/> <source>Export as &Picture...</source> <translation>匯出成圖片(&P)...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="173"/> + <location filename="../PictureDialog.cpp" line="178"/> <location filename="../ProfileInterface.cpp" line="1708"/> <source>Export as &Snapmatic...</source> <translation>匯出成 Snapmatic(&S)...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="175"/> + <location filename="../PictureDialog.cpp" line="180"/> <location filename="../ProfileInterface.cpp" line="1701"/> <source>&Edit Properties...</source> <translation>編輯屬性(&E) ...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="176"/> + <location filename="../PictureDialog.cpp" line="181"/> <location filename="../ProfileInterface.cpp" line="1702"/> <source>&Overwrite Image...</source> <translation>修改圖片(&O)...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="178"/> + <location filename="../PictureDialog.cpp" line="183"/> <location filename="../ProfileInterface.cpp" line="1704"/> <source>Open &Map Viewer...</source> <translation>開啟地圖檢視器(&M)...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="180"/> + <location filename="../PictureDialog.cpp" line="185"/> <location filename="../ProfileInterface.cpp" line="1705"/> <source>Open &JSON Editor...</source> <translation>開啟 JSON 編輯器(&J)...</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="439"/> + <location filename="../PictureDialog.cpp" line="431"/> <source>Key 1 - Avatar Preview Mode Key 2 - Toggle Overlay Arrow Keys - Navigate</source> @@ -1091,35 +1091,35 @@ Arrow Keys - Navigate</source> 方向鍵 - 導覽</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Snapmatic Picture Viewer</source> <translation>Snapmatic 圖片檢視器</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="494"/> + <location filename="../PictureDialog.cpp" line="486"/> <source>Failed at %1</source> <translation>失敗: %1</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="630"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="625"/> <location filename="../SnapmaticEditor.cpp" line="246"/> <source>No Players</source> <translation>無</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> - <location filename="../PictureDialog.cpp" line="609"/> + <location filename="../PictureDialog.cpp" line="507"/> + <location filename="../PictureDialog.cpp" line="604"/> <source>No Crew</source> <translation>無</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="514"/> + <location filename="../PictureDialog.cpp" line="507"/> <source>Unknown Location</source> <translation>未知地點</translation> </message> <message> - <location filename="../PictureDialog.cpp" line="567"/> + <location filename="../PictureDialog.cpp" line="560"/> <source>Avatar Preview Mode Press 1 for Default View</source> <translation>大頭貼預覽模式 @@ -1895,7 +1895,7 @@ Press 1 for Default View</source> <location filename="../JsonEditorDialog.cpp" line="191"/> <location filename="../JsonEditorDialog.cpp" line="197"/> <location filename="../JsonEditorDialog.cpp" line="230"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Snapmatic Properties</source> @@ -1988,7 +1988,7 @@ Press 1 for Default View</source> </message> <message> <location filename="../JsonEditorDialog.cpp" line="197"/> - <location filename="../PictureDialog.cpp" line="747"/> + <location filename="../PictureDialog.cpp" line="742"/> <location filename="../SnapmaticEditor.cpp" line="333"/> <location filename="../SnapmaticWidget.cpp" line="456"/> <source>Patching of Snapmatic Properties failed because of I/O Error</source>