Commit Graph

8957 Commits

Author SHA1 Message Date
Andreas Preikschat
27448160d1 r1758 2011-09-24 08:00:17 +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
Tim Bentley
10a89f033d Head 2011-09-23 19:49:34 +01:00
Raoul Snyman
548f380628 HEAD 2011-09-23 17:58:07 +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
Raoul Snyman
57d7cf272b Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again.
bzr-revno: 1757
Fixes: https://launchpad.net/bugs/812289
2011-09-23 07:25:44 +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
764962002b Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception.
bzr-revno: 1756
Fixes: https://launchpad.net/bugs/855342
2011-09-22 09:47:58 +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
822dd62d58 Fixed bug #854125: Remove reference to the non-existent __del__ method.
bzr-revno: 1751
Fixes: https://launchpad.net/bugs/854125
2011-09-20 08:00:52 +02:00
Tim Bentley
088b5070e0 Head 2011-09-20 05:36:54 +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
05e2d5de21 Translations
bzr-revno: 1750
2011-09-18 19:34:39 +01:00
Andreas Preikschat
505be93907 updated ts files 2011-09-18 17:57:30 +02:00
Andreas Preikschat
0500dae5ab r1749 2011-09-18 17:54:49 +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