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

1385 Commits

Author SHA1 Message Date
Tim Bentley 2e02f1c94f Remove "Can_be_disabled" as no longer require 
Sort out status handling in plugin form.
 2009-11-07 07:42:18 +00:00
Tim Bentley 6148d845ae Headr660 2009-11-07 06:49:14 +00:00
meths@btinternet.com eba4115490 Fix file handling 
bzr-revno: 660
 2009-11-07 06:45:25 +00:00
Tim Bentley 87d3cbf289 Remote editing for custom and theme fix 
bzr-revno: 659
 2009-11-07 00:05:34 +00:00
Jon Tibble ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Jonathan Corwin 65736ef8d1 Fix a couple of issues with last commit 2009-11-06 19:23:58 +00:00
Tim Bentley 38e3ca66cb Fix error in previous merge for ThemeManager 
Get Custom Working with remote editing
 2009-11-06 18:50:46 +00:00
Tim Bentley b6602e67d4 Headr658 2009-11-06 17:36:38 +00:00
Tim Bentley 4f495da735 Remote Edit for Custom 2009-11-06 17:36:18 +00:00
Jon Tibble aa8b7c3fe5 Clean theme handling 
bzr-revno: 658
 2009-11-06 15:38:30 +00:00
Michael Gorven a89cec05da Change to Unicode string. 2009-11-06 11:52:04 +02:00
Michael Gorven 4ee481ca6e Change to Unicode string. 2009-11-06 11:52:04 +02:00
Tim Bentley 6139f049d4 Refactor Service Item and clean up Slide Controller 
bzr-revno: 673
 2009-11-15 16:57:11 +00: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 02ad0595d7 ServiceItem cleanup - hide lists 2 2009-11-14 09:06:25 +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
Jon Tibble f0e2fdd6f5 Fix multiple video plays 2009-11-13 17:43:58 +00: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
Jon Tibble b79d535e04 Fix theme loading logic and missing item from cleaning 2009-11-12 23:49:35 +00:00
Jon Tibble b6eadecb46 isfile test doesn't need try 2009-11-12 23:46:20 +00:00
Jon Tibble 1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Jon Tibble 1c0a86b17f Simplify OS path setting 2009-11-12 23:33:59 +00:00
Jon Tibble 74b08cb9c4 Clean theme loading 2009-11-06 02:12:56 +00:00
Jonathan Corwin e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Tim Bentley cfd5b536c7 Headr657 2009-11-05 17:50:57 +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
Tim Bentley 831281e293 More remote editing cleanups 2009-11-05 17:03:37 +00:00
Tim Bentley 536d26f5db Headr656 2009-11-05 16:43:54 +00: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
Jon Tibble d5e2ba7808 Fix double checks 2009-11-05 00:28:05 +00:00
Jon Tibble 62031c24b9 Fix last theme.parse() without a cleanTheme() 2009-11-05 00:09:19 +00:00
Jon Tibble 3d56391d1c Fix typo 2009-11-04 23:16:33 +00:00
Jon Tibble c8226bf2fc Fix mismerge 2009-11-04 23:13:17 +00: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
Tim Bentley 03607395eb Song editing utf8 fixes part 2 2009-11-04 19:13:49 +00:00
Tim Bentley 3929792bea Headr655 2009-11-04 18:53:19 +00:00
Tim Bentley f4d373e7a5 Song editing utf8 fixes part 1 2009-11-04 18:53:05 +00:00
Jon Tibble 0ea45cd366 Head with correct song edit fix 2009-11-04 18:21:08 +00:00
Tim Bentley 4e9aa7f142 Fix song editing error messages 
bzr-revno: 654
 2009-11-04 18:16:35 +00:00
Tim Bentley 4a05f6e9cf Fix song editing 2009-11-04 17:48:46 +00:00
Jon Tibble 2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble 5b4ce8124d Fix theme loading 2009-11-03 20:04:38 +00:00
Jon Tibble 85d4466c76 Head r653 2009-11-03 19:21:58 +00:00
Tim Bentley 7029235f45 Expansion and Song editing fixes 
bzr-revno: 653
 2009-11-03 19:12:02 +00:00
Jon Tibble c2a0944e6b More truth testing cleanup - plugins 2009-11-03 19:01:53 +00:00
Tim Bentley 2d690c209d Fix phantom expansion in Service Manager 2009-11-03 18:39:58 +00:00
Jon Tibble 84ce96f989 More truth testing cleanup - core 2009-11-03 18:14:25 +00:00
Jon Tibble 51915d0e97 Truth testing cleanup 2009-11-03 15:13:52 +00:00
Tim Bentley 89e0aee373 Headr651 2009-11-03 06:16:27 +00:00
Tim Bentley 8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Jon Tibble debaf91298 Fix media icon initialisation 2009-11-03 01:38:15 +00:00
Jon Tibble 7f176bf16f Improve iterator use 2009-11-03 01:37:08 +00:00
Jon Tibble 7767746f7a More usability fixes 2009-11-03 01:12:35 +00:00
Jon Tibble 066cfcc830 Single monitor and usability fixes 2009-11-03 00:04:41 +00:00
Tim Bentley 2d473d9436 Headr650 2009-11-02 18:08:16 +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 29119c91a4 Minor fixes and copyright 
bzr-revno: 649
 2009-11-02 17:30:37 +00:00
Tim Bentley 0a6e3f47c7 Headr468 and fix 2009-11-02 17:24:27 +00:00
Jon Tibble a1d29862a4 Enable consecutive video playing 
bzr-revno: 648
 2009-11-02 13:46:26 +00:00
Jon Tibble ad69f754b8 Enable multiple videos without restart 2009-11-02 01:03:27 +00:00
Jon Tibble 9b0f62d01e Fix plugin translation 2009-11-01 23:15:19 +00:00
Tim Bentley 8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley e96f54758d Headr646 2009-11-01 20:26:21 +00:00
Tim Bentley d58327435a Media is starting to work - just 
bzr-revno: 646
 2009-11-01 20:21:49 +00:00
Tim Bentley f014c633ac Clean up the version code and remove not required file 
bzr-revno: 645
 2009-11-01 20:18:00 +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
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 282c6a4b5e Remove unused file 2009-11-01 15:28:06 +00:00
Tim Bentley 3cbd601e1c Fix up editing code from Preview and ServiceManager 
bzr-revno: 643
 2009-11-01 15:25:36 +00:00
Tim Bentley 9dae67ac0a Clean up version notifications and checking 2009-11-01 09:07:10 +00:00
Tim Bentley 3349a8fd82 Headr642 2009-10-31 20:39:52 +00:00
Tim Bentley 8420e4a438 Custom plugin fixes 2009-10-31 20:38:57 +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
Jon Tibble 2d464e0d15 Fix typos 2009-10-31 16:17:26 +00:00
Tim Bentley 686f34b7f9 Remote Song Editing Finished - minor other changes 
bzr-revno: 641
 2009-10-31 11:58:47 +00:00
Tim Bentley 9eeaf98b66 Fix error handling for double exception call. Added debugging for Song XML class 2009-10-31 10:19:30 +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
Tim Bentley b6ada60177 Fixes to Renderer etc 
bzr-revno: 640
 2009-10-30 22:15:50 +00:00
Tim Bentley 4695d711f8 Fix names before Raoul sees them 2009-10-30 22:03:09 +00:00
Tim Bentley b16a8cc452 Headr639 2009-10-30 21:47:15 +00:00
Tim Bentley 7b1de0f995 Move version check 2009-10-30 21:45:38 +00:00
Jon Tibble 28a223bc06 Fix double loading 2009-10-30 20:34:11 +00:00
Tim Bentley 2f12c075c2 Fix theme editing where previous image is cached on change of image 2009-10-30 20:21:36 +00:00
Tim Bentley 48e750ded2 Add Save service on New code, and configuration to turn it off. 2009-10-30 20:14:55 +00:00
Jon Tibble 68a7fbcf56 Fix bible function call 2009-10-30 19:29:02 +00:00
Jon Tibble ae67228139 Fix OnNewPrompt i18n 2009-10-30 19:15:25 +00:00
Jon Tibble 7eb86b1580 Plugin cleanups and more i18n 2009-10-30 17:44:16 +00:00
Tim Bentley 0d959fbfb1 Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit 2009-10-30 06:43:28 +00:00
Jon Tibble fb1da41f34 Fix song icon in services 2009-10-30 01:27:30 +00:00
Jon Tibble fe9728f187 Finish the copyright updating 2009-10-30 01:26:45 +00:00
Jon Tibble e662b785db Fix font names in theme editing 2009-10-29 23:27:45 +00:00
Jon Tibble 490b19ddc2 Enable media additions to ServiceManager and fixes 2009-10-29 18:25:34 +00:00
Jon Tibble 1db3cda76b Head r637 2009-10-29 17:19:04 +00:00
Jon Tibble 359c2bee42 TRB Fixes 2009-10-29 17:16:24 +00:00
Tim Bentley 2f03004bcd Minor fixes 
bzr-revno: 637
 2009-10-29 16:21:58 +00:00
Jon Tibble e519f729f1 Fix unnecessary screen setup 2009-10-29 16:01:33 +00:00
Tim Bentley 81de929460 Minor fixes 2009-10-29 15:57:58 +00:00
Tim Bentley 61aeb43240 Headr635 2009-10-29 15:35:37 +00:00
Jon Tibble 1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +00:00
Tim Bentley 3c6d1e7efb Edit Songs and Custom for Service Manager and auto replace 
bzr-revno: 634
 2009-10-29 15:10:58 +00:00
Tim Bentley dd919d4ccf Headr633 and merge resolution 2009-10-29 13:58:03 +00:00
Tim Bentley 1c11b93180 Works for now 2009-10-29 13:48:50 +00:00
Tim Bentley 472857535f headr632 2009-10-29 13:44:52 +00:00
Tim Bentley 302d29ea85 More remote edit changes 2009-10-29 13:44:33 +00:00
Jon Tibble 2a0e5d6726 Fix i18n for New Theme typo 2009-10-29 13:19:31 +00:00
Jon Tibble c6f6624605 Fix i18n for New Theme 2009-10-29 13:11:45 +00:00
Jon Tibble eb61003c8e Fix plugintabs i18n 
bzr-revno: 632
 2009-10-29 13:00:48 +00:00
Tim Bentley 0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Tim Bentley d93551caf3 Add more bible sources and improve handling 
bzr-revno: 631
 2009-10-29 07:31:27 +00:00
Tim Bentley b447e382ad Strange spacing appeared from nowhere 2009-10-29 06:45:37 +00:00
Tim Bentley 8e4f69383c Style fixes 2009-10-29 06:24:53 +00:00
Jon Tibble 8de21d057f PluginNameVisible without splitting __init__ 2009-10-29 01:48:43 +00:00
Jon Tibble 5ed004c772 Fix PresentationPlugin finalising 2009-10-28 22:22:35 +00:00
Jon Tibble fcd5836e0f Fix i18n for tabs v3 2009-10-28 21:52:13 +00:00
Jon Tibble 439c3c90ca Fix i18n for visible and non-visible title use 2009-10-28 21:04:14 +00:00
Tim Bentley ccb54e4faf BibleGateway - Download files and add to selections 2009-10-28 20:57:14 +00:00
Tim Bentley 19e8682bf8 Add BibleGateway List and access it 2009-10-28 18:35:06 +00:00
Jon Tibble 2eccd57aca Fix mediaitem.pys i18n 2009-10-28 01:36:24 +00:00
Jon Tibble c34d452bb6 Fix plugintab.py i18n 2009-10-28 01:17:35 +00:00
Tim Bentley db392aa086 Fix typos 2009-10-27 20:52:30 +00:00
Tim Bentley fe625ee1ff Move Audit to SongUsage , Return of BibleGateway part1. Additions to SlideController 
bzr-revno: 630
 2009-10-27 20:49:16 +00:00
Tim Bentley 0e5ed927c1 More BibleGateway work - no prints 2009-10-27 17:25:58 +00:00
Tim Bentley 1c0ce26e54 More BibleGateway work 2009-10-27 16:55:09 +00:00
Tim Bentley 60649e3624 Move Audit to SongUsage 2009-10-27 08:38:02 +00:00
Tim Bentley 03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +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 6dd0db436e Split if line contains 3 --- can allow for spaces at end of line 2009-10-26 08:23:43 +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
Tim Bentley 279d589b7b Headr629 2009-10-26 05:36:38 +00:00
Tim Bentley 9569042275 Yet more audit work 2009-10-26 05:36:19 +00:00
raoul.snyman@saturnlaboratories.co.za 706db6923b Fix i18n issues 
bzr-revno: 629
 2009-10-26 05:34:44 +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
Tim Bentley 3f69bb7635 "Save and Preview" added to Song editor 2009-10-25 18:07:23 +00:00
Tim Bentley da4a26ef5f Service Items can now have their theme changes at run time. 2009-10-25 16:26:03 +00:00
Raoul Snyman 8de8638ba9 Merged trunk, Fixed up odd trUtf8 2009-10-25 18:12:41 +02:00
Tim Bentley 5f25ffd267 Headr626 2009-10-25 14:41:29 +00:00
Tim Bentley 68bc9bf526 Audit report work 2009-10-25 14:41:15 +00: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
Tim Bentley 7b85b9c7af More Song editing fixes 2009-10-24 20:43:16 +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 df886ef501 Headr622 2009-10-24 16:54:37 +01:00
Tim Bentley 6d5505dbc6 Fix Song editing 2009-10-24 16:54:07 +01:00
Jon Tibble d61b8b95df Fix imports and config item 
bzr-revno: 622
 2009-10-24 16:47:14 +01:00
Tim Bentley 23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +01:00
Raoul Snyman 08c852f8ee Fixed problem in "AmendThemForm" 2009-10-24 13:46:57 +02:00
Raoul Snyman 803987d402 Not quite - I needed to cast it to unicode. 2009-10-24 13:14:26 +02:00
Raoul Snyman 47edd31b58 Let's try fix the version check message. 2009-10-24 13:12:10 +02:00
Tim Bentley 4f211d24e0 Fix theme editor 2009-10-24 11:04:35 +01:00
Tim Bentley 76fa3438c4 Headr621 2009-10-24 10:55:25 +01:00
Raoul Snyman a94f5c9e0d Merge from lp:~raoul-snyman/openlp/i18n 
bzr-revno: 621
 2009-10-24 11:33:20 +02:00
Tim Bentley 2c1c202e5b Fixed edit theme to preview render bug 2009-10-24 08:22:44 +01:00
Tim Bentley 2181655239 Headr620 2009-10-24 06:59:07 +01:00
Tim Bentley cdf4e46b07 Fix abbriviations for searchs 2009-10-24 06:58:49 +01:00
Jon Tibble 21882cd15d Stray config item under image instead of images 2009-10-24 00:42:53 +01: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
Jonathan Corwin b8810abd4b Impress fixes 2009-10-23 21:22:16 +01:00
Raoul Snyman 90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Tim Bentley 4c35fc81a5 Fix rendering bug 2009-10-23 18:09:09 +01:00
Tim Bentley 6c5ccc101b Font Siziing and rendering improvements 2009-10-23 17:10:09 +01:00
Raoul Snyman 8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Tim Bentley 67ab01df01 Minor corrections 2009-10-22 20:07:32 +01:00
Tim Bentley 979ba02b02 Add Lines per slide and wrap indentation 2009-10-22 20:03:08 +01:00
Jon Tibble 27d92e9202 Head r617 2009-10-22 14:44:24 +01:00
Jon Tibble b37b95d928 Rename to ServiceItemType and add Video type 2009-10-22 14:43:49 +01:00
Raoul Snyman 2bf6fe0227 Made the dark->lighter selection colour slightly stronger. 2009-10-21 21:39:55 +02:00
Tim Bentley 20ca8340b9 Fix up bible plugin so it works again 2009-10-21 17:54:59 +01:00
Raoul Snyman 5035f79f50 Started working on a non-UI converter (for web-based import). 2009-10-21 18:11:58 +02:00
j@corwin.co.uk d101a38c1c Presentation fixes for Impress 
bzr-revno: 616
 2009-10-21 17:02:37 +01:00
raoul.snyman@saturnlaboratories.co.za adc769fff0 Fix Bible Media manager look and feel 
bzr-revno: 615
 2009-10-21 05:57:45 +01:00
raoul.snyman@saturnlaboratories.co.za 83e5a916a3 Fix Slide Controller look and feel 
bzr-revno: 614
 2009-10-21 05:55:49 +01:00
Jonathan Corwin f17ae4dcb3 Fix a couple of Impress load/reload bugs 2009-10-20 23:36:08 +01:00
Raoul Snyman ee6465d8a5 Made highlight colour slightly lighter/darker than background. 2009-10-20 21:41:15 +02:00