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

1022 Commits

Author SHA1 Message Date
Tim Bentley 6f87c362d1 Use Icon to show we have Notes 2010-03-07 20:45:27 +00:00
Tim Bentley 5560aac575 Fix expanding service items 2010-03-07 19:22:54 +00:00
Tim Bentley 77e671bd78 Remove unneeded version tagging 2010-03-07 06:42:22 +00:00
Jonathan Corwin 714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Tim Bentley d3564b2df7 Fix translation 2010-03-06 14:08:51 +00:00
Tim Bentley 1932ed886e Fix up service notes 2010-03-06 08:00:36 +00:00
Jon Tibble d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Raoul Snyman 250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley eec672c944 Fix up bug for Theme savings and OOS 2010-03-05 12:06:19 +00:00
Tim Bentley d2b4bc4314 Fix up Copyright and utf8 2010-03-05 10:04:49 +00:00
Tim Bentley 763b7cfeed Fix up context menu for serviceitem 2010-03-05 09:24:42 +00:00
Tim Bentley f4e25bf329 Finish logging cleanup 2010-03-04 22:09:03 +00:00
Tim Bentley 181c7c9946 Event clean ups and fixes 2010-03-04 22:03:43 +00:00
Tim Bentley 9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Jon Tibble 0baa0e6884 Head r721 2010-03-04 18:34:53 +00:00
Tim Bentley 3084140741 Remove extra line 2010-03-03 17:49:28 +00:00
Tim Bentley 6bff7936eb Add ServiceItemNoteForm and handling 2010-03-03 17:48:37 +00:00
Tim Bentley b949ab0054 Head719 2010-03-02 19:45:54 +00:00
Tim Bentley 4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman e7f7fe8861 Added Service Edit and Service Notes icons. 2010-03-02 09:01:56 +02:00
Raoul Snyman 024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Tim Bentley 325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble 5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley d47fc53b78 Add Alternate rows to slide controller 2010-02-27 07:39:47 +00:00
Jon Tibble 80d54dc1be None tests 2010-02-27 00:11:26 +00:00
Jon Tibble 2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Tim Bentley 0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +00:00
Tim Bentley 38a8575989 Sort out startup http gets. 2010-02-25 21:09:27 +00:00
Raoul Snyman 2766081522 Merged from trunk. 
Fixed a conflict.
 2010-02-24 21:02:39 +02:00
Raoul Snyman 0ddaa2bf4a Some more visual tweaks. 
Fixes for older versions of PyQt4.
 2010-02-24 20:39:12 +02:00
Tim Bentley 3cf8b491ea Fix field name 2010-02-23 19:37:07 +00:00
Tim Bentley 8f985291ac Head 2010-02-23 19:19:22 +00:00
Jon Tibble d02fc68a72 Fix unzipping theme files 2010-02-22 16:57:08 +00:00
Jon Tibble 61c7b6479f Fix theme import font colours 2010-02-22 16:42:10 +00:00
Jon Tibble 0337127985 Fix theme import alignment 2010-02-22 15:53:23 +00:00
Tim Bentley 60dd3b36cf Fix presentation tab and repaint service item 2010-02-22 06:14:44 +00:00
Jon Tibble 45c7fad1d6 Fix theme import colours 2010-02-21 23:40:16 +00:00
Jon Tibble 962f1364e4 Fix v2 theme importing 2010-02-21 23:05:03 +00:00
Jon Tibble f7d95a8fdb Remove debug prints 2010-02-21 21:41:30 +00:00
Tim Bentley 20ab9d1ce2 Force regeneration of all changes 2010-02-21 14:12:47 +00:00
Tim Bentley 985ce73dfd Force regeneration of sevice item on theme change 2010-02-21 14:06:56 +00:00
Jon Tibble 5715819e83 Head r710 2010-02-21 13:21:44 +00:00
Jon Tibble ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Raoul Snyman 6f4b4b2616 Moved all "get_xxxxx_directory" functions into one "AppLocation" class. 
Set the plugin manager to use this new AppLocation class as well.
 2010-02-21 14:43:03 +02:00
Raoul Snyman 174a85d969 Couple more visual tweaks, to make OpenLP look good in Windows. 
Print the location of file OpenLP is logging to in debug mode.
 2010-02-21 12:28:35 +02:00
Raoul Snyman 70251a4321 - Created independant "get_config_directory" and "get_data_directory" methods. 
- Moved log file to configuration file location for non-root/administrator users.
 2010-02-21 08:32:43 +02:00
Tim Bentley 516b05e0ad Fix URF8, copyright and alert error 2010-02-17 20:17:33 +00:00
Jon Tibble 60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Jon Tibble 2287db11d7 head 2010-02-17 19:04:53 +00:00
Tim Bentley 0335547d73 Fix SongUsage Dialog so should be complete 
Minor bug fixes discovered and fixed.
Alerts - Major refactor
* Make a plugin
* Move code from maindisplay into plugin
* Add Location , Font size and History option to Font Tab and fix code to use them
* Add button to Alert Tab to allow History to be edited
* Amend Alert screen to be able to use History if option set
* Build screen to allow alerts to be Added / Edited and Deleted.

bzr-revno: 705
 2010-02-16 19:58:10 +00:00
Tim Bentley fef8986550 Fix theme import bug 2010-02-16 17:40:41 +00:00
Tim Bentley 9c97660b73 Alerts now move between top and bottom 2010-02-13 07:37:03 +00:00
Tim Bentley 973d5e3dd8 Alerts move to top and bottom 2010-02-13 07:30:00 +00:00
Tim Bentley 47a61a6581 Finished moving alert code to plugin structure 2010-02-12 18:42:09 +00:00
Tim Bentley 944f45c8c8 Fix up song usage extract processing 2010-02-11 18:39:28 +00:00
Tim Bentley edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley 73d6a24792 Add Fontsize and location to alerts settings 2010-02-09 14:56:31 +00:00
Tim Bentley 643801ae05 New alert tag features and song usage dialog 2010-02-09 14:44:36 +00:00
Jon Tibble 6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley d4668e2ba3 Fix log levels 2010-02-06 17:13:55 +00:00
Tim Bentley 2ffe5af9a3 Fix log levels 2010-02-06 17:12:03 +00:00
Jon Tibble f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley 54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman c1f5a78290 Merge from trunk 2010-02-06 15:39:14 +02:00
Tim Bentley 00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Tim Bentley 58894e2afa Update default config file and add version checking option 2010-02-05 19:08:47 +00:00
Tim Bentley 079c9a4679 Key handling changes 2010-02-04 19:25:32 +00:00
Tim Bentley 1164ab9beb Added Extra key events to SlideController 2010-02-03 18:29:02 +00:00
Tim Bentley b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00
Tim Bentley af58043690 Make startup smoother with a Thread 2010-02-02 20:05:21 +00:00
Tim Bentley 632fae5a76 Remove print statements 2010-02-02 18:16:11 +00:00
Raoul Snyman 965902544f Updated to trunk:HEAD 2010-01-29 23:12:14 +02:00
Raoul Snyman 0e29d0b4af Show a small progress bar rather than a "downloading" message. 2010-01-29 22:20:30 +02:00
Tim Bentley 3610b232bd Fix up saving and loading service items 2010-01-29 16:38:28 +00:00
Tim Bentley 1fd98217ab Pass active presentation types to other controllers 2010-01-29 13:06:47 +00:00
Tim Bentley dc6be31d1f Move changes to get displays working correctly and sort out Impress 2010-01-28 17:36:13 +00:00
Tim Bentley dc7148b76e Fix screen display setup when returning from presentations 2010-01-28 11:46:25 +00:00
Tim Bentley 3baf2f2f7b Import the startup showing the update screen 2010-01-28 07:39:34 +00:00
Tim Bentley af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Tim Bentley 04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Tim Bentley 9beb6c7db5 Add Image layer and rename text layer 2010-01-25 20:34:47 +00:00
Jon Tibble 9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley d6912adbf8 Make display blanking work correctly 2010-01-24 16:28:18 +00:00
Tim Bentley e6e6eeb7c0 Media and Blank screen now play together nicely. 2010-01-24 15:18:26 +00:00
Tim Bentley ad40020169 Fix logging to single file 
Fix QMessage to displays on correct screen.
 2010-01-24 13:58:39 +00:00
Tim Bentley c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Tim Bentley 2d7c9dd402 Fixes from the merge 2010-01-22 18:59:36 +00:00
Tim Bentley 56275fbc21 Remove prints for merge 2010-01-22 17:54:08 +00:00
Tim Bentley af3f69afce Finish off Theme thumbnail performance improvements 2010-01-21 19:41:17 +00:00
Tim Bentley a69ba0a151 Fix themes loading performance by storing small icons. 2010-01-18 19:56:02 +00:00
Tim Bentley 9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Tim Bentley 85bada91ba Move towards sorting out renderer text sizes 2010-01-10 19:03:52 +00:00
Tim Bentley ee8a92b77f fix screen lines calcs so they are correct. 
Prints added for rendering size diagnostics.
 2010-01-10 11:49:04 +00:00
Tim Bentley 6ef3f6aadc Lots of fixes: 
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
 2010-01-09 09:34:06 +00:00
Raoul Snyman b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Tim Bentley 0cdc827a1d Fix up custom plugin issues 2009-12-16 17:54:45 +00:00
Tim Bentley a7833f900f Add Outline and Shadow size options and make editable 2009-12-15 20:36:15 +00:00
Tim Bentley 43a99451a3 Add Outline and Shadow size options 2009-12-15 20:11:52 +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 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 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