Commit Graph

943 Commits

Author SHA1 Message Date
Tim Bentley bb6c4b091a Fix merge error 2009-09-14 20:37:29 +01:00
Tim Bentley dd70e31779 Themes and Timer points
bzr-revno: 540
2009-09-14 20:29:52 +01:00
maikelstuivenberg@gmail.com 66ef9d8579 For Maikel
bzr-revno: 539
2009-09-14 20:28:56 +01:00
Tim Bentley a500e283a1 Add Rendering timer points 2009-09-14 20:18:49 +01:00
Tim Bentley 03d9ac85d5 Add Theme export handling and error handling 2009-09-14 19:53:56 +01:00
Tim Bentley e17b12839f Updates to Presentations etc
bzr-revno: 538
2009-09-14 17:38:32 +01:00
Maikel Stuivenberg 3d4f221c19 Added: Button on PreviewController to go live 2009-09-14 14:16:04 +02:00
Tim Bentley f4599bf947 Fixed reset presentation bug 2009-09-13 20:31:31 +01:00
Tim Bentley 8b9e9665f8 head 2009-09-13 20:26:01 +01:00
Raoul Snyman f2e52ae596 Merge from lp:~raoul-snyman/openlp/bugfixes
bzr-revno: 537
2009-09-13 21:22:32 +02:00
Raoul Snyman 3090aa489b Merge from trunk 2009-09-13 20:45:56 +02:00
Tim Bentley 889a10c4af head 2009-09-13 19:42:45 +01:00
Jon Tibble 142c43d54a For Jon
bzr-revno: 536
2009-09-13 19:40:53 +01:00
Raoul Snyman 9684e696ca Bring this branch up to date with trunk 2009-09-13 19:55:52 +02:00
Jon Tibble df7016c22d dos2unix run on trunk r535 2009-09-13 16:14:45 +01:00
Tim Bentley a925033a73 head 2009-09-13 15:54:17 +01:00
Tim Bentley e30d7df8ac head 2009-09-13 15:45:50 +01:00
Jon Tibble 91acf64cb7 For Jon
Fix themes 2

bzr-revno: 535
2009-09-13 15:44:28 +01:00
Jon Tibble 54057730f7 Complete Theme breakage fixing 2009-09-13 15:12:38 +01:00
Jon Tibble 3b67251f8f For Jon
Fix themes

bzr-revno: 534
2009-09-13 15:00:09 +01:00
Jon Tibble 417d8c3725 Fix theme break 2009-09-13 14:24:58 +01:00
Tim Bentley 1ef543253c Fix up Presentations so Impress works! 2009-09-13 08:39:48 +01:00
Tim Bentley ca919b74c3 Correct settings 2009-09-13 07:25:07 +01:00
Raoul Snyman a4a31a9c76 [ticket #14] Startup output display/splash should be changeable - implemented. 2009-09-12 23:31:35 +02:00
Tim Bentley baf967bf2a head 2009-09-12 19:27:17 +01:00
Jon Tibble 01efadc058 Merged in lp:~meths/openlp/trivialfixes
bzr-revno: 533
2009-09-12 19:31:03 +02:00
Raoul Snyman 43dc7e6b90 Merged in lp:~raoul-snyman/openlp/docstrings
bzr-revno: 532
2009-09-12 19:24:16 +02:00
Jon Tibble 5e1c2d5205 Fix similar bugs with incorrect SIGNALs on QLineEdit 2009-09-11 22:50:23 +01:00
Jon Tibble bdaced63a3 Fix song list reloading bug 2009-09-11 22:34:05 +01:00
Tim Bentley b005954e7e Head 2009-09-11 20:51:16 +01:00
Tim Bentley 43b374a994 Impress issues 2009-09-11 20:51:06 +01:00
Jon Tibble 633d2af487 Merged in lp:~meths/openlp/trivialfixes
bzr-revno: 531
2009-09-11 21:48:21 +02:00
Tim Bentley f4966a655e Head 2009-09-11 20:30:12 +01:00
Tim Bentley 07452df24a fixes to custom and save state of screen 2009-09-11 20:29:57 +01:00
Raoul Snyman 74c6349ab0 Merged changes in from lp:~raoul-snyman/openlp/songmaintenance
bzr-revno: 530
2009-09-11 21:27:05 +02:00
Jon Tibble e0427f8254 Fix DnD issue 2009-09-11 20:05:09 +01:00
Jon Tibble 50de32e882 Trunk resync 2009-09-11 19:46:15 +01:00
Jon Tibble af2234b945 RFC: Different toolbar layout for Service Manager 2009-09-11 12:18:00 +01:00
Tim Bentley b657af7a64 Head 2009-09-11 07:18:31 +01:00
Jon Tibble 20579078d4 For Jon
bzr-revno: 529
2009-09-11 07:17:58 +01:00
Tim Bentley 1ca02a3536 Custom Plugin cleaup 2 2009-09-11 05:56:52 +01:00
Tim Bentley 3c3c1f19ce Custom Plugin cleaup 2009-09-11 05:54:22 +01:00
Jon Tibble abdbed78b6 Fix unneeded \ line breaks 2009-09-10 21:18:15 +01:00
Jon Tibble a6f6ad498b Correct path building and sort line break issues 2009-09-10 21:09:03 +01:00
Raoul Snyman 0df9e356a6 Bringing up to date with trunk. 2009-09-10 20:15:40 +02:00
Jon Tibble b865c8ab7f Add usability information for ServiceManager ThemeComboBox 2009-09-10 18:03:17 +01:00
Raoul Snyman d5113aceca Added Scott! 2009-09-10 18:35:39 +02:00
Tim Bentley 96e1abccf8 Song and Custom cleanups
bzr-revno: 528
2009-09-09 21:12:47 +01:00
Tim Bentley e0a2e5e1f3 For space police 2009-09-09 19:09:17 +01:00
Tim Bentley 457885019b Custom editing fix part 2 2009-09-09 18:40:12 +01:00