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

3603 Commits

Author SHA1 Message Date
Andreas Preikschat
3cdac511e2 fixed bug #690774 2010-12-17 14:30:48 +01:00
M2j
a46ea7c4eb localisation off seperators. 2010-12-17 14:21:55 +01:00
M2j
fb80a09120 HEAD 1147 2010-12-16 21:03:07 +01:00
M2j
f119a4afa5 further work on parse_reference and other things 2010-12-16 21:00:01 +01:00
Andreas Preikschat
e257f0431b r1147 2010-12-16 20:15:23 +01:00
Andreas Preikschat
fe452bc588 removed mistakes 2010-12-16 20:12:34 +01:00
M2j
e6bc3b9303 song search strings: handle unicode and reindex also search_lyric 2010-12-16 19:20:46 +01:00
Andreas Preikschat
95f30dfb6d fixed bug #690774 2010-12-16 18:56:08 +01:00
M2j
ff98870391 - bible imports broken by variable renaming 
- removed tab indentation
 2010-12-16 18:11:02 +01:00
Andreas Preikschat
4e9d6370b3 clean up 2010-12-16 17:08:10 +01:00
Andreas Preikschat
58a4d04980 white spaces 2010-12-16 14:16:53 +01:00
Andreas Preikschat
0e1383c35d clean ups 2010-12-15 20:22:25 +01:00
Tim Bentley
b9a97dd651 Remove comments 2010-12-14 20:22:57 +00:00
Tim Bentley
d848dedb79 Fix custom edit bug 
Fixes: https://launchpad.net/bugs/690335
 2010-12-14 20:22:01 +00:00
M2j
6e834900e6 rewritten bible reference parser with more features and localisation capabilities 
(first, untested version)
 2010-12-13 20:06:07 +01:00
Andreas Preikschat
d9768b6536 whitespaces 2010-12-13 15:24:16 +01:00
andreas
e7a40c492f - "Save" button now only saves the alert (if the alert has not created before the save button is disabled). -> the buttons are less confusing 
- feedback:
1) If the "alert text" field does not contain "<>" but the parameter field is not empty, then a pop up opens.
2) If the "alert text" field does contain "<>" but the parameter field is empty, a pop up opens.

bzr-revno: 1145
 2010-12-12 17:08:12 +00:00
Meinert Jordan
08ab85cb8a Additional buttons in the exception dialog for sending a bug report per email or saving it to a file. 
The report contains the traceback along with library versions.

The bug report is prefilled with the traceback, the openlp version, platform informations (on Linux also KDE or GNOME), the and the versions of all used libraries.

bzr-revno: 1144
 2010-12-12 16:58:06 +00:00
Andreas Preikschat
90b806c6a4 comment fix 2010-12-12 16:57:43 +01:00
Tim Bentley
52803af6d3 Add Autocompletion to the Songs Dialog 
Fix up some lost and confused Camels

bzr-revno: 1143
 2010-12-12 14:41:06 +00:00
Andreas Preikschat
adb765f3fa fixed a bug, user feedback 2010-12-12 11:33:33 +01:00
Andreas Preikschat
77f4adbef0 - fixed progress bar (bible openlp1 import) 
- fixed Bug #688647 (mostly copy&paste)
- fixed "reject" method (the import would not stop, if currentId() == 2/3)
- some songbeamer import tweaks

bzr-revno: 1142
Fixes: https://launchpad.net/bugs/688647
 2010-12-12 09:06:24 +00:00
Tim Bentley
4a7300c6c0 Topic and Book Auto completion 2010-12-12 08:35:02 +00:00
M2j
fda3085449 resource added 2010-12-12 01:03:51 +01:00
M2j
b5075ccddf Bible web import from Bibleserver.com - first version 2010-12-12 00:54:07 +01:00
M2j
a1d413307b HEAD 1141 2010-12-12 00:27:23 +01:00
M2j
f3f2e5cdc8 minor changes 2010-12-12 00:25:49 +01:00
Tim Bentley
031b23ccda Format errors 2010-12-11 20:57:45 +00:00
Tim Bentley
a25ce9d3cf Sort out Camels 2010-12-11 20:49:50 +00:00
Tim Bentley
bc0ca88af5 Add Autocompletion for Authors and Themes 2010-12-11 20:31:47 +00:00
M2j
af202e3358 removed CLI interface of the mailto library 2010-12-11 21:22:03 +01:00
M2j
c28b129421 format mailto() sources 
some exception dialog enhancements
 2010-12-11 16:39:12 +01:00
Andreas Preikschat
0cae712cc4 fixed openlp bible importer progress bar 2010-12-11 13:18:35 +01:00
Andreas Preikschat
2de4edfe56 disable olp import if importError, songbeamer tweaks 2010-12-11 13:07:38 +01:00
Tim Bentley
9d1eabe2a2 Author is optional 2010-12-11 10:46:11 +00:00
Tim Bentley
9d67aea4f7 Fix missing authors on song import 2010-12-11 09:59:23 +00:00
Andreas Preikschat
ce0abd19bd string change, close file, MarkType 2010-12-11 10:53:30 +01:00
Andreas Preikschat
62643d7d5e string change, close file, MarkType 2010-12-11 10:40:52 +01:00
M2j
1cb9594e58 test exception removed 2010-12-11 01:29:57 +01:00
M2j
8ad603b251 completed exception report dialog 2010-12-11 01:26:41 +01:00
M2j
5bae9c74e3 added mailto code 2010-12-10 22:19:46 +01:00
M2j
88ba36c9dd Bug report features for exception dialog 2010-12-10 21:42:20 +01:00
Andreas Preikschat
a268bd9536 Add OpenLP1 bible importer 
bzr-revno: 1140
 2010-12-10 17:25:40 +00:00
Meinert Jordan
bdc0c28809 Local aware song order 
bzr-revno: 1139
Fixes: https://launchpad.net/bugs/687638
 2010-12-10 17:19:33 +00:00
Meinert Jordan
7c5cb8d80b Import Wizards don't Stop 
bzr-revno: 1138
Fixes: https://launchpad.net/bugs/659019
 2010-12-10 17:18:08 +00:00
Andreas Preikschat
5d33376740 again changed olp to openlp 2010-12-09 19:01:04 +01:00
Andreas Preikschat
9515b84c56 whitespaces, string change 2010-12-09 18:44:18 +01:00
Andreas Preikschat
a15aebcc32 latest changes for merge 2010-12-09 17:53:48 +01:00
Andreas Preikschat
6284480055 trunk r1136 2010-12-09 17:10:15 +01:00
M2j
7e221a6e98 locale aware song sorting 2010-12-09 16:08:04 +01:00
Andreas Preikschat
7e86da26f2 close connection when finished, removed unused variable 2010-12-09 14:35:17 +01:00
M2j
465515d71e unicode in song title search strings 2010-12-09 14:30:23 +01:00
Andreas Preikschat
01fad9972c added comments back 2010-12-09 13:49:15 +01:00
M2j
20b1c33a4b making 'cancel bible import' work 2010-12-09 00:40:28 +01:00
M2j
b465d763cd use the same call as in the Qt sources 2010-12-09 00:33:38 +01:00
M2j
c33654c68c Bug #659019 2010-12-08 23:55:28 +01:00
Derek Scotney
3719143f99 Fixes unwanted text imported from some SongSelect files. SongSelect only has a few verse types available for verses and adds extra ones by setting the verse type to 'misc' and then including the actual type on the next line. In the case of a 'misc' type or unknown type, the next line is checked for a valid verse type. The fix has been made for both .txt and .usr file types. 
bzr-revno: 1136
 2010-12-08 20:17:51 +00:00
Tim Bentley
e39c681c44 Add text entry validator to display positions 
Fix Spelling

bzr-revno: 1135
Fixes: https://launchpad.net/bugs/685317
 2010-12-08 19:21:59 +00:00
Derek Scotney
cc7780574b reverted back to revision 1134 2010-12-08 21:14:27 +02:00
Tim Bentley
b405195261 Fix size input validation again 2010-12-08 19:12:38 +00:00
Tim Bentley
2f04bde2aa Fix size input validation 2010-12-08 19:00:24 +00:00
Andreas Preikschat
9f6a0f7c64 moved file 2010-12-08 18:56:29 +01:00
Andreas Preikschat
aca56b78b5 changed olp1 to OpenLP1 2010-12-08 18:46:22 +01:00
Andreas Preikschat
b044226332 changed class name 2010-12-08 18:19:51 +01:00
Andreas Preikschat
12e7c96463 camelCase changes 2010-12-08 18:18:12 +01:00
M2j
3ad231940c HEAD 1127 2010-12-08 09:25:28 +01:00
M2j
62766269f1 - remove None in .split() method 
- change translatable codepage selection strings
 2010-12-08 09:21:17 +01:00
rimach
44b0574778 fix for missing title field 2010-12-07 23:47:02 +01:00
Derek Scotney
298a159b5e Update to verse types 2010-12-07 23:10:57 +02:00
Tim Bentley
ccc640bb27 Stop invalid characters being entered 2010-12-07 20:47:09 +00:00
Derek Scotney
a5fc219abb Updated to handle CCLI verse type 'misc' 2010-12-07 22:03:20 +02:00
Tim Bentley
a55cdd3a50 Fix string to int problem 2010-12-07 18:55:58 +00:00
Tim Bentley
1b3db9f429 Fix Theme Bug text color. 
Fix serious spelling error.

bzr-revno: 1133
Fixes: https://launchpad.net/bugs/686122
 2010-12-07 17:28:46 +00:00
Andreas Preikschat
6fd338c492 tweaked importer 2010-12-07 17:34:19 +01:00
Jon Tibble
7f60e706aa Unused imports 2010-12-06 23:59:01 +00:00
Jon Tibble
9291516b59 Fix v2 import bug 2010-12-06 23:37:55 +00:00
Jon Tibble
533a0c5b5b Head r1131 2010-12-06 23:28:01 +00:00
Tim Bentley
117f77a4a4 Spell Vertical 2010-12-06 19:42:17 +00:00
Tim Bentley
04b4cdaf9f Head1131 2010-12-06 19:39:04 +00:00
Tim Bentley
b01aed6b0d Fix theme main font color bug 
Fixes: https://launchpad.net/bugs/686122
 2010-12-06 19:36:15 +00:00
Andreas Preikschat
d5e0643b45 attempt to clean up bible importers 2010-12-06 20:30:04 +01:00
Tim Bentley
fd473b81d7 Spell Vertical 2010-12-06 19:28:52 +00:00
Tim Bentley
109d214fb3 Add comment 2010-12-06 19:25:44 +00:00
Raoul Snyman
3389e487ca Fixed issues from merges. 
Set second page of wizard on edit.
 2010-12-05 20:02:36 +02:00
Andreas Preikschat
9db57568b0 started olp1 bible import 2010-12-05 17:11:21 +01:00
Andreas Preikschat
e3cb6a6508 changed 2010-12-05 17:07:16 +01:00
Andreas Preikschat
b8e6da0417 completed work 2010-12-05 16:47:23 +01:00
Andreas Preikschat
a66a77bdec completed work 2010-12-05 16:44:51 +01:00
Raoul Snyman
5b19753bf7 HEAD 2010-12-05 08:57:35 +02:00
Raoul Snyman
222d5fe9be HEAD 2010-12-05 08:40:35 +02:00
Andreas Preikschat
e6cfad921a olpv1 bible importer 2010-12-04 21:42:03 +01:00
Tim Bentley
38d777d98e Fix more line endings 2010-12-04 09:05:11 +00:00
Tim Bentley
ea246d777a Head1129 2010-12-03 20:47:05 +00:00
andreas
41c805e607 hanged importer messages (Bug #668789) 
- disabled text search for web bibles (does not matter if the web bible is the dual or normal bible)
- available web bibles in the bible importer are now sorted
- imported bible in the Media Manager are now sorted
- speed improvements (unfortunately this takes the ability to keep unselected item unselected when doing an other search)
- "second" instead of "dual"
- docs, comments
- added an auto completion for bible books ("Quick Search" Tab; "Verse Search" combo box)

bzr-revno: 1129
Fixes: https://launchpad.net/bugs/668789
 2010-12-03 20:45:41 +00:00
andreas
7c65303400 - added the <u>Underline</u> tag 
- clean ups

SongBeamerImport:
- clean ups and tweaks
- fixed a bug which would drop the first line of a verse, when it does not have any "verse type"
- convert SongBeamer's html tags to OpenLP specific style

bzr-revno: 1128
 2010-12-03 20:42:56 +00:00
Tim Bentley
41dfd114d7 Theme values are preserved correctly 
Fixes: https://launchpad.net/bugs/684901
 2010-12-03 20:22:59 +00:00
Andreas Preikschat
245465ab11 improved completor performance 2010-12-03 20:53:56 +01:00
Tim Bentley
22f52b74c1 Fix spelling 2010-12-03 19:21:15 +00:00
Tim Bentley
99cfc65446 Allow theme name to be changed after error message 
Fixes: https://launchpad.net/bugs/684901
 2010-12-03 19:00:40 +00:00
Tim Bentley
37c065a6e4 pylint finished for now 2010-12-03 18:56:12 +00:00
Tim Bentley
1b6aa34d39 Pylint again 2010-12-03 15:14:32 +00:00
Andreas Preikschat
b88436c641 autocompleter should be 'CaseInsensitive' 2010-12-02 18:36:35 +01:00
Tim Bentley
ada84d9352 pylint fixes part 1 2010-12-02 14:37:38 +00:00
Andreas Preikschat
6b1254e923 trunk r1127 2010-12-02 15:00:32 +01:00
andreas
c8fe3ceb67 - docs 
- disable "edit" and "delete" button when loading a song or creating a new one (*)

(*) To reproduce this, edit/create a song, select a verse and click "Cancel". When you edit/create another song, the "edit" and "delete" buttons are enabled.

Manually fix conflict in comments on merge (trb143)

bzr-revno: 1127
 2010-12-02 09:11:34 +00:00
Andreas Preikschat
cd6948f613 added an autoCompleter for bible books for 'Verse Search' 2010-12-01 19:37:54 +01:00
Tim Bentley
7f1e21c13b Fix field names and verse order bug 2010-11-30 20:23:21 +00:00
Andreas Preikschat
28390e965d enable search button 2010-11-29 20:02:58 +01:00
Tim Bentley
cc9ef10821 Songs get created correctly and displays refreshed 2010-11-29 16:02:41 +00:00
Tim Bentley
2c3c0f2255 Songs get built correctly 2010-11-29 14:04:37 +00:00
Tim Bentley
5decd5c466 Cleanups and fixes 2010-11-29 07:32:08 +00:00
Tim Bentley
6ecc121bdf Convert verse tags 2010-11-28 19:38:27 +00:00
Tim Bentley
e2ac8b6dcc More code fixes 2010-11-28 16:48:36 +00:00
Tim Bentley
132c678569 Fix exit for non Sqlite Databases 2010-11-28 15:20:53 +00:00
Andreas Preikschat
8929aaaa23 docs; make sure, that the edit/delete buttons are always disabled after loading the window 2010-11-28 16:10:51 +01:00
Tim Bentley
9fa384b57f More changes 2010-11-28 14:40:46 +00:00
Tim Bentley
dba32e3614 Fix DnD bug 2010-11-28 13:41:52 +00:00
Andreas Preikschat
3a13ebdce7 remove strike tags in songBeamer files; decent check for digits 2010-11-28 14:41:50 +01:00
Tim Bentley
a7e8104f59 Song rebuilding continues 2010-11-28 13:39:51 +00:00
Andreas Preikschat
7889a22810 fixed <p> tag, replaced the <u> tag and another fix 2010-11-27 22:12:52 +01:00
Tim Bentley
1cf4914862 fixes from last merge and more code for song management 2010-11-27 20:51:54 +00:00
Tim Bentley
90c631ce87 Documentation fixups and \nstart to add OpenlLyrics export for songs 2010-11-27 15:25:00 +00:00
Tim Bentley
771c86783e Remove theme background for Images 2010-11-27 08:59:49 +00:00
Andreas Preikschat
52c12d50be trunk r1124 2010-11-26 17:33:01 +01:00
Andreas Preikschat
4d1b88072f fixed reStructuredText 2010-11-26 17:30:04 +01:00
Andreas Preikschat
ae036056b1 added the tag {u} 2010-11-26 17:25:56 +01:00
Andreas Preikschat
0dc9d433b7 SongBeamer import converts tags, that they'll work with OpenLP 2010-11-26 17:06:24 +01:00
Andreas Preikschat
66f230169d SongBeamer import clean ups and tweaks 2010-11-26 15:23:48 +01:00
Tim Bentley
2752279d43 Remove need to restart for double click event changes 2010-11-26 09:49:06 +00:00
Tim Bentley
f153c27d32 Fix preview of live when returning from blank display 2010-11-26 09:00:14 +00:00
Tim Bentley
a12498e011 Fix up comments from merge 
More cleanups discovered
Fix Theme Copying as it was broken
 2010-11-24 21:50:51 +00:00
Tim Bentley
9cc994e0e0 Fix up theme lines per slide text 2010-11-24 19:41:14 +00:00
Tim Bentley
e20e336c5e Remove extra debugging 2010-11-24 17:40:28 +00:00
Tim Bentley
0b1a187f94 Head 2010-11-24 17:39:07 +00:00
Tim Bentley
827840710f Remove print 2010-11-24 17:38:59 +00:00
Jon Tibble
1c11cab27b Whitespace & unused imports 2010-11-24 01:51:08 +00:00
Jon Tibble
3ae6d7db97 Fix BibleGateway searches for BeautifulSoup 3.1 
bzr-revno: 1122
 2010-11-24 01:06:36 +00:00
Tim Bentley
45905753ed Start to add line count code to wizard 2010-11-23 20:48:55 +00:00
Tim Bentley
85261fe659 Fix server load edit bug 2010-11-22 18:52:58 +00:00
Tim Bentley
e103dea7f1 Add extra invalid theme name 2010-11-21 20:46:44 +00:00
Tim Bentley
4c19db0b91 Force black backgounds for videos 2010-11-21 20:45:22 +00:00
Andreas Preikschat
e4e2892ec7 trunk r1119 2010-11-21 12:00:37 +01:00
Tim Bentley
f900980eef Add debugging for Servie editing and fix edit_id bug 2010-11-20 18:14:43 +00:00
Tim Bentley
948cb57d59 Remove blank check box line 
Fix situation when trying to work with no themes

Fixes: https://launchpad.net/bugs/677710
 2010-11-20 16:36:54 +00:00
Raoul Snyman
5867fddd5b Added theme wizard picture. 
Fixed up theme wizard somewhat (still not done).
 2010-11-20 00:26:15 +02:00
Andreas Preikschat
f6c30b7106 removed == 1 2010-11-19 22:34:15 +01:00
Tim Bentley
6823931e38 Review cleanup 2010-11-19 18:05:49 +00:00
Jon Tibble
efdf1405de Head r1117 2010-11-19 01:18:36 +00:00
Tim Bentley
94fb7d49d6 Remove stray print statements 2010-11-18 17:57:51 +00:00
Tim Bentley
1dfef4f061 Style Police 2010-11-18 17:46:47 +00:00
Tim Bentley
44038028bc Add theme error message 2010-11-18 17:40:20 +00:00
Tim Bentley
c08030b462 Version 1 now imports ok 2010-11-17 18:35:04 +00:00
Tim Bentley
19fc6f47a1 Start of version 1 import conversion 2010-11-16 20:24:21 +00:00
Andreas Preikschat
435338caad more generic parameters for __init__ 2010-11-16 19:33:37 +01:00
Andreas Preikschat
b561bf6bdd trunk r1117 2010-11-16 19:00:47 +01:00
Andreas Preikschat
588cfa111f long lines 2010-11-16 18:57:13 +01:00
Tim Bentley
c0adc51f62 Head 2010-11-16 17:36:50 +00:00
Tim Bentley
bca4071900 Fix up boolean theme fields 2010-11-16 17:33:41 +00:00
Raoul Snyman
aadc913ba1 Fix a bug where a null field would cause an exception. 2010-11-16 19:12:11 +02:00
Raoul Snyman
689cddf3e4 Removed an unnecessary line. 2010-11-16 11:29:46 +02:00
Raoul Snyman
59f47a5e1f Fix the spelling. 2010-11-16 08:20:39 +02:00
Raoul Snyman
8ed5bb883e Added a "re-index" tool for songs. 2010-11-16 08:19:23 +02:00
Jon Tibble
f63625b72f Fix biblegateway for BeautifulSoup 3.1 2010-11-16 03:31:17 +00:00
Andreas Preikschat
80721aad35 replaced 'dual' 2010-11-15 18:47:33 +01:00
M2j
bb571b0df5 using list of tuples 2010-11-13 22:04:11 +01:00
Andreas Preikschat
a357bdf6a0 improved performance 2010-11-13 21:13:24 +01:00
Tim Bentley
e9e895f969 Sort themes when read 
bzr-revno: 1115
 2010-11-13 11:44:55 +00:00
M2j
e81bd1c3fc remove QtCore from header 2010-11-13 09:01:47 +01:00
Tim Bentley
6f51b68824 Sort theme 2010-11-13 07:30:34 +00:00
Andreas Preikschat
272eea72b7 removed theme sorting 2010-11-13 08:17:39 +01:00
Tim Bentley
0d9649ff40 Sort themes in sorder 2010-11-13 07:09:00 +00:00
Andreas Preikschat
38397f07a2 changed texts again 2010-11-12 23:27:57 +01:00
Andreas Preikschat
093dc1afca make sure that the theme list (in the settings are sorted), docs/comments 2010-11-12 23:02:25 +01:00
Andreas Preikschat
a0bbe76717 comments/missing lines 2010-11-12 22:51:18 +01:00
Andreas Preikschat
46321741ad make sure, that the bible list in the importer is sorted 2010-11-12 22:34:06 +01:00
Andreas Preikschat
b34bb86b7c spelling 2010-11-12 18:54:34 +01:00
Andreas Preikschat
45945cc302 -docs/comments -disabled text mode for webbibles -"dual" instead of "second" 2010-11-12 14:50:13 +01:00
M2j
4ccb48ffce HEAD 1114 2010-11-12 14:40:24 +01:00
M2j
682fcc2405 use a list in the OLP1 import to get sorted entries in the encoding comboBox 2010-11-12 14:20:45 +01:00
M2j
ef91b24d8a using PySQLite type conversion 2010-11-12 13:23:44 +01:00
Tim Bentley
550654bb2c Display fixes 2010-11-09 20:17:38 +00:00
Andreas Preikschat
802e886e96 removed whitespaces 2010-11-09 18:23:18 +01:00
Andreas Preikschat
f8b793ca3b removed whitespaces, added second blank line before class 2010-11-09 18:10:37 +01:00
Andreas Preikschat
06cf6dcc20 changed bible importer finish message, clean ups 2010-11-09 17:56:16 +01:00
Tim Bentley
dc184fdd2e Head 2010-11-08 18:51:56 +00:00
Tim Bentley
4360447a3b More fixes to editor 2010-11-08 06:11:04 +00:00
M2j
5e9ff18927 caracter encoding comboBox for openlp.org 1.x import 2010-11-07 23:57:30 +01:00
Raoul Snyman
fb5a146104 Added and changed the expand all and collapse all icons. 2010-11-07 23:01:02 +02:00
Tim Bentley
0102500e47 Fix saving 2010-11-06 07:58:46 +00:00
Tim Bentley
73692e9e9f More theme changes 2010-11-05 19:20:41 +00:00
M2j
0853e52de7 single chardet for the whole olp1import database 2010-11-04 23:25:42 +01:00
M2j
fa89971771 openlp.org 1.x importer graped authors out of the lyrics 2010-11-04 21:45:49 +01:00
M2j
4294ae83b8 split song verse order at consecutive whitespaces and not just u' ' 2010-11-04 20:32:43 +01:00
Tim Bentley
e1d2695bc9 Cast adrift amendthemeform 2010-11-04 17:03:52 +00:00
Tim Bentley
69f72c2ba8 Head 2010-11-04 17:02:10 +00:00
Tim Bentley
52c9b9e53a change 2010-11-04 17:00:31 +00:00
Tim Bentley
53bf428a76 changes 2010-11-04 16:58:35 +00:00
Andreas Preikschat
0f76533470 clean up 2010-11-04 17:26:30 +01:00
Jon Tibble
be308c5637 Lots of cleanups 
bzr-revno: 1112
 2010-11-03 22:22:48 +00:00
Andreas Preikschat
a2c0987e44 Changed "songmanager" to "manager" 
Fixed a bug which occurs when you click on "Save & Preview" a second time

bzr-revno: 1111
 2010-11-04 00:17:31 +02:00