raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
8,372 Commits 5 Branches 0 Tags 296 MiB
89f3929bf7
Commit Graph

6462 Commits

Author SHA1 Message Date
Tim Bentley
add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley
8c4397d380 Head 2011-12-03 17:01:57 +00:00
Andreas Preikschat
ae8f57f707 r1815 2011-12-03 16:09:50 +01:00
Andreas Preikschat
5bfc101f09 changed name 2011-12-03 16:09:03 +01:00
Tim Bentley
13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Andreas Preikschat
eb121abb12 attempt to fix bug 768495 
Fixes: https://launchpad.net/bugs/768495
 2011-12-03 15:38:30 +01:00
Jon Tibble
9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Tim Bentley
b37c41d7a8 minor fixes 2011-12-03 13:32:19 +00:00
Tim Bentley
1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley
624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
Jon Tibble
02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
Jon Tibble
bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00:00
Jon Tibble
e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble
f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Jon Tibble
bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
Raoul Snyman
512bab74c3 Added a missing import. 
bzr-revno: 1812
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 11:52:49 +02:00
Raoul Snyman
f8ea1349f4 Fix importing of newer songs databases. 
bzr-revno: 1811
Fixes: https://launchpad.net/bugs/863845
 2011-12-02 11:50:20 +02:00
Raoul Snyman
24095edc2b Added a missing import. 
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00
Raoul Snyman
d558cb080c Fix importing of newer songs databases. 2011-12-01 21:01:57 +02:00
rimach
4fc4bacfa7 bugfixing 2011-12-01 19:08:12 +01:00
rimach
e627960391 bugfixing 2011-12-01 19:07:15 +01:00
Raoul Snyman
3f50ea1b1a Removed 'populate_default' arguments as they are not supported in older versions of migrate. 
bzr-revno: 1809
Fixes: https://launchpad.net/bugs/896977
 2011-11-30 22:32:04 +02:00
Tim Bentley
8fee84d052 Stop keyboard floods getting the slide controller and service manager out of set. 
bzr-revno: 1808
Fixes: https://launchpad.net/bugs/892571
 2011-11-30 22:27:54 +02:00
rimach
af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach
6ed1342f95 sync 2011-11-30 21:14:18 +01:00
rimach
44d71dcee7 bugfixing 2011-11-30 18:10:57 +01:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01:00
rimach
3570e48732 remove unused function 2011-11-30 09:29:32 +01:00
Christian Richter
b2349d892b For newer versions of webkit playing videos doesnt work anymore. 
bzr-revno: 1807
 2011-11-29 19:49:33 +02:00
Tim Bentley
8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Raoul Snyman
87f5d7843c Removed 'populate_default' arguments as they are not supported in older versions of migrate. 
Fixes: https://launchpad.net/bugs/896977
 2011-11-27 23:24:35 +02:00
Jérémie Nau
8e86f21cbd Service notes are not displayed on stage remote view when the current service item is the last. 2011-11-27 21:39:39 +02:00
Meinert Jordan
fee0f79a73 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.

bzr-revno: 1805
 2011-11-27 16:44:39 +00:00
Tim Bentley
ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
Jon Tibble
5b4e8826ec Fix undefined variables 2011-11-26 21:59:21 +00:00
Jon Tibble
ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
Jon Tibble
fb6403f003 Head r1804 2011-11-26 20:32:47 +00:00
M2j
047477c236 layout fix in exceptionform 
bug fix triggerd by searching for nonexistend book numbers
 2011-11-26 20:13:51 +01:00
Andreas Preikschat
d4e9968a4f Fix Song Select Import 
- applied patch from http://support.openlp.org/issues/330

bzr-revno: 1803
 2011-11-25 16:18:16 +00:00
M2j
ebcf7a5dd2 corrected function comment 2011-11-24 23:49:21 +01:00
M2j
286ec88fc4 make VerseType.Other default for VerseType encodings 2011-11-24 23:34:27 +01:00
rimach
65ce3c84d2 fix video play problem with newer webkit version and webkit player 2011-11-24 22:25:38 +01:00
rimach
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach
dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Jérémie Nau
0d1f843584 fixed method names 2011-11-24 20:28:03 +01:00
Tim Bentley
5e702c1782 Fixes keyboard flood where events are switched order by PYQT. 
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
 2011-11-23 06:05:42 +00:00
Raoul Snyman
a579725cd7 HEAD 2011-11-21 23:05:56 +02:00
Andreas Preikschat
0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3 Amend check for files and delete if not used any more 
Fixes: https://launchpad.net/bugs/891781
 2011-11-18 19:34:04 +00:00
M2j
b2067bef43 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.
 2011-11-18 11:53:56 +01:00
Tim Bentley
04b965d166 Fix incorrect signal 2011-11-13 16:31:08 +00:00
Tim Bentley
ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
Tim Bentley
516dda5ec3 Fixes 2011-11-13 08:57:29 +00:00
rimach
acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01:00
rimach
870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach
7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach
a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach
c0cc590c71 sync 2011-11-11 17:42:01 +01:00
Raoul Snyman
46643ab832 Added the quoting to database fields. 2011-11-07 23:22:35 -07:00
Andreas Preikschat
48354ec8ef - fixed bug #827862 (Add Shortcut to change verse, chorus, ... in the live controller) 
bzr-revno: 1797
Fixes: https://launchpad.net/bugs/827862
 2011-11-05 20:39:51 +01:00
Raoul Snyman
3a62438ef1 Upgraded jQuery, jQuery Mobile; added a top toolbar. 2011-11-04 23:17:03 -07:00
Tim Bentley
d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach
4779a3f21a Head and bugfixing 2011-11-02 21:44:44 +01:00
rimach
1c35195f6a sync 2011-11-02 21:39:18 +01:00
rimach
2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Tim Bentley
0304057e00 remove # 2011-11-02 20:09:06 +00:00
Tim Bentley
3d316a802b Head 2011-11-02 19:06:23 +00:00
Tim Bentley
3bd0ad9181 Fix crash with two soft breaks 2011-11-02 18:58:46 +00:00
Andreas Preikschat
1bf1ffc848 fixed bug 884826 
Fixes: https://launchpad.net/bugs/884826
 2011-11-01 18:32:31 +01:00
Tim Bentley
d4eeb4136a stop alerts crashing with splash screen 
bzr-revno: 1793
 2011-11-01 06:09:21 +00:00
Andreas Preikschat
b0b4656ed6 - fixed bug #872975 (Importing from v1 fails with error about missing 'settings' table) 
bzr-revno: 1792
Fixes: https://launchpad.net/bugs/872975
 2011-10-31 22:39:01 +01:00
Tim Bentley
14527bf357 Fix my stupidity 2011-10-31 18:20:10 +00:00
Andreas Preikschat
dad7e86f06 added/fixed comments 2011-10-31 15:18:22 +01:00
Andreas Preikschat
e402b72d58 - fixed bug #872975 (Importing from v1 fails with error about missing 'settings' table) 
Fixes: https://launchpad.net/bugs/872975
 2011-10-31 15:11:54 +01:00
Andreas Preikschat
71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00
Andreas Preikschat
94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat
e856fa9aed r1790 2011-10-31 09:56:48 +01:00
Andreas Preikschat
5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat
cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat
f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat
ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat
2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01: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
Andreas Preikschat
482c741665 r1789 2011-10-30 22:38:42 +01:00
Andreas Preikschat
15e19f9700 fixed rename errors 2011-10-30 22:38:02 +01:00
Andreas Preikschat
0ed66b6a9c fixed alert position not being recalculated properly when changing options 2011-10-30 21:24:04 +01: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
01ff00dcf9 bugfixing and sync 2011-10-26 22:13:30 +02:00
rimach
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat
360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat
c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat
33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach
1f84c4c685 bugfixing 2011-10-24 22:07:10 +02:00
rimach
a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat
ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat
a42940b6bb - shortcuts only for live controller 
- removed v shortcut
 2011-10-24 17:36:59 +02:00
Andreas Preikschat
cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat
b603017b1c started work on shortcuts allowing jumping between different verses 
Fixes: https://launchpad.net/bugs/827862
 2011-10-23 19:47:15 +02:00
Tim Bentley
5f9ed32bfe Fix assignment error 2011-10-23 18:22:11 +01:00
Meinert Jordan
f25cd069ab add version information for mako, migrate and uno to exceptionform 
bzr-revno: 1784
 2011-10-22 15:32:04 +02:00
M2j
5a415311a5 Correction for Migrate version smaller than 0.7 2011-10-22 14:30:21 +02:00
Andreas Preikschat
acac723b09 copy error 2011-10-22 13:28:47 +02:00
Andreas Preikschat
49569746ea fixed doc 2011-10-22 13:16:25 +02:00
Andreas Preikschat
05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
M2j
aa0b49290d add version information for mako, migrate and uno to exceptionform 2011-10-20 22:11:06 +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
2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach
599573b5ce Sync 2011-10-17 23:51:24 +02:00
rimach
dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +02:00
Tim Bentley
bdcf15d87b Fix comments 2011-10-17 19:01:07 +01:00
Andreas Preikschat
dd7af54411 - fixed ticket 299 
http://support.openlp.org/issues/299

bzr-revno: 1778
 2011-10-17 17:48:42 +01:00
Meinert Jordan
972d917c8a Remove mailto code and use QT code 
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
 2011-10-17 17:46:35 +01:00
Andreas Preikschat
13ff2faf18 fixed ticket 299 2011-10-16 22:32:50 +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
Andreas Preikschat
a75e0156cc fixed docstrings 2011-10-16 16:40:46 +02:00
Tim Bentley
2f36c33f62 Review fixes 2011-10-16 09:25:27 +01:00
Tim Bentley
8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
M2j
525658ae8b better readable coding style 2011-10-15 23:21:22 +02:00
M2j
1527704c03 - exception dialog uses Qt call instead of external library 
- unicode support in report and attached filename was broken
 2011-10-15 22:18:49 +02: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
17ec218529 Fix wonky footer 
bzr-revno: 1775
Fixes: https://launchpad.net/bugs/863841
 2011-10-13 19:02:39 +01:00
Tim Bentley
bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley
0e1361b533 Fix footer position 2011-10-12 05:51: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
577fdb6c31 - fixed bug 863376 ('<' in song lyrics causes a traceback) 
- clean ups

bzr-revno: 1774
Fixes: https://launchpad.net/bugs/863376
 2011-10-10 18:03:00 +02:00
Andreas Preikschat
e6751bd043 fixed string 2011-10-09 21:51:44 +02:00
Andreas Preikschat
3c8cc5c532 removed comment + fixed regex 2011-10-09 21:45:50 +02:00
Andreas Preikschat
06068eedce fixed bug 863846 
Fixes: https://launchpad.net/bugs/863846
 2011-10-08 15:29:35 +02:00
Andreas Preikschat
2591854fdd fixed bug 863376 
- clean ups

Fixes: https://launchpad.net/bugs/863376
 2011-10-08 15:20:57 +02:00
Stevan Pettit
0b4259ffba fixed Bug #832345 
bzr-revno: 1771
Fixes: https://launchpad.net/bugs/832345
 2011-10-08 10:59:13 +02:00
Stevan Pettit
2a1d0009a8 Removed whitespace 2011-10-05 18:17:57 -04:00
Stevan Pettit
5dfa0c95ce Modified code so new Openlyrics song import description will appear for translate 2011-10-05 15:50:17 -04:00
Tim Bentley
161300fe73 Number of changes 
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
 2011-10-05 19:20:54 +01:00
Andreas Preikschat
182227a85a - improved the preview frame display performance 
- removed dead code

bzr-revno: 1769
 2011-10-05 20:18:42 +02:00
Tim Bentley
575aa02022 Amend text 2011-10-05 18:18:56 +01:00
Andreas Preikschat
45b296b741 clean up 2011-10-05 19:04:59 +02:00
Tim Bentley
159a95855f Change Text 2011-10-05 17:14:21 +01:00
Andreas Preikschat
1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat
947b31d2c4 fixed name 2011-10-03 22:28:17 +02:00
Andreas Preikschat
91c20c4271 more clean ups 2011-10-03 22:26:51 +02:00
Andreas Preikschat
d3bfffa4b1 removed not used imports 2011-10-03 22:12:57 +02:00
Andreas Preikschat
201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat
360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat
88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Tim Bentley
5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Andreas Preikschat
42d15a53c7 suggest web bible name when registering 2011-10-03 14:32:45 +02: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
6426d9aac4 Display is now big enough 2011-10-02 17:38:05 +01:00
Tim Bentley
297a250010 Display works but bigggggggggg 2011-10-02 08:52:28 +01:00
Tim Bentley
9b5074991c Add new dialog 2011-10-01 21:33:53 +01:00
Stevan Pettit
dc41fa4318 Added coded to translate the modified OpenLyrics import description 2011-10-01 10:34:30 -04:00
Tim Bentley
648c5159a1 Allow the stageview time to be formatted between 12 and 24 hours 
Fixes: https://launchpad.net/bugs/863841
 2011-10-01 17:34:09 +05:30
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Stevan Pettit
d8fc6cd4dd Added additional desctiption to OpenLyrics import selection and added code to select xml files for import 2011-09-30 17:45:59 -04:00
Tim Bentley
128b6b80bf Display now works 2011-09-29 18:57:48 +01:00
rimach
3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
rimach
c299efab1a update 2011-09-28 22:54:43 +02:00
Tim Bentley
9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley
ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley
632e2ce2dd More fixes 2011-09-28 05:50:56 +01:00
Tim Bentley
3e2e87bb2c Initial stab 
Fixes: https://launchpad.net/bugs/814201
 2011-09-27 20:37:34 +01:00
Tim Bentley
276d4045e3 Fix edit for tags loaded for song which is not saved 
bzr-revno: 1765
 2011-09-27 18:23:21 +01:00
Tim Bentley
90cc812592 Head 2011-09-27 05:59:50 +01:00
Tim Bentley
695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Andreas Preikschat
0a7ba097a8 shorter code 2011-09-26 20:48:47 +02:00
Andreas Preikschat
d27a75287f - improved render performance for service items with the CanSoftBreak capability 
- added HTML5 doctype

bzr-revno: 1763
 2011-09-26 20:28:23 +02:00
Andreas Preikschat
70a7f1bf9f r1763 2011-09-26 20:26:40 +02:00
Andreas Preikschat
947a58dbbe improved line counting 2011-09-26 20:26:13 +02:00
Tim Bentley
7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Andreas Preikschat
9a40b27672 fix for theme editing 2011-09-26 18:57:32 +02:00
Andreas Preikschat
c9b7b55a87 reverted some changes 2011-09-26 18:46:11 +02:00
Andreas Preikschat
6631c2fcbb r1761 2011-09-26 18:26:47 +02:00
Andreas Preikschat
3a2be026f5 reverted some changes 2011-09-26 18:25:22 +02:00
Tim Bentley
8c6fcfcd4a Fix typing error 2011-09-26 17:12:40 +01:00
Tim Bentley
fb3f001c26 Add Justify theme option 
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
 2011-09-26 17:07:30 +01:00
Tim Bentley
682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley
88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Tim Bentley
c058c774fc revert 1757 2011-09-24 16:18:48 +01:00