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

556 Commits

Author SHA1 Message Date
Tim Bentley
c5b12ffaf3 Screen size fix for Raoul 2010-05-15 07:57:29 +01:00
Martin Thompson
a8a7e675a4 Updated from review comments 2010-05-09 21:02:38 +01:00
Martin Thompson
dbdf681165 More changes to suit pyqt4.4 2010-05-06 21:30:08 +01:00
Tim Bentley
077933d703 Head 805 2010-05-01 07:50:43 +01:00
Jon Tibble
b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
Tim Bentley
5614e10324 Fix again 2010-04-30 20:56:26 +01:00
Tim Bentley
22c2e4c38e Minor cleanups and add comments to code 2010-04-30 20:37:47 +01:00
Tim Bentley
79180c7f1c Text over video with loop 2010-04-30 17:57:53 +01:00
Tim Bentley
09da62f9cc Text over video 2010-04-30 17:30:25 +01:00
Tim Bentley
d28498611d Fix up video playing so main screen is hidden on start 2010-04-30 06:16:06 +01:00
Tim Bentley
4e6c56c430 Video clean ups and bug fixes from 800 2010-04-29 21:56:27 +01:00
Tim Bentley
39a4593bd3 Fix up display buttons 2010-04-29 20:33:45 +01:00
Tim Bentley
b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Tim Bentley
d19d3eb213 Fix video display 2010-04-28 18:00:05 +01:00
Jon Tibble
484a76289c Fix presentations a bit more 2010-04-27 23:36:50 +01:00
Tim Bentley
d0c6cf9639 move display to core 2010-04-27 20:59:44 +01:00
Tim Bentley
d7e060c503 Start to add ability to set display screen size for a session 2010-04-24 19:42:01 +01:00
Jonathan Corwin
fa54f94905 Finish signal refactor 2010-04-22 22:22:09 +01:00
Jonathan Corwin
877af7ea2c More fixes 2010-04-21 22:56:48 +01:00
Jonathan Corwin
40e6289102 head 2010-04-20 23:12:04 +01:00
Jonathan Corwin
29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
Tim Bentley
5a311c6f77 Clean up video class 2010-04-18 20:11:28 +01:00
Tim Bentley
1948da79ff Comments 2010-04-17 12:27:12 +01:00
Tim Bentley
a766542854 Display Hook cleanups 2010-04-17 08:53:06 +01:00
Tim Bentley
dcd48d1042 Clean up alert dialog with new layout 
Alerts over video starting to work 
Fix bug in impress close down
 2010-04-17 08:31:15 +01:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley
3cc600a67b More changes and attempts 2010-04-13 16:53:00 +01:00
Tim Bentley
571e91b20f Sort out screen display and add comments 2010-04-12 09:13:27 +01:00
Tim Bentley
e0be3b5705 refactor video display 2010-04-10 11:28:57 +01:00
Tim Bentley
b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley
bc4f31ef93 More fixes and new features 2010-04-08 10:15:40 +01:00
Tim Bentley
150eaf7e56 Video changes and bug fixes part1 2010-04-08 08:37:01 +01:00
Tim Bentley
d74ff3393e head784 2010-04-07 20:10:47 +01:00
Tim Bentley
5c90f4944c remove display background 2010-04-07 20:09:13 +01:00
Tim Bentley
828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Tim Bentley
3c8c20f2d4 cleanup the screen size code 2010-04-02 19:12:54 +01:00
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley
e4db12423a Add Theme and Hide buttons to slide controller 2010-03-25 21:53:52 +00:00
Raoul Snyman
ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
rimach
9169870520 make Blank button workable 2010-03-20 00:02:23 +01:00
Tim Bentley
af5a52fa62 Fix service saving and cancelling 
Fix Red and Bla
 2010-03-14 17:05:50 +00:00
Jon Tibble
d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Tim Bentley
4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Tim Bentley
325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble
2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Jon Tibble
ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Tim Bentley
516b05e0ad Fix URF8, copyright and alert error 2010-02-17 20:17:33 +00:00
Jon Tibble
60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Tim Bentley
9c97660b73 Alerts now move between top and bottom 2010-02-13 07:37:03 +00:00
Tim Bentley
973d5e3dd8 Alerts move to top and bottom 2010-02-13 07:30:00 +00:00
Tim Bentley
47a61a6581 Finished moving alert code to plugin structure 2010-02-12 18:42:09 +00:00
Tim Bentley
944f45c8c8 Fix up song usage extract processing 2010-02-11 18:39:28 +00:00
Jon Tibble
6dfa580613 r701 2010-02-09 12:20:16 +00:00
Jon Tibble
f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Tim Bentley
079c9a4679 Key handling changes 2010-02-04 19:25:32 +00:00
Tim Bentley
dc6be31d1f Move changes to get displays working correctly and sort out Impress 2010-01-28 17:36:13 +00:00
Tim Bentley
dc7148b76e Fix screen display setup when returning from presentations 2010-01-28 11:46:25 +00:00
Tim Bentley
af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Tim Bentley
04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Tim Bentley
9beb6c7db5 Add Image layer and rename text layer 2010-01-25 20:34:47 +00:00
Jon Tibble
9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley
e6e6eeb7c0 Media and Blank screen now play together nicely. 2010-01-24 15:18:26 +00:00
Tim Bentley
ad40020169 Fix logging to single file 
Fix QMessage to displays on correct screen.
 2010-01-24 13:58:39 +00:00
Tim Bentley
c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Tim Bentley
56275fbc21 Remove prints for merge 2010-01-22 17:54:08 +00:00
Tim Bentley
9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Tim Bentley
85bada91ba Move towards sorting out renderer text sizes 2010-01-10 19:03:52 +00:00
Tim Bentley
ee8a92b77f fix screen lines calcs so they are correct. 
Prints added for rendering size diagnostics.
 2010-01-10 11:49:04 +00:00
Tim Bentley
6ef3f6aadc Lots of fixes: 
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
 2010-01-09 09:34:06 +00:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Tim Bentley
be3fecac20 Sort out Presentation plugin Handler 
* Allow 2 presentations to work at same time
* Sort out live / preview issues to stop cross messaging
 2009-12-13 22:08:10 +00:00
Tim Bentley
fe959f451f Fix up Alert generation (needs to be tested on duel screen) 2009-12-13 14:20:24 +00:00
Tim Bentley
480fc4771f Fix up song tagging so case does not matter 
Fix bug in transitions when using images
Remove MediaTab as not wanted
 2009-12-05 08:05:11 +00:00
Tim Bentley
6ebd1d9e60 Cleanup from rendering changes 2009-12-01 17:02:18 +00:00
Raoul Snyman
17548726a1 Merge from HEAD 2009-11-30 22:34:45 +02:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice. 
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
 2009-11-30 22:29:26 +02:00
Tim Bentley
939909fdd8 Remove Timer from transitions not needed 
Add Code to use the Verse Order to expand songs
 2009-11-29 21:03:24 +00:00
Raoul Snyman
a6d8813a50 Merge from HEAD, started changing the copyright to include Michael Gorven. 2009-11-29 22:30:41 +02:00
Raoul Snyman
910a61ce3f Merged in HEAD 2009-11-29 22:01:23 +02:00
Tim Bentley
d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Tim Bentley
1c60a29d68 Basic Tranisitions 2009-11-28 09:12:22 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values 
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
 2009-11-27 21:54:37 +00:00
Raoul Snyman
ce63999383 Various configuration option cleanups and changes. 2009-11-27 23:37:01 +02:00
Raoul Snyman
2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs 
bzr-revno: 671
 2009-11-15 09:02:27 +02:00
Raoul Snyman
461acc2bc8 Added a small fix, courtesy of Jon Tibble. 2009-11-14 22:18:14 +02:00
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking. 
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
 2009-11-13 23:24:59 +02:00
Raoul Snyman
8c599b6707 Fixed up an issue between the display screen and the blank button 2009-11-13 22:10:35 +02:00
Jon Tibble
f0e2fdd6f5 Fix multiple video plays 2009-11-13 17:43:58 +00:00
Jon Tibble
f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Tim Bentley
6df4e5a369 Remove transition code 2009-11-12 19:12:13 +00:00
Tim Bentley
9970ae8281 Transitions between slides 2009-11-12 17:48:49 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Tim Bentley
e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +00:00
Jon Tibble
37e2342a8c Unicode and import fixes 
bzr-revno: 668
 2009-11-12 17:18:30 +00:00
Tim Bentley
1eb41aab78 SlideController cleanups 2009-11-11 19:10:38 +00:00
Tim Bentley
ab12f73a21 spacing cleanups 2009-11-10 20:44:02 +00:00
Tim Bentley
f778948abb Reset Preview when exiting media 2009-11-10 06:13:59 +00:00
Tim Bentley
1c3c672e9b Add Media Preview to slideController 2009-11-09 20:27:25 +00:00
Tim Bentley
b6332e7ff5 Fix media previews ti work and not display the extra screens 2009-11-09 16:37:37 +00:00
Tim Bentley
9eb88a4300 Try to hide display screens for previews 2009-11-09 06:11:26 +00:00
Tim Bentley
bf63b2ae2f Fix up toolbar handing to stop toolbar going off screen 
Added Media Toolbar for the media items
Added it to Preview 
Added and wired in a volume control
 2009-11-09 05:58:45 +00:00
Jon Tibble
95acdbfde0 Fix import 2009-11-09 00:11:01 +00:00
Jonathan Corwin
e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Raoul Snyman
3853a257b3 Merged in display fixes from lp:~raoul-snyman/openlp/fixes 
bzr-revno: 657
 2009-11-05 19:33:38 +02:00
Raoul snyman
7a359c047a Renamed DisplayLabel to DisplayWidget 
Fixed typo in DisplayWidget.__init__
Changed MainDisplay.__init__ to call DisplayWidget.__init__ not QtGui.QWidget.__init__
Fixed issue where the display window was showing up on the primary display.
 2009-11-05 08:06:43 +02:00
Raoul Snyman
08786fdcec Fixed incorrect showing of image based on splash screen configuration. 
Fixed a bug where the display screen's image would not resize when the display screen was set to another desktop.
 2009-11-04 22:06:46 +02:00
Jon Tibble
84ce96f989 More truth testing cleanup - core 2009-11-03 18:14:25 +00:00
Jon Tibble
066cfcc830 Single monitor and usability fixes 2009-11-03 00:04:41 +00:00
Jon Tibble
d0145bd1e4 Video on multi-monitor setups 2009-11-02 18:05:52 +00:00
Tim Bentley
e3dd7842d4 Merge it right this time 
bzr-revno: 650
 2009-11-02 17:37:41 +00:00
Tim Bentley
0a6e3f47c7 Headr468 and fix 2009-11-02 17:24:27 +00:00
Jon Tibble
ad69f754b8 Enable multiple videos without restart 2009-11-02 01:03:27 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
8880a1b016 It works as long as you wont to play only 1 thing per service 2009-11-01 19:41:13 +00:00
Tim Bentley
c06b64fdbe Start to add the menu items to slide controller 2009-11-01 19:22:51 +00:00
Jon Tibble
359c2bee42 TRB Fixes 2009-10-29 17:16:24 +00:00
Jon Tibble
27d92e9202 Head r617 2009-10-22 14:44:24 +01:00
Jon Tibble
e37ae62079 Initial video fudging! 2009-10-19 18:51:21 +01:00
Tim Bentley
0bbbf8b6b8 General Tab fixes 2009-10-19 17:18:32 +01:00
Tim Bentley
efec5e1e95 Backgounds now appear in Theme editor 2009-10-18 08:49:47 +01:00
Tim Bentley
7273ff3d2f Display Screen handling improvements 2009-10-17 17:11:41 +01:00
Tim Bentley
1082428926 Show Splash screen option now works 2009-10-17 14:29:01 +01:00
Tim Bentley
b11a068a8f Inspired by Jon 2009-09-28 21:45:04 +01:00
Jon Tibble
e5db2456e7 Remove unused imports 2009-09-25 01:43:42 +01:00
Jon Tibble
a224d6a895 Improve readability for white space patch 2009-09-21 20:26:10 +01:00
Jon Tibble
98ea9141f4 More white space and line length fixes 2009-09-21 18:56:36 +01:00
Raoul Snyman
fb9914fb08 Changed the license info from docstrings to normal comments. 2009-09-08 21:58:05 +02:00
Tim Bentley
63f67ea756 EventManager Removal - complete 2009-08-26 06:00:19 +01:00
Tim Bentley
7ec0a53d77 SlideController clean up part 2 2009-08-24 05:30:04 +01:00
Tim Bentley
46cf6c763c Clean up event structure and add calling names 
Clean up Remote client to remove qt dependancy
 2009-08-12 05:57:24 +01:00
Tim Bentley
161973eef6 Clean up exit code so plugins can be called 
Clean up Alerts Tab so can be called from UI and Remote via events
Start to get events to be called sequentially not nested
Fix up merge issues
 2009-08-10 21:10:20 +01:00
Raoul Snyman
82101b8c65 Fixed a few bits and bobs 2009-08-09 14:05:54 +02:00
Raoul Snyman
bf09df4f0b Made some minor modifications to the edit song dialog, one or two other bug fixes. 2009-08-06 23:30:14 +02:00
Raoul Snyman
2fb7ff511e Make the "Song Maintenance" button on the SongEdit form to work; Include a merge from trunk. 2009-08-06 16:51:38 +02:00
Raoul Snyman
4e1656961b Merged from trunk. 2009-08-06 15:17:36 +02:00
Tim Bentley
9da5a3223f Fix song conversions 
Fix focus for Song dialog
Preserve state when moving serviceitems
 2009-07-21 19:10:14 +01:00
Tim Bentley
6861877c3d Clean up Alerts code to use correct timmers 
code now allows slides and songs to change with alert still active
 2009-07-19 08:40:31 +01:00
Tim Bentley
f586d9bf5e Update images and rename some. 
More changes to slidecontroller and friends
 2009-07-03 20:08:21 +01:00
Tim Bentley
42d196d751 Corrections from last merge 
Clean up Bibles plugin
Clean up Custom plugin
Fix python 2.6 error mesage.
 2009-06-17 06:11:16 +01:00
Tim Bentley
e2b8af7073 Mass Unicode migration 
Fix bugs found in retesting the app.
 2009-06-16 19:21:24 +01:00
Raoul Snyman
a8307e430b Changed QPixmaps to QImages to see the difference. 2009-06-10 17:37:33 +02:00
Tim Bentley
ed73a78e95 Add double clicks to songs and customSlide 
More code cleanups
 2009-06-07 20:34:24 +01:00
Raoul Snyman
473bb289b6 Fixed displaying of "display" label on the display form. 
Display form is displayed on the correct screen at startup.
Display form switches to active non-primary screen or hidden on primary screen after set in the settings dialog.
A few syntax tidy-ups.
Made the loading and saving of things to the "registry" better.
 2009-06-05 20:53:50 +02:00
Tim Bentley
30154f2127 Lots for fixes: 
- General Tab now saves and retrieves
- Alert Dialogs now alerts
- Renderer - More fixes
- SlideController looks better.
- Removal of poked in Managers all accessed via Parent.
 2009-06-01 18:50:37 +01:00
Tim Bentley
da0acea229 Phase1 operation superfly 2009-05-20 21:17:20 +01:00
Tim Bentley
47c0b69d36 Finish the Theme work to save all themes and replay them on reload 
Add rules as to which theme to use in the RenderManager
 2009-05-18 20:04:25 +01:00
Tim Bentley
46efe3188e Add Images to the themes 
Fix MainDisplay to record change of frame when blanked out.
 2009-05-16 20:47:30 +01:00
Tim Bentley
df51cd18d4 Close display window on exit 
Performance improvements in renderer
Performance improvements in Thememanager
Fix review comments from last few reviews
Add new media types to media plugin_helpers
Code format cleanups.
 2009-05-16 11:24:03 +01:00
Tim Bentley
643be2ca5e Fix screen close 2009-05-04 14:51:56 +01:00
Tim Bentley
13766fc7c7 Fixes to formatting and rendering 
Add Blank screen functionality
 2009-05-04 14:48:12 +01:00
Tim Bentley
e5ba8b73a6 More servicing changes (Preview and Live) behave and can be selected. 
Setup Slidecontroller so it has an identity
Setup SlideController so it knows anout the display
Fix maindisplay view bugs
 2009-05-03 08:20:15 +01:00
Raoul Snyman
717e56fff7 Updated the handling of dual displays. 2009-05-01 13:50:09 +02:00
Tim Bentley
c8726a3892 Latest version with new displays 2009-04-28 20:40:51 +01:00
Tim Bentley
e6c2ca29c8 Add new display window. 2009-04-28 20:19:20 +01:00