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

3928 Commits

Author SHA1 Message Date
M2j
ff98870391 - bible imports broken by variable renaming 
- removed tab indentation
 2010-12-16 18:11:02 +01:00
Andreas Preikschat
58a4d04980 white spaces 2010-12-16 14:16:53 +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
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
Tim Bentley
031b23ccda Format errors 2010-12-11 20:57:45 +00:00
Tim Bentley
bc0ca88af5 Add Autocompletion for Authors and Themes 2010-12-11 20:31:47 +00: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
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
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
Derek Scotney
a5fc219abb Updated to handle CCLI verse type 'misc' 2010-12-07 22:03:20 +02: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
Andreas Preikschat
d5e0643b45 attempt to clean up bible importers 2010-12-06 20:30:04 +01: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
Andreas Preikschat
e6cfad921a olpv1 bible importer 2010-12-04 21:42:03 +01: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
Andreas Preikschat
245465ab11 improved completor performance 2010-12-03 20:53:56 +01:00
Andreas Preikschat
b88436c641 autocompleter should be 'CaseInsensitive' 2010-12-02 18:36:35 +01: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
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
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
e20e336c5e Remove extra debugging 2010-11-24 17:40:28 +00:00
Tim Bentley
0b1a187f94 Head 2010-11-24 17:39:07 +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
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
Andreas Preikschat
f6c30b7106 removed == 1 2010-11-19 22:34:15 +01: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
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
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
M2j
e81bd1c3fc remove QtCore from header 2010-11-13 09:01:47 +01:00
Andreas Preikschat
272eea72b7 removed theme sorting 2010-11-13 08:17:39 +01: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
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
M2j
5e9ff18927 caracter encoding comboBox for openlp.org 1.x import 2010-11-07 23:57:30 +01: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
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
f4b86d1f14 songmanager -> manager, fixed traceback 2010-11-03 19:18:44 +01:00
Jon Tibble
947e4d4173 Long lines 2010-11-03 18:03:28 +00:00
Jon Tibble
b7dd528d50 Cleanups 2010-11-03 17:19:44 +00:00
M2j
36a71d8764 HEAD 1109 2010-11-01 21:50:26 +01:00
M2j
47e7937baf - recognize openlp.org 1.x import char encoding by title, lyrics and copyright 
- prefere utf-8 encoding for CCLI imports
 2010-11-01 21:48:30 +01:00
Tim Bentley
51d68f2066 Fix up file type / mime type issues 2010-10-30 10:29:59 +01:00
Meinert Jordan
b673d905d7 Some things from my months old todo list: 
- enabling nested docks for more flexible container arrangements
- show the next slide content
- some old UTF8 problems

bzr-revno: 1106
 2010-10-29 21:23:43 +02:00
Andreas Preikschat
21dbf51a0b Fix custom and songusage managers 
bzr-revno: 1105
Fixes: https://launchpad.net/bugs/667531
 2010-10-29 17:17:45 +01:00
M2j
ed82a6c17e enable nested docks 
preview the next slide content
whipe out some UTF8 sins in the custom plugin
 2010-10-29 18:08:31 +02:00
Andreas Preikschat
e3b7cc2c91 fixed manager for customs 2010-10-28 16:56:52 +02:00
Andreas Preikschat
d458ac2a98 replaced songusagemanager 2010-10-28 14:10:25 +02:00
Tim Bentley
7dcd7f3011 Fix Media icon - it went AWOL 2010-10-27 20:40:38 +01:00
Tim Bentley
53d498bdc9 Fix bugs 2010-10-27 18:42:10 +01:00
Tim Bentley
8d31844ee0 Add Vacuum to databases on exit 
Tidy up custom plugin naming

Fixes: https://launchpad.net/bugs/636835
 2010-10-27 16:30:30 +01:00
Andreas Preikschat
b3ae89e045 head 2010-10-24 18:18:01 +02:00
Andreas Preikschat
8d82715924 added empty lines 2010-10-24 13:08:46 +02:00
Tim Bentley
68fa2c4791 Fix themes and class names 2010-10-23 18:37:10 +01:00
Tim Bentley
feb3be1cb9 Head 2010-10-23 08:24:30 +01:00
Tim Bentley
b0ba4472bd Fix up themes now 2010-10-23 08:23:49 +01:00
Tim Bentley
6dbb80ee94 Initial version of Image performance improvements 2010-10-22 18:24:56 +01:00
Jon Tibble
8a977ef155 Fix spelling of Samuel (Bug #647931) 2010-10-21 22:43:14 +01:00
Jon Tibble
a6bcfbf568 Cleanups 2010-10-21 16:31:22 +01:00
Raoul Snyman
baaa7e0508 Updated documentation. 
Renamed the import wizards to match the general form naming convention.
Removed an unnecessary class.
 2010-10-16 21:38:23 +02:00
Tim Bentley
2f3bfc51cc Alerts work again , image performance improvements 
bzr-revno: 1092
 2010-10-15 17:37:02 +01:00
Andreas Preikschat
da3db82d24 Code Cleanups 
bzr-revno: 1090
 2010-10-15 16:47:16 +01:00
Tim Bentley
edbc6bf5ce Head 2010-10-15 16:38:11 +01:00
Tim Bentley
4f04bba5e6 Fix alert view bug 2010-10-15 15:43:42 +01:00
Jonathan Corwin
dc0c597243 Warn, not error, if COM Impress not available 2010-10-15 10:00:08 +01:00
Andreas Preikschat
3ae6295e21 clean ups 2010-10-15 10:35:00 +02:00
Jeffrey Smith
b89b8983f8 This is a fix for bug #659673 
bzr-revno: 1087
 2010-10-14 21:41:43 +02:00
Jeffrey S. Smith
b58eecdf63 In EasyWorship song importer, add initial support for non-latin1 encodings 2010-10-14 13:15:02 -05:00
Andreas Preikschat
c4e6b4aaac Fixed a bug in the song editor where the last added verse would revert to the previous verse type. 
bzr-revno: 1086
 2010-10-14 18:46:14 +02:00
Raoul Snyman
161a1e444a Documentation updates. 
bzr-revno: 1085
 2010-10-13 07:14:54 +02:00
Andreas Preikschat
aab9d1b2ca docs 2010-10-12 18:47:53 +02:00
Andreas Preikschat
2d00d08ccf Fix for bug #657694 (lines 8-9) 
Enhanced the code (lines 11-29)

bzr-revno: 1084
 2010-10-12 08:11:13 +02:00
Raoul Snyman
177d2d0351 More documentation updates. 2010-10-11 22:47:00 +02:00
Andreas Preikschat
0cefed0eb5 onVerseTypeComboBoxChanged 2010-10-11 19:29:03 +02:00
andreas
080a1ede33 Revised custom Dialog and new edit form 
bzr-revno: 1083
 2010-10-11 17:13:49 +01:00
Andreas Preikschat
35fdbdeee8 fix for bug #657694 and some code enhancements 2010-10-11 17:26:48 +02:00
Andreas Preikschat
034bae031a missing space 2010-10-11 09:47:55 +02:00
Raoul Snyman
3a8b33a5ff Some updates to the documentation: 
- Added some more classes to the rST files.
- Fixed up some docstrings to proper rST.
 2010-10-10 23:13:10 +02:00
Andreas Preikschat
b9b202e5a8 another fix for the merge 2010-10-10 22:19:58 +02:00
Andreas Preikschat
bf7df829d0 Make sure that the 'edit' and 'delete' buttons are disabled after editing all verses (because no verse is selected). 
bzr-revno: 1079
 2010-10-10 18:42:29 +02:00
Andreas Preikschat
65798895db A few things: 
- Finished bible "text search" (the search considers all verses which are in the database).
- Comment/doc clean ups.
- Changed "permission" to "permissions" since the database uses "permissions" (changing this is just being consequent).
- Disabled search button while searching.

bzr-revno: 1078
 2010-10-10 18:40:20 +02:00
Andreas Preikschat
373597120b fixes for merge 2010-10-10 17:59:11 +02:00
Andreas Preikschat
bab38de43e -'verse' -> 'slide' -buttons name fixes 2010-10-10 16:23:00 +02:00
Andreas Preikschat
144060a74b moved method to its old position 2010-10-10 15:29:08 +02:00
Andreas Preikschat
4dde13136c layout clean ups 2010-10-10 15:17:01 +02:00
Andreas Preikschat
3c32cb5be5 clean ups + forgotten file 2010-10-10 15:09:45 +02:00
Andreas Preikschat
421577f8ce make sure that the 'edit' and 'delete' buttons are disabled after editing all verses 2010-10-10 14:14:12 +02:00
Andreas Preikschat
842c55002a fixed broken copyright block 2010-10-09 22:00:33 +02:00
Andreas Preikschat
b97bc5fe0e head 2010-10-09 21:41:19 +02:00
Andreas Preikschat
84d0c01274 fixes for the merge proposal 2010-10-09 21:36:05 +02:00
Andreas Preikschat
de940f7ca5 first draft of new custom editor 2010-10-09 21:20:07 +02:00
Andreas Preikschat
2f99a85c4e continued save button problem 2010-10-09 14:15:31 +02:00
Andreas Preikschat
607a0d1155 - make sure the 'edit all' button is disabled when creating a new custom 
- ask if unsaved data should be saved when clicking on the save button
 2010-10-09 13:00:28 +02:00
Andreas Preikschat
2ad3f983f7 added reStructuredText back 2010-10-09 08:48:21 +02:00
Andreas Preikschat
ae015a270a added reStructuredText back 2010-10-09 08:00:50 +02:00
Jonathan Corwin
5a502475fd Head 2010-10-08 20:42:17 +01:00
Andreas Preikschat
1bf1aeacd4 minor fixes for proposal 2010-10-08 19:37:34 +02:00
Andreas Preikschat
2a21349a6e head 2010-10-08 19:07:49 +02:00
Andreas Preikschat
2e2efab2d4 tweaks 2010-10-08 19:07:14 +02:00
Philip Ridout
30c2ff400e Update File load extensions for song imports 
bzr-revno: 1073
 2010-10-08 07:16:01 +01:00
Jonathan Corwin
415f79b9ed head r1072 2010-10-07 22:49:25 +01:00
Jonathan Corwin
d6ce88959c Add the use phonon media setting 2010-10-07 22:47:17 +01:00
Tim Bentley
bccc3c56ca Fix text issues 2010-10-06 21:30:49 +01:00
Tim Bentley
c262d9ad75 Fix remote edit issue 2010-10-06 21:24:53 +01:00
Tim Bentley
16b4aa0715 fix line lenght 2010-10-06 21:10:26 +01:00
Tim Bentley
7863a2ebfc Add Service Item update from edit with config flag 2010-10-06 20:27:30 +01:00
Andreas Preikschat
59b387b9d0 replaced 'permission' with permissions since the db uses permissions 2010-10-06 16:57:38 +02:00
Andreas Preikschat
f515dc60d0 changed methods (call the db methods instead of the manager's methods) 2010-10-06 16:15:39 +02:00
Tim Bentley
39f1aa2e09 Head1071 2010-10-06 05:55:00 +01:00
Philip Ridout
274b3b9253 Removed the xml filter for OpenSong 2010-10-05 22:32:03 +01:00
Philip Ridout
40d06d492b and added some u's before "'"'s 2010-10-05 20:47:35 +01:00
Philip Ridout
e81efb84f6 Removed extension checking in wow import as this is handled by the filters in the open dialouge box. Instead, check the the header to ensure that the file is a wow song file regardless of ext. 
Corrected open song import extension.
 2010-10-05 20:41:54 +01:00
Andreas Preikschat
fa68d0d9ff text search for bibles 2010-10-05 20:44:54 +02:00
rimach
f869e0d979 replace self.text_strings with self.textStrings, fix doc string 2010-10-05 18:09:48 +02:00
rimach
1c48bfab67 Head 2010-10-05 17:26:28 +02:00
Andreas Preikschat
6ab70f1bc0 Fixed up chapter and verse comboboxes for advanced Bible search. 
A few other cleanups.

bzr-revno: 1070
 2010-10-04 08:18:35 +02:00
Philip Ridout
881cb4e3c3 Added file extension checking to words of worship import 
Added the ability for importers to specifiy file fillters, and added the relevent filters for most importers (the ones where I could easily find the file ext, still need easiworship and song beamer, and maybe a few others!)
 2010-10-03 23:28:47 +01:00
Jonathan Corwin
f331f13278 Optional phonon videos, start 2010-10-01 23:47:37 +01:00
Andreas Preikschat
f8ed4acf78 clean ups 2010-10-01 16:37:51 +02:00
Andreas Preikschat
919b07bd61 clean ups 2010-10-01 16:18:15 +02:00
Andreas Preikschat
e17f6c7c9e -disable search buttons while searching, -clean ups 2010-10-01 15:50:29 +02:00
Tim Bentley
4d3a473e91 Service Manager loading - finished 2010-09-30 21:21:45 +01:00
Andreas Preikschat
74752da694 implemented 'text search' for bibles 2010-09-30 20:40:10 +02:00
Tim Bentley
68b38aa88c fix up rest of service load updates 2010-09-30 18:07:27 +01:00
Tim Bentley
bdc924093e Update service items on service load 2010-09-30 06:12:06 +01:00
rimach
e6de575c88 Head 2010-09-30 07:04:43 +02:00
rimach
ec16298908 add missing newlines, simplify getString function, wrap long lines 2010-09-29 23:06:59 +02:00
rimach
345a94381a bugfixing 2010-09-29 22:37:52 +02:00
Andreas Preikschat
0872cefacf clean ups 2010-09-28 19:51:42 +02:00
rimach
a76dd15fbe resolve diverged branches 2010-09-27 20:34:40 +02:00
rimach
d249b2a326 changes for SongBeamer import 2010-09-27 20:17:39 +02:00
rimach
f265c552ea replace strings with text_strings 2010-09-27 20:15:55 +02:00
rimach
91544f5db1 Head 2010-09-27 06:51:32 +02:00
rimach
5049aab6d2 Changes for SongBeamer Import 2010-09-27 06:51:16 +02:00
Andreas Preikschat
52e572e94d Naming Conventions 2010-09-26 19:23:58 +02:00
Andreas Preikschat
2f1134556f veses/chapters comboBoxes now behave differently 2010-09-26 19:17:29 +02:00
Andreas Preikschat
f1fd4b6d2b Bible code tidy 
bzr-revno: 1066
 2010-09-26 15:33:11 +01:00
Andreas Preikschat
8d51d2820f rearranged methods 2010-09-26 15:38:40 +02:00
Tim Bentley
2f75087e40 Merge request cleanups 2010-09-26 09:38:11 +01:00
Tim Bentley
cc42dc34d8 Basic Theme copy and rename working 2010-09-26 08:39:50 +01:00
Tim Bentley
6351e65c1c Head193 2010-09-26 07:20:37 +01:00
Jonathan Corwin
f7b90c5a76 Fix song number/book save and load 
bzr-revno: 1061
 2010-09-25 14:03:01 +01:00
Jeffrey Smith
5d61520b6e Better handling of memo files larger than 16MiB. 
Handle blank fields more intelligently.

bzr-revno: 1060
 2010-09-25 14:54:06 +02:00
Jeffrey S. Smith
0a3dc7bff4 EW importer needs to import 'translate' before using it 2010-09-25 07:13:42 -05:00
Jeffrey S. Smith
053d73de9b Add licence block to EW importer 2010-09-25 06:58:16 -05:00
Jeffrey S. Smith
20085d0a6c Make strings used in UI translatable 2010-09-25 06:55:26 -05:00
Jonathan Corwin
3615fe5d13 Fix save/load of songnumber/book 2010-09-25 12:55:01 +01:00
Tim Bentley
a5367b647f Head 2010-09-25 08:48:02 +01:00
Tim Bentley
8f98ae9d2e Add Image cache 2010-09-25 08:45:21 +01:00
Jeffrey S. Smith
6504397662 Fix bug in reading memo files larger than 16MiB 2010-09-24 22:56:33 -05:00
Jeffrey S. Smith
4f11181bfa Return None for blank fields in the database 2010-09-24 22:55:21 -05:00
Raoul Snyman
697cc79b3a Fix bug #598805 2010-09-24 22:54:52 +02:00
Christian Richter
70f8795d61 Fixed exception thrown on unchecking 'Auto detect' in languages menu 
Fixed saving of language setting
Added pinging of review page in translation_util.py

bzr-revno: 1056
 2010-09-24 19:51:21 +02:00
Jeffrey Smith
a079e698f9 Refactor code for making song import wizard pages. 
bzr-revno: 1055
 2010-09-24 19:19:32 +02:00
rimach
53478cb707 bugfixing 2010-09-24 06:16:48 +02:00
Jeffrey S. Smith
e99ebe64c7 Replace disablable with can_disable. Change obj_prefix default 2010-09-23 14:23:56 -05:00
rimach
90fd6dec20 add SongBeamer import 2010-09-23 21:02:18 +02:00
rimach
9111a1885e add SongBeamer import 2010-09-23 21:01:52 +02:00
rimach
ef6845dad8 Head 2010-09-23 19:12:04 +02:00
Andreas Preikschat
7b47d52eca This fixes the following bugs and issues: 
- Bible items cannot be extended any more
- Dual and single Bible verses cannot be mixed (Media Manager/Service Manager)
- Bible item title in the service manager contains all bible passages (separated by a comma) bug #634533 and bug #609355
- Fixed bug #643783

bzr-revno: 1053
 2010-09-22 22:11:51 +02:00
Andreas Preikschat
6c39c3d1af clean up 2010-09-22 20:56:42 +02:00
Andreas Preikschat
15378611d8 different fixes 2010-09-22 20:46:02 +02:00
rimach
d1172e14c1 fix click/unclick 'Auto detect', fix saving of language setting 2010-09-22 20:03:10 +02:00
Jeffrey S. Smith
29cfa96ce8 Factorize code for making song import wizard pages 2010-09-22 10:01:37 -05:00
Tim Bentley
5e38d34997 Fix issues with other merges 2010-09-22 05:57:50 +01:00
Andreas Preikschat
2a4e64c9db fix for Bug #643783 2010-09-21 20:44:48 +02:00
Raoul Snyman
c235b793b0 Fix bug #644106 
Fix a related bug in the song importer.
 2010-09-21 20:12:46 +02:00
Tim Bentley
1c58fcda9f Remove print statement 2010-09-21 18:42:16 +01:00
Tim Bentley
79881d9023 Update plugin version numbers 2010-09-21 18:30:32 +01:00
Andreas Preikschat
a22dec796e typing error 2010-09-21 07:57:23 +02:00
Jeffrey S. Smith
49e6a4589c Get rid of extra blank lines and handle \{ \} \ in RTF 2010-09-20 15:58:55 -05:00
Andreas Preikschat
8b6e90ab44 tweak 2010-09-20 20:55:14 +02:00
Andreas Preikschat
137fb7417e removed code and added a dialog 2010-09-20 20:38:18 +02:00
Jeffrey S. Smith
d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
Andreas Preikschat
17b4335ee4 do not delete results when changing from keep to clear 2010-09-19 18:51:52 +02:00
rimach
23099261bd Head 2010-09-19 10:47:00 +02:00
Andreas Preikschat
bd5f82096f head + resolved conflicts 2010-09-19 07:59:38 +02:00
Christian Richter
9539e0fb22 Change OpenOffice to use pipes not sockets to resolve slow networking issue. Fix option parsing unicode problem for python 2.5 
bzr-revno: 1044
 2010-09-18 23:18:32 +01:00
Andreas Preikschat
02b46f051c changed combobox behaviour 2010-09-18 23:29:41 +02:00
rimach
86bed937f5 Remove unused lines 2010-09-18 20:56:57 +02:00
rimach
9971027e4d Head, Remove unneeded lines 2010-09-18 20:37:02 +02:00
Jonathan Corwin
93b2d54c92 String fixes 2010-09-18 16:24:39 +01:00
Raoul Snyman
1e5645995c Some more spelling/grammatical corrections. 2010-09-17 22:06:41 +02:00
Raoul Snyman
794493d0d1 Fixed bug #640460. 2010-09-17 21:02:25 +02:00
Raoul Snyman
c54450377f Attempting to solve bug #635338 
bzr-revno: 1037
 2010-09-17 16:32:07 +02:00
Andreas Preikschat
bfc3543d39 changed/removed variable 2010-09-17 14:17:50 +02:00
Andreas Preikschat
194e278581 fixed bug (forgotten %); removed unused variables 2010-09-17 14:10:41 +02:00
Andreas Preikschat
9913754df4 spelling mistake 2010-09-17 13:41:52 +02:00
rimach
399813e6aa fix for the merge comments, add correct translations for settings window 2010-09-16 23:10:36 +02:00
rimach
d2bf1fedae correct piped soffice start, fix Python2.5 problem with unicode strings in optparse 2010-09-16 23:01:44 +02:00
Raoul Snyman
a3aaf7dce8 Some fancy footwork around encodings. 2010-09-16 20:51:29 +02:00
Andreas Preikschat
5ad41ac457 tweaked methods 2010-09-16 18:57:21 +02:00
Andreas Preikschat
30ad1a3eb0 whitespace 2010-09-16 18:35:19 +02:00
Andreas Preikschat
6795c04947 added two methods 2010-09-16 18:22:23 +02:00
Martin Thompson
ec9230be38 Put comment in right place 2010-09-15 22:02:32 +01:00
rimach
5f7348ed2e Head 2010-09-15 22:51:22 +02:00
rimach
ea1321ef20 add pipe using for soffice 2010-09-15 22:51:01 +02:00
Martin Thompson
f7fafae09c Fixed merge fail 2010-09-15 21:46:16 +01:00
Martin Thompson
ebf3ce587d Tweaks from review 2010-09-15 21:12:03 +01:00
rimach
84a6c273fe Python 2.5 cant handle unicode strings in optparse 2010-09-15 20:07:08 +02:00
rimach
a308c66aa9 Python 2.5 cant handle unicode strings in optparse 2010-09-15 20:06:30 +02:00
rimach
915842a311 Head 2010-09-15 19:57:44 +02:00
rimach
3bc527e4fc bugfixing 2010-09-15 19:55:27 +02:00
Andreas Preikschat
d4ffc72c17 clean ups 2010-09-15 18:52:22 +02:00
Raoul Snyman
ef9684320c HEAD 2010-09-14 22:34:44 +02:00
Raoul Snyman
2f33ae1bab Add in code to display a disabled message if an importer is not available. 2010-09-14 22:33:33 +02:00
rimach
c53731d74b media items' __init__ methods 2010-09-14 20:34:39 +02:00
rimach
2d47e2523c remove executable flag 2010-09-14 20:18:47 +02:00
Andreas Preikschat
4aba7e3357 change bible title in service manager (NOT nice) 2010-09-14 20:07:38 +02:00
rimach
33f49f7d4a Head 2010-09-14 19:46:39 +02:00
rimach
22304d491d correct coding rules, some optimizations 2010-09-14 19:46:21 +02:00
Tim Bentley
efb58a710f Remove whitespace 2010-09-14 17:44:21 +01:00
Jon Tibble
1968803619 More cleanups 2010-09-14 15:43:21 +01:00
Jon Tibble
5fe753c833 Cleanups 2010-09-14 15:21:44 +01:00
Jon Tibble
23859bb241 Head r1030 2010-09-14 14:04:04 +01:00
Raoul Snyman
0a84fc0bcc Added extra labels to show that an item is disabled. 
Added functionality to the SongFormat class to keep track of availability of importers.
 2010-09-13 23:09:13 +02:00
Martin Thompson
a8dd0f5ddc Merged and fixed importing of 'other' verse types 2010-09-13 21:12:45 +01:00
rimach
8e8a6e42ff Head 2010-09-13 21:08:26 +02:00
Raoul Snyman
d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
rimach
9546c338fc Head 2010-09-12 23:03:45 +02:00
rimach
e2c8ee11f2 Fix removing dock with translation 2010-09-12 23:03:16 +02:00
Martin Thompson
062a88e2f2 Better handling of progress bar. Attempt to get 'other' type verses into database 2010-09-12 21:31:23 +01:00
Andreas Preikschat
6654a7993a started to rework bibles (dual/single verses) 2010-09-11 21:36:47 +02:00
Raoul Snyman
4e8f663444 Set the correct default encoding. 
Centralise decoding to a single function.
HEAD
 2010-09-11 21:00:01 +02:00
Raoul Snyman
c1ed2a76e2 Detect v1.0 database at the beginning of the import, not half way through. 
Do some detection of the encoding.
 2010-09-11 20:51:27 +02:00
Tim Bentley
0412fca642 Remove execuitable flag 2010-09-11 13:42:50 +01:00
rimach
5b32a9f6a9 Head 2010-09-10 21:23:20 +02:00
rimach
6d7e7d7ad2 hopefully Line ending corrected and resolve merge conflict, part2 2010-09-10 21:21:14 +02:00
rimach
2b700c481f hopefully Line ending corrected and resolve merge conflict 2010-09-10 20:46:04 +02:00
Jonathan Corwin
02abcf24fc Head 2010-09-10 18:52:22 +01:00
rimach
d4cabf9693 move translations from mediamanager to plugins with dict 2010-09-10 17:50:30 +02:00
rimach
fa328945d3 Head 2010-09-09 23:12:02 +02:00
Jonathan Corwin
81a1cfc815 Tidy up versetag counting 2010-09-09 20:34:45 +01:00
Raoul Snyman
1dcf3a2769 jQuery-fied the JavaScript, made the interface look a little prettier. 
bzr-revno: 1023
 2010-09-09 21:01:23 +02:00
Derek Scotney
efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +02:00
Raoul Snyman
158c612cf9 Fixed up the styles a little, and sync'ed to HEAD. 2010-09-08 22:38:37 +02:00
rimach
8da2009413 Head 2010-09-08 20:40:19 +02:00
Tim Bentley
b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Raoul Snyman
b8893f4ab2 Merge in the openlp.org 1.x importer. 
bzr-revno: 1017
 2010-09-08 06:57:13 +02:00
rimach
8bdedae911 Head 2010-09-07 23:04:13 +02:00
Tim Bentley
1dd5ee185c Fix song editing bug 
bzr-revno: 1016
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 19:41:09 +01:00
Tim Bentley
4c648f142c Fix song editing display bug 
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 17:12:47 +01:00
Raoul Snyman
60fa82b78c Fix bug #598805 2010-09-07 15:23:02 +02:00
Raoul Snyman
f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman
63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Martin Thompson
c25b0aa8ff Test for multi character versetypes 2010-09-06 21:37:22 +01:00
Raoul Snyman
f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Martin Thompson
db118196a5 test_opensong passes again 2010-09-06 20:56:20 +01:00
Martin Thompson
53dc52c7c8 merged 2010-09-06 20:43:37 +01:00
Martin Thompson
2ae4c5a1b1 Merged 2010-09-06 20:42:39 +01:00
Raoul Snyman
5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Raoul Snyman
035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Raoul Snyman
08e97a67cb More string fixes and updates from Pootle. 2010-09-06 06:53:48 +02:00
rimach
44806ff859 Head 2010-09-05 23:04:25 +02:00
Jonathan Corwin
aa0f4f7af0 Finish wizard integration 2010-09-05 16:16:48 +01:00
Jonathan Corwin
3d550e383c Head 2010-09-05 15:18:38 +01:00
Tim Bentley
e2c117034a Fix up bug for bible settings of duel drop down 
Fixes: https://launchpad.net/bugs/629848
 2010-09-04 20:40:28 +01:00
Tim Bentley
da64f5147c Head1011 2010-09-04 19:14:51 +01:00
Raoul Snyman
a44ae94de7 HEAD 2010-09-04 19:53:10 +02:00
Raoul Snyman
2901c79ed6 Start work on the openlp.org 1.x importer. 
Add a couple of fixes to the song import.
Add a few fixes to the OpenSong importer.
 2010-09-04 19:51:41 +02:00
Tim Bentley
20844c8d28 Fix CCLI for songs 
Fixes: https://launchpad.net/bugs/622894
 2010-09-04 18:39:03 +01:00
Philip Ridout
163bf9d2f4 Corrected one line that was missed (not by me :-p) 2010-09-04 15:26:04 +01:00
Tim Bentley
04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
rimach
95ffc8dd3b add translation code for MediaDocks and PluginList 2010-09-04 00:51:28 +02:00
Jon Tibble
9fa6039557 Head r1006 2010-09-03 21:08:38 +01:00
Raoul Snyman
5432daae57 Fix for bug #621695. 
bzr-revno: 1004
 2010-09-03 08:29:29 +02:00
Andreas Preikschat
b138a4c1e8 Improved dual Bible handling, fixed some edge-case bugs, including bug #625997. 
bzr-revno: 1003
 2010-09-03 08:26:43 +02:00
Raoul Snyman
a37fafa722 Fix the name of the keyword argument. 2010-09-03 07:33:03 +02:00
Jon Tibble
da658e8850 Silly space 2010-09-03 00:20:35 +01:00
Martin Thompson
84bff09d03 REmoved prints 2010-09-02 21:30:01 +01:00
Martin Thompson
11a9d3d8f5 Handles versetypes like 'V3a' 2010-09-02 21:21:31 +01:00
Martin Thompson
192010588f Test for & in authors 2010-09-02 20:43:28 +01:00
Raoul Snyman
df007a438e Fixed double-spacing 2010-09-02 12:53:50 +02:00
Derek Scotney
56b5a037ae Conflicts resolved 2010-09-01 22:20:27 +02:00
Derek Scotney
9ed0df5023 Removed unnecessary commented out lines 2010-09-01 21:31:16 +02:00
Derek Scotney
ce73d86e0a More code convention corrections 2010-09-01 21:27:45 +02:00
Andreas Preikschat
cadfefe616 opps.. forgot the %s 2010-09-01 21:22:55 +02:00
Andreas Preikschat
b21e164fd3 added permission to footer 2010-09-01 19:54:10 +02:00
Andreas Preikschat
80851ddfc4 added permission, changed formattig 2010-09-01 19:27:38 +02:00
Philip Ridout
7e0245344a Adding the Words of Worship importer. 
bzr-revno: 1001
 2010-09-01 07:11:31 +02:00
Martin Thompson
b4cfea211e Import completely unlabelled songs. Import unreferenced verses 2010-08-31 20:49:57 +01:00
Derek Scotney
5734c3052a Code convention corrections 2010-08-31 21:01:55 +02:00
Andreas Preikschat
60ced9e184 moved some code 2010-08-31 20:28:21 +02:00
Derek Scotney
83c5ee3450 Removed openlp/plugins/songs/lib/.directory 2010-08-30 22:42:07 +02:00
Martin Thompson
733bedebe8 Passes first tests again 2010-08-30 21:19:16 +01:00
Derek Scotney
590aef4a87 Corrected docstring lengths 2010-08-30 20:32:00 +02:00
Raoul Snyman
2d9b39986a Some more fixes for the OpenSong import. 2010-08-29 22:05:36 +02:00
Derek Scotney
d3ee43965f Change comments to reStructuredText format 2010-08-29 20:24:09 +02:00
Raoul Snyman
130e315333 HEAD 2010-08-29 19:54:36 +02:00
Andreas Preikschat
31aba2eadb removed commented lines, name change 2010-08-29 18:20:56 +02:00
Andreas Preikschat
1911972177 head 2010-08-29 15:07:10 +02:00
Andreas Preikschat
9fc45065fc removed unnecessary line 2010-08-29 14:58:40 +02:00
Andreas Preikschat
87db3e98e6 clean ups, tweaks, fixed 625997 2010-08-29 14:49:45 +02:00
Jon Tibble
9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Raoul Snyman
59d2e2dab6 Fixed up the OpenSong importer. 2010-08-29 01:09:05 +02:00
Philip Ridout
271bbe22b2 Made the constants more like constants! 2010-08-28 21:46:03 +01:00
Jon Tibble
0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Raoul Snyman
7fcd2512ce HEAD 2010-08-28 21:49:12 +02:00
Andreas Preikschat
beaac2d923 removed everything which cannot work 2010-08-28 21:41:06 +02:00
Jon Tibble
168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble
066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Andreas Preikschat
37b2b1bb9d clean up 2010-08-28 21:28:50 +02:00
Andreas Preikschat
de3659bc92 commented everything out, which cannot work (currently) 2010-08-28 21:17:52 +02:00
Andreas Preikschat
521b06ee8c clean up - not working 2010-08-28 20:56:46 +02:00
Andreas Preikschat
36e2f2e33f fixed stuff messed up resolvesing the conflict 2010-08-28 19:32:44 +02:00
Andreas Preikschat
14dbfaa4b5 fixed stuff messed up resolvesing the conflict 2010-08-28 19:10:14 +02:00
Andreas Preikschat
8071a65720 head 2010-08-28 19:05:45 +02:00
Tim Bentley
618813f020 Display and renderer changes 
bzr-revno: 997
 2010-08-28 17:35:16 +01:00
Tim Bentley
5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Derek Scotney
81b53ee21b Changs to comment formatting 2010-08-28 15:27:17 +02:00
Derek Scotney
676cc9305c Changes to CCLI file importer to work with import wizard 2010-08-28 15:17:27 +02:00
Derek Scotney
80ded239a8 Changes to CCLI file importer to work with import wizard 2010-08-28 15:15:12 +02:00
Philip Ridout
f712ccca50 Signal fix as mentioned by Meths 2010-08-28 03:51:29 +01:00
Jon Tibble
000d23f7c6 Cleanup long lines 2010-08-28 02:31:11 +01:00
Jon Tibble
bb31492609 Fix song maintenance as subform (Bug #612282) 2010-08-27 23:49:27 +01:00
Philip Ridout
1611251ec2 and an empty line at the end 2010-08-27 21:18:48 +01:00
Philip Ridout
e4f4626f04 shortened some long lines. 2010-08-27 21:14:23 +01:00
Philip Ridout
4e059f8cc5 Forgot to add the wowimport.py file 2010-08-27 21:02:59 +01:00
Philip Ridout
6b6da86c54 wow_import implemented in to import wizard 
bug fix in wizzard, so that it starts from the first page if used previously
bux fix in importer, so that it resets the defualts after commiting a song to the db
 2010-08-27 20:53:22 +01:00
Jon Tibble
6266c3369e Cleanup the OpenLPv2 song importer 2010-08-27 16:25:29 +01:00
Jonathan Corwin
f717dc10d4 Bring up to date 2010-08-26 23:08:09 +01:00
Jonathan Corwin
1c66c7cd2c Head 2010-08-26 22:34:34 +01:00
Jonathan Corwin
ea2419924c progressbar 2010-08-26 22:32:31 +01:00
Raoul Snyman
3d60cc894d Added the initial openlp.org 1.x importer. 2010-08-26 22:53:24 +02:00
Raoul Snyman
dfe8bbae9c Some minor syntactic sugar. 2010-08-26 22:52:54 +02:00
Derek Scotney
ab7cd33c8d Updates to CCLI handling 2010-08-26 21:45:09 +02:00
Tim Bentley
ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Jon Tibble
53295b08e0 Cleanups and a version check fix 
bzr-revno: 992
 2010-08-26 14:45:56 +01:00
Raoul Snyman
8c27f92ee3 Fix a string. 2010-08-26 07:52:30 +02:00
Jon Tibble
06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley
492389b715 Head990 2010-08-25 18:08:36 +01:00
Raoul Snyman
8b141b0942 Fixed the couple of issues Jon T. pointed out. 2010-08-24 21:08:57 +02:00
Tim Bentley
b2234ae269 Remove Unused variables 2010-08-24 17:39:51 +01:00
Raoul Snyman
78889633f6 Changed incrementProgressBar again slightly so that passing a blank string or None to the text will not update the text. 2010-08-24 17:31:33 +02:00
Raoul Snyman
70cd4bc700 Added an extra argument to the incrementProgressBar function so that an increment can be specified (like 0, if you don't want an increment). 2010-08-24 17:28:45 +02:00
Raoul Snyman
25f6bb33e7 Made changes suggested/requested by Jonathan C. 2010-08-24 17:25:26 +02:00
Jonathan Corwin
0066edecbb Remove comments 2010-08-24 13:50:26 +01:00
Raoul Snyman
788e8a2b55 Fixed a problem with the getListOfFiles function which was returning a list of repr'd QListWidgetItems instead of a list of strings. 
Made a SongFormat.ccli -> SongFormat.CCLI after renaming some fields caught this too.
 2010-08-24 10:08:07 +02:00
Jonathan Corwin
2c3e732453 SongImport.__init__() 2010-08-23 22:52:21 +01:00
Raoul Snyman
ef44dc72c6 Changed the Generic importer to multifile as well. 2010-08-23 21:29:39 +02:00
Derek Scotney
0f7fb002b4 Added SongSelectFileImport to source control 2010-08-23 19:42:59 +02:00
Raoul Snyman
6d0b229860 Merge from HEAD. 
Add file I forgot to add previously.
Change Songs Of Fellowship importer to multi-file.
 2010-08-23 19:36:42 +02:00
Jonathan Corwin
8b79abdfe6 sof wizard 2010-08-22 23:36:11 +01:00
Raoul Snyman
530530d791 Got the song wizard working. Pity none of the importers seems to work at the moment. 2010-08-22 21:50:30 +02:00
Tim Bentley
a4e58c3349 Finish off spelling and tags for Custom and Song dialogs 2010-08-22 09:27:08 +01:00
Tim Bentley
f705b69e20 Spellchecking of songs and custom 2010-08-22 08:05:05 +01:00
Tim Bentley
9f4066bf3f More fixes and update song editing 2010-08-21 20:35:32 +01:00
Derek Scotney
54736fdac0 Implementation of SongSelect file import 2010-08-21 17:33:31 +02:00
Tim Bentley
1e86aa98ba Fix theme text weight and html tag cleanups 2010-08-21 07:00:46 +01:00
Raoul Snyman
3d478ec975 Song Wizard! 2010-08-20 21:40:07 +02:00
Tim Bentley
def949fc9a Head987 2010-08-20 19:14:58 +01:00
Andreas Preikschat
5a22e67346 clean up 2010-08-18 17:04:16 +02:00
Andreas Preikschat
1b1261a1a4 - improved usage of different bibles and/or books in one service item 2010-08-15 17:35:20 +02:00
Andreas Preikschat
30e867e020 - rework 
- improved usage of different bibles
 2010-08-15 16:49:07 +02:00
Andreas Preikschat
a043407e25 Dual bible fixes 
bzr-revno: 987
 2010-08-11 20:47:24 +01:00
Andreas Preikschat
c41bb80a95 made lines more readable 2010-08-10 18:49:52 +02:00
Andreas Preikschat
df8b064058 made lines more readable 2010-08-10 18:48:10 +02:00
Andreas Preikschat
47125ba600 made lines more readable 2010-08-10 18:44:04 +02:00
Andreas Preikschat
403ee4cd53 more convenient names 2010-08-08 20:05:33 +02:00
Raoul Snyman
d992fb1e07 First add and delete buttons working! 2010-08-08 16:38:51 +02:00
Andreas Preikschat
24de78680e cleanup 2010-08-06 09:23:32 +02:00
Andreas Preikschat
719268f121 cleanup 2010-08-06 09:07:20 +02:00
Andreas Preikschat
3bee58e314 'if' not necessary 2010-08-06 09:00:34 +02:00
Andreas Preikschat
60b179b2ed improved single and dual bible usage in one service item 2010-08-05 21:32:58 +02:00
Tim Bentley
6d352df382 Video cleanups 2010-08-04 20:09:43 +01:00
Andreas Preikschat
e6f0fde98d tweaks and cleanups 2010-08-04 10:02:52 +02:00
Tim Bentley
821911503e Alerts now work 2010-08-04 05:59:41 +01:00
Tim Bentley
f3e62c9f14 Bible text display cleanups 2010-08-03 20:23:05 +01:00
Andreas Preikschat
444a219a20 removed unused list 2010-08-03 19:17:09 +02:00
Andreas Preikschat
6df4e2cfef continued fixing + cleaned my work up 2010-08-03 19:04:08 +02:00
Andreas Preikschat
b3d17de18a fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:49:04 +02:00
Andreas Preikschat
569377e7d0 fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:46:12 +02:00
Tim Bentley
9539e5b2a6 Head986 2010-08-03 05:56:33 +01:00
Andreas Preikschat
778388b2ae search result are dependent (in regard to 2nd bible) 2010-08-02 22:03:20 +02:00
Tim Bentley
9bdc7db801 Fixes 2010-08-02 20:23:39 +01:00
Andreas Preikschat
06752ffa66 show both bible versions in the title 2010-08-02 21:11:05 +02:00
Tim Bentley
9da35664bb Fix up songusage 2010-08-02 20:05:40 +01:00
Tim Bentley
4e0a3ca40b Fix song usage missing code 2010-08-02 18:51:44 +01:00
Tim Bentley
992cebb05c Head984 2010-08-01 16:48:26 +01:00
Andreas Preikschat
839d5da3ef Disable buttons when no item to act on 
bzr-revno: 984
 2010-08-01 16:32:09 +01:00
Tim Bentley
047e8efe1f Head982 2010-08-01 09:44:58 +01:00
Jon Tibble
65c95057b7 Fix alerts and screen resizing 
bzr-revno: 982
 2010-08-01 09:35:17 +01:00
Tim Bentley
fb4bd1a8c2 Head981 2010-08-01 09:30:42 +01:00
Tim Bentley
f10e478438 Alert workings 2010-08-01 09:28:31 +01:00
Jon Tibble
4b0093e97b Fix alerts width 2010-07-31 23:23:48 +01:00
Andreas Preikschat
23022c095d improved button behaviour 2010-07-31 13:52:17 +02:00
Philip Ridout
f6e91b4198 A very minor presentation fix. About text for remotes was not going on to next line after heading. 
bzr-revno: 981
 2010-07-31 12:57:12 +02:00
Jon Tibble
c9edfb9508 Cleanup QMessageBoxes using defaults 2010-07-31 03:06:44 +01:00
Jon Tibble
8eb7fd4c30 Fix alert form parenting 2010-07-31 01:46:15 +01:00
Jon Tibble
8f0d30c48b Fix plugin forms 2010-07-31 01:34:37 +01:00
Jon Tibble
ab3efd2b3b Fix issues with plugins (inc. bug #605655) 2010-07-31 01:05:27 +01:00
Philip Ridout
a36f922be6 A very minor presentation fix. About text for remotes was not going on to next line after heading. 2010-07-30 23:12:04 +01:00
Tim Bentley
e95ea60d9b Alerts start to work 2010-07-30 20:15:55 +01:00
Tim Bentley
c46dfab8a1 Head979 2010-07-30 19:02:57 +01:00
Tim Bentley
0518f4987a Bibles do not loop 2010-07-30 19:02:03 +01:00
Tim Bentley
50691074b8 Head978 2010-07-30 18:49:55 +01:00
Jon Tibble
003cfd1e68 Fix unused var and standardise loop vars 2010-07-30 17:13:17 +01:00
Jon Tibble
9df8cb11f9 Fix doc text location 2010-07-30 13:04:15 +01:00
Tim Bentley
b191f1391c Fixed shadows and added transitions 2010-07-30 06:08:49 +01:00
Jon Tibble
26bae2e35b Fix message parenting 2010-07-29 16:10:40 +01:00
Jon Tibble
7729ba3ced Bible reference error message 2010-07-29 16:04:09 +01:00
Jon Tibble
fc849398a9 Bible reference refactor 2010-07-29 15:36:02 +01:00
Tim Bentley
b7c241cf36 Outline works - Irsh shadow 2010-07-28 18:21:32 +01:00
Tim Bentley
ca0c98e72e Head974 2010-07-28 17:58:34 +01:00
Jon Tibble
c099e6f808 Naming cleanup 2010-07-28 14:32:12 +01:00
Jon Tibble
2bd442ff4f More naming cleanup 2010-07-28 14:15:39 +01:00
Jon Tibble
b350356c35 Head r976 2010-07-28 12:52:36 +01:00
Philip Ridout
73650e6536 Moved loop delay on to the general tab from the image tab, as it was being used in songs and custom slides as well. 
Deleted image tab, as the loop delay was the only setting on it!
 2010-07-27 21:35:50 +01:00
Tim Bentley
44fd8f31e0 Head974 2010-07-27 19:54:53 +01:00
Tim Bentley
059af571c0 Alerts part 1 2010-07-27 19:42:53 +01:00
Jon Tibble
db87a9e7dd Exception handling fixes in bible import 2010-07-27 16:07:00 +01:00
Jon Tibble
dfcd2f6293 Explicit exception handling 
bzr-revno: 974
 2010-07-27 16:01:06 +01:00
Jon Tibble
d0fa9228a8 Head r972 2010-07-27 13:56:03 +01:00
Jon Tibble
cc38e0f367 Explicit exception catching 2010-07-27 13:54:26 +01:00
Jon Tibble
88be71f625 Missing bits 2010-07-27 12:42:38 +01:00
Jon Tibble
9482b40b8c EditCustom & SongUsage naming 2010-07-27 12:21:11 +01:00
Jon Tibble
37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Jon Tibble
5ae5a5d63f Fix showing screen after black and cleanups 
bzr-revno: 972
 2010-07-27 07:58:35 +01:00
Raoul Snyman
6abb0c7cc3 Fixed a small bug where there was a "u" in the verse label with () brackets. 
bzr-revno: 971
 2010-07-27 07:31:35 +02:00
Jon Tibble
16924808bd Fixes and cleanups 2010-07-26 21:31:05 +01:00
Tim Bentley
271a5f598f Head970 2010-07-26 17:42:36 +01:00
Tim Bentley
2cde65ba70 html cleanup - text over video works 2010-07-26 17:42:19 +01:00
Jon Tibble
37d2e910b7 Long lines 2010-07-26 16:19:11 +01:00
Raoul Snyman
2ef095dd98 Fixed a small bug where there was a "u" in the verse label with () brackets. 2010-07-26 08:06:17 +02:00
Jon Tibble
96033624aa Head r968 2010-07-25 12:47:53 +01:00
Tim Bentley
fbe647b896 Head968 2010-07-25 10:03:01 +01:00
Raoul Snyman
f6c5a9788c Update the copyright notice and the credits. 
bzr-revno: 967
 2010-07-25 10:21:02 +02:00
Tim Bentley
9efad8da66 Head966 - and fix mediaitem 2010-07-25 07:21:29 +01:00
Jon Tibble
69ffb9124e Fix some pesky bits 2010-07-25 00:12:36 +01:00
Raoul Snyman
2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Raoul Snyman
81441f3e79 Remove some unused imports. 
Remove an unused variable.
Fix up a couple of strings I missed in the previous string fix merge.
 2010-07-24 23:20:02 +02:00
Jon Tibble
6e6d44710f Head r965 2010-07-24 22:03:58 +01:00
Jon Tibble
7df342ff1a Fix bible search strictness for web bibles 2010-07-24 21:52:37 +01:00
Raoul Snyman
d29ffb72c5 Going through all the strings and making them decent, user-friendly English. 
bzr-revno: 965
 2010-07-24 22:34:16 +02:00
Tim Bentley
ec788f33c9 Head964 2010-07-24 17:56:02 +01:00
Jon Tibble
87fc38fb6f Head r964 and book spelling 2010-07-24 17:54:55 +01:00
Jon Tibble
3ea6ce9520 Use urllib.urlencode() 2010-07-24 15:03:04 +01:00
Jon Tibble
4b5ad13eec Fix numbered book BG bibles 2010-07-24 13:59:02 +01:00
Jon Tibble
8004bc4c18 Import fix for last commit 2010-07-24 03:19:24 +01:00
Jon Tibble
323090e141 Bible search fixes (Bug #608409) 2010-07-24 03:14:08 +01:00
Jon Tibble
ccda22a962 Fix BG refactor 2010-07-24 02:10:57 +01:00
Raoul Snyman
651ee535f6 Hopefully the last of the string fixes. 2010-07-23 21:17:36 +02:00
Raoul Snyman
3c303365b1 HEAD 2010-07-23 20:07:27 +02:00
Raoul Snyman
2b7d7f3ba5 More string updating. 2010-07-23 20:03:19 +02:00
Jon Tibble
c8c65120cf Head r963 2010-07-23 17:33:03 +01:00
Jon Tibble
9b425cb52d Fix BibleGateway refactor 2010-07-23 17:21:27 +01:00
Jon Tibble
1ea37f8d77 Cleanup refactor 2010-07-23 16:25:54 +01:00
Jon Tibble
c1ddaa2dd1 DocStrings 
bzr-revno: 963
 2010-07-23 12:17:18 +01:00
Raoul Snyman
60e1c7002e More string fixes. 2010-07-23 11:01:17 +02:00
Tim Bentley
b76a946bff Head961 2010-07-23 06:06:42 +01:00
Jon Tibble
e9edb0c7a4 Refactor BibleGateway retrieval 2010-07-23 03:19:35 +01:00
Jon Tibble
b5ceb59e27 Cleanup getters and setters 2010-07-23 01:01:06 +01:00
Jon Tibble
150968dd05 Head r961 2010-07-22 23:54:23 +01:00
Tim Bentley
4761589d0c Head960 2010-07-22 19:09:35 +01:00
Jonathan Corwin
efdc2bcb0d Presentations no longer startup blanked 2010-07-22 08:32:55 +01:00
Jonathan Corwin
d628956c1a Bug 608149 - Enable presentation controllers by default, and simplify default workflow 
bzr-revno: 960
 2010-07-22 08:00:32 +01:00
Raoul Snyman
2c7fcef2af More string updated. 2010-07-22 08:02:31 +02:00
Raoul Snyman
935d6602e5 HEAD 2010-07-22 07:26:19 +02:00
Jon Tibble
d232133b35 Remove wildcard import 2010-07-22 01:39:00 +01:00
Jon Tibble
d2372850e4 DocStrings 2010-07-22 01:28:56 +01:00
Jonathan Corwin
475bab8215 [Bug 608149] [NEW] Presentations are not intuitive 2010-07-21 23:46:25 +01:00
Jon Tibble
5178172c80 Importer fix 
bzr-revno: 959
 2010-07-21 23:42:17 +01:00
Tim Bentley
225ef69b0d Head 2010-07-21 21:07:51 +01:00
Jon Tibble
66fcf1db40 Another importer fix 2010-07-21 14:41:10 +01:00
Andreas Preikschat
5b0ca457a1 Fix song authors and books 
bzr-revno: 958
 2010-07-21 14:31:25 +01:00
andreas
c4a59586a6 improvement + fix 2010-07-21 15:13:03 +02:00
Jon Tibble
cf02c71001 Fix v2 song DB importing 2010-07-21 13:11:32 +01:00
andreas
2691636e71 fixed Song Book publisher 
fixed Authors like "0123hallo" which cannot be splitted
 2010-07-21 12:30:29 +02:00
Raoul Snyman
2efb7cd34a Update more strings, and just tweak the display of the remotes plugin settings tab. 2010-07-21 08:24:32 +02:00
Raoul Snyman
33fa1541a7 HEAD 2010-07-21 07:20:30 +02:00
Raoul Snyman
7ec7235676 Updated more strings and things. 2010-07-21 07:20:03 +02:00
Jon Tibble
3560277684 Cleanups 2010-07-20 21:43:42 +01:00
Tim Bentley
85c40e4e16 Head956 2010-07-20 21:17:12 +01:00
Jon Tibble
425b80d57a DATABASE SCHEMA CHANGE, fixes and cleanups 
bzr-revno: 956
 2010-07-20 20:46:04 +01:00
Jon Tibble
ee4802735d Fix topic/author adding (Bug #607034) 
bzr-revno: 955
 2010-07-20 18:03:04 +01:00
andreas
99fc77d4dc head953 2010-07-20 18:45:45 +02:00
Jon Tibble
cb431fea2a Fix song object creation (Bug #607034) 2010-07-20 16:22:05 +01:00
Jon Tibble
cb17897d47 Media rather than Audio 2010-07-20 13:43:21 +01:00
Jon Tibble
1738040b87 Save Song Book (Bug #607030) 2010-07-20 12:02:03 +01:00
Jon Tibble
a4bbb0ef28 Clarify import type 2010-07-20 10:21:15 +01:00
Jon Tibble
11c90c3eb7 Fix song book form ampersands 2010-07-20 09:37:15 +01:00
Jon Tibble
7e623ea226 OpenLP v2 song DB importer 2010-07-20 09:33:22 +01:00
Tim Bentley
e31a039568 Head952 and cleanups 2010-07-20 06:16:06 +01:00
Raoul Snyman
71ee0eff8c HEAD 2010-07-20 06:58:20 +02:00
Raoul Snyman
35bcb8eabd HEAD 2010-07-20 06:58:01 +02:00
Jon Tibble
80eb8e36af Import fix 2010-07-19 21:48:10 +01:00
Jon Tibble
42cff45762 Complete refactor for new code 2010-07-19 21:45:53 +01:00
Jon Tibble
7691418bc3 Head r952 and cleanups 2010-07-19 21:43:02 +01:00
Andreas Preikschat
a266a54641 Cleanups and song data merging 
bzr-revno: 952
 2010-07-19 21:30:45 +01:00
Tim Bentley
c5e8a4cdab Tidy up image background workflow and make it work 2010-07-19 21:05:25 +01:00
Martin Thompson
acb9cca5d3 Missed a rename 2010-07-19 20:35:33 +01:00
andreas
978372ca9f added check preventing adding a topic/author twice to the song 2010-07-19 20:34:03 +02:00
Jon Tibble
86ad4b1071 Fix DB definition ordering 2010-07-19 16:39:42 +01:00
andreas
6eb260a64e fix 2010-07-19 17:03:49 +02:00
andreas
dd662dc277 now filtering songs 2010-07-19 16:56:24 +02:00
andreas
a21154addc names 2010-07-19 15:39:18 +02:00
Jon Tibble
9e2b876be3 Add audio files to DB 2010-07-19 13:18:56 +01:00
andreas
30cbaafb09 fixed comment 2010-07-19 12:17:41 +02:00
andreas
3502149556 reworked code 2010-07-19 10:50:44 +02:00
Jon Tibble
dd8c6f378b Fix alt title field 2010-07-19 09:50:16 +01:00
andreas
1a462e1a65 reverted changes 2010-07-19 09:54:57 +02:00
andreas
6ab287cfaa reverted changes 2010-07-19 09:54:22 +02:00
andreas
2009e95ff0 head 2010-07-19 09:51:20 +02:00
Jon Tibble
f71f27c890 Database refactor 2010-07-19 00:37:24 +01:00
Martin Thompson
cd7f0167a1 Merged from trunk - handle lack of getters/setters in songimport through direct attribute use 2010-07-18 20:44:49 +01:00
Martin Thompson
168aeea3e1 Tweaks from review 2010-07-18 20:27:27 +01:00
Jon Tibble
bf71742308 Head r950 2010-07-18 15:36:59 +01:00
Jon Tibble
f964c5d1ce Add alternate_title field 2010-07-17 18:36:03 +01:00
andreas
d0e914a681 name standardisation + reloads song list after author(s) have been edited/merged 2010-07-17 18:03:59 +02:00
andreas
c7f32e280c docs 2010-07-17 17:10:46 +02:00
andreas
f458f80ce2 added check to prevent an author/topic being associated (with one song) twice (causing an error) 2010-07-17 17:01:47 +02:00
andreas
dacfe58bea continued working on 'merging' song books, topics, authors (still not finished) 2010-07-17 13:49:54 +02:00
andreas
94660ee798 continued working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-17 11:55:48 +02:00
andreas
b844687abd head947 2010-07-17 11:27:45 +02:00
Tim Bentley
f45625ac92 Head 2010-07-17 09:59:29 +01:00
Jon Tibble
096e0e8b61 Fixes and cleanups 2010-07-16 23:36:53 +01:00
Jon Tibble
c7904f613e Fix set_last_dir call 2010-07-16 22:32:36 +01:00
Jon Tibble
c7a8bbee8b More getters and setters 2010-07-16 22:26:57 +01:00
Jon Tibble
5097cbaf9c Start cleaning getters and setters 2010-07-16 22:06:10 +01:00
Jon Tibble
65d5f89302 Fix English and alignment 2010-07-16 19:53:49 +01:00
andreas
1f3656f792 continued working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 20:20:18 +02:00
Jon Tibble
e83cb035ac Tab Order and Theme fix (Bug #606256) 
bzr-revno: 946
 2010-07-16 17:43:02 +01:00
andreas
fedde147ae started working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 18:39:18 +02:00
Tim Bentley
53c6e93d08 Fix conflict in head945 2010-07-16 17:03:00 +01:00
andreas
e11ebea963 error messages changes 2010-07-16 15:22:53 +02:00
Jon Tibble
897929967a Add Theme fix and form tab ordering 2010-07-16 13:31:47 +01:00
andreas
84416b0bdc head944 2010-07-16 11:25:01 +02:00
andreas
853ae906d3 reverted changed done before we official changed line length from 79 to 80 2010-07-16 11:09:11 +02:00
andreas
eaf2f568f4 error messages added 2010-07-16 11:00:20 +02:00
Jon Tibble
96ed86a13a Use populate() for DB objects 2010-07-15 23:45:55 +01:00
Martin Thompson
059032f237 Changed internal 'song' attribute to clearer 'song_import'. OpenSong themes now map to Topics. Text cleaning called 2010-07-15 21:29:24 +01:00
Martin Thompson
bb34a304a9 Tweaked Topics handler 2010-07-15 21:27:44 +01:00
Martin Thompson
294a02af45 Renamed back and fixed a couple of = signs 2010-07-15 21:26:57 +01:00
Martin Thompson
222f10ba45 Now fixed the trunk merge 2010-07-14 21:52:45 +01:00
Martin Thompson
76a731c725 Merged from trunk 2010-07-14 21:47:40 +01:00
Martin Thompson
490e2451e0 spaces 2010-07-14 21:46:23 +01:00
Martin Thompson
d54770646d Rename cclino to ccli_number and theme to theme_name in all song import related files 2010-07-14 21:38:46 +01:00
Martin Thompson
0f4c7276b3 Using new manager 2010-07-14 21:10:27 +01:00
Jon Tibble
b5f667fe51 Fix theme editing (Bug #594909 part 1) 
bzr-revno: 938
 2010-07-13 19:32:29 +01:00
Jon Tibble
767214bb13 Proper theme name editing (Bug #594909) 2010-07-12 22:11:00 +01:00
Tim Bentley
4d69120225 Head 2010-07-12 18:14:04 +01:00
Tim Bentley
a071dcc879 Head 2010-07-12 18:13:59 +01:00
Andreas Preikschat
13c0496553 Improve song data integrity 
bzr-revno: 934
 2010-07-12 17:48:54 +01:00
andreas
75f9f809a8 use database for checking 2010-07-12 15:18:07 +02:00
Jon Tibble
4bffb39567 Import fixes 2010-07-12 11:59:48 +01:00
Jonathan Corwin
bff74507d7 Coding standards 2010-07-11 21:53:53 +01:00
Jonathan Corwin
fe5b3e6771 pptview/impress fixes to thumbnails on Windows 2010-07-11 21:22:53 +01:00
Tim Bentley
19400843d4 Renderer replacement- text now output and pages 2010-07-11 17:02:20 +01:00
andreas
488ead8162 cleanup 2010-07-11 15:23:12 +02:00
Jonathan Corwin
fb4faf0dbb Powerpoint fix 2010-07-10 23:41:36 +01:00
Jonathan Corwin
08c36f7e1c Got a conflict fix wrong 2010-07-10 23:33:09 +01:00
Jonathan Corwin
968eaad46a Head 2010-07-10 23:28:59 +01:00
Jonathan Corwin
91b3c06849 Missed one 2010-07-10 23:21:50 +01:00
Jonathan Corwin
27bccda0b6 Presentation thumbnail changes 2010-07-10 23:21:14 +01:00
andreas
0623d2bb4e fixes for merge 2010-07-10 23:44:43 +02:00
andreas
931f572a4e spelling mistakes 2010-07-10 23:39:54 +02:00
andreas
ab179f8e12 fixes for merge 2010-07-10 23:26:09 +02:00
andreas
d6fe2d1c9f oppps... spelling 2010-07-10 20:19:54 +02:00
andreas
639ce2bfbc fixed double whitespace 2010-07-10 19:30:01 +02:00
andreas
1b536ab0c8 Books, Topics and Authors redundancy imporvements. 2010-07-10 19:02:42 +02:00
Jon Tibble
60b5568979 Fix bug then fix fix! (Bug #603798) 2010-07-10 02:01:14 +01:00
Martin Thompson
bd6337af0d Changed opensong import file extension to All files *.* 2010-07-09 19:17:48 +01:00
Martin Thompson
3c21924e03 Fixed some coding stds. HAndles unnumbered choruses etc by putting a '1' on the end. Strip out page and column breaks. Theme and CCLI no currently not imported correctly 2010-07-09 19:08:03 +01:00
Jon Tibble
f1f5a61ef6 build_icon fixes 2010-07-09 12:26:31 +01:00
Jon Tibble
520d0ea36f Head r926 2010-07-08 14:50:06 +01:00
andreas
1ef947c4fc name fix 2010-07-08 14:38:48 +02:00
andreas
f514bfc1ba coding standard fixes 2010-07-08 14:32:09 +02:00
Jon Tibble
7a65d5ff08 Fix build_icon patch 2010-07-08 13:25:17 +01:00
andreas
f09843e55b import menu fixes 2010-07-08 14:19:22 +02:00
Jon Tibble
1b9830429b Use build_icon 2010-07-08 12:46:03 +01:00
Jon Tibble
cea09a4214 Remove dead code 2010-07-08 11:26:52 +01:00
Jon Tibble
a913c47254 Remove initPluginNameVisible hack 2010-07-08 10:14:00 +01:00
Martin Thompson
e4b7e23c42 Added test data 2010-07-07 21:18:38 +01:00
Martin Thompson
b04c93e9a7 test theme, alttheme -> our theme 2010-07-07 21:17:58 +01:00
Martin Thompson
860d3e2923 Removed opensong code from songxml 2010-07-07 21:17:16 +01:00
Martin Thompson
b3559a993d test theme, alttheme -> our theme 2010-07-07 21:16:14 +01:00
Martin Thompson
7297248d88 Sets CCLI info 2010-07-07 20:38:23 +01:00
Jon Tibble
cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
Raoul Snyman
167c60345b Updated translation files. 
Fixed a few more strings.
 2010-07-07 14:58:03 +02:00
Raoul Snyman
f1eeaff633 Some more string fixes. 2010-07-06 17:54:15 +02:00
Raoul Snyman
9a46ebca56 More string fixes 2010-07-06 17:44:15 +02:00
Raoul Snyman
0e53994ca6 String fixes. 2010-07-06 17:41:56 +02:00
Raoul Snyman
a167d759a5 String fixes. 2010-07-06 17:40:25 +02:00
Raoul Snyman
419b21a2b1 Fix up some strings and come bugs in the alerts plugin. 2010-07-06 17:26:52 +02:00
Jonathan Corwin
c75d29eaa7 Must get TRB143 a new mop for Christmas 2010-07-05 23:17:14 +01:00
Jon Tibble
d1482d4a60 Fix song saving 
bzr-revno: 917
 2010-07-05 22:49:28 +01:00
Jon Tibble
c8faf0cc08 Fix song saving 2010-07-05 22:23:39 +01:00
Martin Thompson
cfc9c72845 Merged from trunk - updated to lxml 2010-07-05 21:11:13 +01:00
Martin Thompson
ab1f040aaa Working on non-ascii characters in zipfiles 2010-07-05 21:00:05 +01:00
Tim Bentley
667d44eb8c and add_to_list 2010-07-05 17:33:45 +01:00
Tim Bentley
cbe65f921a Head915 2010-07-05 17:01:29 +01:00
Tim Bentley
08f650871a Signature Cleanups 2010-07-05 17:00:48 +01:00
Jon Tibble
4439625013 Fixes and cleanups 2010-07-05 12:39:48 +01:00
Jon Tibble
e2a2500a1a XML: merge song XML handling 2010-07-04 17:40:53 +01:00
Jon Tibble
765cc6ddbe Head r913 2010-07-04 17:15:29 +01:00
Jon Tibble
9910655223 Start customisation 2010-07-04 14:42:01 +01:00
Jon Tibble
b7563ae075 Import fix 2010-07-04 00:10:28 +01:00
Jon Tibble
0f53c65f4f Importish fix 2010-07-03 22:52:28 +01:00
Jon Tibble
aa390e9831 Cleanups 2010-07-03 22:50:42 +01:00
Jon Tibble
1e4a11f4e5 XML: Objecify it to make it run 2010-07-03 18:46:00 +01:00
Jon Tibble
732bf24ef8 XML: Cleanups 2010-07-03 14:26:29 +01:00
Jon Tibble
497d1c9dc9 XML: Put it where it should be 2010-07-03 02:33:40 +01:00
Jon Tibble
0c184d5e60 Remove some unused methods 2010-07-03 02:07:36 +01:00
Jon Tibble
989ffb9fc5 Head r911 2010-07-03 01:24:17 +01:00
Jonathan Corwin
db961c76db Clean up after TRB143's attempts to outclean Meths 
Fix pptview plugin when running as exe
 2010-07-02 23:18:54 +01:00
Tim Bentley
64de9f1d7a Head909 2010-07-02 19:21:59 +01:00
Tim Bentley
0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Andreas Preikschat
f519e037b9 Some random fix ;-) 
bzr-revno: 909
 2010-07-02 19:18:54 +01:00
andreas
c93cad3a20 fixed a small bug 2010-07-02 19:00:23 +02:00
Tim Bentley
603c2e7be2 Head907 2010-07-02 17:54:22 +01:00
Jon Tibble
3447c7fed6 XML: Start refactoring 2010-07-02 15:57:48 +01:00
Jon Tibble
45375e7442 Cleanup plugins (Bug #600996) 2010-07-02 13:13:46 +01:00
Jon Tibble
9e1474e851 Fix songs and wildcard import 2010-07-02 11:29:36 +01:00
Tim Bentley
e3e6c82eac Fix up display levels and renames 2010-07-02 06:16:30 +01:00
Jon Tibble
254ac02561 Alerts: Import and long lines 2010-07-01 13:56:02 +01:00
Jon Tibble
c61121bb51 DB cleanups 2010-07-01 11:31:37 +01:00
Jon Tibble
079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Martin Thompson
38ccc21f89 Added GUI for importing OpenSong 2010-06-30 22:19:18 +01:00
Martin Thompson
02fd6fe4da Main class handles zipfiles 2010-06-30 21:05:43 +01:00
Martin Thompson
94553048e3 Merged from trunk 2010-06-30 20:54:30 +01:00
Martin Thompson
7ce01d0e65 Moved test scripts and data to a test folder 2010-06-30 20:53:08 +01:00
Raoul Snyman
eda9093064 Change namespace of other plugin icons and make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 
bzr-revno: 903
 2010-06-30 21:29:08 +02:00
Raoul Snyman
568e80748c Change namespace of other plugin icons. 2010-06-30 20:16:07 +02:00
Tim Bentley
9ebdc1e2d3 Update missing checks 2010-06-30 18:05:12 +01:00
Tim Bentley
8b5931d50c Video and Image updates 2010-06-30 17:30:25 +01:00
Tim Bentley
7198148a48 Replaceable Backgound images now work 2010-06-30 17:10:54 +01:00
Raoul Snyman
5c4a835dac Added decent images for remotes, alerts and song usage. 2010-06-29 23:23:56 +02:00
Jon Tibble
cede98c0cb Head 897 2010-06-29 16:40:46 +01:00
Jon Tibble
d37b4d1e8d Plugin and other docstrings 2010-06-29 16:25:24 +01:00
Jon Tibble
6235140868 Head r896 2010-06-29 11:04:22 +01:00
Jon Tibble
0b8e4f2845 Fix filter usage (Fixes theme deletion) 2010-06-29 11:02:23 +01:00
andreas
6d233a75a0 - small fixes 2010-06-28 22:02:56 +02:00
andreas
68a934de71 - small fixes 2010-06-28 22:00:35 +02:00
Martin Thompson
75c6ba2284 Improved =s 2010-06-28 20:55:04 +01:00
andreas
93ae2b9cf8 resolved conflicts 2010-06-28 21:28:28 +02:00
Tim Bentley
ebb368559f Head894 2010-06-28 20:14:31 +01:00
Jon Tibble
19ff5dec55 Refactor database code 
bzr-revno: 894
 2010-06-28 20:12:08 +01:00
andreas
51e07d66df fixed deletion bug in media manager (custom, media, images, presentations) 2010-06-28 21:05:55 +02:00
andreas
eccd2999ee started fixing deletion bug in media manager (custom still to be done) 2010-06-28 20:20:05 +02:00
Tim Bentley
109ef118c4 Head893 2010-06-28 17:48:36 +01:00
andreas
5de4832ae7 changed the variable name 2010-06-28 18:23:59 +02:00
andreas
4f05a42627 fixed bug #599066 2010-06-28 17:43:40 +02:00
Jon Tibble
3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble
f0896422d4 Fix off-by-one in song saving 2010-06-28 13:43:14 +01:00
Jon Tibble
ad9328a30f RFC: Fix couple of leftovers 2010-06-28 12:24:18 +01:00
Jon Tibble
6c182ef70b Head r892 2010-06-28 11:48:58 +01:00
Jonathan Corwin
9a2b05f830 Prevent crash if OpenOffice not installed on Windows 2010-06-27 23:34:33 +01:00
Jonathan Corwin
7cf31532b8 Remove error trace if no impress 2010-06-26 21:34:26 +01:00
Tim Bentley
4b38c22d30 Alerts now work and more hiding cleanups 2010-06-26 15:13:10 +01:00
Jonathan Corwin
d4b70b34e7 sofimport error trap if ooo not installed 2010-06-26 12:16:59 +01:00
Tim Bentley
d82f94e326 Refactor Alert code for Html 2010-06-26 09:09:09 +01:00
Jonathan Corwin
e5da1cb5f9 head 2010-06-25 21:21:40 +01:00
Jonathan Corwin
217b40c26f Bug 598361 - Preview presentation error. Ensure presentations close correctly 2010-06-25 21:20:03 +01:00
Jon Tibble
4d1a7e8b41 Cleanup last few commits 2010-06-25 20:01:03 +01:00
Martin Thompson
baec9d5c2f Unicode chars in my testcase work OK 2010-06-25 19:20:45 +01:00
Jon Tibble
01421770ed Head r883 2010-06-25 19:14:38 +01:00
Frode Woldsund
4807fed62e Fixed (c) symbol. 
bzr-revno: 883
 2010-06-25 16:28:55 +02:00
Frode Woldsund
5c5427d963 Merged with current trunk and used '\xa9' as (c) symbol 2010-06-25 10:07:51 +02:00
Raoul Snyman
0034691bd0 pptviewlib changes 2010-06-25 07:22:58 +02:00
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jonathan Corwin
adb5776d61 pptviewlib changes 
bzr-revno: 881
 2010-06-24 22:01:57 +01:00
Raoul Snyman
ae17e3b6b3 Some more OOo related fixes. 2010-06-24 22:48:38 +02:00
Jonathan Corwin
a23a354532 pptviewlib.dll 2010-06-24 21:25:35 +01:00
Jonathan Corwin
6f525dc0c2 Presentation tidies 
bzr-revno: 880
 2010-06-24 21:16:34 +01:00
Martin Thompson
76e3538127 Imports all of SOF and the opensong default songs without crashing 2010-06-24 21:13:32 +01:00
Jon Tibble
95945c622f Fix check_item_selection 
bzr-revno: 879
 2010-06-24 21:05:04 +01:00
Jonathan Corwin
1ea6d1da50 Merge excepts together (again) 2010-06-24 20:58:45 +01:00
Raoul Snyman
10663be6bc Fix bug #595676i, improve the OSIS importer and add source languages from Pootle. 
bzr-revno: 878
 2010-06-24 21:46:53 +02:00
Jonathan Corwin
84b7a4f4ad head 2010-06-24 20:43:06 +01:00
Jonathan Corwin
30f8441ce9 Merge excepts together 2010-06-24 20:42:15 +01:00
Raoul Snyman
9dc12ac522 Try to fix the song plugin's dependence on OOo. 2010-06-24 21:40:41 +02:00
Jon Tibble
78b1c8d1af Do the fix properly 2010-06-24 20:36:33 +01:00
Raoul Snyman
e29127477e Merge from trunk. 2010-06-24 21:18:50 +02:00
Raoul Snyman
aa2d1586ea Fix bug #595676 and improve the OSIS importer. 2010-06-24 20:35:01 +02:00
Jon Tibble
4ac7ce16c0 Ampersands and item selection checking 
bzr-revno: 877
 2010-06-24 19:16:43 +01:00
Jon Tibble
2c42aa0289 Refactor check_item_selected 2010-06-24 16:50:40 +01:00
Jon Tibble
ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Jonathan Corwin
bbf5ecf0fc Head 2010-06-23 23:30:15 +01:00
Jonathan Corwin
fe01718d46 Presentation tidyups 2010-06-23 23:26:54 +01:00
Tim Bentley
da5ff6c3db Update version numbers and white space 2010-06-23 18:37:01 +01:00
Frode Woldsund
56f87c3a35 Fixed (c) symbol 2010-06-23 15:39:36 +02:00
Frode Woldsund
07db3c4c21 removed u' 2010-06-23 09:22:05 +02:00
Frode Woldsund
4826408536 stupid whitespace ... 2010-06-23 09:05:43 +02:00
Frode Woldsund
b95b598340 Forgot to import translate from openlp.core.lib :( 2010-06-23 08:54:11 +02:00
Martin Thompson
f7b8095f68 Handles [1] type verse numbering, parses all of SOF and Songs.zip 2010-06-22 22:54:10 +01:00
Frode Woldsund
683a53c594 Fixed 2 translate() functions in songplugin 2010-06-22 23:53:18 +02:00
Martin Thompson
9c573d7bef Handles [C] followed by non-numbered lines, by assigned them all to [C1] 2010-06-22 22:24:24 +01:00
Martin Thompson
e8a397d3ec Handles songs without a preliminary V tag 2010-06-22 21:41:31 +01:00
Jon Tibble
d9d976d64b Cleanup and import fix 2010-06-22 16:09:49 +01:00
Jon Tibble
43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Jon Tibble
70df49476d Long lines 2010-06-22 00:38:54 +01:00
Jon Tibble
1cf85205ce More translate() 2010-06-21 22:04:56 +01:00
Jon Tibble
2a71670149 Stray trailing backslashes 2010-06-21 21:52:25 +01:00
Tim Bentley
a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01:00
Raoul Snyman
c8bbd65349 Updated the majority of the translate() functions. 
bzr-revno: 866
 2010-06-21 20:00:21 +02:00
Raoul Snyman
74767e3874 Merge from trunk 2010-06-21 18:47:34 +02:00
Raoul Snyman
6c1b5a6fad Updated the majority of the translate() functions. 
Removed .qm files.
Ignore .qm files.
 2010-06-21 18:43:59 +02:00
Tim Bentley
b08707cc80 Head864 2010-06-21 17:21:00 +01:00
Tim Bentley
af5ae6047a Fix bug with Inactive not working 2010-06-21 17:20:41 +01:00
Jon Tibble
e7b4e16405 Couple o' Cleanups 2010-06-20 14:03:06 +01:00
Jon Tibble
700b41390e Head r863 2010-06-20 13:43:09 +01:00
M2j
888bc50622 fixes 2010-06-20 08:48:32 +02:00
M2j
8e25f3850e corrected one string 2010-06-20 01:58:42 +02:00
M2j
87c21201e7 HEAD 2010-06-20 01:31:32 +02:00
M2j
3061c319d5 Automatic verse order entry expanding 
deleted a misplaced QSpacerItem
 2010-06-20 01:16:15 +02:00
Jon Tibble
afefd3c45f Head r861 2010-06-20 00:12:00 +01:00
M2j
735ae40996 single character verse entries 2010-06-19 23:54:53 +02:00
Jon Tibble
e3a07c1e57 Cleanups 2010-06-19 21:21:36 +01:00
Raoul Snyman
d321249366 Removed unnecessary comments. 2010-06-19 20:38:17 +02:00
Jon Tibble
1005a3c1b1 Cleanup unneeded trailing backslashes 2010-06-19 19:29:18 +01:00
Raoul Snyman
38255ffdb6 Merge from trunk 2010-06-19 20:03:21 +02:00
Raoul Snyman
e615401007 Make image formats filter in a central location. 2010-06-19 20:00:50 +02:00
Jon Tibble
91c0fcb9e7 Head r860 2010-06-19 18:30:41 +01:00
Jon Tibble
0235f251bf Cleanups 2010-06-19 14:18:38 +01:00
Jon Tibble
2d050b07db Head r858 2010-06-19 12:53:20 +01:00
Jon Tibble
14cafa91c2 Complete openlp.migration removal 
bzr-revno: 858
 2010-06-19 12:42:33 +01:00
Tim Bentley
0a3bf10fb9 Translation updates 
Remove Text over video for now.
Fix song editing bug

bzr-revno: 856
Fixes: https://launchpad.net/bugs/596211
 2010-06-19 12:02:18 +01:00
Tim Bentley
cf73f77e0d Fix bug #596211 2010-06-19 11:37:58 +01:00
Tim Bentley
18a32a2217 Remove Media dynamic backgrounds for now. 
Clean up Media, Image and Custom translate strings
 2010-06-19 04:43:10 +01:00
Jon Tibble
f7fb45e69e Complete openlp.migration removal 2010-06-18 23:13:10 +01:00
Raoul Snyman
a616a7d160 - Fixed a problem where authors with null names in the db were not editable. 
- Fixed the add author shortcut on the edit song form to split up the author's name so that the above error doesn't occur.
- Made the Clear Search button run a blank search (which is what the user expects).
 2010-06-19 00:09:41 +02:00
Raoul Snyman
d48daa2c98 Added last bits of streamlining of Song Maintenance form. 2010-06-18 21:55:45 +02:00
Raoul Snyman
cc2db3a5f4 Merge from trunk 2010-06-18 18:44:10 +02:00
Jon Tibble
226277e55d Head r852 2010-06-18 12:57:50 +01:00
Tim Bentley
d143b197a3 Head851 2010-06-18 06:59:31 +01:00
Tim Bentley
e4f77dbacb Bug fixes 2010-06-18 06:58:40 +01:00
Jon Tibble
7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble
5dc87d3ede Cleanups 2010-06-17 22:07:01 +01:00
Jon Tibble
16ab2da4d6 Fix HTTPBible verse counts 2010-06-17 22:01:30 +01:00
Jon Tibble
d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble
1af5f700e2 Bible search fix 
Edit and Delete feedback for Media Manager Items
Fix Bible Import Wizard setField errors
Fix addToServiceItem locations
Remove unused scripts/get-strings.py

bzr-revno: 850
 2010-06-17 15:06:47 +01:00
Frode Woldsund
d5bd675489 Complete trUtf8 -> translate conversion 
bzr-revno: 849
 2010-06-17 15:03:10 +01:00
Frode Woldsund
7c6b5c0b99 translate(pluginName.pluginName) -> translate(pluginName) and removed some spaces 2010-06-17 14:02:18 +02:00
Jon Tibble
9d9464aee5 Head r848 2010-06-17 12:45:45 +01:00
Jon Tibble
4683e20860 Fix addToServiceItem location 2010-06-17 02:56:05 +01:00
Frode Woldsund
cc7b6a9ec3 Merged whit current trunk 2010-06-17 00:14:46 +02:00
Jonathan Corwin
674b9e00ad Remove the main display so we can see the ppt's 2010-06-16 22:22:02 +01:00
Jonathan Corwin
62376aa93d Head 2010-06-16 21:54:41 +01:00
Jon Tibble
04f2a9797b Bible search fix: 
* Add feedback
* cater for partial file-based bibles
* Prevent an uncaught exception
 2010-06-16 02:48:52 +01:00
Jon Tibble
5e0ab4a7f6 Fix lack of feedback for edit and delete 2010-06-16 02:23:57 +01:00
Jon Tibble
814a4f023d Fix Bible Import setField errors 2010-06-16 01:31:44 +01:00
Martin Thompson
fc27f8107e First test looks promsing 2010-06-15 22:25:50 +01:00
Martin Thompson
2f077c3982 Renamed so as not to conflict with the Pthon XML library which is still used by the Song XML class 2010-06-15 22:24:49 +01:00
Martin Thompson
f709c90f0a Start opensong importer 2010-06-15 21:03:47 +01:00
Jon Tibble
b7e3ec4441 RFC: Refactor a filter method 2010-06-15 19:08:02 +01:00
Jon Tibble
37dd8888ca Head r847 2010-06-15 16:43:52 +01:00
Jon Tibble
85661fe6e4 RFC: Tweaks 2010-06-15 16:42:52 +01:00
Meinert Jordan
48619f72cc Various i18n fixes. 
bzr-revno: 847
 2010-06-15 17:22:26 +02:00
Jon Tibble
e92b017348 RFC PT4: The other DB plugins 2010-06-15 03:08:22 +01:00
Jon Tibble
554ab59caf RFC PT3: Bibles 2010-06-15 01:44:06 +01:00
Jonathan Corwin
f2a0fb9f29 Well at least you can open a presentation now. Can't see it yet though cos of some silly black window in the way 2010-06-14 23:01:04 +01:00
Jonathan Corwin
89e78b6528 Head 2010-06-14 22:12:22 +01:00
Jonathan Corwin
b6057c0156 resize thumbs 2010-06-14 21:59:07 +01:00
Jon Tibble
e71caf43e7 Head r846 2010-06-14 19:22:08 +01:00
Jon Tibble
7c2c8f26e1 Revert resource location 2010-06-14 18:56:42 +01:00
Jon Tibble
754da4c28e Fix PEBKAC 2010-06-14 14:43:04 +01:00
Jon Tibble
a4f0df76cc Fix QColorDialog usage 2010-06-14 14:23:19 +01:00
Frode Woldsund
e94bba463b The translate() function is a static method. Fixed. 2010-06-14 14:24:30 +02:00
Frode Woldsund
7b43146421 merged with current trunk 2010-06-14 08:38:51 +02:00
Jon Tibble
0558900951 Head r843 2010-06-14 03:48:12 +01:00
Jon Tibble
f54a423832 Fix bible runtime data location 2010-06-14 03:42:47 +01:00
Raoul Snyman
b5aa2f86f9 Added in dynamic adding of authors and topics to the song edit form. 2010-06-13 22:29:47 +02:00
Raoul Snyman
4af5e1d8ef Tidied up the UI of the Song Maintenance Dialog to make it look good on all OSes. 2010-06-13 20:28:59 +02:00
Jon Tibble
54aa8958fe RFC PT2: Refactor Manager 2010-06-13 00:00:14 +01:00
Jon Tibble
ec4d54e66a Fix variable naming 2010-06-12 21:22:58 +01:00
Jon Tibble
e70ad3ca90 addToServiceItem is not an Icon 2010-06-12 21:22:20 +01:00
Jon Tibble
999df4e296 Fix db settings location 2010-06-12 21:06:01 +01:00
Jon Tibble
13c646153f Keep library classes/methods in lib dirs 2010-06-12 13:33:04 +01:00
Jon Tibble
5f2042168d RFC: Cleanup DB metadata for RFC 2010-06-12 03:14:18 +01:00
Jon Tibble
55f6197212 RFC: Refactor database setup code 
A possible way to refactor database code to remove code duplication and,
I hope, provide a simpler, more intuitive model to be copied by others
 2010-06-12 02:52:04 +01:00
M2j
96415d47a4 revert change in verse ordering 2010-06-11 19:07:33 +02:00
Jon Tibble
914a710f95 More docstrings 2010-06-10 22:30:50 +01:00
Jon Tibble
78114b8063 Apply docstrings feedback 2010-06-10 20:45:02 +01:00
Jon Tibble
7ddaff2843 Head r839 2010-06-10 17:36:49 +01:00
M2j
69c6e0ef02 use filesystem char encoding for file operations 2010-06-10 16:42:55 +02:00
Jon Tibble
5868a37018 Small refactorings 2010-06-10 14:28:41 +01:00
Jon Tibble
31c3be39e4 Remove old song import/export forms 2010-06-10 14:18:08 +01:00
M2j
2dac357fa7 HEAD 2010-06-10 15:17:39 +02:00
Jon Tibble
3a7ca9a185 Fix module name thinkos 2010-06-10 14:12:19 +01:00
M2j
f8580333bd realized too late, that you may not test for NoneType 2010-06-10 11:10:54 +02:00
M2j
0229b362af phrase verse index decoding more pythonish 2010-06-10 11:05:56 +02:00
Jon Tibble
8d059fb84e Add DocStrings 2010-06-10 02:57:59 +01:00
M2j
50f123490f fix: verses in comboBox of editverseform 2010-06-09 23:50:55 +02:00
M2j
8296b8dc84 Additional translatable strings 
Removed string_to_unicode and variant_to_unicode
 2010-06-09 23:15:37 +02:00
M2j
940c6fd44f Set theme and service file content to UTF-8 
Replaced replaced all non-ASCII chars in the sources (exept of comments)
Fixed theme background images bug
 2010-06-09 21:10:57 +02:00
M2j
8733ceac70 HEAD 2010-06-09 20:33:47 +02:00
Jon Tibble
0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01:00
Frode Woldsund
f5b02659b6 Replaces missed trUtf8('...') -> translate(u'PluginName.ClassName', '...') 2010-06-09 13:11:01 +02:00
Jon Tibble
559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
M2j
62d7649e2b reenable verses without number in the verse order 2010-06-08 15:47:23 +02:00
Frode Woldsund
2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
M2j
69b98a44e8 fix for image names 2010-06-07 11:37:27 +02:00
M2j
d7a84fb592 derive captable image formats from Qt 2010-06-07 01:40:24 +02:00
M2j
69608de08c fix: bug introduced in 833 2010-06-07 01:23:29 +02:00
Frode Woldsund
23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
M2j
761f30ec00 fix: set editverseform comboBox only for valid verse names 2010-06-06 21:56:41 +02:00
Tim Bentley
b624ba0ed0 Fixed for now - could be better 2010-06-06 18:03:48 +01:00
Tim Bentley
950dc73d2b try again and fix from last merge 2010-06-06 17:25:39 +01:00
Tim Bentley
cb35fb7be4 Head832 + fix 2010-06-06 16:59:01 +01:00
Frode Woldsund
6e1ef3cc70 Fixed translate() function in songsPlugin and songusagePlugin 2010-06-06 16:22:00 +02:00
Frode Woldsund
5e64814133 Fixed translate() function in RemotePlugin 2010-06-06 15:44:07 +02:00
Frode Woldsund
3c096b4d0a Fixed translate() function in PresentationPlugin 2010-06-06 15:42:24 +02:00
Frode Woldsund
4571e808ba Fixed translate() function in MediaPlugin 2010-06-06 15:30:57 +02:00
Frode Woldsund
febb743acd Fixed all translate() function in ImagePlugin 2010-06-06 15:26:42 +02:00
Tim Bentley
0e5450f9d1 Fix tag error 2010-06-06 13:39:13 +01:00
Frode Woldsund
0788937721 Fixed translate() function in BiblesPlugin 2010-06-06 13:49:39 +02:00
Frode Woldsund
2c1f1f9455 Fixed translate() funtion in alertsplugin 2010-06-06 13:34:35 +02:00
M2j
604a6d0c77 identify button from object name 
revert some only cosmetic changes
 2010-06-06 12:15:12 +02:00
Frode Woldsund
dc35faf1ae Fixed all errors from the feedback I got from IRC 2010-06-06 12:07:48 +02:00
Tim Bentley
4714502f67 Clean up song imports 2010-06-06 08:28:07 +01:00
Tim Bentley
e06556489e Finish converting tags 2010-06-06 07:40:08 +01:00
M2j
5a238e663b string recoding cleanups 2010-06-06 01:05:53 +02:00
Tim Bentley
3bfa515c12 Verse Translations part 2 - fixed 2010-06-05 21:12:13 +01:00
Tim Bentley
af3932f182 Verse Translations part 2 - revised 2010-06-05 21:00:50 +01:00
Tim Bentley
9d4cb86a6e Verse Translations part 1 2010-06-05 18:48:26 +01:00
Tim Bentley
8da2167ebe Live generation cleaned up 2010-06-05 17:06:39 +01:00
Tim Bentley
7bf8e71acf Song editing cleaned up 2010-06-05 16:46:14 +01:00
Tim Bentley
c022e6a89f Fix cursor position 2010-06-05 15:29:06 +01:00
Tim Bentley
4b0dc2a83f Head831 2010-06-05 14:28:53 +01:00
Tim Bentley
2143a24182 tidy ups 2010-06-05 14:28:34 +01:00
M2j
262d125b00 HEAD 2010-06-03 12:28:54 +02:00
M2j
ffcdddf928 fixing string encoding in songmaintenanceform 
making verses w/o index a alias for the first one
 2010-06-02 17:33:55 +02:00
Jon Tibble
08f0c1ff49 Cleanup including diff check fixes 2010-06-01 18:13:54 +01:00
Jon Tibble
bea44a5124 Fix __init__ calling and imports 2010-06-01 01:05:05 +01:00
Jon Tibble
83354166da Whitespace and unused variable 2010-06-01 00:23:08 +01:00
Frode Woldsund
3be909c5c0 Replaced { self.trUtf8() } with { translate() } which is the new standar. I also imported the translate library on the following files. I did not remove any import sinse I do not know how this { self.trUtf8() } does work. 2010-06-01 00:06:16 +02:00
Raoul Snyman
07d402ee59 Fix the alerts not being sent. 2010-05-31 22:07:27 +02:00
Raoul Snyman
b5af6bb5b9 - Improve HTML 
- Improve layout
- Pull JavaScript and CSS out into their own files.
- Add jQuery
- jQuery-fy JavaScript.
 2010-05-30 20:01:17 +02:00
Jon Tibble
4a4bf00140 Head r829 2010-05-30 16:26:45 +01:00
Raoul Snyman
7c47e24cf0 Fixed up json import. 
Started JavaScript framework.
Started implementing Service Management.
 2010-05-30 00:28:28 +02:00
Jon Tibble
dcd5b62524 Fix redefinition of init_models() 2010-05-29 22:28:40 +01:00
Raoul Snyman
0b8d8b8832 HEAD. 2010-05-29 23:25:43 +02:00
Jon Tibble
fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble
f41cadd17b CONSTANTS and an exception 2010-05-28 16:01:50 +01:00
Jon Tibble
bbcfd7729c Refactor BaseModel 2010-05-28 01:26:49 +01:00
Jon Tibble
85b5437f80 Head r827 2010-05-28 01:20:50 +01:00
Jon Tibble
d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +01:00
Raoul Snyman
2ddde15875 Moved Jonathan's JS over to jQuery 2010-05-27 21:40:44 +02:00
andreas
039792104b - again changes done to the bible footer 2010-05-27 18:58:00 +02:00
andreas
dfd53e5628 - footer now displays both bible versions/copyright information (dual bible view) 
- small fix
 2010-05-27 18:13:25 +02:00
Jon Tibble
4616bbcb36 Explicitly declare exceptions 2010-05-27 17:00:51 +01:00
Tim Bentley
fbbcdc20da Head826 2010-05-27 16:58:04 +01:00
Jon Tibble
dc96d471e6 Variable cleanup 2010-05-27 15:41:47 +01:00
Tim Bentley
7443c4af72 Head 2010-05-26 18:38:04 +01:00
Tim Bentley
9032935219 Fix tags 2010-05-26 18:36:06 +01:00
Jon Tibble
15038a9184 More cleanups 2010-05-26 16:52:33 +01:00
Jon Tibble
e195f0ffb7 Match method and overridden method arguments and cleanups 2010-05-26 00:47:26 +01:00
Jon Tibble
f0c03ad2cb Cleanups 2010-05-26 00:07:50 +01:00
Jon Tibble
871640c374 Whitespace 2010-05-25 17:16:43 +01:00
Jon Tibble
e29f3d30c0 Remove unnecessary semicolons 2010-05-25 16:35:34 +01:00
Jon Tibble
29cfcee29f Fix undefined variables 2010-05-25 16:04:37 +01:00
Jon Tibble
c7d420d4b9 Fix class defs and name redefinitions 2010-05-25 15:30:34 +01:00
Jon Tibble
14307fcc8a Fix indentation 2010-05-25 01:48:42 +01:00
Jon Tibble
122756eca5 Fix indentations 2010-05-24 23:37:20 +01:00
Tim Bentley
f6d7743905 Fix memory leak and improve slide controller tags 
bzr-revno: 823
 2010-05-24 19:04:22 +01:00
Tim Bentley
f7987501b9 Stop memory growth, improve verse display 2010-05-23 08:03:28 +01:00
Jon Tibble
3e9176d8c9 Head r820 2010-05-20 22:02:53 +01:00
Jon Tibble
c8b6a3640d Import fixes 2010-05-20 17:49:47 +01:00
Jon Tibble
1ee3ccd180 Head r819 2010-05-20 17:47:24 +01:00
Jon Tibble
1609f589e4 Some head 2010-05-20 17:46:53 +01:00
Tim Bentley
38290cb804 Head819 2010-05-20 17:43:18 +01:00
Tim Bentley
cd8f59c7d0 Remove extra blank line 2010-05-20 17:40:56 +01:00
Raoul Snyman
28a403bd07 Some other minor touchups. 2010-05-18 23:32:58 +02:00
Raoul Snyman
304aed1c1e Fixed up problems with adding and removing songs from the service manager. 2010-05-18 23:18:52 +02:00
Tim Bentley
0dfda8ff27 Finish tagging the songs 2010-05-18 20:29:40 +01:00
Raoul Snyman
09bcb066eb HEAD+fixes 2010-05-17 22:48:16 +02:00
Tim Bentley
d86f0285c9 Song Edit tableisation 2010-05-17 19:39:28 +01:00
andreas@andypc
005dccb5d8 Fix bug in bibles with 2 bible displays 
bzr-revno: 817
 2010-05-16 16:24:16 +01:00
andreas
bfb3143cfc fix for empty slide in dual bible view 2010-05-15 21:59:21 +02:00
Jon Tibble
ed233039ad Head r814 2010-05-11 17:41:19 +01:00
rimach
16b202d8b5 Head 2010-05-10 22:44:38 +02:00
Martin Thompson
a8a7e675a4 Updated from review comments 2010-05-09 21:02:38 +01:00
rimach
ae36bc2bb9 Head 2010-05-09 10:47:57 +02:00
Martin Thompson
efa1e8c2d9 Quick fix to handle Bible config gets confused and returns None 2010-05-07 21:29:21 +01:00
Jon Tibble
dfb02e4996 Head r812 2010-05-07 01:21:03 +01:00
Martin Thompson
d04d75ad41 More changes to suit pyqt4.4 2010-05-06 21:41:42 +01:00
Martin Thompson
c613773bfb Merged trunk 2010-05-06 21:30:23 +01:00
Martin Thompson
dbdf681165 More changes to suit pyqt4.4 2010-05-06 21:30:08 +01:00
Tim Bentley
6c9c9848db Clean up fixes 2010-05-06 17:49:12 +01:00
Jon Tibble
33198ad86e Head r811 and trivialities 2010-05-06 03:02:19 +01:00
Tim Bentley
0e7fb1c80c minor errors 2010-05-05 20:21:05 +01:00
Tim Bentley
fd22b01e59 Head811 2010-05-05 20:15:09 +01:00
Tim Bentley
27a963a9c2 Validate Service item viewer loading 2010-05-05 20:14:48 +01:00
Jonathan Corwin
3f569d428d Remotes: support more filetypes and subfolders for web 
presentation_hide signal support

bzr-revno: 811
 2010-05-05 19:29:08 +01:00
Tim Bentley
a8bbd540d4 service loading prefix check 2010-05-05 19:07:57 +01:00
Tim Bentley
e1f97fc9b9 Fix initial display 2010-05-05 18:35:11 +01:00
rimach
4661756d68 Head 2010-05-05 19:09:23 +02:00
Jonathan Corwin
4f8d058928 rename get to send and allow webpages to be served from subfolders 2010-05-04 22:49:02 +01:00
Jon Tibble
a8f2cd2e1f Import fixes 2010-05-04 22:19:40 +01:00
Tim Bentley
e0bfaf07bc Cleanup and finish bits 2010-05-04 21:01:45 +01:00
Raoul Snyman
108d3244c9 Documentation! 
bzr-revno: 810
 2010-05-04 19:53:27 +02:00
Jonathan Corwin
465ce8c7f7 web fixes, allow more file types. Slidecontroller_hide event 2010-05-03 22:49:42 +01:00
rimach
0c061087e9 Head 2010-05-03 22:39:06 +02:00
Tim Bentley
4d9f429ae0 Fix bible spelling in database 
bzr-revno: 809
 2010-05-03 07:12:59 +01:00
Jonathan Corwin
456d35f2d4 Fix image qstring 2010-05-01 23:02:31 +01:00
rimach
850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
Raoul Snyman
fff2d780eb HEAD 2010-05-01 22:00:01 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Tim Bentley
40ad9729ba Head 807 2010-05-01 14:06:22 +01:00
Tim Bentley
4ffb7d8a18 Fix up drag and Drop for service items 2010-05-01 14:05:17 +01:00
Jonathan Corwin
9ef2b13ad6 comments, update client, load html from disk, blanking 2010-05-01 13:10:48 +01:00
Jonathan Corwin
12810ad34a Head 2010-05-01 09:46:06 +01:00
Jon Tibble
5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
Jon Tibble
b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
rimach
190a6d4819 Head 2010-04-30 22:03:26 +02:00
rimach
faffe729f8 Head 2010-04-30 21:30:50 +02:00
rimach
b74dec5446 update 2010-04-30 21:23:02 +02:00
Tim Bentley
09da62f9cc Text over video 2010-04-30 17:30:25 +01:00
Tim Bentley
932560e81d Fix missing %s 2010-04-30 15:49:27 +01:00
Tim Bentley
61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Tim Bentley
8e630c5adf Fixes 2010-04-30 10:38:17 +01:00
Tim Bentley
591dc07354 Fix up presentations so they work again 2010-04-30 06:50:52 +01:00
Jon Tibble
8d6a624c6c Fix break 2010-04-30 02:43:05 +01:00
Jon Tibble
a582d09752 Make plugin tab file locations consistent 2010-04-30 02:35:41 +01:00
Jon Tibble
22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Jonathan Corwin
72fa923937 update browser if slide changes 2010-04-29 23:52:23 +01:00
Tim Bentley
4e6c56c430 Video clean ups and bug fixes from 800 2010-04-29 21:56:27 +01:00
Jonathan Corwin
f4cc91f529 Show service and song text. Click on service item/song verse to go live 2010-04-28 23:08:37 +01:00
Jonathan Corwin
3d6dc75c23 head 2010-04-28 20:13:48 +01:00
Tim Bentley
b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Tim Bentley
17ee4f00fa remove plugin 2010-04-28 17:41:04 +01:00
Jon Tibble
bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
Jon Tibble
507cd19739 Cleanups and diff reading fixes 2010-04-28 02:28:37 +01:00
Jon Tibble
5a8cd52acf File list refactor 2010-04-28 00:49:21 +01:00
Jon Tibble
c626653092 Fix bible reloading 2010-04-27 23:51:16 +01:00
Jon Tibble
484a76289c Fix presentations a bit more 2010-04-27 23:36:50 +01:00
Jon Tibble
55dd795a45 Unbreak presentations slightly 2010-04-27 22:30:04 +01:00
rimach
181c19d112 futher changes 2010-04-27 22:54:55 +02:00
Tim Bentley
d0c6cf9639 move display to core 2010-04-27 20:59:44 +01:00
Jonathan Corwin
d5df10576e Adding the httpserver.py which contains the functionality might help 2010-04-27 19:39:51 +01:00
Jon Tibble
9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Jonathan Corwin
75829333c0 Control via web 2010-04-26 22:29:40 +01:00
rimach
95a1419d9c Head 2010-04-25 21:29:39 +02:00
Tim Bentley
b0763714c8 Fix up object copy and get to work. 2010-04-24 20:57:29 +01:00
Tim Bentley
d7e060c503 Start to add ability to set display screen size for a session 2010-04-24 19:42:01 +01:00
Jonathan Corwin
80e9f94a52 Basic http support 2010-04-24 14:19:08 +01:00
Tim Bentley
a29ea3f861 Add line spacing adjustment to renderer 
Remove .thumbnail directories
 2010-04-24 08:21:35 +01:00
Jon Tibble
b8f940565e Import fixes 2010-04-23 21:39:27 +01:00
Raoul Snyman
e22e76e183 HEAD 2010-04-23 21:20:44 +02:00
Jonathan Corwin
496b7befce head 2010-04-22 22:23:14 +01:00
Jonathan Corwin
fa54f94905 Finish signal refactor 2010-04-22 22:22:09 +01:00
rimach
b83d115738 Copyright character solution 2010-04-22 19:27:26 +02:00
Jonathan Corwin
877af7ea2c More fixes 2010-04-21 22:56:48 +01:00
Jonathan Corwin
68685d1be5 head 2010-04-21 21:26:18 +01:00
Tim Bentley
e6d6541ca2 Presentation Thumbnails 2010-04-21 18:36:29 +01:00
Tim Bentley
88f4abf524 head 2010-04-21 18:22:47 +01:00
Tim Bentley
9d0c1c01f3 Alerts cleanup and fixes 2010-04-21 18:21:56 +01:00
Jonathan Corwin
40e6289102 head 2010-04-20 23:12:04 +01:00
Jonathan Corwin
29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
Jon Tibble
17ec820b79 Import and typo fixes 2010-04-19 19:43:20 +01:00
Tim Bentley
8242bac82f Presentation icons 2010-04-19 19:20:44 +01:00
Tim Bentley
4c8c3b7b1c Head 2010-04-19 17:45:40 +01:00
Tim Bentley
e463e83ed5 Icon fixes 2010-04-19 17:45:13 +01:00
Tim Bentley
884fdc513f Alert manager cleanups 
Improvements in video display

bzr-revno: 796
 2010-04-19 17:34:57 +01:00
Raoul Snyman
b45dcc6b81 Added autocompletion to the topics, songbooks and themes. 2010-04-19 07:31:31 +02:00
Raoul Snyman
7e747f7cc9 Added autocompletion to the Authors combobox. 2010-04-19 07:22:56 +02:00
Tim Bentley
d96126ee55 Head 794 2010-04-17 12:28:23 +01:00
Tim Bentley
dcd48d1042 Clean up alert dialog with new layout 
Alerts over video starting to work 
Fix bug in impress close down
 2010-04-17 08:31:15 +01:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley
3cc600a67b More changes and attempts 2010-04-13 16:53:00 +01:00
Jonathan Corwin
c7c4def38e error trap if no ooo 2010-04-13 08:33:58 +01:00
Jonathan Corwin
14bb4c2edb add missing file 2010-04-12 22:55:59 +01:00
Jonathan Corwin
4e504daa6e head 2010-04-12 22:54:19 +01:00
Jonathan Corwin
e4989f422b tidyups 2010-04-12 22:49:56 +01:00
Jonathan Corwin
578a81236a head 2010-04-12 08:28:30 +01:00
Jonathan Corwin
5371990777 Generic OOo import 2010-04-12 08:22:56 +01:00
Jon Tibble
cbc93259cb Import and line ending fixes 2010-04-11 18:52:51 +01:00
Jon Tibble
3f5ac846f6 Head r791 2010-04-11 18:47:39 +01:00
Tim Bentley
04b63cb20f remove weirdness 2010-04-10 19:11:24 +01:00
Tim Bentley
f99b91509c remove prints 2010-04-10 19:08:03 +01:00
Tim Bentley
76726e263e Head 2010-04-10 16:46:25 +01:00
Tim Bentley
aa7371eabf Fedora fixes 2010-04-09 20:15:26 +01:00
Tim Bentley
141a9b4358 Clean up custom plugin dialog 2010-04-08 20:46:50 +01:00
Tim Bentley
b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley
bc4f31ef93 More fixes and new features 2010-04-08 10:15:40 +01:00
Tim Bentley
cee89eadcd Head 2010-04-08 08:37:18 +01:00
Tim Bentley
150eaf7e56 Video changes and bug fixes part1 2010-04-08 08:37:01 +01:00
Tim Bentley
be7ed23c1d and again 2010-04-07 19:32:54 +01:00
Tim Bentley
abb3827817 Style fixes 2010-04-06 20:16:14 +01:00
Tim Bentley
b51998c760 Replace missing tags 2010-04-06 19:26:25 +01:00
Tim Bentley
04fa7bda1c fix missing method 2010-04-06 19:14:59 +01:00
Tim Bentley
a866b30491 Presentation bug fixes 2010-04-06 18:52:09 +01:00
Tim Bentley
e934c7e623 Compress Impress previews 2010-04-05 12:06:37 +01:00
Tim Bentley
f5a9f9ed89 Update Image thumbnail if original has changed 2010-04-05 09:13:45 +01:00
Tim Bentley
fa8c543556 Clean up Media mediaitem 2010-04-05 08:22:21 +01:00
Tim Bentley
5a3150a063 Fix up plugins for multiple service item generation 2010-04-05 07:45:01 +01:00
Tim Bentley
b17b83bb27 Add multiple songs to service manager 2010-04-04 14:53:39 +01:00
Tim Bentley
1cb25db4e9 Head785 2010-04-04 14:16:14 +01:00
Tim Bentley
5b9229777d fixes 2010-04-04 14:16:01 +01:00
Jonathan Corwin
728c524ff5 fixes 2010-04-04 09:26:53 +01:00
Raoul Snyman
513b7a10b7 Reworked the verse dialog. 2010-04-04 01:00:05 +02:00
Jonathan Corwin
b602dcafe0 A few more tidyups 2010-04-03 23:14:37 +01:00
Jonathan Corwin
3ceb0267e9 cleanups+multi-song delete 2010-04-03 20:17:37 +01:00
Raoul Snyman
646d8a658c A few changes. 2010-04-03 18:43:29 +02:00
Tim Bentley
4eca8e265a Consistancy 2010-04-03 12:59:17 +01:00
Tim Bentley
10c3c54db2 Correct error message 2010-04-03 12:11:57 +01:00
Tim Bentley
89bbdea0b9 Code fixes from last merge and presentation improvements 2010-04-03 09:42:51 +01:00
Tim Bentley
3c2fb96376 File housekeeping all files not touched for over 1 year 2010-04-03 09:10:26 +01:00
Tim Bentley
bd8598a00e Head 782 2010-04-03 09:04:58 +01:00
Tim Bentley
18eb768f2f Sort out multiple Chorus tags 2010-04-03 09:04:41 +01:00
Tim Bentley
66054c44e4 Display handling cleanups and changes to service item flags 
bzr-revno: 783
 2010-04-03 09:03:36 +01:00
Tim Bentley
828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Raoul Snyman
f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Jonathan Corwin
dad04bfd90 SOF fixes+delete all selected songs 2010-04-03 00:24:51 +01:00
Raoul Snyman
20636bf655 Wizard works, though not functional. 2010-04-02 22:03:51 +02:00
Tim Bentley
8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Jonathan Corwin
2cabfc67f3 Hook it all together 2010-04-02 15:10:10 +01:00
Raoul Snyman
21b6bedcb4 First go at the Song Import Wizard. 2010-04-02 14:23:40 +02:00
Jonathan Corwin
1f41039e07 Split song and sof specifics 2010-04-01 22:36:03 +01:00
Jonathan Corwin
949dfd927d head 2010-04-01 08:43:36 +01:00
Jonathan Corwin
33f4bc05f2 tidy 2010-04-01 08:42:42 +01:00
Jonathan Corwin
8d6d2b8272 standalone sof test script 2010-04-01 00:06:57 +01:00
Jon Tibble
d7ef6d5f41 Cleanups 2010-03-28 22:57:54 +01:00
Tim Bentley
afc1fbde17 Remove ...s 2010-03-28 17:11:33 +01:00
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley
68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Raoul Snyman
85d44554b0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

bzr-revno: 775
 2010-03-27 22:19:47 +02:00
Raoul Snyman
d2670b1cb0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.
 2010-03-27 21:59:35 +02:00
Raoul Snyman
daa42bce71 Fixed the "Bible" item in the "Import" menu. 
bzr-revno: 773
 2010-03-27 19:06:13 +02:00
Raoul Snyman
08ee7be551 Fixed the "Bible" item in the "Import" menu. 2010-03-27 16:53:41 +02:00
Raoul Snyman
abfc977b17 Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX"). 2010-03-27 14:37:21 +02:00
Tim Bentley
8df0053409 Fix Copyrights 2010-03-27 10:12:11 +00:00
Tim Bentley
d2b56fc719 Basic verse counting 2010-03-27 07:16:39 +00:00
Tim Bentley
097a414c59 oops string bug 2010-03-27 07:03:12 +00:00
Tim Bentley
611ae15790 Fix up tag editing 2010-03-27 07:01:50 +00:00
Tim Bentley
b90169a129 Song editing improvements 2010-03-26 21:04:50 +00:00
Raoul Snyman
8f095a2fc5 Fixed a bug with Strongs in CrossWalk. 2010-03-26 22:50:55 +02:00
Tim Bentley
92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley
49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Tim Bentley
463847c61c Correct image override process 2010-03-25 20:24:52 +00:00
Tim Bentley
63aa583942 Images bulk delete if selected 2010-03-25 20:01:15 +00:00
Jonathan Corwin
b490e74012 Start presentation apps in right place 2010-03-24 22:59:05 +00:00
Raoul Snyman
ff215ace3c Fixed two bugs in the web downloads import dealing with non-latin characters. 
bzr-revno: 765
 2010-03-24 23:59:39 +02:00
Raoul Snyman
0b596dab47 Fixed another possible bug. 2010-03-24 23:18:36 +02:00
Raoul Snyman
2eaadffea0 Fixed two bugs in the web downloads import dealing with non-latin characters. 2010-03-24 23:00:43 +02:00
Tim Bentley
a091c8f3b6 Fix Quick bible enter 2010-03-24 19:15:25 +00:00
Tim Bentley
161f7e88bb Head763 2010-03-24 18:59:48 +00:00
Tim Bentley
33d2de6f9b Heads 2010-03-24 18:59:37 +00:00
Jon Tibble
6578fb529e Test tweaks and remove unused variables 2010-03-23 21:51:20 +00:00
Jon Tibble
fd3b17f6fa Head r761 2010-03-23 20:33:17 +00:00
Jonathan Corwin
ab72e7d7cc Close down presentation apps at end correctly 
bzr-revno: 761
 2010-03-23 21:59:32 +02:00
Jon Tibble
fe1755c25f Head r760 2010-03-23 19:56:25 +00:00
Jonathan Corwin
00cb0d1277 Close down presentation apps at end correctly 2010-03-23 19:41:54 +00:00
Raoul Snyman
2c325d718b Changes: 
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
 2010-03-23 21:04:15 +02:00
Jon Tibble
317730be1f Head r759 2010-03-23 15:15:00 +00:00
Jon Tibble
310f790e8e Some head 2010-03-23 15:14:20 +00:00
Raoul Snyman
1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Tim Bentley
fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Raoul Snyman
19c5c07c54 Add Christian and Phill to the credits 
bzr-revno: 755
 2010-03-22 10:37:18 +02:00
Raoul Snyman
ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
Raoul Snyman
be598da4f9 Fixed a number of issues in the Bibles: 
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
 2010-03-22 00:16:43 +02:00
Raoul Snyman
12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02:00
Jon Tibble
2f840944e9 Unused variable fixes 2010-03-21 15:55:45 +00:00
Raoul Snyman
82a6bc791f Bug fixes for the Bible imports. 
bzr-revno: 751
 2010-03-21 17:11:37 +02:00
Raoul Snyman
253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02:00
Tim Bentley
848eb601af Fix NONE appearing as song verses 
Delay the hidden window display
Fix missing add status for custom slides
 2010-03-21 14:24:41 +00:00
Raoul Snyman
eddd112811 Failed Bibles are deleted. 2010-03-20 00:08:06 +02:00
Tim Bentley
b011104deb Head747 2010-03-19 08:07:12 +00:00
Raoul Snyman
2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02:00
Tim Bentley
44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman
6414330b2c Reworked the BibleGateway Bibles. 
Changed some code to be standards compliant.
 2010-03-18 23:36:30 +02:00
Tim Bentley
a71505a10c Bible can add verses to service item 2010-03-17 19:09:09 +00:00
Tim Bentley
13608bedae Alter form removal complete 2010-03-17 19:04:39 +00:00
Jon Tibble
a81c39ca65 Import fix 2010-03-16 21:13:23 +00:00
Tim Bentley
60a3468edb remove alert dialog 2010-03-16 21:03:10 +00:00
Raoul Snyman
dc6c6bec31 - Removed commented code (just for you, TRB143!) 
- Removed any non-alphanumeric character for Bible names, just to be safe, since we don't actually use the filenames anymore.
 2010-03-16 22:43:41 +02:00
Tim Bentley
c1182aa9cc Add maintain menu item 2010-03-16 20:30:33 +00:00
Tim Bentley
de8d0f4d9c Add add to existing service item 2010-03-16 20:22:28 +00:00
Raoul Snyman
9044ed3a4a Fixed a bug where Bible names were being used for file names, and causing issues on various operating systems. 2010-03-16 21:46:19 +02:00
Raoul Snyman
223393e38b Fix a problem introduced per ongeluk. 2010-03-15 21:23:07 +02:00
Raoul Snyman
90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02:00
Raoul Snyman
5d8c1e42ba Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled. 2010-03-14 00:35:17 +02:00
Raoul Snyman
7da00bc26f Attempt to get Bibles to work properly. 
Merge from HEAD
 2010-03-13 23:48:04 +02:00
Tim Bentley
2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Tim Bentley
601abab854 Text string fixes 
bzr-revno: 739
 2010-03-13 13:02:50 +00:00
Tim Bentley
47dc69b194 More text fixes 2010-03-13 08:43:54 +00:00
Raoul Snyman
881c4cea18 Fixed locations to use the AppLocation class. 2010-03-12 23:55:52 +02:00
Tim Bentley
db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Tim Bentley
4c9bd6d34b Fix text 2010-03-12 16:55:01 +00:00
Raoul Snyman
04c1db2033 Merge from head. 2010-03-12 17:42:47 +02:00
Raoul Snyman
00b9305a51 Doing the docstring thing! 2010-03-12 17:41:15 +02:00
Tim Bentley
cd873b9196 add full stops 2010-03-12 07:31:59 +00:00
Tim Bentley
2607d23c00 String more strings and song edit error 2010-03-11 21:01:19 +00:00
Tim Bentley
68287b9604 String fixes 2010-03-11 19:28:49 +00:00
Tim Bentley
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Jonathan Corwin
9308669ec5 Fix issues regarding the blank button for presentations and added methods to extract presentation text and notes for use in the future. 
bzr-revno: 733
 2010-03-11 13:43:22 +02:00
Raoul Snyman
142f679098 Fix "red letter" versions of Crosswalk Bibles. 2010-03-11 08:15:29 +02:00
Jonathan Corwin
bfee664c94 fixes 2010-03-10 23:00:48 +00:00
Jonathan Corwin
1613610853 Good idea to test conflict resolutions before committing 2010-03-10 22:32:27 +00:00
Jonathan Corwin
99a963e509 Head 2010-03-10 22:28:19 +00:00
Jonathan Corwin
d48046c0c3 Blanking issues 2010-03-10 22:24:09 +00:00
Jon Tibble
26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Raoul Snyman
32b267fab9 Windows modifications: 
- Added Windows build files.
- Added Windows installer files.
- Modified the tabs in the media manager to look a little better on both Windows and Linux.
- Windows icon.

bzr-revno: 730
 2010-03-10 07:50:48 +02:00
Raoul Snyman
8e5e1dfc36 Merged from HEAD 2010-03-09 21:58:59 +02:00
Jon Tibble
56d2e30fe6 Head r729 2010-03-09 19:45:13 +00:00
Jon Tibble
e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Jon Tibble
51d95b661c Head r728 and truth test 2010-03-09 19:14:23 +00:00
Tim Bentley
47bf6252bb Head 728 2010-03-09 18:49:28 +00:00
Tim Bentley
0b1ce89017 Fix translation 2010-03-09 18:19:58 +00:00
Raoul Snyman
0ef8005b52 Fixed up some problems and inadvertant bugs from the move to the scripts directory. 2010-03-09 08:07:42 +02:00
Jon Tibble
54c4bc9c19 Head r727 and C style fix 2010-03-08 19:43:37 +00:00
Tim Bentley
6f87c362d1 Use Icon to show we have Notes 2010-03-07 20:45:27 +00:00
Jonathan Corwin
714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Jonathan Corwin
a33a6d53ca coding standards 2010-03-05 22:10:53 +00:00
Jon Tibble
d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Jonathan Corwin
edad400a73 Minor fixes 2010-03-05 19:50:51 +00:00
Jonathan Corwin
851f5a4e47 head 2010-03-05 19:39:30 +00:00
Raoul Snyman
250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Jonathan Corwin
77838615b3 Presentations - close app down correctly, and mode to automatically detect file type 2010-03-05 08:36:32 +00:00
Tim Bentley
9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Jon Tibble
132022205e None tests redux 2010-03-04 18:43:53 +00:00
Jon Tibble
0baa0e6884 Head r721 2010-03-04 18:34:53 +00:00
Tim Bentley
bb0a3f7293 Head 721 2010-03-03 17:51:19 +00:00
Raoul Snyman
98cd78c7b2 Merged to head. 2010-03-03 12:19:01 +02:00
Jonathan Corwin
5863541a61 Split live/preview presentation documents, plus fixes for Windows 
bzr-revno: 720
 2010-03-03 08:28:39 +02:00
Jonathan Corwin
aa5f21b50d Live/Preview presentation changes for Windows 2010-03-02 23:15:13 +00:00
Jonathan Corwin
743ae230a8 Split live/preview presentation documents 2010-03-02 21:01:23 +00:00
Tim Bentley
4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman
024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Raoul Snyman
e37ab565ad A fix to the OSIS importer, and added the version file. 2010-02-28 22:50:14 +02:00
Jon Tibble
0c97973469 Head r718 2010-02-27 19:29:57 +00:00
Tim Bentley
325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble
5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley
065986c33c Automate Media type list from phonon 2010-02-27 14:57:33 +00:00
Tim Bentley
86e03f0c11 Move editing to line 2 2010-02-27 10:10:03 +00:00
Tim Bentley
1979f24502 Fix song editing where text is lost 2010-02-27 09:55:44 +00:00
Tim Bentley
4a83e572e9 Fix bugs in last merge and fix comments 2010-02-27 09:18:26 +00:00
Jon Tibble
80d54dc1be None tests 2010-02-27 00:11:26 +00:00
Jon Tibble
2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Tim Bentley
0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +00:00
Raoul Snyman
2766081522 Merged from trunk. 
Fixed a conflict.
 2010-02-24 21:02:39 +02:00
Raoul Snyman
0ddaa2bf4a Some more visual tweaks. 
Fixes for older versions of PyQt4.
 2010-02-24 20:39:12 +02:00
Tim Bentley
8f985291ac Head 2010-02-23 19:19:22 +00:00
Tim Bentley
8e2efcb183 Fix spelllling 2010-02-23 19:19:06 +00:00
Tim Bentley
60dd3b36cf Fix presentation tab and repaint service item 2010-02-22 06:14:44 +00:00
Jon Tibble
ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Jonathan Corwin
357c1e6a20 A few more small presentation fixes/cosmetics. 
bzr-revno: 708
 2010-02-19 21:38:56 +02:00
Jonathan Corwin
cf62d6187f More presentation fixes/tidies 2010-02-17 22:57:59 +00:00
Tim Bentley
516b05e0ad Fix URF8, copyright and alert error 2010-02-17 20:17:33 +00:00
Jon Tibble
711bd3cf00 Import fixes and copyright insertion 2010-02-17 19:13:04 +00:00
Jon Tibble
60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Jon Tibble
2287db11d7 head 2010-02-17 19:04:53 +00:00
Jonathan Corwin
959c2469a5 Fix PowerPoint and PowerPoint viewer screen lookup 2010-02-16 22:28:35 +00:00
Tim Bentley
0335547d73 Fix SongUsage Dialog so should be complete 
Minor bug fixes discovered and fixed.
Alerts - Major refactor
* Make a plugin
* Move code from maindisplay into plugin
* Add Location , Font size and History option to Font Tab and fix code to use them
* Add button to Alert Tab to allow History to be edited
* Amend Alert screen to be able to use History if option set
* Build screen to allow alerts to be Added / Edited and Deleted.

bzr-revno: 705
 2010-02-16 19:58:10 +00:00
Tim Bentley
04d79f72a1 Fix typos 2010-02-16 18:51:41 +00:00
Tim Bentley
e0b7c54ddc Minor fixes and unicode changes 2010-02-16 18:47:26 +00:00
Tim Bentley
2fefcef09d Alerts editing now work - history and pre determined 2010-02-14 20:19:57 +00:00
Tim Bentley
acc97f3c79 Alerts now have history 2010-02-14 13:27:32 +00:00
Tim Bentley
9c97660b73 Alerts now move between top and bottom 2010-02-13 07:37:03 +00:00
Tim Bentley
973d5e3dd8 Alerts move to top and bottom 2010-02-13 07:30:00 +00:00
Tim Bentley
47a61a6581 Finished moving alert code to plugin structure 2010-02-12 18:42:09 +00:00
Tim Bentley
944f45c8c8 Fix up song usage extract processing 2010-02-11 18:39:28 +00:00
Tim Bentley
edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley
73d6a24792 Add Fontsize and location to alerts settings 2010-02-09 14:56:31 +00:00
Tim Bentley
643801ae05 New alert tag features and song usage dialog 2010-02-09 14:44:36 +00:00
Jon Tibble
8240605839 Head r702 2010-02-09 12:20:56 +00:00
Jon Tibble
6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley
be4c40b401 Cleaner fix 2010-02-09 11:20:19 +00:00
Tim Bentley
fc9b8fcdad fix presentation import values 2010-02-09 08:28:34 +00:00
Tim Bentley
18760262ab Edit Cancel updating song by accident 2010-02-07 20:11:37 +00:00
Tim Bentley
8992f410a5 Bible fixes part 2 2010-02-06 16:51:18 +00:00
Jon Tibble
f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley
f5229ffaa4 Bible fixes 2010-02-06 15:33:23 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman
c1f5a78290 Merge from trunk 2010-02-06 15:39:14 +02:00
Raoul Snyman
bd4d2daa74 Removed now unnecessary file. 2010-02-06 15:23:38 +02:00
Raoul Snyman
f81968e62b Mis-named variable in QuickSearch click. 2010-02-06 15:22:26 +02:00
Raoul Snyman
92ef1f0d57 Fixed multi-verse dual bible. 2010-02-06 15:05:45 +02:00
Raoul Snyman
cf95b81a49 Last few fixes 2010-02-06 12:42:47 +02:00
Tim Bentley
a5dc0bd75d Set plugins up for alpha release 2010-02-06 10:33:33 +00:00
Raoul Snyman
78c525ab76 Moved data for web bibles to am SQLite database. 2010-02-06 12:22:20 +02:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Raoul Snyman
ce6738a976 Fixed up searching for non-latin characters in Bible book names. 
Removed an annoying exception to do with debug logging.
 2010-02-04 21:34:12 +02:00
Raoul Snyman
e465264630 Standardised manager name to "manager" 2010-02-04 19:38:21 +02:00
Tim Bentley
5838495bb4 Update remote client 2010-02-03 18:53:31 +00:00
Tim Bentley
b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00
Tim Bentley
632fae5a76 Remove print statements 2010-02-02 18:16:11 +00:00
Tim Bentley
377f3ad6ea Put the messagelistener back 2010-02-01 20:06:50 +00:00
Tim Bentley
17a08e3847 latest hacking 2010-02-01 19:42:52 +00:00
Raoul Snyman
01ec0f407f Fixed up some of the Bible loading 2010-01-31 22:36:54 +02:00
Raoul Snyman
db534dc2e8 Removed signals while they're still not working. 2010-01-31 21:51:23 +02:00
Raoul Snyman
2b5ddb13a4 An attempt to fix the problems some folks are having. 2010-01-31 21:49:01 +02:00
Raoul Snyman
ab7125c98e Make the progress bar only pop up when we *actually* fetch a verse from the Internet 2010-01-30 10:42:03 +02:00
Raoul Snyman
d45a9733af Fixed a bug in Windows and other versions of PyQt4 where "setProperty" was not available. Changed it to "setValue" which is what it's meant to be anyways. 2010-01-30 00:26:30 +02:00
Raoul Snyman
baabcba290 Changed the value of the progress bar to look a little more "active" 2010-01-29 23:35:02 +02:00
Raoul Snyman
0cbb079aa3 Added the little progress bar back in. 2010-01-29 23:26:24 +02:00
Raoul Snyman
965902544f Updated to trunk:HEAD 2010-01-29 23:12:14 +02:00
Raoul Snyman
0e29d0b4af Show a small progress bar rather than a "downloading" message. 2010-01-29 22:20:30 +02:00
Tim Bentley
1fd98217ab Pass active presentation types to other controllers 2010-01-29 13:06:47 +00:00
Tim Bentley
04d7a9227e Automate Presentation filters 2010-01-29 11:59:13 +00:00
Tim Bentley
dc6be31d1f Move changes to get displays working correctly and sort out Impress 2010-01-28 17:36:13 +00:00
Tim Bentley
af5bfe3066 Clean up SongUsage so it now works again 2010-01-28 07:15:23 +00:00
Tim Bentley
04c68a075e More Image Layer changes 2010-01-26 19:16:47 +00:00
Jon Tibble
9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Tim Bentley
dd18a4da76 Fix spacing of media items 2010-01-24 16:30:48 +00:00
Raoul Snyman
4a9a8149c4 Fixed up web Bibles. 
Renamed "csv.py" to "csvbible.py" to resolve a namespace conflict with the Python csv module.
 2010-01-24 09:08:14 +02:00
Tim Bentley
c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Raoul Snyman
a976d6b59a A few fixes after renaming some functions. 2010-01-17 18:48:45 +02:00
Raoul Snyman
c9e07d3b0c Cleaned up all them docstrings. 2010-01-17 10:56:25 +02:00
Tim Bentley
9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Raoul Snyman
a523d127bd Merge from trunk. 2010-01-11 17:07:53 +02:00
Raoul Snyman
027d6d3e4e Moved the stop import out of the base class, since Qt doesn't like it. 2010-01-11 17:03:16 +02:00
Tim Bentley
6ef3f6aadc Lots of fixes: 
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
 2010-01-09 09:34:06 +00:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Raoul Snyman
0374233db6 Lots of changes here, I think. 
- Pluggable import system
- The enumeration class provides the correct importer class
- Reworked Bible verse parsing, using regular expressions
- Reworked verse query method to accept multiple verse ranges
- Renamed lots of methods, which is probably gonna break lots of stuff
 2009-12-30 19:29:08 +02:00
Raoul Snyman
34ab7ea901 Started moving Bible formats to a generic system. 2009-12-28 01:54:00 +02:00
Raoul Snyman
6c7939bd71 Implemented canceling of imports and some better handling around the import process. 2009-12-28 00:19:39 +02:00
Raoul Snyman
8d04e4cc11 YEEEHAH! Revision 700! 2009-12-24 20:03:49 +02:00
Raoul Snyman
4f09b260db This time had to bribe the Line Length Police! 2009-12-24 20:01:39 +02:00
Raoul Snyman
c900ed9b5c Merged from HEAD. 
Cleaned up conflict.
Fixed a few other potential breaks.
Paid bail to the Line Length Police.
 2009-12-24 19:54:39 +02:00
Raoul Snyman
4500b02824 Moved openlp database upgrade script to scripts directory. 
Removed old bible import form.
Removed some debugging in the OSIS and bible db classes.
 2009-12-24 17:21:03 +02:00
Raoul Snyman
3e425803e3 Last few fixes for the OSIS importer. 2009-12-24 17:12:09 +02:00
Raoul Snyman
b7f224e280 99% of OSIS import now working. 2009-12-24 00:31:14 +02:00
Raoul Snyman
1181152c5a Trying to regexify and make the OSIS importer more robust. 2009-12-23 23:09:07 +02:00
Raoul Snyman
dc0f7e7f5a Finishing touches on the Import wizard and the OpenSong bible importer. 2009-12-21 22:58:00 +02:00
Raoul Snyman
e29a88e9a3 Final touches to the import Wizard; Fixed a few bugs in the OpenSong implementation. 2009-12-19 00:31:28 +02:00
Raoul Snyman
fa93b10b94 A pre-import working Import Wizard. 2009-12-16 22:52:44 +02:00
Tim Bentley
0cdc827a1d Fix up custom plugin issues 2009-12-16 17:54:45 +00:00
Raoul Snyman
77bf9b6f9a Web download bibles now load correctly. 2009-12-16 04:22:16 +02:00
Raoul Snyman
438c5cf00a Added an OpenSong implementation, a new import wizard, and validation for the import wizard. 2009-12-15 21:37:56 +02:00
Tim Bentley
1b1b811cb7 Custom display footer if Credit required 2009-12-14 18:10:00 +00:00
Tim Bentley
2f09c70274 Presentation cleanup - finished for now 2009-12-14 17:05:53 +00:00
Tim Bentley
be3fecac20 Sort out Presentation plugin Handler 
* Allow 2 presentations to work at same time
* Sort out live / preview issues to stop cross messaging
 2009-12-13 22:08:10 +00:00
Tim Bentley
d676430ffa Add option to Custom to suppress the footer. 
Not always needed for Copyright.
Default Required
 2009-12-13 08:57:58 +00:00
Tim Bentley
f7f0f18142 Fix bug with Verse Tags being lost when expanding or contracting the verse edit list 2009-12-13 08:28:51 +00:00
Tim Bentley
14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley
231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley
aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Tim Bentley
a745d15a98 Remove the media tab correctly 2009-12-05 09:44:44 +00:00
Tim Bentley
480fc4771f Fix up song tagging so case does not matter 
Fix bug in transitions when using images
Remove MediaTab as not wanted
 2009-12-05 08:05:11 +00:00
Tim Bentley
b8149cc826 Fix up Icon code to use isinstance 
Fix up code to ignore cases when doing tests.
 2009-12-04 20:25:48 +00:00
Tim Bentley
547074d29a Verse tagging verses must be in format of vX 2009-12-04 18:52:44 +00:00
Tim Bentley
156a70208b Add new types to verse editing 
Clean up dialog so looks better
Add controls around the editor in terms of validation
 2009-12-02 08:35:02 +00:00
Michael Gorven
9f5d1956ac Merge lp:~mgorven/openlp/copyright-symbol: Fix copyright symbol in translation strings. 
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399

bzr-revno: 683
 2009-12-01 09:13:35 +02:00
Raoul Snyman
17548726a1 Merge from HEAD 2009-11-30 22:34:45 +02:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice. 
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
 2009-11-30 22:29:26 +02:00
Raoul Snyman
47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Raoul Snyman
074b639635 Removed "Video Mode Rendering" as it is no longer relevant (or even related!) 2009-11-30 20:26:37 +02:00
Tim Bentley
6380cc5126 Fix up song verse expansion to handle no verse order 
Fix bug in slide controller when no slide and button is pressed
 2009-11-30 18:22:43 +00:00
Michael Gorven
ba89e6e1a2 Fix copyright symbol in translation strings. 2009-11-30 08:39:36 +02:00
Tim Bentley
939909fdd8 Remove Timer from transitions not needed 
Add Code to use the Verse Order to expand songs
 2009-11-29 21:03:24 +00:00
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley
f46cd2c6cb Song validation changes 2009-11-29 18:21:40 +00:00
Tim Bentley
ff8ab8f14f Fix song editing validation 2009-11-29 14:06:41 +00:00
Tim Bentley
d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Tim Bentley
2247d01d6f Verse Tag editing - Add, Edit, Edit All and save work 2009-11-28 07:50:12 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values 
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
 2009-11-27 21:54:37 +00:00
Raoul Snyman
d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley
1d359c7503 More Song tagging fixes 2009-11-26 18:41:39 +00:00
Tim Bentley
fe2d35a937 More song tagging changes - fixes 2009-11-23 17:54:47 +00:00
Tim Bentley
5e2beba4ea More song tagging changes 2009-11-23 17:28:21 +00:00
Tim Bentley
50aa143446 Save verse details 2009-11-22 20:51:52 +00:00
Tim Bentley
388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Tim Bentley
6139f049d4 Refactor Service Item and clean up Slide Controller 
bzr-revno: 673
 2009-11-15 16:57:11 +00:00
Tim Bentley
365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley
b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley
e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking. 
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
 2009-11-13 23:24:59 +02:00
Tim Bentley
8da19172a7 Slide Controller cleanups and Media bug fixes 
bzr-revno: 669
 2009-11-12 19:51:58 +00:00
Tim Bentley
124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +00:00
Tim Bentley
f0e0cfa4c1 Head552 2009-11-08 07:22:12 +00:00
Jonathan Corwin
c10b4742be Presentation fixes 
bzr-revno: 662
 2009-11-07 19:39:52 +00:00
Jonathan Corwin
337df8da9f Fix Impress off-by-one and slow slide update problems Meths found 2009-11-07 16:45:49 +00:00
Tim Bentley
1bedf56dc3 Plugin clean ups 
bzr-revno: 661
 2009-11-07 16:19:18 +00:00
Tim Bentley
2e02f1c94f Remove "Can_be_disabled" as no longer require 
Sort out status handling in plugin form.
 2009-11-07 07:42:18 +00:00
Tim Bentley
6148d845ae Headr660 2009-11-07 06:49:14 +00:00
meths@btinternet.com
eba4115490 Fix file handling 
bzr-revno: 660
 2009-11-07 06:45:25 +00:00
Tim Bentley
87d3cbf289 Remote editing for custom and theme fix 
bzr-revno: 659
 2009-11-07 00:05:34 +00:00
Jon Tibble
ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Jonathan Corwin
65736ef8d1 Fix a couple of issues with last commit 2009-11-06 19:23:58 +00:00
Tim Bentley
38e3ca66cb Fix error in previous merge for ThemeManager 
Get Custom Working with remote editing
 2009-11-06 18:50:46 +00:00
Tim Bentley
4f495da735 Remote Edit for Custom 2009-11-06 17:36:18 +00:00
Jonathan Corwin
e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Tim Bentley
536d26f5db Headr656 2009-11-05 16:43:54 +00:00
Jon Tibble
d5e2ba7808 Fix double checks 2009-11-05 00:28:05 +00:00
Tim Bentley
03607395eb Song editing utf8 fixes part 2 2009-11-04 19:13:49 +00:00
Tim Bentley
3929792bea Headr655 2009-11-04 18:53:19 +00:00
Tim Bentley
f4d373e7a5 Song editing utf8 fixes part 1 2009-11-04 18:53:05 +00:00
Jon Tibble
0ea45cd366 Head with correct song edit fix 2009-11-04 18:21:08 +00:00
Tim Bentley
4e9aa7f142 Fix song editing error messages 
bzr-revno: 654
 2009-11-04 18:16:35 +00:00
Tim Bentley
4a05f6e9cf Fix song editing 2009-11-04 17:48:46 +00:00
Jon Tibble
2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble
85d4466c76 Head r653 2009-11-03 19:21:58 +00:00
Tim Bentley
7029235f45 Expansion and Song editing fixes 
bzr-revno: 653
 2009-11-03 19:12:02 +00:00
Jon Tibble
c2a0944e6b More truth testing cleanup - plugins 2009-11-03 19:01:53 +00:00
Tim Bentley
2d690c209d Fix phantom expansion in Service Manager 2009-11-03 18:39:58 +00:00
Jon Tibble
51915d0e97 Truth testing cleanup 2009-11-03 15:13:52 +00:00
Tim Bentley
8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Jon Tibble
debaf91298 Fix media icon initialisation 2009-11-03 01:38:15 +00:00
Jon Tibble
7767746f7a More usability fixes 2009-11-03 01:12:35 +00:00
Tim Bentley
29119c91a4 Minor fixes and copyright 
bzr-revno: 649
 2009-11-02 17:30:37 +00:00
Tim Bentley
0a6e3f47c7 Headr468 and fix 2009-11-02 17:24:27 +00:00
Jon Tibble
9b0f62d01e Fix plugin translation 2009-11-01 23:15:19 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
e96f54758d Headr646 2009-11-01 20:26:21 +00:00
Tim Bentley
d58327435a Media is starting to work - just 
bzr-revno: 646
 2009-11-01 20:21:49 +00:00
Tim Bentley
f014c633ac Clean up the version code and remove not required file 
bzr-revno: 645
 2009-11-01 20:18:00 +00:00
Tim Bentley
6df0649fbc Video cleanup part1 2009-11-01 16:06:59 +00:00
Tim Bentley
70b04f5821 Headr644 2009-11-01 15:31:22 +00:00
Tim Bentley
201fce5bba Headr642 2009-11-01 15:29:53 +00:00
Tim Bentley
282c6a4b5e Remove unused file 2009-11-01 15:28:06 +00:00
Tim Bentley
3cbd601e1c Fix up editing code from Preview and ServiceManager 
bzr-revno: 643
 2009-11-01 15:25:36 +00:00
Tim Bentley
9dae67ac0a Clean up version notifications and checking 2009-11-01 09:07:10 +00:00
Tim Bentley
3349a8fd82 Headr642 2009-10-31 20:39:52 +00:00
Tim Bentley
8420e4a438 Custom plugin fixes 2009-10-31 20:38:57 +00:00
Tim Bentley
7a349c998e Fix up handling of service items in the slide controllers and stop editing issues 2009-10-31 20:27:08 +00:00
Jon Tibble
2d464e0d15 Fix typos 2009-10-31 16:17:26 +00:00
Tim Bentley
686f34b7f9 Remote Song Editing Finished - minor other changes 
bzr-revno: 641
 2009-10-31 11:58:47 +00:00
Tim Bentley
9eeaf98b66 Fix error handling for double exception call. Added debugging for Song XML class 2009-10-31 10:19:30 +00:00
Tim Bentley
4eaa7a1535 Finish remote editing of ServiceManager by updating live 2009-10-31 08:45:24 +00:00
Tim Bentley
b6ada60177 Fixes to Renderer etc 
bzr-revno: 640
 2009-10-30 22:15:50 +00:00
Tim Bentley
b16a8cc452 Headr639 2009-10-30 21:47:15 +00:00
Tim Bentley
7b1de0f995 Move version check 2009-10-30 21:45:38 +00:00
Jon Tibble
28a223bc06 Fix double loading 2009-10-30 20:34:11 +00:00
Tim Bentley
48e750ded2 Add Save service on New code, and configuration to turn it off. 2009-10-30 20:14:55 +00:00
Jon Tibble
68a7fbcf56 Fix bible function call 2009-10-30 19:29:02 +00:00
Jon Tibble
ae67228139 Fix OnNewPrompt i18n 2009-10-30 19:15:25 +00:00
Jon Tibble
7eb86b1580 Plugin cleanups and more i18n 2009-10-30 17:44:16 +00:00
Tim Bentley
0d959fbfb1 Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit 2009-10-30 06:43:28 +00:00
Jon Tibble
fb1da41f34 Fix song icon in services 2009-10-30 01:27:30 +00:00
Jon Tibble
fe9728f187 Finish the copyright updating 2009-10-30 01:26:45 +00:00
Jon Tibble
490b19ddc2 Enable media additions to ServiceManager and fixes 2009-10-29 18:25:34 +00:00
Jon Tibble
1db3cda76b Head r637 2009-10-29 17:19:04 +00:00
Jon Tibble
359c2bee42 TRB Fixes 2009-10-29 17:16:24 +00:00
Tim Bentley
2f03004bcd Minor fixes 
bzr-revno: 637
 2009-10-29 16:21:58 +00:00
Tim Bentley
81de929460 Minor fixes 2009-10-29 15:57:58 +00:00
Tim Bentley
61aeb43240 Headr635 2009-10-29 15:35:37 +00:00
Jon Tibble
1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +00:00
Tim Bentley
3c6d1e7efb Edit Songs and Custom for Service Manager and auto replace 
bzr-revno: 634
 2009-10-29 15:10:58 +00:00
Tim Bentley
1c11b93180 Works for now 2009-10-29 13:48:50 +00:00
Tim Bentley
472857535f headr632 2009-10-29 13:44:52 +00:00
Tim Bentley
302d29ea85 More remote edit changes 2009-10-29 13:44:33 +00:00
Jon Tibble
eb61003c8e Fix plugintabs i18n 
bzr-revno: 632
 2009-10-29 13:00:48 +00:00
Tim Bentley
0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Tim Bentley
d93551caf3 Add more bible sources and improve handling 
bzr-revno: 631
 2009-10-29 07:31:27 +00:00
Tim Bentley
b447e382ad Strange spacing appeared from nowhere 2009-10-29 06:45:37 +00:00
Tim Bentley
8e4f69383c Style fixes 2009-10-29 06:24:53 +00:00
Jon Tibble
8de21d057f PluginNameVisible without splitting __init__ 2009-10-29 01:48:43 +00:00
Jon Tibble
5ed004c772 Fix PresentationPlugin finalising 2009-10-28 22:22:35 +00:00
Jon Tibble
439c3c90ca Fix i18n for visible and non-visible title use 2009-10-28 21:04:14 +00:00
Tim Bentley
ccb54e4faf BibleGateway - Download files and add to selections 2009-10-28 20:57:14 +00:00
Tim Bentley
19e8682bf8 Add BibleGateway List and access it 2009-10-28 18:35:06 +00:00
Jon Tibble
2eccd57aca Fix mediaitem.pys i18n 2009-10-28 01:36:24 +00:00
Jon Tibble
c34d452bb6 Fix plugintab.py i18n 2009-10-28 01:17:35 +00:00
Tim Bentley
db392aa086 Fix typos 2009-10-27 20:52:30 +00:00
Tim Bentley
fe625ee1ff Move Audit to SongUsage , Return of BibleGateway part1. Additions to SlideController 
bzr-revno: 630
 2009-10-27 20:49:16 +00:00
Tim Bentley
0e5ed927c1 More BibleGateway work - no prints 2009-10-27 17:25:58 +00:00
Tim Bentley
1c0ce26e54 More BibleGateway work 2009-10-27 16:55:09 +00:00
Tim Bentley
60649e3624 Move Audit to SongUsage 2009-10-27 08:38:02 +00:00
Tim Bentley
03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +00:00
Jon Tibble
abafa78958 Head r629 2009-10-26 23:51:48 +00:00
Tim Bentley
3ee930f6ae Fix Line split code. Stop SlideController being editied 2009-10-26 16:19:26 +00:00
Tim Bentley
6dd0db436e Split if line contains 3 --- can allow for spaces at end of line 2009-10-26 08:23:43 +00:00
Tim Bentley
4833f7cd0b Add Song Tab option to remove them 2009-10-26 06:30:08 +00:00
Tim Bentley
9569042275 Yet more audit work 2009-10-26 05:36:19 +00:00
Tim Bentley
3f69bb7635 "Save and Preview" added to Song editor 2009-10-25 18:07:23 +00:00
Tim Bentley
5f25ffd267 Headr626 2009-10-25 14:41:29 +00:00
Tim Bentley
68bc9bf526 Audit report work 2009-10-25 14:41:15 +00:00
j@corwin.co.uk
4871acd05c More presentation fixes 
bzr-revno: 626
 2009-10-25 14:39:45 +00:00
Tim Bentley
bad24ee614 Finally fix redisplaying of correct slide 2009-10-25 08:09:41 +00:00
Jonathan Corwin
60b0120e56 Fix merge conflict 2009-10-24 20:53:49 +01:00
Tim Bentley
7b85b9c7af More Song editing fixes 2009-10-24 20:43:16 +01:00
Jonathan Corwin
e0f9f3f09e Keep item in slidecontroller in sync with presentation, and detect external slide changes. 2009-10-24 20:22:00 +01:00
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley
df886ef501 Headr622 2009-10-24 16:54:37 +01:00
Tim Bentley
6d5505dbc6 Fix Song editing 2009-10-24 16:54:07 +01:00
Jon Tibble
d61b8b95df Fix imports and config item 
bzr-revno: 622
 2009-10-24 16:47:14 +01:00
Tim Bentley
23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +01:00
Tim Bentley
76fa3438c4 Headr621 2009-10-24 10:55:25 +01:00
Raoul Snyman
a94f5c9e0d Merge from lp:~raoul-snyman/openlp/i18n 
bzr-revno: 621
 2009-10-24 11:33:20 +02:00
Tim Bentley
2181655239 Headr620 2009-10-24 06:59:07 +01:00
Tim Bentley
cdf4e46b07 Fix abbriviations for searchs 2009-10-24 06:58:49 +01:00
Jon Tibble
21882cd15d Stray config item under image instead of images 2009-10-24 00:42:53 +01:00
Jonathan Corwin
b8810abd4b Impress fixes 2009-10-23 21:22:16 +01:00
Raoul Snyman
90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Raoul Snyman
8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Jon Tibble
27d92e9202 Head r617 2009-10-22 14:44:24 +01:00
Tim Bentley
20ca8340b9 Fix up bible plugin so it works again 2009-10-21 17:54:59 +01:00
j@corwin.co.uk
d101a38c1c Presentation fixes for Impress 
bzr-revno: 616
 2009-10-21 17:02:37 +01:00
raoul.snyman@saturnlaboratories.co.za
adc769fff0 Fix Bible Media manager look and feel 
bzr-revno: 615
 2009-10-21 05:57:45 +01:00
Jonathan Corwin
f17ae4dcb3 Fix a couple of Impress load/reload bugs 2009-10-20 23:36:08 +01:00
Jon Tibble
e37ae62079 Initial video fudging! 2009-10-19 18:51:21 +01:00
Jon Tibble
7f773a314b General fixes 
bzr-revno: 610
 2009-10-19 18:17:38 +01:00
Jon Tibble
fc61d7fe55 Fixups 2009-10-19 15:56:44 +01:00
Raoul Snyman
4d83753b10 Tidied up the bible media manager item. 2009-10-18 20:15:20 +02:00
Raoul Snyman
d2c8d8bbce Some more style fixes for Windows; Fixed spacing on Songs media manager. 2009-10-18 19:06:34 +02:00
Tim Bentley
486f5ce709 Head 2009-10-18 07:27:15 +01:00
Tim Bentley
0b053a2e54 Spelling fixes 2009-10-18 07:26:36 +01:00
Jonathan Corwin
c491a19be8 Merged in lp:~j-corwin/openlp/present 
bzr-revno: 607
 2009-10-17 22:04:12 +02:00
Tim Bentley
2961a8b020 Head 2009-10-17 20:17:44 +01:00
Raoul Snyman
3e4f07be6e Merge from lp:~raoul-snyman/openlp/uifixes 
bzr-revno: 606
 2009-10-17 21:14:39 +02:00
Jonathan Corwin
2ae79a4480 HEAD 2009-10-17 20:06:06 +01:00
Jonathan Corwin
3b10559af5 Get slide previews in impress working 2009-10-17 19:56:31 +01:00
Raoul Snyman
68f8b1e45f Fixed a bug where a warning was generated about layouts. 
Made the media manager items stand out a little more, and enhanced the currently selected one.
 2009-10-17 20:41:56 +02:00
Tim Bentley
d5b5549ca0 Head 2009-10-17 19:20:55 +01:00
Raoul Snyman
7607d80254 Merged in lp:~raoul-snyman/openlp/uifixes 
bzr-revno: 605
 2009-10-17 20:16:27 +02:00
Tim Bentley
f5e3c046df Presentations - Can be disabled now! 2009-10-17 18:44:07 +01:00
Tim Bentley
0828335939 Bible Plugin - Hide Duel verse Combo be default 2009-10-17 07:12:38 +01:00
Tim Bentley
742eac2487 Bible Plugin loses searc as type 2009-10-17 06:49:54 +01:00
Tim Bentley
025d7c86d2 Songs Plugin get search as you type 2009-10-17 06:47:17 +01:00
Jonathan Corwin
bb619ce325 Show powerpoint slide thumbnails in slidecontroller 2009-10-17 00:34:56 +01:00
Raoul Snyman
a35d205cea Reducing spacing on media manager items. 2009-10-16 20:41:41 +02:00
Jonathan Corwin
ee069cbcab Error handling for Impress being closed during presentation 2009-10-15 22:49:31 +01:00
Tim Bentley
fa6cb6020a fixes from merge 2009-10-14 19:27:44 +01:00
Tim Bentley
6904ac2145 Web Bibles to Advanced Tab complete for now 2009-10-14 17:27:46 +01:00
Tim Bentley
dfe31f370d More bible changes 2009-10-14 06:13:09 +01:00
Tim Bentley
1bca1cf4cf More bible changes 2009-10-14 06:08:36 +01:00
Tim Bentley
cc71923682 Bible plugin clean up and Quick web setup 2009-10-12 11:18:54 +01:00
Tim Bentley
4f997d4fb2 Head 2009-10-12 07:21:31 +01:00
Tim Bentley
4a1b826e66 Cleanups 2009-10-12 07:21:17 +01:00
Tim Bentley
8f66346828 Various changes and fixes 
bzr-revno: 597
 2009-10-12 07:19:06 +01:00
j@corwin.co.uk
47a75cae2f More Presentation fixes 
bzr-revno: 596
 2009-10-12 07:18:02 +01:00
Tim Bentley
d0b501bd2f Fixes to last merge request 2009-10-12 05:43:02 +01:00
Jonathan Corwin
bb4ab294c1 Attempt to detect silly user errors, like closing down PowerPoint/PPTViewer whilst halfway through a presentation. 2009-10-11 22:31:27 +01:00
Tim Bentley
1adb391797 Audit Cleanup - part 1 2009-10-11 12:08:47 +01:00
Tim Bentley
018d217b61 Plugins now hide and reappear correctly 2009-10-10 14:39:32 +01:00
Tim Bentley
4f1241e60f More hiding changes 2009-10-10 14:13:57 +01:00
Tim Bentley
444e1796cf Head 2009-10-10 05:56:25 +01:00
Jon Tibble
75af51b460 Song theme fix and remove unused variables 2009-10-09 23:46:35 +01:00
Jon Tibble
fcaf9e912a Bible rendering fixes 
bzr-revno: 592
 2009-10-09 23:38:21 +01:00
Tim Bentley
79cfb6d843 Bible New features and Clean up 2009-10-09 18:57:15 +01:00
Tim Bentley
34b95be0b7 Fix Bible plugin rendering 2009-10-09 13:48:22 +01:00
Jonathan Corwin
ed7e2a9724 Controllers cleanup if presentation deleted. Prevent ppt files with same name. Only create thumbnails if out of date 2009-10-09 00:24:26 +01:00
Tim Bentley
14439e053a Fix song issue 
bzr-revno: 590
 2009-10-08 20:35:24 +01:00
Tim Bentley
05fe475db0 Presentations add code but leave for now - Angels fear to tread 2009-10-08 18:31:21 +01:00
Tim Bentley
afff83113f Songs now play hide and seek 2009-10-08 18:28:59 +01:00
Tim Bentley
5d32ce5e66 More cleanups, Bibles and media done 2009-10-08 06:02:39 +01:00
Jonathan Corwin
ad72874d03 Incorrect case on method call 2009-10-08 00:09:24 +01:00
Jonathan Corwin
49bce996ff Presentation slide preview images 2009-10-07 23:49:48 +01:00
Tim Bentley
85a0c245ea Clean up disenablement 2009-10-07 17:16:21 +01:00
Tim Bentley
cfc82e7407 Cleanup hinding code and move to disable for now 2009-10-07 06:09:35 +01:00
Tim Bentley
9a8c045f2b Add Ability to hide plugins 
bzr-revno: 587
 2009-10-05 16:14:48 +01:00
Tim Bentley
9325ed0521 Head 2009-10-04 16:01:11 +01:00
Jonathan Corwin
1cf3c9a223 Support blank/first/last buttons in presentations 2009-10-03 20:18:59 +01:00
Tim Bentley
b94d1d1b8f Sort out Settings tab items 2009-10-03 20:02:40 +01:00
Tim Bentley
39a9f8efac Media Itmes now hide them selves correctly 2009-10-03 19:39:44 +01:00
Tim Bentley
c4f8fc86cd Sort out Initialistion order and Plugin Status code 2009-10-03 14:08:18 +01:00
Tim Bentley
9ec94494e8 Audit can now be disabled dynamically 2009-10-03 12:07:58 +01:00
Tim Bentley
37a9b5fb4e Plugin List Combo boxhandling finished 2009-10-03 08:25:41 +01:00
Tim Bentley
0408a0a320 Start of Active / Inactive work 2009-10-02 20:06:07 +01:00
Jon Tibble
6d00aef525 Dialogs, Exceptions and Toolbars 
bzr-revno: 584
 2009-10-02 12:50:57 +01:00
Jon Tibble
ce18ee8e7a Dialogs, Exceptions and PushButtons 2009-10-02 00:43:16 +01:00
Tim Bentley
c64584f888 Plugin abouts fixed 2009-10-01 18:19:46 +01:00
Tim Bentley
759bc34069 Plugin abouts 2 2009-10-01 17:58:05 +01:00
Tim Bentley
e0f28ce493 Plugin abouts 2009-10-01 17:56:42 +01:00
Jonathan Corwin
1f9eb94682 New checkinstalled method. Lets see if I can break launchpad again 2009-09-30 21:24:37 +01:00
Jonathan Corwin
e639b31936 *sigh* and again 2009-09-30 20:37:45 +01:00
Jonathan Corwin
bbef55326b Individual presentation controllers are now completely self-contained. 
(left out dll to see if breaks the merge, so powerpoint viewer won't work anymore. If this succeeds and is approved I'll then try pushing the dll separately)
 2009-09-30 20:26:51 +01:00
Tim Bentley
9efa28ce07 Head 2009-09-29 18:05:34 +01:00
Jon Tibble
1a7ad33bf9 Use buildIcon and general fixes all over 2009-09-29 03:54:32 +01:00
Tim Bentley
b11a068a8f Inspired by Jon 2009-09-28 21:45:04 +01:00
Tim Bentley
4813290275 head 2009-09-28 21:03:05 +01:00
Jonathan Corwin
c67ea1f304 Don't start the presentation app unless requested 2009-09-28 20:34:55 +01:00
Tim Bentley
ce7857fd66 Jon missed these 2009-09-28 18:45:14 +01:00
Tim Bentley
4aae4fa317 Head 2009-09-28 18:17:12 +01:00
Jonathan Corwin
10cb26d12d Fix powerpoint output geometry 2009-09-27 22:49:00 +01:00
Tim Bentley
911e8ffaf2 Head 2009-09-27 13:56:37 +01:00
Tim Bentley
9ff310eebe Cleanups 2009-09-27 13:56:14 +01:00
Tim Bentley
6628beebf3 Audit changes and cleanups 
bzr-revno: 576
 2009-09-27 13:47:28 +01:00
j@corwin.co.uk
bf6a744722 Jons Presentation merge with hack to fix conflicts 
bzr-revno: 575
 2009-09-27 13:44:11 +01:00
Tim Bentley
e3998431fc Bible Plugin visual change and shorten delay 2009-09-27 08:22:23 +01:00
Jonathan Corwin
d94abc85e6 It helps to add new files 2009-09-26 22:00:45 +01:00
Jonathan Corwin
c01ed3eb84 Inherit from presentationcontrollers plus powerpoint 2009-09-26 21:51:05 +01:00
Tim Bentley
9c4e5ae137 General cleanups Jon missed 2009-09-26 19:22:10 +01:00
Tim Bentley
459a728443 translations for OSIS bibles 2009-09-26 15:36:08 +01:00
Tim Bentley
9e1b9031c1 Audit Selective Delete complete 2009-09-26 15:05:06 +01:00
Tim Bentley
b37692b326 Audit Delete Date cleanup 2009-09-26 14:35:44 +01:00
Tim Bentley
6637f88892 Plugin updates 
bzr-revno: 574
 2009-09-26 13:10:41 +01:00
Tim Bentley
2c64f1186a Plugin standardisation and clanups 2009-09-26 10:11:39 +01:00
Tim Bentley
4615f25963 Song Plugin Cleanup 2009-09-26 08:13:59 +01:00
Tim Bentley
9f04b6f478 More audit changes and dynamic image backgrounds 2009-09-26 07:46:26 +01:00
Jon Tibble
8a44484aee Fix None testing and general cleanups 2009-09-26 00:06:54 +01:00
Jonathan Corwin
96e3f7bce6 Inherit common presentationcontroller 2009-09-25 23:20:34 +01:00
Tim Bentley
14277fdbfd Add dialog forms to Audit 2009-09-25 21:12:35 +01:00
Tim Bentley
2fd14de465 Remove Powerpoint for Linux Users 2009-09-25 17:23:44 +01:00
Tim Bentley
b08a5c3f65 Head 2009-09-25 16:49:00 +01:00
Jon Tibble
d50a41b904 Imports clean up 
bzr-revno: 571
 2009-09-25 15:36:35 +01:00
Jon Tibble
8777ca29a7 Import fixes 2009-09-25 15:13:33 +01:00
Tim Bentley
21090eccc5 Audit Menus 2009-09-25 06:16:01 +01:00
Tim Bentley
32ee1d36d4 Bring Custom and Song editing in line 2009-09-25 05:51:40 +01:00
Tim Bentley
3ec9771a9c Head 2009-09-25 05:34:27 +01:00
Tim Bentley
71c4b7c998 Remore lines 2009-09-25 05:34:13 +01:00
Jon Tibble
e5db2456e7 Remove unused imports 2009-09-25 01:43:42 +01:00
Jonathan Corwin
7c9c45cb36 People might prefer to display their own powerpoint, rather than a hard-coded one 2009-09-24 22:44:47 +01:00
Jonathan Corwin
7dec1ff8f9 Hoorah, got the powerpoint viewer to display a ppt from within openlp 2009-09-24 21:56:13 +01:00
Jonathan Corwin
1a6a672968 Only import powerpoint/pptviewer on Windows 2009-09-24 19:46:16 +01:00
Tim Bentley
65a13b3c76 Audit Changes to database 
bzr-revno: 568
 2009-09-24 16:49:17 +01:00
Jon Tibble
2aa5c4104b Code clean ups 
bzr-revno: 567
 2009-09-24 11:53:13 +01:00
Jonathan Corwin
3a9cd0ff03 Merge from lp:~j-corwin/openlp/presentations 
bzr-revno: 566
 2009-09-24 10:54:38 +02:00
Jonathan Corwin
6421f1d493 Minor adjustments 2009-09-24 08:35:30 +01:00
Tim Bentley
9df75953b3 Fix table for null fields 2009-09-24 05:48:12 +01:00
Tim Bentley
7f5ad5df7a Force code to recompile 2009-09-24 05:32:24 +01:00
Tim Bentley
3ce692bbac Fix audit to not crash, add copyright to DB and fix CCL 2009-09-24 05:31:33 +01:00
Jonathan Corwin
4ca4fa8f23 Update PptviewController as per ImpressController 2009-09-23 23:39:37 +01:00
Jonathan Corwin
85b647e3c3 Fix to pick up 2007 viewer correctly. Assembly now built as "release" with Visual C++ Express 2008 and with any luck will now work on other Window PC's 2009-09-23 21:40:19 +01:00
Tim Bentley
44ecfe6dd3 Minor changes and clean ups 2009-09-23 19:49:26 +01:00
Tim Bentley
39f4cdfcc9 Audit database addition insert 2 2009-09-23 18:36:22 +01:00
Tim Bentley
51fb1533bd Audit database addition insert 1 2009-09-23 17:33:30 +01:00
Tim Bentley
0ec1362424 Audit database addition built 2009-09-23 16:57:38 +01:00
Tim Bentley
cea3de26fa Audit database addition 2009-09-23 16:51:03 +01:00
Tim Bentley
b44b7e404b Audit database 2009-09-22 20:37:36 +01:00
Tim Bentley
3821af30b7 Audit database 2009-09-22 20:36:25 +01:00
Tim Bentley
341916d610 head and merge fixes 2009-09-22 20:23:12 +01:00
Tim Bentley
49e856021a Add database to audit 2009-09-22 20:20:11 +01:00
Jon Tibble
69de990aa5 More spacing 2009-09-22 18:43:07 +01:00
Jon Tibble
873e16f3a6 Double space cleanup 2009-09-22 00:11:50 +01:00
Jon Tibble
44ee6c3a4f Runtime fix 2009-09-21 20:38:25 +01:00
Jon Tibble
a224d6a895 Improve readability for white space patch 2009-09-21 20:26:10 +01:00
Tim Bentley
d23f03bf9c Plugin cleanups - Image and Audit 2009-09-21 20:23:51 +01:00
Jon Tibble
98ea9141f4 More white space and line length fixes 2009-09-21 18:56:36 +01:00
Jon Tibble
e0a7dd7335 Fix song editor Add Theme button 2009-09-21 03:42:59 +01:00
Jon Tibble
a4da4bae72 Fix song editor bugs - take 2 2009-09-21 01:47:10 +01:00
Jon Tibble
f684ffb0c3 Fix partial song creation scenario 2009-09-21 01:12:47 +01:00
Jon Tibble
2fbce78381 Clean up code and fixes 2009-09-20 00:05:30 +01:00
Jon Tibble
becaf33dde Refactor services 2009-09-19 22:45:50 +01:00
Tim Bentley
645983f415 Add audit File and state handling 2009-09-19 20:45:15 +01:00
Tim Bentley
88c66b368c Add audit File and state handling 2009-09-19 20:31:18 +01:00
Tim Bentley
2726479988 Arrival of the Audit 
bzr-revno: 551
 2009-09-18 17:33:35 +01:00
Tim Bentley
9096d1960c Fix data format 2009-09-18 17:06:39 +01:00
Jon Tibble
39499c712c Merge log.exception() conversion 
bzr-revno: 550
 2009-09-18 17:06:25 +01:00
Tim Bentley
3a4bb91633 Fix data format 2009-09-18 16:54:15 +01:00
Tim Bentley
05ea84fe1d head 2009-09-18 16:40:36 +01:00
Jon Tibble
803aa6213d Complete half changed line in log.exception conversion 2009-09-18 12:55:26 +01:00
Tim Bentley
8d04804865 Audit cleanup from last merge 2009-09-18 11:47:57 +01:00
Tim Bentley
66ec702dec head 2009-09-18 11:36:32 +01:00
Tim Bentley
1dcb3ef5e6 presentation review fix 2009-09-18 11:26:26 +01:00
Tim Bentley
43b7951693 Fix presentation array issue 2009-09-18 07:07:10 +01:00
Jon Tibble
a5fb1d05ef Change logging sys.exc_info() to log.exception 2009-09-18 00:10:25 +01:00
Tim Bentley
8b65992307 requested cleanups 1 2009-09-17 19:24:13 +01:00
Jonathan Corwin
2207c96005 Impress support on Windows, via COM 2009-09-17 08:28:47 +01:00
Tim Bentley
0c6a1d5762 head 2009-09-16 20:03:11 +01:00
Jon Tibble
ff166980a1 For Jon 
bzr-revno: 545
 2009-09-16 19:54:49 +01:00
Tim Bentley
6b73581ec5 Head 2009-09-16 19:40:38 +01:00
Tim Bentley
02f839f5cc Audit UI 3 2009-09-16 19:37:25 +01:00
Jon Tibble
b229f5b5ad Remove unwanted button sizing 2009-09-16 11:50:13 +01:00
Tim Bentley
1cc973b334 Audit UI 2 2009-09-16 06:01:11 +01:00
Tim Bentley
74ac4adfe4 Audit UI 2009-09-16 05:59:38 +01:00
Jon Tibble
d3d5e9846e Remove GST 2009-09-15 22:59:20 +01:00
Jon Tibble
ccb1289c14 User interface tweaks 2009-09-15 19:56:56 +01:00
Tim Bentley
111c007526 Add audit event to slide times and trigger when added to live 2009-09-15 06:13:33 +01:00
Jon Tibble
77edf564fa Temp fix for size issue, cleanups in media and runtime output 2009-09-14 23:10:08 +01:00
Tim Bentley
889a10c4af head 2009-09-13 19:42:45 +01:00
Jon Tibble
df7016c22d dos2unix run on trunk r535 2009-09-13 16:14:45 +01:00
Tim Bentley
1ef543253c Fix up Presentations so Impress works! 2009-09-13 08:39:48 +01:00
Tim Bentley
ca919b74c3 Correct settings 2009-09-13 07:25:07 +01:00
Tim Bentley
baf967bf2a head 2009-09-12 19:27:17 +01:00
Jon Tibble
01efadc058 Merged in lp:~meths/openlp/trivialfixes 
bzr-revno: 533
 2009-09-12 19:31:03 +02:00
Raoul Snyman
43dc7e6b90 Merged in lp:~raoul-snyman/openlp/docstrings 
bzr-revno: 532
 2009-09-12 19:24:16 +02:00
Jon Tibble
bdaced63a3 Fix song list reloading bug 2009-09-11 22:34:05 +01:00
Tim Bentley
f4966a655e Head 2009-09-11 20:30:12 +01:00
Tim Bentley
07452df24a fixes to custom and save state of screen 2009-09-11 20:29:57 +01:00
Tim Bentley
1ca02a3536 Custom Plugin cleaup 2 2009-09-11 05:56:52 +01:00
Tim Bentley
3c3c1f19ce Custom Plugin cleaup 2009-09-11 05:54:22 +01:00
Raoul Snyman
0df9e356a6 Bringing up to date with trunk. 2009-09-10 20:15:40 +02:00
Tim Bentley
e0a2e5e1f3 For space police 2009-09-09 19:09:17 +01:00
Tim Bentley
457885019b Custom editing fix part 2 2009-09-09 18:40:12 +01:00
Tim Bentley
cb1d5c2abb Custom editing fix part 1 2009-09-09 18:30:33 +01:00
Tim Bentley
05761ef442 Song editing fix - final 2009-09-09 18:02:44 +01:00
Tim Bentley
d7ecd8a493 Song editing fix 2009-09-09 18:01:02 +01:00
Tim Bentley
4dd19eb643 Song editing fix 2009-09-09 17:34:24 +01:00
Raoul Snyman
fb9914fb08 Changed the license info from docstrings to normal comments. 2009-09-08 21:58:05 +02:00
Jon Tibble
38ff2f92ac Fix typo in previous commit 2009-09-08 18:51:34 +01:00
Raoul Snyman
4cfd7dfbaa Attempt to fix a bug where the song list is never updated. 2009-09-08 17:21:30 +02:00
Jon Tibble
0efcf15752 Move network code to initialise(). Add weight to plugin attibutes documentation 2009-09-07 21:39:17 +01:00
Tim Bentley
9ec28564ee Head again 2009-09-07 20:00:41 +01:00
Tim Bentley
b734da3aa6 More Presentation Hacks, Remotes gets activation option 2009-09-07 20:00:24 +01:00
Jon Tibble
44e3050577 Latest merge from lp:~meths/openlp/trivialfixes 
bzr-revno: 525
 2009-09-07 20:49:27 +02:00
Tim Bentley
c1ccf8752f Head 2009-09-07 18:07:29 +01:00
Tim Bentley
28d52460d4 Reanme files 2009-09-07 18:06:11 +01:00
Raoul Snyman
9f12188b4f Merged lp:~raoul-snyman/openlp/docstrings into trunk. 
bzr-revno: 524
 2009-09-07 08:16:53 +02:00
Tim Bentley
feca90483a Cleanups from Last merge and documentation 2009-09-07 06:13:39 +01:00
Tim Bentley
4a5767a5cf Move fixups for Presentations 2009-09-06 20:23:57 +01:00
Raoul Snyman
e4756a1c6c Merge latest code from trunk, plus more modifications to docstrings. 2009-09-06 20:47:48 +02:00
Jon Tibble
169dcff9f6 Fix incorrect ( \ newline characters, fix == spacing and other code style fixes noticed 2009-09-06 14:57:32 +01:00
Tim Bentley
e613cdac81 Presentation plugin - still getting there 2009-09-06 09:11:32 +01:00
Tim Bentley
7e398174cf Presentation plugin - getting there 2009-09-05 20:58:02 +01:00
Tim Bentley
3784838a36 Presentations - service item handling 2009-09-05 14:30:09 +01:00
Tim Bentley
984915a979 Missing files - oops 2009-09-05 09:58:29 +01:00
Tim Bentley
00eecfc8c2 Presentation Plugin - cleanup 2009-09-05 09:52:01 +01:00
Tim Bentley
b94f091fb2 Cleanups and fixes 2009-09-05 07:29:23 +01:00
Raoul Snyman
88a9eb020f Make the "Edit All" button work! 2009-09-04 19:19:54 +02:00
Jon Tibble
796ad1f4cf Fix compilation errors in openlp dir 2009-09-03 16:19:30 +01:00
Raoul Snyman
a077fe40eb Updated the documentation more. Moved the Songs plugin out into it's own file. 2009-09-02 22:42:57 +02:00
Jon Tibble
cd3fe8b38f Whitespace, linewrap and spelling fixes 2009-09-02 02:44:09 +01:00
Tim Bentley
20303b1812 Plugin Clean up for trying to display non selected items 2 2009-09-01 06:17:32 +01:00
Tim Bentley
3ba22197dd Plugin Clean up for trying to display non selected items 2009-08-31 22:53:35 +01:00
Tim Bentley
94a3513bb1 Saving OOS changes and other cleanups 2009-08-31 19:27:36 +01:00
Tim Bentley
4c2b9fe426 Presentation changes - Items to service Manager 2009-08-31 15:04:00 +01:00
Tim Bentley
9457030c04 Update Logging and make bibles selected 2009-08-30 22:14:15 +01:00
Tim Bentley
eca69df868 Slide Controller rewrite complete 2009-08-29 08:17:56 +01:00
Tim Bentley
ed385ec31d SlideController cleanup - merge Main and Image 2009-08-27 06:17:20 +01:00
Tim Bentley
63f67ea756 EventManager Removal - complete 2009-08-26 06:00:19 +01:00
Tim Bentley
49a424abd1 EventManager Removal part 3 - Theme handling 2009-08-25 21:04:58 +01:00
Tim Bentley
9b826aab56 EventManager Removal part 2 2009-08-25 06:18:09 +01:00
Tim Bentley
7226d4a232 EventManager Removal part 1 2009-08-24 21:05:46 +01:00
Tim Bentley
8b1425d163 Image Plugin Performance improvements part 2 2009-08-24 18:43:15 +01:00
Tim Bentley
b3f45c21c4 Image Plugin Performance improvements part 1 2009-08-24 18:01:55 +01:00
Tim Bentley
7dea8a37a1 SlideController clean up part 4 2009-08-24 06:13:27 +01:00
Tim Bentley
41782ae8a7 SlideController clean up part 3 2009-08-24 06:10:04 +01:00
Tim Bentley
7ec0a53d77 SlideController clean up part 2 2009-08-24 05:30:04 +01:00
Tim Bentley
57f04820f0 SlideController clean up part 1 2009-08-23 21:15:05 +01:00
Tim Bentley
f6578fc000 Song Exit error message 2009-08-15 20:19:34 +01:00
Tim Bentley
297c4ab4c3 Presentation plugin again 2009-08-15 20:10:59 +01:00
Tim Bentley
48bca4155d Plugin Clean up to remove extra code and remove need for Theme_Manager 2009-08-15 12:02:24 +01:00
Tim Bentley
1987258fcb Stop plugins being initialised when Inactive. Bible Import Tab state correction 2009-08-15 08:55:16 +01:00
Tim Bentley
b774cc10be Clean up Event Handling and remove call the ThemeManager from plugins 2009-08-15 08:33:01 +01:00
Tim Bentley
d87f58747c Finish (for now) Impress start and Stop from Config 2009-08-14 20:12:14 +01:00
Tim Bentley
586425b0d9 Clean up Remotes 
Add Tab to remotes to set Openlp.org port number
 2009-08-14 18:41:29 +01:00
Tim Bentley
fb63c3fc3f Plugin Form Complete 2009-08-14 17:26:22 +01:00
Tim Bentley
10ba1db5f3 Fix bug on song saving 
Add new screen for Plugin status
Add new presentation plugin code
 2009-08-13 21:02:38 +01:00
Tim Bentley
a684ecaa1e More remote fixes 2009-08-12 17:29:00 +01:00
Tim Bentley
46cf6c763c Clean up event structure and add calling names 
Clean up Remote client to remove qt dependancy
 2009-08-12 05:57:24 +01:00
Tim Bentley
7a6695b1a6 Update Presentation Plugin 2009-08-11 20:21:52 +01:00
Tim Bentley
161973eef6 Clean up exit code so plugins can be called 
Clean up Alerts Tab so can be called from UI and Remote via events
Start to get events to be called sequentially not nested
Fix up merge issues
 2009-08-10 21:10:20 +01:00
Tim Bentley
6fa6b78e35 Head 2009-08-10 20:11:54 +01:00
Tim Bentley
6b7444ea97 Initial add of Remote Plugin 2009-08-10 19:20:46 +01:00
Raoul Snyman
29389bde13 Merge from trunk; A few bugfixes. 2009-08-09 19:58:37 +02:00
Tim Bentley
38f8005d5d Fix code so we can save songs 2009-08-08 07:19:09 +01:00
Tim Bentley
18f1434903 New bible Import Screen 
Transparent Theme backgrounds
Global Theme Handling improvements

-------This line and the following will be ignored --------------

modified:
  openlp/core/lib/renderer.py
  openlp/core/lib/themexmlhandler.py
  openlp/core/ui/amendthemeform.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/thememanager.py
  openlp/core/ui/themestab.py
  openlp/plugins/bibles/forms/bibleimportdialog.py
  resources/forms/bibleimportdialog.ui
pending merges:
  Tim Bentley 2009-08-07 finish Theme handling corrections 
    Tim Bentley 2009-08-07 Default handling allows editing and blocks deletes
    Tim Bentley 2009-08-07 New bible import form
    Tim Bentley 2009-08-06 [merge] Head
    Tim Bentley 2009-08-06 Standardize row hight in renderer

bzr-revno: 503
 2009-08-07 20:17:32 +01:00
Tim Bentley
06ff5ec618 New bible import form 
Start of default theme handling
Add Transparent backgrounds
 2009-08-07 18:19:32 +01:00
Raoul Snyman
bf09df4f0b Made some minor modifications to the edit song dialog, one or two other bug fixes. 2009-08-06 23:30:14 +02:00
Raoul Snyman
2fb7ff511e Make the "Song Maintenance" button on the SongEdit form to work; Include a merge from trunk. 2009-08-06 16:51:38 +02:00
Raoul Snyman
4e1656961b Merged from trunk. 2009-08-06 15:17:36 +02:00
Tim Bentley
cf56b14383 Fix errors in Italic handling 
Add delay to get screen refresh workig
 2009-08-05 18:59:37 +01:00
Raoul Snyman
8c010efe5a Changed the layout of the Song Edit form, making it slightly easier for the average PC Joe to digest. 2009-08-04 22:23:33 +02:00
Tim Bentley
2816277af1 New features and fixes. 
bzr-revno: 499
 2009-08-04 18:18:47 +01:00
Raoul Snyman
dc352c28d3 Merged in some changes for the song maintenance form. 
bzr-revno: 498
 2009-08-03 21:59:19 +02:00
Raoul Snyman
708a62ad47 Switched around the order of some dialogs when deleting items in the Song Maintenance dialog. 2009-08-02 21:10:54 +02:00
Tim Bentley
13f016cf5f Minor bug fixes 2009-08-02 17:13:59 +01:00
Tim Bentley
fa606e19a9 Add download notifications for HTTP bibles 
Fix bug running off the end of bible chapter
 2009-08-02 14:44:41 +01:00
Tim Bentley
b93cfa887c Head changes 2009-08-01 19:04:13 +01:00
Raoul Snyman
2b237bb488 Made relative imports absolute. 
Changed self.NameEdit.text() == u'' to not self.NameEdit.text()
 2009-07-26 15:51:32 +02:00
Raoul Snyman
782304114e Merged in changes from the songmaintenance branch 
bzr-revno: 497
 2009-07-26 15:02:37 +02:00
Raoul Snyman
67f4669df2 Updated author validation to validate the display name as well. 2009-07-26 12:02:18 +02:00
Raoul Snyman
1915f93b6e Added the rest of the validation and tested that it all works. 2009-07-26 10:36:57 +02:00
Raoul Snyman
7eac26d98a Added validation to the Author dialog. 2009-07-26 00:07:59 +02:00
Raoul Snyman
6cb9222aba Last few touches to the song maintenance. 2009-07-25 00:13:40 +02:00
Raoul Snyman
d4d6a88c6f Lots of yummy updates to the song maintenance form. 2009-07-24 22:40:34 +02:00
Raoul Snyman
af9b8edd6f The new song maintenance dialog... getting there. 2009-07-23 22:20:49 +02:00
Tim Bentley
66eed38671 Change Bible layout options to add verse per slide 2009-07-23 06:17:26 +01:00
Raoul Snyman
cf5b415640 Added the start of a song maintenance dialog. 2009-07-22 10:20:42 +02:00
Tim Bentley
8e0901ef67 Fix bug where empty lists fail to display dialogs 2009-07-22 07:14:34 +01:00
Tim Bentley
9da5a3223f Fix song conversions 
Fix focus for Song dialog
Preserve state when moving serviceitems
 2009-07-21 19:10:14 +01:00
Tim Bentley
2885a08ed2 Fix combo box errors 2009-07-19 08:58:37 +01:00
Tim Bentley
4552fb543a Add song conversion script 
Remove conversion code as it did not work!
More Song for tidy ups
 2009-07-19 07:31:08 +01:00
Tim Bentley
6a495d451e Finish fixing the songedit form so it now saves. 2009-07-18 08:46:17 +01:00
Tim Bentley
eb47246f18 Fix up song migration code so we only have 1 author 
Fix up Songedit dialog to refesh lists on entry 
Fix up meta data bug
 2009-07-18 08:30:26 +01:00
Tim Bentley
b1fd518ff6 Text clean ups 
Move Author / Topic / Book edit form Song Edit
Add above to Toolbar
Add Icons
 2009-07-18 06:43:50 +01:00
Raoul Snyman
40a9c5a32c Merged in the changes from the biblefixes branch. 
bzr-revno: 494
 2009-07-15 21:18:08 +02:00
Raoul Snyman
37384f570c - Created a consolidated "models.py" file. 
- Updated BibleDBImpl with the changes.
 2009-07-14 21:44:15 +02:00
Tim Bentley
6fdd5d028f Fix none for new authors 
Fix focus bugs in Song child windows
 2009-07-14 19:38:33 +01:00
Raoul Snyman
6b7537c588 Merged changes from trunk, fixed a conflict. 2009-07-13 22:11:36 +02:00
Raoul Snyman
dc10f0e2a4 Various fixes: 
- Started the conversion of SQL to SQLAlchemy
- Found a bug in the generating of Bible slides
- Some code cleanups
 2009-07-13 22:08:43 +02:00
Tim Bentley
66b6836406 More bug fixes 
Bibles have correct footers
Songs now save all data and have correct focus
 2009-07-13 18:02:38 +01:00
Raoul Snyman
7a0f9d3e06 Added some fixes to the operation and layout of the slide controllers. 2009-07-12 22:38:34 +02:00
Raoul Snyman
bc368d3a91 Some minor fixes. 2009-07-12 21:27:48 +02:00
Tim Bentley
6c30e67723 Fix html ripping bug for bibles 2009-07-12 16:11:57 +01:00
Tim Bentley
f576e9d83d Look a songs Focus issues 
Fix Bibles footers
 2009-07-12 15:56:06 +01:00
Tim Bentley
2aaf72bb20 Unicode work 2009-07-10 16:41:08 +01:00
Tim Bentley
93655bc92e Stop Presentation Tab failing 
CSV Bibles get Unicode
 2009-07-09 17:51:25 +01:00
Tim Bentley
36113b0d90 cleanups of files not used 
fixes to bibles to handle unicode better
 2009-07-09 06:15:26 +01:00
Raoul Snyman
150adaac23 Put the settings tab back in after accidentally removing it... silly me! 
bzr-revno: 486
 2009-07-08 18:59:53 +02:00
Raoul Snyman
c8d5b7acb2 Merged changes to Bible plugin into trunk. 
bzr-revno: 485
 2009-07-08 07:13:58 +02:00
Raoul Snyman
f12949eb0c Fixed up a few logging things, a few bits of indentation, and resolved some conflicts from the last update. 
bzr-revno: 484
 2009-07-08 07:12:16 +02:00
Raoul Snyman
66898bad84 Made some fixes to the common Bible import classes. 2009-07-07 22:18:36 +02:00
Tim Bentley
a06b8f0b07 Add saving check to exit so OOS can be saved 2009-07-07 17:35:01 +01:00
Tim Bentley
209f92439c Remove Not used files and References 
Fixes from Last Merge
ThemeManager Cleanup MVC.
 2009-07-06 17:34:13 +01:00
Tim Bentley
e5a33d2f30 Added Martin's changes to my tree 
Resolve confilcts
Get plugins working again and clean up duplicate code
Remove the references to listwithpreviews
 2009-07-04 06:52:30 +01:00
Tim Bentley
4e08922528 OOPs missed file 2009-07-03 21:33:41 +01:00
Tim Bentley
1110713529 Fix bug in bibles with invalid method name 
Add Image Tab to get loop delay
Fix loss of Bible Icons
Add Loop delay to ImageController
Get Controllers to swap correctly
 2009-07-03 21:32:33 +01:00
Tim Bentley
f586d9bf5e Update images and rename some. 
More changes to slidecontroller and friends
 2009-07-03 20:08:21 +01:00
Tim Bentley
3c71e91498 Fix up rendering a bit 
Re-write the slide controller so it looks better (big clean up)
Fix themes where backgrounds are png files so they do not become phantom themes
start to sort out conversions
Hide openoffice at startup
 2009-07-02 20:04:50 +01:00
Martin Thompson
6349595297 Changes from review 2009-07-01 21:21:13 +01:00
Martin Thompson
5e8ff0214e Video items have a preview shown 2009-06-30 21:35:53 +01:00
Tim Bentley
409383add2 Sort out Image Plugin icons 2009-06-29 06:13:06 +01:00
Tim Bentley
560584d8f6 Added ImageToolBar to show what I am thinking 
Cleanup mainwindow from mark 1 attempt.
Fix bug in Thememanager so themes are not deleted
 2009-06-29 06:07:32 +01:00
Tim Bentley
7927080838 More changes to get plugable slideControllers to work 2009-06-28 07:54:12 +01:00
Tim Bentley
a4a0b521a4 More cleanups and bug fixes. 2009-06-27 20:55:55 +01:00
Tim Bentley
c78ea3c911 More cleanups with the media manager 2009-06-27 16:33:03 +01:00
Tim Bentley
23f49bfee7 Update new plugin infrastructure 2009-06-27 06:46:05 +01:00
Tim Bentley
b36b78afdc Try to fix openoffice startup 2009-06-26 20:06:28 +01:00
Tim Bentley
c981cb21d2 More fixes and cleanups 2009-06-26 19:54:05 +01:00
Tim Bentley
b76790bc2f Fixes and cleanups following MediaManager Merge 2009-06-26 18:51:43 +01:00
Tim Bentley
2879a52416 Start of plugable SlideControllers 2009-06-26 17:39:16 +01:00
Martin Thompson
45d9f436ab Media item for media functions basically. No previews, and no live/preview control 2009-06-25 22:09:52 +01:00
Martin Thompson
2b13e84c73 Latest trunk merged 2009-06-25 21:12:13 +01:00
Tim Bentley
8040f10204 From Head 2009-06-25 21:06:42 +01:00
Tim Bentley
66c665d352 More Fixes 2009-06-25 21:06:02 +01:00
Martin Thompson
322d19265a Tweaked a couple of = signs 2009-06-25 21:01:02 +01:00
Tim Bentley
92b1b82a58 Clean up cnvdb 
Start on Presentation Plugin code for Impress
 2009-06-25 20:42:22 +01:00
Martin Thompson
16716372f0 Merged changes from trunk 
Created a BaseListWithDnD to allow plugins to inherit their Drag and
drop handler without too much copy and paste Also moved the basic DnD
handler to the Plugin base class, again to reduce copy/paste.  The
Image plugin uses this functionality, others are TBD
 2009-06-24 21:15:24 +01:00
Martin Thompson
726c8826b2 Merged from trunk 2009-06-24 20:46:06 +01:00
Martin Thompson
058322620d First video play works 2009-06-24 20:44:52 +01:00
Tim Bentley
69df159f17 Change Topics Form handling to allow save button to be enabled. 2009-06-24 07:15:04 +01:00
Tim Bentley
c77cbb0aa1 Clean up migration database tables 2009-06-24 07:10:13 +01:00
Martin Thompson
b700d143a5 Seems to be working as before 2009-06-23 21:59:38 +01:00
Martin Thompson
d2a0b296ee Refactored media manager 2009-06-23 21:53:06 +01:00
Tim Bentley
0b0013331a Commit Fixes to Conversion Utilities 
Changes to Presentation Plugin
 2009-06-23 17:25:40 +01:00
Tim Bentley
a1b60e034e Fix error on song saving 2009-06-23 16:48:31 +01:00
Martin Thompson
d84c99122f Displayed video+audio+slider 
Tweaked some unicode strings
 2009-06-22 21:44:35 +01:00
Tim Bentley
3c255076f9 Add Author Search to Song Plugin 2009-06-21 18:45:59 +01:00
Tim Bentley
03904d7502 Finish OOS work with Images 
Correct errors with existing oos 
Correct bugs in Bible HTTP code for unicode conversions
 2009-06-20 20:11:17 +01:00
Tim Bentley
5303d0673b Fix up Image plugin so it now works again! 
Render the images correctly to reflect the screen size
Add images to slide controller
Fix ImagePlugin selction criteria
Amend the loing format.
 2009-06-20 11:44:12 +01:00
Tim Bentley
3a65ef4dca Add Menu Items which are finished 
Correct last merge spelling errors
 2009-06-19 20:49:00 +01:00
Tim Bentley
a95b55f905 Bug fixes to handle window events with no selection 
Comment and file cleanups
Add extra filter to file list 
ServiceManager record movements and changes to OOS to allow for files to be stored
 2009-06-19 19:41:38 +01:00
Tim Bentley
42d196d751 Corrections from last merge 
Clean up Bibles plugin
Clean up Custom plugin
Fix python 2.6 error mesage.
 2009-06-17 06:11:16 +01:00
Tim Bentley
e2b8af7073 Mass Unicode migration 
Fix bugs found in retesting the app.
 2009-06-16 19:21:24 +01:00
Tim Bentley
50d41d562e Complete Song Plugin Tidy Up 
All lists now use same MVC mechanisms
Code in the same style.
 2009-06-14 16:12:40 +01:00
Tim Bentley
69a846c7c9 Update list handling for Plugin and Edit Screen 
Add error handling displays to show whats in error
 2009-06-14 14:50:56 +01:00
Tim Bentley
d96267934c Reload list only if title changes. 2009-06-14 08:25:39 +01:00
Tim Bentley
dc40e79ee7 Add Song Theme Handling 2009-06-14 08:02:58 +01:00
Tim Bentley
fbc16a0270 Add Song Book Handling 2009-06-14 07:48:38 +01:00
Tim Bentley
6640d79eb8 Add Topic handling 2009-06-14 07:30:09 +01:00
Tim Bentley
fb815b8ca6 New Song Works 
Speed Up media Item
Fix Song definition
 2009-06-13 17:15:55 +01:00
Tim Bentley
4f7310a5a6 Add double click to allow servicemanager to live 
Add StateMachine to Song Editor (Verses and Authors)
Allow Authors to be Added and Removed from Songs
 2009-06-13 07:46:13 +01:00
Tim Bentley
e8ae29e620 Add XML Lyrics handling to Songs. 2009-06-12 18:20:40 +01:00
Tim Bentley
dfb467e830 Add Alternative tile 
Code the search field creations
 2009-06-12 06:13:54 +01:00
Tim Bentley
56680463c7 Replace str with unicode 
refresh the list screen when we change things
 2009-06-11 22:14:12 +01:00
Tim Bentley
5871e3419d Corrent Song footer to display correct info 
Start of saving extra song data.
 2009-06-11 06:13:10 +01:00
Tim Bentley
a6d64ef20e update title and copyright 2009-06-10 19:04:32 +01:00
Tim Bentley
a576962181 Start of Song work 
Clean up code to standards
 2009-06-10 18:12:03 +01:00
Raoul Snyman
a8307e430b Changed QPixmaps to QImages to see the difference. 2009-06-10 17:37:33 +02:00
Tim Bentley
7becc9cb56 Strange problems with events firing early. 
Fixed bugs to stop errors by chaning initilistion order and defining varables.
Changing method names following last review.
 2009-06-08 06:04:06 +01:00
Tim Bentley
47884bc340 Remove logging for Renderer to speed it up 
Clean up Renderer
Minor change to BibleMediaitem
 2009-06-08 05:30:12 +01:00
Tim Bentley
2b16aacc6e bug fixes 2009-06-07 20:34:51 +01:00
Tim Bentley
ed73a78e95 Add double clicks to songs and customSlide 
More code cleanups
 2009-06-07 20:34:24 +01:00
Tim Bentley
aabe4e82f3 Fix problem with single number for set of chapters eg John 1:1-5. 
Add double click feature to add preview (missing from 1.x)
Move formatting cleanups on open classes.
 2009-06-07 19:39:31 +01:00
Tim Bentley
1dcd0623f1 Bug fixes for errors in search 
Code Cleanups while in the code.
 2009-06-07 17:33:33 +01:00
Raoul Snyman
27de0cd008 Merged proposal #7122 
bzr-revno: 459
 2009-06-05 21:23:15 +02:00
Tim Bentley
2157699814 Fix up serviceitem for better interface 
Fix extra rndering cycle from Servicemanager
Fix Image / Custom / Bibles / Songs to use new interface
 2009-06-05 20:00:57 +01:00
Raoul Snyman
473bb289b6 Fixed displaying of "display" label on the display form. 
Display form is displayed on the correct screen at startup.
Display form switches to active non-primary screen or hidden on primary screen after set in the settings dialog.
A few syntax tidy-ups.
Made the loading and saving of things to the "registry" better.
 2009-06-05 20:53:50 +02:00
Tim Bentley
472ef981b6 Fix crash on delete of last record in list 2009-06-05 17:24:42 +01:00
Tim Bentley
2c5e701e10 Fix Bible import bugs for duplicate bibles 
Fix Bibles refresh errors on nw bible creation
Finish Topic / Author and Songbook code for now
 2009-06-05 06:00:26 +01:00
Tim Bentley
11a9d28bed Fix unicode bible import error 
More Song changes
 2009-06-04 21:06:32 +01:00
Tim Bentley
5b58f7137f Fix Database defaults 
Add Topic Dialog and add functionality
Add Topic code to Song window
 2009-06-04 20:00:41 +01:00
Tim Bentley
b365090544 Song fixes 
Bug fixes to event receiver and presentations
 2009-06-04 17:14:10 +01:00
Tim Bentley
29530d31ca More changes to Songs plugin to get ManageAuthors working. 2009-06-03 18:32:53 +01:00
Tim Bentley
a473a4dffc Start fixing the songs plugin 2009-06-03 17:14:56 +01:00
Tim Bentley
5fbc870c64 Song plugin add to service manager 
custom and bible cleanups
 2009-06-03 16:38:14 +01:00
Tim Bentley
971be91bad Fix commit due to missing 2009-06-01 19:37:06 +01:00
Tim Bentley
30154f2127 Lots for fixes: 
- General Tab now saves and retrieves
- Alert Dialogs now alerts
- Renderer - More fixes
- SlideController looks better.
- Removal of poked in Managers all accessed via Parent.
 2009-06-01 18:50:37 +01:00
Tim Bentley
d0bcc06d35 more changes and fixes 2009-05-22 20:36:16 +01:00
Tim Bentley
8acc980ce4 End of Operation Cleanup for now 
Fix more bugs 
Start to sort out Service Item
 2009-05-22 19:30:25 +01:00
Tim Bentley
190a371f56 More from Operation Cleanup 
Fix spelling of Maintenance
 2009-05-21 17:07:01 +01:00
Tim Bentley
2dfbe1dcfc Phase2 Operation Cleanup. 2009-05-21 06:15:51 +01:00
Tim Bentley
da0acea229 Phase1 operation superfly 2009-05-20 21:17:20 +01:00
Tim Bentley
47c0b69d36 Finish the Theme work to save all themes and replay them on reload 
Add rules as to which theme to use in the RenderManager
 2009-05-18 20:04:25 +01:00
Tim Bentley
d5b2a1e496 Fix Bible plugin to handle themes correctly when changed and removed. 2009-05-18 17:11:59 +01:00
Tim Bentley
37b755affe Change Presentation Plugin to choose presentation software. 
Trial version until superfly gets his hands on it!
 2009-05-18 17:04:34 +01:00
Tim Bentley
27027eb051 Fix comments from last merge 
Fix BiblePlugin Theme storage and usage
 2009-05-18 05:41:49 +01:00
Tim Bentley
a5615fd4fe Corrections to Renderer to handle slides not lines 
Fixes to Bibleplugin to renderer multiple verses per slide
Pass Bible Theme to RenderManager
 2009-05-17 16:24:02 +01:00
Tim Bentley
df0fd5b618 hook up themes to combo boxes 2009-05-17 09:25:15 +01:00
Tim Bentley
2969c3641d More code cleanups 2009-05-16 17:38:03 +01:00
Tim Bentley
df51cd18d4 Close display window on exit 
Performance improvements in renderer
Performance improvements in Thememanager
Fix review comments from last few reviews
Add new media types to media plugin_helpers
Code format cleanups.
 2009-05-16 11:24:03 +01:00
Tim Bentley
d59f80d819 Rename the video plugin to media 2009-05-15 06:15:53 +01:00
Tim Bentley
0ba52fbd66 Added context menus to ServiceManager 
Refactored Icon Construction to single method
 2009-05-13 20:47:25 +01:00