-
-
Notifications
You must be signed in to change notification settings - Fork 461
chore(color): conversion helper tool and file cleanup #6781
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
318205f to
dca4592
Compare
dca4592 to
3c30b4c
Compare
|
Ok, so finally looking at this @JimB40 🤣 I think you had doubled up on the CSV/script file... I think I've rebased this to make it merge-ready again (and hopefully didn't break something), removed those extra files, I then run If everything looks ok to you, should be right to merge. If that old script was just my earlier one modified, don't think there is any need to keep that... better to not add two scripts doing basically the same job - any changes needed can be made to yours as time goes on ;) |
|
Hey thx. Hasn't noticed I left png-radio-fw.sh & png_radio_fw_list.csv |
|
Thanks for that. Yes, my bad, the png_radio_fw just had some things convert_gfx, didn't, so added that in, and changed it to a Python script as it was already a bit long for a shell script (plus python lets you do a lot of platform-agnostic stuff in an easy to maintain manner). It now also (among other things I probably forgot):
I'll stop fiddling with it now, and we can add to it more and make changes as time progresses. |
If you really want to make changes, you can do just and (or technically, just the second, with respect to the first - see the note about keeping them in the same order) and I can probably figure out a not so painful way to do the rest (in anoher PR - let's keep this specific to the graphics and conversion helper). |
ad9ffaa to
b5ec540
Compare
1. changed img-src files names & folder structure - files follows naming <bmp_|mask_><type_><name>.svg scheme that follows Figma UI Design scheme - bmp_ & mask_ prefix defines PNG type - no subfolders to simplify PNG generation & review - all SVG vector sources simplified end re-exported to img-src 2. Replaced PNG - PNGs now have new names - unused PNGs are removed - conversion done using rsvg-convert for smaller size 3. Modified CMakeList.txt - simplified 4. Modified *.cpp - all *.cpp with *.lbm references are updated to reflect naming change - _BuiltinIcon names left untouched to avoid conflicts (lots of changes in code) 5. tools script to convert SVG to PNG - changed name to convert-gfx - added --resvg param to force using resvg insted of rsvg-convert (testing)
1. add missing Favourite PNGs for EdgeTX#6753 2. added --update parameter to script - CSV now keeps track of SVG modification date - running ./convert-gfx.sh --make all --update will only re-genarate PNGs for SVG s with newer modification date that the one in CSV
Note: on MacOS
This reverts commit 3c30b4c and deletes the other two scripts instead.
OS agnostic and easier to maintain as the script gets more complex
Was going to add it during another PR, but here is as good as any place.
Also remove ANSI formatting in preference to rich formatting and duration
Also de-duplcate CSV handling and minor cleanups
… output Check for orphaned PNGs when validating rather than needing to use cleanup in `--dry-run` mode. SVGs are already checked against CSV so nothing more is needed there. Also turn off rich's syntax highlighting as this was triggering number and keyword highlighting.
b5ec540 to
107f71b
Compare

This PR
Summary of changes:
Other PRs @pfeerick