raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,696 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

5825 Commits

Author SHA1 Message Date
Simon Hanna 39e48b9fed Show double verses at the end of songs in stageview 
Fixes: https://launchpad.net/bugs/1510572
 2015-12-30 01:09:11 +01:00
Raoul Snyman 9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Tomas Groth a6f5251d7e pep8 fixes 2015-12-26 15:30:12 +01:00
Tomas Groth b69bb5ce27 trunk 2015-12-26 10:00:48 +01:00
raoul@snyman.info a898b8e878 A couple of fixes for Debian package requirements: Add jQuery and jQuery Mobile sources; Add Keywords field to desktop file. 
bzr-revno: 2580
 2015-12-24 19:33:33 +00:00
Raoul Snyman 8bf871fe2b [SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown') 2015-12-23 20:20:22 +02:00
Raoul Snyman 322b481b01 [Debian package requirements] Add jQuery and jQuery Mobile sources; Add Keywords field to desktop file 2015-12-23 14:55:30 +02:00
springermac@gmail.com d9a02f6ada Migrate to PyQt5 
bzr-revno: 2576
 2015-12-21 21:27:10 +01:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tomas Groth 89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01: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
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
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
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
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 3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05: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
Tim Bentley ae1888106d Fix Presentations and Media 2015-11-28 15:37:26 +00:00
Jonathan Springer c37b033ba0 Fix typo in typo fix 2015-11-23 14:14:58 -05:00
Jonathan Springer 9e349b55f7 Fix typo 2015-11-23 14:04:10 -05:00
Jonathan Springer 7d3ec1ae24 Fix typo 2015-11-23 13:55:56 -05:00
Tim Bentley fba6767e79 fix old versions 2015-11-22 14:06:54 +00:00
Tim Bentley 78078fb2ed catchup late fixes from 2.2.1 2015-11-21 08:31:17 +00:00
Tim Bentley a5a2b8b02b fix remote call data 2015-11-15 15:13:40 +00:00
Tim Bentley ae21d548ba fix join 2015-11-08 21:19:54 +00:00
Tim Bentley 97e3eea173 and add tests 2015-11-08 21:07:48 +00:00
Tim Bentley 1ff9413d5a remove s 2015-11-08 20:23:16 +00:00
Tim Bentley 7299aae51c fix code 2015-11-08 20:19:02 +00:00
Jonathan Springer 285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley 19a2deef30 allow local remote views 2015-11-06 21:43:31 +00:00
Tim Bentley 0e4847b5fa head 2015-11-02 20:57:48 +00:00
Tim Bentley d165010aaa minor fix ups 2015-11-02 20:52:22 +00:00
Tomas Groth 05043edb6d Strip trailing whitespaces from verse-string. 2015-10-28 16:43:17 +00:00
Tomas Groth fc5f2e1018 Improve the worshipcenter pro importer and updated test. 2015-10-27 15:00:11 +00:00
Tomas Groth d65fa351c3 Added test for zionworx file import. 2015-10-27 13:16:48 +00:00
Tomas Groth 85f034abdd Make zionwork imported work with python3 
Fixes: https://launchpad.net/bugs/1510282
 2015-10-27 12:28:13 +00:00
Tim Bentley a197e92f7d Missing strings 2015-10-22 17:23:40 +01:00
Tim Bentley 375884b1bb Songs 2015-10-16 17:58:22 +01:00
Tim Bentley 9590de703a plugins again 2015-10-16 17:49:58 +01:00
Tim Bentley e8f0844339 custom 2015-10-16 17:43:48 +01:00
Tim Bentley ae1124f8bd bible 2015-10-16 17:38:39 +01:00
Tomas Groth 19bd2dd25a pep8 fixes 2015-10-10 21:50:59 +01:00
Tomas Groth cacb3ca0a0 Fix string that makes it possible to translate the string. 2015-10-03 13:00:44 +01:00
Tomas Groth 05899eb41d Update link to google play store 2015-10-01 12:17:26 +01:00
Tim Bentley afa4f7b0b2 fix broken trunk 2015-09-10 21:27:17 +01:00
Jonathan Springer 85d2cfda6a Move icon creation inside setup_item to avoid generating the icon multiple times 2015-09-09 16:02:19 -04:00
Jonathan Springer 6688d45108 merge trunk 2015-09-08 15:15:43 -04:00
Jonathan Springer eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Jonathan Springer 46d4105cb1 Change relative import to absolute import 2015-09-08 15:13:26 -04:00
Jonathan Springer 934a9cb7b3 Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized 2015-09-08 15:11:09 -04:00
Tomas Groth 579f532aec Removed unnecessary line. 2015-08-28 14:20:17 +01:00
Tomas Groth c559741143 Forgot to remove debug print... 2015-08-28 13:34:28 +01:00
Tomas Groth 0c24d3705b Fix traceback on windows in the OO/LO song importer. 2015-08-28 11:22:06 +01:00
Tomas Groth 585c319c8b Improved the robustness of the download-webbibles-form. Fixes bug 1489757. 
Fixes: https://launchpad.net/bugs/1489757
 2015-08-28 09:50:13 +01:00
Tomas Groth 4488fedfdc Fix SongPro import. Fixes bug 1489376. 
Fixes: https://launchpad.net/bugs/1489376
 2015-08-27 12:24:24 +01:00
Samuel Mehrbrodt 0c9f23a875 PEP8 2015-08-26 09:59:27 +02:00
Samuel Mehrbrodt eac92737a2 Better strings for translation 2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt fce9a1e1f2 OpenLP 2.0 -> OpenLP 2 2015-08-26 09:26:19 +02:00
Tomas Groth 8b1c81f00a Ignore Libre/OpenOffice exceptions if we are closing it. 2015-08-03 19:54:00 +01:00
Tomas Groth 25ce352047 Fix traceback in OSIS import on empty verse tag. 2015-07-04 23:19:13 +01:00
Tomas Groth 4e3b1c0e8f Revert changes to support python 3.5 to make sure we support python 3.3. 2015-07-04 22:09:59 +01:00
Tomas Groth 03b5ec6d16 Catch songselect connections error. Fixes bug 1464421. 
Fixes: https://launchpad.net/bugs/1464421
 2015-06-17 18:46:45 +01:00
Tomas Groth 3b0b75e5b6 Remove unneeded import. 2015-06-16 09:47:42 +02:00
Tomas Groth 1b332c1580 Fix PDF reader using wrong maindisplay size. 2015-06-10 17:05:29 +02:00
Tomas Groth 7eb506fae8 Improve network exception handling. 2015-06-07 21:56:06 +01:00
Tomas Groth 14031720be Fix timer that checks for presentation slide change, remove powerpoint event handler that did the same. 2015-06-05 22:22:16 +01:00
Tomas Groth 0e2e281fa0 pep8 fix 2015-06-04 00:27:56 +01:00
Tomas Groth bee9808503 Hide the main impress window when loading a presentation, but make it visible for a moment when starting presentation. Hopefully fixes bug 1420356. 
Fixes: https://launchpad.net/bugs/1420356
 2015-06-04 00:27:03 +01:00
Tomas Groth f0232d7147 Improve the detection of powerpoints presentation window by only looking at the filename root. 2015-06-02 22:53:11 +01:00
Tomas Groth 2bc78ffd25 Fix traceback when going live with presentation while blanked to desktop 2015-06-02 22:16:10 +01:00
Tomas Groth 3f145078f5 Set service_item.name to "images" for pdfs (which are images though they are presentations) 2015-06-02 22:13:15 +01:00
Raoul Snyman bd92e6a7d3 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 
bzr-revno: 2541
 2015-05-30 13:11:32 +01:00
Tomas Groth 623a0974a5 For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. 
Don't import setting keys that does not exists. Fixes bug 1458672.
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
Only use transitions if we are changing slide. Fixes bug 1449064.
Make translation of 'Advanced' specific to the bible plugin.
Many PowerPoint fixes/improvements:
 * Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
 * Implement workaround for unblanking bug in PowerPoint 2010.
 * Open PowerPoint hidden so the main application window isn't visible.
 * Added support for odp for PowerPoint 2007 and newer.
 * Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus.
 * Minimized the flashing of the PowerPoint presentation window in the taskbar.

bzr-revno: 2539
 2015-05-29 17:22:22 +01:00
Raoul Snyman 5bcdc85ce1 Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None 2015-05-28 22:38:43 +02:00
Tomas Groth 9b0ebabc92 Last minute fixes... Don't query window process, instead look at window title for presentation filename. 2015-05-27 10:45:52 +02:00
Tomas Groth 6cd2704814 Revert attempt to try to hide powerpoint presentation window. Instead try to minimized the flashing in the taskbar. 2015-05-26 22:26:59 +01:00
Tomas Groth a5cebb73c4 trunk 2015-05-25 21:58:05 +01:00
Tomas Groth ff5be436ae Make translation of 'Advanced' specific to the bible plugin. 2015-05-25 21:37:29 +01:00
Tim Bentley 1cfd33df30 Fix Jenkins, tests and spellings 2015-05-25 21:03:31 +01:00
Tomas Groth aef340b631 Added some logging 2015-05-25 13:08:26 +01:00
Tomas Groth dce6031a9f Only try to hide powerpoint presentation window for powerpoint 2007 and newer. 2015-05-25 12:12:54 +01:00
Tomas Groth 4266d9cbdf For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056. 
Fixes: https://launchpad.net/bugs/1458056
 2015-05-25 12:11:04 +01:00
Raoul Snyman b27aae52cf Fix bug#1451237 by overriding the create_item_from_id() method in the child MediaItem class to build a proper QTreeWidgetItem. 2015-05-16 23:24:57 +02:00
Tomas Groth a07b8a8f49 Added support for odp for powerpoint 2007 and newer. 2015-05-08 16:47:02 +02:00
Tomas Groth b52a4e640c Hide the powerpoint presentation window from the taskbar - can be disabled from the settings. 2015-05-08 10:17:35 +02:00
Tomas Groth bf665a8549 Remove unnecessary powerpoint presentation setting. 2015-05-07 14:45:52 +02:00
Tomas Groth 47acc9dc89 pep8 fixes 2015-05-05 11:03:47 +02:00
Tomas Groth cd6903be86 Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus. 2015-05-05 10:53:31 +02:00
Tomas Groth af3eaf2b37 Added an option for letting powerpoint control the size and position for the presentation window. Workaround for windows 8.1 scaling. 2015-05-03 19:25:00 +01:00
Tomas Groth 73ae9a2643 Make screenshots for main webview, even on single screen setup. Fixes bug 1449041. 
Fixes: https://launchpad.net/bugs/1449041
 2015-05-01 16:21:59 +02:00
Tomas Groth cdb564c4f3 Partly revert to old unblanking workaround for powerpoint 2010. 2015-04-30 16:57:26 +02:00
Tomas Groth d044821483 pep8 fixes 2015-04-30 14:48:45 +02:00
Tomas Groth 1333c2ff43 Implement workaround for unblanking bug in powerpoint 2010 2015-04-30 14:38:55 +02:00
Tomas Groth d4b2148727 trunk 2015-04-28 22:28:52 +01:00
Tomas Groth 472baeb079 Fix blanking 2015-04-28 22:24:01 +01:00
Tomas Groth 9c0525b00c Use return-to-pre-blank-slide fix for all powerpoint versions. 2015-04-28 14:36:43 +02:00
Tomas Groth ed6d454105 Small fixes for powerpoint. 2015-04-28 11:55:40 +02:00
Tomas Groth e21729c14f Fix wrong indentation 2015-04-27 19:07:14 +01:00
Tomas Groth 23ddd918d1 Open PowerPoint hidden so the main application window isn't visible. 2015-04-27 16:59:22 +01:00
Raoul Snyman ab54b04468 Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path 2015-04-25 16:32:09 +02:00
Tomas Groth 29f5efeb91 Delete image thumbnails when the image is removed. Fixes bug 1446491. 
Fixes: https://launchpad.net/bugs/1446491
 2015-04-22 20:37:32 +01:00
Tomas Groth f8114d0b97 Disable button for replacing live background if the webkit player is not available. 2015-04-21 22:49:22 +01:00
Tomas Groth c294ea5752 Make the way we display verse ranges consistent and make use of localized or custom separators. Fixes bug 1081807 
Fixes: https://launchpad.net/bugs/1081807
 2015-04-07 23:01:52 +01:00
Tomas Groth 67ecf9b901 Take focus back if Powerpoint steals it - fixes bug 1423913. 
Optionally advance a Powerpoint slides animation when clicked in the slidecontroller - fixes bug 1194847.
Made OpenLP respect hidden slides. Improved logging in case of errors.
For Impress, go to previous effect instead of the previous slide.

bzr-revno: 2527
Fixes: https://launchpad.net/bugs/1423913, https://launchpad.net/bugs/1194847
 2015-04-03 20:36:02 +02:00
Tomas Groth cff0b412f8 Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. 
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).

bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761
 2015-04-03 20:31:19 +02:00
Tomas Groth da6f88a7ae Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671. 
Fixes: https://launchpad.net/bugs/1439671
 2015-04-02 21:49:19 +01:00
Tomas Groth 589bc98bec Use html.escape instead of the deprecated cgi.escape 2015-04-02 21:32:20 +01:00
Tomas Groth d5804567b5 Added test + some cleaning 2015-04-02 09:33:46 +01:00
Tomas Groth d627982bfe Go to previous effect instead of the previous slide. 2015-04-01 21:38:42 +01:00
Raoul Snyman 02128c85f0 Fix bug #1437771: Clear the song after every import 
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)

Fixes: https://launchpad.net/bugs/1437771
 2015-03-31 22:58:51 +02:00
Tomas Groth 0e6cff913a Take focus back if Powerpoint steals it - fixes bug 1423913. Optionally advance a Powerpoint slides animation when clicked in the slidecontroller - fixes bug 1194847. Made OpenLP respect hidden slides. Improved logging in case of errors. 
Fixes: https://launchpad.net/bugs/1194847, https://launchpad.net/bugs/1423913
 2015-03-26 15:22:23 +01:00
Tomas Groth e9c0057b96 Fix a traceback by changing filepath to file_path. Fixes bug 1389149. 
Fixes: https://launchpad.net/bugs/1389149
 2015-03-26 15:17:14 +01:00
Tomas Groth f8084059ba Added test + small fixes. 2015-03-18 22:04:30 +00:00
Tomas Groth d74f2c05ff Fix crash if presentation file in the mediamanger was removed bewteen sessions. Fixes bug 1432418. 
Fixes: https://launchpad.net/bugs/1432418
 2015-03-15 21:53:46 +00:00
Raoul Snyman cecde62157 Fix bug #1411433 by moving some stuff around. 
bzr-revno: 2522
 2015-03-11 18:47:29 +00:00
Tomas Groth 79c1335d41 Only update presentation thumbnails if needed. Fixes bug 1424330. 
Fixes: https://launchpad.net/bugs/1424330
 2015-03-10 22:00:32 +00:00
Raoul Snyman 3c130cf201 Fix bug #1411433 by rearranging methods within the media plugin 
Fixes: https://launchpad.net/bugs/1411433
 2015-03-10 23:33:35 +02:00
Tomas Groth c9f2b3d173 typo 2015-03-09 21:39:31 +00:00
Tomas Groth 39c79aaed9 PEP8 fixes 2015-03-09 20:57:39 +00:00
Tomas Groth aefe3e9cad trunk 2015-03-09 20:42:28 +00:00
Tomas Groth 512df1451d Use the language id when importing bibles. And fixed presentationcontroller tests. 2015-03-09 20:42:03 +00:00
Tomas Groth 0777a5cb90 When writing in utf8, also read in utf8 2015-03-06 09:35:47 +01:00
Oliver Wieland 408dd440ce Fix bug #1424555 by setting the verse and not allowing it to change 
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
 2015-02-28 20:46:31 +02:00
Raoul Snyman 3131c3f7c8 Some CCLI import fixes, a quitting dialog in one case, and empty lyrics in another. 
Fix bug #1412216 where a song from CCLI without lyrics would cause a traceback - now just tell the user.
Fix bug #1423699 so that you're not logged out when you want to import more songs.

bzr-revno: 2515
 2015-02-28 06:47:35 +00:00
Raoul Snyman e14c03166d Minor style fixes 2015-02-28 01:02:19 +02:00
Raoul Snyman f843e5a8a0 HEAD 2015-02-28 00:30:47 +02:00
Raoul Snyman 7d7fec194e Fix bug #1423699 so that you're not logged out when you want to import more songs. 
Fixes: https://launchpad.net/bugs/1423699
 2015-02-28 00:28:24 +02:00
Tomas Groth 84a0fa0ecd Moved string format input outside calls to translate. Fixes bug 1425035. 
Fixes: https://launchpad.net/bugs/1425035
 2015-02-27 21:14:08 +00:00
Tomas Groth 98b2be5bc7 Make presentation controller save notes and titles in utf-8 encoding. Fixes bug 1424972. 
Fixes: https://launchpad.net/bugs/1424972
 2015-02-27 21:11:41 +00:00
Tomas Groth e6f93904f7 trunk 2015-02-26 21:10:35 +00:00
Tomas Groth 7a5787797e Pep8 fixes 2015-02-26 21:02:26 +00:00
Tomas Groth 4fb55448f8 Fixes for code and tests. 2015-02-26 20:58:54 +00:00
Tomas Groth ecc30163af Reverted some things to decrease the changes. It is now working. 2015-02-24 23:04:01 +00:00
Tomas Groth e78a0ba0da Implemented getting languages into combobox. 2015-02-23 22:35:56 +00:00
Oliver Wieland 4e96db4010 fixes bug#1424555 2015-02-23 18:40:56 +01:00
Tomas Groth de58d1c607 Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956. 2015-02-21 13:12:49 +00:00
Raoul Snyman b65e592df9 Bug #1412216: Detect when a song has a problem, show a message to the user, and flip back to the previous screen. 2015-02-21 11:59:37 +02:00
Phill Ridout fb20f9243f Further fixes 2015-02-19 21:24:12 +00:00
Phill Ridout 4f94b2acd2 remove fallback 2015-02-18 21:20:35 +00:00
Phill Ridout 5e8ad1710b remove old redundant keys 2015-02-18 20:55:30 +00:00
Phill Ridout 14c3d27fed revert db upgrade code 2015-02-18 20:43:51 +00:00
Tomas Groth 52f3695334 Initial support for fetching list of web bibles. Not used yet. 2015-02-17 22:58:29 +00:00