GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Rodrigo Pedra Brum authored Apr 27, 2022 and Jonah Brüchert committed Apr 27, 2022

Attempt to address #88

Disclaimer: I sent the feature request linked above.

This PR adds a setting option to allow the tab bar to be hidden when there is a single tab shown. 

This would allow for a cleaner look when there is just a tab open, which added to the clean look of Angelfish would make it perfect for product screenshots.

I have no previous experience with QML, but I tried to look around similar options to implement it the best way.

Of course suggestions are welcome and I will promptly fix anything wrong if it is within my reach of knowledge.

Lastly, if this not a desired feature to have, there is no hard feelings. It was already fun to look around QML code for the first time.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This makes the desktop entries show up on phosh.

Fixes #85

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"