Commit Graph

252 Commits

Author SHA1 Message Date
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 14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley 231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley 5d79141cfc Verse tagging - combo complete 2009-12-06 16:50:13 +00:00
Tim Bentley 528004df23 Start to add change in toolbar 2009-12-06 13:55:07 +00:00
Tim Bentley 40523ed0f6 Toolbar fixups 2009-12-06 08:39:56 +00:00
Raoul Snyman 583d96b5d1 Song Verses Toolbar: Phase 1
- Convert verse icons to drop-down verse menu.
2009-12-06 09:14:11 +02: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 b8149cc826 Fix up Icon code to use isinstance
Fix up code to ignore cases when doing tests.
2009-12-04 20:25:48 +00:00
Tim Bentley 1b6ad5814b Verse Tagging complete 2009-12-02 11:22:48 +00:00
Tim Bentley a2ff6433ba Build Dynamic Icons for SlideController 2009-12-02 10:59:54 +00:00
Tim Bentley 156a70208b Add new types to verse editing
Clean up dialog so looks better
Add controls around the editor in terms of validation
2009-12-02 08:35:02 +00: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
Raoul Snyman 47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02: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 8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley 77b0da2c41 Tidy ups pre merge 2009-11-29 19:00:10 +00:00
Tim Bentley 829e4976e2 Slide Controller refactoring ready for Verse changes 2009-11-29 08:33:46 +00: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 d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley 365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley f9f4cc2518 Renderer cleanups and fixes 2009-11-15 07:07:40 +00:00
Raoul Snyman 2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs
bzr-revno: 671
2009-11-15 09:02:27 +02:00
Tim Bentley 98e4b47d91 headr670 2009-11-14 17:01:14 +00:00
Tim Bentley 78fd8efdf7 Remove unneed varables
Move code into serviceItem
Fix up splitter code
2009-11-14 12:24:27 +00:00
Tim Bentley 26b9274604 ServiceItem cleanup - fix presentation issues 2009-11-14 11:47:10 +00:00
Tim Bentley 3ecec95aca ServiceItem cleanup - remove code duplication 2009-11-14 11:44:06 +00:00
Tim Bentley b0ae4e4ceb ServiceItem cleanup - fix media playing 2009-11-14 10:51:58 +00:00
Tim Bentley b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley 0aca1665be ServiceItem cleanup - remove CommandItem 2009-11-14 09:37:54 +00:00
Tim Bentley ad6abb1e9c ServiceItem cleanup - hide lists 2009-11-14 09:02:30 +00:00
Tim Bentley e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Raoul Snyman 9e96aac849 Make sure screen and button are still black after coming back from media. 2009-11-13 23:37:11 +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
Raoul Snyman 262577bd6e Removed an unused parameter from addToolbarButton, and added a "checkable" argument. 2009-11-13 20:46:47 +02:00
Jon Tibble 3defb3b4c5 SPG 2009-11-13 17:42:51 +00:00
Jon Tibble f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Tim Bentley e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +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 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
Tim Bentley bc28e3e78f Clean up slide sizes part 2 2009-11-08 17:40:43 +00:00
Tim Bentley ebce104f30 Clean up slide sizes part 1 2009-11-08 17:02:46 +00:00
Tim Bentley 5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
Tim Bentley f3f3906ca0 Add test to stop icons going over the limit 2009-11-08 09:09:23 +00:00
Tim Bentley 66a6dfd42a Add icon to slidecontroller/nAdd inital icons /nFix ToolBar for Media" 2009-11-08 08:58:31 +00:00
Jonathan Corwin c10b4742be Presentation fixes
bzr-revno: 662
2009-11-07 19:39:52 +00:00
Jonathan Corwin 337df8da9f Fix Impress off-by-one and slow slide update problems Meths found 2009-11-07 16:45:49 +00:00
meths@btinternet.com eba4115490 Fix file handling
bzr-revno: 660
2009-11-07 06:45:25 +00:00
Jon Tibble ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Jonathan Corwin e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Tim Bentley 831281e293 More remote editing cleanups 2009-11-05 17:03:37 +00:00
Jon Tibble 2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble 85d4466c76 Head r653 2009-11-03 19:21:58 +00:00
Jon Tibble 84ce96f989 More truth testing cleanup - core 2009-11-03 18:14:25 +00:00
Tim Bentley 8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Jon Tibble ad69f754b8 Enable multiple videos without restart 2009-11-02 01:03:27 +00:00
Tim Bentley c06b64fdbe Start to add the menu items to slide controller 2009-11-01 19:22:51 +00:00
Tim Bentley 6df0649fbc Video cleanup part1 2009-11-01 16:06:59 +00:00
Tim Bentley 70b04f5821 Headr644 2009-11-01 15:31:22 +00:00
Tim Bentley 201fce5bba Headr642 2009-11-01 15:29:53 +00:00
Tim Bentley 7a349c998e Fix up handling of service items in the slide controllers and stop editing issues 2009-10-31 20:27:08 +00:00
Tim Bentley 258bf403c8 Sort out number of buttons on SlideController to match song and make more KITT like 2009-10-31 09:03:54 +00:00
Tim Bentley 4eaa7a1535 Finish remote editing of ServiceManager by updating live 2009-10-31 08:45:24 +00:00
Jon Tibble 1db3cda76b Head r637 2009-10-29 17:19:04 +00:00
Tim Bentley 81de929460 Minor fixes 2009-10-29 15:57:58 +00:00
Tim Bentley 60649e3624 Move Audit to SongUsage 2009-10-27 08:38:02 +00:00
Jon Tibble abafa78958 Head r629 2009-10-26 23:51:48 +00:00
Tim Bentley 3ee930f6ae Fix Line split code. Stop SlideController being editied 2009-10-26 16:19:26 +00:00
Tim Bentley 4833f7cd0b Add Song Tab option to remove them 2009-10-26 06:30:08 +00:00
Tim Bentley 19e27dbc95 Add Song verses to menu bar 2009-10-26 06:09:33 +00:00
Raoul Snyman d54a023611 Merged in Windows changes. 2009-10-25 23:36:04 +02:00
Raoul Snyman e95eb437e2 Removed the QLabels from text service items. It's nigh impossible to dynamically style QLabels in QTableWdigetItems. 2009-10-25 23:33:07 +02:00
Raoul Snyman 07468597aa Just changed the SlideController selection back for the moment. 2009-10-25 22:20:03 +02:00
Raoul Snyman 8133cea273 Merge from trunk 2009-10-25 21:19:25 +02:00
j@corwin.co.uk 4871acd05c More presentation fixes
bzr-revno: 626
2009-10-25 14:39:45 +00:00
Tim Bentley bad24ee614 Finally fix redisplaying of correct slide 2009-10-25 08:09:41 +00:00
Jonathan Corwin 60b0120e56 Fix merge conflict 2009-10-24 20:53:49 +01:00
Jonathan Corwin e0f9f3f09e Keep item in slidecontroller in sync with presentation, and detect external slide changes. 2009-10-24 20:22:00 +01:00
Tim Bentley 8c86edb0b6 Headr624 2009-10-24 19:16:04 +01:00
Tim Bentley 7b54d89039 Preserve selected slide on editing 2009-10-24 19:11:02 +01:00
Jon Tibble aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley abd66af1c4 Fix extra utf8 strings 2009-10-24 17:00:43 +01:00
Tim Bentley 23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +01:00
Raoul Snyman a94f5c9e0d Merge from lp:~raoul-snyman/openlp/i18n
bzr-revno: 621
2009-10-24 11:33:20 +02:00
Jon Tibble fac8bb8dd3 Fix ServiceType -> ServiceItemType change 2009-10-23 23:54:29 +01:00
Jonathan Corwin ee076e306e First stab at showing ppt output in mini-live-display 2009-10-23 23:47:22 +01:00
Raoul Snyman 90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Raoul Snyman 8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Raoul Snyman 2bf6fe0227 Made the dark->lighter selection colour slightly stronger. 2009-10-21 21:39:55 +02:00
Raoul Snyman ee6465d8a5 Made highlight colour slightly lighter/darker than background. 2009-10-20 21:41:15 +02:00