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

3512 Commits

Author SHA1 Message Date
Tim Bentley
0936c7d6d5 Updates 2010-10-24 18:36:43 +01:00
Andreas Preikschat
b3ae89e045 head 2010-10-24 18:18:01 +02:00
Andreas Preikschat
8d82715924 added empty lines 2010-10-24 13:08:46 +02:00
Andreas Preikschat
c8e5f9c07e fixed traceback after editing image item, icons for down/up buttons 2010-10-24 13:00:20 +02:00
Tim Bentley
8e1a7334d3 Fix up presentations 2010-10-24 07:26:07 +01:00
Tim Bentley
68fa2c4791 Fix themes and class names 2010-10-23 18:37:10 +01:00
Tim Bentley
feb3be1cb9 Head 2010-10-23 08:24:30 +01:00
Tim Bentley
b0ba4472bd Fix up themes now 2010-10-23 08:23:49 +01:00
Tim Bentley
76ddf975a7 Add ImageManager 2010-10-22 19:56:58 +01:00
Tim Bentley
6dbb80ee94 Initial version of Image performance improvements 2010-10-22 18:24:56 +01:00
Jon Tibble
8a977ef155 Fix spelling of Samuel (Bug #647931) 2010-10-21 22:43:14 +01:00
Jon Tibble
a6bcfbf568 Cleanups 2010-10-21 16:31:22 +01:00
Raoul Snyman
49faf7fb1f Working on bringing actions into the shortcut form. 2010-10-21 09:42:13 +02:00
Tim Bentley
0851b94837 Theme now created correctly we I think 2010-10-17 20:34:10 +01:00
Tim Bentley
61c763639b Theme cleanup and more UI work. 2010-10-17 19:58:42 +01:00
Tim Bentley
97c7ebc4c5 Head 2010-10-17 15:53:06 +01:00
Tim Bentley
63b3be4767 Head 2010-10-17 15:44:00 +01:00
Tim Bentley
c3b890e198 Performance updates 2010-10-17 15:43:51 +01:00
Raoul Snyman
09dbafaf3e HEAD 2010-10-17 16:25:03 +02:00
Tim Bentley
cf139be7cb Fix image but and more path optimisation 
bzr-revno: 1095
Fixes: https://launchpad.net/bugs/661965
 2010-10-17 14:32:40 +01:00
Tim Bentley
ca20598dde More path optimisation 
Fixes: https://launchpad.net/bugs/661965
 2010-10-17 08:26:14 +01:00
Raoul Snyman
009e337158 Removed an incorrect import. 
Added more documentation.
 2010-10-17 00:50:36 +02:00
Raoul Snyman
baaa7e0508 Updated documentation. 
Renamed the import wizards to match the general form naming convention.
Removed an unnecessary class.
 2010-10-16 21:38:23 +02:00
Tim Bentley
7dcac8ea54 Fix htmlbuilder 2010-10-16 17:21:02 +01:00
Tim Bentley
cf2d215534 More imporovements 2010-10-16 14:54:57 +01:00
Tim Bentley
cbef9f0519 Head 2010-10-16 08:22:14 +01:00
Tim Bentley
cc4acf4edd Position Tab updates 2010-10-16 08:21:24 +01:00
Tim Bentley
2f3bfc51cc Alerts work again , image performance improvements 
bzr-revno: 1092
 2010-10-15 17:37:02 +01:00
Andreas Preikschat
da3db82d24 Code Cleanups 
bzr-revno: 1090
 2010-10-15 16:47:16 +01:00
Tim Bentley
edbc6bf5ce Head 2010-10-15 16:38:11 +01:00
Tim Bentley
f3646cf6e6 Code cleanups 2010-10-15 16:37:29 +01:00
Tim Bentley
cef92476ad Path image improvements 2010-10-15 16:33:06 +01:00
Tim Bentley
4f04bba5e6 Fix alert view bug 2010-10-15 15:43:42 +01:00
Jonathan Corwin
dc0c597243 Warn, not error, if COM Impress not available 2010-10-15 10:00:08 +01:00
Andreas Preikschat
3ae6295e21 clean ups 2010-10-15 10:35:00 +02:00
Jeffrey Smith
b89b8983f8 This is a fix for bug #659673 
bzr-revno: 1087
 2010-10-14 21:41:43 +02:00
Jeffrey S. Smith
b58eecdf63 In EasyWorship song importer, add initial support for non-latin1 encodings 2010-10-14 13:15:02 -05:00
Andreas Preikschat
c4e6b4aaac Fixed a bug in the song editor where the last added verse would revert to the previous verse type. 
bzr-revno: 1086
 2010-10-14 18:46:14 +02:00
Tim Bentley
4f7566c76b Position code and preview 2010-10-13 21:19:38 +01:00
Tim Bentley
5e485a0673 Head 2010-10-13 20:40:39 +01:00
Tim Bentley
567e0009a7 Position screen 2010-10-13 20:40:01 +01:00
Raoul Snyman
161a1e444a Documentation updates. 
bzr-revno: 1085
 2010-10-13 07:14:54 +02:00
Andreas Preikschat
aab9d1b2ca docs 2010-10-12 18:47:53 +02:00
Andreas Preikschat
2d00d08ccf Fix for bug #657694 (lines 8-9) 
Enhanced the code (lines 11-29)

bzr-revno: 1084
 2010-10-12 08:11:13 +02:00
Raoul Snyman
177d2d0351 More documentation updates. 2010-10-11 22:47:00 +02:00
Andreas Preikschat
0cefed0eb5 onVerseTypeComboBoxChanged 2010-10-11 19:29:03 +02:00
Tim Bentley
f4023118db Fix up the theme class again 2010-10-11 17:43:14 +01:00
Tim Bentley
026c25facb Head 2010-10-11 17:14:46 +01:00
Tim Bentley
562a27e8ca More refactoring 2010-10-11 17:14:36 +01:00
andreas
080a1ede33 Revised custom Dialog and new edit form 
bzr-revno: 1083
 2010-10-11 17:13:49 +01:00
Andreas Preikschat
35fdbdeee8 fix for bug #657694 and some code enhancements 2010-10-11 17:26:48 +02:00
Andreas Preikschat
034bae031a missing space 2010-10-11 09:47:55 +02:00
Raoul Snyman
3a8b33a5ff Some updates to the documentation: 
- Added some more classes to the rST files.
- Fixed up some docstrings to proper rST.
 2010-10-10 23:13:10 +02:00
Andreas Preikschat
b9b202e5a8 another fix for the merge 2010-10-10 22:19:58 +02:00
Andreas Preikschat
bf7df829d0 Make sure that the 'edit' and 'delete' buttons are disabled after editing all verses (because no verse is selected). 
bzr-revno: 1079
 2010-10-10 18:42:29 +02:00
Andreas Preikschat
65798895db A few things: 
- Finished bible "text search" (the search considers all verses which are in the database).
- Comment/doc clean ups.
- Changed "permission" to "permissions" since the database uses "permissions" (changing this is just being consequent).
- Disabled search button while searching.

bzr-revno: 1078
 2010-10-10 18:40:20 +02:00
Andreas Preikschat
373597120b fixes for merge 2010-10-10 17:59:11 +02:00
Andreas Preikschat
bab38de43e -'verse' -> 'slide' -buttons name fixes 2010-10-10 16:23:00 +02:00
Andreas Preikschat
144060a74b moved method to its old position 2010-10-10 15:29:08 +02:00
Andreas Preikschat
4dde13136c layout clean ups 2010-10-10 15:17:01 +02:00
Andreas Preikschat
3c32cb5be5 clean ups + forgotten file 2010-10-10 15:09:45 +02:00
Andreas Preikschat
421577f8ce make sure that the 'edit' and 'delete' buttons are disabled after editing all verses 2010-10-10 14:14:12 +02:00
Andreas Preikschat
842c55002a fixed broken copyright block 2010-10-09 22:00:33 +02:00
Andreas Preikschat
b97bc5fe0e head 2010-10-09 21:41:19 +02:00
Andreas Preikschat
84d0c01274 fixes for the merge proposal 2010-10-09 21:36:05 +02:00
Andreas Preikschat
de940f7ca5 first draft of new custom editor 2010-10-09 21:20:07 +02:00
Andreas Preikschat
2f99a85c4e continued save button problem 2010-10-09 14:15:31 +02:00
Tim Bentley
216f044883 For settings updates 2010-10-09 12:20:47 +01:00
Andreas Preikschat
607a0d1155 - make sure the 'edit all' button is disabled when creating a new custom 
- ask if unsaved data should be saved when clicking on the save button
 2010-10-09 13:00:28 +02:00
Tim Bentley
f5ccb757ab Head 2010-10-09 11:59:56 +01:00
Tim Bentley
5009196d45 Fint main tab 2010-10-09 11:59:49 +01:00
Jonathan Corwin
e67edb909f Option to use phonon or webkit for video. Fix blank to image 
bzr-revno: 1076
 2010-10-09 11:11:55 +01:00
Tim Bentley
1e096fc4fe Head1075 2010-10-09 07:49:08 +01:00
Tim Bentley
8892959b35 First form works 2010-10-09 07:48:54 +01:00
Andreas Preikschat
2ad3f983f7 added reStructuredText back 2010-10-09 08:48:21 +02:00
Andreas Preikschat
ae015a270a added reStructuredText back 2010-10-09 08:00:50 +02:00
Jonathan Corwin
87ebd77138 Remove commented code 2010-10-08 21:42:25 +01:00
Jonathan Corwin
5a502475fd Head 2010-10-08 20:42:17 +01:00
Jonathan Corwin
5f5c207b20 volume 2010-10-08 20:40:59 +01:00
Tim Bentley
fd45f2e32d Add config option for Expanding service items 2010-10-08 20:32:07 +01:00
Tim Bentley
c9eaf99696 Add config option for Expanding service items 2010-10-08 20:15:01 +01:00
Andreas Preikschat
1bf1aeacd4 minor fixes for proposal 2010-10-08 19:37:34 +02:00
Andreas Preikschat
2a21349a6e head 2010-10-08 19:07:49 +02:00
Andreas Preikschat
2e2efab2d4 tweaks 2010-10-08 19:07:14 +02:00
Raoul Snyman
ecb2022df3 HEAD 2010-10-08 18:08:06 +02:00
Raoul Snyman
a988db8e08 Added the ability to capture a shortcut. 2010-10-08 18:07:52 +02:00
Tim Bentley
e37682cb03 Fix duplicate file save bug 
Fix Dnd bug

bzr-revno: 1074
Fixes: https://launchpad.net/bugs/656177
 2010-10-08 07:17:59 +01:00
Philip Ridout
30c2ff400e Update File load extensions for song imports 
bzr-revno: 1073
 2010-10-08 07:16:01 +01:00
Jonathan Corwin
415f79b9ed head r1072 2010-10-07 22:49:25 +01:00
Jonathan Corwin
d6ce88959c Add the use phonon media setting 2010-10-07 22:47:17 +01:00
Raoul Snyman
cff333ddc2 Added a shortcut list dialog shell. 2010-10-07 23:27:26 +02:00
Tim Bentley
75d35cf182 Fix duplicate file saving bug 
Fix drag and drop service item bug

Fixes: https://launchpad.net/bugs/656177
 2010-10-07 18:52:40 +01:00
Tim Bentley
681b6dc60f Head 2010-10-07 06:16:14 +01:00
Tim Bentley
749eb51dd4 Theme xml fixes 2010-10-07 06:15:02 +01:00
Tim Bentley
bccc3c56ca Fix text issues 2010-10-06 21:30:49 +01:00
Tim Bentley
c262d9ad75 Fix remote edit issue 2010-10-06 21:24:53 +01:00
Tim Bentley
16b4aa0715 fix line lenght 2010-10-06 21:10:26 +01:00
Tim Bentley
7863a2ebfc Add Service Item update from edit with config flag 2010-10-06 20:27:30 +01:00
Andreas Preikschat
59b387b9d0 replaced 'permission' with permissions since the db uses permissions 2010-10-06 16:57:38 +02:00
Andreas Preikschat
f515dc60d0 changed methods (call the db methods instead of the manager's methods) 2010-10-06 16:15:39 +02:00
Tim Bentley
39f1aa2e09 Head1071 2010-10-06 05:55:00 +01:00
Tim Bentley
85dd394e25 Head1071 2010-10-06 05:47:29 +01:00
Jonathan Corwin
9a744119d3 Alerts over Phonon videos. Fix blank to theme bug for image backgrounds. 2010-10-05 23:23:46 +01:00
Philip Ridout
274b3b9253 Removed the xml filter for OpenSong 2010-10-05 22:32:03 +01:00
Tim Bentley
368bc2647f Head 2010-10-05 20:53:20 +01:00
Tim Bentley
4e8a7f47eb Fix up theme xml handling to new schema 2010-10-05 20:52:28 +01:00
Philip Ridout
40d06d492b and added some u's before "'"'s 2010-10-05 20:47:35 +01:00
Philip Ridout
e81efb84f6 Removed extension checking in wow import as this is handled by the filters in the open dialouge box. Instead, check the the header to ensure that the file is a wow song file regardless of ext. 
Corrected open song import extension.
 2010-10-05 20:41:54 +01:00
Andreas Preikschat
fa68d0d9ff text search for bibles 2010-10-05 20:44:54 +02:00
rimach
f869e0d979 replace self.text_strings with self.textStrings, fix doc string 2010-10-05 18:09:48 +02:00
rimach
1c48bfab67 Head 2010-10-05 17:26:28 +02:00
Andreas Preikschat
6ab70f1bc0 Fixed up chapter and verse comboboxes for advanced Bible search. 
A few other cleanups.

bzr-revno: 1070
 2010-10-04 08:18:35 +02:00
Philip Ridout
881cb4e3c3 Added file extension checking to words of worship import 
Added the ability for importers to specifiy file fillters, and added the relevent filters for most importers (the ones where I could easily find the file ext, still need easiworship and song beamer, and maybe a few others!)
 2010-10-03 23:28:47 +01:00
Tim Bentley
fc092ed919 Theme wizard start 2010-10-03 08:42:02 +01:00
Jonathan Corwin
f331f13278 Optional phonon videos, start 2010-10-01 23:47:37 +01:00
Andreas Preikschat
f8ed4acf78 clean ups 2010-10-01 16:37:51 +02:00
Andreas Preikschat
919b07bd61 clean ups 2010-10-01 16:18:15 +02:00
Andreas Preikschat
e17f6c7c9e -disable search buttons while searching, -clean ups 2010-10-01 15:50:29 +02:00
Tim Bentley
4d3a473e91 Service Manager loading - finished 2010-09-30 21:21:45 +01:00
Andreas Preikschat
74752da694 implemented 'text search' for bibles 2010-09-30 20:40:10 +02:00
Tim Bentley
68b38aa88c fix up rest of service load updates 2010-09-30 18:07:27 +01:00
Tim Bentley
bdc924093e Update service items on service load 2010-09-30 06:12:06 +01:00
rimach
e6de575c88 Head 2010-09-30 07:04:43 +02:00
rimach
2e72e2cbe7 add missing function content 2010-09-30 07:04:31 +02:00
rimach
ec16298908 add missing newlines, simplify getString function, wrap long lines 2010-09-29 23:06:59 +02:00
rimach
3eaf7a0738 Head 2010-09-29 22:39:15 +02:00
rimach
fd502f3443 Head 2010-09-29 22:38:12 +02:00
rimach
345a94381a bugfixing 2010-09-29 22:37:52 +02:00
Tim Bentley
0f480a6dd5 Fix loading of service items bug 
Fixes: https://launchpad.net/bugs/651076
 2010-09-29 17:48:45 +01:00
Andreas Preikschat
0872cefacf clean ups 2010-09-28 19:51:42 +02:00
Tim Bentley
882e4679f4 Head1066 2010-09-28 18:41:33 +01:00
Tim Bentley
f6a02fa6fa Fix blank line 
Fixes: https://launchpad.net/bugs/649999
 2010-09-28 18:41:14 +01:00
rimach
a76dd15fbe resolve diverged branches 2010-09-27 20:34:40 +02:00
rimach
d249b2a326 changes for SongBeamer import 2010-09-27 20:17:39 +02:00
rimach
f265c552ea replace strings with text_strings 2010-09-27 20:15:55 +02:00
rimach
91544f5db1 Head 2010-09-27 06:51:32 +02:00
rimach
5049aab6d2 Changes for SongBeamer Import 2010-09-27 06:51:16 +02:00
Andreas Preikschat
52e572e94d Naming Conventions 2010-09-26 19:23:58 +02:00
Andreas Preikschat
2f1134556f veses/chapters comboBoxes now behave differently 2010-09-26 19:17:29 +02:00
Andreas Preikschat
f1fd4b6d2b Bible code tidy 
bzr-revno: 1066
 2010-09-26 15:33:11 +01:00
Tim Bentley
25a4ff7880 Fix errors in merge 2010-09-26 15:01:27 +01:00
Andreas Preikschat
8d51d2820f rearranged methods 2010-09-26 15:38:40 +02:00
Tim Bentley
0d5fc3c980 Style Fixups 2010-09-26 13:23:50 +01:00
Tim Bentley
2f75087e40 Merge request cleanups 2010-09-26 09:38:11 +01:00
Tim Bentley
e33e4cb7ff Replace Context menu with smart context menu 2010-09-26 09:07:47 +01:00
Tim Bentley
cc42dc34d8 Basic Theme copy and rename working 2010-09-26 08:39:50 +01:00
Tim Bentley
6351e65c1c Head193 2010-09-26 07:20:37 +01:00
Tim Bentley
271d3b4af5 More updates 2010-09-26 07:20:24 +01:00
Tim Bentley
b4fcff6fe4 Update preview text 
bzr-revno: 1063
 2010-09-25 17:22:49 +01:00
Tim Bentley
451f08db9f Spaces 2010-09-25 17:16:36 +01:00
Tim Bentley
fb5a481da5 Update preview song 2010-09-25 17:14:14 +01:00
Jonathan Corwin
f7b90c5a76 Fix song number/book save and load 
bzr-revno: 1061
 2010-09-25 14:03:01 +01:00
Jeffrey Smith
5d61520b6e Better handling of memo files larger than 16MiB. 
Handle blank fields more intelligently.

bzr-revno: 1060
 2010-09-25 14:54:06 +02:00
Jeffrey S. Smith
0a3dc7bff4 EW importer needs to import 'translate' before using it 2010-09-25 07:13:42 -05:00
Jeffrey S. Smith
053d73de9b Add licence block to EW importer 2010-09-25 06:58:16 -05:00
Jeffrey S. Smith
20085d0a6c Make strings used in UI translatable 2010-09-25 06:55:26 -05:00
Jonathan Corwin
3615fe5d13 Fix save/load of songnumber/book 2010-09-25 12:55:01 +01:00
Tim Bentley
83334a19e9 New Manifest file 2010-09-25 11:07:40 +01:00
Tim Bentley
a5367b647f Head 2010-09-25 08:48:02 +01:00
Tim Bentley
3748bbf53a Fix crash and optimise display 
bzr-revno: 1058
 2010-09-25 08:47:23 +01:00
Tim Bentley
8f98ae9d2e Add Image cache 2010-09-25 08:45:21 +01:00
Tim Bentley
6a171899f5 Remove visible lag on displaying first picture of background 2010-09-25 07:29:03 +01:00
Tim Bentley
dabc04c7dd Fix replacement backgrounds 2010-09-25 07:11:00 +01:00
Jeffrey S. Smith
6504397662 Fix bug in reading memo files larger than 16MiB 2010-09-24 22:56:33 -05:00
Jeffrey S. Smith
4f11181bfa Return None for blank fields in the database 2010-09-24 22:55:21 -05:00
Raoul Snyman
697cc79b3a Fix bug #598805 2010-09-24 22:54:52 +02:00
Christian Richter
70f8795d61 Fixed exception thrown on unchecking 'Auto detect' in languages menu 
Fixed saving of language setting
Added pinging of review page in translation_util.py

bzr-revno: 1056
 2010-09-24 19:51:21 +02:00
Jeffrey Smith
a079e698f9 Refactor code for making song import wizard pages. 
bzr-revno: 1055
 2010-09-24 19:19:32 +02:00
Tim Bentley
f62ac45a29 Head1054 2010-09-24 12:30:10 +01:00
Tim Bentley
d3e8da302c More cleanups 2010-09-24 12:29:52 +01:00
rimach
53478cb707 bugfixing 2010-09-24 06:16:48 +02:00
Jeffrey S. Smith
e99ebe64c7 Replace disablable with can_disable. Change obj_prefix default 2010-09-23 14:23:56 -05:00
rimach
90fd6dec20 add SongBeamer import 2010-09-23 21:02:18 +02:00
rimach
9111a1885e add SongBeamer import 2010-09-23 21:01:52 +02:00
Tim Bentley
17132f0505 Remove line breaks in ServiceManager 
bzr-revno: 1054
Fixes: https://launchpad.net/bugs/642788
 2010-09-23 18:45:49 +01:00
rimach
da33167b66 Head 2010-09-23 19:43:30 +02:00
rimach
7a7a4795f4 correct english sentense 2010-09-23 19:13:57 +02:00
rimach
ef6845dad8 Head 2010-09-23 19:12:04 +02:00
Tim Bentley
8ab9299814 remove line break before truncation. 
Fixes: https://launchpad.net/bugs/642788
 2010-09-23 17:45:17 +01:00
Andreas Preikschat
7b47d52eca This fixes the following bugs and issues: 
- Bible items cannot be extended any more
- Dual and single Bible verses cannot be mixed (Media Manager/Service Manager)
- Bible item title in the service manager contains all bible passages (separated by a comma) bug #634533 and bug #609355
- Fixed bug #643783

bzr-revno: 1053
 2010-09-22 22:11:51 +02:00
Andreas Preikschat
6c39c3d1af clean up 2010-09-22 20:56:42 +02:00
Tim Bentley
983c2012fd Update plugin list 
Fix ServiceManager 
Put splash image back 
Fix hide screen bug.

bzr-revno: 1052
Fixes: https://launchpad.net/bugs/641644, https://launchpad.net/bugs/642754
 2010-09-22 19:50:55 +01:00
Andreas Preikschat
15378611d8 different fixes 2010-09-22 20:46:02 +02:00
Jonathan Corwin
ba78b7372b Speed up video loop, and adjust left margin for outline 
bzr-revno: 1051
 2010-09-22 19:43:55 +01:00
rimach
5231023f1c Head 2010-09-22 20:30:06 +02:00
rimach
d1172e14c1 fix click/unclick 'Auto detect', fix saving of language setting 2010-09-22 20:03:10 +02:00
Jeffrey S. Smith
29cfa96ce8 Factorize code for making song import wizard pages 2010-09-22 10:01:37 -05:00
Tim Bentley
47b359a313 Fix issues with other merges 2010-09-22 06:03:10 +01:00
Tim Bentley
5e38d34997 Fix issues with other merges 2010-09-22 05:57:50 +01:00
Jonathan Corwin
050d1478c9 Attempt to speed up video restart when looping. Make sure outlined fonts don't vanish off left hand side 2010-09-21 23:22:05 +01:00
rimach
395fe85d42 update 2010-09-21 21:53:46 +02:00
Tim Bentley
e790f9aedc Move display fixes 2010-09-21 20:08:23 +01:00
Tim Bentley
3e0a3f799b Fix bug 642754 in service manager 2010-09-21 20:05:45 +01:00
Andreas Preikschat
2a4e64c9db fix for Bug #643783 2010-09-21 20:44:48 +02:00
Raoul Snyman
c235b793b0 Fix bug #644106 
Fix a related bug in the song importer.
 2010-09-21 20:12:46 +02:00
Tim Bentley
1c58fcda9f Remove print statement 2010-09-21 18:42:16 +01:00
Tim Bentley
8e94d87e65 Put the display image back after it was lost 2010-09-21 18:35:26 +01:00
Tim Bentley
79881d9023 Update plugin version numbers 2010-09-21 18:30:32 +01:00
Tim Bentley
d50ffbafa3 Fix review comments 2010-09-21 18:24:01 +01:00
Tim Bentley
b1d312626a Head1047 2010-09-21 17:47:54 +01:00
Andreas Preikschat
a22dec796e typing error 2010-09-21 07:57:23 +02:00
Jeffrey S. Smith
49e6a4589c Get rid of extra blank lines and handle \{ \} \ in RTF 2010-09-20 15:58:55 -05:00
Andreas Preikschat
8b6e90ab44 tweak 2010-09-20 20:55:14 +02:00
Andreas Preikschat
137fb7417e removed code and added a dialog 2010-09-20 20:38:18 +02:00
Tim Bentley
419008d4b7 Head 2010-09-20 19:36:56 +01:00
Jeffrey S. Smith
d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
Tim Bentley
56297a1cce fixes for 641644 
Fixes: https://launchpad.net/bugs/641644
 2010-09-20 19:01:32 +01:00
Tim Bentley
5675eba314 Fix local variable issues 2010-09-20 17:43:36 +01:00
Tim Bentley
fe6a3af42c Explicit error type 2010-09-20 17:33:38 +01:00
Tim Bentley
293443ba61 Fixed but untested 
Fixes: https://launchpad.net/bugs/642778
 2010-09-20 06:06:18 +01:00
Tim Bentley
b73a921dbc Fix bug if no lanuagage files 2010-09-20 05:59:51 +01:00
Tim Bentley
551bf3c41f r1044 2010-09-20 05:39:46 +01:00
Jonathan Corwin
827eb93c67 r1044 2010-09-19 22:07:26 +01:00
Jonathan Corwin
ad51cb8040 Remove top/left border on maindisplay. QGraphicsWebView only appeared in Qt4.6 2010-09-19 21:59:00 +01:00
Andreas Preikschat
17b4335ee4 do not delete results when changing from keep to clear 2010-09-19 18:51:52 +02:00
rimach
23099261bd Head 2010-09-19 10:47:00 +02:00
Andreas Preikschat
bd5f82096f head + resolved conflicts 2010-09-19 07:59:38 +02:00
Christian Richter
9539e0fb22 Change OpenOffice to use pipes not sockets to resolve slow networking issue. Fix option parsing unicode problem for python 2.5 
bzr-revno: 1044
 2010-09-18 23:18:32 +01:00
Andreas Preikschat
02b46f051c changed combobox behaviour 2010-09-18 23:29:41 +02:00
Raoul Snyman
3ff6d4da16 Fix for bug #640697 
bzr-revno: 1043
 2010-09-18 21:32:34 +02:00
rimach
86bed937f5 Remove unused lines 2010-09-18 20:56:57 +02:00
rimach
9971027e4d Head, Remove unneeded lines 2010-09-18 20:37:02 +02:00
Raoul Snyman
bf35338c99 Fix some typos. 2010-09-18 20:15:54 +02:00
Raoul Snyman
7f5a6411d6 Fix for bug #640697 2010-09-18 19:14:27 +02:00
Jonathan Corwin
93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Jonathan Corwin
2837c36553 tweaks 2010-09-17 21:32:00 +01:00
Raoul Snyman
1e5645995c Some more spelling/grammatical corrections. 2010-09-17 22:06:41 +02:00
Raoul Snyman
85732d6ad8 Fix bug #640460. 
bzr-revno: 1039
 2010-09-17 21:38:12 +02:00
Raoul Snyman
794493d0d1 Fixed bug #640460. 2010-09-17 21:02:25 +02:00
Raoul Snyman
fdc0d14790 Fixed a spelling error. 
bzr-revno: 1038
 2010-09-17 18:38:21 +02:00
Raoul Snyman
c54450377f Attempting to solve bug #635338 
bzr-revno: 1037
 2010-09-17 16:32:07 +02:00
Raoul Snyman
9fb2bb1458 Some more fixes for the Windows World: 
- Fixed location of .qm files, so that they can be found in a Windows build
- Added PyEnchant to the build process
- Fixed up langaugemanager.py so that it conforms to coding standards

bzr-revno: 1036
 2010-09-17 16:30:26 +02:00
Andreas Preikschat
bfc3543d39 changed/removed variable 2010-09-17 14:17:50 +02:00
Andreas Preikschat
194e278581 fixed bug (forgotten %); removed unused variables 2010-09-17 14:10:41 +02:00
Andreas Preikschat
9913754df4 spelling mistake 2010-09-17 13:41:52 +02:00
Raoul Snyman
c8d9fd97df Fixed a spelling error. 2010-09-17 08:20:51 +02:00
rimach
d69f077f53 Head 2010-09-16 23:27:46 +02:00
Jonathan Corwin
2ad441e883 Speedups 2010-09-16 22:19:51 +01:00
rimach
8bf0b34d22 Head 2010-09-16 23:12:51 +02:00
rimach
399813e6aa fix for the merge comments, add correct translations for settings window 2010-09-16 23:10:36 +02:00
rimach
d2bf1fedae correct piped soffice start, fix Python2.5 problem with unicode strings in optparse 2010-09-16 23:01:44 +02:00
Raoul Snyman
22774b880a - Fixed up the QM file locations for static builds. 
- Added PyEnchant to the build process.
- Fixed LanguageManager to be complaint with the coding standards.
 2010-09-16 22:40:12 +02:00
Raoul Snyman
a3aaf7dce8 Some fancy footwork around encodings. 2010-09-16 20:51:29 +02:00
Andreas Preikschat
5ad41ac457 tweaked methods 2010-09-16 18:57:21 +02:00
Andreas Preikschat
30ad1a3eb0 whitespace 2010-09-16 18:35:19 +02:00
Andreas Preikschat
6795c04947 added two methods 2010-09-16 18:22:23 +02:00
Martin Thompson
ec9230be38 Put comment in right place 2010-09-15 22:02:32 +01:00
rimach
5f7348ed2e Head 2010-09-15 22:51:22 +02:00
rimach
ea1321ef20 add pipe using for soffice 2010-09-15 22:51:01 +02:00
Martin Thompson
f7fafae09c Fixed merge fail 2010-09-15 21:46:16 +01:00
rimach
ad6294ffcc simplify icon name settings 2010-09-15 22:23:03 +02:00
Martin Thompson
ebf3ce587d Tweaks from review 2010-09-15 21:12:03 +01:00
rimach
84a6c273fe Python 2.5 cant handle unicode strings in optparse 2010-09-15 20:07:08 +02:00
rimach
a308c66aa9 Python 2.5 cant handle unicode strings in optparse 2010-09-15 20:06:30 +02:00
Tim Bentley
bc537365bd Speed up render 2010-09-15 19:03:54 +01:00
rimach
915842a311 Head 2010-09-15 19:57:44 +02:00
rimach
3bc527e4fc bugfixing 2010-09-15 19:55:27 +02:00
Andreas Preikschat
d4ffc72c17 clean ups 2010-09-15 18:52:22 +02:00
Raoul Snyman
ef9684320c HEAD 2010-09-14 22:34:44 +02:00
Raoul Snyman
2f33ae1bab Add in code to display a disabled message if an importer is not available. 2010-09-14 22:33:33 +02:00
rimach
c53731d74b media items' __init__ methods 2010-09-14 20:34:39 +02:00
rimach
2d47e2523c remove executable flag 2010-09-14 20:18:47 +02:00
Andreas Preikschat
4aba7e3357 change bible title in service manager (NOT nice) 2010-09-14 20:07:38 +02:00
rimach
33f49f7d4a Head 2010-09-14 19:46:39 +02:00
rimach
22304d491d correct coding rules, some optimizations 2010-09-14 19:46:21 +02:00
Tim Bentley
627ba9626c Fix errors in merge 2010-09-14 18:29:56 +01:00
Tim Bentley
fe21b6be12 Fix video crashing 
Fixes: https://launchpad.net/bugs/637886
 2010-09-14 18:06:08 +01:00
Tim Bentley
d476e63621 fix service editing crashing 
Fixes: https://launchpad.net/bugs/637547
 2010-09-14 18:05:05 +01:00
Tim Bentley
efb58a710f Remove whitespace 2010-09-14 17:44:21 +01:00
Jon Tibble
1968803619 More cleanups 2010-09-14 15:43:21 +01:00
Jon Tibble
5fe753c833 Cleanups 2010-09-14 15:21:44 +01:00
Jon Tibble
23859bb241 Head r1030 2010-09-14 14:04:04 +01:00
Raoul Snyman
0a84fc0bcc Added extra labels to show that an item is disabled. 
Added functionality to the SongFormat class to keep track of availability of importers.
 2010-09-13 23:09:13 +02:00
Martin Thompson
a8dd0f5ddc Merged and fixed importing of 'other' verse types 2010-09-13 21:12:45 +01:00
rimach
8e8a6e42ff Head 2010-09-13 21:08:26 +02:00
Raoul Snyman
a1f7c9c5a0 Various string-related fixes: 
- Removed a bunch of double spaces.
- Renamed the translation files.
- Updated the translation files.
- Fixed up a few widgets.
Also fixed up the layout on the Edit Song form.

bzr-revno: 1030
 2010-09-13 08:17:07 +02:00
Tim Bentley
317a4ea8c6 Fix code so translations can be found 
bzr-revno: 1029
 2010-09-13 07:05:24 +01:00
Raoul Snyman
d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
rimach
9546c338fc Head 2010-09-12 23:03:45 +02:00
rimach
e2c8ee11f2 Fix removing dock with translation 2010-09-12 23:03:16 +02:00
Martin Thompson
062a88e2f2 Better handling of progress bar. Attempt to get 'other' type verses into database 2010-09-12 21:31:23 +01:00
Raoul Snyman
826e366880 Fixes bug #635330 and attempts to fix bug #635338 
bzr-revno: 1028
 2010-09-12 22:25:08 +02:00
Tim Bentley
37aecbefaf Lanugages now work 2010-09-12 10:14:02 +01:00
Jonathan Corwin
15c868568f Head 2010-09-11 22:40:26 +01:00
Jonathan Corwin
0d36cba0bb Video background loop/change 2010-09-11 22:40:14 +01:00
Andreas Preikschat
6654a7993a started to rework bibles (dual/single verses) 2010-09-11 21:36:47 +02:00
Raoul Snyman
4e8f663444 Set the correct default encoding. 
Centralise decoding to a single function.
HEAD
 2010-09-11 21:00:01 +02:00
Raoul Snyman
c1ed2a76e2 Detect v1.0 database at the beginning of the import, not half way through. 
Do some detection of the encoding.
 2010-09-11 20:51:27 +02:00
Tim Bentley
7b46f33cde Space 2010-09-11 16:58:03 +01:00
Tim Bentley
8d51128e0c Fix translation code to find qm files 2010-09-11 15:03:10 +01:00
Tim Bentley
0412fca642 Remove execuitable flag 2010-09-11 13:42:50 +01:00
Tim Bentley
beedfb78e6 Change version checking code 2010-09-11 12:11:19 +01:00
Tim Bentley
36b3446d2c Theme Cleanup up 2010-09-11 07:59:36 +01:00
rimach
d542e2762a hopefully Line ending corrected part3 2010-09-10 21:47:33 +02:00
rimach
5b32a9f6a9 Head 2010-09-10 21:23:20 +02:00
rimach
6d7e7d7ad2 hopefully Line ending corrected and resolve merge conflict, part2 2010-09-10 21:21:14 +02:00
rimach
2b700c481f hopefully Line ending corrected and resolve merge conflict 2010-09-10 20:46:04 +02:00
Jonathan Corwin
02abcf24fc Head 2010-09-10 18:52:22 +01:00
Jonathan Corwin
d549935fa8 Bug 634771 - Check for no recent files 2010-09-10 18:49:22 +01:00
rimach
d4cabf9693 move translations from mediamanager to plugins with dict 2010-09-10 17:50:30 +02:00
rimach
fa328945d3 Head 2010-09-09 23:12:02 +02:00
Jonathan Corwin
81a1cfc815 Tidy up versetag counting 2010-09-09 20:34:45 +01:00
Raoul Snyman
1dcf3a2769 jQuery-fied the JavaScript, made the interface look a little prettier. 
bzr-revno: 1023
 2010-09-09 21:01:23 +02:00
Derek Scotney
198cd94011 All verse types have auto numbering 2010-09-09 20:30:38 +02:00
Derek Scotney
efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +02:00
Jonathan Corwin
15a155044f Left+Bottom align footer, and prevent wrapping 
bzr-revno: 1021
 2010-09-09 19:05:08 +01:00
Jonathan Corwin
dd2136774b Remove height, so fix actually works 2010-09-09 08:30:14 +01:00
Jonathan Corwin
58dc96b124 Anchor footer from bottom, and prevent footer line wrapping 2010-09-08 22:55:24 +01:00
Raoul Snyman
158c612cf9 Fixed up the styles a little, and sync'ed to HEAD. 2010-09-08 22:38:37 +02:00
Tim Bentley
0eea3f40f3 Head 2010-09-08 20:39:39 +01:00
Tim Bentley
3bfea1c715 Proper fix for 632674 2010-09-08 20:36:39 +01:00
Tim Bentley
472da0cf27 Short term fix for 633354 
Fix display and text bugs

bzr-revno: 1019
Fixes: https://launchpad.net/bugs/594808, https://launchpad.net/bugs/632674
 2010-09-08 20:13:58 +01:00
Raoul Snyman
c2fdb62e74 Added a simple dialog to display any uncaught exceptions. 
bzr-revno: 1018
 2010-09-08 21:06:23 +02:00
rimach
8da2009413 Head 2010-09-08 20:40:19 +02:00
Tim Bentley
ccb75ad3b6 Fix display to work on 1024x768 resolution without nasty slider movements 
Fixes: https://launchpad.net/bugs/594808
 2010-09-08 19:12:16 +01:00
Tim Bentley
b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Tim Bentley
cfca50ff25 Fix setText bug when null list item 
Fixes: https://launchpad.net/bugs/632674
 2010-09-08 18:51:19 +01:00
Raoul Snyman
b8893f4ab2 Merge in the openlp.org 1.x importer. 
bzr-revno: 1017
 2010-09-08 06:57:13 +02:00
rimach
8bdedae911 Head 2010-09-07 23:04:13 +02:00
Raoul Snyman
7c2da6e2e3 Added a global exception catcher, so that our poor n00bs can see what happened. 2010-09-07 22:42:33 +02:00
Tim Bentley
1dd5ee185c Fix song editing bug 
bzr-revno: 1016
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 19:41:09 +01:00
Tim Bentley
4c648f142c Fix song editing display bug 
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 17:12:47 +01:00
Raoul Snyman
60fa82b78c Fix bug #598805 2010-09-07 15:23:02 +02:00
Raoul Snyman
f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman
63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Martin Thompson
c25b0aa8ff Test for multi character versetypes 2010-09-06 21:37:22 +01:00
Raoul Snyman
f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Martin Thompson
db118196a5 test_opensong passes again 2010-09-06 20:56:20 +01:00
Martin Thompson
53dc52c7c8 merged 2010-09-06 20:43:37 +01:00
Martin Thompson
2ae4c5a1b1 Merged 2010-09-06 20:42:39 +01:00
Raoul Snyman
5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Tim Bentley
991d8f1caf Fix bugs regarding screen blanking 
bzr-revno: 1015
Fixes: https://launchpad.net/bugs/639285, https://launchpad.net/bugs/630254
 2010-09-06 16:35:33 +01:00
Raoul Snyman
035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Raoul Snyman
08e97a67cb More string fixes and updates from Pootle. 2010-09-06 06:53:48 +02:00
rimach
44806ff859 Head 2010-09-05 23:04:25 +02:00
Tim Bentley
91eff095a5 Fix hiding of screen and adding items behind it and showing them. 
Fixes: https://launchpad.net/bugs/630285
 2010-09-05 20:52:49 +01:00
Tim Bentley
a4d8e225c0 Allow images to blank to theme. 
As none defined cos it's an image use global

Fixes: https://launchpad.net/bugs/630254
 2010-09-05 17:11:50 +01:00
Jonathan Corwin
aa0f4f7af0 Finish wizard integration 2010-09-05 16:16:48 +01:00
Jonathan Corwin
3d550e383c Head 2010-09-05 15:18:38 +01:00
Tim Bentley
2617e8d67b Fix bug for song CCLI setting 
Fix bug for dual bible tab which was a general settings bug.

bzr-revno: 1013
Fixes: https://launchpad.net/bugs/629848, https://launchpad.net/bugs/622894
 2010-09-05 07:05:00 +01:00
Jonathan Corwin
301a190483 Size maindisplay to full screen correctly, and eliminate maindisplay scrollbars 
bzr-revno: 1012
 2010-09-04 22:31:32 +01:00
Tim Bentley
e2c117034a Fix up bug for bible settings of duel drop down 
Fixes: https://launchpad.net/bugs/629848
 2010-09-04 20:40:28 +01:00
Jonathan Corwin
e54340d8f3 scrollbar attempt 2 2010-09-04 20:13:26 +01:00
Tim Bentley
da64f5147c Head1011 2010-09-04 19:14:51 +01:00
Tim Bentley
2cc3b8543c Clean up the renderer 
bzr-revno: 1011
 2010-09-04 19:12:48 +01:00
Philip Ridout
cefc155441 Rearranged the screen co-ordinate fields. 
bzr-revno: 1010
 2010-09-04 20:08:13 +02:00
Philip Ridout
55982e4b74 Fix incorrect method 
bzr-revno: 1009
 2010-09-04 19:01:17 +01:00
Jonathan Corwin
9c0391fe73 Screen size and scrollbar fix? 2010-09-04 18:55:10 +01:00
Raoul Snyman
a44ae94de7 HEAD 2010-09-04 19:53:10 +02:00
Raoul Snyman
2901c79ed6 Start work on the openlp.org 1.x importer. 
Add a couple of fixes to the song import.
Add a few fixes to the OpenSong importer.
 2010-09-04 19:51:41 +02:00