Fix the conflict of family name between Material Design Icons 5.x and…

… 6.x python fontname.py "Material Design Icons 5.9.55" materialdesignicons5-webfont.ttf https://github.com/chrissimpkins/fontname.py/blob/v2.0.0/fontname.py
spyder-ide · Oct 20, 2021 · 3d8bdca · 3d8bdca
1 parent bfa2423
commit 3d8bdca
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/qtawesome/__init__.py b/qtawesome/__init__.py
@@ -73,8 +73,8 @@ def _instance():
              'fontawesome5-brands-webfont.ttf',
              'fontawesome5-brands-webfont-charmap.json'),
             ('ei', 'elusiveicons-webfont.ttf', 'elusiveicons-webfont-charmap.json'),
-            ('mdi', 'materialdesignicons-webfont.ttf',
-             'materialdesignicons-webfont-charmap.json'),
+            ('mdi', 'materialdesignicons5-webfont.ttf',
+             'materialdesignicons5-webfont-charmap.json'),
             ('mdi6', 'materialdesignicons6-webfont.ttf',
              'materialdesignicons6-webfont-charmap.json'),
             ('ph', 'phosphor.ttf', 'phosphor-charmap.json'),

diff --git a/.../materialdesignicons-webfont-charmap.json → ...materialdesignicons5-webfont-charmap.json b/.../materialdesignicons-webfont-charmap.json → ...materialdesignicons5-webfont-charmap.json
diff --git a/...ome/fonts/materialdesignicons-webfont.ttf → ...me/fonts/materialdesignicons5-webfont.ttf b/...ome/fonts/materialdesignicons-webfont.ttf → ...me/fonts/materialdesignicons5-webfont.ttf
diff --git a/qtawesome/iconic_font.py b/qtawesome/iconic_font.py
@@ -37,7 +37,7 @@
     'fontawesome5-solid-webfont.ttf': 'acf50f59802f20d8b45220eaae532a1c',
     'fontawesome5-brands-webfont.ttf': 'ed2b8bf117160466ba6220a8f1da54a4',
     'elusiveicons-webfont.ttf': '207966b04c032d5b873fd595a211582e',
-    'materialdesignicons-webfont.ttf': '174c02fc4609e8fc4389f5d21f16a296',
+    'materialdesignicons5-webfont.ttf': 'b7d40e7ef80c1d4af6d94902af66e524',
     'materialdesignicons6-webfont.ttf': '9a2f455e7cbce011368aee95d292613b',
     'phosphor.ttf': '5b8dc57388b2d86243566b996cc3a789',
     'remixicon.ttf': '888e61f04316f10bddfff7bee10c6dd0',