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
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
Felipe Polo-Wood
e0ef84140f Added exception logging 2013-10-25 14:04:11 -04:00
Felipe Polo-Wood
5644e26a85 Improved unit tests 2013-10-24 21:15:44 -04:00
Dmitriy Marmyshev
e657a99d0b Trunk 2013-10-24 21:09:31 +04:00
Felipe Polo-Wood
8072188cdf Added tests for __get_text_from_page 2013-10-22 23:12:45 -04:00
Felipe Polo-Wood
28345808da Added unit tests for the two new methods get_titles_and_notes and save_titles_and_notes 2013-10-22 14:24:56 -04:00
Samuel Mehrbrodt
43f99b81eb This variable has been renamed. 2013-10-22 17:37:56 +02:00
Philip Ridout
76fd5b3da0 Fixed up pptviewcontroller to work with the unicode changes to the c library 2013-10-20 21:49:39 +01:00
Philip Ridout
f6c3881d03 Unicodified C Library 2013-10-20 21:42:40 +01:00
Felipe Polo-Wood
1f7a3e0fb3 Default ImpressController.presentation.Display to 1 in case the ScreenList() call fails, which should only happen while running tests. 2013-10-19 23:53:28 -04:00
Felipe Polo-Wood
d4d572bf80 Fixed and verified test on Ubuntu/Impress 2013-10-19 23:25:07 -04:00
Felipe Polo-Wood
dd1f556a8e Fixed formatting issues 
Added three test classes for the presentation controllers 
Fixed issue that failed load for ImpressDocument
 2013-10-19 19:15:46 -04:00
Felipe Polo-Wood
00fd7f01f7 -- General code cleanup to better match the architecture 
-- Added thumbnails to the remote display
-- Modify the service list to use the displaytitle
 2013-10-19 01:27:25 -04:00
Felipe Polo-Wood
3bbaff362d - Added support for titles (and improved notes) for impresscontroller.py 
- Removed \x0b and \n from the titles
 2013-10-17 19:55:17 -04:00
Felipe Polo-Wood
348ebee661 Read titles and notes from the presentation files and display them on the remote 2013-10-17 15:31:17 -04:00
Tim Bentley
b9e2a2cdc1 Missed imports 2013-10-13 22:07:28 +01:00
Tim Bentley
63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley
a82c64237c Fix move of check_directory_exists 2013-10-13 18:23:52 +01:00
Tim Bentley
b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley
257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Tomas Groth
a45dfd2d1b Made branch work with python3. 2013-10-04 21:06:31 +02:00
Tomas Groth
bc3f2d3422 Merge with python3 changes. 2013-10-03 22:17:44 +02:00
Raoul Snyman
1347ad61d1 Changed the way we create and initialise MediaManagerItems so that we can test things better. 2013-10-02 23:07:20 +02:00
Dmitriy Marmyshev
44e5f5bf62 Trunk & fixes 2013-09-04 09:05:15 +04:00
Andreas Preikschat
3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Tomas Groth
180c16147f Merge with trunk to resolve conflict. 2013-08-06 17:33:05 +01:00
Tomas Groth
968e30837f Reload pdf-presentation if images needed is missing instead of displaying an error. 2013-08-06 17:15:06 +01:00
Tomas Groth
d28d75a2ce Added possible to point to a binary to use for pdf-processing. 2013-08-04 20:51:22 +01:00
Andreas Preikschat
07ab1cf217 changes calls to super calls 2013-08-01 17:11:03 +02:00
Andreas Preikschat
5e7bc82694 more constructors 2013-08-01 15:04:42 +02:00
Tomas Groth
308d5ed5ee Instead of using a special PDF-player, now we present the images from PDF using the image-presentation features. 2013-07-27 11:43:04 +02:00
Andreas Preikschat
3fef52348b head 2013-07-20 11:38:24 +02:00
Andreas Preikschat
e32f0869cc constructors 2013-07-19 15:00:15 +02:00
Andreas Preikschat
7f541327ca changed to 120 chars 2013-07-18 21:28:35 +02:00
Andreas Preikschat
5e2b7c310c changed constructor 2013-07-18 21:06:42 +02:00
Andreas Preikschat
59be78f20a changed constructors 2013-07-18 16:28:03 +02:00
Raoul Snyman
cec9689dce Fix up the build_file_mask_string test. 
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
- Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
 2013-07-17 23:07:52 +02:00
Andreas Preikschat
6e66cdefcf clean ups 2013-07-17 16:19:21 +02:00
Andreas Preikschat
4fee73fc37 added test 2013-07-17 15:59:35 +02:00
Andreas Preikschat
63bfacf0d1 fixed presentations 2013-07-17 14:37:42 +02:00
Tomas Groth
fa537260f6 Various fixes for ghostscript. Tried to support windows+mupdf. 2013-07-16 22:59:52 +02:00
Tomas Groth
b23abd0378 First attempt to support pdf using mupdf or ghostscript 2013-07-15 21:20:00 +02:00
Dmitriy Marmyshev
25ed0ab4d7 small fixes 2013-07-09 01:26:31 +04:00
Andreas Preikschat
8dd068b9c1 print func 2013-06-30 20:03:26 +02:00
Tim Bentley
0f0097c1a4 Fix presentations 2013-06-20 20:12:55 +01:00
Tim Bentley
4b2868b271 Fox presentations and refactor service item 2013-05-24 21:17:47 +01:00
Andreas Preikschat
f82000eaa2 reverted change to avoid conflict 2013-04-20 11:06:26 +02:00
Andreas Preikschat
465fc7bff1 do not overrie build-ins 2013-04-20 11:02:45 +02:00
Andreas Preikschat
7682698cf1 media code standards 2013-04-19 21:15:12 +02:00
Andreas Preikschat
dad243dd74 songusage and presentation code standards 2013-04-19 20:52:39 +02:00
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +01:00
Tim Bentley
fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +01:00
M2j
042bf4ed2d rename openlp.core.utils.get_local_key to openlp.core.utils.get_locale_key 2013-04-05 19:41:01 +02:00
M2j
76ea812629 - switch to Python3 style sorting 
- use ICU for string sorting
 2013-03-30 22:54:42 +01:00
Tim Bentley
a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
Tim Bentley
90ac714c0d Mediamanageritem converted 2013-03-19 22:00:50 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley
611dbdf044 Head 2013-03-19 17:53:51 +00:00
Tim Bentley
861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Arjan Schrijver
ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
Tim Bentley
bdad091ff0 Fix change typos 2013-03-16 21:18:05 +00:00
Tim Bentley
6a99a9e140 Changes made 2013-03-16 20:52:59 +00:00
Tim Bentley
04bc47cb52 All Tabs converted 2013-03-16 19:57:15 +00:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Arjan Schrijver
2cb47f6040 Merge HEAD 2013-03-14 12:39:04 +01:00
Arjan Schrijver
043c35a985 Merge HEAD 2013-03-11 16:23:43 +01:00
Tim Bentley
7d371228bc Config updates 2013-03-10 20:19:42 +00:00
Andreas Preikschat
5f67e4f149 removed not needed icon parameter 2013-03-07 14:14:31 +01:00
Arjan Schrijver
52523224ec Merge HEAD 2013-03-07 12:23:52 +01:00
Andreas Preikschat
6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat
a27b251060 songimporters 2013-03-07 09:05:43 +01:00
Arjan Schrijver
c02098faa8 Merge HEAD 2013-03-03 17:53:33 +01:00
Tim Bentley
0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Tim Bentley
5ca6d36935 Clean up custom plugin 2013-02-19 21:23:56 +00:00
phill-ridout
ba37105bbf Fixed OpenLP not starting 2013-02-17 08:29:23 +00:00
Andreas Preikschat
0c4789f071 r2179 2013-02-16 10:58:41 +01:00
Arjan Schrijver
cc9464ea74 Merge HEAD 2013-02-13 20:27:10 +01:00
Arjan Schrijver
0ca05faa5e Merge HEAD 2013-02-11 10:21:46 +01:00
Arjan Schrijver
3717e7fa20 - Enhanced 'choose group' dialog layout (thanks Raoul) 
- Revert back to old QListWidget and use QTreeWidget only for images plugin
- Renamed dialogs to comply to coding standards
- Added image group icon
- Enabled animation on image groups
- Removed special 'Imported' folder and allow toplevel images instead
 2013-02-10 17:11:12 +01:00
Tim Bentley
cae39247d9 Final cleanup of variables 2013-02-07 11:33:47 +00:00
Tim Bentley
c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Tim Bentley
fae34b1b4d Head + fix merge problems 2013-02-07 07:17:19 +00:00
Andreas Preikschat
bf01c2f0a8 use own ScreenList() call instead of using parents to access it 2013-02-06 10:56:41 +01:00
Andreas Preikschat
f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat
f94da5c22c fixed spaces 2013-02-05 07:47:03 +01:00
Andreas Preikschat
3df730db09 used += instead 2013-02-04 22:26:27 +01:00
Andreas Preikschat
86912ec2c3 removed not needed imports; removed not needed script 2013-02-04 22:22:12 +01:00
Tim Bentley
ca5e46a2b1 Add test idea for the registry 2013-02-03 21:46:56 +00:00
Arjan Schrijver
adb7aac7cf Merge HEAD 2013-02-03 20:34:53 +01:00
Tim Bentley
a9a4c7938e Fix name and other bugs 2013-02-03 19:23:12 +00:00
Tim Bentley
123f460f7e Fix up Receiver code changes 2013-02-03 15:06:17 +00:00
Tim Bentley
27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
phill-ridout
7cc695f3bb New line at end of file added. 2013-02-02 17:44:07 +00:00
Philip Ridout
f75b3ffdaf Fixes bug 1113446 2013-02-02 14:09:22 +00:00
Arjan Schrijver
3f4df4f22c Merge HEAD 2013-02-01 13:01:24 +01:00
Arjan Schrijver
d95aef4b97 - Scroll images list automatically when dragging 
- Expand group where new images were added
- Select dropped images
- More code style fixes
- Reverted earlier change to validateAndLoad
 2013-01-30 20:33:22 +01:00
Arjan Schrijver
42a75e545e Implemented drag&drop from external directly into an image group 2013-01-29 14:21:07 +01:00
Tim Bentley
bdb9089409 Cleanup ServiceManager code 2013-01-27 07:36:04 +00:00
Tim Bentley
183c0c700d More Registry cleanups and bug fixes 2013-01-26 07:39:07 +00:00