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

Model print and compare user customisable style #5866

Merged
merged 3 commits into from May 21, 2018

Conversation

Projects
None yet
4 participants
@elecpower
Copy link
Contributor

elecpower commented May 2, 2018

New feature to allow users the ability to customise the print style via a stylesheet. The main use is for model compare to more clearly highlight differences.
A reuseable simple file editor has been included to manage the customisable file.
The default is a resource file to ensure it is kept in sync with the code and any QT changes. The initial stylesheet version replicates the code.
The customised file is stored in the OS application data folder so it persists across Companion versions.
QT 5 has a number of limitations when using stylesheets.

Fixes #5750

Cosmetic layout fixes.

@elecpower

This comment has been minimized.

Copy link
Contributor Author

elecpower commented May 2, 2018

QStandardPaths::AppDataLocation is only available from QT 5.4 and from the Travis build log looks like we compile against QT 5.3.
As QT 5.10 is available do you have a timeline for upping the supported version for Companion?
If you support the PR and the timeline is too far off I can rework the location code.

@3djc

This comment has been minimized.

Copy link
Contributor

3djc commented May 3, 2018

I have bumped to 5.7 which is what we compile with, but you need to get the update

@elecpower elecpower force-pushed the elecpower:model_print_custom_style branch from ed08645 to a26aea6 May 3, 2018

@elecpower

This comment has been minimized.

Copy link
Contributor Author

elecpower commented May 3, 2018

Is it me but are you sure Travis uses 5.7 as environment variable QT_BASE is set to 53 and the QT Version displays 5.3.2 in the log

@kilrah

This comment has been minimized.

Copy link
Member

kilrah commented May 3, 2018

He just changed it in the 2.2 branch. As he said you need to rebase, cherry-pick or such for the change to be carried into your branch.

@elecpower

This comment has been minimized.

Copy link
Contributor Author

elecpower commented May 3, 2018

Okay got it now. Thanks

@elecpower elecpower force-pushed the elecpower:model_print_custom_style branch from a26aea6 to 35e67ea May 3, 2018

@elecpower elecpower closed this May 3, 2018

@elecpower elecpower reopened this May 3, 2018

@elecpower

This comment has been minimized.

Copy link
Contributor Author

elecpower commented May 4, 2018

Devs can one of you force this PR to rebuild?

@bsongis

This comment has been minimized.

Copy link
Member

bsongis commented May 10, 2018

Would you rebase against 2.2 to have Travis checks?

@elecpower elecpower force-pushed the elecpower:model_print_custom_style branch from 3f3b433 to 1993c89 May 10, 2018

@elecpower

This comment has been minimized.

Copy link
Contributor Author

elecpower commented May 10, 2018

Rebased

@bsongis

This comment has been minimized.

Copy link
Member

bsongis commented May 10, 2018

my mistake ... would you rebase again?

@elecpower elecpower force-pushed the elecpower:model_print_custom_style branch from 1993c89 to 3ef71bd May 11, 2018

@bsongis bsongis merged commit 2f91eba into opentx:2.2 May 21, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bsongis

This comment has been minimized.

Copy link
Member

bsongis commented May 21, 2018

Thanks!

@elecpower elecpower deleted the elecpower:model_print_custom_style branch May 25, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment