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

910 Commits

Author SHA1 Message Date
Simon Hanna
2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Simon Hanna
4206d11228 Make methods static where possible 2016-01-04 01:18:01 +01:00
Tim Bentley
3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Jonathan Springer
3b3c8a35b6 merge trunk 2015-11-29 17:57:37 -05: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
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
9590de703a plugins again 2015-10-16 17:49:58 +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
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
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
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
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
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
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
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
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
Tomas Groth
c9f2b3d173 typo 2015-03-09 21:39:31 +00:00
Tomas Groth
0777a5cb90 When writing in utf8, also read in utf8 2015-03-06 09:35:47 +01: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
Ken Roberts
19e31d7492 Missed encoding for md5_hash 2015-02-10 13:01:22 -08:00
Ken Roberts
88cb02bb3d Fix bug #1417809: Remove default ascii encoding so md5hash can be used to hash other data. 
bzr-revno: 2497
Fixes: https://launchpad.net/bugs/1417809
 2015-02-10 21:38:53 +02:00
Tomas Groth
1e9430b435 Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered. 
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available. 
Fix bug 1412517: Fix support for 'end' mark in bible-search.

bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517
 2015-02-10 21:24:33 +02:00
Ken Roberts
0636985a74 fix presentation controller call to md5_hash 2015-02-04 09:20:14 -08:00
Phill Ridout
0cc2ae5998 Fix exception raised on mac 
Fixes: https://launchpad.net/bugs/1414360
 2015-01-27 19:57:09 +00:00
Tomas Groth
6668282fde Set the cursor back to normal after deleting a presentation. Fixes bug 1414978. 
Fixes: https://launchpad.net/bugs/1414978
 2015-01-27 15:59:06 +01:00
Philip Ridout
5390ed5bac Fixes Bug #1367141: Presentations/Images with same name gets the same thumbnail 
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)

Also added code to remove the old thumbnails.

bzr-revno: 2487
 2015-01-24 18:24:51 +00:00
Phill Ridout
854537b3e6 PEP fix 2015-01-22 18:01:54 +00:00
Phill Ridout
75dff3d2be HEAD 2015-01-22 17:31:00 +00:00
Phill Ridout
833c6fb800 Add test 2015-01-22 15:05:03 +00:00
Phill Ridout
d6b8cd1d2a code tidies 2015-01-22 13:59:46 +00:00
Phill Ridout
7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +00:00
Phill Ridout
4d749a89ac Presentation fixes 2015-01-20 21:56:05 +00:00
Raoul Snyman
ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tim Bentley
f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Tomas Groth
4123b9af1d Imported just 'which' from shutil, instead of the complete module. Also set the default song search to search as type. 2014-12-06 20:08:42 +00:00
Tomas Groth
be12ce54bb Use shutil.which instead of calling which with check_output. 2014-12-05 21:10:58 +00:00
Tomas Groth
9c64bd9d56 Added pptm as support file format for Powerpoint, Powerpoint Viewer and Libre/OpenOffice Impress. Fixes bug 1088800. 
Fixes: https://launchpad.net/bugs/1088800
 2014-11-28 08:21:03 +00:00
Tomas Groth
3693e55f5c Change filename encoding to only apply to local variable. 2014-10-27 11:37:22 +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
Tomas Groth
c02ef96fff Made the code a bit more readable by introducing PDF_CONTROLLER_FILETYPES 2014-10-14 11:05:35 +02:00
Phill Ridout
ddec0e00cd Patch changes from botched branch 2014-10-06 19:09:47 +01:00
Tomas Groth
9dbbe9d5be Fixed console popping up on windows when running mudraw.exe 2014-10-03 11:57:35 +02:00
Tomas Groth
2b9d36702b Added oxps as supported presentation filetype (by mudraw) 2014-09-29 21:11:07 +01:00
Tomas Groth
78d9da5c26 Fix comments and typos 2014-09-22 22:19:02 +01:00
Tomas Groth
dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Jonathan Springer
f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Phill Ridout
34a1ab3b3e HEAD 2014-08-26 17:51:52 +01:00
Tomas Groth
a48589752f Moved thumbnail setting into the main settingstab. 2014-08-25 21:04:33 +01:00
Tomas Groth
a0b7c72e09 Changed Image dimension-key into width and height + a bunch of small changes 2014-07-15 20:52:59 +02:00
Tomas Groth
b6cd13fc91 pep8 fixes 2014-07-15 12:02:56 +02:00
Tomas Groth
597e06153c Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes 2014-07-15 11:23:45 +02:00
Tomas Groth
8fa23ac95d Added support for showing thumbnails of images in webinterface 2014-07-14 14:41:27 +02:00
Tomas Groth
06110df08b Add notes and titles to presentation-serviceitem when creating it, and updated stageview to show title+thumbnail+notes. 2014-07-14 11:58:05 +02:00
Tomas Groth
98a58d45bf pep8 fixes 2014-07-11 15:35:44 +02:00
Tomas Groth
406cc506c1 Merged with trunk and fixed tests 2014-07-11 13:35:56 +02:00
Tomas Groth
79c7c58398 Added test for powerpointcontroller 2014-07-03 13:21:12 +02:00
Phill Ridout
9b6979b840 Changed log.warn to log.warning 2014-06-30 21:59:22 +01:00
Tomas Groth
49342f4a69 Improve Powerpoint error handling 2014-06-22 22:12:59 +02:00
Tomas Groth
d424270b7f Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac. 2014-05-30 11:21:26 +02:00
Andreas Preikschat
deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Tomas Groth
bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Samuel Mehrbrodt
4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Raoul Snyman
ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox. 
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
 2014-04-14 19:28:04 +01:00
Raoul Snyman
b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Samuel Mehrbrodt
a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +02:00
Samuel Mehrbrodt
d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Samuel Mehrbrodt
8b7bbb4761 Merge trunk 2014-03-31 20:48:10 +02:00
Tomas Groth
0f0e09a282 Fixed wrong dll load path. 2014-03-29 20:56:20 +01:00
Tomas Groth
8ad47cb888 Fixes for windows tests and for starting OpenLP on windows. 2014-03-24 17:49:50 +01:00
Tim Bentley
bbe4169c24 Fix all formatting errors 2014-03-21 21:38:08 +00:00
Tomas Groth
991661b169 Head 2014-03-19 18:49:46 +01:00
Tomas Groth
fa4120a4bd Small test fixes 2014-03-18 21:58:52 +01:00
Tim Bentley
30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Tomas Groth
258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00
Tim Bentley
9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tim Bentley
22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley
0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00:00
Tim Bentley
d2efa83e89 Head 2014-03-14 17:34:36 +00:00
Tomas Groth
ed03ec2195 Fixes for tests on wine/windows 2014-03-13 21:59:10 +01:00
Tim Bentley
0da1b7b5f7 Presentations 2014-03-08 21:23:47 +00:00
Tim Bentley
43f156d9fe Update Songs forms 2014-03-04 18:49:30 +00:00
Tomas Groth
52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Tomas Groth
21eeac70eb fixed an exception 2014-02-21 23:27:00 +01:00
Philip Ridout
150ff4e980 HEAD 2014-02-11 20:29:57 +00:00
Tomas Groth
c3af8d5d14 Only allow pdf-program selection using filedialog. 2014-01-14 21:57:43 +00:00
Felipe Polo-Wood
d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05:00
Tomas Groth
e958c04659 Make the PdfController reload backend if setting changes. 2014-01-06 12:06:22 +00:00
Tomas Groth
d02377f74f Moved PS script into separate file. 2014-01-06 10:51:53 +00:00
Tomas Groth
b242343d59 Added some docstring documentation. 2014-01-01 15:31:06 +00:00
Tomas Groth
f5ace2c238 merged with trunk 2013-12-31 12:20:11 +00:00
Tomas Groth
3cc69cc9fd Changed the way a serviceitem from the servicemanager is copied and converted. Also fixed for PEP8. 2013-12-31 12:15:18 +00:00
Felipe Polo-Wood
b495c47a5a More styling issues 2013-12-30 13:19:50 -05:00
Felipe Polo-Wood
1a83a0a557 Merge head 2013-12-30 03:53:51 -05:00
Felipe Polo-Wood
b993b0d4a8 Style changes 2013-12-30 03:35:05 -05:00
Tomas Groth
84334a039e Merged with trunk. 2013-12-29 19:47:54 +00:00
Tomas Groth
7dd3417217 Added tests for the PdfController. 2013-12-29 19:46:04 +00:00
Tim Bentley
e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tomas Groth
82aaf11860 Fixes for the presentation setting tab 2013-12-28 18:36:33 +00:00
Felipe Polo-Wood
1ef910463c Merge head 2013-12-28 12:06:29 -05:00
Tomas Groth
47ea300786 Merged with trunk 2013-12-27 17:47:40 +00:00
Tomas Groth
685258b744 Made presenting PDF from the servicemanager work 2013-12-27 17:44:12 +00:00
Tim Bentley
6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley
cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Samuel Mehrbrodt
7e484086dc Merge trunk 2013-12-07 18:35:06 +01:00
Tim Bentley
f32409b5a5 format changes 2013-12-06 19:00:37 +00:00
Felipe Polo-Wood
04abbd97d0 implemented caching thru the ImageManager 
Styling issues
Merge with fix-router changes
 2013-11-22 13:21:07 -05:00
Tomas Groth
ffa3cd32b3 Merged with trunk to resolve conflicts. 2013-11-20 22:42:48 +01:00
Philip Ridout
20ae5d13b0 some final cleanups 2013-11-16 10:16:06 +00:00
Philip Ridout
cc3cdf7126 added some tests for PresentationController 2013-11-16 10:05:41 +00:00
Tomas Groth
3acd18c102 Mostly code cleanup of PDF support code. 2013-11-14 17:42:21 +01:00
Philip Ridout
61da0e8ad9 Some refactoring 2013-11-07 20:35:02 +00:00
Felipe Polo-Wood
3c7102abcd Removed dependency on ppt.py and added ppinterface.py which contains the bare minimum support for events. 2013-11-06 14:42:18 -05:00
Philip Ridout
bb614d4af2 HEAD 2013-11-01 19:35:54 +00:00
Philip Ridout
4345608759 fixed issue with not all PPTS not loading correctly using PPTViewer 2013-11-01 19:30:26 +00:00
Felipe Polo-Wood
1759468ea5 - Undid superfluous line formatting 2013-11-01 11:03:43 -04:00
Felipe Polo-Wood
fecd56106d Removed extra line 
Made PowerpontController class compatible with Linux
 2013-10-31 22:53:52 -04:00
Felipe Polo-Wood
e958e17889 - Added settings dialog at the client (with choice for thumbnail) 
- Fixed problem Presentations at remote getting out of sync
 2013-10-31 16:54:38 -04:00
Felipe Polo-Wood
6d464dec4b Added resizing capabilities to the thumbnails 
Fixed a problem with setting the presentation slides from the remote
 2013-10-29 11:38:28 -04:00
Philip Ridout
f374c58d39 Tidying up some uneeded str() 2013-10-28 21:15:16 +00:00
Felipe Polo-Wood
9a07d6887b style fixes 2013-10-28 11:16:22 -04:00
Felipe Polo-Wood
1aae38cb8e Merging 2013-10-27 23:40:38 -04:00
Felipe Polo-Wood
b9850e6e68 bunch of cosmetic changes 2013-10-27 22:33:28 -04:00
Samuel Mehrbrodt
abdc3937ef Small test for PresentationController Constructor 2013-10-27 13:39:13 +01:00