Commit Graph

1715 Commits

Author SHA1 Message Date
Raoul Snyman
29a2138deb Merged HEAD 2009-11-13 20:29:38 +02:00
Jon Tibble
f0e2fdd6f5 Fix multiple video plays 2009-11-13 17:43:58 +00:00
Jon Tibble
3defb3b4c5 SPG 2009-11-13 17:42:51 +00:00
Jon Tibble
f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Jon Tibble
b79d535e04 Fix theme loading logic and missing item from cleaning 2009-11-12 23:49:35 +00:00
Jon Tibble
b6eadecb46 isfile test doesn't need try 2009-11-12 23:46:20 +00:00
Jon Tibble
1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Jon Tibble
1c0a86b17f Simplify OS path setting 2009-11-12 23:33:59 +00:00
Tim Bentley
8da19172a7 Slide Controller cleanups and Media bug fixes
bzr-revno: 669
2009-11-12 19:51:58 +00:00
Tim Bentley
6df4e5a369 Remove transition code 2009-11-12 19:12:13 +00:00
Tim Bentley
04873758e9 Remove extra Video 2009-11-12 19:05:24 +00:00
Tim Bentley
124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +00:00
Tim Bentley
9970ae8281 Transitions between slides 2009-11-12 17:48:49 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Tim Bentley
e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +00:00
Jon Tibble
37e2342a8c Unicode and import fixes
bzr-revno: 668
2009-11-12 17:18:30 +00:00
Jon Tibble
a821179a63 A unicode fix for themes 2009-11-12 00:49:55 +00:00
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +00:00
Tim Bentley
1eb41aab78 SlideController cleanups 2009-11-11 19:10:38 +00:00
Tim Bentley
ab12f73a21 spacing cleanups 2009-11-10 20:44:02 +00:00
Tim Bentley
82b8df98be Headr667 2009-11-10 20:33:17 +00:00
Tim Bentley
d4d1b69d8e Change version number
bzr-revno: 667
2009-11-10 20:12:51 +00:00
Tim Bentley
a8110e8eb9 Headr666 2009-11-10 19:04:34 +00:00
Tim Bentley
0170d09c21 Add media Preview code
bzr-revno: 666
2009-11-10 19:03:05 +00:00
Tim Bentley
f778948abb Reset Preview when exiting media 2009-11-10 06:13:59 +00:00
Tim Bentley
1c3c672e9b Add Media Preview to slideController 2009-11-09 20:27:25 +00:00
Raoul Snyman
dfced32cf2 Expanded commandline options to include a specific logging level, a Qt4 style, and whether or not OpenLP should be run in portable mode. 2009-11-09 21:10:28 +02:00
Tim Bentley
b6332e7ff5 Fix media previews ti work and not display the extra screens 2009-11-09 16:37:37 +00:00
Tim Bentley
9eb88a4300 Try to hide display screens for previews 2009-11-09 06:11:26 +00:00
Tim Bentley
bf63b2ae2f Fix up toolbar handing to stop toolbar going off screen
Added Media Toolbar for the media items
Added it to Preview 
Added and wired in a volume control
2009-11-09 05:58:45 +00:00
Jon Tibble
95acdbfde0 Fix import 2009-11-09 00:11:01 +00:00
Tim Bentley
ff8e181d19 Clean up slidecontroller
bzr-revno: 665
2009-11-08 18:35:56 +00:00
Tim Bentley
bc28e3e78f Clean up slide sizes part 2 2009-11-08 17:40:43 +00:00
Tim Bentley
ebce104f30 Clean up slide sizes part 1 2009-11-08 17:02:46 +00:00
Tim Bentley
00ed999964 Fix bugs in theme and slidecontroller
bzr-revno: 664
2009-11-08 15:20:48 +00:00
Tim Bentley
f18ba14fc9 remove print for log 2009-11-08 14:16:02 +00:00
Tim Bentley
5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
Tim Bentley
85e158c458 SlideController cleanups
bzr-revno: 663
2009-11-08 13:36:45 +00:00
Tim Bentley
f3f3906ca0 Add test to stop icons going over the limit 2009-11-08 09:09:23 +00:00
Tim Bentley
f060974054 Add Icon files 2009-11-08 09:05:41 +00:00
Tim Bentley
4118951d8b Fix strange commit 2009-11-08 09:03:00 +00:00
Tim Bentley
66a6dfd42a Add icon to slidecontroller/nAdd inital icons /nFix ToolBar for Media" 2009-11-08 08:58:31 +00:00
Tim Bentley
f0e0cfa4c1 Head552 2009-11-08 07:22:12 +00:00
Jonathan Corwin
c10b4742be Presentation fixes
bzr-revno: 662
2009-11-07 19:39:52 +00:00
Jonathan Corwin
337df8da9f Fix Impress off-by-one and slow slide update problems Meths found 2009-11-07 16:45:49 +00:00
Tim Bentley
1bedf56dc3 Plugin clean ups
bzr-revno: 661
2009-11-07 16:19:18 +00:00
Tim Bentley
381e91294f Fix blocking for Active/Inactive 2009-11-07 14:58:24 +00:00
Tim Bentley
2e02f1c94f Remove "Can_be_disabled" as no longer require
Sort out status handling in plugin form.
2009-11-07 07:42:18 +00:00
Tim Bentley
6148d845ae Headr660 2009-11-07 06:49:14 +00:00
meths@btinternet.com
eba4115490 Fix file handling
bzr-revno: 660
2009-11-07 06:45:25 +00:00