Commit Graph

3512 Commits

Author SHA1 Message Date
Tim Bentley
38d777d98e Fix more line endings 2010-12-04 09:05:11 +00:00
Tim Bentley
ea246d777a Head1129 2010-12-03 20:47:05 +00:00
andreas
41c805e607 hanged importer messages (Bug #668789)
- disabled text search for web bibles (does not matter if the web bible is the dual or normal bible)
- available web bibles in the bible importer are now sorted
- imported bible in the Media Manager are now sorted
- speed improvements (unfortunately this takes the ability to keep unselected item unselected when doing an other search)
- "second" instead of "dual"
- docs, comments
- added an auto completion for bible books ("Quick Search" Tab; "Verse Search" combo box)

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

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

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

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

Manually fix conflict in comments on merge (trb143)

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

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

bzr-revno: 1111
2010-11-04 00:17:31 +02:00
Jon Tibble
8a56d7acde Head 1110 2010-11-03 18:35:56 +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
ddc99e13e8 Unused imports 2010-11-03 17:40:45 +00:00
Tim Bentley
6cf851022e Update preview 2010-11-03 17:33:08 +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
f7ddb507e8 Fix renderer 2010-11-01 19:33:33 +00:00
Tim Bentley
206eb1006e Fix preview bug 2010-11-01 19:22:00 +00:00
Tim Bentley
e486246cd0 Head 1107 2010-10-30 12:09:52 +01:00
Tim Bentley
7edae012dc UI works with independent mode 2010-10-30 12:09:36 +01:00
Tim Bentley
74bb054b83 Head1107 2010-10-30 11:17:25 +01:00
Raoul Snyman
a45069e4d3 Customisable Shortcuts, Phase 1: View-only list of actions and shortcuts, currently also only the actions in the main window are in the shortcut dialog.
bzr-revno: 1108
2010-10-30 12:14:22 +02:00
Tim Bentley
51d68f2066 Fix up file type / mime type issues 2010-10-30 10:29:59 +01:00
Raoul Snyman
5327f9bc4c Some minor fixes. 2010-10-30 09:51:34 +02: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
Tim Bentley
eacf6cc870 Head1105 2010-10-29 20:04:08 +01: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
Tim Bentley
e6506e7433 Spelling 2010-10-29 07:44:38 +01:00
Tim Bentley
9ed0ff2ea2 Proper fix for 1102 2010-10-29 07:36:17 +01:00
Tim Bentley
fff4cf1e1c Revert 1102
Fixes: https://launchpad.net/bugs/667837
2010-10-28 18:23:17 +01:00
Tim Bentley
5d9ef61e2c Only Vacuum changed databases 2010-10-28 18:02:28 +01: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
Raoul Snyman
0373f93130 Change the table to a tree.
Hook the tree up to the shortcut list.
Fix adding actions to shortcut list.
2010-10-28 08:36:18 +02:00
Raoul Snyman
a249393b2c HEAD 2010-10-28 07:24:31 +02:00
Raoul Snyman
419b6469ce Finished up the actions list. 2010-10-28 07:21:45 +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
Raoul Snyman
fceb9d8978 Separated action list stuff into its own file. 2010-10-27 17:35:15 +02: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
Tim Bentley
901b9d98c5 Auto Save service on exit if already saved service
Fixes: https://launchpad.net/bugs/657307
2010-10-27 16:20:25 +01:00
Raoul Snyman
574d108a82 Started working on some list classes to create nice categorised action lists. 2010-10-27 15:49:21 +02:00
Tim Bentley
7285490fcb Fix Image saving bug 2010-10-26 20:25:31 +01:00
Tim Bentley
d3e4cf7a2d Remove # 2010-10-26 20:11:26 +01:00
Tim Bentley
54d99657ab Head 2010-10-26 20:08:20 +01:00
Tim Bentley
f67e25c82e Fix Image size backgounds 2010-10-26 20:07:12 +01:00
Tim Bentley
1da9d5629d Updates to screen handling 2010-10-24 20:23:12 +01:00
Tim Bentley
39f7b3b4d8 Head 2010-10-24 19:20:23 +01:00
Tim Bentley
0936c7d6d5 Updates 2010-10-24 18:36:43 +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
Andreas Preikschat
c8e5f9c07e fixed traceback after editing image item, icons for down/up buttons 2010-10-24 13:00:20 +02:00
Tim Bentley
8e1a7334d3 Fix up presentations 2010-10-24 07:26:07 +01: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
76ddf975a7 Add ImageManager 2010-10-22 19:56:58 +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
49faf7fb1f Working on bringing actions into the shortcut form. 2010-10-21 09:42:13 +02:00
Tim Bentley
0851b94837 Theme now created correctly we I think 2010-10-17 20:34:10 +01:00
Tim Bentley
61c763639b Theme cleanup and more UI work. 2010-10-17 19:58:42 +01:00
Tim Bentley
97c7ebc4c5 Head 2010-10-17 15:53:06 +01:00
Tim Bentley
63b3be4767 Head 2010-10-17 15:44:00 +01:00
Tim Bentley
c3b890e198 Performance updates 2010-10-17 15:43:51 +01:00
Raoul Snyman
09dbafaf3e HEAD 2010-10-17 16:25:03 +02:00
Tim Bentley
cf139be7cb Fix image but and more path optimisation
bzr-revno: 1095
Fixes: https://launchpad.net/bugs/661965
2010-10-17 14:32:40 +01:00
Tim Bentley
ca20598dde More path optimisation
Fixes: https://launchpad.net/bugs/661965
2010-10-17 08:26:14 +01:00
Raoul Snyman
009e337158 Removed an incorrect import.
Added more documentation.
2010-10-17 00:50:36 +02: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
7dcac8ea54 Fix htmlbuilder 2010-10-16 17:21:02 +01:00
Tim Bentley
cf2d215534 More imporovements 2010-10-16 14:54:57 +01:00
Tim Bentley
cbef9f0519 Head 2010-10-16 08:22:14 +01:00
Tim Bentley
cc4acf4edd Position Tab updates 2010-10-16 08:21:24 +01: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
f3646cf6e6 Code cleanups 2010-10-15 16:37:29 +01:00
Tim Bentley
cef92476ad Path image improvements 2010-10-15 16:33:06 +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
Tim Bentley
4f7566c76b Position code and preview 2010-10-13 21:19:38 +01:00
Tim Bentley
5e485a0673 Head 2010-10-13 20:40:39 +01:00
Tim Bentley
567e0009a7 Position screen 2010-10-13 20:40:01 +01: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
Tim Bentley
f4023118db Fix up the theme class again 2010-10-11 17:43:14 +01:00
Tim Bentley
026c25facb Head 2010-10-11 17:14:46 +01:00
Tim Bentley
562a27e8ca More refactoring 2010-10-11 17:14:36 +01:00
andreas
080a1ede33 Revised custom Dialog and new edit form
bzr-revno: 1083
2010-10-11 17:13:49 +01:00