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
Michael Gorven 662962abef Merge from trunk. 2009-11-27 13:00:01 +02:00
Raoul Snyman d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley 8dc0742e1e Headr676 2009-11-26 18:42:00 +00:00
Tim Bentley 1d359c7503 More Song tagging fixes 2009-11-26 18:41:39 +00:00
Raoul Snyman 4d715a3d5d Moved i18n to resources (better place for it). 
Fixed up openlp-get-strings.py to use the new TS file location.
Started fixing up the trUtf8() strings.
 2009-11-24 21:51:41 +02:00
Raoul Snyman d42a6a53e1 Merged in changes from trunk 2009-11-24 21:10:54 +02:00
Raoul Snyman a3714e98d1 Lowercased config settings (they are case insensitive). 
Made text render antialiased.
 2009-11-24 21:08:53 +02:00
Tim Bentley fe2d35a937 More song tagging changes - fixes 2009-11-23 17:54:47 +00:00
Tim Bentley 5e2beba4ea More song tagging changes 2009-11-23 17:28:21 +00:00
Tim Bentley 50aa143446 Save verse details 2009-11-22 20:51:52 +00:00
Tim Bentley 388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Tim Bentley 56c69bd8e8 Fix up renderer to protect it from Gushie 2009-11-21 14:32:19 +00:00
Raoul Snyman 461acc2bc8 Added a small fix, courtesy of Jon Tibble. 2009-11-14 22:18:14 +02: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
Tim Bentley 8da19172a7 Slide Controller cleanups and Media bug fixes 
bzr-revno: 669
 2009-11-12 19:51:58 +00:00
Tim Bentley 6df4e5a369 Remove transition code 2009-11-12 19:12:13 +00:00
Tim Bentley 04873758e9 Remove extra Video 2009-11-12 19:05:24 +00:00
Tim Bentley 124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +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
Jon Tibble a821179a63 A unicode fix for themes 2009-11-12 00:49:55 +00:00
Jon Tibble b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +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 0170d09c21 Add media Preview code 
bzr-revno: 666
 2009-11-10 19:03:05 +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
Tim Bentley ff8e181d19 Clean up slidecontroller 
bzr-revno: 665
 2009-11-08 18:35:56 +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 00ed999964 Fix bugs in theme and slidecontroller 
bzr-revno: 664
 2009-11-08 15:20:48 +00:00
Tim Bentley f18ba14fc9 remove print for log 2009-11-08 14:16:02 +00:00
Tim Bentley 5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
Tim Bentley 85e158c458 SlideController cleanups 
bzr-revno: 663
 2009-11-08 13:36:45 +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
Tim Bentley f0e0cfa4c1 Head552 2009-11-08 07:22:12 +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
Tim Bentley 1bedf56dc3 Plugin clean ups 
bzr-revno: 661
 2009-11-07 16:19:18 +00:00
Tim Bentley 381e91294f Fix blocking for Active/Inactive 2009-11-07 14:58:24 +00:00
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