Commit Graph

12600 Commits

Author SHA1 Message Date
Raoul Snyman 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
Raoul Snyman 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
Ken Roberts 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
Raoul Snyman d1e85ea9a1 Settings Form - check if the item is valid first
bzr-revno: 2433
2014-10-28 20:40:32 +00:00
Raoul Snyman 00455847a7 HEAD 2014-10-28 22:27:09 +02:00
Raoul Snyman d0b69d8f35 Fix traceback after settings form is saved
bzr-revno: 2432
2014-10-28 20:05:05 +00:00
Raoul Snyman 743dc59d51 [fix 1386710] Fix traceback after settings form is saved
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 108e3b6687 Forgot to catch the cancel_wizard_text refactor 2014-10-22 23:01:40 +02:00
Raoul Snyman 3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
Raoul Snyman 76f4b6e3ad Forgot to add test file 2014-10-22 22:44:05 +02:00
Raoul Snyman 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
Ken Roberts b38921a90b Code cleanups 2014-10-21 14:40:47 -07:00
Ken Roberts a026633f78 Notes cleanups 2014-10-21 14:24:16 -07:00
Tomas Groth 5662f4b2af Ask the user if a backup of the data folder should be created after upgrading
bzr-revno: 2427
2014-10-21 22:08:26 +01:00
Samuel Mehrbrodt 674cf930ef Update jQuery and jQuery Mobile
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Tomas Groth 5ecbfa61fd Fix tests so they can run individually.
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Tim Bentley d6dc19ae5e Correct Version to Mainwindow communications.
bzr-revno: 2424
2014-10-21 22:03:31 +01:00
Philip Ridout 28a8d9926f Fixes bug 1222534 by using userdata rather than relying on a translated string
bzr-revno: 2423
Fixes: https://launchpad.net/bugs/1222534
2014-10-21 21:40:16 +01:00
Ken Roberts 0fe5b9f8fe Typo in column define 2014-10-21 13:11:25 -07:00
Phill Ridout 07c693c8c8 Changed some of the comments 2014-10-21 21:08:37 +01:00
Ken Roberts a8cebffec0 cleanups 2014-10-21 13:05:35 -07:00
Tim Bentley 2b3e3d777e Add Test and fix more code 2014-10-21 21:05:08 +01:00