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

3830 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
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
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
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
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
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
88d7176900 Fix for #828385, more sensible and partly alphabetical order of import formats. 2011-12-13 02:34:46 +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
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
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
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
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
Tim Bentley
ecba19f124 Fixes 2011-12-08 19:42:31 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +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
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
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
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
Raoul Snyman
c825df38fa Hopefully the final piece of the fix. 2011-12-04 15:26:27 +02: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
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
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
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
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
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
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
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
e627960391 bugfixing 2011-12-01 19:07:15 +01:00
rimach
af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01: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
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
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
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
Jérémie Nau
0d1f843584 fixed method names 2011-11-24 20:28:03 +01:00
Raoul Snyman
a579725cd7 HEAD 2011-11-21 23:05:56 +02: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
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
Raoul Snyman
3a62438ef1 Upgraded jQuery, jQuery Mobile; added a top toolbar. 2011-11-04 23:17:03 -07:00
rimach
1c35195f6a sync 2011-11-02 21:39:18 +01:00
rimach
2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Andreas Preikschat
1bf1ffc848 fixed bug 884826 
Fixes: https://launchpad.net/bugs/884826
 2011-11-01 18:32:31 +01: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
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
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach
1f84c4c685 bugfixing 2011-10-24 22:07:10 +02:00
Andreas Preikschat
05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +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
599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley
bdcf15d87b Fix comments 2011-10-17 19:01:07 +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
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
Andreas Preikschat
9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Tim Bentley
9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley
bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley
e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +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
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
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
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
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
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
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
Tim Bentley
ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +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
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
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
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
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
54a1e25cb7 Trying to fix bug #803342 2011-09-20 18:24:07 +02: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
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
2b7f51d4e9 Code cleanup of openlyrics import with formatting tags 2011-09-19 00:43:12 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Martin Zibricky
8a11e790e5 [merge] merge with trunk r1747 2011-09-17 09:37:04 +02: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
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