diff options
| author | Ilya Zverev <zverik@textual.ru> | 2015-08-04 17:34:14 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:59:06 +0300 |
| commit | 45e112525f8979eb1a39a52ce4852d532eee189f (patch) | |
| tree | 69406a329dd4d99de740d0b50cef29c7a3c1020f /installer | |
| parent | 6c01695c6ad25587793daa4cdf89a2ff0eef0660 (diff) | |
[fonts] Replace WenQuanYi MicroHei with Droid Sans Fallback
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/win/MapsWithMe.wxs | 6 | ||||
| -rw-r--r-- | installer/win/generator.pl | 2 | ||||
| -rw-r--r-- | installer/win/guids.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/installer/win/MapsWithMe.wxs b/installer/win/MapsWithMe.wxs index 1e04a9b408..bf493499b5 100644 --- a/installer/win/MapsWithMe.wxs +++ b/installer/win/MapsWithMe.wxs @@ -83,8 +83,8 @@ <Component Id='_01_dejavusans.ttf' Guid='9c3a2d71-58a5-4e5a-ae65-0ffd085e7f6f'> <File Id='_01_dejavusans.ttf' Name='01_dejavusans.ttf' Source='..\..\data\01_dejavusans.ttf' DiskId='1' KeyPath='yes' Checksum='no' /> </Component> - <Component Id='_02_wqy_microhei.ttf' Guid='1370713b-1bdf-484a-984a-5a829ecfd9ee'> - <File Id='_02_wqy_microhei.ttf' Name='02_wqy-microhei.ttf' Source='..\..\data\02_wqy-microhei.ttf' DiskId='1' KeyPath='yes' Checksum='no' /> + <Component Id='_02_droidsans_fallback.ttf' Guid='1370713b-1bdf-484a-984a-5a829ecfd9ee'> + <File Id='_02_droidsans_fallback.ttf' Name='02_droidsans-fallback.ttf' Source='..\..\data\02_droidsans-fallback.ttf' DiskId='1' KeyPath='yes' Checksum='no' /> </Component> <Component Id='_03_jomolhari_id_a3d.ttf' Guid='8c0e64ea-b45e-4a1c-a8b5-8ec0647d6db6'> <File Id='_03_jomolhari_id_a3d.ttf' Name='03_jomolhari-id-a3d.ttf' Source='..\..\data\03_jomolhari-id-a3d.ttf' DiskId='1' KeyPath='yes' Checksum='no' /> @@ -156,7 +156,7 @@ <ComponentRef Id='_World.mwm' /> <ComponentRef Id='_01_dejavusans.ttf' /> - <ComponentRef Id='_02_wqy_microhei.ttf' /> + <ComponentRef Id='_02_droidsans_fallback.ttf' /> <ComponentRef Id='_03_jomolhari_id_a3d.ttf' /> <ComponentRef Id='_04_padauk.ttf' /> <ComponentRef Id='_05_khmeros.ttf' /> diff --git a/installer/win/generator.pl b/installer/win/generator.pl index 963dcb85af..5a90ec6bb5 100644 --- a/installer/win/generator.pl +++ b/installer/win/generator.pl @@ -1,6 +1,6 @@ use strict; -my @RESOURCES = ("01_dejavusans.ttf", "02_wqy-microhei.ttf", "03_jomolhari-id-a3d.ttf", "04_padauk.ttf", "05_khmeros.ttf", "06_code2000.ttf", +my @RESOURCES = ("01_dejavusans.ttf", "02_droidsans-fallback.ttf", "03_jomolhari-id-a3d.ttf", "04_padauk.ttf", "05_khmeros.ttf", "06_code2000.ttf", "basic.skn", "symbols_24.png", "classificator.txt", "drawing_rules.bin", "fonts_blacklist.txt", "fonts_whitelist.txt", "unicode_blocks.txt", diff --git a/installer/win/guids.txt b/installer/win/guids.txt index 75de6338ba..fd901355b1 100644 --- a/installer/win/guids.txt +++ b/installer/win/guids.txt @@ -4,7 +4,7 @@ 0cd8c6a6-5f3d-40bc-a36b-cb37842239d4 QtNetwork4.dll 8de45066-d0c7-475e-b83e-cba8f9df8a60 QtWebkit4.dll 9c3a2d71-58a5-4e5a-ae65-0ffd085e7f6f 01_dejavusans.ttf -1370713b-1bdf-484a-984a-5a829ecfd9ee 02_wqy-microhei.ttf +1370713b-1bdf-484a-984a-5a829ecfd9ee 02_droidsans-fallback.ttf 8c0e64ea-b45e-4a1c-a8b5-8ec0647d6db6 03_jomolhari-id-a3d.ttf 9895bfbb-480f-4a83-baa6-3826cf496398 04_padauk.ttf 5ea3e229-6211-4790-9a7b-81f653cfda7d 05_khmeros.ttf |