Commit Graph

337 Commits

Author SHA1 Message Date
Phill Ridout ddec0e00cd Patch changes from botched branch 2014-10-06 19:09:47 +01:00
Tomas Groth 2b9d36702b Added oxps as supported presentation filetype (by mudraw) 2014-09-29 21:11:07 +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 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
Samuel Mehrbrodt 8b7bbb4761 Merge trunk 2014-03-31 20:48:10 +02:00
Tim Bentley 0da1b7b5f7 Presentations 2014-03-08 21:23:47 +00:00
Tomas Groth 52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Philip Ridout 150ff4e980 HEAD 2014-02-11 20:29:57 +00:00
Tomas Groth e958c04659 Make the PdfController reload backend if setting changes. 2014-01-06 12:06:22 +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
Tomas Groth 84334a039e Merged with trunk. 2013-12-29 19:47:54 +00:00
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +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
Tomas Groth ffa3cd32b3 Merged with trunk to resolve conflicts. 2013-11-20 22:42:48 +01:00
Tomas Groth 3acd18c102 Mostly code cleanup of PDF support code. 2013-11-14 17:42:21 +01:00
Philip Ridout bb614d4af2 HEAD 2013-11-01 19:35:54 +00:00
Philip Ridout f374c58d39 Tidying up some uneeded str() 2013-10-28 21:15:16 +00:00
Dmitriy Marmyshev e657a99d0b Trunk 2013-10-24 21:09:31 +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
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
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
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 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
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 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
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 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
Arjan Schrijver ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
Tim Bentley e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Arjan Schrijver 043c35a985 Merge HEAD 2013-03-11 16:23:43 +01:00
Andreas Preikschat 5f67e4f149 removed not needed icon parameter 2013-03-07 14:14:31 +01:00
Andreas Preikschat a27b251060 songimporters 2013-03-07 09:05:43 +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
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +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 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
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
Arjan Schrijver 9b707d2351 Moved images filenames storage from configfile to sqlite db 2013-01-25 12:52:32 +01:00
Arjan Schrijver 5631a68c40 Fixes for QTreeWidget 2013-01-25 12:38:48 +01:00
Arjan Schrijver dbce056688 Change QListWidget to QTreeWidget in media manager 2013-01-25 12:29:32 +01:00
Tim Bentley aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley 3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Andreas Preikschat 5b6326e2ac migrate settings 2013-01-18 20:24:06 +01:00
Andreas Preikschat a98045e386 remove set_list and get_list from SettingsManager 2013-01-18 19:50:46 +01:00
Andreas Preikschat 91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat 2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Tim Bentley 0e5a3aa045 More 120 cleanups 2013-01-05 22:17:30 +00:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Andreas Preikschat b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Andreas Preikschat 18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat 6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Andreas Preikschat 6c1e303dbd fixed branch 2012-12-05 21:33:39 +01:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley cf0bb94b3f Clean ups 2012-11-26 17:57:36 +00:00
Tim Bentley 57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley 69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Tim Bentley 9e1e07c04c Head 2103 2012-11-07 18:41:07 +00:00
Tim Bentley 9ba9b9605d Fix missing files in presentations 2012-11-05 06:05:44 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley e24c588df3 Head 2012-10-25 20:17:14 +01:00