Samuel Mehrbrodt
720d79e46a
Fix songbook as first slide display
...
bzr-revno: 2851
2019-03-28 21:19:15 +01:00
Tomas Groth
2ebccbfb91
trunk
2019-03-27 21:33:21 +01:00
Tomas Groth
4e739a3ed9
Disable the presentation console
2019-03-27 21:29:19 +01:00
Tim Bentley
0a2de8e606
fix pep8.5
2019-03-27 19:21:11 +00:00
Tim Bentley
ae2109e509
fix pep8.5
2019-03-27 18:59:03 +00:00
Tim Bentley
b7bb59a837
vlc tests pass
2019-03-27 17:46:12 +00:00
Tim Bentley
6cb16a9f0a
media now works and plays
2019-03-25 21:45:19 +00:00
Tim Bentley
f849b0eeb0
head
2019-03-25 21:24:51 +00:00
Tim Bentley
112fac8baf
Media is now playing again - just
2019-03-24 07:53:19 +00:00
Philip Ridout
8789073eb3
Linting changes
2019-03-17 20:35:11 +00:00
Philip Ridout
573f31fd45
Minor tidy ups
2019-03-17 10:36:12 +00:00
Philip Ridout
eb115a0ad4
More pathlib clean ups
2019-03-17 10:01:52 +00:00
Philip Ridout
7c284ad520
Fix deleting bibles
...
Fixes: https://launchpad.net/bugs/1748719
2019-03-16 21:07:44 +00:00
Philip Ridout
cae0c2eb09
Revert commented code
2019-03-16 10:58:59 +00:00
Philip Ridout
d8644648a4
Fit the logo to the Main Display
...
Fixes: https://launchpad.net/bugs/1819763
2019-03-16 10:26:05 +00:00
Philip Ridout
296adb59a0
Bible import issues
2019-03-16 10:20:46 +00:00
Philip Ridout
e1d2c67f33
HEAD?
2019-03-15 20:56:32 +00:00
Philip Ridout
056b902cf9
PEP8
2019-03-15 20:47:47 +00:00
Philip Ridout
50598e9058
pathlib cleanups
2019-03-10 21:01:39 +00:00
Philip Ridout
07a61c57e6
HEAD
2019-03-09 06:59:19 +00:00
Philip Ridout
87216707d3
Test fixes
2019-03-09 06:58:52 +00:00
eb8864f569
Minor cleanups
2019-03-08 19:53:20 -08:00
Philip Ridout
11aa69c9ac
PEP fixes
2019-03-08 21:25:16 +00:00
Philip Ridout
fc8255d658
PEP fixes
2019-03-08 21:00:16 +00:00
cc4b8e4242
PJLink2 Update U
2019-03-08 07:19:57 -08:00
Tomas Groth
07ebc22fa7
Update the appveyor build script. Fix various bugs that caused the frozen app from working.
...
bzr-revno: 2848
2019-03-07 21:51:00 +01:00
Tomas Groth
b6a36f2324
pep8 fixes
2019-03-07 20:23:04 +01:00
Bob Luursema
490f9bbe15
Fix linting
2019-03-05 22:21:12 +01:00
Bob Luursema
40ceb07f18
Hotfix
2019-03-05 22:02:49 +01:00
Bob Luursema
c68d6dc3de
Fixed bug 1800761
2019-03-05 21:55:37 +01:00
Bob Luursema
2a6378f489
Almost fixed bug 1800761
2019-03-04 21:37:11 +01:00
Tomas Groth
d7e4798b96
trunk
2019-03-04 21:33:43 +01:00
Philip Ridout
07ffb7c0d0
Fix choruses, bridges & etc. being imported as verses in CCLI txt files
2019-03-03 13:32:31 +00:00
Philip Ridout
c761592095
Catch some OSErrors to provide user friendly error messages. Few other minor fixes
...
Fixes: https://launchpad.net/bugs/1650910
2019-03-03 09:49:01 +00:00
Philip Ridout
670c06db60
Add proxy settings button to FTW, ftw refactors, a few fixes!
2019-02-27 21:12:16 +00:00
Tomas Groth
fb02d06a09
make the path of display web file work on frozen apps
2019-02-27 21:17:00 +01:00
Samuel Mehrbrodt
94fa2e912a
Fix songbook as first slide display
2019-02-22 08:34:40 +01:00
Philip Ridout
67be698ad2
Fixes
2019-02-21 21:29:00 +00:00
Samuel Mehrbrodt
fcf4cb1c5c
Merge trunk
2019-02-21 22:26:36 +01:00
Tomas Groth
c241b28039
put debug in the log
2019-02-19 22:38:44 +01:00
Tomas Groth
0d66070879
build both 32 and 64 bit, and add debug print
2019-02-19 21:46:31 +01:00
Philip Ridout
bd99cee8fd
minor changes
2019-02-16 08:57:11 +00:00
Philip Ridout
5a32b40653
pep again!
2019-02-15 22:54:45 +00:00
Philip Ridout
5fdebcb7a6
change select all icons. fix wordwrap
2019-02-15 22:34:53 +00:00
Philip Ridout
de89167a33
url change
2019-02-15 20:56:15 +00:00
Philip Ridout
9b2ef7d8f7
PEP8
2019-02-15 20:47:09 +00:00
Philip Ridout
6d7c19256b
Fixes
2019-02-15 20:22:02 +00:00
Philip Ridout
8bc6cfc1a5
HEAD
2019-02-15 20:12:59 +00:00
Philip Ridout
097225c9d7
Code change for json config file. Titulate themes ftw page
2019-02-15 20:12:28 +00:00
Tomas Groth
aa982492e4
Implement going to the previous serviceitem.
2019-02-15 20:33:43 +01:00
Tomas Groth
b10aa24119
Attempt to fix appveyor tests
2019-02-14 22:19:26 +01:00
Tomas Groth
ad0eacd4f0
merge trunk
2019-02-14 20:49:32 +01:00
Tim Bentley
fc579f120a
Head 2
2019-02-14 19:42:34 +00:00
Tim Bentley
c0d328dc06
Head
2019-02-14 19:40:35 +00:00
Tomas Groth
fa4ec96054
Updated to 2019 in copyright headers
2019-02-14 16:09:09 +01:00
d99c2f6996
Migration from WebKit to Webengine. Also introduced reveal.js for slide rendering, new screen setup dialogs and many other changes.
...
bzr-revno: 2844
2019-02-14 00:04:30 -07:00
465ff767d6
Fix an unused import and some incorrect patch()s
2019-02-13 14:36:37 -07:00
Tomas Groth
5ac8bbc3f2
Even more pep8 fixes and removed the old htmlbuilder.
2019-02-13 22:19:24 +01:00
Tomas Groth
27f37df7e8
More pep8 fixes
2019-02-13 21:54:35 +01:00
Tomas Groth
31ed94d88c
pep8 fixes
2019-02-13 21:28:10 +01:00
Tomas Groth
927b68dc95
Fix more tests
2019-02-13 20:41:10 +01:00
Tomas Groth
2219f1f65f
Updated reveal.js to 3.7.0
2019-02-11 21:34:20 +01:00
Samuel Mehrbrodt
99f0d37253
Remove blank lines
2019-02-08 14:39:40 +01:00
Samuel Mehrbrodt
cf8feead1b
Merge trunk
2019-02-08 12:22:39 +01:00
Kyle Nweeia
652b94e1ac
Fixed bug #1678632 - SongSelect Importer Infinite Loop.
...
bzr-revno: 2843
Fixes: https://launchpad.net/bugs/1678632
2019-02-06 21:34:55 +01:00
Tomas Groth
2e93377cd3
Fix a few tests.
2019-02-06 21:26:33 +01:00
Philip Ridout
4ea2578cff
Rework FTW to use ScreeenSelectionWizard
2019-02-06 20:07:01 +00:00
Tomas Groth
4489feb935
Added the text slide footer
2019-02-05 22:26:30 +01:00
Tomas Groth
82fa94857f
Fix pagination
2019-02-02 22:02:33 +01:00
Tim Bentley
8de6ff8832
Fixed trunk merge so now matches that.
2019-01-31 21:34:20 +01:00
Tomas Groth
128ae7948b
Workaround for image thumbnails not being displayed correctly in the slidecontroller.
2019-01-30 21:11:32 +01:00
62b0eedfc6
Get Pyro working again
2019-01-30 00:18:03 -07:00
64251747fb
HEAD
2019-01-29 10:27:34 -07:00
Tim Bentley
5c9e47d977
Add settings tab
2019-01-28 08:31:37 +00:00
Tomas Groth
728dcfba78
Fixed a traceback when saving in the screentab.
2019-01-27 21:01:02 +01:00
Tim Bentley
2f43ec5cf0
more fixes
2019-01-27 16:33:12 +00:00
Tim Bentley
2cae002824
cleanups
2019-01-27 14:52:06 +00:00
Tim Bentley
f1c7664125
Merge media trunk and fix up
2019-01-27 14:42:23 +00:00
Philip Ridout
af41798128
Make screen selection reusable
2019-01-26 08:17:07 +00:00
Tim Bentley
77f84e2b95
More stream stuff
2019-01-20 21:54:26 +00:00
Tim Bentley
469a888563
clean ups and settings
2019-01-20 17:58:41 +00:00
Tim Bentley
168efffb60
Move settings
2019-01-20 16:20:45 +00:00
Tim Bentley
8ed4216975
settings updates
2019-01-20 09:29:47 +00:00
Tim Bentley
59d61d6c9b
fix
2019-01-11 20:23:24 +00:00
Tim Bentley
5b7beffe64
fix code
2019-01-10 22:01:07 +00:00
Tim Bentley
e39cad307b
fix code
2019-01-10 21:20:44 +00:00
Tim Bentley
807e6a843d
Fix doc strings
2019-01-08 19:30:28 +00:00
Tim Bentley
5299cc27f5
pep8
2019-01-04 20:50:40 +00:00
Tim Bentley
fb978fca99
pep8
2019-01-04 20:39:05 +00:00
Tim Bentley
588fc947c3
pep8
2019-01-04 20:30:34 +00:00
Tim Bentley
392bfba099
pep8
2019-01-04 20:11:12 +00:00
Tim Bentley
c2a03e205d
try again
2019-01-04 18:21:38 +00:00
Tim Bentley
26f549cd9e
try again
2019-01-04 18:17:39 +00:00
Tim Bentley
72cd432f10
try again
2019-01-04 18:11:15 +00:00
Tim Bentley
f0108d89fc
try again
2019-01-04 18:05:17 +00:00
Tim Bentley
da73e2f762
for fixes
2019-01-03 22:08:13 +00:00
Tim Bentley
df3bbc1ec0
fixes
2019-01-01 16:04:37 +00:00
Tim Bentley
3bfa92cd47
fix bits
2018-12-21 15:42:12 +00:00
Tim Bentley
7be849681a
fix bits
2018-12-21 15:33:46 +00:00
Tim Bentley
0f538250b9
fixes
2018-12-15 08:31:16 +00:00
Tim Bentley
71c1051f88
test fixing
2018-12-13 19:25:20 +00:00
Kyle Nweeia
d086e83656
2018-12-11 21:30:22 -05:00
Tim Bentley
79eca4756a
Fix tests
2018-12-11 21:20:32 +00:00
2f8ad08d1a
HEAD
2018-12-10 09:48:48 -07:00
7012a09812
temporarily fixed theme level
2018-12-10 09:48:26 -07:00
Tomas Groth
0f91ad72fd
Make image preview respect slide-max-height setting
2018-12-07 21:27:33 +01:00
Tomas Groth
22fc6f746f
Fix images
2018-12-06 21:26:35 +01:00
Tomas Groth
a5443bf308
Quick fix for a traceback
2018-12-06 20:52:16 +01:00
Tim Bentley
c7fe441087
Fix tests and code
2018-12-02 10:19:07 +00:00
Tim Bentley
65fb592d1f
Fix tests and code
2018-12-02 09:20:06 +00:00
Tim Bentley
c1a1ac58ba
Fix tests and code
2018-12-02 09:03:01 +00:00
Tim Bentley
c24fb0cb59
Fix tests and code
2018-12-02 08:39:53 +00:00
Tim Bentley
95bdfc1f64
head
2018-12-01 14:10:47 +00:00
Tim Bentley
a7cd0a9370
fix sound
2018-12-01 14:10:28 +00:00
Tim Bentley
34e4301f53
audio now works
2018-12-01 12:19:01 +00:00
f9adf856f1
HEAD
2018-11-30 22:54:20 -07:00
e58e0ee485
Fix all the tests
2018-11-30 22:52:49 -07:00
Tim Bentley
6228ed89b6
Cleanups
2018-11-20 21:41:23 +00:00
Tim Bentley
a3d0dc28de
More missing lib fixes and MediaInfo cleanup
2018-11-18 17:29:47 +00:00
56f76b1179
Fixed up some more tests
2018-11-15 21:34:49 -07:00
Tomas Groth
a1c4374b1d
Fix hang in powerpointcontroller
2018-11-13 22:41:45 +01:00
Philip Ridout
0271962d6d
a 'fix' for presenation previews
2018-11-13 21:00:14 +00:00
a1e4a5d006
HEAD
2018-11-13 07:39:34 -07:00
16027a43a9
Fixed a couple tests
2018-11-12 22:42:43 -07:00
Tomas Groth
ffb673a3d4
Some fixes for powerpoint presentation. Still some work to do...
2018-11-12 21:15:50 +01:00
Philip Ridout
d9d0a917fd
head
2018-11-10 08:09:10 +00:00
Philip Ridout
692a386387
Initial widification
2018-11-10 06:26:19 +00:00
Tomas Groth
3766ec3643
Fixed a few URIs and display on multiple vs single monitor
2018-11-09 16:31:33 +01:00
Tomas Groth
79fba1b4c9
Do some rewirering of alerts.
2018-11-08 22:06:35 +01:00
Tomas Groth
3fbfd7592b
Fix a traceback when going live with presentation
2018-11-06 22:00:58 +01:00
Tomas Groth
14a3239a6e
Reintroduce the display_on_monitor setting.
2018-11-06 21:39:09 +01:00
Tomas Groth
d0eebc09df
Always use display_geometry for displays.
2018-11-06 20:41:27 +01:00
Tomas Groth
dfa10b42bb
Hack to get theme screenshot working
2018-11-06 19:55:34 +01:00
Tim Bentley
77613086bf
error message update
2018-11-04 20:23:25 +00:00
Tim Bentley
0540453892
Clean up error handling
2018-11-04 17:13:56 +00:00
4c103e4305
Fix the problem where the slides were being incorrectly indexed
2018-11-02 22:48:43 -07:00
4506e78a1c
Fix a problem where going back to fullscreen wasn't working
2018-11-02 21:32:09 -07:00
76d1fefaba
Fix the problem with the custom vs display geometries
2018-11-02 21:23:15 -07:00
Tomas Groth
953ed2606b
Implement blanking.
2018-11-02 20:01:38 +01:00
Tim Bentley
0694d1b3d0
Stop media crashing
2018-11-01 20:51:42 +00:00
Tomas Groth
38c9514b80
Make tests runnable and clean up a bit
2018-10-30 21:12:16 +01:00
Tomas Groth
e7526f1e59
merge trunk
2018-10-30 20:46:55 +01:00
Tomas Groth
b45de5a7dd
Improve saving and loading of service files.
2018-10-28 22:16:00 +01:00
Tomas Groth
4d8661b669
Improve service loading
2018-10-28 17:34:17 +01:00
Tomas Groth
055d165830
Fixed loading and viewing presentations.
2018-10-28 07:28:33 +01:00
Bastian Germann
191273fbe8
Remove unused imports
2018-10-27 13:05:41 +02:00
Bastian Germann
6aa998edd0
Replace PyICU with PyQt's QCollator
...
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
2018-10-27 12:50:15 +02:00
df3b3520ff
Fix up some tests and things
2018-10-26 23:01:13 -07:00
Tim Bentley
26a9b2430d
Head
2018-10-27 07:00:51 +01:00
Tim Bentley
b09a3a5b5a
minor
2018-10-27 06:58:03 +01:00
dc5a9590ba
Fix up some more linting issues
2018-10-26 21:13:33 -07:00
417912aae2
Fix the tests
2018-10-26 18:53:43 -07:00
d1c4cea777
Fix linting issues
2018-10-26 18:40:20 -07:00
ec479e589b
Fix a bunch of linting issues (which should also help resolve other circular dependencies)
2018-10-26 16:15:31 -07:00
Tim Bentley
bcd917d360
finish plugin migartion and clean up main window
2018-10-26 20:30:39 +01:00
Tim Bentley
20dc4f81ed
fix plugin loading
2018-10-26 19:30:59 +01:00
4bed8eabed
Attempt to remove/reduce circular imports
2018-10-26 11:26:12 -07:00
02e1263d20
Fix a merge issue
2018-10-25 19:17:28 -07:00
80c57a9c6d
HEAD
2018-10-25 19:15:25 -07:00
Tim Bentley
9546c1d9bf
Head
2018-10-25 17:38:39 +01:00
Tim Bentley
59c5c7bed7
more cleanups
2018-10-25 17:37:12 +01:00
Philip Ridout
a867c54b94
HEAD
2018-10-24 22:02:06 +01:00
Tomas Groth
7f5bd854db
2018-10-24 22:10:32 +02:00
Phill
891f1dc397
Migrate bibles to use the centeral proxy settings. Upgrade settings and bible meta data accordingly.
...
bzr-revno: 2837
2018-10-24 20:35:22 +01:00
Tomas Groth
8ad8eeb60d
Update some header years.
2018-10-24 20:44:17 +02:00
Bastian Germann
cd5939eb3b
This fixes setuptools' dependencies according to scripts/check_dependencies.py.
...
The minimum Python version is set to 3.6 because this was agreed to on the mailing list.
Some packages which are optional in the source are declared as optional (uno, pyenchant, pyodbc).
To overcome a module conflict, openlp.py is replaced with run_openlp.py which setuptools installs as /usr/bin/openlp (or openlp.exe on Windows).
Additionally, pyxdg is replaced with appdirs (see License violations issue).
bzr-revno: 2836
2018-10-24 20:22:28 +02:00
Tim Bentley
9c30b2e5a9
More plugin state cleanups
2018-10-23 17:43:52 +01:00
Philip Ridout
aa744e0d99
PEP fixes
2018-10-22 21:42:25 +01:00
Philip Ridout
bdec3f407b
Remove proxy settings from individual bibles and use the centeral OpenLP proxy server settings.
2018-10-22 21:17:55 +01:00
Tomas Groth
27dfa68240
Fixed actual creation of themes. Thumbnail creation does not work yet.
2018-10-21 22:12:53 +02:00
Tim Bentley
c08347ca3e
more fixes
2018-10-21 16:35:59 +01:00
Tim Bentley
bc7b772ed2
head
2018-10-20 15:43:33 +01:00
Tim Bentley
1d4a414240
more state stuff
2018-10-20 15:41:32 +01:00
a3f2030349
PJLink2 Update T and pep8
2018-10-19 21:33:32 -07:00
Bastian Germann
e458622fcc
Revert the mediainfo upstreaming
...
Keep the pymediainfo dependency for later
2018-10-16 22:58:39 +02:00
Bastian Germann
0484d0bf23
Move the openlp.__main__ module to run_openlp
2018-10-16 22:07:00 +02:00
Bastian Germann
b11079526d
Decode byte string for MediaInfo
2018-10-16 21:24:47 +02:00
Bastian Germann
45a1c3d3f1
Find macOS problem
2018-10-16 21:07:31 +02:00
Bastian Germann
dd346487f5
Find macOS problem
2018-10-16 20:55:25 +02:00
Bastian Germann
ddc66fcd2f
Try to fix macOS tests
2018-10-16 20:32:30 +02:00
Bastian Germann
7eafbac68d
Make Code-Analysis happy
2018-10-16 09:29:58 +02:00
Bastian Germann
b5e717a0bd
Make Code-Analysis happy
2018-10-16 09:18:48 +02:00
Tomas Groth
66ce7db46f
Fixed the theme layout preview and made preview widget scaling use HTML scaling.
2018-10-13 22:55:36 +02:00
Tim Bentley
92492ab0e8
initial phase of vlc and statemanagement
2018-10-13 11:24:01 +01:00
Bastian Germann
ba01cd35e1
Optionally depend on launchpadlib
2018-10-13 00:11:04 +02:00
Tomas Groth
bb9aa4a561
Initial support for transparent backgrounds.
2018-10-12 21:51:51 +02:00
Bastian Germann
e124229040
Try to fix CI
2018-10-11 20:25:53 +02:00
Bastian Germann
0e61b22a10
Add OFL for FontAwesome
2018-10-11 00:05:02 +02:00
Bastian Germann
5f23d3adea
Use appdirs instead of pyxdg
...
appdirs is used for all systems except Windows.
It has Windows support, so it could be used there as well.
2018-10-08 01:34:00 +02:00
Bastian Germann
bd3015babf
Media plugin checks for libmediainfo
2018-10-08 00:05:04 +02:00
Bastian Germann
79e7ea487f
Correct the help message
2018-10-07 23:40:36 +02:00
Tomas Groth
2fb0050531
Fixed some crashes when creating a new theme. Still some work to do...
2018-10-07 22:36:04 +02:00
Bastian Germann
d1e1975394
Use upstream pymediainfo
...
Current pymediainfo versions load a DLL/so. Use a very thin
wrapper to make sure that the executable is used if the DLL
is not available.
2018-10-07 02:24:29 +02:00
Bastian Germann
4784cdf152
Reapply OpenLP's changes to pymediainfo
2018-10-07 01:00:18 +02:00
Bastian Germann
7fb3ad4e9e
Reimport pymediainfo with its correct license
...
The mediainfoWrapper.py file was taken from
https://github.com/sbraz/pymediainfo/blob/a24c4b79c5/pymediainfo/__init__.py
and slightly modified.
It is licensed undre MIT but the license information was not copied.
Instead it was relicensed as GPLv2 with OpenLP's default copyright.
This is the original version.
2018-10-07 00:44:01 +02:00
Bastian Germann
9f6b03047b
Support running ./setup.py test
...
setuptools can run tests. Use nose2 to run the tests.
If it is not installed on your system, it is downloaded
and temporarily used.
2018-10-06 22:49:13 +02:00
Bastian Germann
0b1ba4ba6d
Fix setup's requirements
...
Move the startup script so that its name does not
conflict with the openlp namespace.
Codify scripts/check_dependencies.py in setup.py.
The name on PyPI is used to declare the dependencies.
This is a first step to enable OpenLP distribution via
PyPI.
The differences are:
* pyenchant and pyodbc are declared optional because
they are optional in the code and pyenchant is not
maintained anymore.
* pyenchant's required version is set to 1.6 not only
for windows. This version is quite old.
* The 5.0 version checks for PyQt5 are left out because
this is the first version anyway.
* LibreOffice's uno does not exist on PyPI
* sqlite3, asyncio and mock are available in Python
>= 3.4 anyway and not noted as dependencies.
* six is not defined as dependency because the code
should be py3 only.
The situation with regards to platform wheels being
published looks quite promising.
As Linux users typically install via their package
manager wheel availability is not as import for them
as for Win or Mac users.
Both of them are available for most dependencies with
native extensions.
The few exceptions:
* PyICU does not publish any platform wheels.
More info: https://github.com/ovalhub/pyicu/issues/79
* mysql-connector-python does not publish win32 wheels.
* pyenchant does not publish win64 wheels.
The wheels are typically available for Py=2.7 and Py>=3.4,
although some (mysql-connector-python, PyQt5, pywin32)
need Py>=3.5
2018-10-03 01:19:49 +02:00
e45be1a50f
Fixed issue where screens were being loaded twice; Fixed an issue where an underlying C++ object was being deleted before the Python object was finished with it
2018-10-01 23:00:25 -07:00
aa3b0c4bcc
HEAD
2018-10-01 21:39:42 -07:00
Tomas Groth
12a2a90ea6
Readded the Renderer class for calculating slide sizes.
2018-09-28 21:33:40 +02:00
