Commit Graph

13352 Commits

Author SHA1 Message Date
Tomas Groth
529f94c504 Remove old pyinstaller hooks which has been moved to the packaging branch 2014-11-07 09:26:16 +01:00
435a299b19 First (failed) stab at using threads correctly. 2014-11-06 23:08:56 +02:00
Ken Roberts
a45befd8e5 Update resources.py with projector icons 2014-11-06 10:33:30 -08:00
Tomas Groth
f685572da2 Improved FTW handling of connection issues 2014-11-06 14:19:00 +01:00
Tomas Groth
bc8afc9e4f Update thememanager widget after theme import 2014-11-06 14:16:14 +01:00
Tomas Groth
8f4ccc5426 Close db session after import to unlock file on windows 2014-11-06 14:14:05 +01:00
Tomas Groth
ff4ddefa77 pep8 fix 2014-11-06 10:42:54 +01:00
Tomas Groth
b6e0036383 Re-re-fix duplicate song check on windows, and now it actually works in builds. 2014-11-06 10:34:07 +01:00
Tomas Groth
992ac3bbb8 Second attempt to fix duplicate-song-detection on windows 2014-11-05 21:44:45 +00:00
Tomas Groth
02a159bf65 Added one more test file for WoW import 2014-11-05 14:04:43 +01:00
Tomas Groth
77c7da2d20 Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth
af6a5322e2 Make it possible to break out of waiting loop 2014-11-04 12:58:03 +01:00
Tomas Groth
88e4c2e0b9 Try to fix 0 track length by waiting. Fixes bug 1387293
Fixes: https://launchpad.net/bugs/1387293
2014-11-03 20:30:43 +00:00
Tomas Groth
51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Tomas Groth
2ed5f2bbe4 Fix for import of Words of Worship file 2014-11-03 11:03:53 +01:00
Phill Ridout
f160607e17 Renamed some methods 2014-11-02 19:57:06 +00:00
Phill Ridout
9c6e007ed3 Applied changes as superfly suggested 2014-11-02 19:32:40 +00:00
Phill Ridout
985717edb4 HEAD 2014-11-02 18:26:07 +00:00
Philip Ridout
fbeb0222a8 Fix release tag checker for 2.1.1
bzr-revno: 2439
2014-11-02 17:49:14 +00:00
Phill Ridout
2b710a82ab Correct tag 2014-11-02 17:41:04 +00:00
Phill Ridout
3218ae8cae Added 2.1.1 tag 2014-11-02 17:31:06 +00:00
Phill Ridout
b119cc40be HEAD 2.1.1 release 2014-11-02 17:19:27 +00:00
Phill Ridout
b464b5613c pep fixes 2014-11-02 17:19:02 +00:00
Phill Ridout
b682117f92 Completed tests for ColorButton 2014-11-02 16:50:18 +00:00
Tim Bentley
314101f013 Add back SlideController focus
bzr-revno: 2438
2014-11-01 11:31:21 +00:00
Tim Bentley
616565fe19 Head 2014-11-01 11:12:27 +00:00
b692e11d82 Filter out ampersands and angle brackets
bzr-revno: 2437
2014-11-01 11:11:48 +00:00
Tomas Groth
146a505ee6 #1387286, playing audio CD clips on windows.
#1247025, Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025.
Fix traceback on theme import in windows.

bzr-revno: 2436
2014-11-01 11:09:10 +00:00
Tim Bentley
b20b114a7b test fix 2014-11-01 11:06:17 +00:00
Tim Bentley
6323f8bba7 Add tests 2014-11-01 10:59:45 +00:00
39fa2641af Fixed up an import statement 2014-11-01 12:38:33 +02:00
9f1638959e Fix some more instances of button text 2014-11-01 12:35:54 +02:00
Tim Bentley
ee4bd0f521 head 2014-11-01 07:47:43 +00:00
Tim Bentley
837013763a fix focus 2014-11-01 07:47:26 +00:00
Tomas Groth
6500a4b813 Fix for bug #1387286, playing audio CD clips on windows
Fixes: https://launchpad.net/bugs/1387286
2014-10-31 22:44:22 +00:00
0e46a05ccc Apparently pylint doesnt like blank lines at the end of the file. fussy.
Fixes: https://launchpad.net/bugs/1387309
2014-10-31 22:15:44 +02:00
ee7fb49e49 Fix some linting issues 2014-10-31 22:12:06 +02:00
6a67a77240 Fix bug #1387309: Filter out ampersands and angle brackets 2014-10-31 21:47:36 +02:00
Tomas Groth
74b582032f Fix theme import in windows. Test included. 2014-10-31 13:01:07 +01:00
8f5f20cb1d Two fixes:
- Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it
  - Found a potential bug where the settings form was canceled, with one or more inactive plugins
  - Wrote a test for the above settings form bug

bzr-revno: 2435
2014-10-31 05:29:36 +00:00
69873c0db3 Two fixes:
- Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it
- Found a potential bug where the settings form was canceled, with one or more inactive plugins
- Wrote a test for the above settings form bug

Fixes: https://launchpad.net/bugs/1386896
2014-10-31 00:53:06 +02:00
Tim Bentley
6a21258c47 head 2014-10-29 22:02:52 +00:00
Tomas Groth
f05a4344af trunk 2014-10-29 21:13:29 +00:00
Tomas Groth
036ed94c68 Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025
Fixes: https://launchpad.net/bugs/1247025
2014-10-29 21:04:17 +00:00
Phill Ridout
8c0f480b0e Start of ColorButton tests 2014-10-29 19:18:01 +00:00
Phill Ridout
3685948ed5 HEAD 2014-10-29 19:11:43 +00:00
Phill Ridout
013e59c527 fixes to FileDialog tests 2014-10-29 19:07:13 +00:00
d029745007 Add basic remote control of networked projectors using PJLink control format.
bzr-revno: 2434
2014-10-28 21:50:09 +00:00
Ken Roberts
ddd94ba061 Upstream merges 2014-10-28 13:48:20 -07:00
Ken Roberts
6ae179d672 Upstream merges 2014-10-28 13:45:53 -07:00