Skip to content

Commit d53610a

Browse files
committed
Add Material Design Icons 6.3.95
1 parent e7c4ef3 commit d53610a

8 files changed

+6426
-16
lines changed

README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ The following prefixes are currently available to use:
5858

5959
- `ei` prefix holds [**Elusive Icons** 2.0 with its 304 icons](http://elusiveicons.com/icons/).
6060

61-
- `mdi` prefix holds [**Material Design Icons** 5.9.55 with its 5955 icons.](https://cdn.materialdesignicons.com/5.9.55/)
61+
- [**Material Design Icons**](https://cdn.materialdesignicons.com)
62+
63+
- `mdi6` prefix holds [**Material Design Icons** 6.3.95 with its 6395 icons.](https://cdn.materialdesignicons.com/6.3.95/)
64+
65+
- `mdi` prefix holds [**Material Design Icons** 5.9.55 with its 5955 icons.](https://cdn.materialdesignicons.com/5.9.55/)
6266

6367
- `msc` prefix holds [**Codicon Icons** 0.0.25 with its 385 icons.](https://github.com/microsoft/vscode-codicons)
6468

@@ -84,8 +88,8 @@ asl_icon = qta.icon('ei.asl')
8488
elusive_button = QtWidgets.QPushButton(asl_icon, 'Elusive Icons!')
8589

8690
# or Material Design Icons:
87-
apn_icon = qta.icon('mdi.access-point-network')
88-
mdi_button = QtWidgets.QPushButton(apn_icon, 'Material Design Icons!')
91+
apn_icon = qta.icon('mdi6.access-point-network')
92+
mdi6_button = QtWidgets.QPushButton(apn_icon, 'Material Design Icons!')
8993

9094
# or Microsoft's Codicons:
9195
squirrel_icon = qta.icon('msc.squirrel')

UPDATE.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ with open('charmap.json', 'w') as file:
3636

3737
## Material Design Icons
3838

39-
To update _Material Design Icons_, you must:
39+
To update _Material Design Icons 6.x_, you must:
4040

4141
- download ttf from <https://raw.githubusercontent.com/Templarian/MaterialDesign-Webfont/master/fonts/materialdesignicons-webfont.ttf>
4242
- regenerate the json charmap with the `materialdesignicons.css` file from <https://raw.githubusercontent.com/Templarian/MaterialDesign-Webfont/master/css/materialdesignicons.css>
@@ -52,15 +52,15 @@ import hashlib
5252
TTF_URL = 'https://raw.githubusercontent.com/Templarian/MaterialDesign-Webfont/master/fonts/materialdesignicons-webfont.ttf'
5353
CSS_URL = 'https://raw.githubusercontent.com/Templarian/MaterialDesign-Webfont/master/css/materialdesignicons.css'
5454

55-
with open('materialdesignicons-webfont.ttf', 'wb') as fp:
55+
with open('materialdesignicons6-webfont.ttf', 'wb') as fp:
5656
req = urllib.request.urlopen(TTF_URL)
5757
if req.status != 200:
5858
raise Exception('Failed to download TTF')
5959
fp.write(req.read())
6060
req.close()
6161

6262
hasher = hashlib.md5()
63-
with open('materialdesignicons-webfont.ttf', 'rb') as f:
63+
with open('materialdesignicons6-webfont.ttf', 'rb') as f:
6464
content = f.read()
6565
hasher.update(content)
6666

@@ -83,7 +83,7 @@ for name, key in data:
8383
name = name.lower()
8484
charmap[name] = key
8585

86-
with open('materialdesignicons-webfont-charmap.json', 'w') as fp:
86+
with open('materialdesignicons6-webfont-charmap.json', 'w') as fp:
8787
json.dump(charmap, fp, indent=4, sort_keys=True)
8888

8989
```

docs/source/usage.rst

+10-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ The following prefixes are currently available to use:
2222

2323
- ``ei`` prefix holds `Elusive Icons 2.0 with its 304 icons`_.
2424

25-
- ``mdi`` prefix holds `Material Design Icons 5.9.55 with its 5955
26-
icons.`_
25+
- `Material Design Icons`_:
26+
27+
- ``mdi6`` prefix holds `Material Design Icons 6.3.95 with its 6395 icons.`_
28+
29+
- ``mdi`` prefix holds `Material Design Icons 5.9.55 with its 5955 icons.`_
2730

2831
- ``msc`` prefix holds Microsoft's `Codicon Icons 0.0.25 with its 385 icons.`_
2932

@@ -33,6 +36,8 @@ The following prefixes are currently available to use:
3336
.. _414 icons of various brands.: https://fontawesome.com/icons?d=gallery&s=brands&v=5.0.0,5.0.1,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.0.10,5.0.11,5.0.12,5.0.13,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.5.0,5.6.0,5.6.1,5.6.3&m=free
3437
.. _FA 4.7 version with its 675 icons: https://fontawesome.com/v4.7.0/icons/
3538
.. _Elusive Icons 2.0 with its 304 icons: http://elusiveicons.com/icons/
39+
.. _Material Design Icons: https://cdn.materialdesignicons.com/
40+
.. _Material Design Icons 6.3.95 with its 6395 icons.: https://cdn.materialdesignicons.com/6.3.95/
3641
.. _Material Design Icons 5.9.55 with its 5955 icons.: https://cdn.materialdesignicons.com/5.9.55/
3742
.. _Codicon Icons 0.0.25 with its 385 icons.: https://github.com/microsoft/vscode-codicons
3843

@@ -61,9 +66,9 @@ Examples
6166
asl_icon = qta.icon('ei.asl')
6267
elusive_button = QtWidgets.QPushButton(asl_icon, 'Elusive Icons!')
6368
64-
# Get Material Design icons by name
65-
apn_icon = qta.icon('mdi.access-point-network')
66-
mdi_button = QtWidgets.QPushButton(apn_icon, 'Material Design Icons!')
69+
# Get Material Design icons 6.x by name
70+
apn_icon = qta.icon('mdi6.access-point-network')
71+
mdi6_button = QtWidgets.QPushButton(apn_icon, 'Material Design Icons!')
6772
6873
# Get Microsoft Codicons icons by name
6974
squirrel_icon = qta.icon('msc.squirrel')

example.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def __init__(self):
3030
elusive_button = QtWidgets.QPushButton(asl_icon, 'Elusive Icons!')
3131

3232
# Get Material Design icons by name
33-
apn_icon = qta.icon('mdi.access-point-network')
34-
mdi_button = QtWidgets.QPushButton(apn_icon, 'Material Design Icons!')
33+
apn_icon = qta.icon('mdi6.access-point-network')
34+
mdi6_button = QtWidgets.QPushButton(apn_icon, 'Material Design Icons!')
3535

3636
# Rotated
3737
rot_icon = qta.icon('mdi.access-point-network', rotated=45)
@@ -127,7 +127,7 @@ def __init__(self):
127127
fa5s_button,
128128
fa5b_button,
129129
elusive_button,
130-
mdi_button,
130+
mdi6_button,
131131
music_button,
132132
heart_button,
133133
rot_button,

qtawesome/__init__.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ def _instance():
7575
('ei', 'elusiveicons-webfont.ttf', 'elusiveicons-webfont-charmap.json'),
7676
('mdi', 'materialdesignicons-webfont.ttf',
7777
'materialdesignicons-webfont-charmap.json'),
78+
('mdi6', 'materialdesignicons6-webfont.ttf',
79+
'materialdesignicons6-webfont-charmap.json'),
7880
('ph', 'phosphor.ttf', 'phosphor-charmap.json'),
7981
('ri', 'remixicon.ttf', 'remixicon-charmap.json'),
8082
('msc', 'codicon.ttf', 'codicon-charmap.json'),
@@ -102,7 +104,8 @@ def icon(*names, **kwargs):
102104
- The prefix corresponding to Font-Awesome 5.x (solid) is 'fa5s'
103105
- The prefix corresponding to Font-Awesome 5.x (brands) is 'fa5b'
104106
- The prefix corresponding to Elusive-Icons is 'ei'
105-
- The prefix corresponding to Material-Design-Icons is 'mdi'
107+
- The prefix corresponding to Material-Design-Icons 5.x is 'mdi'
108+
- The prefix corresponding to Material-Design-Icons 6.x is 'mdi6'
106109
107110
When requesting a single glyph, options (such as color or positional offsets)
108111
can be passed as keyword arguments::

0 commit comments

Comments
 (0)