Commit Graph

8276 Commits

Author SHA1 Message Date
Mattias Põldaru
235e8c6fcf Use generated exceptions instead to make more specific errors. 2011-12-15 13:53:51 +02:00
Mattias Põldaru
95147c996b Fix #304, catch AttributeError together with XML syntax error (which is true in wider meaning of syntax, I think). 2011-12-15 05:45:30 +02:00
Mattias Põldaru
c10f73144d Fix for bug #828385, song import plugins order more alphabetical, but OpenLP related ones in front. It saves last used item's index. Saving of last used simply saves item's index in list, so if the order of import types changes (or one is added before the one), wrong item is selected for once.
bzr-revno: 1837
Fixes: https://launchpad.net/bugs/828385
2011-12-14 12:50:04 +02:00
Mattias Põldaru
3d278d51a7 Fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have (they really shouldn't since BOM is used to detect unicode on Windows and at least by wiki nobody is opposed).
bzr-revno: 1836
2011-12-14 12:47:52 +02:00
Mattias Põldaru
13385116af Using toInt of QVariant for sure is better than a chain of toString, str and int. Thanks to superfly. 2011-12-13 23:04:16 +02:00
Mattias Põldaru
2959235335 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags, resulting in the re-encoding of the same string on every save which makes the string wrong.
bzr-revno: 1835
Fixes: https://launchpad.net/bugs/802159
2011-12-13 22:34:30 +02:00
Mattias Põldaru
1665c557c1 I always forget something :( 2011-12-13 22:20:17 +02:00
Mattias Põldaru
143d87cc88 One more list which needs right order. 2011-12-13 22:01:21 +02:00
Mattias Põldaru
57d78d00df Make loading of variable slightly more bulletproof. 2011-12-13 21:52:57 +02:00
Mattias Põldaru
4f603d7353 Previous change of order was not enough, now is actually works. It also saves the type of import last time used and uses that value as default (as suggested), otherwise defaults to OpenLyrics. 2011-12-13 21:33:49 +02:00
Mattias Põldaru
9f5c0645aa No silly name abbreviations anymore. 2011-12-13 12:58:33 +02:00
Mattias Põldaru
88d7176900 Fix for #828385, more sensible and partly alphabetical order of import formats. 2011-12-13 02:34:46 +02:00
Mattias Põldaru
e70ca4fa06 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags. 2011-12-13 00:58:43 +02:00
Jonathan Corwin
d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly.
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
2011-12-12 19:20:51 +00:00
Tim Bentley
e6f9b66762 When a service is imported at present and we do not wish to save the songs we do not. This prevents the user from editing songs.
This change adds a "temporary" flag on the song database to allow those songs to be save and edited bit not via the plugin as the search will not show them.
On exit the songs will be deleted.

bzr-revno: 1833
2011-12-12 18:40:43 +00:00
Tim Bentley
143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley
4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin
6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jon Tibble
bd514c2994 Fix v1 themes with Unicode file names (Bug #882819)
bzr-revno: 1832
2011-12-11 20:23:47 +00:00
Jonathan Corwin
318484dc29 SOF5 capitalized words 2011-12-11 17:32:18 +00:00
Jonathan Corwin
62bca04614 Head 2011-12-11 17:24:45 +00:00
Jon Tibble
85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble
e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble
26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Jon Tibble
c975a4b309 Head r1831 2011-12-10 21:32:58 +00:00
Andreas Preikschat
193b1e2a0e Translation Strings
bzr-revno: 1831
2011-12-10 20:35:34 +00:00
Mattias Põldaru
c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem.
bzr-revno: 1830
2011-12-10 20:31:16 +00:00
Andreas Preikschat
8e2d119163 update ts files 2011-12-10 21:25:57 +01:00
Andreas Preikschat
b6810c7099 r1829 2011-12-10 21:19:17 +01:00
Mattias Põldaru
ca6250ae3b Supposedly fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have. 2011-12-10 20:21:18 +02:00
Jon Tibble
1184e198db Head r1829 2011-12-10 16:24:27 +00:00
Tim Bentley
b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Jonathan Corwin
4949f88f28 Fix problem with the outline alignment when the theme is using Justify.
bzr-revno: 1829
Fixes: https://launchpad.net/bugs/859950
2011-12-10 10:14:13 +00:00
Tim Bentley
39bc9238bf Lost temporary edit flag 2011-12-10 08:52:18 +00:00
Tim Bentley
1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Jonathan Corwin
6bf2354d1a Fix Songs of Fellowship import and support book 5
bzr-revno: 1828
2011-12-09 19:13:30 +00:00
Jonathan Corwin
6f77ee1351 Handle   and other white space too 2011-12-09 18:52:24 +00:00
Andreas Preikschat
4eee13430e -Fixed media item recreation (which caused bug #900399)
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
2011-12-09 17:32:17 +01:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Jonathan Corwin
6a17d55484 Songs of Fellowship 5 import 2011-12-09 00:08:59 +00:00
Jonathan Corwin
814c1930fd head 2011-12-08 23:32:03 +00:00
Christian Richter
b0f0d8030d Fixed a traceback when replaying live video background when no service item has been sent live before.
bzr-revno: 1826
Fixes: https://launchpad.net/bugs/899665
2011-12-08 22:27:22 +02:00
Jonathan Corwin
c36a13d0a8 Remove webkit version in js 2011-12-08 19:49:43 +00:00
Tim Bentley
c5f6dbfa6e Head 2011-12-08 19:42:40 +00:00
Tim Bentley
ecba19f124 Fixes 2011-12-08 19:42:31 +00:00
Jonathan Corwin
15d5b97075 Remove version check and js tidyups 2011-12-08 19:24:25 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +01:00
Andreas Preikschat
95aedfa5d9 assign variables in methods instead of returning them 2011-12-08 18:45:33 +01:00