diff --git a/radio/src/fonts/horus/font_dblsize.png b/radio/src/fonts/horus/font_dblsize.png index 0e324eb5a..cfbf91076 100644 Binary files a/radio/src/fonts/horus/font_dblsize.png and b/radio/src/fonts/horus/font_dblsize.png differ diff --git a/radio/src/fonts/horus/font_dblsize.specs b/radio/src/fonts/horus/font_dblsize.specs index 5f06cd075..d6fa34d4a 100644 --- a/radio/src/fonts/horus/font_dblsize.specs +++ b/radio/src/fonts/horus/font_dblsize.specs @@ -1 +1 @@ -0,4,14,28,54,76,110,139,146,160,173,193,217,228,242,251,266,289,310,331,352,375,397,420,441,464,487,497,508,532,556,580,598,613,641,665,689,715,736,757,783,808,818,832,859,880,910,935,963,987,1015,1040,1062,1087,1112,1140,1178,1206,1234,1258,1272,1287,1300,1324,1343,1356,1378,1401,1420,1443,1466,1484,1507,1529,1539,1553,1576,1586,1618,1640,1663,1686,1709,1726,1746,1764,1786,1810,1841,1865,1889,1909,1933,1937,1961,1989,2016,2034,2052,2075,2098,2121,2144,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2195,2218,2240,2255,2274 \ No newline at end of file +0,4,14,28,54,76,110,139,146,160,173,193,217,228,242,251,266,289,310,331,352,375,397,420,441,464,487,497,508,532,556,580,598,613,641,665,689,715,736,757,783,808,818,832,859,880,910,935,963,987,1015,1040,1062,1087,1112,1140,1178,1206,1234,1258,1272,1287,1300,1324,1343,1356,1378,1401,1420,1443,1466,1484,1507,1529,1539,1553,1576,1586,1618,1640,1663,1686,1709,1726,1746,1764,1786,1810,1841,1865,1889,1909,1933,1940,1964,1992,2019,2037,2055,2078,2101,2124,2147,2175,2175,2175,2175,2175,2175,2175,2175,2175,2175,2175,2175,2175,2198,2221,2243,2258,2277,2305,2327,2355,2378,2403,2425,2448 \ No newline at end of file diff --git a/radio/src/fonts/horus/font_midsize.png b/radio/src/fonts/horus/font_midsize.png index 6ebada671..366be3383 100644 Binary files a/radio/src/fonts/horus/font_midsize.png and b/radio/src/fonts/horus/font_midsize.png differ diff --git a/radio/src/fonts/horus/font_midsize.specs b/radio/src/fonts/horus/font_midsize.specs index 82b12a96b..9eae1a16d 100644 --- a/radio/src/fonts/horus/font_midsize.specs +++ b/radio/src/fonts/horus/font_midsize.specs @@ -1 +1 @@ -0,4,10,20,41,56,80,100,106,115,125,140,159,167,177,184,196,212,227,242,258,274,290,306,322,338,354,361,369,388,407,426,440,451,471,487,505,524,539,553,572,589,595,605,623,638,658,675,695,710,730,747,763,782,799,819,845,864,883,901,910,922,931,950,967,976,991,1006,1020,1036,1052,1064,1080,1095,1101,1110,1125,1131,1154,1169,1185,1200,1216,1227,1241,1253,1268,1285,1306,1323,1340,1354,1373,1377,1396,1417,1438,1453,1468,1485,1502,1519,1536,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1574,1590,1605,1616,1630 \ No newline at end of file +0,4,10,20,41,56,80,100,106,115,125,140,159,167,177,184,196,212,227,242,258,274,290,306,322,338,354,361,369,388,407,426,440,451,471,487,505,524,539,553,572,589,595,605,623,638,658,675,695,710,730,747,763,782,799,819,845,864,883,901,910,922,931,950,967,976,991,1006,1020,1036,1052,1064,1080,1095,1101,1110,1125,1131,1154,1169,1185,1200,1216,1227,1241,1253,1268,1285,1306,1323,1340,1354,1373,1379,1398,1419,1440,1455,1470,1487,1504,1521,1538,1560,1560,1560,1560,1560,1560,1560,1560,1560,1560,1560,1560,1560,1576,1592,1607,1618,1632,1652,1667,1687,1703,1720,1735,1751 \ No newline at end of file diff --git a/radio/src/fonts/horus/font_smlsize.png b/radio/src/fonts/horus/font_smlsize.png index a93cdff23..6eb26592d 100644 Binary files a/radio/src/fonts/horus/font_smlsize.png and b/radio/src/fonts/horus/font_smlsize.png differ diff --git a/radio/src/fonts/horus/font_smlsize.specs b/radio/src/fonts/horus/font_smlsize.specs index 7da8a6e98..7281ed870 100644 --- a/radio/src/fonts/horus/font_smlsize.specs +++ b/radio/src/fonts/horus/font_smlsize.specs @@ -1 +1 @@ -0,4,8,13,23,31,44,55,58,63,67,75,85,88,94,97,103,112,120,128,137,146,154,163,171,180,189,192,195,205,215,225,232,238,248,256,266,276,284,291,301,310,313,318,327,335,345,354,365,373,384,393,402,412,421,431,445,455,465,475,479,485,489,499,508,513,521,529,537,546,555,561,570,578,581,586,594,597,609,617,626,634,643,649,657,663,671,680,692,701,710,718,728,732,742,754,766,774,782,792,802,812,822,833,833,833,833,833,833,833,833,833,833,833,833,833,842,851,859,865,873 \ No newline at end of file +0,4,8,13,23,31,44,55,58,63,67,75,85,88,94,97,103,112,120,128,137,146,154,163,171,180,189,192,195,205,215,225,232,238,248,256,266,276,284,291,301,310,313,318,327,335,345,354,365,373,384,393,402,412,421,431,445,455,465,475,479,485,489,499,508,513,521,529,537,546,555,561,570,578,581,586,594,597,609,617,626,634,643,649,657,663,671,680,692,701,710,718,728,731,741,753,765,773,781,791,801,811,821,832,832,832,832,832,832,832,832,832,832,832,832,832,841,850,858,864,872,882,890,901,910,919,927,935 \ No newline at end of file diff --git a/radio/src/fonts/horus/font_stdsize.png b/radio/src/fonts/horus/font_stdsize.png index 459105c68..634d3be5f 100644 Binary files a/radio/src/fonts/horus/font_stdsize.png and b/radio/src/fonts/horus/font_stdsize.png differ diff --git a/radio/src/fonts/horus/font_stdsize.specs b/radio/src/fonts/horus/font_stdsize.specs index bca645be3..0a626940a 100644 --- a/radio/src/fonts/horus/font_stdsize.specs +++ b/radio/src/fonts/horus/font_stdsize.specs @@ -1 +1 @@ -0,4,7,13,26,35,51,63,66,71,76,85,97,101,107,111,118,128,137,146,155,166,175,185,194,204,214,218,222,234,246,258,266,273,285,295,307,319,329,338,351,362,366,372,383,392,405,416,429,439,452,463,473,485,496,508,525,537,549,561,566,573,578,590,601,607,617,627,636,646,656,663,673,682,685,690,700,703,718,727,737,747,757,764,773,780,789,799,813,823,833,842,854,858,870,884,898,907,916,927,938,949,960,974,989,1004,1019,1034,1049,1064,1079,1094,1109,1124,1139,1154,1164,1174,1184,1191,1200 \ No newline at end of file +0,4,7,13,26,35,51,63,66,71,76,85,97,101,107,111,118,128,137,146,155,166,175,185,194,204,214,218,222,234,246,258,266,273,285,295,307,319,329,338,351,362,366,372,383,392,405,416,429,439,452,463,473,485,496,508,525,537,549,561,566,573,578,590,601,607,617,627,636,646,656,663,673,682,685,690,700,703,718,727,737,747,757,764,773,780,789,799,813,823,833,842,854,857,869,883,897,906,915,926,937,948,959,973,988,1003,1018,1033,1048,1063,1078,1093,1108,1123,1138,1153,1163,1173,1183,1190,1199,1211,1221,1234,1244,1255,1264,1274 \ No newline at end of file diff --git a/radio/src/fonts/horus/font_stdsizebold.png b/radio/src/fonts/horus/font_stdsizebold.png index 9c56245fc..c156a5d45 100644 Binary files a/radio/src/fonts/horus/font_stdsizebold.png and b/radio/src/fonts/horus/font_stdsizebold.png differ diff --git a/radio/src/fonts/horus/font_stdsizebold.specs b/radio/src/fonts/horus/font_stdsizebold.specs index 63f8a7522..5de2caca5 100644 --- a/radio/src/fonts/horus/font_stdsizebold.specs +++ b/radio/src/fonts/horus/font_stdsizebold.specs @@ -1 +1 @@ -0,4,9,16,29,40,57,72,76,83,89,99,111,117,124,129,136,148,159,169,179,191,202,213,223,235,247,252,257,269,281,293,302,309,323,335,347,360,370,380,393,405,410,417,430,440,455,467,481,493,507,519,530,542,554,568,587,601,615,627,634,641,647,659,668,675,686,697,707,719,731,740,752,763,768,775,786,791,807,818,830,841,853,861,871,880,891,903,919,931,943,953,965,969,981,995,1009,1018,1027,1038,1049,1060,1071,1085,1100,1115,1130,1145,1160,1175,1190,1205,1220,1235,1250,1265,1277,1289,1300,1307,1317 \ No newline at end of file +0,4,9,16,29,40,57,72,76,83,89,99,111,117,124,129,136,148,159,169,179,191,202,213,223,235,247,252,257,269,281,293,302,309,323,335,347,360,370,380,393,405,410,417,430,440,455,467,481,493,507,519,530,542,554,568,587,601,615,627,634,641,647,659,668,675,686,697,707,719,731,740,752,763,768,775,786,791,807,818,830,841,853,861,871,880,891,903,919,931,943,953,965,968,980,994,1008,1017,1026,1037,1048,1059,1070,1084,1099,1114,1129,1144,1159,1174,1189,1204,1219,1234,1249,1264,1276,1288,1299,1306,1316,1330,1341,1355,1367,1379,1390,1401 \ No newline at end of file diff --git a/radio/src/fonts/horus/font_tinsize.png b/radio/src/fonts/horus/font_tinsize.png index 9b9988bbd..9dd9cbd2c 100644 Binary files a/radio/src/fonts/horus/font_tinsize.png and b/radio/src/fonts/horus/font_tinsize.png differ diff --git a/radio/src/fonts/horus/font_tinsize.specs b/radio/src/fonts/horus/font_tinsize.specs index 27ab28004..910189196 100644 --- a/radio/src/fonts/horus/font_tinsize.specs +++ b/radio/src/fonts/horus/font_tinsize.specs @@ -1 +1 @@ -0,4,7,12,20,26,36,44,47,51,55,61,69,72,76,79,84,91,97,103,109,116,122,129,135,142,149,151,154,162,170,178,184,189,197,204,211,219,226,232,240,247,250,254,262,268,276,283,291,298,306,313,320,328,335,343,353,360,368,375,379,384,388,396,403,407,413,420,426,432,439,444,450,456,459,463,470,473,482,488,495,502,508,513,519,524,530,537,545,552,559,565,573,577,585,594,603,609,615,622,629,636,643,651,651,651,651,651,651,651,651,651,651,651,651,651,658,665,671,676,682 \ No newline at end of file +0,4,7,12,20,26,36,44,47,51,55,61,69,72,76,79,84,91,97,103,109,116,122,129,135,142,149,151,154,162,170,178,184,189,197,204,211,219,226,232,240,247,250,254,262,268,276,283,291,298,306,313,320,328,335,343,353,360,368,375,379,384,388,396,403,407,413,420,426,432,439,444,450,456,459,463,470,473,482,488,495,502,508,513,519,524,530,537,545,552,559,565,573,575,583,592,601,607,613,620,627,634,641,649,649,649,649,649,649,649,649,649,649,649,649,649,656,663,669,674,680,688,694,702,709,716,722,729 \ No newline at end of file diff --git a/radio/src/fonts/horus/font_xxlsize.png b/radio/src/fonts/horus/font_xxlsize.png index f67b7ed56..15ec5697d 100644 Binary files a/radio/src/fonts/horus/font_xxlsize.png and b/radio/src/fonts/horus/font_xxlsize.png differ diff --git a/radio/src/fonts/horus/font_xxlsize.specs b/radio/src/fonts/horus/font_xxlsize.specs index ebed58b41..cd50e8e66 100644 --- a/radio/src/fonts/horus/font_xxlsize.specs +++ b/radio/src/fonts/horus/font_xxlsize.specs @@ -1 +1 @@ -0,4,12,29,66,93,137,173,181,195,210,235,269,280,296,305,325,353,378,404,431,460,487,515,542,570,598,607,618,652,686,720,743,762,798,827,859,893,920,944,979,1010,1019,1035,1067,1093,1129,1160,1197,1224,1261,1292,1320,1354,1384,1420,1468,1502,1536,1568,1582,1602,1616,1650,1679,1695,1722,1749,1774,1802,1830,1850,1878,1904,1912,1925,1952,1960,2002,2028,2056,2083,2111,2130,2154,2174,2200,2229,2268,2297,2326,2351,2385,2389,2423,2462,2501,2526,2551,2582,2613,2644,2675,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2743,2771,2798,2817,2842 \ No newline at end of file +0,4,12,29,66,93,137,173,181,195,210,235,269,280,296,305,325,353,378,404,431,460,487,515,542,570,598,607,618,652,686,720,743,762,798,827,859,893,920,944,979,1010,1019,1035,1067,1093,1129,1160,1197,1224,1261,1292,1320,1354,1384,1420,1468,1502,1536,1568,1582,1602,1616,1650,1679,1695,1722,1749,1774,1802,1830,1850,1878,1904,1912,1925,1952,1960,2002,2028,2056,2083,2111,2130,2154,2174,2200,2229,2268,2297,2326,2351,2385,2393,2427,2466,2505,2530,2555,2586,2617,2648,2679,2719,2719,2719,2719,2719,2719,2719,2719,2719,2719,2719,2719,2719,2747,2775,2802,2821,2846,2882,2909,2946,2974,3004,3030,3058 \ No newline at end of file diff --git a/radio/src/gui/horus/fonts.cpp b/radio/src/gui/horus/fonts.cpp index 7e68afd22..8bb09b972 100644 --- a/radio/src/gui/horus/fonts.cpp +++ b/radio/src/gui/horus/fonts.cpp @@ -79,7 +79,7 @@ pm_uchar font_stdsizebold[] = { const uint16_t * const fontspecsTable[16] = { font_stdsize_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs, font_stdsizebold_specs }; const uint8_t * const fontsTable[16] = { font_stdsize, font_tinsize, font_smlsize, font_midsize, font_dblsize, font_xxlsize, font_stdsizebold }; -BitmapBuffer * fontCache[2]; +BitmapBuffer * fontCache[2] = { NULL, NULL }; BitmapBuffer * createFontCache(const uint8_t * font, LcdFlags fg, LcdFlags bg) { @@ -95,6 +95,8 @@ BitmapBuffer * createFontCache(const uint8_t * font, LcdFlags fg, LcdFlags bg) void loadFontCache() { + delete fontCache[0]; + delete fontCache[1]; fontCache[0] = createFontCache(fontsTable[0], TEXT_COLOR, TEXT_BGCOLOR); fontCache[1] = createFontCache(fontsTable[0], TEXT_INVERTED_COLOR, TEXT_INVERTED_BGCOLOR); } diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e91aae7e0..ea91f89cb 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -605,7 +605,7 @@ #define BREAKSPACE " " #endif -#if defined(PCBTARANIS) +#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #define TR_ENTER "[ENTER]" #else #define TR_ENTER "[MENU]" @@ -643,7 +643,7 @@ #define TR_TRIMINC TR("Trim Schr.", "Trimmschritte") #define TR_DISPLAY_TRIMS TR("Trim anzeig", "Trimwerte anzeigen") #define TR_TTRACE TR("Gasquelle", INDENT "Gas-Timerquelle") -#define TR_TTRIM TR("Gastrim", INDENT "Gas-Leerlauftrim") +#define TR_TTRIM TR("Gastrim", INDENT "Gas-Leerlauftrim") #define TR_BEEPCTR TR("Mitt.Piep", "Mittelstell. -Pieps") #define TR_USE_GLOBAL_FUNCS TR("Glob. Funkt.", "Globale Funkt verw.") #if defined(PCBSKY9X) && defined(REVX) @@ -663,8 +663,8 @@ #define TR_DEFAULT "(Normal)" #define TR_CHECKTRIMS CENTER"\006Check\012Trims" #define OFS_CHECKTRIMS CENTER_OFS+(9*FW) -#define TR_SWASHTYPE TR("Typ Taumelsch", "Typ Taumelscheibe") -#define TR_COLLECTIVE TR("Kollekt. Pitch", "Kollekt. Pitch Quelle") +#define TR_SWASHTYPE TR("Typ Taumelsch", "Typ Taumelscheibe") +#define TR_COLLECTIVE TR("Kollekt. Pitch", "Kollekt. Pitch Quelle") #define TR_AILERON "Roll Quelle" #define TR_ELEVATOR "Nick Quelle" #define TR_SWASHRING TR("Ring Begrenz", "Ring Begrenzung") @@ -786,10 +786,10 @@ #define TR_MIX "MIX" #define TR_EEPROMLOWMEM "EEPROM voll" #define TR_ALERT "WARNUNG" -#define TR_PRESSANYKEYTOSKIP TR("Taste drücken",CENTER"Taste drücken") +#define TR_PRESSANYKEYTOSKIP TR("Taste drücken", CENTER "Taste drücken") #define TR_THROTTLENOTIDLE "Gas nicht Null!" #define TR_ALARMSDISABLED "Alarme ausgeschaltet" -#define TR_PRESSANYKEY TR("Taste drücken",CENTER"Taste drücken") +#define TR_PRESSANYKEY TR("Taste drücken", CENTER "Taste drücken") #define TR_BADEEPROMDATA "EEPROM ungültig" #define TR_BAD_RADIO_DATA "Bad Radio Data" #define TR_EEPROMFORMATTING "EEPROM Initialisieren" @@ -849,7 +849,7 @@ #define TR_LATITUDE "Breite:" #define TR_LONGITUDE "Länge:" #define TR_GPSCOORD TR("GPS-Koord.", "GPS-Koordinaten-Format") -#define TR_VARIO TR("----Vario--------", "----Variometer----") //9XR-Pro +#define TR_VARIO TR("----Vario--------", "----Variometer----") // 9XR-Pro #define TR_PITCH_AT_ZERO INDENT "Niedrigster Ton" #define TR_PITCH_AT_MAX INDENT "Höchster Ton" #define TR_REPEAT_AT_ZERO INDENT "Wiederholrate" @@ -858,7 +858,7 @@ #define TR_SAVEMODEL "Modelleinstellungen speichern" #define TR_BATT_CALIB "Akku Spg messen" #define TR_CURRENT_CALIB "Strom abgl." -#define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spannungsquelle") //9XR-Pro +#define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spannungsquelle") // 9XR-Pro #define TR_CURRENT TR(INDENT "Strom", INDENT "Stromquelle") #define TR_SELECT_MODEL "Modell Wählen" #define TR_CREATE_CATEGORY "Create Category" @@ -869,7 +869,7 @@ #define TR_CHANGE_CATEGORY "Change category" #define TR_COPY_MODEL "Kopiere Modell" #define TR_MOVE_MODEL "Verschiebe Modell" -#define TR_BACKUP_MODEL "Modell auf SD-Karte" //9XR-Pro +#define TR_BACKUP_MODEL "Modell auf SD-Karte" // 9XR-Pro #define TR_DELETE_MODEL "Modell Löschen" // TODO merged into DELETEMODEL? #define TR_RESTORE_MODEL "Modell Restore" #define TR_SDCARD_ERROR "SD-Kartenfehler" @@ -885,7 +885,7 @@ #define TR_SWITCHWARN "SCHALTER" #define TR_FAILSAFEWARN "FAILSAFE" #define TR_NO_FAILSAFE TR("Failsafe not set", "Failsafe nicht programmiert") -#define TR_KEYSTUCK "Taste klemmt" //Key stuck=Taste klemmt +#define TR_KEYSTUCK "Taste klemmt" // Key stuck=Taste klemmt #define TR_INVERT_THR TR("Gas umkehren?", "Vollgas hinten?") // Th9x 9XR #define TR_SPEAKER_VOLUME INDENT "Lautstärke" #define TR_LCD "Bildschirm" @@ -896,7 +896,7 @@ #define TR_COPROC "CoProz." #define TR_COPROC_TEMP "MB Temp. \016>" #define TR_CAPAWARNING INDENT "Kapaz. niedrig" // wg 9XR-Pro -#define TR_TEMPWARNING INDENT "Temp. größer" //wg 9XR-Pro +#define TR_TEMPWARNING INDENT "Temp. größer" // wg 9XR-Pro #define TR_FUNC "Funktion" #define TR_V1 "V1" #define TR_V2 "V2" @@ -921,7 +921,7 @@ #define TR_REMOVED " gelöscht" #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Formatieren" -#define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung +#define TR_NA "N/V" // NV=Nicht Verfügbar Kurz-Meldung #define TR_HARDWARE TR("Hardware einst. ", "Namen und Hardware einst.") #define TR_FORMATTING "Formatierung..." #define TR_TEMP_CALIB "Temp. abgl." @@ -980,10 +980,10 @@ #define TR_SPEAKER INDENT "Lautspr" #define TR_BUZZER INDENT "Summer" #define TR_BYTES "Bytes" -#define TR_MODULE_BIND TR("Bind","[Bind]") //9XR-Pro -#define TR_MODULE_RANGE TR("Rang", "[Range]") //9XR-Pro -#define TR_RESET_BTN TR("[Reset]", "[Reset Trim]") -#define TR_SET "[Set]" +#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) +#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) +#define TR_RESET_BTN BUTTON("Reset") +#define TR_SET BUTTON("Set") #define TR_TRAINER "----DSC Buchse PPM In/Out------" //DSC Buchse Trainer Buchse #define TR_ANTENNAPROBLEM CENTER "TX-Antennenproblem!" #define TR_MODELIDUSED TR("ID schon benutzt", "Modell-ID schon benutzt") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 9f9b2da25..97ca68ade 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -601,7 +601,7 @@ #define BREAKSPACE " " #endif -#if defined(PCBTARANIS) +#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #define TR_ENTER "[ENTER]" #else #define TR_ENTER "[MENU]" @@ -968,10 +968,10 @@ #define TR_SPEAKER INDENT "Haut-p." #define TR_BUZZER INDENT "Bipeur" #define TR_BYTES "bytes" -#define TR_MODULE_BIND TR("[Bnd]", "[Bind]") -#define TR_MODULE_RANGE TR("[Prt]", "[Port.]") -#define TR_RESET_BTN "[RAZ]" -#define TR_SET "[Déf]" +#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) +#define TR_MODULE_RANGE BUTTON(TR("Prt", "Port.")) +#define TR_RESET_BTN BUTTON("RAZ") +#define TR_SET BUTTON("Déf") #define TR_TRAINER "Ecolage" #define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!" #define TR_MODELIDUSED TR("ID déjà affecté", "No de modèle déjà utilisé") diff --git a/radio/util/font2png.py b/radio/util/font2png.py index 62ea0b275..64735fad2 100755 --- a/radio/util/font2png.py +++ b/radio/util/font2png.py @@ -10,15 +10,14 @@ app = Qt.QApplication(sys.argv) for f in glob.glob("fonts/*.ttf"): QtGui.QFontDatabase.addApplicationFont(f) -chars_en = u""" !"#$%&'()*+,-./0123456789:;<=>?°ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz~ ≥→←↑↓↗↘↙↖△""" +chars_en = u""" !"#$%&'()*+,-./0123456789:;<=>?°ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz~|≥→←↑↓↗↘↙↖△""" chars_fr = u"""éèàîç""" +chars_de = u"""ÄäÖöÜüß""" COUNT_EXTRA_CHARS = 12 chars_extra = u"".join([chr(1+i) for i in range(COUNT_EXTRA_CHARS)]) -chars = chars_en + chars_extra + chars_fr - -print len(chars_en + chars_extra) +chars = chars_en + chars_extra + chars_fr + chars_de def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, background, coordsfile=True):