Commit Graph

8303 Commits

Author SHA1 Message Date
Andreas Preikschat
f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01: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
Andreas Preikschat
08743f147c replaced has_key 2011-12-10 15:10:56 +01:00
Andreas Preikschat
3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Andreas Preikschat
9967e34d0a re reverted changes
Fixes: https://launchpad.net/bugs/768495
2011-12-10 15:03:08 +01: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
Andreas Preikschat
4f9a801966 set settings_tab to None if plugin is disabled 2011-12-08 17:34:18 +01:00
Mattias Põldaru
97560f6947 The category strings, if not unicode, can only be QStrings. Thanks to superfly. 2011-12-08 14:13:57 +02:00
Jonathan Corwin
44eb1fb024 Remove comment 2011-12-07 22:24:13 +00:00
Jon Tibble
e778531fb1 Fix the non-ascii check on Macs
bzr-revno: 1825
2011-12-07 22:23:12 +00:00
Jonathan Corwin
1c79b28461 Workaround justify and outline alignment problems 2011-12-07 21:56:06 +00:00
Andreas Preikschat
66c183a6b8 break instead of continue 2011-12-07 21:41:19 +01:00
Andreas Preikschat
32f2dcac59 reverted change 2011-12-07 21:28:26 +01:00
Andreas Preikschat
12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
Jon Tibble
fd8525bf89 Head r1824 2011-12-06 22:38:46 +00:00
Mattias Põldaru
ef3e3252e7 Comparison to None is discouraged 2011-12-07 00:37:56 +02:00
rimach
b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
Mattias Põldaru
1830cfbe9e Ensure that action category names are unicode, to prevent warnings on comparison. 2011-12-06 23:25:04 +02:00
Andreas Preikschat
73d0050b95 reverted r1819
bzr-revno: 1824
2011-12-06 20:40:55 +01:00
Andreas Preikschat
38a2a3dee2 fixed bug 768495 2011-12-06 20:30:39 +01:00
Andreas Preikschat
36e729303c reverted changes 2011-12-06 20:25:12 +01:00
Jon Tibble
04d7669948 Fix non-ascii file check on Macs 2011-12-05 21:40:56 +00:00
Tim Bentley
149a660dad Head 2011-12-05 19:47:59 +00:00
Tim Bentley
d05c6b8d70 Fix up song import code 2011-12-05 19:47:50 +00:00
Raoul Snyman
b7e7da56e6 Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error about missing columns or tables.
bzr-revno: 1823
2011-12-05 18:06:47 +01:00
Jon Tibble
35d13cc90b Fix non-acsii service filename loading
bzr-revno: 1822
2011-12-04 21:51:09 +00:00
Jon Tibble
6b91f58da3 Head r1821 2011-12-04 20:58:39 +00:00
Jon Tibble
a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Raoul Snyman
ba0a4bb827 HEAD 2011-12-04 22:52:08 +02:00