raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
10,047 Commits 5 Branches 0 Tags 296 MiB
d8cfc4f28a
Commit Graph

556 Commits

Author SHA1 Message Date
Tim Bentley
d4eeb4136a stop alerts crashing with splash screen 
bzr-revno: 1793
 2011-11-01 06:09:21 +00:00
Tim Bentley
14527bf357 Fix my stupidity 2011-10-31 18:20:10 +00:00
Andreas Preikschat
eb7b7a19d8 r1790 2011-10-31 08:09:48 +01:00
Andreas Preikschat
d1030a7c2d Corrected comment 2011-10-31 08:08:51 +01:00
Tim Bentley
c37ffbe3e2 Pass in plugins 2011-10-31 06:03:03 +00:00
Tim Bentley
c8e9496db1 Fix up review comments 2011-10-29 20:13:11 +01:00
Tim Bentley
ea4cb7f7ed Add Class instead of magic numbers 2011-10-29 14:21:54 +01:00
Tim Bentley
8e853f10b1 Fix crash with alerts over video 
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
 2011-10-29 10:33:48 +01:00
rimach
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach
a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat
05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
Andreas Preikschat
e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background") 
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
 2011-10-19 19:30:32 +01:00
Tim Bentley
9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide 
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
 2011-10-19 19:25:08 +01:00
Tim Bentley
4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach
599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley
bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat
406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat
004472baa8 reverted alert change 2011-10-16 16:53:39 +02:00
Tim Bentley
8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
Andreas Preikschat
9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Andreas Preikschat
a1a79c98d1 overwrite parent method 2011-10-15 09:52:25 +02:00
Andreas Preikschat
ec5991a197 removed dead code§ 2011-10-15 09:36:51 +02:00
Tim Bentley
9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley
bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley
e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Tim Bentley
9176911810 Try 1 2011-10-11 19:10:53 +01:00
Andreas Preikschat
76f47a4f62 - clean ups 
- only display alert when the screen is not hidden
 2011-10-10 18:54:01 +02:00
Andreas Preikschat
658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat
6883427cbd fixed bug 871441 
Fixes: https://launchpad.net/bugs/871441
 2011-10-10 18:22:41 +02:00
Andreas Preikschat
88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
rimach
11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach
18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02: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
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
0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman
c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
rimach
2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach
c608301b0b review changes 2011-08-29 23:51:03 +02:00
Raoul Snyman
540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
rimach
20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach
c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
rimach
229fe56305 Head 2011-08-23 22:28:09 +02:00
rimach
565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
Tim Bentley
957a86b11e fexes 2011-08-22 18:32:18 +01:00
Andreas Preikschat
f0d4afaaf6 improved code readability 2011-07-30 08:33:51 +02:00
rimach crichter@web.de
ed9d704db9 Head 2011-07-25 23:06:43 +02:00
rimach crichter@web.de
210926867f bugfixing 2011-07-20 22:47:29 +02:00
rimach crichter@web.de
65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Andreas Preikschat
1214706d2a removed debug help 2011-07-18 18:20:40 +02:00
Andreas Preikschat
baec0f5c69 added margin back; added missing spaces 2011-07-18 18:01:42 +02:00
rimach crichter@web.de
98e1028705 update 2011-07-10 23:43:07 +02:00
Andreas Preikschat
2c2000f488 r1680 + conflicts 2011-07-08 15:20:14 +02:00
Tim Bentley
2a73f1b188 Prevent Images and Media backgrounds being added when No service Item is present in the live controller. 
Fixes: https://launchpad.net/bugs/795980
 2011-07-03 09:13:48 +01:00
Andreas Preikschat
4d20334cce changed instance variable to camelCase as the class is Qt based 2011-06-23 15:32:32 +02:00
Jonathan Corwin
6be7a1e06e When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay. 
bzr-revno: 1651
 2011-06-21 22:08:30 +01:00
Jonathan Corwin
5082091426 Remove parent from live maindisplay, so videos work. Also means the display won't minimize when the main window is, or when the Windows show desktop facility is used 2011-06-20 20:44:56 +01:00
Jonathan Corwin
f3c83a19e1 maindisplay on top of X11 taskbar 2011-06-18 12:44:40 +01:00
rimach crichter@web.de
9dfb50951f bugfixing 2011-06-14 18:10:20 +02:00
rimach crichter@web.de
2c62a819b3 Head 2011-06-13 23:20:20 +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
Jonathan Corwin
7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
rimach crichter@web.de
592af0e181 bugfixing 2011-06-08 15:18:05 +02:00
rimach crichter@web.de
43fe38c129 sync 2011-06-06 21:12:14 +02:00
Jonathan Corwin
c7a90102a2 Fix some startup blank/hide problems 2011-06-01 08:38:19 +01:00
Jonathan Corwin
ddf11d4681 Live dangerously, and pass parent None to MainDisplay 2011-05-28 21:12:32 +01:00
Jonathan Corwin
82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01: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
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
rimach crichter@web.de
82a14745e3 cleanup, correct settings tab 2011-05-24 22:03:57 +02:00
rimach crichter@web.de
43a55c7087 Sync 2011-05-17 23:11:46 +02:00
rimach crichter@web.de
aebc0e240e further progress 2011-05-17 21:50:00 +02:00
rimach crichter@web.de
2ccf6a67fa sync 2011-05-10 22:54:26 +02:00
rimach crichter@web.de
d4162e814c next steps 2011-05-10 22:39:17 +02:00
Andreas Preikschat
34e0355921 removed debug line 2011-05-09 13:41:12 +02:00
Andreas Preikschat
25a697e03e removed more old code 2011-05-06 21:55:16 +02:00
Andreas Preikschat
090e8378ae - allow negative x and y values 
- fixes
- removed redundant variables
 2011-05-06 21:09:40 +02:00
Andreas Preikschat
2a7c5bd4de names changes 2011-05-05 17:16:55 +02:00
Andreas Preikschat
0c9bea3b50 - removed obsolete code 
- fixes
 2011-05-05 15:02:12 +02:00
Andreas Preikschat
e25145a81b 2011-05-05 13:51:47 +02:00
Andreas Preikschat
cbd7ae2afc - make start up smoother by setting up the displays correct the first time 
- do not pass screens as argument
 2011-05-04 19:31:02 +02:00
Tim Bentley
ddf9c3b61b Remove Var from last merge 2011-04-29 20:24:21 +01:00
Tim Bentley
08b6d7cee1 Fixes for Jon 2011-04-29 17:27:27 +01:00
Tim Bentley
4304d111f1 Live Initialisation Delayed 2011-04-29 12:55:49 +01:00
Tim Bentley
e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Raoul Snyman
35cb2b2fa6 Fix up the multicolouredness. 2011-04-27 12:30:29 +02:00
Raoul Snyman
86a05a38b5 Fixed bug #752212. Added a revert button to revert the image to the default OpenLP image. Also moved things slightly to for the dialog to look a little better on other platforms/DEs. 2011-04-27 11:00:37 +02:00
Andreas Preikschat
c66ffbd725 removed import 2011-04-22 09:06:38 +02:00
Andreas Preikschat
65925efd25 fixed logo pixelation 2011-04-22 08:30:07 +02:00
rimach crichter@web.de
392b5ecb47 head 2011-04-19 14:10:38 +02:00
rimach crichter@web.de
942fe8a141 further changes 2011-04-19 14:03:36 +02:00
rimach crichter@web.de
50ff8438a0 Video reimplementations issues 2011-04-18 21:50:12 +02:00
Jonathan Corwin
1ce94d1c20 Fix theme image appearing between media images. Try and do same for ppt, but not yet. Broken the blank button... (it'll get worse before it gets better!) 2011-04-10 23:10:23 +01:00
Tim Bentley
be7eeb9e6a r1421 2011-03-25 17:49:53 +00:00
Tim Bentley
f83ac13f3f Allow slides to automatically unblank when added to live 
Fixes: https://launchpad.net/bugs/735367
 2011-03-24 21:28:03 +00:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Tim Bentley
63309d4f1a head 2011-03-20 18:43:51 +00:00
Jonathan Corwin
55d9e85840 tidies 2011-03-19 22:52:56 +00:00
Jonathan Corwin
2fa2888112 Tidyups and fix pause problem. Still issue with media manager hanging sometimes after play starts. Perhaps missing an event? 2011-03-19 17:26:17 +00:00
Tim Bentley
921163dbcd Media now has start and end times 2011-03-19 12:40:33 +00:00
Tim Bentley
ae25fc96df r1391 2011-03-15 20:03:25 +00:00
Jonathan Corwin
fcc08aff9a Alert position, genearl import, Windows QPaint error, case insensitive song order and presentation issues 
bzr-revno: 1391
 2011-03-15 19:23:05 +00:00
Tim Bentley
7cf0a582ca Add checking of Display on Screen Flag for single screen outputs. 
Fixes: https://launchpad.net/bugs/730160
 2011-03-15 08:34:27 +00:00
Jon Tibble
b25abc59aa Cleanups 2011-03-15 01:07:40 +00:00
Jonathan Corwin
a026189fac Head 2011-03-15 00:11:40 +00:00
Tim Bentley
63d60ce231 Update comments 2011-03-14 10:10:10 +00:00
Tim Bentley
ffe7e838db Add Blank at end of video 
Add comments for background override code.
Add Hook for setting video stop time (post beta 1)

Fixes: https://launchpad.net/bugs/657860
 2011-03-14 08:27:25 +00:00
Jonathan Corwin
363b49b490 attempt to detect end of pptviewer pre-load if ppt is set to loop until ESC 2011-03-12 17:06:26 +00:00
Jonathan Corwin
f04964e073 Song sequence, alert position and make OOo not invisible anymore 2011-03-12 00:12:52 +00:00
Andreas Preikschat
674e9713e7 serach comments 2011-03-09 19:14:50 +01:00
Andreas Preikschat
f73b8660e0 added more debug messages 2011-03-08 17:46:53 +01:00
Andreas Preikschat
e535c4e040 fixed Bug #727710 
Fixes: https://launchpad.net/bugs/727710
 2011-03-07 19:04:40 +01:00
Andreas Preikschat
3b465ed22f fixed images being displayed for a short time, even when the desktop was hidden 2011-03-06 16:29:25 +01:00
Andreas Preikschat
632c1f8ade display 'Show Desktop' even with one screen 2011-03-05 19:38:33 +01:00
Tim Bentley
9d875bf85b Fix hide cursor error 
Fixes: https://launchpad.net/bugs/728551
 2011-03-03 17:07:36 +00:00
Raoul Snyman
780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Raoul Snyman
a5b278b871 Added a setting in the advanced tab to give the users the option of changing the default display screen. 2011-02-23 08:42:33 +02:00
Tim Bentley
774f9d6cdd Fix names 2011-02-14 18:43:37 +00:00
Tim Bentley
720c2036e3 Review comments 2011-02-13 13:11:15 +00:00
Tim Bentley
f12b5f60ae r1295 2011-02-13 10:38:05 +00:00
Jon Tibble
e69819a3d3 Fix alertTabs 2011-02-12 16:07:11 +00:00
Tim Bentley
d98ea53cc1 Allow media items to start in the middle 2011-02-12 10:04:10 +00:00
Jon Tibble
12d0867623 Plugin refactor: icons, tabs, mediaitems 2011-02-11 04:04:05 +00:00
Jon Tibble
a97cd1bb9b Unnecessary line breaks 2011-02-08 02:45:37 +00:00
Andreas Preikschat
d7b9cc93f9 fixed Bug #677282 2011-02-05 10:45:08 +01:00
Tim Bentley
ed2d7355ed Miss a reset 2011-01-24 17:26:13 +00:00
Tim Bentley
33a924a243 Preserve replacement backgrounds - finish 2011-01-23 15:36:15 +00:00
Tim Bentley
8252e504e1 Preserve replacement backgrounds - start 2011-01-23 14:08:49 +00:00
Tim Bentley
e3a78c4d83 r1242 2011-01-23 08:25:35 +00:00
Tim Bentley
a0746c0865 Fix theme editor losing options 2011-01-23 08:25:21 +00:00
Andreas Preikschat
425c50cdb4 clean ups 2011-01-22 20:32:02 +01:00
Andreas Preikschat
4ff9157adf update preview frame, when using 'blank to screen/theme'; fixed bug when replacing live background when no item is live 2011-01-22 19:16:25 +01:00
rimach
640f21367c Head 2011-01-19 22:36:43 +01:00
Jon Tibble
14d45a0011 Fix verse order saving 2011-01-18 19:11:46 +00:00
rimach
4144f9b6a1 Head 2011-01-17 23:26:44 +01:00
Garrett
921724f5dd Enable cursor hiding over live display 
bzr-revno: 1223
 2011-01-17 22:25:52 +00:00
Garrett
84882c4841 removed non-necessary variable 2011-01-17 11:24:37 -08:00
Garrett
0cab45bcf8 moved function code into buildHtml, made setting name more descriptive 2011-01-17 08:24:23 -08:00
Andreas Preikschat
12ce267ff3 removed blank line 2011-01-17 16:43:07 +01:00
Andreas Preikschat
42a955582b moved code to core 2011-01-17 16:38:10 +01:00
Garrett
1defafbe86 moved the option to the advanced tab, removed extra line returns 2011-01-16 16:08:16 -08:00
Garrett
4414d7e421 Add a setting to hide the mouse cursor on the display. 2011-01-16 14:32:39 -08:00
rimach
77da076c3b correct longlines, use camelNames, correct indentations 2011-01-16 21:54:31 +01:00
rimach
a5eb15f719 Head 2011-01-16 00:04:50 +01:00
rimach
13608ca5c3 update 2011-01-15 23:50:25 +01:00
Jon Tibble
ecb97881a1 Refactor file deleting, cleanups 2011-01-14 18:58:47 +00:00
Tim Bentley
af9e9641c4 Fix black background on Display resizing 
Fixes: https://launchpad.net/bugs/696557
 2011-01-12 18:52:16 +00:00
Tim Bentley
c4891f27ed Fix merge errors 2011-01-09 13:54:40 +00:00
Tim Bentley
833d31ddb0 Head 2011-01-05 16:57:49 +00:00