Tim Bentley
e90fb00ddd
head
2015-12-22 19:07:51 +00:00
Tomas Groth
3507b96d7d
Added pysword to the check_dependencies script.
2015-12-22 15:21:38 +01:00
Tomas Groth
5bbea1685d
trunk with qt5
2015-12-22 14:13:17 +01:00
Tomas Groth
66de29c0f9
Forgot to add the actual importer...
2015-12-22 14:04:32 +01:00
Tomas Groth
f32c7823df
First stab at a pysword based SWORD-importer.
2015-12-22 14:04:01 +01:00
springermac@gmail.com
d9a02f6ada
Migrate to PyQt5
...
bzr-revno: 2576
2015-12-21 21:27:10 +01:00
second@tgc.dk
0baa733c91
Added importer for Lyrix and VideoPsalm + tests.
...
Added support for author-type in importers.
Migrated songselect and songbeamer tests to the SongImportTestHelper based structure.
bzr-revno: 2575
Fixes: https://launchpad.net/bugs/1509550
2015-12-21 09:47:19 +01:00
Jonathan Springer
bee587fa67
merge trunk
2015-12-20 19:43:38 -05:00
Tim Bentley
15f1b61fd4
simplified
2015-12-20 21:30:47 +00:00
Tomas Groth
89ae1ae738
Added tests for LyriX import.
2015-12-20 20:28:14 +01:00
Tim Bentley
2ef0b3b210
remove debugs
2015-12-20 18:00:38 +00:00
Tim Bentley
b728dddaa4
remove slidecontroller
2015-12-20 17:58:24 +00:00
Tim Bentley
8de95e34a0
first merge
2015-12-20 17:24:45 +00:00
Tomas Groth
2a4205c0a1
Migrated songselect and songbeamer tests to the SongImportTestHelper based structure.
2015-12-20 17:46:39 +01:00
Tomas Groth
037d3f4f7d
Added support for author types in tests + some VideoPsalm fixes
2015-12-18 23:24:20 +01:00
Tomas Groth
6eb17b561d
trunk
2015-12-18 21:13:21 +01:00
s.mehrbrodt@gmail.com
12141d6a7e
Small fixes:
...
* Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)
* OpenLP 2.0 -> OpenLP 2
* Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")
* Improve exception dialog (mention that description should be english and relevant files should be attached)
* Do not translate the bug report labels
* Ignore "E402 module level import not at top of file" pep8 errors (added to ...
bzr-revno: 2574
2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt
e6978033e9
PEP8
2015-12-17 22:43:49 +01:00
Tomas Groth
6b8178a0b4
Added support of importing VideoPsalm songbooks.
2015-12-17 22:39:52 +01:00
Samuel Mehrbrodt
020864dd26
PEP8
2015-12-17 22:28:36 +01:00
Samuel Mehrbrodt
0ce6804171
Fix pep8
2015-12-17 21:27:08 +01:00
Jonathan Springer
8327346647
merge trunk
2015-12-16 17:25:41 -05:00
Jonathan Springer
445e755895
Change some keyboard shortcuts to use predefined platform dependent shotcuts from Qt.
...
Display keyboard shortcuts with modifiers in their platform native form.
2015-12-16 17:19:50 -05:00
Tomas Groth
e40d8e7126
Added suport for importing songs exported from Lyrix.
2015-12-15 00:00:57 +01:00
Jonathan Springer
0a935bdb90
merge trunk
2015-12-13 19:21:58 -05:00
springermac@gmail.com
4687d71c50
Fix traceback in mediacontroller if a service item had a processor type of automatic
...
bzr-revno: 2573
2015-12-13 22:59:45 +01:00
Tomas Groth
44a523631e
Only import vlc in one place. Make it work with PyInstaller.
2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt
0d4541b8dc
Merge trunk
2015-12-11 09:33:24 +01:00
Jonathan Springer
ec4ec887ea
Fix CheckMedia player not stopping.
...
Fix duration of zero on first play.
2015-12-10 14:03:57 -05:00
Jonathan Springer
fc3c433a21
Fix failing situation by making default_players a list instead of a string
2015-12-10 12:26:08 -05:00
Jonathan Springer
3108adff17
Add test for failing situation
2015-12-10 12:25:34 -05:00
Tim Bentley
daee9916d6
Allow local stage views
...
bzr-revno: 2572
2015-12-07 22:09:22 +00:00
Jonathan Springer
50c0a173eb
Add settings migration for phonon to system change
2015-12-07 16:41:15 -05:00
Jonathan Springer
baa59f9321
Forgot to uncomment some code
2015-12-07 16:40:45 -05:00
Jonathan Springer
2e23d9919d
Fix system player being used for live-background
2015-12-07 16:40:09 -05:00
Jonathan Springer
ae4858e434
Fix traceback in mediacontroller if a service item had a processor type of automatic
2015-12-07 16:34:10 -05:00
Jonathan Springer
f241aa663d
Add test to reproduce traceback in mediacontroller
2015-12-07 16:31:46 -05:00
Tim Bentley
9a950ea4ab
remove prints
2015-12-05 12:45:51 +00:00
Tim Bentley
dcf97bf93b
head
2015-12-05 12:45:01 +00:00
Tim Bentley
ab18eaa051
fixes
2015-12-05 12:44:37 +00:00
Jonathan Springer
6b35a99775
merge trunk
2015-12-01 17:07:00 -05:00
springermac@gmail.com
08cf14c544
Fix projector tests by removing unneeded patch start calls
...
bzr-revno: 2571
2015-12-01 21:37:15 +00:00
Jonathan Springer
609f5a8512
Fix projector tests
2015-12-01 14:47:46 -05:00
Jonathan Springer
3b3c8a35b6
merge trunk
2015-11-29 17:57:37 -05:00
Jonathan Springer
c964d968ca
Update generate_resources.sh for PyQt5
2015-11-29 17:49:20 -05:00
Jonathan Springer
05a653e670
Make sure all generated pixmaps are show at the proper pixel ratio
2015-11-29 17:48:10 -05:00
Tim Bentley
f1be12e941
Fix missing players when processing service items
...
bzr-revno: 2570
2015-11-29 13:41:29 +00:00
Tim Bentley
6a48bb5ac2
Style fixes
2015-11-28 20:13:16 +00:00
Tim Bentley
3a31f86e84
Head
2015-11-28 17:05:06 +00:00
Tim Bentley
64867b52a8
Add tests for Presentations
2015-11-28 17:04:46 +00:00
