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

6895 Commits

Author SHA1 Message Date
Jonathan Corwin
16f798e404 Attempt to check for gnome version 2011-12-12 22:10:37 +00:00
Jonathan Corwin
d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly. 
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
 2011-12-12 19:20:51 +00:00
Tim Bentley
143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley
4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin
6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jonathan Corwin
318484dc29 SOF5 capitalized words 2011-12-11 17:32:18 +00:00
Jon Tibble
85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble
e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble
26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Andreas Preikschat
f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01:00
Mattias Põldaru
c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Mattias Põldaru
ca6250ae3b Supposedly fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have. 2011-12-10 20:21:18 +02:00
Tim Bentley
b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Andreas Preikschat
08743f147c replaced has_key 2011-12-10 15:10:56 +01:00
Andreas Preikschat
3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Andreas Preikschat
9967e34d0a re reverted changes 
Fixes: https://launchpad.net/bugs/768495
 2011-12-10 15:03:08 +01:00
Jonathan Corwin
4949f88f28 Fix problem with the outline alignment when the theme is using Justify. 
bzr-revno: 1829
Fixes: https://launchpad.net/bugs/859950
 2011-12-10 10:14:13 +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
Jonathan Corwin
6bf2354d1a Fix Songs of Fellowship import and support book 5 
bzr-revno: 1828
 2011-12-09 19:13:30 +00:00
Jonathan Corwin
6f77ee1351 Handle   and other white space too 2011-12-09 18:52:24 +00:00
Andreas Preikschat
4eee13430e -Fixed media item recreation (which caused bug #900399) 
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
 2011-12-09 17:32:17 +01:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Jonathan Corwin
6a17d55484 Songs of Fellowship 5 import 2011-12-09 00:08:59 +00:00
rimach
1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01:00
Christian Richter
b0f0d8030d Fixed a traceback when replaying live video background when no service item has been sent live before. 
bzr-revno: 1826
Fixes: https://launchpad.net/bugs/899665
 2011-12-08 22:27:22 +02:00
Jonathan Corwin
c36a13d0a8 Remove webkit version in js 2011-12-08 19:49:43 +00:00
Tim Bentley
c5f6dbfa6e Head 2011-12-08 19:42:40 +00:00
Tim Bentley
ecba19f124 Fixes 2011-12-08 19:42:31 +00:00
Jonathan Corwin
15d5b97075 Remove version check and js tidyups 2011-12-08 19:24:25 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +01:00
Andreas Preikschat
95aedfa5d9 assign variables in methods instead of returning them 2011-12-08 18:45:33 +01:00
Andreas Preikschat
4f9a801966 set settings_tab to None if plugin is disabled 2011-12-08 17:34:18 +01:00
Mattias Põldaru
97560f6947 The category strings, if not unicode, can only be QStrings. Thanks to superfly. 2011-12-08 14:13:57 +02:00
Jonathan Corwin
44eb1fb024 Remove comment 2011-12-07 22:24:13 +00:00
Jonathan Corwin
1c79b28461 Workaround justify and outline alignment problems 2011-12-07 21:56:06 +00:00
Andreas Preikschat
66c183a6b8 break instead of continue 2011-12-07 21:41:19 +01:00
Andreas Preikschat
32f2dcac59 reverted change 2011-12-07 21:28:26 +01:00
Andreas Preikschat
12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
rimach
f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +01:00
Jon Tibble
fd8525bf89 Head r1824 2011-12-06 22:38:46 +00:00
Mattias Põldaru
ef3e3252e7 Comparison to None is discouraged 2011-12-07 00:37:56 +02:00
rimach
b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
Mattias Põldaru
1830cfbe9e Ensure that action category names are unicode, to prevent warnings on comparison. 2011-12-06 23:25:04 +02:00
rimach
bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
rimach
7f513fc58c sync 2011-12-06 22:16:09 +01:00
Andreas Preikschat
73d0050b95 reverted r1819 
bzr-revno: 1824
 2011-12-06 20:40:55 +01:00
Andreas Preikschat
38a2a3dee2 fixed bug 768495 2011-12-06 20:30:39 +01:00
Andreas Preikschat
36e729303c reverted changes 2011-12-06 20:25:12 +01:00
Jon Tibble
04d7669948 Fix non-ascii file check on Macs 2011-12-05 21:40:56 +00:00
Tim Bentley
149a660dad Head 2011-12-05 19:47:59 +00:00
Tim Bentley
d05c6b8d70 Fix up song import code 2011-12-05 19:47:50 +00:00
rimach
2df4a1903e bugfixing 2011-12-05 19:48:32 +01:00
rimach
ae5998e2dc sync 2011-12-05 18:43:54 +01:00
Raoul Snyman
b7e7da56e6 Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error about missing columns or tables. 
bzr-revno: 1823
 2011-12-05 18:06:47 +01:00
Jon Tibble
6b91f58da3 Head r1821 2011-12-04 20:58:39 +00:00
Jon Tibble
a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Raoul Snyman
ba0a4bb827 HEAD 2011-12-04 22:52:08 +02:00
Jon Tibble
6336915b4e Reduce recent file list duplication (Bug #892668) 
bzr-revno: 1821
 2011-12-04 20:50:52 +00:00
Raoul Snyman
11f5dfcfcd HEAD 2011-12-04 22:50:39 +02:00
Raoul Snyman
06570a9941 Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error. 2011-12-04 22:50:13 +02:00
Raoul Snyman
90d8b211d9 Hopefully the final fix to all our database woes. 
bzr-revno: 1820
 2011-12-04 20:19:20 +02:00
Tim Bentley
17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Tim Bentley
f751ae092a fix exit code 2011-12-04 16:19:45 +00:00
Jon Tibble
5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Raoul Snyman
c825df38fa Hopefully the final piece of the fix. 2011-12-04 15:26:27 +02:00
Andreas Preikschat
5d664d629d fixed bug 768495 (Shortcut can be assigned twice in certain circumstances) 
bzr-revno: 1819
Fixes: https://launchpad.net/bugs/768495
 2011-12-04 12:08:09 +01:00
Andreas Preikschat
3218ab3d8f - fixed a few tooltip strings 
bzr-revno: 1818
 2011-12-04 12:07:05 +01:00
Tim Bentley
456d7ec68e remove print 2011-12-04 07:27:49 +00:00
Raoul Snyman
2016ce61ca Sometimes the song_id column doesn't exist on the model, so we use the table instead. 2011-12-04 00:30:22 +02:00
Raoul Snyman
def18307cc Avoid an error about something not being a Boolean. 
Fixes: https://launchpad.net/bugs/899532
 2011-12-03 23:49:40 +02:00
Raoul Snyman
2e7a25697d HEAD 2011-12-03 23:40:30 +02:00
Andreas Preikschat
b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Tim Bentley
6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Raoul Snyman
76d10b094f HEAD 2011-12-03 20:33:12 +02:00
Raoul Snyman
5b67d36b3c Fix problem where importing new song databases now does not work. 
Fixes: https://launchpad.net/bugs/863845
 2011-12-03 20:23:46 +02:00
Andreas Preikschat
f34ae80eec fixed bug 887313 
Fixes: https://launchpad.net/bugs/887313
 2011-12-03 19:01:36 +01:00
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
rimach
8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
Jon Tibble
02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
rimach
2c225c19a0 bugfixing 2011-12-02 23:00:28 +01: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
rimach
11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach
cc2c58d9dc sync with trunk 2011-12-02 16:12:59 +01: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
Andreas Preikschat
9841406071 minor improvement for such cases where [---] was used 2011-09-24 14:54:27 +02:00
Andreas Preikschat
b776015ae9 r1759 2011-09-24 14:19:28 +02:00
Raoul Snyman
0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-24 00:14:23 +02:00
Martin Zibricky
b66e07e98b Fixed bug #745636: Added export to openlyrics format with formatting tags. 
bzr-revno: 1758
Fixes: https://launchpad.net/bugs/745636
 2011-09-23 08:43:06 +02:00
Martin Zibricky
3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky
7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +02:00
Martin Zibricky
1ef223b4a3 Fix issues with ignoring comments and chords 2011-09-23 02:12:55 +02:00
Raoul Snyman
a6821c0b7d Removed some unnecessary experimental code. 2011-09-22 22:39:27 +02:00
Martin Zibricky
354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
Raoul Snyman
77e4e376c6 Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again. 
Fixes: https://launchpad.net/bugs/812289
 2011-09-22 22:07:31 +02:00
rimach
81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach
d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach
11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach
2284cee517 little corrections 2011-09-22 20:27:04 +02:00
rimach
18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky
8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Raoul Snyman
e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception. 
Fixes: https://launchpad.net/bugs/855342
 2011-09-21 22:47:30 +02:00
Tim Bentley
0e2d6cb45f Replace u'' for None 
bzr-revno: 1755
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:48:22 +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
Martin Zibricky
c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Martin Zibricky
6e4c619cbd Add openlyrics export with formatting tags support. 2011-09-21 01:06:43 +02:00
Raoul Snyman
854cdf2c83 Fixed bug #803342. 
bzr-revno: 1754
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 20:03:42 +02:00
Raoul Snyman
b0dc146043 Added the default background colour back in so that the rest of the app that is not expecting to have to supply a background colour doesn't have to be changed. 
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 19:53:09 +02:00
Andreas Preikschat
9cab0f223c Fixed bug 805088 (Display tags do not work on second slide when slide is split) 
bzr-revno: 1753
 2011-09-20 18:34:33 +02:00
Raoul Snyman
bd3961eb50 Reverted a change for deprecated options (for now). 2011-09-20 18:26:04 +02:00
Raoul Snyman
54a1e25cb7 Trying to fix bug #803342 2011-09-20 18:24:07 +02:00
Tim Bentley
3cec8cbb17 Fix crash on service load of some people. 
Fix loop on config exit under extreme activities!

bzr-revno: 1752
Fixes: https://launchpad.net/bugs/854171
 2011-09-20 17:11:49 +01:00
Martin Zibricky
74c5669194 Dropped <line> element for openlyrics parsing and allow to import formatting tags over multiple lines and tags with only starting tag 2011-09-20 17:52:19 +02:00
Andreas Preikschat
920a65b4e1 fix detection when tag exists more than once 2011-09-20 17:50:43 +02:00
Tim Bentley
47b7379967 Fix spelling and remove print statement 2011-09-20 16:41:04 +01:00
Tim Bentley
834ed570ce Fix bug where string is added to image instead of QColor. 
Fix issue where queue has records to process but it is not running.

Fixes: https://launchpad.net/bugs/854171
 2011-09-20 16:23:29 +01: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
Andreas Preikschat
240d612948 fixed doc 2011-09-19 18:13:38 +02:00
Andreas Preikschat
724e2be04f close tags 2011-09-19 18:00:27 +02:00
Martin Zibricky
039115c7f4 Fix issue with more new lines when having more <lines> element in openlyrics document. 2011-09-19 14:59:37 +02:00
Martin Zibricky
b27784e838 Add comments to some new functions 2011-09-19 01:00:55 +02:00
Martin Zibricky
fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Martin Zibricky
2b7f51d4e9 Code cleanup of openlyrics import with formatting tags 2011-09-19 00:43:12 +02:00
Andreas Preikschat
734c868223 removed semicolon 2011-09-18 17:39:12 +02:00
Stevan Pettit
0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Tim Bentley
f19db2e5dc Fix lists to sort if new items are added for Images, Media and Presentations 
bzr-revno: 1748
Fixes: https://launchpad.net/bugs/827027
 2011-09-18 14:07:27 +01:00
Andreas Preikschat
ceec3d6f3a reverted not necessary change 2011-09-18 12:32:27 +02:00
Andreas Preikschat
d856e957b4 removed FIXME 2011-09-18 12:30:14 +02:00
Andreas Preikschat
2dad85f4c5 r1749 2011-09-18 12:28:53 +02:00
Andreas Preikschat
d62876b411 r1749 2011-09-18 12:28:27 +02:00
Andreas Preikschat
cd33d807fc removed test code 2011-09-18 12:28:10 +02:00
Andreas Preikschat
3c3339f114 final fixes and clean ups 2011-09-18 12:26:47 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Stevan Pettit
c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley
d47189e904 Remove unneeded timer logger . Was from old renderer 2011-09-17 14:05:28 +01:00
Tim Bentley
11424c8a7a Only load list if changed 2011-09-17 09:28:33 +01:00
Tim Bentley
62979a0062 Sort for added items in Images, Media and Presentations 
Fixes: https://launchpad.net/bugs/827027
 2011-09-17 09:20:03 +01:00
Martin Zibricky
8a11e790e5 [merge] merge with trunk r1747 2011-09-17 09:37:04 +02:00
Tim Bentley
6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Martin Zibricky
614ad790ae Fix spelling mistake 2011-09-16 13:31:11 +02:00
Raoul Snyman
f6927ef5b7 Fixed bug #851653, where deleting a song without audio files raised an exception. 
bzr-revno: 1747
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 13:20:44 +02:00
Raoul Snyman
1afcbbc837 Fixed bug #851653, added an if statement, and fixed the orphaned variable. 
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 10:15:37 +02:00
Martin Zibricky
a7cd6c8a17 fix typo in comment 2011-09-15 19:44:03 +02:00
Martin Zibricky
82163867fe Add docstrings to some new openlyrics methods. 2011-09-15 14:23:40 +02:00
Tim Bentley
52c63d9665 Undo fix 2011-09-14 21:35:32 +01:00
Tim Bentley
53b3b394e9 Turn off autopreview when deleting images. 
Stops images being deleted trying to preview themselves.

Fixes: https://launchpad.net/bugs/835033
 2011-09-14 21:27:30 +01:00
Martin Zibricky
526365153f rename in xml.py only_process_format_tags to parse_and_not_save 2011-09-13 22:40:34 +02:00
Martin Zibricky
8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Tim Bentley
7469c08674 Head 2011-09-13 19:13:25 +01:00
Stevan Pettit
1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04:00
Stevan Pettit
25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Martin Zibricky
50dbb1ed0b [merge] merge with trunk r1743 2011-09-12 22:36:41 +02:00
Martin Zibricky
fb664bed0c Remove openlyrics tests for easier merging. They will be merged later. 2011-09-12 22:35:39 +02:00
Raoul Snyman
2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Raoul Snyman
807aac95ee Delete audio files when you delete a song. 2011-09-12 19:09:11 +02:00
Raoul Snyman
017359ff5c Fixed up audio file import from version 1.2, plus a few bits I missed from renaming things. 2011-09-12 18:35:32 +02:00
Raoul Snyman
906b0fe67e Added support for copying files from openlp.org 1.2.x. 2011-09-12 08:29:58 +02:00
Raoul Snyman
75fda95339 HEAD 2011-09-12 06:59:07 +02:00
Martin Zibricky
50e1964795 Remove the db_file_path option from db.Manager init function 2011-09-11 22:39:33 +02:00
Martin Zibricky
606e19734c Allow to override data dir for tests 2011-09-11 22:29:25 +02:00
Stevan Pettit
c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Martin Zibricky
5c13123cef Delete print statement 2011-09-10 22:15:23 +02:00
Martin Zibricky
a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Tim Bentley
b3cb4a21f4 fixes 2011-09-09 20:14:19 +01:00
Tim Bentley
ea7c5c4b9e Head 2011-09-09 19:19:48 +01:00
Stevan Pettit
e560371e53 Added code to allow canceling of downloads and to completely bypass any downloads is there is no internet access in the First Time Wizard 
bzr-revno: 1742
Fixes: https://launchpad.net/bugs/836980, https://launchpad.net/bugs/836611
 2011-09-09 07:45:43 +02:00
Raoul Snyman
d1ae7a7f28 HEAD 2011-09-08 21:04:38 +02:00
Stevan Pettit
2c589f8b0e Added code to allow canceling of file downloads. Fixed aparent hang if no internet connection. 2011-09-08 09:14:51 -04:00
Martin Zibricky
c8c8c7e654 code to expand <format> tag for openlyrics export 2011-09-08 01:16:14 +02:00
Martin Zibricky
9fb6936263 code to add formatting tags to openlyrics lyrics 2011-09-07 22:54:53 +02:00
Tim Bentley
e93a1d2687 Hide the screen on startup if only 1 screen 
Fixes: https://launchpad.net/bugs/800156
 2011-09-06 20:32:30 +01:00
Tim Bentley
a328d1c7c7 Bypass message if requested from remote plugin 
Fixes: https://launchpad.net/bugs/796195
 2011-09-06 18:53:43 +01:00
Martin Zibricky
6163bc99c3 Do not use depracated dict.has_key() function in openlyrics code 2011-09-06 15:22:17 +02:00
Martin Zibricky
5d2bde01c2 For openlyrics export skip adding format tags if not used. 2011-09-06 15:14:57 +02:00
Andreas Preikschat
c7ab79f987 fixed bug 805088 2011-09-06 13:56:52 +02:00
Martin Zibricky
46203297de [merge] merge with trunk r1740 2011-09-06 12:48:19 +02:00
Raoul Snyman
9659834430 Finished fixing variable names. 2011-09-06 07:47:33 +02:00
Raoul Snyman
14ffb6d3c1 HEAD 2011-09-06 07:05:34 +02:00
Stevan Pettit
796e779300 Fixed various issues around the exporting and importing of settings. 
bzr-revno: 1740
Fixes: https://launchpad.net/bugs/838831
 2011-09-05 19:21:12 +02:00
Stevan Pettit
b90796da45 Cleaned up some code 2011-09-05 09:03:30 -04:00
Raoul Snyman
564c7e4a5a Coding standards clean up. 2011-09-05 14:51:16 +02:00
Martin Zibricky
bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Raoul Snyman
11f5a29b6d Added some openlp_process_events signals and move the hiding of the finish button higher up in the code. 
Fixes: https://launchpad.net/bugs/837319
 2011-09-04 23:00:37 +02:00
Raoul Snyman
3a87f3dff1 Songs can now have attached audio files, which are stored in services, and imported if the song needs to be imported. 
bzr-revno: 1738
Fixes: https://launchpad.net/bugs/739770
 2011-09-04 22:00:10 +02:00
Raoul Snyman
79bb94c6b0 Removed empty directories. 2011-09-04 14:04:44 +02:00
Raoul Snyman
a32e2b9d1b Hopefully fixed the problem where existing audio files are deleted. 2011-09-04 11:26:13 +02:00
Stevan Pettit
30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Martin Zibricky
4cf750ce9d Wrap db.Manager to a function arg for automated tests 2011-09-03 16:21:36 +02:00
Martin Zibricky
0de5d5e09a [merge] merge with trunk r1736 2011-09-03 10:35:47 +02:00
Stevan Pettit
50a5b98f8c Fixed problems with "shortcuts" section of export/import file 2011-09-02 18:57:02 -04:00
Martin Zibricky
9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Martin Zibricky
e4f3041802 Add pytest to optional dependencies in check_dependecies.py 2011-09-02 13:10:07 +02:00
Raoul Snyman
79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman
2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +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
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
Raoul Snyman
8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Andreas Preikschat
d85128829e Fix Renderer - again 
bzr-revno: 1735
 2011-08-30 19:10:52 +01:00
Mattias Põldaru
af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
rimach
709037ccca review changes part 2 and Head 2011-08-30 18:58:12 +02:00
rimach
38e08a5c8b Head 2011-08-30 18:56:52 +02:00
rimach
2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
Andreas Preikschat
71bdaf0708 comments 2011-08-30 17:15:39 +02:00
Andreas Preikschat
25ce484fb1 hopefully fixed it now completely 2011-08-30 17:12:16 +02:00
Andreas Preikschat
88704fbc68 fix soft break 2011-08-30 15:35:06 +02:00
rimach
169f8a2942 review changes 2011-08-29 23:52:26 +02:00
rimach
c608301b0b review changes 2011-08-29 23:51:03 +02:00
Andreas Preikschat
6c7527349d do not use the same name twice 2011-08-29 22:58:32 +02:00
Andreas Preikschat
ccd0a46e2b do not expand the tags 2011-08-29 22:56:07 +02:00
Raoul Snyman
540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
Martin Zibricky
1d05abbe04 Necessary changes for automated gui tests to work. 
bzr-revno: 1732
 2011-08-29 22:05:06 +02:00
rimach
d7f4298fbb bugfixing and Head 2011-08-29 21:59:12 +02:00
rimach
20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach
c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman
bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit
7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Mattias Põldaru
44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Stevan Pettit
96076a4bac Removed import receiver 2011-08-29 08:59:19 -04:00
Stevan Pettit
7e48256534 Removed need for signal to run appStartup 2011-08-29 08:47:32 -04:00
Andreas Preikschat
d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Andreas Preikschat
f046edc615 - fixed bug #796528 (Renderer splits slides twice even when the there is enough space) 
- fixed method confusion

bzr-revno: 1729
Fixes: https://launchpad.net/bugs/796528
 2011-08-29 08:21:24 +02:00
Raoul Snyman
2658c94520 Add audio file support to updating songs from the service. 2011-08-28 22:58:21 +02:00
Raoul Snyman
532ad84b87 - Bundle audio files with the song when adding it to the service 
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
 2011-08-28 22:51:44 +02:00
Andreas Preikschat
fc71905735 append text to the last slide (if more than one) 2011-08-28 19:46:52 +02:00
Raoul Snyman
0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit
bf1d8c239f Added code to mainwindow.py to allow exporting/importing of OpenLP settings to an INI file. 
During importing, the selected file is checked to insure it is an OpenLP settings file.
The user is warned prior to the import that changes will be made.

I also changed the settings section of an entry in servicemanager from "service" to "servicemanager".

I changed my nick in about.

Changed the import restart message.
Removed need for "import string".
Fixed the Try:

Changed filetype of export settings file from .ini to .conf

bzr-revno: 1728
 2011-08-28 18:41:07 +01:00
Andreas Preikschat
bc1f2d2977 removed wrong line 2011-08-28 18:59:09 +02:00
Andreas Preikschat
2acd1ae2ad added comments 2011-08-28 18:04:18 +02:00
Andreas Preikschat
2364ea72c2 hopefully completed the fix 2011-08-28 17:53:27 +02:00
Stevan Pettit
9957419f2b Changed system exit call 2011-08-28 09:39:34 -04:00
Stevan Pettit
d4e6c44d21 Fixed signal name 2011-08-27 16:42:22 -04:00
Tim Bentley
67894aa8d9 Error Handling improvements 2011-08-27 19:43:05 +01:00
Tim Bentley
3f078a553f Head 2011-08-27 16:04:11 +01:00
Tim Bentley
c1a648900f Fix initial setup bug 2011-08-27 16:02:45 +01:00
Andreas Preikschat
f3691516fd import tags from xml (part 1) 2011-08-27 16:00:24 +02:00
Andreas Preikschat
65630c6853 r1726 2011-08-27 13:24:24 +02:00
Andreas Preikschat
8020869dec - added some hints that the exporter export OpenLyrics files 
bzr-revno: 1726
 2011-08-27 13:19:55 +02:00
Tim Bentley
9949fba4ae Update songusage database to add plugin and what type of access. 
Amend triggers to record the correct data
Update report to output the new data items.

Apply fix in bug to allow Meda_data tables to be defined in core

bzr-revno: 1725
 2011-08-27 09:15:55 +01:00
Tim Bentley
611577577f Remove extra imports 2 2011-08-27 07:12:03 +01:00
Tim Bentley
9de4c0c118 Remove extra imports 2011-08-27 07:07:30 +01:00
Stevan Pettit
3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Raoul Snyman
f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Raoul Snyman
c81117991a HEAD 2011-08-26 22:59:27 +02:00
Tim Bentley
ed57b9bfbd Record timestamps of changes in songs database 
bzr-revno: 1724
 2011-08-26 20:51:14 +01:00
Tim Bentley
01128d4dc7 Fix report and triggers 2011-08-26 20:31:02 +01:00
Tim Bentley
1e4b922bfa DB Fixed 2011-08-26 20:09:25 +01:00
Tim Bentley
2dd0aa234e remove prints 2011-08-26 19:07:44 +01:00
Tim Bentley
f266485001 Add fields to database 2011-08-26 18:56:36 +01:00
Andreas Preikschat
d88a268c5c removed 'again' 2011-08-26 17:48:58 +02:00
Andreas Preikschat
fa85525a68 r1723 2011-08-26 17:32:37 +02:00
Andreas Preikschat
fbb32a0278 added hints that exported files are OpenLyrics files 2011-08-26 17:30:51 +02:00
Andreas Preikschat
6c3d156363 fixed inversion :-D 2011-08-26 17:22:57 +02:00
Andreas Preikschat
407b342f45 changed 'switch' name 2011-08-26 17:15:17 +02:00
Andreas Preikschat
953ff87ff5 do not delete temporary tags when resetting the list; preparations 2011-08-26 17:06:22 +02:00
Andreas Preikschat
627b9429aa documented formatting tags; added infrastructure to allow temporary formatting tags 2011-08-26 16:27:53 +02:00
Andreas Preikschat
dd00f95f64 r1723 2011-08-26 15:18:06 +02:00
Stevan Pettit
24126e74c8 Changed filetype of settings file from .ini to .conf 2011-08-26 09:14:12 -04:00
Tim Bentley
4f0c7716bc Fix default value 2011-08-26 14:13:32 +01:00
Tim Bentley
dec8ce3a8d Add ability to set colours around borders of images and in themes. 
May not be to all tastes ;-)

bzr-revno: 1722
 2011-08-26 13:20:49 +01:00
Tim Bentley
1adac78588 Add date fields to songs 2011-08-26 13:02:06 +01:00
Raoul Snyman
2c0df18f35 - Implemented a seamless database upgrade system. 
- Added the first upgrade as a demonstration.
- Added database version check so that newer version databases are not loaded.

bzr-revno: 1721
 2011-08-26 13:39:32 +02:00
Martin Zibricky
eef0af11ac Fix error msg with corrupted file 2011-08-26 13:04:56 +02:00
Tim Bentley
61feddd34e Fix method call 2011-08-26 11:21:47 +01:00
Tim Bentley
869bc9bb20 Fix field name 2011-08-26 09:21:27 +01:00
Raoul Snyman
4b1ce7102e A few more tweaks as requested by Andreas. 2011-08-25 22:14:02 +02:00
Raoul Snyman
bcf9b174ff Fixed a bug where the version number saved to the database was incorrect. Added the ability to throw an error message and not load the database if the db is too new or incorrect. 2011-08-25 22:02:55 +02:00
Tim Bentley
d5717a486e Head 2011-08-25 20:53:37 +01:00
Tim Bentley
5f6b315c4a fix trace 2011-08-25 20:52:07 +01:00
Stevan Pettit
d927adbe5a Changed import re-start message. Removed need for "import string" 2011-08-25 14:40:44 -04:00
Tim Bentley
803adc92c0 Fixes 2011-08-25 19:33:25 +01:00
Tim Bentley
ba3fb9221e Head 2011-08-25 19:22:38 +01:00
Martin Zibricky
20c431a6e5 - Remove darwin specific dead code 
- Move app.setOrganization and app.setApplication to orgininal place
 2011-08-25 17:33:21 +02:00
Stevan Pettit
215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Raoul Snyman
ddf148449d Now with exception handling. 2011-08-25 13:47:07 +02:00
Martin Zibricky
1dc05c0f66 Add ability to run openlp without app.exec_() method (needed to run gui tests) 2011-08-25 13:16:04 +02:00
Martin Zibricky
7fae06483a Move main() from openlp.pyw to openlp.core.__init__ 2011-08-25 12:04:17 +02:00
Raoul Snyman
923261c59c Even better, got rid of 'upgrade_schema' function which is not really needed. 2011-08-25 11:22:48 +02:00
Martin Zibricky
68facbf2b5 Move class OpenLP from openlp.pyw to openlp.core.__init__ 2011-08-25 11:04:41 +02:00
Raoul Snyman
7e572cd0c2 Database upgrading, revision 1. 2011-08-25 11:02:59 +02:00
Stevan Pettit
9b4df37a77 Modified code to handle keys with _ 2011-08-24 12:17:24 -04:00
Raoul Snyman
cdcfeaece8 Keeping things tidy: Actually save to DB now, and delete removed files. 2011-08-24 14:22:39 +02:00
Raoul Snyman
122c2226bd Now copying files too\! 2011-08-24 13:53:22 +02:00
Andreas Preikschat
50b820af4e try to fix gradient when using html5 doctype 2011-08-24 10:34:15 +02:00
Raoul Snyman
d5e92c0d35 Added a media files form and populated it from the media plugin, if the media plugin is enabled. 2011-08-23 23:48:46 +02:00
rimach
d64d22533f preview issue fixed, sync with trunk 2011-08-23 22:29:11 +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
Andreas Preikschat
0d99f5be96 hopefully fixed bug #796528 (to be cleaned up 
Fixes: https://launchpad.net/bugs/796528
 2011-08-23 21:57:29 +02:00
Raoul Snyman
6a60ece204 Added Up, Down, Remove and Remove All buttons. Reworked the UI to make use of the buttons better. 2011-08-23 15:44:50 +02:00
Stevan Pettit
131c9f90b5 Modified shutdown from sys.exit to os._exit 2011-08-23 08:11:41 -04:00
Raoul Snyman
409a16eb35 Added the tab, list and buttons for linked audio. 2011-08-23 08:38:02 +02:00
Tim Bentley
957a86b11e fexes 2011-08-22 18:32:18 +01:00
Andreas Preikschat
e209c81fed simplification 2011-08-22 16:11:37 +02:00
Andreas Preikschat
650dc83aeb do not use re with xml 2011-08-22 15:39:02 +02:00
Stevan Pettit
b36a4f74d3 Fixed traceback error when adding ini to filename 2011-08-21 19:15:16 -04:00
Andreas Preikschat
b0df1bdd94 - changed menu shortcut letter 
bzr-revno: 1718
 2011-08-21 21:15:36 +02:00
Tim Bentley
d1f823d864 More fixes 2 2011-08-21 19:02:58 +01:00
Tim Bentley
6c55362eee More fixes 2011-08-21 17:59:03 +01:00
Tim Bentley
62cffbb3b6 Review fixes and improvements 2011-08-21 17:13:45 +01:00
Stevan Pettit
79ab8cc1c0 Added code to always create a filename.INI file. 2011-08-21 10:05:24 -04:00
Tim Bentley
21bf34c436 Theme fix 2011-08-21 06:33:07 +01:00
Tim Bentley
76c0881559 Head 1716 2011-08-21 05:51:19 +01:00
Tim Bentley
d660d1d5ae Add missing file 2011-08-21 05:51:03 +01:00
Andreas Preikschat
8108e279dc changed menu shortcut letter 2011-08-20 21:36:51 +02:00
Raoul Snyman
8957c5e4bf Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
bzr-revno: 1716
Fixes: https://launchpad.net/bugs/825809
 2011-08-20 20:48:27 +02:00
Andreas Preikschat
c7d875a67f compatibility for OpenLyrics files created with OpenLP 1.9.6 and OpenLyrics 0.7 2011-08-20 19:39:38 +02:00
Andreas Preikschat
0ab092e56e removed _get method 2011-08-20 19:15:31 +02:00
Andreas Preikschat
23733608ef adapted virtual breaks in OpenLyrics implementation for the upcomming 0.8 release 2011-08-20 19:06:48 +02:00
Tim Bentley
3c17af592d Fix autoupdates 2011-08-20 16:02:57 +01:00
Tim Bentley
cc1e174d62 Updates 2011-08-20 14:21:25 +01:00
Tim Bentley
9e6d05098b 1715 2011-08-20 12:46:18 +01:00
Tim Bentley
ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01:00
Andreas Preikschat
d668f2d87c - changed instance varaibles to camelCase 
bzr-revno: 1715
 2011-08-20 10:24:17 +02:00
Andreas Preikschat
9363177e9d - Fixed bug #804747 (Bible disappear after upgrade)\n- Fixed bug Bug #824129 (Bibles plugin does not always delete corrupted bibles from falied imports)\n- Removed not needed or redundant variables.\n- Removed not needed code.\n- When upgrading bibles move the files to the temp directory.\n- clean ups 
bzr-revno: 1714
Fixes: https://launchpad.net/bugs/804747, https://launchpad.net/bugs/824129
 2011-08-20 10:23:18 +02:00
Andreas Preikschat
5b28d384fe Fixed bug #826483 (NIV 2010 web bible missing chapters) 
bzr-revno: 1713
Fixes: https://launchpad.net/bugs/826483
 2011-08-20 10:21:42 +02:00
Andreas Preikschat
a69705ccd3 Fixed song meta data in OpenLyrics files to contain the application version 
bzr-revno: 1712
 2011-08-20 10:20:28 +02:00
Stevan Pettit
9f284d9ab2 Moved export/import settings menu items from tools to file menu. Added status-tips 2011-08-18 22:43:08 -04:00
Andreas Preikschat
9baa1374b6 changed instance varaibles to camelCase 2011-08-17 18:16:43 +02:00
Andreas Preikschat
d7ae55f733 improved deletion of corrupted files on windows (bug #824129) 
Fixes: https://launchpad.net/bugs/824129
 2011-08-17 14:08:33 +02:00
Andreas Preikschat
7159559eaa removed not needed code (this case should never occur and if it does, the manager instance should delete the file) 2011-08-17 13:08:32 +02:00
Andreas Preikschat
29b67efed6 close connection to database when the upgrade failed, to prevent errors on windows 2011-08-17 12:47:01 +02:00
Stevan Pettit
b95924ae74 Added code to export/import settings via an ini file 2011-08-16 22:58:07 -04:00
Raoul Snyman
ca5c8d9a0b Fixed bug #802146: Couldn't import some SongShowPlus files. Rearranged the file menu as well to be in a more logical order, and to look a little nicer. 
Fixes: https://launchpad.net/bugs/802146
 2011-08-16 23:19:57 +02:00
Raoul Snyman
301993a3ea Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
Fixes: https://launchpad.net/bugs/825809
 2011-08-16 21:53:52 +02:00
Mattias Põldaru
da758fbb89 Removed wrong comment 2011-08-16 11:46:55 +03:00
Mattias Põldaru
509bc9e704 Two last importers, which did not stop on cancel. 2011-08-16 03:59:45 +03:00
Mattias Põldaru
bbba7203e3 Fix #249 on tracker, exception on opensong files with verse name containing only number [1] 2011-08-16 03:08:16 +03:00
Mattias Põldaru
a3ddb50479 Now we do not read several GB video files entirely into memory when opening service, this also fixes #257 in tracker. 2011-08-16 01:46:31 +03:00
Mattias Põldaru
bdde2a4fb4 String fix. 2011-08-16 01:44:02 +03:00
Mattias Põldaru
aca0a86915 Fix comparison of always unequal unicode and non-unicode string on drag-and-drop. 2011-08-16 01:42:48 +03:00
Mattias Põldaru
7ab1538460 Supposed to fix #819271, crash when downloading some chapters. 2011-08-15 12:54:07 +03:00
Andreas Preikschat
9865e2b73a r1710 2011-08-15 11:30:36 +02:00
Andreas Preikschat
d46eecd96d - added spellchecker to service notes dialog (bug #825979); - escape texts in various places (bug #825983) 
bzr-revno: 1710
Fixes: https://launchpad.net/bugs/825979, https://launchpad.net/bugs/825983
 2011-08-15 11:28:49 +02:00
Andreas Preikschat
cdec32f706 remove print 2011-08-15 11:05:28 +02:00
Andreas Preikschat
07e9e3fe93 fix failure dectection 2011-08-15 10:55:36 +02:00
Andreas Preikschat
5607f025f6 fixed bug #826483 
Fixes: https://launchpad.net/bugs/826483
 2011-08-15 10:53:51 +02:00
Andreas Preikschat
da1db9994d removed not needed code 2011-08-15 09:35:37 +02:00
Andreas Preikschat
c70ac5e656 create temp directory name in constructor 2011-08-15 08:31:36 +02:00
Andreas Preikschat
928467847e do not call postWizard twice 2011-08-14 16:35:36 +02:00
Andreas Preikschat
924482ac51 prevent closing an already closed database 2011-08-14 15:49:03 +02:00
Andreas Preikschat
41b3bde919 changed underscore varialbe to camelCase 2011-08-14 15:11:41 +02:00
Andreas Preikschat
17e397ffa8 added spellchecker to service notes dialog (bug #825979); escape texts in various places (bug #825983) 
Fixes: https://launchpad.net/bugs/825983, https://launchpad.net/bugs/825979
 2011-08-14 15:05:39 +02:00
Andreas Preikschat
3f489ddbaf fixed song meta data to include application name 2011-08-14 12:56:05 +02:00
Andreas Preikschat
8a926b01e1 Auto-completer does not work immediately after importing/upgrading a bible (bug #825181) 
Fixes: https://launchpad.net/bugs/825181
 2011-08-13 12:49:53 +02:00
Andreas Preikschat
ec93173891 r1708 2011-08-13 12:41:57 +02:00
Andreas Preikschat
259b57badd added try/except 2011-08-13 12:41:21 +02:00
Andreas Preikschat
b72b538893 removed variable; hopefully fixed windows crahes 2011-08-13 12:14:20 +02:00
Andreas Preikschat
6c96794af1 restore not upgraded bibles; clean ups 2011-08-12 17:31:16 +02:00