quelea-projection / Quelea

Open source projection software for churches.
https://quelea.org
GNU General Public License v3.0
154 stars 145 forks source link

Add preference option to allow song information to appear on first, last or all slides #634

Closed bezchmurny closed 6 months ago

bezchmurny commented 6 months ago

Feedback most welcome.

I have left the main "show" option in place as it's tied in all over the place; this adds to it rather than replaces it.

bezchmurny commented 6 months ago

Added a fix to LyricDrawer based on feedback from @berry120

bezchmurny commented 6 months ago

Cleaned up imports in LyricDrawer whilst correcting an IntelliJ automatic change.

DeeTigIT commented 6 months ago

This seems not stable, yet:

bezchmurny commented 6 months ago

OK, I'm pretty sure this'll be down to something I've done in the preferences pane.

Are you using English (GB), Polish (PL) or another language out of interest?

bezchmurny commented 6 months ago

OK, I'm pretty sure this'll be down to something I've done in the preferences pane.

Are you using English (GB), Polish (PL) or another language out of interest?

I've reproduced this in French (FR). I never tested it against a language where I hadn't added in labels (lesson learned). I'll take a look tomorrow and see what I missed.

bezchmurny commented 6 months ago

Heh. So the use of the LabelGrabber#getEngKey() method of dealing with preferences relies on the keys being there in the current language file. The H/V position properties suffer this same issue in for example Punjabi (PJ).

I'll sleep on whether I make the method more fancy (riskier but more correct) or just add the placeholders in to all languages...!

bezchmurny commented 6 months ago

P.S. @DeeTigIT thanks for catching that before it goes to a release version, much appreciated!!

DeeTigIT commented 6 months ago

Van: Stephen Sharpe @.> Verzonden: dinsdag 2 januari 2024 22:57 Aan: quelea-projection/Quelea @.> CC: DeeTigIT @.>; Comment @.> Onderwerp: Re: [quelea-projection/Quelea] Add preference option to allow song information to appear on first, last or all slides (PR #634)

OK, I'm pretty sure this'll be down to something I've done in the preferences pane.

Are you using English (GB), Polish (PL) or another language out of interest?

— Reply to this email directly, view it on GitHub https://github.com/quelea-projection/Quelea/pull/634#issuecomment-1874614913 , or unsubscribe https://github.com/notifications/unsubscribe-auth/AJQJIFGT27WZGF5PU2V6K2DYMR7ERAVCNFSM6AAAAABBJHGYFSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZUGYYTIOJRGM . You are receiving this because you commented. https://github.com/notifications/beacon/AJQJIFDVT4IHETTOWNQYZQ3YMR7ERA5CNFSM6AAAAABBJHGYFSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPXRNIC.gif Message ID: @. @.> >

DeeTigIT commented 6 months ago

You’re welcome!

Van: Stephen Sharpe @.> Verzonden: dinsdag 2 januari 2024 23:27 Aan: quelea-projection/Quelea @.> CC: DeeTigIT @.>; Mention @.> Onderwerp: Re: [quelea-projection/Quelea] Add preference option to allow song information to appear on first, last or all slides (PR #634)

P.S. @DeeTigIT https://github.com/DeeTigIT thanks for catching that before it goes to a release version, much appreciated!!

— Reply to this email directly, view it on GitHub https://github.com/quelea-projection/Quelea/pull/634#issuecomment-1874639517 , or unsubscribe https://github.com/notifications/unsubscribe-auth/AJQJIFH6VTDMEZDVNQJ6GZTYMSCTPAVCNFSM6AAAAABBJHGYFSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZUGYZTSNJRG4 . You are receiving this because you were mentioned. https://github.com/notifications/beacon/AJQJIFC6WMVGYSAHLWC6RLDYMSCTPA5CNFSM6AAAAABBJHGYFSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPXS5J2.gif Message ID: @. @.> >

bezchmurny commented 6 months ago

@DeeTigIT I believe this should now be fixed - have pushed a small change in another PR; please check if you have a moment.

DeeTigIT commented 6 months ago

Hello Stephen,

I’ll check if a new CI release will published this evening. And then test it.

Best regards,

Dirk

Van: Stephen Sharpe @.> Verzonden: woensdag 3 januari 2024 19:08 Aan: quelea-projection/Quelea @.> CC: DeeTigIT @.>; Mention @.> Onderwerp: Re: [quelea-projection/Quelea] Add preference option to allow song information to appear on first, last or all slides (PR #634)

@DeeTigIT https://github.com/DeeTigIT I believe this should now be fixed; please check :)

— Reply to this email directly, view it on GitHub https://github.com/quelea-projection/Quelea/pull/634#issuecomment-1875766275 , or unsubscribe https://github.com/notifications/unsubscribe-auth/AJQJIFEU6O3QY7GTC6I6MUDYMWM6TAVCNFSM6AAAAABBJHGYFSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZVG43DMMRXGU . You are receiving this because you were mentioned. https://github.com/notifications/beacon/AJQJIFCIIDM3CDH3ZXG2ONDYMWM6TA5CNFSM6AAAAABBJHGYFSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPZXWAG.gif Message ID: @. @.> >

DeeTigIT commented 6 months ago

My compliments, the setting works now as expected. And is also saved between Quelea sessions. Thanks!