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

6895 Commits

Author SHA1 Message Date
Mattias Põldaru
1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Mattias Põldaru
85a92455d1 Apply formatting tags to alerts. 2012-01-03 01:43:59 +02:00
Stevan Pettit
34eb37a4f4 Modified statement to avoid duplicate code execution 2012-01-01 08:43:43 -05:00
Stevan Pettit
3b58fe88f2 Added test to open save-as dialog if save location is unavailable 2011-12-31 23:09:49 -05:00
Mattias Põldaru
14dde1f0c4 Rename EasiSlides to EasySlides 
bzr-revno: 1863
 2011-12-31 19:17:54 +00:00
Mattias Põldaru
011e963751 Wiki page is renamed as well. 2011-12-31 21:00:27 +02:00
Jon Tibble
fb34a3e86d Fix crashes in media settings (Bug #908252) 2011-12-31 17:37:56 +00:00
Jon Tibble
768c099971 Indentation 2011-12-31 17:36:58 +00:00
Jon Tibble
e1a4837a19 Long line 2011-12-31 17:36:23 +00:00
Mattias Põldaru
a0ecae3f47 Rename EasiSlides to EasySlides. 
Fixes: https://launchpad.net/bugs/904384
 2011-12-31 16:18:05 +02:00
Jon Tibble
c997c38c59 Head r1860 2011-12-31 13:54:57 +00:00
Jon Tibble
89f3929bf7 Dedupe media search 2011-12-30 21:40:13 +00:00
Mattias Põldaru
185cc5487a Use cgi.escape instead of simply replacing tags, also escaping & was missing. 2011-12-30 15:00:08 +02:00
Andreas Preikschat
68ee74f72f - download theme screenshots in a thread to speed up the FTW 
bzr-revno: 1860
 2011-12-30 08:59:02 +01:00
Andreas Preikschat
214bd37057 fixed method name 2011-12-29 20:41:25 +01:00
Jon Tibble
4280e03c47 Head r1859 2011-12-29 18:47:39 +00:00
Tim Bentley
93a59d560f Another year has passed by 
bzr-revno: 1859
 2011-12-29 17:50:42 +00:00
Andreas Preikschat
20ef9b9730 download theme screenshots in a thread 2011-12-29 13:26:37 +01:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jon Tibble
b25fe75070 Fix unused imports 2011-12-26 16:33:11 +00:00
Jonathan Corwin
2b9f09b32a Minor fixes 2011-12-23 21:52:54 +00:00
Mattias Põldaru
b48dda3c74 Converts <> marks to &lt;&gt; to make it impossible to insert HTML to alerts. 
Fixes: https://launchpad.net/bugs/908197
 2011-12-23 21:14:49 +02:00
Jonathan Corwin
70ffa5b988 Head 2011-12-23 18:37:27 +00:00
Jonathan Corwin
5600946e0e divergences 2011-12-23 17:35:58 +00:00
Jonathan Corwin
ec035d6d37 Set correct monitor in wizard 2011-12-23 17:25:05 +00:00
Mattias Põldaru
173915f956 Made search function's replace greedy as well. Thanks to gushie the world is better place now :). 2011-12-23 18:03:37 +02:00
Mattias Põldaru
514773abe8 Make replace work for two or more occurrences. 2011-12-23 17:47:36 +02:00
Mattias Põldaru
e94ab832eb Escape \ and " characters first, to prevent traceback when sending such an alert from remote. 2011-12-23 17:23:32 +02:00
Mattias Põldaru
7f6edda463 Add a missing pair of quotes to fix #354. 2011-12-23 16:54:53 +02:00
Mattias Põldaru
706fa7ff49 Revert previous change. 2011-12-23 16:54:08 +02:00
Jonathan Corwin
3a5723cbaa Don't show initial display window if on same screen as application window, override or not. 2011-12-23 14:38:02 +00:00
Mattias Põldaru
2508e71a44 Supposedly fix for #354 in support.openlp.org, a traceback when JSON response from remote cannot be decoded. 2011-12-23 15:15:19 +02:00
Martin Zibricky
5f6962f4c7 This fixes bug #906926. 
bzr-revno: 1854
Fixes: https://launchpad.net/bugs/906926
 2011-12-22 23:36:22 +02:00
Jonathan Corwin
69490c8f2c Ensure visible flags correct, and display if single screen works on Windows 2011-12-22 20:11:52 +00:00
Martin Zibricky
79c5a3a4d4 refactoring: merge with trunk and use sys.platform 2011-12-22 19:29:55 +01:00
Martin Zibricky
4071bc8deb remove disabling opengl - done in new branch 2011-12-22 19:21:22 +01:00
Martin Zibricky
6828fc9ef5 fixed bug 907857: opengl rendering disabled for mac 2011-12-22 19:17:35 +01:00
Martin Zibricky
82728e148e #906926 fix stay on top for OS X 2011-12-22 15:46:47 +01:00
Jonathan Corwin
1cd3206f96 Redundant imports 2011-12-22 13:23:04 +00:00
Jonathan Corwin
16043527fc Check for Unity instead 2011-12-22 12:27:54 +00:00
Jonathan Corwin
b9c1da189a Head 2011-12-21 21:19:52 +00:00
Jonathan Corwin
febf40884f Just remove X11 bypass 2011-12-21 21:19:35 +00:00
Raoul Snyman
5bcfbb9433 Fixed bug #907164: Exclude footnotes div and the comment after it. 
bzr-revno: 1851
Fixes: https://launchpad.net/bugs/907164
 2011-12-21 12:30:16 +02:00
Mattias Põldaru
40783e1a3b Fixes error when trying to import an openlp.org songs or bibles database with non-ascii filename. Also some in-code notes about error handling. 
bzr-revno: 1850
 2011-12-21 12:29:08 +02:00
Mattias Põldaru
b80e2ffa5b Enable searching in web remote by pressing enter when search bar is focused. 
bzr-revno: 1849
 2011-12-21 12:27:54 +02:00
Mattias Põldaru
c1d1d38eba Such precision would not be needed in user errors, I suppose. The ones who would benefit from this can read log anyway. 2011-12-21 10:21:37 +02:00
Mattias Põldaru
5f9f87e8fa Style fixed. 2011-12-21 10:15:07 +02:00
Raoul Snyman
4e94986aa8 Fixed bug #907164: Exclude footnotes div and the comment after it. 
Fixes: https://launchpad.net/bugs/907164
 2011-12-21 07:22:49 +02:00
Mattias Põldaru
35665ff336 Fixes error when trying to import openlp.org v1 bible or songs db from a file with non-ascii characters. Also some notes about error handling. 2011-12-21 00:44:35 +02:00
Mattias Põldaru
b721559419 This line created a warning since codecs returns unicode strings. 2011-12-21 00:09:52 +02:00
Mattias Põldaru
72521be196 Merge trunk changes. 2011-12-20 23:00:20 +02:00
Mattias Põldaru
bfd0708f3a Enable search by pressing enter in web remote. 2011-12-20 22:43:57 +02:00
Meinert Jordan
e974df4c54 recover v1.x theme file names from XML info 
bzr-revno: 1847
 2011-12-20 20:25:27 +00:00
Meinert Jordan
d94816d481 recover v1.x theme file names from XML info 
bzr-revno: 1846
 2011-12-20 20:23:36 +00:00
Raoul Snyman
479598ab0b Fixed up bug #905367: The values were being sent through to the server unquoted. 
- Fixed an issue where the search options were getting called too early. Now they are called on page load.
- Upgraded jQuery Mobile to 1.0 final.
- Removed the dependency on json2.js, and removed json2.js
- Converted the back button to a home button, as that was its original intention.

bzr-revno: 1845
 2011-12-20 20:21:58 +00:00
M2j
cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01:00
M2j
15449372e1 use ICU collator on Windows systems 2011-12-19 01:20:39 +01:00
Raoul Snyman
2033ecb71c Converted the back button to a home button, as that was its original intention. 2011-12-18 23:02:06 +02:00
Raoul Snyman
9cc7412852 Removed the dependency on json2.js, and removed json2.js 2011-12-18 22:49:31 +02:00
Raoul Snyman
2c7ee7ba20 Upgraded jQuery Mobile to 1.0 final. 
Fixed an issue where the search options were getting called too early. Now they are called on page load.
Fixed up bug #905367: The values were being sent through to the server unquoted.

Fixes: https://launchpad.net/bugs/905367
 2011-12-18 22:42:28 +02:00
Andreas Preikschat
8bfaa22535 added missing ) 2011-12-18 20:46:56 +01:00
Andreas Preikschat
9e03e18653 added floft to the list of packagers 2011-12-18 20:44:41 +01:00
Mattias Põldaru
dca74bd144 Style, no "is" to compare strings. 2011-12-17 23:17:53 +02:00
Mattias Põldaru
86df7d9734 Name it rather OpenLyricsError 2011-12-17 19:47:08 +02:00
Mattias Põldaru
28fa03b7cd Use OpenLyricsException instead. 2011-12-17 19:26:59 +02:00
Raoul Snyman
d701316923 Fix bug #900387: Converted a user's old Phonon setting to the new media players format. 
bzr-revno: 1842
Fixes: https://launchpad.net/bugs/900387
 2011-12-17 08:43:36 +02:00
Tim Bentley
0a9ea54bf8 Fix remote hiding of screen and updating UI buttons 
bzr-revno: 1841
 2011-12-16 15:06:14 +00:00
Andreas Preikschat
36d6a9003d Shortcut can be assigned twice in certain circumstances) 
Description of the fix:
1) Create a dict with the shortcuts as keys and a list of actions using this shortcut as value.
2) When we add a new action/shortcut we check if the shortcut is valid. If this is the case we add it to the dict and if not we remove the shortcut.

bzr-revno: 1840
 2011-12-16 15:04:51 +00:00
Raoul Snyman
d800951800 Actually read directly from the media controller, and then update the settings tab. 2011-12-15 23:06:50 +02:00
M2j
99fc7dea18 v1 theme import moved to seperate method 2011-12-15 21:14:12 +01:00
Raoul Snyman
19fac1e84a Cleaned up some code to conform to our coding standards. 
Added an appStartup() method to the media plugin to detect the settings of an older version of the media plugin, and update the settings.
 2011-12-15 22:13:45 +02:00
Tim Bentley
55353e54f0 yet more changes 2011-12-15 18:59:25 +00:00
Mattias Põldaru
cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
Tim Bentley
acebb85055 more changes 2011-12-15 17:19:54 +00:00
Andreas Preikschat
27843ae718 removed space 2011-12-15 16:27:17 +01:00
Mattias Põldaru
235e8c6fcf Use generated exceptions instead to make more specific errors. 2011-12-15 13:53:51 +02:00
Tim Bentley
e141419cdc Fix method names and add to poll event 2011-12-15 06:10:35 +00: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
Jonathan Corwin
98a6c25ac8 Missed a file... 2011-12-14 23:41:52 +00:00
Jonathan Corwin
3874363e54 Add a more specific test for gnome shell 2011-12-14 22:44:41 +00:00
Mattias Põldaru
ac557714ef Fix for 860876, a bug where web remote returns wrongly decoded alert message. It also fixes no search results when searching words with non-ascii characters. 
Fixes: https://launchpad.net/bugs/860876
 2011-12-15 00:39:52 +02:00
Tim Bentley
a06a1dd24c Fix url messages 2011-12-14 20:26:23 +00:00
Tim Bentley
58f7649cca Fix elif 2011-12-14 20:04:38 +00:00
Tim Bentley
e450ea476d Remove blank line 2011-12-14 19:19:26 +00:00
Tim Bentley
fa1a721c26 Head 2011-12-14 19:07:56 +00:00
Tim Bentley
c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
Andreas Preikschat
d2cf6aa684 fixed a i18n bug + remove shortcut from map if removing the action 2011-12-14 16:45:11 +01: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
M2j
f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j
0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01: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
16f798e404 Attempt to check for gnome version 2011-12-12 22:10:37 +00: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
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
Jonathan Corwin
318484dc29 SOF5 capitalized words 2011-12-11 17:32:18 +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
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
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
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 &nbsp; 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
rimach
1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01: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
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
rimach
f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +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
rimach
bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
rimach
7f513fc58c sync 2011-12-06 22:16:09 +01: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
rimach
2df4a1903e bugfixing 2011-12-05 19:48:32 +01:00
rimach
ae5998e2dc sync 2011-12-05 18:43:54 +01: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
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
Jon Tibble
6336915b4e Reduce recent file list duplication (Bug #892668) 
bzr-revno: 1821
 2011-12-04 20:50:52 +00:00
Raoul Snyman
11f5dfcfcd HEAD 2011-12-04 22:50:39 +02:00
Raoul Snyman
06570a9941 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. 2011-12-04 22:50:13 +02:00
Raoul Snyman
90d8b211d9 Hopefully the final fix to all our database woes. 
bzr-revno: 1820
 2011-12-04 20:19:20 +02:00
Tim Bentley
17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Tim Bentley
f751ae092a fix exit code 2011-12-04 16:19:45 +00:00
Jon Tibble
5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Raoul Snyman
c825df38fa Hopefully the final piece of the fix. 2011-12-04 15:26:27 +02:00
Andreas Preikschat
5d664d629d fixed bug 768495 (Shortcut can be assigned twice in certain circumstances) 
bzr-revno: 1819
Fixes: https://launchpad.net/bugs/768495
 2011-12-04 12:08:09 +01:00
Andreas Preikschat
3218ab3d8f - fixed a few tooltip strings 
bzr-revno: 1818
 2011-12-04 12:07:05 +01:00
Tim Bentley
456d7ec68e remove print 2011-12-04 07:27:49 +00:00
Raoul Snyman
2016ce61ca Sometimes the song_id column doesn't exist on the model, so we use the table instead. 2011-12-04 00:30:22 +02:00
Raoul Snyman
def18307cc Avoid an error about something not being a Boolean. 
Fixes: https://launchpad.net/bugs/899532
 2011-12-03 23:49:40 +02:00
Raoul Snyman
2e7a25697d HEAD 2011-12-03 23:40:30 +02:00
Andreas Preikschat
b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Tim Bentley
6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Raoul Snyman
76d10b094f HEAD 2011-12-03 20:33:12 +02:00
Raoul Snyman
5b67d36b3c Fix problem where importing new song databases now does not work. 
Fixes: https://launchpad.net/bugs/863845
 2011-12-03 20:23:46 +02:00
Andreas Preikschat
f34ae80eec fixed bug 887313 
Fixes: https://launchpad.net/bugs/887313
 2011-12-03 19:01:36 +01:00
Tim Bentley
add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley
8c4397d380 Head 2011-12-03 17:01:57 +00:00
Andreas Preikschat
ae8f57f707 r1815 2011-12-03 16:09:50 +01:00
Andreas Preikschat
5bfc101f09 changed name 2011-12-03 16:09:03 +01:00
Tim Bentley
13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Andreas Preikschat
eb121abb12 attempt to fix bug 768495 
Fixes: https://launchpad.net/bugs/768495
 2011-12-03 15:38:30 +01:00
Jon Tibble
9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Tim Bentley
b37c41d7a8 minor fixes 2011-12-03 13:32:19 +00:00
Tim Bentley
1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley
624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
rimach
8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
Jon Tibble
02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
rimach
2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
Jon Tibble
bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00:00
Jon Tibble
e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble
f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Jon Tibble
bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
rimach
11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach
cc2c58d9dc sync with trunk 2011-12-02 16:12:59 +01:00
Raoul Snyman
512bab74c3 Added a missing import. 
bzr-revno: 1812
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 11:52:49 +02:00
Raoul Snyman
f8ea1349f4 Fix importing of newer songs databases. 
bzr-revno: 1811
Fixes: https://launchpad.net/bugs/863845
 2011-12-02 11:50:20 +02:00
Raoul Snyman
24095edc2b Added a missing import. 
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00
Raoul Snyman
d558cb080c Fix importing of newer songs databases. 2011-12-01 21:01:57 +02:00
rimach
4fc4bacfa7 bugfixing 2011-12-01 19:08:12 +01:00
rimach
e627960391 bugfixing 2011-12-01 19:07:15 +01:00
Raoul Snyman
3f50ea1b1a Removed 'populate_default' arguments as they are not supported in older versions of migrate. 
bzr-revno: 1809
Fixes: https://launchpad.net/bugs/896977
 2011-11-30 22:32:04 +02:00
Tim Bentley
8fee84d052 Stop keyboard floods getting the slide controller and service manager out of set. 
bzr-revno: 1808
Fixes: https://launchpad.net/bugs/892571
 2011-11-30 22:27:54 +02:00
rimach
af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach
6ed1342f95 sync 2011-11-30 21:14:18 +01:00
rimach
44d71dcee7 bugfixing 2011-11-30 18:10:57 +01:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01:00
rimach
3570e48732 remove unused function 2011-11-30 09:29:32 +01:00
Christian Richter
b2349d892b For newer versions of webkit playing videos doesnt work anymore. 
bzr-revno: 1807
 2011-11-29 19:49:33 +02:00
Tim Bentley
8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Raoul Snyman
87f5d7843c Removed 'populate_default' arguments as they are not supported in older versions of migrate. 
Fixes: https://launchpad.net/bugs/896977
 2011-11-27 23:24:35 +02:00
Jérémie Nau
8e86f21cbd Service notes are not displayed on stage remote view when the current service item is the last. 2011-11-27 21:39:39 +02:00
Meinert Jordan
fee0f79a73 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.

bzr-revno: 1805
 2011-11-27 16:44:39 +00:00
Tim Bentley
ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
Jon Tibble
5b4e8826ec Fix undefined variables 2011-11-26 21:59:21 +00:00
Jon Tibble
ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
Jon Tibble
fb6403f003 Head r1804 2011-11-26 20:32:47 +00:00
M2j
047477c236 layout fix in exceptionform 
bug fix triggerd by searching for nonexistend book numbers
 2011-11-26 20:13:51 +01:00
Andreas Preikschat
d4e9968a4f Fix Song Select Import 
- applied patch from http://support.openlp.org/issues/330

bzr-revno: 1803
 2011-11-25 16:18:16 +00:00
M2j
ebcf7a5dd2 corrected function comment 2011-11-24 23:49:21 +01:00
M2j
286ec88fc4 make VerseType.Other default for VerseType encodings 2011-11-24 23:34:27 +01:00
rimach
65ce3c84d2 fix video play problem with newer webkit version and webkit player 2011-11-24 22:25:38 +01:00
rimach
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach
dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Jérémie Nau
0d1f843584 fixed method names 2011-11-24 20:28:03 +01:00
Tim Bentley
5e702c1782 Fixes keyboard flood where events are switched order by PYQT. 
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
 2011-11-23 06:05:42 +00:00
Raoul Snyman
a579725cd7 HEAD 2011-11-21 23:05:56 +02:00
Andreas Preikschat
0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3 Amend check for files and delete if not used any more 
Fixes: https://launchpad.net/bugs/891781
 2011-11-18 19:34:04 +00:00
M2j
b2067bef43 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.
 2011-11-18 11:53:56 +01:00
Tim Bentley
04b965d166 Fix incorrect signal 2011-11-13 16:31:08 +00:00
Tim Bentley
ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
Tim Bentley
516dda5ec3 Fixes 2011-11-13 08:57:29 +00:00
rimach
acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01:00
rimach
870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach
7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach
a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach
c0cc590c71 sync 2011-11-11 17:42:01 +01:00
Raoul Snyman
46643ab832 Added the quoting to database fields. 2011-11-07 23:22:35 -07:00
Andreas Preikschat
48354ec8ef - fixed bug #827862 (Add Shortcut to change verse, chorus, ... in the live controller) 
bzr-revno: 1797
Fixes: https://launchpad.net/bugs/827862
 2011-11-05 20:39:51 +01:00
Raoul Snyman
3a62438ef1 Upgraded jQuery, jQuery Mobile; added a top toolbar. 2011-11-04 23:17:03 -07:00
Tim Bentley
d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach
4779a3f21a Head and bugfixing 2011-11-02 21:44:44 +01:00
rimach
1c35195f6a sync 2011-11-02 21:39:18 +01:00
rimach
2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Tim Bentley
0304057e00 remove # 2011-11-02 20:09:06 +00:00
Tim Bentley
3d316a802b Head 2011-11-02 19:06:23 +00:00
Tim Bentley
3bd0ad9181 Fix crash with two soft breaks 2011-11-02 18:58:46 +00:00
Andreas Preikschat
1bf1ffc848 fixed bug 884826 
Fixes: https://launchpad.net/bugs/884826
 2011-11-01 18:32:31 +01:00
Tim Bentley
d4eeb4136a stop alerts crashing with splash screen 
bzr-revno: 1793
 2011-11-01 06:09:21 +00:00
Andreas Preikschat
b0b4656ed6 - fixed bug #872975 (Importing from v1 fails with error about missing 'settings' table) 
bzr-revno: 1792
Fixes: https://launchpad.net/bugs/872975
 2011-10-31 22:39:01 +01:00
Tim Bentley
14527bf357 Fix my stupidity 2011-10-31 18:20:10 +00:00
Andreas Preikschat
dad7e86f06 added/fixed comments 2011-10-31 15:18:22 +01:00
Andreas Preikschat
e402b72d58 - fixed bug #872975 (Importing from v1 fails with error about missing 'settings' table) 
Fixes: https://launchpad.net/bugs/872975
 2011-10-31 15:11:54 +01:00
Andreas Preikschat
71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00
Andreas Preikschat
94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat
e856fa9aed r1790 2011-10-31 09:56:48 +01:00
Andreas Preikschat
5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat
cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat
f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat
ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat
2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01:00
Andreas Preikschat
eb7b7a19d8 r1790 2011-10-31 08:09:48 +01:00
Andreas Preikschat
d1030a7c2d Corrected comment 2011-10-31 08:08:51 +01:00
Tim Bentley
c37ffbe3e2 Pass in plugins 2011-10-31 06:03:03 +00:00
Andreas Preikschat
482c741665 r1789 2011-10-30 22:38:42 +01:00
Andreas Preikschat
15e19f9700 fixed rename errors 2011-10-30 22:38:02 +01:00
Andreas Preikschat
0ed66b6a9c fixed alert position not being recalculated properly when changing options 2011-10-30 21:24:04 +01:00
Tim Bentley
c8e9496db1 Fix up review comments 2011-10-29 20:13:11 +01:00
Tim Bentley
ea4cb7f7ed Add Class instead of magic numbers 2011-10-29 14:21:54 +01:00
Tim Bentley
8e853f10b1 Fix crash with alerts over video 
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
 2011-10-29 10:33:48 +01:00
rimach
01ff00dcf9 bugfixing and sync 2011-10-26 22:13:30 +02:00
rimach
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat
360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat
c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat
33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach
1f84c4c685 bugfixing 2011-10-24 22:07:10 +02:00
rimach
a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat
ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat
a42940b6bb - shortcuts only for live controller 
- removed v shortcut
 2011-10-24 17:36:59 +02:00
Andreas Preikschat
cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat
b603017b1c started work on shortcuts allowing jumping between different verses 
Fixes: https://launchpad.net/bugs/827862
 2011-10-23 19:47:15 +02:00
Tim Bentley
5f9ed32bfe Fix assignment error 2011-10-23 18:22:11 +01:00
Meinert Jordan
f25cd069ab add version information for mako, migrate and uno to exceptionform 
bzr-revno: 1784
 2011-10-22 15:32:04 +02:00
M2j
5a415311a5 Correction for Migrate version smaller than 0.7 2011-10-22 14:30:21 +02:00
Andreas Preikschat
acac723b09 copy error 2011-10-22 13:28:47 +02:00
Andreas Preikschat
49569746ea fixed doc 2011-10-22 13:16:25 +02:00
Andreas Preikschat
05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
M2j
aa0b49290d add version information for mako, migrate and uno to exceptionform 2011-10-20 22:11:06 +02:00
Andreas Preikschat
e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background") 
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
 2011-10-19 19:30:32 +01:00
Tim Bentley
9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide 
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
 2011-10-19 19:25:08 +01:00
Tim Bentley
4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach
2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach
599573b5ce Sync 2011-10-17 23:51:24 +02:00
rimach
dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +02:00
Tim Bentley
bdcf15d87b Fix comments 2011-10-17 19:01:07 +01:00
Andreas Preikschat
dd7af54411 - fixed ticket 299 
http://support.openlp.org/issues/299

bzr-revno: 1778
 2011-10-17 17:48:42 +01:00
Meinert Jordan
972d917c8a Remove mailto code and use QT code 
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
 2011-10-17 17:46:35 +01:00
Andreas Preikschat
13ff2faf18 fixed ticket 299 2011-10-16 22:32:50 +02:00
Tim Bentley
bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat
406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat
004472baa8 reverted alert change 2011-10-16 16:53:39 +02:00
Andreas Preikschat
a75e0156cc fixed docstrings 2011-10-16 16:40:46 +02:00
Tim Bentley
2f36c33f62 Review fixes 2011-10-16 09:25:27 +01:00
Tim Bentley
8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
M2j
525658ae8b better readable coding style 2011-10-15 23:21:22 +02:00
M2j
1527704c03 - exception dialog uses Qt call instead of external library 
- unicode support in report and attached filename was broken
 2011-10-15 22:18:49 +02:00
Andreas Preikschat
9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Andreas Preikschat
a1a79c98d1 overwrite parent method 2011-10-15 09:52:25 +02:00
Andreas Preikschat
ec5991a197 removed dead code§ 2011-10-15 09:36:51 +02:00
Tim Bentley
9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley
17ec218529 Fix wonky footer 
bzr-revno: 1775
Fixes: https://launchpad.net/bugs/863841
 2011-10-13 19:02:39 +01:00
Tim Bentley
bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley
0e1361b533 Fix footer position 2011-10-12 05:51:03 +01:00
Tim Bentley
e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Tim Bentley
9176911810 Try 1 2011-10-11 19:10:53 +01:00
Andreas Preikschat
76f47a4f62 - clean ups 
- only display alert when the screen is not hidden
 2011-10-10 18:54:01 +02:00
Andreas Preikschat
658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat
6883427cbd fixed bug 871441 
Fixes: https://launchpad.net/bugs/871441
 2011-10-10 18:22:41 +02:00
Andreas Preikschat
577fdb6c31 - fixed bug 863376 ('<' in song lyrics causes a traceback) 
- clean ups

bzr-revno: 1774
Fixes: https://launchpad.net/bugs/863376
 2011-10-10 18:03:00 +02:00
Andreas Preikschat
e6751bd043 fixed string 2011-10-09 21:51:44 +02:00
Andreas Preikschat
3c8cc5c532 removed comment + fixed regex 2011-10-09 21:45:50 +02:00
Andreas Preikschat
06068eedce fixed bug 863846 
Fixes: https://launchpad.net/bugs/863846
 2011-10-08 15:29:35 +02:00
Andreas Preikschat
2591854fdd fixed bug 863376 
- clean ups

Fixes: https://launchpad.net/bugs/863376
 2011-10-08 15:20:57 +02:00
Stevan Pettit
0b4259ffba fixed Bug #832345 
bzr-revno: 1771
Fixes: https://launchpad.net/bugs/832345
 2011-10-08 10:59:13 +02:00
Stevan Pettit
2a1d0009a8 Removed whitespace 2011-10-05 18:17:57 -04:00
Stevan Pettit
5dfa0c95ce Modified code so new Openlyrics song import description will appear for translate 2011-10-05 15:50:17 -04:00
Tim Bentley
161300fe73 Number of changes 
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
 2011-10-05 19:20:54 +01:00
Andreas Preikschat
182227a85a - improved the preview frame display performance 
- removed dead code

bzr-revno: 1769
 2011-10-05 20:18:42 +02:00
Tim Bentley
575aa02022 Amend text 2011-10-05 18:18:56 +01:00
Andreas Preikschat
45b296b741 clean up 2011-10-05 19:04:59 +02:00
Tim Bentley
159a95855f Change Text 2011-10-05 17:14:21 +01:00
Andreas Preikschat
1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat
947b31d2c4 fixed name 2011-10-03 22:28:17 +02:00
Andreas Preikschat
91c20c4271 more clean ups 2011-10-03 22:26:51 +02:00
Andreas Preikschat
d3bfffa4b1 removed not used imports 2011-10-03 22:12:57 +02:00
Andreas Preikschat
201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat
360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat
88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Tim Bentley
5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Andreas Preikschat
42d15a53c7 suggest web bible name when registering 2011-10-03 14:32:45 +02:00
Tim Bentley
9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley
c5a7127aec Copy theme during remote edit. 
Fixes: https://launchpad.net/bugs/864822
 2011-10-02 20:49:29 +01:00
Tim Bentley
6426d9aac4 Display is now big enough 2011-10-02 17:38:05 +01:00
Tim Bentley
297a250010 Display works but bigggggggggg 2011-10-02 08:52:28 +01:00
Tim Bentley
9b5074991c Add new dialog 2011-10-01 21:33:53 +01:00
Stevan Pettit
dc41fa4318 Added coded to translate the modified OpenLyrics import description 2011-10-01 10:34:30 -04:00
Tim Bentley
648c5159a1 Allow the stageview time to be formatted between 12 and 24 hours 
Fixes: https://launchpad.net/bugs/863841
 2011-10-01 17:34:09 +05:30
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Stevan Pettit
d8fc6cd4dd Added additional desctiption to OpenLyrics import selection and added code to select xml files for import 2011-09-30 17:45:59 -04:00
Tim Bentley
128b6b80bf Display now works 2011-09-29 18:57:48 +01:00
rimach
3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
rimach
c299efab1a update 2011-09-28 22:54:43 +02:00
Tim Bentley
9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley
ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley
632e2ce2dd More fixes 2011-09-28 05:50:56 +01:00
Tim Bentley
3e2e87bb2c Initial stab 
Fixes: https://launchpad.net/bugs/814201
 2011-09-27 20:37:34 +01:00
Tim Bentley
276d4045e3 Fix edit for tags loaded for song which is not saved 
bzr-revno: 1765
 2011-09-27 18:23:21 +01:00
Tim Bentley
90cc812592 Head 2011-09-27 05:59:50 +01:00
Tim Bentley
695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Andreas Preikschat
0a7ba097a8 shorter code 2011-09-26 20:48:47 +02:00
Andreas Preikschat
d27a75287f - improved render performance for service items with the CanSoftBreak capability 
- added HTML5 doctype

bzr-revno: 1763
 2011-09-26 20:28:23 +02:00
Andreas Preikschat
70a7f1bf9f r1763 2011-09-26 20:26:40 +02:00
Andreas Preikschat
947a58dbbe improved line counting 2011-09-26 20:26:13 +02:00
Tim Bentley
7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Andreas Preikschat
9a40b27672 fix for theme editing 2011-09-26 18:57:32 +02:00
Andreas Preikschat
c9b7b55a87 reverted some changes 2011-09-26 18:46:11 +02:00
Andreas Preikschat
6631c2fcbb r1761 2011-09-26 18:26:47 +02:00
Andreas Preikschat
3a2be026f5 reverted some changes 2011-09-26 18:25:22 +02:00
Tim Bentley
8c6fcfcd4a Fix typing error 2011-09-26 17:12:40 +01:00
Tim Bentley
fb3f001c26 Add Justify theme option 
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
 2011-09-26 17:07:30 +01:00
Tim Bentley
682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley
88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Tim Bentley
c058c774fc revert 1757 2011-09-24 16:18:48 +01:00
Andreas Preikschat
9841406071 minor improvement for such cases where [---] was used 2011-09-24 14:54:27 +02:00
Andreas Preikschat
b776015ae9 r1759 2011-09-24 14:19:28 +02:00
Raoul Snyman
0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-24 00:14:23 +02:00
Martin Zibricky
b66e07e98b Fixed bug #745636: Added export to openlyrics format with formatting tags. 
bzr-revno: 1758
Fixes: https://launchpad.net/bugs/745636
 2011-09-23 08:43:06 +02:00
Martin Zibricky
3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky
7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +02:00
Martin Zibricky
1ef223b4a3 Fix issues with ignoring comments and chords 2011-09-23 02:12:55 +02:00
Raoul Snyman
a6821c0b7d Removed some unnecessary experimental code. 2011-09-22 22:39:27 +02:00
Martin Zibricky
354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
Raoul Snyman
77e4e376c6 Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again. 
Fixes: https://launchpad.net/bugs/812289
 2011-09-22 22:07:31 +02:00
rimach
81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach
d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach
11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach
2284cee517 little corrections 2011-09-22 20:27:04 +02:00
rimach
18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky
8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Raoul Snyman
e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-21 22:47:30 +02:00
Tim Bentley
0e2d6cb45f Replace u'' for None 
bzr-revno: 1755
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:48:22 +01:00
Tim Bentley
58695ac6f6 Change None to u'' for printing 
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:23:04 +01:00
Martin Zibricky
c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Martin Zibricky
6e4c619cbd Add openlyrics export with formatting tags support. 2011-09-21 01:06:43 +02:00
Raoul Snyman
854cdf2c83 Fixed bug #803342. 
bzr-revno: 1754
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 20:03:42 +02:00
Raoul Snyman
b0dc146043 Added the default background colour back in so that the rest of the app that is not expecting to have to supply a background colour doesn't have to be changed. 
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 19:53:09 +02:00
Andreas Preikschat
9cab0f223c Fixed bug 805088 (Display tags do not work on second slide when slide is split) 
bzr-revno: 1753
 2011-09-20 18:34:33 +02:00
Raoul Snyman
bd3961eb50 Reverted a change for deprecated options (for now). 2011-09-20 18:26:04 +02:00
Raoul Snyman
54a1e25cb7 Trying to fix bug #803342 2011-09-20 18:24:07 +02:00
Tim Bentley
3cec8cbb17 Fix crash on service load of some people. 
Fix loop on config exit under extreme activities!

bzr-revno: 1752
Fixes: https://launchpad.net/bugs/854171
 2011-09-20 17:11:49 +01:00
Martin Zibricky
74c5669194 Dropped <line> element for openlyrics parsing and allow to import formatting tags over multiple lines and tags with only starting tag 2011-09-20 17:52:19 +02:00
Andreas Preikschat
920a65b4e1 fix detection when tag exists more than once 2011-09-20 17:50:43 +02:00
Tim Bentley
47b7379967 Fix spelling and remove print statement 2011-09-20 16:41:04 +01:00
Tim Bentley
834ed570ce Fix bug where string is added to image instead of QColor. 
Fix issue where queue has records to process but it is not running.

Fixes: https://launchpad.net/bugs/854171
 2011-09-20 16:23:29 +01:00
Raoul Snyman
429a1a4541 Remove reference to the non-existent __del__ method. 
Fixes: https://launchpad.net/bugs/854125
 2011-09-19 20:55:34 +02:00
Andreas Preikschat
240d612948 fixed doc 2011-09-19 18:13:38 +02:00
Andreas Preikschat
724e2be04f close tags 2011-09-19 18:00:27 +02:00
Martin Zibricky
039115c7f4 Fix issue with more new lines when having more <lines> element in openlyrics document. 2011-09-19 14:59:37 +02:00
Martin Zibricky
b27784e838 Add comments to some new functions 2011-09-19 01:00:55 +02:00
Martin Zibricky
fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Martin Zibricky
2b7f51d4e9 Code cleanup of openlyrics import with formatting tags 2011-09-19 00:43:12 +02:00
Andreas Preikschat
734c868223 removed semicolon 2011-09-18 17:39:12 +02:00
Stevan Pettit
0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Tim Bentley
f19db2e5dc Fix lists to sort if new items are added for Images, Media and Presentations 
bzr-revno: 1748
Fixes: https://launchpad.net/bugs/827027
 2011-09-18 14:07:27 +01:00
Andreas Preikschat
ceec3d6f3a reverted not necessary change 2011-09-18 12:32:27 +02:00
Andreas Preikschat
d856e957b4 removed FIXME 2011-09-18 12:30:14 +02:00
Andreas Preikschat
2dad85f4c5 r1749 2011-09-18 12:28:53 +02:00
Andreas Preikschat
d62876b411 r1749 2011-09-18 12:28:27 +02:00
Andreas Preikschat
cd33d807fc removed test code 2011-09-18 12:28:10 +02:00
Andreas Preikschat
3c3339f114 final fixes and clean ups 2011-09-18 12:26:47 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Stevan Pettit
c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley
d47189e904 Remove unneeded timer logger . Was from old renderer 2011-09-17 14:05:28 +01:00
Tim Bentley
11424c8a7a Only load list if changed 2011-09-17 09:28:33 +01:00
Tim Bentley
62979a0062 Sort for added items in Images, Media and Presentations 
Fixes: https://launchpad.net/bugs/827027
 2011-09-17 09:20:03 +01:00
Martin Zibricky
8a11e790e5 [merge] merge with trunk r1747 2011-09-17 09:37:04 +02:00
Tim Bentley
6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Martin Zibricky
614ad790ae Fix spelling mistake 2011-09-16 13:31:11 +02:00
Raoul Snyman
f6927ef5b7 Fixed bug #851653, where deleting a song without audio files raised an exception. 
bzr-revno: 1747
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 13:20:44 +02:00
Raoul Snyman
1afcbbc837 Fixed bug #851653, added an if statement, and fixed the orphaned variable. 
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 10:15:37 +02:00
Martin Zibricky
a7cd6c8a17 fix typo in comment 2011-09-15 19:44:03 +02:00
Martin Zibricky
82163867fe Add docstrings to some new openlyrics methods. 2011-09-15 14:23:40 +02:00
Tim Bentley
52c63d9665 Undo fix 2011-09-14 21:35:32 +01:00
Tim Bentley
53b3b394e9 Turn off autopreview when deleting images. 
Stops images being deleted trying to preview themselves.

Fixes: https://launchpad.net/bugs/835033
 2011-09-14 21:27:30 +01:00
Martin Zibricky
526365153f rename in xml.py only_process_format_tags to parse_and_not_save 2011-09-13 22:40:34 +02:00
Martin Zibricky
8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Tim Bentley
7469c08674 Head 2011-09-13 19:13:25 +01:00
Stevan Pettit
1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04:00
Stevan Pettit
25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Martin Zibricky
50dbb1ed0b [merge] merge with trunk r1743 2011-09-12 22:36:41 +02:00