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

960 Commits

Author SHA1 Message Date
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 ca7d032aa5 Correct Icon Path 2009-12-02 09:20:40 +00:00
Tim Bentley 250fd4e41b Fix Icons on toolbar 2009-12-02 08:55:15 +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
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 9f80c5a742 Fix problem with slide controller 
soften the renderer transition
 2009-11-30 19:51:29 +00:00
Raoul Snyman 47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Tim Bentley 6380cc5126 Fix up song verse expansion to handle no verse order 
Fix bug in slide controller when no slide and button is pressed
 2009-11-30 18:22:43 +00: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 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
Raoul Snyman 420b0ef68d Merged in Michael's changes from the AST module and resolved some conflicts. 2009-11-29 16:18:42 +02:00
Raoul Snyman ae905abfde Spruced up the About page. Made a few configuration key changes. 2009-11-29 16:07:25 +02:00
Tim Bentley 829e4976e2 Slide Controller refactoring ready for Verse changes 2009-11-29 08:33:46 +00:00
Tim Bentley f04e5c078a Head677 2009-11-28 12:39:13 +00:00
Tim Bentley d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Michael Gorven 2bd1ff755b Merge lp:~mgorven/openlp/get-strings-ast: Use AST module to parse code and extract translation strings. 
https://code.launchpad.net/~mgorven/openlp/get-strings-ast/+merge/15328

bzr-revno: 677
 2009-11-28 14:09:17 +02: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
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 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 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 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 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 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 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
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
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
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
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
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 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
Jon Tibble 0ea45cd366 Head with correct song edit fix 2009-11-04 18:21:08 +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 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 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
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 d58327435a Media is starting to work - just 
bzr-revno: 646
 2009-11-01 20:21:49 +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 9dae67ac0a Clean up version notifications and checking 2009-11-01 09:07:10 +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 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 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 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 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
Jon Tibble 1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +00:00
Tim Bentley dd919d4ccf Headr633 and merge resolution 2009-10-29 13:58:03 +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 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 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 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
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 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@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 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