From 35924c4696684ab0127fe7c003208ea9f1d9bd0b Mon Sep 17 00:00:00 2001 From: Syping Date: Sun, 9 May 2021 07:42:14 +0200 Subject: [PATCH] MapLocationDialog zoom is now experimental (incomplete) --- MapLocationDialog.cpp | 4 +++ UserInterface.cpp | 4 +-- res/gta5sync.ts | 64 +++++++++++++++++++------------------- res/gta5sync_de.ts | 64 +++++++++++++++++++------------------- res/gta5sync_en_US.ts | 64 +++++++++++++++++++------------------- res/gta5sync_fr.qm | Bin 47793 -> 47992 bytes res/gta5sync_fr.ts | 70 +++++++++++++++++++++--------------------- res/gta5sync_ko.ts | 64 +++++++++++++++++++------------------- res/gta5sync_ru.ts | 64 +++++++++++++++++++------------------- res/gta5sync_uk.ts | 64 +++++++++++++++++++------------------- res/gta5sync_zh_TW.ts | 64 +++++++++++++++++++------------------- 11 files changed, 264 insertions(+), 262 deletions(-) diff --git a/MapLocationDialog.cpp b/MapLocationDialog.cpp index bfea683..b233a28 100644 --- a/MapLocationDialog.cpp +++ b/MapLocationDialog.cpp @@ -241,6 +241,7 @@ void MapLocationDialog::mouseReleaseEvent(QMouseEvent *ev) void MapLocationDialog::wheelEvent(QWheelEvent *ev) { +#ifdef GTA5SYNC_EXPERIMENTAL #if QT_VERSION >= 0x050000 const QPoint numPixels = ev->pixelDelta(); const QPoint numDegrees = ev->angleDelta(); @@ -276,6 +277,9 @@ void MapLocationDialog::wheelEvent(QWheelEvent *ev) repaint(); } } +#else + Q_UNUSED(ev) +#endif } void MapLocationDialog::on_cmdChange_clicked() diff --git a/UserInterface.cpp b/UserInterface.cpp index 469637f..b9809d2 100644 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -48,7 +48,6 @@ #ifdef GTA5SYNC_DONATE #ifdef GTA5SYNC_DONATE_ADDRESSES -#include #include #include #include @@ -235,9 +234,8 @@ UserInterface::UserInterface(ProfileDatabase *profileDB, CrewDatabase *crewDB, D QrCode qr = QrCode::encodeText(address.toUtf8().constData(), QrCode::Ecc::MEDIUM); const std::string svgString = qr.toSvgString(0); QSvgRenderer svgRenderer(QByteArray::fromRawData(svgString.c_str(), svgString.size())); - qreal screenRatio = AppEnv::screenRatio(); qreal screenRatioPR = AppEnv::screenRatioPR(); - const QSize widgetSize = QSize(200, 200) * screenRatio; + const QSize widgetSize = QSize(200, 200); const QSize pixmapSize = widgetSize * screenRatioPR; QPixmap qrPixmap(pixmapSize); qrPixmap.fill(Qt::white); diff --git a/res/gta5sync.ts b/res/gta5sync.ts index 52205df..348fb74 100644 --- a/res/gta5sync.ts +++ b/res/gta5sync.ts @@ -1341,7 +1341,7 @@ Press 1 for Default View - + All files (**) @@ -1386,26 +1386,26 @@ Press 1 for Default View - + GTA V Export (*.g5e) - + Savegames files (SGTA*) - + Snapmatic pictures (PGTA*) - + No valid file is selected @@ -1424,13 +1424,13 @@ Press 1 for Default View - + Failed to read Snapmatic picture - + Failed to read Savegame file @@ -1640,7 +1640,7 @@ Press 1 for Default View - + All profile files (*.g5e SGTA* PGTA*) @@ -2259,7 +2259,7 @@ Press 1 for Default View UserInterface - + %2 - %1 @@ -2291,9 +2291,9 @@ Press 1 for Default View - - - + + + &Close @@ -2329,8 +2329,8 @@ Press 1 for Default View - - + + &About %1 @@ -2386,15 +2386,15 @@ Press 1 for Default View - + Select &GTA V Folder... - - + + Select GTA V Folder... @@ -2451,53 +2451,53 @@ Press 1 for Default View - - - + + + Select Profile - - + + &Donate - + Donate - + Donation methods - + &Copy - + Open File... - - - - + + + + Open File - + Can't open %1 because of not valid file format - + %1 - Messages diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index b5ff803..29f8cc4 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -1379,13 +1379,13 @@ Drücke 1 für Standardmodus - + Savegames files (SGTA*) Spielstanddateien (SGTA*) - + Snapmatic pictures (PGTA*) Snapmatic Bilder (PGTA*) @@ -1405,7 +1405,7 @@ Drücke 1 für Standardmodus - + All files (**) Alle Dateien (**) @@ -1426,13 +1426,13 @@ Drücke 1 für Standardmodus - + Failed to read Snapmatic picture Fehler beim Lesen vom Snapmatic Bild - + Failed to read Savegame file Fehler beim Lesen von Spielstanddatei @@ -1473,7 +1473,7 @@ Drücke 1 für Standardmodus - + No valid file is selected Keine gültige Datei wurde ausgewählt @@ -1677,13 +1677,13 @@ Drücke 1 für Standardmodus Exportiere Datei %1 von %2 Dateien - + All profile files (*.g5e SGTA* PGTA*) Alle Profildateien (*.g5e SGTA* PGTA*) - + GTA V Export (*.g5e) GTA V Export (*.g5e) @@ -2410,7 +2410,7 @@ Drücke 1 für Standardmodus - + Select &GTA V Folder... Wähle &GTA V Ordner... @@ -2426,9 +2426,9 @@ Drücke 1 für Standardmodus - - - + + + &Close S&chließen @@ -2463,56 +2463,56 @@ Drücke 1 für Standardmodus Dateien &importieren... - - - + + + Select Profile Profil auswählen - - + + Select GTA V Folder... Wähle GTA V Ordner... - + Open File... Datei öffnen... - + %2 - %1 %2 - %1 - - + + &About %1 &Über %1 - - + + &Donate Spen&den - + Donate Spenden - + Donation methods Spendenmethoden - + &Copy &Kopieren @@ -2525,20 +2525,20 @@ Drücke 1 für Standardmodus Kopieren - - - - + + + + Open File Datei öffnen - + Can't open %1 because of not valid file format Kann nicht %1 öffnen weil Dateiformat nicht gültig ist - + %1 - Messages %1 - Nachrichten diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index 4f923e2..82c4389 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -1357,19 +1357,19 @@ Press 1 for Default View - + GTA V Export (*.g5e) - + Savegames files (SGTA*) - + Snapmatic pictures (PGTA*) @@ -1384,14 +1384,14 @@ Press 1 for Default View - + All files (**) - + No valid file is selected @@ -1410,13 +1410,13 @@ Press 1 for Default View - + Failed to read Snapmatic picture - + Failed to read Savegame file @@ -1640,7 +1640,7 @@ Press 1 for Default View - + All profile files (*.g5e SGTA* PGTA*) @@ -2259,7 +2259,7 @@ Press 1 for Default View UserInterface - + %2 - %1 @@ -2291,9 +2291,9 @@ Press 1 for Default View - - - + + + &Close @@ -2324,8 +2324,8 @@ Press 1 for Default View - - + + &About %1 @@ -2381,15 +2381,15 @@ Press 1 for Default View - + Select &GTA V Folder... - - + + Select GTA V Folder... @@ -2437,53 +2437,53 @@ Press 1 for Default View - - - + + + Select Profile - - + + &Donate - + Donate - + Donation methods - + &Copy - + Open File... - - - - + + + + Open File - + Can't open %1 because of not valid file format - + %1 - Messages diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index ba51ac9682351784c6a879c7eb5b403b3cf3a9ae..e32b947022738b0179fae5caca0b2dcad4e6e185 100644 GIT binary patch delta 416 zcmZ8bPbh#f3=X<3iqg-skW<@AJGn&+PSu%@v_5Ts*^~=5Qid7z1lY z2N1ae>uDLlauBQ!6&k0=jy7yogBU{WB%ZaN|Hh8ya{*juEHhjU5N)A!RyW(op<>+v zCTUOC%2SS2fQ?1sdOJ3eQy;)M9qL=yasioyF}68EvqHb*=PL(ZfR#%66coHx70waw z$R@V2%_^D|6^v0@bmArDN(v^ZUaAuu)7q2c6p$KOyo1ux67MUW)VhwT$6#cuITSFo zqe>Zr(GUyC`$M+?v2uFUw5Duy`^}j-b9{qgBa*XWGpV86#)1V=Vulh)*;=@ia#@f`hot28mf4X( z3<{kh79@n#5ef@SB*KO)Bxm*8J@x#2i|sEll|e<*`h-|*o8Ank_QPi>Ky(Yf%Pe3q z2;WR3rS7Ze5jsumo0BKjoQ)s!FuOrS1k1GdSY*Q$L@%LzKfQ znxDXxS}~7l$Bvb)`D>>YL1Ms~Z&#$**4?G#y7*OP%kpWb^%YCC6$o0yD zj#FU$&i2uEK%SJm04=xjyygT*u9sH#Ah0&Xy7W^uhh&I!o|gq_%P*eeYyr5MJg;*J hb~4NJ+tp+5{+S - + Savegames files (SGTA*) Fichiers de sauvegarde GTA (SGTA*) - + Snapmatic pictures (PGTA*) Photos Snapmatic (PGTA*) @@ -1412,7 +1412,7 @@ Appuyer sur 1 pour le mode par défaut - + All files (**) Tous les fichiers (**) @@ -1434,7 +1434,7 @@ Appuyer sur 1 pour le mode par défaut - + No valid file is selected Fichier invalide @@ -1445,13 +1445,13 @@ Appuyer sur 1 pour le mode par défaut - + Failed to read Snapmatic picture Impossible d'ouvrir la photo Snapmatic - + Failed to read Savegame file Impossible de lire le fichier de sauvegarde @@ -1679,13 +1679,13 @@ Appuyer sur 1 pour le mode par défaut Supprimer la sélection ? - + All profile files (*.g5e SGTA* PGTA*) Tous les fichiers de profil (*.g5e SGTA* PGTA*) - + GTA V Export (*.g5e) GTA V Export (*.g5e) @@ -2349,9 +2349,9 @@ Appuyer sur 1 pour le mode par défaut - - - + + + &Close Fer&mer @@ -2427,15 +2427,15 @@ Appuyer sur 1 pour le mode par défaut - + Select &GTA V Folder... Modifier l'emplacement de &GTA V... - - + + Select GTA V Folder... Modifier l'emplacement de GTA V... @@ -2489,39 +2489,39 @@ Appuyer sur 1 pour le mode par défaut - + %2 - %1 %2 - %1 - - + + &About %1 &À propos de %1 - - - + + + Select Profile Sélectionner un profil - - + + &Donate - + &Don - + Donate - + Don - + Donation methods - + Méthodes de don View @@ -2532,30 +2532,30 @@ Appuyer sur 1 pour le mode par défaut Copier - + &Copy &Copier - + Open File... Ouvrir... - - - - + + + + Open File Ouvrir - + Can't open %1 because of not valid file format Impossible d'ouvrir %1, format invalide - + %1 - Messages %1 - Nouvelles diff --git a/res/gta5sync_ko.ts b/res/gta5sync_ko.ts index 1758271..43d35de 100644 --- a/res/gta5sync_ko.ts +++ b/res/gta5sync_ko.ts @@ -1393,7 +1393,7 @@ Press 1 for Default View - + All files (**) 모든 파일 (**) @@ -1438,26 +1438,26 @@ Press 1 for Default View - + GTA V Export (*.g5e) GTA V로 내보내기 (*.g5e) - + Savegames files (SGTA*) 세이브 파일 (SGTA*) - + Snapmatic pictures (PGTA*) 스냅매틱 이미지 (PGTA*) - + No valid file is selected 올바른 파일이 선택되지 않았습니다. @@ -1478,13 +1478,13 @@ Press 1 for Default View - + Failed to read Snapmatic picture 스냅매틱 이미지를 읽지 못했습니다. - + Failed to read Savegame file 세이브 파일을 읽지 못했습니다. @@ -1703,7 +1703,7 @@ Press 1 for Default View 제목 변경 - + All profile files (*.g5e SGTA* PGTA*) 모든 프로필 파일 (*.g5e SGTA* PGTA*) @@ -2344,7 +2344,7 @@ Press 1 for Default View UserInterface - + %2 - %1 %2 - %1 @@ -2377,9 +2377,9 @@ Press 1 for Default View - - - + + + &Close 닫기(&C) @@ -2415,8 +2415,8 @@ Press 1 for Default View - - + + &About %1 %1 정보(&A) @@ -2472,15 +2472,15 @@ Press 1 for Default View - + Select &GTA V Folder... GTA V 폴더 선택(&G) - - + + Select GTA V Folder... GTA V 폴더 선택 @@ -2537,25 +2537,25 @@ Press 1 for Default View 인게임 숨기기 - - - + + + Select Profile 프로필 선택 - - + + &Donate 기부하기(&D) - + Donate 기부하기 - + Donation methods 기부 방법 @@ -2568,30 +2568,30 @@ Press 1 for Default View 복사 - + &Copy 복사(&C) - + Open File... 파일 열기... - - - - + + + + Open File 파일 열기 - + Can't open %1 because of not valid file format 올바른 파일 형식이 아니므로 %1을 열 수 없습니다. - + %1 - Messages %1 - 뉴스 diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 1ef5a60..3191b6e 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -1391,13 +1391,13 @@ Press 1 for Default View - + Savegames files (SGTA*) Файлы сохранения (SGTA*) - + Snapmatic pictures (PGTA*) Картинка Snapmatic (PGTA*) @@ -1405,7 +1405,7 @@ Press 1 for Default View - + All files (**) Все файлы (**) @@ -1426,20 +1426,20 @@ Press 1 for Default View - + Failed to read Snapmatic picture Не удалось загрузить картинку Snapmatic - + Failed to read Savegame file Не удалось загрузить файл сохранения - + No valid file is selected Выбранный файл неверен @@ -1692,13 +1692,13 @@ Press 1 for Default View Экспортируется файл %1 из %2 - + All profile files (*.g5e SGTA* PGTA*) Все файлы профиля (*.g5e SGTA* PGTA*) - + GTA V Export (*.g5e) GTA V Export (*.g5e) @@ -2392,7 +2392,7 @@ Press 1 for Default View - + Select &GTA V Folder... Выбрать &папку GTA V... @@ -2436,9 +2436,9 @@ Press 1 for Default View - - - + + + &Close &Закрыть @@ -2478,51 +2478,51 @@ Press 1 for Default View &Открыть файл... - - - + + + Select Profile Выбор профиля - - + + Select GTA V Folder... Выбрать папку GTA V... - + %2 - %1 %2 - %1 - - + + &About %1 &О программе %1 - - + + &Donate По&жертвовать - + Donate Пожертвовать - + Donation methods Способы для взноса - + &Copy &Копировать @@ -2535,25 +2535,25 @@ Press 1 for Default View Копировать - + Open File... Открыть файл... - - - - + + + + Open File Открыть файл - + Can't open %1 because of not valid file format Не удалось открыть %1 из-за неверного формата файла - + %1 - Messages %1 - Новости diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 22cd688..490ecac 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -1383,7 +1383,7 @@ Press 1 for Default View - + All files (**) Усі файли (**) @@ -1428,26 +1428,26 @@ Press 1 for Default View - + GTA V Export (*.g5e) GTA V Export (*.g5e) - + Savegames files (SGTA*) Файли збереження гри (SGTA*) - + Snapmatic pictures (PGTA*) Snapmatic зображення (PGTA*) - + No valid file is selected Вибрані недійсні файли @@ -1468,13 +1468,13 @@ Press 1 for Default View - + Failed to read Snapmatic picture Не вдалося прочитати Snapmatic картинку - + Failed to read Savegame file Не вдалося прочитати файл збереження гри @@ -1688,7 +1688,7 @@ Press 1 for Default View Змінити назву - + All profile files (*.g5e SGTA* PGTA*) Усі файли зображень (*.g5e SGTA* PGTA*) @@ -2325,7 +2325,7 @@ Press 1 for Default View UserInterface - + %2 - %1 %2 - %1 @@ -2357,9 +2357,9 @@ Press 1 for Default View - - - + + + &Close &Закрити @@ -2395,8 +2395,8 @@ Press 1 for Default View - - + + &About %1 &Про %1 @@ -2452,15 +2452,15 @@ Press 1 for Default View - + Select &GTA V Folder... Вибрати &GTA V теку... - - + + Select GTA V Folder... Вибрати GTA V теку... @@ -2517,25 +2517,25 @@ Press 1 for Default View Сховати у грі - - - + + + Select Profile Вибрати профіль - - + + &Donate &Пожертвування - + Donate Пожертвування - + Donation methods Метод пожертвування @@ -2548,30 +2548,30 @@ Press 1 for Default View Копіювати - + &Copy &Копіювати - + Open File... Відкрити файл... - - - - + + + + Open File Відкрити файл - + Can't open %1 because of not valid file format Неможливо відкрити %1 через невідомий формат файлу - + %1 - Messages %1 - Новини diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index 213e15b..d0bcfff 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -1377,7 +1377,7 @@ Press 1 for Default View - + All files (**) 所有檔案 (**) @@ -1422,26 +1422,26 @@ Press 1 for Default View - + GTA V Export (*.g5e) GTA V Export (*.g5e) - + Savegames files (SGTA*) 遊戲存檔 (SGTA*) - + Snapmatic pictures (PGTA*) Snapmatic 圖片 (PGTA*) - + No valid file is selected 沒有選擇有效的檔案 @@ -1460,13 +1460,13 @@ Press 1 for Default View - + Failed to read Snapmatic picture 無法讀取 Snapmatic 圖片 - + Failed to read Savegame file 無法讀取遊戲存檔 @@ -1678,7 +1678,7 @@ Press 1 for Default View 更改標題 - + All profile files (*.g5e SGTA* PGTA*) 所有設定檔檔案 (*.g5e SGTA* PGTA*) @@ -2306,7 +2306,7 @@ Press 1 for Default View UserInterface - + %2 - %1 %2 - %1 @@ -2338,9 +2338,9 @@ Press 1 for Default View - - - + + + &Close 關閉(&C) @@ -2376,8 +2376,8 @@ Press 1 for Default View - - + + &About %1 關於 %1(&A) @@ -2433,15 +2433,15 @@ Press 1 for Default View - + Select &GTA V Folder... 選擇 GTA V 資料夾(&G)... - - + + Select GTA V Folder... 選擇 GTA V 資料夾... @@ -2498,25 +2498,25 @@ Press 1 for Default View 在遊戲中隱藏 - - - + + + Select Profile 選擇設定檔 - - + + &Donate 贊助(&D) - + Donate 贊助 - + Donation methods 贊助方式 @@ -2529,30 +2529,30 @@ Press 1 for Default View 複製 - + &Copy 複製(&C) - + Open File... 開啟檔案... - - - - + + + + Open File 開啟檔案 - + Can't open %1 because of not valid file format 格式無效，無法開啟 %1 - + %1 - Messages %1 - 新聞