Merge lp://qastaging/~trb143/openlp/fonts into lp://qastaging/openlp
Proposed by
Tim Bentley
Status: | Superseded | ||||||||
---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~trb143/openlp/fonts | ||||||||
Merge into: | lp://qastaging/openlp | ||||||||
Diff against target: |
53800 lines (+50101/-647) 85 files modified
.bzrignore (+36/-36) openlp/core/api/tab.py (+3/-39) openlp/core/app.py (+1/-0) openlp/core/common/i18n.py (+2/-1) openlp/core/common/registry.py (+1/-0) openlp/core/lib/mediamanageritem.py (+16/-18) openlp/core/lib/serviceitem.py (+16/-8) openlp/core/lib/ui.py (+3/-2) openlp/core/projectors/editform.py (+2/-2) openlp/core/projectors/manager.py (+49/-30) openlp/core/projectors/tab.py (+2/-1) openlp/core/server.py (+7/-6) openlp/core/ui/__init__.py (+1/-1) openlp/core/ui/aboutdialog.py (+3/-3) openlp/core/ui/advancedtab.py (+4/-3) openlp/core/ui/exceptiondialog.py (+7/-7) openlp/core/ui/filerenamedialog.py (+2/-2) openlp/core/ui/firsttimelanguagedialog.py (+2/-2) openlp/core/ui/firsttimewizard.py (+3/-3) openlp/core/ui/fonts/openlp-charmap.json (+11/-0) openlp/core/ui/fonts/openlp.sfd (+49283/-0) openlp/core/ui/formattingtagdialog.py (+5/-5) openlp/core/ui/icons.py (+193/-0) openlp/core/ui/maindisplay.py (+2/-1) openlp/core/ui/mainwindow.py (+31/-30) openlp/core/ui/media/mediacontroller.py (+5/-4) openlp/core/ui/media/playertab.py (+2/-1) openlp/core/ui/plugindialog.py (+2/-2) openlp/core/ui/printservicedialog.py (+9/-9) openlp/core/ui/printserviceform.py (+22/-21) openlp/core/ui/serviceitemeditdialog.py (+2/-2) openlp/core/ui/servicemanager.py (+33/-33) openlp/core/ui/settingsdialog.py (+2/-2) openlp/core/ui/shortcutlistdialog.py (+6/-6) openlp/core/ui/slidecontroller.py (+24/-23) openlp/core/ui/starttimedialog.py (+2/-2) openlp/core/ui/themelayoutdialog.py (+2/-2) openlp/core/ui/thememanager.py (+12/-11) openlp/core/ui/themestab.py (+2/-1) openlp/core/ui/themewizard.py (+2/-2) openlp/core/version.py (+1/-1) openlp/core/widgets/buttons.py (+3/-3) openlp/core/widgets/edits.py (+5/-4) openlp/core/widgets/wizard.py (+6/-5) openlp/plugins/alerts/alertsplugin.py (+5/-4) openlp/plugins/alerts/forms/alertdialog.py (+6/-7) openlp/plugins/bibles/bibleplugin.py (+3/-2) openlp/plugins/bibles/forms/booknamedialog.py (+2/-2) openlp/plugins/bibles/forms/editbibledialog.py (+2/-2) openlp/plugins/bibles/forms/languagedialog.py (+2/-2) openlp/plugins/bibles/lib/mediaitem.py (+8/-7) openlp/plugins/custom/customplugin.py (+2/-1) openlp/plugins/custom/forms/editcustomdialog.py (+2/-2) openlp/plugins/custom/forms/editcustomslidedialog.py (+4/-5) openlp/plugins/custom/lib/mediaitem.py (+4/-3) openlp/plugins/images/imageplugin.py (+2/-1) openlp/plugins/images/lib/mediaitem.py (+16/-16) openlp/plugins/media/forms/mediaclipselectordialog.py (+2/-2) openlp/plugins/media/forms/mediaclipselectorform.py (+4/-7) openlp/plugins/media/lib/mediaitem.py (+13/-15) openlp/plugins/media/mediaplugin.py (+2/-1) openlp/plugins/presentations/lib/mediaitem.py (+4/-6) openlp/plugins/presentations/lib/messagelistener.py (+1/-1) openlp/plugins/presentations/presentationplugin.py (+2/-1) openlp/plugins/songs/forms/authorsdialog.py (+2/-2) openlp/plugins/songs/forms/editsongdialog.py (+2/-2) openlp/plugins/songs/forms/editversedialog.py (+7/-7) openlp/plugins/songs/forms/mediafilesdialog.py (+2/-2) openlp/plugins/songs/forms/songbookdialog.py (+2/-2) openlp/plugins/songs/forms/songmaintenancedialog.py (+14/-14) openlp/plugins/songs/forms/songreviewwidget.py (+2/-2) openlp/plugins/songs/forms/songselectdialog.py (+8/-8) openlp/plugins/songs/forms/topicsdialog.py (+2/-2) openlp/plugins/songs/lib/mediaitem.py (+12/-11) openlp/plugins/songs/songsplugin.py (+3/-2) openlp/plugins/songusage/forms/songusagedeletedialog.py (+2/-2) openlp/plugins/songusage/forms/songusagedetaildialog.py (+2/-2) openlp/plugins/songusage/songusageplugin.py (+5/-6) resources/images/openlp-2.qrc (+12/-145) scripts/check_dependencies.py (+2/-1) scripts/jenkins_script.py (+0/-1) tests/functional/openlp_core/api/test_tab.py (+1/-3) tests/functional/openlp_core/test_version.py (+57/-10) tests/functional/openlp_core/ui/test_icons.py (+50/-0) tests/functional/openlp_plugins/bibles/test_mediaitem.py (+1/-2) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~trb143/openlp/fonts | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenLP Core | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2018-08-04.
Commit message
Ok here it is with a complete conversion.
Jenkins will not run for me so cannot provide the stats.
You need python3-QtAwesome
all png files have been replaced by font awesome fonts.
I have created a small number of new icons. I AM NOT A GRAPHIC DESIGNER so they will need fixing.
I have attempted to standardize the meaning of things but this can be improved.
Can we get this in so that we can then fix things up slowly and then argue over improvements!
Fedora only has version 4.8.3 so the pallet is a bit limited.
To post a comment you must log in.
lp:~trb143/openlp/fonts (revision 2828) /ci.openlp. io/job/ Branch- 01-Pull/ 2560/ [SUCCESS] /ci.openlp. io/job/ Branch- 02a-Linux- Tests/2458/ [SUCCESS] /ci.openlp. io/job/ Branch- 02b-macOS- Tests/240/ [FAILURE] /ci.openlp. io/job/ Branch- 03a-Build- Source/ 147/ [SUCCESS] /ci.openlp. io/job/ Branch- 03b-Build- macOS/133/ [SUCCESS] /ci.openlp. io/job/ Branch- 04a-Code- Analysis/ 1609/ [FAILURE] /ci.openlp. io/job/ Branch- 04b-Test- Coverage/ 1422/ [SUCCESS]
https:/
https:/
https:/
https:/
https:/
https:/
https:/