Commit Graph

3517 Commits

Author SHA1 Message Date
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02: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 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
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 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 354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +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
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
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 fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +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
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