Commit Graph

12611 Commits

Author SHA1 Message Date
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
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
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
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
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
d1e85ea9a1 Settings Form - check if the item is valid first
bzr-revno: 2433
2014-10-28 20:40:32 +00:00
00455847a7 HEAD 2014-10-28 22:27:09 +02:00
d0b69d8f35 Fix traceback after settings form is saved
bzr-revno: 2432
2014-10-28 20:05:05 +00:00
743dc59d51 [fix 1386710] Fix traceback after settings form is saved
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
ae7c863333 [fix 1385979] Check if the item is valid first 2014-10-28 21:02:06 +02:00
Tomas Groth
c19613ce82 Various small bugfixes:
- Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix
- Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574
- Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog
- Remove prints in http_router
- Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace.

bzr-revno: 2431
Fixes: https://launchpad.net/bugs/1296574
2014-10-28 20:36:54 +02:00
Tomas Groth
11b2b4dc3b Added test for checking extension list creation 2014-10-27 21:38:19 +00:00
Tim Bentley
ac50bd9d06 Fix final debug method errors
bzr-revno: 2430
2014-10-27 21:08:12 +00:00
Tim Bentley
afde4a25ad Fix missing dummy values for debug 2014-10-27 20:22:57 +00:00
Tomas Groth
e9a151cec0 This fixes the adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix 2014-10-27 14:14:12 +01:00
Tomas Groth
d2f388bb59 Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574
Fixes: https://launchpad.net/bugs/1296574
2014-10-27 14:11:55 +01:00
Tomas Groth
3d387cb296 Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog 2014-10-27 13:58:59 +01:00
Tomas Groth
6d2cfedd7e Remove prints 2014-10-27 13:52:56 +01:00
Tomas Groth
3693e55f5c Change filename encoding to only apply to local variable. 2014-10-27 11:37:22 +01:00
Tim Bentley
8720ed1b72 Head 2014-10-26 05:53:53 +00:00
0a1897f1da [fix #1385438] Make list widget items select tab pages via user data rather than just their position.
bzr-revno: 2429
Fixes: https://launchpad.net/bugs/1385438
2014-10-25 23:04:20 +02:00
b34da371ba [fix #1385438] Make list widget items select tab pages via user data rather than just their position.
Fixes: https://launchpad.net/bugs/1385438
2014-10-25 22:26:19 +02:00
Ken Roberts
e8e6410d45 Fix test suite change 2014-10-24 12:17:12 -07:00
Ken Roberts
f81903bbcf Merge upstream 2014-10-23 15:16:38 -07:00
Ken Roberts
3cf8c0464c Fix discard/reset button calls - added button tooltips 2014-10-23 14:00:06 -07:00
997d49648a Fix up the look and feel of the wizards after I messed it up with my changes for OS X
Added and updated tests:
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests
Updated setup.py with some Python3 changes.
Merged HEAD
Forgot to catch the cancel_wizard_text refactor

bzr-revno: 2428
2014-10-23 22:38:11 +02:00
Ken Roberts
c7d36826aa Add 1.5 second delay for autoloading projectors 2014-10-22 19:40:22 -07:00
Ken Roberts
0264d57b61 Add input source edit text option 2014-10-22 19:21:26 -07:00
108e3b6687 Forgot to catch the cancel_wizard_text refactor 2014-10-22 23:01:40 +02:00
3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
76f4b6e3ad Forgot to add test file 2014-10-22 22:44:05 +02:00
551a10d311 Added and updated tests:
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests

Updated setup.py with some Python3 changes.
2014-10-22 22:43:05 +02:00
Ken Roberts
d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Ken Roberts
6391b17b6d Fix focus to ip text widget when calling projetor edit 2014-10-21 17:49:21 -07:00
Ken Roberts
2e6556a11b Fix call to get_source_list in pjlink1 2014-10-21 17:02:37 -07:00
Ken Roberts
416c37140c Fix single dialog get_source_list() call 2014-10-21 16:51:51 -07:00
Ken Roberts
5ae48da58e Fix missing poll check 2014-10-21 16:45:15 -07:00
Ken Roberts
04ad28c106 Fixed typos in ProjectorSource 2014-10-21 15:47:25 -07:00
Ken Roberts
2b5b58379f Code cleanups 2014-10-21 14:50:35 -07:00