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

1143 Commits

Author SHA1 Message Date
Tim Bentley 35255c250e Fix up theme bugs 2010-03-26 20:48:46 +00:00
Tim Bentley 92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley 49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Raoul Snyman ee879774b8 Update the credits. 2010-03-26 21:44:18 +02:00
Tim Bentley 44f3e02a5c Fix outline rendering bug 2010-03-26 08:49:26 +00:00
Tim Bentley e4db12423a Add Theme and Hide buttons to slide controller 2010-03-25 21:53:52 +00:00
Tim Bentley 463847c61c Correct image override process 2010-03-25 20:24:52 +00:00
Tim Bentley 51d6d2410b Fix QT4.4 bug in service manager 2010-03-25 19:27:46 +00:00
Tim Bentley b20c29f45c Add delete to context menu 2010-03-25 18:52:16 +00:00
Tim Bentley 59dd69eee1 Do not display empty list 2010-03-24 19:10:08 +00:00
Tim Bentley f158044d5e Fix row counts and bad code before superfly spots it 2010-03-24 19:05:45 +00:00
Tim Bentley 33d2de6f9b Heads 2010-03-24 18:59:37 +00:00
Raoul Snyman 2c325d718b Changes: 
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
 2010-03-23 21:04:15 +02:00
Jonathan Corwin 8524bf9174 Remove transparent error: QImage::scaled: Image is a null image 2010-03-22 23:50:32 +00:00
Tim Bentley fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Tim Bentley 32086cb877 Fix slide selection so looks nice 2010-03-22 18:31:43 +00:00
Raoul Snyman 19c5c07c54 Add Christian and Phill to the credits 
bzr-revno: 755
 2010-03-22 10:37:18 +02:00
Raoul Snyman ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
Raoul Snyman be598da4f9 Fixed a number of issues in the Bibles: 
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
 2010-03-22 00:16:43 +02:00
Tim Bentley 2ff005cdc0 Add verse tag to live song rows 2010-03-21 19:55:51 +00:00
Tim Bentley 3e4683bd6d Fix up issues and confusion with service item edit 2010-03-21 17:56:56 +00:00
Tim Bentley 2d43cd2d8a Stop double loading of service items 2010-03-21 15:08:46 +00:00
Tim Bentley 8f692d13be Remove prints 2010-03-21 14:30:18 +00:00
Tim Bentley 848eb601af Fix NONE appearing as song verses 
Delay the hidden window display
Fix missing add status for custom slides
 2010-03-21 14:24:41 +00:00
Tim Bentley 92d39b1d98 Minor tidy ups and add stupidity block 2010-03-20 08:34:36 +00:00
rimach 9169870520 make Blank button workable 2010-03-20 00:02:23 +01:00
Tim Bentley b011104deb Head747 2010-03-19 08:07:12 +00:00
Tim Bentley 09f18fd96d Clean up maintenance - Complete 2010-03-19 07:23:48 +00:00
Tim Bentley 66b23f6a6f Fix dialog 2010-03-18 22:06:51 +00:00
Tim Bentley 44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman 6414330b2c Reworked the BibleGateway Bibles. 
Changed some code to be standards compliant.
 2010-03-18 23:36:30 +02:00
Jon Tibble de767459bd Fix 2 for AppLocation changes 2010-03-18 16:25:25 +00:00
Jon Tibble 5d2fe81d71 Fix for AppLocation changes 2010-03-18 15:52:37 +00:00
Jon Tibble fea160c5c4 AppLocation.PluginsDir changes 2010-03-18 15:43:27 +00:00
Tim Bentley ff8145cef1 Add in maintenance page to service manager 2010-03-17 21:25:35 +00:00
Tim Bentley 72d2d8f83d Clean up service item form names 2010-03-17 21:08:18 +00:00
Tim Bentley c1182aa9cc Add maintain menu item 2010-03-16 20:30:33 +00:00
Tim Bentley de8d0f4d9c Add add to existing service item 2010-03-16 20:22:28 +00:00
Jon Tibble 366fe2f508 Head r742 and import fix 2010-03-14 23:22:44 +00:00
Tim Bentley 36b9688695 Fix save service file name 2010-03-14 17:53:14 +00:00
Tim Bentley 23236b50e1 remove print 2010-03-14 17:14:38 +00:00
Tim Bentley af5a52fa62 Fix service saving and cancelling 
Fix Red and Bla
 2010-03-14 17:05:50 +00:00
Tim Bentley df8ffa53b2 Fix DND for service items 2010-03-14 07:56:39 +00:00
Tim Bentley 3b59525e98 Renderer screen and font fixes 2010-03-13 20:50:52 +00:00
Tim Bentley 2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Jon Tibble 660a35486b Head r737 2010-03-13 12:11:11 +00:00
Tim Bentley 47dc69b194 More text fixes 2010-03-13 08:43:54 +00:00
Tim Bentley db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Raoul Snyman ccfa7501ce - Fixed up Mac OS X detection 
- Removed an unnecessary import
- Fixed an export
 2010-03-12 20:31:13 +02:00
Jon Tibble 9196a6b6f6 Head r736 2010-03-12 17:43:17 +00:00
Raoul Snyman c7c1a9c06a Added icons for: 
- Blank Screen
 - Show Desktop
 - Show Theme Background
 2010-03-12 17:38:56 +02:00
Jon Tibble 8124f0e8fe Import and weird character cleanups 2010-03-11 14:02:43 +00:00
Tim Bentley e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Tim Bentley dde75e2288 Head733 2010-03-11 12:48:19 +00:00
Tim Bentley 27d09b8be8 Blank text screens do not have footers 2010-03-11 08:29:32 +00:00
Tim Bentley b3ce7bf940 Refactor theme outlines 2010-03-11 08:11:36 +00:00
Jonathan Corwin bfee664c94 fixes 2010-03-10 23:00:48 +00:00
Jonathan Corwin 99a963e509 Head 2010-03-10 22:28:19 +00:00
Tim Bentley 74b288aa6a Head731 2010-03-10 16:58:07 +00:00
Tim Bentley 9bace991fa renderer changes 2010-03-10 16:57:33 +00:00
Jon Tibble 26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Raoul Snyman 32b267fab9 Windows modifications: 
- Added Windows build files.
- Added Windows installer files.
- Modified the tabs in the media manager to look a little better on both Windows and Linux.
- Windows icon.

bzr-revno: 730
 2010-03-10 07:50:48 +02:00
Raoul Snyman 1e79260c5c Renamed the versionThread class to VersionThread to fit with our coding standards. 2010-03-09 22:29:45 +02:00
Raoul Snyman 16ea5dd0ad Tidied up the tabs on the media manager. 2010-03-09 22:26:12 +02:00
Raoul Snyman 8e5e1dfc36 Merged from HEAD 2010-03-09 21:58:59 +02:00
Jon Tibble 56d2e30fe6 Head r729 2010-03-09 19:45:13 +00:00
Jon Tibble e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Jon Tibble 51d95b661c Head r728 and truth test 2010-03-09 19:14:23 +00:00
Tim Bentley b75bc2abbf Remove Print statements 2010-03-08 19:55:13 +00:00
Tim Bentley 55c676dc03 Minor servicemanager fixes 2010-03-08 19:50:35 +00:00
Jon Tibble 54c4bc9c19 Head r727 and C style fix 2010-03-08 19:43:37 +00:00
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