Commit Graph

3414 Commits

Author SHA1 Message Date
Andreas Preikschat 1911972177 head 2010-08-29 15:07:10 +02:00
Andreas Preikschat 9fc45065fc removed unnecessary line 2010-08-29 14:58:40 +02:00
Andreas Preikschat 87db3e98e6 clean ups, tweaks, fixed 625997 2010-08-29 14:49:45 +02:00
Jon Tibble 9278f271f8 Cleanups and song form fix (Bug #612282)
bzr-revno: 998
2010-08-29 12:23:35 +01:00
Jon Tibble 9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Jon Tibble 0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Andreas Preikschat beaac2d923 removed everything which cannot work 2010-08-28 21:41:06 +02:00
Jon Tibble 168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble 066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Andreas Preikschat 37b2b1bb9d clean up 2010-08-28 21:28:50 +02:00
Andreas Preikschat de3659bc92 commented everything out, which cannot work (currently) 2010-08-28 21:17:52 +02:00
Andreas Preikschat 521b06ee8c clean up - not working 2010-08-28 20:56:46 +02:00
Andreas Preikschat 36e2f2e33f fixed stuff messed up resolvesing the conflict 2010-08-28 19:32:44 +02:00
Andreas Preikschat 14dbfaa4b5 fixed stuff messed up resolvesing the conflict 2010-08-28 19:10:14 +02:00
Andreas Preikschat 8071a65720 head 2010-08-28 19:05:45 +02:00
Tim Bentley 618813f020 Display and renderer changes
bzr-revno: 997
2010-08-28 17:35:16 +01:00
Tim Bentley 5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Jonathan Corwin 764c3d42c9 More fixes 2010-08-28 11:57:03 +01:00
Jon Tibble 000d23f7c6 Cleanup long lines 2010-08-28 02:31:11 +01:00
Jonathan Corwin c4f3bccb59 Problems with outlines in qtwebkit 533.3. Shadow colour and kerning 2010-08-28 00:19:50 +01:00
Jon Tibble bb31492609 Fix song maintenance as subform (Bug #612282) 2010-08-27 23:49:27 +01:00
Jonathan Corwin 97d088f0ac renderer merge 2010-08-27 23:35:09 +01:00
Tim Bentley 3645c9400e Fix theme bug reported on Redhat bugzilla
bzr-revno: 996
2010-08-27 20:18:37 +01:00
Jon Tibble 5cfdaf3b77 Update OpenLPv2 song importer
bzr-revno: 995
2010-08-27 19:50:08 +01:00
Tim Bentley 759019e5eb Fix theme import Redhat Bugzilla 2010-08-27 19:48:06 +01:00
Tim Bentley 7d1515e875 994 2010-08-27 19:42:00 +01:00
Tim Bentley a4f1b29cca Fix bug losing transitions 2010-08-27 19:28:19 +01:00
Tim Bentley 3c637f6c2d chnage theme suffix 2010-08-27 17:44:42 +01:00
Tim Bentley e1afe3be94 Head994 2010-08-27 17:10:15 +01:00
Jon Tibble 6266c3369e Cleanup the OpenLPv2 song importer 2010-08-27 16:25:29 +01:00
Raoul Snyman 62cb7ae7fe I was playing, and somehow it got into trunk :-(. This fixes bug #625183.
bzr-revno: 994
2010-08-27 13:23:39 +02:00
Raoul Snyman 596b49af9e Fixed up some HTML that crept in somewhere. 2010-08-27 11:11:57 +02:00
Tim Bentley ba4821e5f8 Screen re-sizing now works 2010-08-26 17:51:27 +01:00
Tim Bentley 2e6c06ad1f Screen switching now works 2010-08-26 17:08:26 +01:00
Tim Bentley ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Tim Bentley d6a67e7382 Screen fixes 2010-08-26 16:50:03 +01:00
Raoul Snyman 364940c547 Additional failover for version problems.
bzr-revno: 993
2010-08-26 15:54:05 +02:00
Jon Tibble 53295b08e0 Cleanups and a version check fix
bzr-revno: 992
2010-08-26 14:45:56 +01:00
Raoul Snyman 438856a978 Fix a string and update the translation sources.
bzr-revno: 991
2010-08-26 14:53:17 +02:00
Raoul Snyman 6346a7b200 Updated translation files. 2010-08-26 10:07:16 +02:00
Raoul Snyman 8c27f92ee3 Fix a string. 2010-08-26 07:52:30 +02:00
Raoul Snyman 3b1c151e15 Fail silently on version problems.
Renamed a variable to be a little more sensible.
2010-08-26 07:35:34 +02:00
Tim Bentley adb757cd2f Cleanups and screen fixes 2010-08-26 06:01:29 +01:00
Jon Tibble 06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley 492389b715 Head990 2010-08-25 18:08:36 +01:00
Tim Bentley 2ec84cc5d9 White Space cleanup 2010-08-25 18:08:24 +01:00
Raoul Snyman cb778ecbfe Now the Song Wizard works, just waiting for the importers to catch up.
bzr-revno: 990
2010-08-25 07:12:59 +02:00
Raoul Snyman 8b141b0942 Fixed the couple of issues Jon T. pointed out. 2010-08-24 21:08:57 +02:00
Tim Bentley fcb62e41b8 Cut paste bug 2010-08-24 18:53:41 +01:00
Tim Bentley 46e35ead28 Spotted video bug 2010-08-24 18:28:13 +01:00