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

3190 Commits

Author SHA1 Message Date
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