Fix default font loading

2021-02-17 23:31:26 +01:00 · 2021-02-17 23:31:26 +01:00 · b0f95d1cae
parent 962b1c82c3
commit b0f95d1cae
9 changed files with 40 additions and 41 deletions
--- a/main.cpp
+++ b/main.cpp
@ -105,7 +105,6 @@ int main(int argc, char *argv[])
 #if QT_VERSION >= 0x060000
    a.setFont(QApplication::font("QMenu"));
 #elif QT_VERSION >= 0x050400
-#else
    if (QSysInfo::windowsVersion() >= 0x0080) {
        a.setFont(QApplication::font("QMenu"));
    }
--- a/res/gta5sync.ts
+++ b/res/gta5sync.ts
@ -585,7 +585,7 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2235,22 +2235,22 @@ Press 1 for Default View</source>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation type="unfinished"></translation>
    </message>
--- a/res/gta5sync_de.ts
+++ b/res/gta5sync_de.ts
@ -604,7 +604,7 @@ Wenn du es als Avatar verwenden möchtest wird es abgetrennt!</translation>
        <translation>&amp;Fertig</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2287,22 +2287,22 @@ Drücke 1 für Standardmodus</translation>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation>%1 Benutzerstatistik</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation>Sollen bei Einreichungen Persönliche Nutzungsdaten einbezogen werden um %1 in der Zukunft zu unterstützen?</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation>Ja, ich möchte Persönliche Nutzungsdaten einbeziehen.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation>&amp;OK</translation>
    </message>
--- a/res/gta5sync_en_US.ts
+++ b/res/gta5sync_en_US.ts
@ -585,7 +585,7 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2235,22 +2235,22 @@ Press 1 for Default View</source>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation type="unfinished"></translation>
    </message>
--- a/res/gta5sync_fr.ts
+++ b/res/gta5sync_fr.ts
@ -605,7 +605,7 @@ Si vous l&apos;utilisez comme Avatar, l&apos;image sera détachée !</translatio
        <translation>&amp;Terminer</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2299,22 +2299,22 @@ Appuyer sur 1 pour le mode par défaut</translation>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation>Voulez-vous aider au développement de %1 en transmettant vos données d&apos;utilisation ?</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation>Statistiques utilisateurs %1</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation>Oui, je veux partager mes données d&apos;utilisation.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation>&amp;OK</translation>
    </message>
--- a/res/gta5sync_ko.ts
+++ b/res/gta5sync_ko.ts
@ -610,7 +610,7 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation>완료(&amp;D)</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2320,22 +2320,22 @@ Press 1 for Default View</source>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation>개인 사용 데이터를 제출에 포함시켜 %1이(가) 개선되기를 원합니까?</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation>%1 사용자 통계</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation>예, 개인 사용 데이터를 포함시키고 싶습니다.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation>확인(&amp;O)</translation>
    </message>
--- a/res/gta5sync_ru.ts
+++ b/res/gta5sync_ru.ts
@ -611,7 +611,7 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation>&amp;Готово</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2302,22 +2302,22 @@ Press 1 for Default View</source>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation>Разрешишь нам собирать статистику о пользовании тобой %1? Это поможет нам в разработке.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation>%1 Пользовательская статистика</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation>Да, передавать данные о пользовании программой.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation>&amp;ОК</translation>
    </message>
--- a/res/gta5sync_uk.ts
+++ b/res/gta5sync_uk.ts
@ -607,7 +607,7 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation>&amp;Готово</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2300,22 +2300,22 @@ Press 1 for Default View</source>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation>Ви хочете допомогти %1  покращитись у майбутньому, включивши дані особистого користування?</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation>%1 Статистика користувачів</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation>Так, я хочу включити дані особистого користування.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translatorcomment>&amp;OK</translatorcomment>
        <translation>&amp;OK</translation>
--- a/res/gta5sync_zh_TW.ts
+++ b/res/gta5sync_zh_TW.ts
@ -602,7 +602,7 @@ When you want to use it as Avatar the image will be detached!</source>
        <translation>完成(&amp;D)</translation>
    </message>
    <message>
-        <location filename="../MapLocationDialog.cpp" line="65"/>
+        <location filename="../MapLocationDialog.cpp" line="64"/>
        <source>X: %1
 Y: %2</source>
        <comment>X and Y position</comment>
@ -2282,22 +2282,22 @@ Press 1 for Default View</source>
 <context>
    <name>TelemetryDialog</name>
    <message>
-        <location filename="../main.cpp" line="150"/>
+        <location filename="../main.cpp" line="148"/>
        <source>You want help %1 to improve in the future by including personal usage data in your submission?</source>
        <translation>你希望通過收集資料來幫助改善 %1 嗎?</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="151"/>
+        <location filename="../main.cpp" line="149"/>
        <source>%1 User Statistics</source>
        <translation>%1 使用者統計</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="155"/>
+        <location filename="../main.cpp" line="153"/>
        <source>Yes, I want include personal usage data.</source>
        <translation>是的，我想幫忙.</translation>
    </message>
    <message>
-        <location filename="../main.cpp" line="164"/>
+        <location filename="../main.cpp" line="162"/>
        <source>&amp;OK</source>
        <translation>確定(&amp;O)</translation>
    </message>