Commit Graph

429 Commits

Author SHA1 Message Date
Tim Bentley
502a7c2c2e Kernel start 2013-01-22 18:54:59 +00:00
Andreas Preikschat
d0c9c35deb r2154 + fixed trunk 2013-01-21 20:47:53 +01:00
Tim Bentley
4224d8befe Spelling 2013-01-21 07:34:50 +00:00
Tim Bentley
b04a6bba79 Code tidy ups to make pylint happier 2013-01-21 07:29:43 +00:00
Tim Bentley
a54d02f81c Fix merges 2013-01-21 06:52:55 +00:00
Dmitriy Marmyshev
a20c077698 Add Autoplay feature to Service items and Service Manager
bzr-revno: 2152
2013-01-21 06:45:00 +00:00
Tim Bentley
3681ef911c Updates 2013-01-20 17:12:33 +00:00
Andreas Preikschat
9e2ae12ad0 fixed bug 2013-01-20 13:37:34 +01:00
Andreas Preikschat
aef944dc8e removed not used imports
bzr-revno: 2151
2013-01-20 13:14:34 +01:00
Tim Bentley
d4db88d2a4 More Service item tests 2013-01-20 10:01:51 +00:00
Tim Bentley
47d391457c Head 2013-01-19 12:51:29 +00:00
Andreas Preikschat
b91177f00b removed not needed imports 2013-01-19 00:31:02 +01:00
Arjan Schrijver
b6c6a7cd6d Fix line spacing 2013-01-15 22:29:56 +01:00
Arjan Schrijver
2ce3f7d512 Make sure images use the configured background/border color when loaded from a saved service file 2013-01-10 11:22:01 +01:00
Tim Bentley
feef9df575 Head 2013-01-02 21:50:45 +00:00
Dmitriy Marmyshev
df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley
174905b991 update tests 2012-12-30 22:10:51 +00:00
Tim Bentley
e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Dmitriy Marmyshev
8a96b0b3a1 HEAD 2012-12-30 02:52:19 +04:00
Tim Bentley
4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley
ae576251bd Core lib 2012-12-28 22:06:43 +00:00
Andreas Preikschat
6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Dmitriy Marmyshev
3f380c68d9 Code cleanUp lines to 120 2012-12-19 00:25:07 +04:00
Dmitriy Marmyshev
770f245d0c HEAD 2012-12-18 00:39:07 +04:00
Tim Bentley
cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley
564b2e41ae Style Fixes 2012-12-10 06:15:42 +00:00
Tim Bentley
6748266fba Fix the setting for lite saves 2012-12-08 16:20:52 +00:00
Tim Bentley
5be9ba5b2c Cleanup Service Item Validation and start tests 2012-12-08 08:40:41 +00:00
Tim Bentley
d2d48da480 Cleanup ServiceItem 2012-12-07 21:57:35 +00:00
Andreas Preikschat
fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley
fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Andreas Preikschat
1ef6643e85 - when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance
bzr-revno: 2120
2012-12-03 20:01:33 +01:00
Tim Bentley
a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley
734c697fef Documentation 2012-11-24 07:24:30 +00:00
Tim Bentley
4eab1a6521 Head 2012-11-22 21:58:16 +00:00
Tim Bentley
57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Dmitriy Marmyshev
2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +04:00
Tim Bentley
5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley
55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley
431a5fbb15 Fix from misalignment 2012-11-10 16:51:23 +00:00
Tim Bentley
69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Philip Ridout
e90af50fd6 Removes items with missing files prior to saving (after confirmation from user)
bzr-revno: 2106
2012-11-10 16:38:26 +00:00
Dmitriy Marmyshev
d5a4cbd900 Autoplay slides ffuture 2012-11-09 22:44:25 +04:00
Tim Bentley
47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Philip Ridout
0bc2e5b71e Simplified Validate Method 2012-11-07 21:10:38 +00:00
Tim Bentley
751246ce0c Merge cleanups 2012-11-04 20:11:10 +00:00
Philip Ridout
443ad478c1 Added validate function to serviceitem 2012-11-02 18:54:42 +00:00
Andreas Preikschat
3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Philip Ridout
d35d4f4f79 Added some methods to serviceitem.py so as not to expose "inner workings of ServiceItem" and modified get_frame_path method. (Which required a modification to slidecontroller.py & messagelistener.py) 2012-10-31 21:04:29 +00:00
Tim Bentley
e24c588df3 Head 2012-10-25 20:17:14 +01:00
Tim Bentley
716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley
cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Tim Bentley
8e5dafb715 Fix bugs and more simplifications 2012-10-20 20:52:04 +01:00
Tim Bentley
a5824120c3 Lite save works 2012-10-15 17:20:23 +01:00
Tim Bentley
aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Andreas Preikschat
159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat
b226364559 when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 2012-10-02 19:35:10 +02:00
Tim Bentley
6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Andreas Preikschat
25177adce6 - update the image cache when the image timestamp changes
- reworked image manager's _cache

bzr-revno: 2013
2012-07-02 20:45:03 +02:00
Andreas Preikschat
bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Jonathan Corwin
65beb6ccda move webview to init and use %s 2012-06-30 23:20:16 +01:00
Andreas Preikschat
9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00
Jonathan Corwin
2518a340ae Well only creating the QWebView just the once fixes it. But I'm sure we used to do that and there was a good reason why we started recreating it for each render... 2012-06-25 23:14:53 +01:00
Samuel Findlay
4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Andreas Preikschat
7281f44603 removed argument 2012-06-10 15:39:45 +02:00
Andreas Preikschat
ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02:00
Andreas Preikschat
b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat
81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Andreas Preikschat
28930a9c32 added missing docstring 2012-05-23 18:55:41 +02:00
Andreas Preikschat
8a90476f89 added missing line 2012-05-23 18:53:08 +02:00
Andreas Preikschat
2745406038 removed test code 2012-05-23 18:28:35 +02:00
Andreas Preikschat
c15ac3a84e last fixes 2012-05-23 18:14:03 +02:00
Andreas Preikschat
a5fa986bdd continued work 2012-05-20 21:11:27 +02:00
Andreas Preikschat
060718be32 (experimental) attempt to imporve renderer (to be fixed) 2012-05-20 20:26:24 +02:00
Andreas Preikschat
ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat
baf1c792e5 clean ups 2012-05-05 14:24:25 +02:00
Andreas Preikschat
6915fb9d0d improved renderer performance 2012-05-02 20:25:37 +02:00
Jon Tibble
a9d70a2d2e Bugs #888815 #941966 2012-03-17 14:44:23 +00:00
Raoul Snyman
ccba9e7df5 Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly.
Fixes: https://launchpad.net/bugs/888815
2012-03-12 23:05:39 +02:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Tim Bentley
39bc9238bf Lost temporary edit flag 2011-12-10 08:52:18 +00:00
Tim Bentley
1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Tim Bentley
516dda5ec3 Fixes 2011-11-13 08:57:29 +00:00
Tim Bentley
d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
Andreas Preikschat
a75e0156cc fixed docstrings 2011-10-16 16:40:46 +02:00
Andreas Preikschat
9259eed4a6 -fixed bug 871272
-clean ups

Fixes: https://launchpad.net/bugs/871272
2011-10-15 13:30:39 +02:00
Tim Bentley
5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Tim Bentley
9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley
c5a7127aec Copy theme during remote edit.
Fixes: https://launchpad.net/bugs/864822
2011-10-02 20:49:29 +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
Raoul Snyman
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Raoul Snyman
abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman
4d66954d62 - Fixed re-playing of previous audio file.
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
2011-08-31 09:49:57 +02:00
Raoul Snyman
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Tim Bentley
ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01:00
Andreas Preikschat
7483c8dfe8 r1690 2011-07-18 15:24:58 +02:00
Andreas Preikschat
47e43404aa - added doctype to html
- added encoding to html
- changed <br /> to <br>
- removed obsolete language attribute
2011-07-16 11:00:30 +02:00
Andreas Preikschat
69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Jon Tibble
42acff98ab Unused import 2011-07-13 22:00:35 +01:00
Tim Bentley
4651ec35b6 Fixes 2011-07-10 12:59:23 +01:00
Tim Bentley
e9fb8e59c1 Allow service item themes to change and be added back to slide controller
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
2011-07-09 08:43:35 +01:00
Andreas Preikschat
74d2b2d25c replaced <br> by <br /> 2011-06-27 13:44:57 +02:00
Andreas Preikschat
4d20334cce changed instance variable to camelCase as the class is Qt based 2011-06-23 15:32:32 +02:00
Andreas Preikschat
25fcdc2600 r1652 2011-06-22 21:23:21 +02:00
Jonathan Corwin
658d4c2ecf Preserve service item notes between edits 2011-06-18 14:36:29 +01:00
Andreas Preikschat
7d5e349602 removed test lines 2011-06-13 17:19:49 +02:00
Andreas Preikschat
d7ea218342 clean ups 2011-06-13 10:16:50 +02:00
Andreas Preikschat
062e52c6db r1636 2011-06-12 21:34:19 +02:00
Andreas Preikschat
445c63ce8b 2011-06-12 20:38:04 +02:00
Tim Bentley
608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley
c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Andreas Preikschat
6aca4600b7 fixed bug 788770
Fixes: https://launchpad.net/bugs/788770
2011-05-26 20:52:05 +02:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Andreas Preikschat
3a91365e5a fixed space
Fixes: https://launchpad.net/bugs/786896
2011-05-25 15:14:59 +02:00
Andreas Preikschat
cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Andreas Preikschat
b9bcd98716 removed not need line 2011-05-24 18:51:40 +02:00
Andreas Preikschat
d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +02:00
Jonathan Corwin
3e1bdc7475 More stageview changes 2011-05-11 23:32:25 +01:00
Andreas Preikschat
307ef744dd - fixed not closed file
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
2011-05-04 09:29:16 +02:00
Andreas Preikschat
68fdc7dee9 fixed virtue breaks, fixed word break 2011-04-26 19:03:19 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley
3155bde0b2 inprogress 2011-04-01 05:48:09 +01:00
Tim Bentley
2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley
239b62a488 Render Ester 8:9 on more than 1 page 2011-03-28 18:04:31 +01:00
Tim Bentley
b84c4a0a3d r1430 2011-03-27 18:03:48 +01:00
Tim Bentley
c93b073da8 Renderer Cleanups - started 2011-03-27 09:19:00 +01:00
Tim Bentley
be7eeb9e6a r1421 2011-03-25 17:49:53 +00:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Tim Bentley
9836131025 Allow Preview Controller to request servicemanger to make the preview item live and add next to preview.
Fixes: https://launchpad.net/bugs/730294
2011-03-23 21:08:24 +00:00
Tim Bentley
63309d4f1a head 2011-03-20 18:43:51 +00:00
Andreas Preikschat
05b699520f fixed comment 2011-03-19 17:11:52 +01:00
Andreas Preikschat
a43bd19bd9 convert verse order 2011-03-19 17:06:04 +01:00
Tim Bentley
7fc84ad2b2 Enter and save end times 2011-03-19 11:50:48 +00:00
Tim Bentley
23bfaf1566 Old spelling bug 2011-03-15 19:55:49 +00:00
Andreas Preikschat
0ae31ce861 fixed old service files 2011-03-13 16:01:01 +01:00
Andreas Preikschat
f4e723ed1c fixed songs, without footer 2011-03-04 18:31:23 +01:00
Andreas Preikschat
1fda0e371a clean ups 2011-03-02 19:20:47 +01:00
Raoul Snyman
780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Jon Tibble
1fbc873a8c Cleanups 2011-02-16 03:28:06 +00:00
Jon Tibble
8059ac5181 Head r1300 2011-02-14 19:51:16 +00:00
Tim Bentley
329db94fd2 Fix indent 2011-02-14 18:32:46 +00:00
Tim Bentley
fba2a245fb Fix Media length calc 2011-02-14 17:54:09 +00:00
Jon Tibble
d5596583ff Fixes, cleanups, strings 2011-02-14 16:08:17 +00:00
Tim Bentley
720c2036e3 Review comments 2011-02-13 13:11:15 +00:00
Tim Bentley
57c0ab31dc Video length tagging and display 2011-02-13 10:37:27 +00:00
Tim Bentley
d98ea53cc1 Allow media items to start in the middle 2011-02-12 10:04:10 +00:00
Tim Bentley
daf545bc06 Fix up service item display changes 2011-01-29 07:53:21 +00:00