Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

PR: Add Microsoft's Codicons 0.0.25 font #152

Merged
merged 11 commits into from
Oct 18, 2021

Conversation

darkvertex
Copy link
Contributor

While developing Visual Studio Code, Microsoft has been developing an opensource font of the icons used in it. I think it's a nice clean set.

Here's a screenshot of the browser with the icon size shrunk a little to make them fit:
image

This PR adds an "msc" (for MicroSoft Codicons) prefix with this new font and a new update_msc setup.py subcommand to help refresh the icons to the latest version easily, just like we have update_fa5 for FA5.

@darkvertex
Copy link
Contributor Author

@ccordoba12 can you review this when you have a chance? (I'd assign you to the PR but I don't have the rights to do so.)

@ccordoba12 ccordoba12 assigned ccordoba12 and dalthviz and unassigned ccordoba12 Sep 21, 2020
@ccordoba12 ccordoba12 changed the title Add Microsoft's Codicons 0.0.7 font PR: Add Microsoft's Codicons 0.0.7 font Sep 21, 2020
@ccordoba12 ccordoba12 added this to the v1.0.0 milestone Sep 21, 2020
@ccordoba12
Copy link
Member

Sorry for the delay. @dalthviz will take care of this.

@dalthviz dalthviz self-requested a review September 21, 2020 23:09
@dalthviz dalthviz assigned darkvertex and unassigned dalthviz Sep 21, 2020
Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @darkvertex for the work to add the new font set! I left a suggestion to fix the run of the update command on Windows. Also, while I was checking that, seems like an update is needed (successfully running the command left me with the following diff):

diff --git a/qtawesome/fonts/codicon.json b/qtawesome/fonts/codicon.json
index b6dcb5d..c01b755 100644
--- a/qtawesome/fonts/codicon.json
+++ b/qtawesome/fonts/codicon.json
@@ -102,6 +102,7 @@
     "error": "0xea87",
     "exclude": "0xeae5",
     "expand-all": "0xeb95",
+    "export": "0xebac",
     "extensions": "0xeae6",
     "eye": "0xea70",
     "eye-closed": "0xeae7",
@@ -139,6 +140,7 @@
     "go-to-file": "0xea94",
     "grabber": "0xeb02",
     "graph": "0xeb03",
+    "graph-left": "0xebad",
     "gripper": "0xeb04",
     "group-by-ref-type": "0xeb97",
     "heart": "0xeb05",
@@ -172,6 +174,7 @@
     "loading": "0xeb19",
     "location": "0xeb1a",
     "lock": "0xea75",
+    "magnet": "0xebae",
     "mail": "0xeb1c",
     "mail-read": "0xeb1b",
     "markdown": "0xeb1d",
diff --git a/qtawesome/fonts/codicon.ttf b/qtawesome/fonts/codicon.ttf
index 82acc89..42c536e 100644
Binary files a/qtawesome/fonts/codicon.ttf and b/qtawesome/fonts/codicon.ttf differdiff --git a/qtawesome/iconic_font.py b/qtawesome/iconic_font.py
index 0f4d623..677d144 100644
--- a/qtawesome/iconic_font.py
+++ b/qtawesome/iconic_font.py
@@ -38,7 +38,7 @@ MD5_HASHES = {
     'fontawesome5-brands-webfont.ttf': 'ed2b8bf117160466ba6220a8f1da54a4',
     'elusiveicons-webfont.ttf': '207966b04c032d5b873fd595a211582e',
     'materialdesignicons-webfont.ttf': 'f51112347be6b44f9ef46151a971430d',
-    'codicon.ttf': '223490291528837216424bf892a36810',
+    'codicon.ttf': 'a6a40fbdf515e76ccb0c7ae56c24d96c',
 }

setupbase.py Outdated Show resolved Hide resolved
@dalthviz dalthviz modified the milestones: v1.0.0, v1.1.0 Sep 25, 2020
@dalthviz
Copy link
Member

Hi @darkvertex we are thinking on doing a release for QtAwesome 1.1.0 soon and we would like to include this work as well as #151 Let us know if you want to help us updating these PRs or if is ok for you if we finish them

Co-authored-by: Daniel Althviz Moré <d.althviz10@uniandes.edu.co>
@darkvertex
Copy link
Contributor Author

Hi @darkvertex we are thinking on doing a release for QtAwesome 1.1.0 soon and we would like to include this work as well as #151 Let us know if you want to help us updating these PRs or if is ok for you if we finish them

That's cool. Sorry that the PR fell through the cracks of my inboxes.

Let me try to update the branch with the latest codicons release. There's been a bunch since the PR was made.

@dalthviz
Copy link
Member

Thank you @darkvertex ! If you need any help let us know 👍

@darkvertex darkvertex changed the title PR: Add Microsoft's Codicons 0.0.7 font PR: Add Microsoft's Codicons 0.0.25 font Oct 14, 2021
@darkvertex
Copy link
Contributor Author

darkvertex commented Oct 14, 2021

Was able to use the update_msc command to update to the latest without hiccups. (Yay!)

I'm not near a graphical Linux environment right now to get you an updated screenshot for you (as I had at the first message.) -- If it matters for the docs, someone please open the icon browser and snap a new one. (I had to edit the column length to fit them without having scrollbars FYI.)

Otherwise I'd say this PR is good to. 🚀

@darkvertex
Copy link
Contributor Author

Hang on, sorry, I just saw there's conflicts. Let me patch those for you...

@darkvertex
Copy link
Contributor Author

darkvertex commented Oct 14, 2021

Ok. No more conflicts. 🧹

@darkvertex
Copy link
Contributor Author

Missed a coma while resolving conflicts. Everything should pass now.

I think that's all. 😅

@darkvertex darkvertex requested a review from dalthviz October 14, 2021 19:28
Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much @darkvertex for helping use update this PR! I left some suggestions but the big one is basically to change codicon.json for codicon-charmap.json to follow the same convention used with the other fonts.

Otherwise this LGTM 👍🏼

README.md Outdated Show resolved Hide resolved
qtawesome/__init__.py Outdated Show resolved Hide resolved
setupbase.py Outdated Show resolved Hide resolved
darkvertex and others added 2 commits October 15, 2021 16:15
Co-authored-by: Daniel Althviz Moré <d.althviz10@uniandes.edu.co>
@darkvertex
Copy link
Contributor Author

Thanks for the review. I incorporated your feedback.

Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much @darkvertex for your help! This LGTM 👍

@dalthviz dalthviz merged commit 56584f4 into spyder-ide:master Oct 18, 2021
@darkvertex darkvertex deleted the add_msc branch March 9, 2022 16:29
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants