Skip to content
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

Add LibreOffice icons #124

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Add LibreOffice icons #124

merged 2 commits into from
Jun 7, 2024

Conversation

Finii
Copy link
Collaborator

@Finii Finii commented Mar 8, 2024

@hasecilu
Copy link
Collaborator

hasecilu commented Mar 8, 2024

Actually I wanted to also include LibreOffice specific icons here but since they a little complex I decided to not do it and use the generic office icons for this PR: eza-community/eza#565

@Gaspartcho, do you planned other use case apart from terminal? At least we can try to see how would be use them for LibreOffice files, they are very cool indeed.

@Gaspartcho
Copy link

The reason I initially wanted to put these icons was that the text editor I use used the icons from NerdFonts in order to show file icons in the treeview

@hasecilu
Copy link
Collaborator

hasecilu commented Mar 10, 2024

I made a test and this is how it would look like with some different sizes with eza
image
vs
image

Here is the font if you want to test for your use case:

Icon Position
LibreOffice 0xf373
LibreOffice Base 0xf374
LibreOffice Calc 0xf375
LibreOffice Draw 0xf376
LibreOffice Impress 0xf377
LibreOffice Math 0xf378

SymbolsNerdFont-Regular.ttf.zip

@Finii
Copy link
Collaborator Author

Finii commented Mar 10, 2024

My opinion...

The small details that make the icons different are a bit ... small. And hard to discern.
Of course we could enlarge that details.

Otoh I really hate these Microsoft centric icons with p and x 😒

Edit: Also that odf and odg have no file-border while the odp odt ods have is strange.

@hasecilu
Copy link
Collaborator

Of course we could enlarge that details.

Could be useful to make another test

Otoh I really hate these Microsoft centric icons with p and x 😒

Me too.

Edit: Also that odf and odg have no file-border while the odp odt ods have is strange.

The odg is the generic vector icon and odf just sqrt(2), since those extensions are specific to OpenDocument format the LibreOffice icons can be a good fit.

@Finii
Copy link
Collaborator Author

Finii commented Mar 13, 2024

image

Hmm, seeing them irl here, they do not look as bad as expected.

@hasecilu
Copy link
Collaborator

hasecilu commented Apr 5, 2024

I made a test enlarging the writer logo, I think that size is good, details are more easily recognizable. See f.odt2 file icon.

I took file from /usr/share/icons/hicolor/scalable I have LibreOffice 24.2.2-2
image

image

@Finii
Copy link
Collaborator Author

Finii commented Apr 5, 2024

Nice idea 👍

But you change the content itself instead of just scaling up. I'm not sure that it is then still 'the same logo'.
Here a quick n dirty Gimp manipulation with just scaling up the text-and-image thing without further modification.

image

@hasecilu
Copy link
Collaborator

hasecilu commented Apr 5, 2024

The old icons already have 2 years from last update on help module: https://github.com/LibreOffice/help/tree/master/source/media/navigation which is the source from simple-icons

The new ones are here, also from 2 years ago but have these modern, rounded design in core package: https://github.com/LibreOffice/core/tree/3ca12a07335e1e9ae6b64491faaab6a46e9c4db5/sysui/desktop/icons/hicolor/scalable/apps

Branding page: https://wiki.documentfoundation.org/Design/Branding

See difference:

Edit: Testing branch -> https://github.com/hasecilu/font-logos/tree/test/libreoffice

Previous icons are not rounded but their elements are slightly bigger.
image

@hasecilu
Copy link
Collaborator

This is a comparative of different small sizes with the both group of icons.

The first pack of logos are the older ones at original scale, the second pack contains the newer logos with an increase in the central glyphs to make it more differentiable at small scales (as would be expected on most terminal emulators).

In the first pack the glyphs are well centered, in the second pack seems to be a more like in the bottom because of the top corner cut.

image

@Finii
Copy link
Collaborator Author

Finii commented May 29, 2024

Excellent.
I went through their icons and you are right they changed them a bit.

I believe they (your modified icons) look very good.

Just some comment (of course 😉 )

image

  • The blank file black block has more room in the bottom than in the top, maybe move down 'a pixel'
    Even with small sizes I noticed that immediately.
  • And I like the distance between symbol and border for draw (square, triangle, circle) better than the other icons where the symbol feels more down. Yes the other symbols are taller, but maybe we can nudge them a bit up. I guess they will not yet collide with the folded corner thing. Esp 'math' and 'database' (?) seem very low and still the is space in the top.

Nice work! 👍

Edit: Add this image from 'afar':

image

@Finii
Copy link
Collaborator Author

Finii commented May 29, 2024

I guess you should just cherry pick your commits into this branch. After tweaking if you like. 🐱
Then we have later on this discussion linked with the commits.

@hasecilu hasecilu force-pushed the feature/add-libreoffice branch 2 times, most recently from a830c80 to 2515332 Compare June 5, 2024 17:11
@hasecilu
Copy link
Collaborator

hasecilu commented Jun 5, 2024

I modified the main (effectively with one extra pixel in height), base and math icons, now look better. The impress and writer icons I think are ok-ish, maybe to move up a little the calc icon, what do you think?

@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

Just git organizational:
Replace merging in master into this branch by rebasing on master, making the commit line much more easy.
Force push.

Just to clean up the commit log, no change except that now we also have the updated FreeCad logo in this and and continue with a simple fastforward or the likes.

Edit:
To continue with your local repo you need something like git fetch && git reset --hard origin/feature/add-libreoffice or so, to pull in the force push. If you need this hint at all.

Old:
image

New:
image

@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

This all looks excellent!

But as you ask, yes, Calc could go up a bit.

image

@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

Unrelated:
Hmm, just noticed this while building...

image

@hasecilu
Copy link
Collaborator

hasecilu commented Jun 6, 2024

To continue with your local repo you need something like git fetch && git reset --hard origin/feature/add-libreoffice or so, to pull in the force push. If you need this hint at all.

Thanks, I tried rebasing and somehow messed history.

I tweaked cal, draw, impress & math to make them to be at about 3.1px from the bottom. No central glyph overpass the start of the corner diagonal.

image


About the build message and don't get it using aur/wkhtmltopdf-static from AUR

$ wkhtmltoimage --version
wkhtmltoimage 0.12.6.1 (with patched qt)

@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

I think this looks excellent!!

Marking this as ready.


I tried rebasing and somehow messed history.

To be honest I did not rebase either, but did

$ git reset --hard origin/master
$ git cherry-pick 580fc1f6573307aa643aaccfb092c226f6691b2a 
$ tig
$ git cherry-pick 2515332f1c82f9ecde38e59e430ecbd4701d4fe2
$ git status
$ vi icons.tsv
$ git add icons.tsv
$ git cherry-pick --continue
$ tig
$ git diff origin/feature/add-libreoffice
$ tig
$ git push --force-with-lease

You see I love tig ;-)

@Finii Finii marked this pull request as ready for review June 6, 2024 19:06
@Finii Finii changed the title WIP: Add LibreOffice icons Add LibreOffice icons Jun 6, 2024
@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

About the build message and don't get it using aur/wkhtmltopdf-static from AUR

$ wkhtmltoimage --version
wkhtmltoimage 0.12.6.1 (with patched qt)

Hmm, our CI also has 'my' problem:

image

I will check that, if I do not forget ;-)

There seem to be also some old actions that need update... Maybe. Or did we do that already? I thought all repos I do the CI for have been updated meanwhile ;-)

image

@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

Smuggling unrelated fix in ;-D

@hasecilu
Copy link
Collaborator

hasecilu commented Jun 6, 2024

You see I love tig ;-)

Didn't know about that tool, personally I use lazygit TUI, very handy to reword, ammend, cherry-pick, etc.

So, we just need to squash the fixup! commit...
This is the log of lazygit for "Apply fixup commits..." action
image

@Finii
Copy link
Collaborator Author

Finii commented Jun 6, 2024

Ah :-)

I do all git commands by hand, maybe I am too old. git rebase -i and then just set the commits to s for squash.
tig I use for git log and git show and occasionally for git blame. But then often the original git commands are more powerful (esp in case of log).

Coworkers get the zine "Oh shit, git" from me :-D and in the coffee kitchen hangs her git command list

https://wizardzines.com/zines/oh-shit-git/
Can't find the command list right now...

You merge this I presume? I can not formally approve because it is my own PR.

@hasecilu hasecilu self-requested a review June 6, 2024 22:57
Copy link
Collaborator

@hasecilu hasecilu left a comment

Choose a reason for hiding this comment

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

All SVGs seems to be fine, and render fine on viewers and terminal.
I removed the "WIP: " from the commit.

@hasecilu
Copy link
Collaborator

hasecilu commented Jun 6, 2024

Ah :-)

I do all git commands by hand, maybe I am too old. git rebase -i and then just set the commits to s for squash. tig I use for git log and git show and occasionally for git blame. But then often the original git commands are more powerful (esp in case of log).

Coworkers get the zine "Oh shit, git" from me :-D and in the coffee kitchen hangs her git command list

https://wizardzines.com/zines/oh-shit-git/ Can't find the command list right now...

You merge this I presume? I can not formally approve because it is my own PR.

I tend to use a bunch of aliases but when commands become long & scary I prefer to use TUI

@Finii
Copy link
Collaborator Author

Finii commented Jun 7, 2024

Here's the thing I hung in our coffee kitchen ;-D

git-cheat-sheet.pdf

Finii and others added 2 commits June 7, 2024 06:46
The request originally originate from

ryanoasis/nerd-fonts#1527

by @Gaspartcho

but where updated to the new LibreOffice logos,
manually optimized.

See PR #124

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
Co-authored-by: hasecilu <hasecilu@tuta.io>
[why]
Because we want to use Node 20 etc pp

[how]
Just use the latest major version.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
@Finii
Copy link
Collaborator Author

Finii commented Jun 7, 2024

Just changed the commit message slightly.

Working / collaborating on the PR was nice 💚

git fetch
git checkout feature/add-libreoffice
git reset --hard origin/feature/add-libreoffice
tig
git rebase -i HEAD~3
git push --force-with-lease

In the interactive rebase, tag the main commit with e (edit) and edit the commit message.

Which now also references the PR, so we do not need a merge commit anymore (which I usually create only to have some backlink to the PR discussions. Which already also bite me several times, as the repo moved from one platform to another (stash -> gitlab -> github) and thus the discussed information is lost forever - should probably been in the commit message 😒 ).

@Finii Finii merged commit 8eb711b into master Jun 7, 2024
Finii added a commit that referenced this pull request Jun 7, 2024
The request originally originate from

ryanoasis/nerd-fonts#1527

by @Gaspartcho

but where updated to the new LibreOffice logos,
manually optimized.

See PR #124

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
Co-authored-by: hasecilu <hasecilu@tuta.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants