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

1441 Commits

Author SHA1 Message Date
Tim Bentley 1b1b811cb7 Custom display footer if Credit required 2009-12-14 18:10:00 +00:00
Tim Bentley 2f09c70274 Presentation cleanup - finished for now 2009-12-14 17:05:53 +00:00
Tim Bentley 1271eac76e Correct comment 2009-12-14 16:55:58 +00: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 d676430ffa Add option to Custom to suppress the footer. 
Not always needed for Copyright.
Default Required
 2009-12-13 08:57:58 +00:00
Tim Bentley f7f0f18142 Fix bug with Verse Tags being lost when expanding or contracting the verse edit list 2009-12-13 08:28:51 +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 aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Tim Bentley 540f63c9de Fix Theme handling so Song level works again 
bzr-revno: 686
 2009-12-10 17:03:21 +00:00
Tim Bentley 3cc63840f4 Fix up theme string issues to False is matched 
Remove any Print statements
 2009-12-09 17:09:45 +00:00
Tim Bentley 9893a887ab Add slideTransition Flag to theme to allow for transitions to be turned off at theme level 2009-12-08 17:52:45 +00:00
Tim Bentley 4158ae458e Clean up ServiceItem usage in ServiceManager 2009-12-08 17:04:27 +00:00
Tim Bentley 26dd28d083 Remove unneeded code 2009-12-06 19:22:41 +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 a745d15a98 Remove the media tab correctly 2009-12-05 09:44:44 +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 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 547074d29a Verse tagging verses must be in format of vX 2009-12-04 18:52:44 +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 7eeb81f00a Head683 2009-12-01 17:02:34 +00:00
Tim Bentley 6ebd1d9e60 Cleanup from rendering changes 2009-12-01 17:02:18 +00:00
Michael Gorven 9f5d1956ac Merge lp:~mgorven/openlp/copyright-symbol: Fix copyright symbol in translation strings. 
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399

bzr-revno: 683
 2009-12-01 09:13:35 +02: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
Raoul Snyman 074b639635 Removed "Video Mode Rendering" as it is no longer relevant (or even related!) 2009-11-30 20:26:37 +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
Michael Gorven ba89e6e1a2 Fix copyright symbol in translation strings. 2009-11-30 08:39:36 +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 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 f46cd2c6cb Song validation changes 2009-11-29 18:21:40 +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 ff8ab8f14f Fix song editing validation 2009-11-29 14:06:41 +00: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 2247d01d6f Verse Tag editing - Add, Edit, Edit All and save work 2009-11-28 07:50:12 +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 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