Commit Graph

1804 Commits

Author SHA1 Message Date
M2j
7c68265f4b remove two consecutive spaces from python code of the whole OpenLP sources
replaced double quotes for string in python code of the whole OpenLP sources
2010-12-27 23:57:35 +01:00
M2j
914827c023 same as before for SongImportWidget
(removing unneccesary format instructions and FormLayout alignment)
2010-12-27 19:23:46 +01:00
Tim Bentley
399970e7c7 More Theme Management cleanups 2010-12-27 10:18:09 +00:00
Tim Bentley
a464ab791b Head 1169 2010-12-27 08:32:01 +00:00
rimach
ec062c2640 SongBeamer fixes
Correct Song Tab error

bzr-revno: 1169
2010-12-27 08:28:33 +00:00
rimach
0a98f3038e Head 2010-12-26 21:56:51 +01:00
rimach
2cb38c6ab8 add complete check 2010-12-26 21:55:40 +01:00
Tim Bentley
e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
Tim Bentley
67f6fceb0a Allow Songs to be Searched by Theme 2010-12-23 17:51:32 +00:00
M2j
5dddb3a53d typo 2010-12-22 20:03:38 +01:00
M2j
1027d60635 Fix: Bug in editsongform
Fix: Bug in bibleserver import
2010-12-22 19:15:48 +01:00
Jon Tibble
3ce8ed46d1 Cleanups
bzr-revno: 1160
2010-12-22 14:41:17 +00:00
Tim Bentley
47441be28a Fix song edit bug
Fix Custom wording 693150

Fixes: https://launchpad.net/bugs/693150, https://launchpad.net/bugs/691952
2010-12-21 19:49:02 +00:00
Jon Tibble
e6f3650bfd Cleanups 2010-12-21 19:39:35 +00:00
Tim Bentley
4d18dcbafb Head 2010-12-21 16:33:32 +00:00
Tim Bentley
f1eb140954 Fix song saving error. Reverting 1036 as this is causing an exception in song saving
Fixes: https://launchpad.net/bugs/691952
2010-12-21 16:32:46 +00:00
Andreas Preikschat
313343856a f 2010-12-21 14:40:41 +01:00
Tim Bentley
12af5cada3 Fix field name 2010-12-20 14:15:03 +00:00
rimach
96ee7fb343 correct SongTab Signal connection 2010-12-20 08:50:39 +01:00
rimach
582b81238f Head 2010-12-20 08:47:21 +01:00
rimach
bd66ef200a add default title 2010-12-20 08:46:59 +01:00
Tim Bentley
bef5479a6a Fix spacing 2010-12-19 08:22:48 +00:00
Tim Bentley
b553b2ac89 Tighten up the validation 2010-12-18 19:24:44 +00:00
Tim Bentley
47ac10f413 Fix songs with no text being saved
Fixes: https://launchpad.net/bugs/691952
2010-12-18 17:28:50 +00:00
Tim Bentley
6b760003d0 Head 2010-12-18 17:11:50 +00:00
Tim Bentley
02645f0457 Songs must have an Author 2010-12-18 17:11:21 +00:00
andreas
18e75b7824 - camelCase for Ui_FileRenameDialog
- Fixed bug #690774
- Keep copyright field empty if the imported song (from the service list) does not have any copyright information.

bzr-revno: 1151
Fixes: https://launchpad.net/bugs/690774
2010-12-18 08:53:29 +00:00
Meinert Jordan
176d4fbc2a Fix: wrong variable names caused osis and http bible imports to crash
Fix: handle unicode in song search string generation
Fix: replaced tab indentation
regenerate search_lyrics on song reindex action

bzr-revno: 1149
2010-12-17 18:55:53 +00:00
Andreas Preikschat
fa79dd2cca keep copyright field empty if imported song does not have any copyright information 2010-12-17 15:28:19 +01:00
Andreas Preikschat
3cdac511e2 fixed bug #690774 2010-12-17 14:30:48 +01:00
Andreas Preikschat
e257f0431b r1147 2010-12-16 20:15:23 +01:00
Andreas Preikschat
fe452bc588 removed mistakes 2010-12-16 20:12:34 +01:00
M2j
e6bc3b9303 song search strings: handle unicode and reindex also search_lyric 2010-12-16 19:20:46 +01:00
Andreas Preikschat
95f30dfb6d fixed bug #690774 2010-12-16 18:56:08 +01:00
Andreas Preikschat
58a4d04980 white spaces 2010-12-16 14:16:53 +01:00
Andreas Preikschat
d9768b6536 whitespaces 2010-12-13 15:24:16 +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
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
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
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
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
9515b84c56 whitespaces, string change 2010-12-09 18:44:18 +01:00
M2j
7e221a6e98 locale aware song sorting 2010-12-09 16:08:04 +01:00
M2j
465515d71e unicode in song title search strings 2010-12-09 14:30:23 +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
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
Jon Tibble
9291516b59 Fix v2 import bug 2010-12-06 23:37:55 +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
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
Tim Bentley
7f1e21c13b Fix field names and verse order bug 2010-11-30 20:23:21 +00: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
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
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
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
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
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
b561bf6bdd trunk r1117 2010-11-16 19:00:47 +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
M2j
bb571b0df5 using list of tuples 2010-11-13 22:04:11 +01:00
M2j
e81bd1c3fc remove QtCore from header 2010-11-13 09:01:47 +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
f8b793ca3b removed whitespaces, added second blank line before class 2010-11-09 18:10:37 +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
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
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
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
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
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
aab9d1b2ca docs 2010-10-12 18:47:53 +02:00
Andreas Preikschat
0cefed0eb5 onVerseTypeComboBoxChanged 2010-10-11 19:29:03 +02:00
Andreas Preikschat
35fdbdeee8 fix for bug #657694 and some code enhancements 2010-10-11 17:26:48 +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
421577f8ce make sure that the 'edit' and 'delete' buttons are disabled after editing all verses 2010-10-10 14:14:12 +02:00
Philip Ridout
30c2ff400e Update File load extensions for song imports
bzr-revno: 1073
2010-10-08 07:16:01 +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
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
rimach
f869e0d979 replace self.text_strings with self.textStrings, fix doc string 2010-10-05 18:09:48 +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
Tim Bentley
4d3a473e91 Service Manager loading - finished 2010-09-30 21:21:45 +01: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
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
Tim Bentley
cc42dc34d8 Basic Theme copy and rename working 2010-09-26 08:39:50 +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
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
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
Raoul Snyman
c235b793b0 Fix bug #644106
Fix a related bug in the song importer.
2010-09-21 20:12:46 +02:00
Tim Bentley
79881d9023 Update plugin version numbers 2010-09-21 18:30:32 +01:00
Jeffrey S. Smith
49e6a4589c Get rid of extra blank lines and handle \{ \} \ in RTF 2010-09-20 15:58:55 -05:00
Jeffrey S. Smith
d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
rimach
23099261bd Head 2010-09-19 10:47:00 +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
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
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
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
915842a311 Head 2010-09-15 19:57:44 +02:00
rimach
3bc527e4fc bugfixing 2010-09-15 19:55:27 +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
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
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
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
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
Derek Scotney
efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +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
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
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
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
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
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
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
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
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
Tim Bentley
618813f020 Display and renderer changes
bzr-revno: 997
2010-08-28 17:35:16 +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
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
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
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
Raoul Snyman
3d478ec975 Song Wizard! 2010-08-20 21:40:07 +02:00
Raoul Snyman
d992fb1e07 First add and delete buttons working! 2010-08-08 16:38:51 +02:00
Tim Bentley
9bdc7db801 Fixes 2010-08-02 20:23:39 +01:00
Tim Bentley
9da35664bb Fix up songusage 2010-08-02 20:05:40 +01:00
Andreas Preikschat
23022c095d improved button behaviour 2010-07-31 13:52:17 +02:00
Jon Tibble
c9edfb9508 Cleanup QMessageBoxes using defaults 2010-07-31 03:06:44 +01:00
Jon Tibble
ab3efd2b3b Fix issues with plugins (inc. bug #605655) 2010-07-31 01:05:27 +01:00
Jon Tibble
003cfd1e68 Fix unused var and standardise loop vars 2010-07-30 17:13:17 +01:00
Jon Tibble
c099e6f808 Naming cleanup 2010-07-28 14:32:12 +01:00
Jon Tibble
37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Jon Tibble
96033624aa Head r968 2010-07-25 12:47:53 +01:00
Raoul Snyman
f6c5a9788c Update the copyright notice and the credits.
bzr-revno: 967
2010-07-25 10:21:02 +02: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
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
b5ceb59e27 Cleanup getters and setters 2010-07-23 01:01:06 +01:00
Jon Tibble
d2372850e4 DocStrings 2010-07-22 01:28:56 +01:00
Jon Tibble
5178172c80 Importer fix
bzr-revno: 959
2010-07-21 23:42:17 +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
Jon Tibble
3560277684 Cleanups 2010-07-20 21:43:42 +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
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
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
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
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
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
andreas
75f9f809a8 use database for checking 2010-07-12 15:18:07 +02:00
andreas
488ead8162 cleanup 2010-07-11 15:23:12 +02: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
520d0ea36f Head r926 2010-07-08 14:50:06 +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
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
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
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
Tim Bentley
0656b34df9 Cleanups 2010-07-02 19:21:45 +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
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
568e80748c Change namespace of other plugin icons. 2010-06-30 20:16:07 +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
0b8e4f2845 Fix filter usage (Fixes theme deletion) 2010-06-29 11:02:23 +01:00
Martin Thompson
75c6ba2284 Improved =s 2010-06-28 20:55:04 +01:00
Jon Tibble
19ff5dec55 Refactor database code
bzr-revno: 894
2010-06-28 20:12:08 +01: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
d4b70b34e7 sofimport error trap if ooo not installed 2010-06-26 12:16:59 +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
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Raoul Snyman
ae17e3b6b3 Some more OOo related fixes. 2010-06-24 22:48:38 +02:00
Martin Thompson
76e3538127 Imports all of SOF and the opensong default songs without crashing 2010-06-24 21:13:32 +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
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
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
43a4eaed96 Head r872 2010-06-22 15:34:03 +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
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
M2j
735ae40996 single character verse entries 2010-06-19 23:54:53 +02: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
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
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
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
7c6b5c0b99 translate(pluginName.pluginName) -> translate(pluginName) and removed some spaces 2010-06-17 14:02:18 +02:00
Frode Woldsund
cc7b6a9ec3 Merged whit current trunk 2010-06-17 00:14:46 +02:00
Jon Tibble
5e0ab4a7f6 Fix lack of feedback for edit and delete 2010-06-16 02:23:57 +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
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
Jon Tibble
e71caf43e7 Head r846 2010-06-14 19:22:08 +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
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
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
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
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
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
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
Tim Bentley
0e5450f9d1 Fix tag error 2010-06-06 13:39:13 +01: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
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
Jon Tibble
4a4bf00140 Head r829 2010-05-30 16:26:45 +01: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
d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +01:00
Tim Bentley
fbbcdc20da Head826 2010-05-27 16:58:04 +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
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
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
rimach
16b202d8b5 Head 2010-05-10 22:44:38 +02:00
Martin Thompson
d04d75ad41 More changes to suit pyqt4.4 2010-05-06 21:41:42 +01:00
rimach
850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02: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
Jon Tibble
22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +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
rimach
181c19d112 futher changes 2010-04-27 22:54:55 +02:00
Jon Tibble
9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
rimach
95a1419d9c Head 2010-04-25 21:29:39 +02:00
rimach
b83d115738 Copyright character solution 2010-04-22 19:27:26 +02:00
Jonathan Corwin
68685d1be5 head 2010-04-21 21:26:18 +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
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
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +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
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
Tim Bentley
b9630907a8 Fixes 2010-04-08 17:00:04 +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
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
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
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01: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
Jon Tibble
fe1755c25f Head r760 2010-03-23 19:56:25 +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
310f790e8e Some head 2010-03-23 15:14:20 +00:00
Raoul Snyman
ea5ceaf00a Updated copyright.
Updated credits.
2010-03-22 01:58:01 +02:00
Jon Tibble
2f840944e9 Unused variable fixes 2010-03-21 15:55:45 +00: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
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Jon Tibble
e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Jon Tibble
d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Tim Bentley
9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +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
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
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
Tim Bentley
edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley
18760262ab Edit Cancel updating song by accident 2010-02-07 20:11:37 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Tim Bentley
a5dc0bd75d Set plugins up for alpha release 2010-02-06 10:33:33 +00:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Raoul Snyman
2b5ddb13a4 An attempt to fix the problems some folks are having. 2010-01-31 21:49:01 +02:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02: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
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
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
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
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
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +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
meths@btinternet.com
eba4115490 Fix file handling
bzr-revno: 660
2009-11-07 06:45:25 +00:00
Jon Tibble
ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +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
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
Jon Tibble
c2a0944e6b More truth testing cleanup - plugins 2009-11-03 19:01:53 +00:00
Tim Bentley
8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
9dae67ac0a Clean up version notifications and checking 2009-11-01 09:07:10 +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
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
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
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
Tim Bentley
81de929460 Minor fixes 2009-10-29 15:57:58 +00:00
Jon Tibble
1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +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
Tim Bentley
0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Jon Tibble
8de21d057f PluginNameVisible without splitting __init__ 2009-10-29 01:48:43 +00:00
Jon Tibble
439c3c90ca Fix i18n for visible and non-visible title use 2009-10-28 21:04:14 +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
03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +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
3f69bb7635 "Save and Preview" added to Song editor 2009-10-25 18:07:23 +00:00
Tim Bentley
bad24ee614 Finally fix redisplaying of correct slide 2009-10-25 08:09:41 +00:00
Tim Bentley
7b85b9c7af More Song editing fixes 2009-10-24 20:43:16 +01:00
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley
6d5505dbc6 Fix Song editing 2009-10-24 16:54:07 +01:00
Tim Bentley
23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +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
raoul.snyman@saturnlaboratories.co.za
adc769fff0 Fix Bible Media manager look and feel
bzr-revno: 615
2009-10-21 05:57:45 +01:00
Raoul Snyman
d2c8d8bbce Some more style fixes for Windows; Fixed spacing on Songs media manager. 2009-10-18 19:06:34 +02:00
Raoul Snyman
3e4f07be6e Merge from lp:~raoul-snyman/openlp/uifixes
bzr-revno: 606
2009-10-17 21:14:39 +02: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
Raoul Snyman
7607d80254 Merged in lp:~raoul-snyman/openlp/uifixes
bzr-revno: 605
2009-10-17 20:16:27 +02:00
Tim Bentley
0828335939 Bible Plugin - Hide Duel verse Combo be default 2009-10-17 07:12:38 +01:00
Tim Bentley
025d7c86d2 Songs Plugin get search as you type 2009-10-17 06:47:17 +01:00
Raoul Snyman
a35d205cea Reducing spacing on media manager items. 2009-10-16 20:41:41 +02:00
Jon Tibble
75af51b460 Song theme fix and remove unused variables 2009-10-09 23:46:35 +01:00
Tim Bentley
14439e053a Fix song issue
bzr-revno: 590
2009-10-08 20:35:24 +01:00
Tim Bentley
afff83113f Songs now play hide and seek 2009-10-08 18:28:59 +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
e0f28ce493 Plugin abouts 2009-10-01 17:56:42 +01:00
Jon Tibble
1a7ad33bf9 Use buildIcon and general fixes all over 2009-09-29 03:54:32 +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
Tim Bentley
b08a5c3f65 Head 2009-09-25 16:49:00 +01:00
Tim Bentley
32ee1d36d4 Bring Custom and Song editing in line 2009-09-25 05:51:40 +01:00
Jon Tibble
e5db2456e7 Remove unused imports 2009-09-25 01:43:42 +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
Tim Bentley
9df75953b3 Fix table for null fields 2009-09-24 05:48:12 +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
Tim Bentley
44ecfe6dd3 Minor changes and clean ups 2009-09-23 19:49:26 +01:00
Jon Tibble
873e16f3a6 Double space cleanup 2009-09-22 00:11:50 +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
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
Tim Bentley
3a4bb91633 Fix data format 2009-09-18 16:54:15 +01:00
Jon Tibble
803aa6213d Complete half changed line in log.exception conversion 2009-09-18 12:55:26 +01:00
Jon Tibble
a5fb1d05ef Change logging sys.exc_info() to log.exception 2009-09-18 00:10:25 +01:00
Tim Bentley
0c6a1d5762 head 2009-09-16 20:03:11 +01:00
Jon Tibble
b229f5b5ad Remove unwanted button sizing 2009-09-16 11:50:13 +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
df7016c22d dos2unix run on trunk r535 2009-09-13 16:14:45 +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
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
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
Raoul Snyman
4cfd7dfbaa Attempt to fix a bug where the song list is never updated. 2009-09-08 17:21:30 +02:00
Raoul Snyman
e4756a1c6c Merge latest code from trunk, plus more modifications to docstrings. 2009-09-06 20:47:48 +02:00
Tim Bentley
984915a979 Missing files - oops 2009-09-05 09:58:29 +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
3ba22197dd Plugin Clean up for trying to display non selected items 2009-08-31 22:53:35 +01:00
Tim Bentley
63f67ea756 EventManager Removal - complete 2009-08-26 06:00:19 +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
f6578fc000 Song Exit error message 2009-08-15 20:19:34 +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
b774cc10be Clean up Event Handling and remove call the ThemeManager from plugins 2009-08-15 08:33:01 +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
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
38f8005d5d Fix code so we can save songs 2009-08-08 07:19:09 +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
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
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
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
Tim Bentley
6fdd5d028f Fix none for new authors
Fix focus bugs in Song child windows
2009-07-14 19:38:33 +01: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
Tim Bentley
f576e9d83d Look a songs Focus issues
Fix Bibles footers
2009-07-12 15:56:06 +01: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
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
a4a0b521a4 More cleanups and bug fixes. 2009-06-27 20:55:55 +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
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
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
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
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
ed73a78e95 Add double clicks to songs and customSlide
More code cleanups
2009-06-07 20:34:24 +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
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
2969c3641d More code cleanups 2009-05-16 17:38:03 +01:00
Raoul Snyman
55cd0b90cd Replaced the old logos and graphics with the new ones, did some coding-standards-cleanup, and fixed a bug in the OpenLPToolbar code where it discarded Unicode strings. 2009-05-02 00:26:43 +02:00
Tim Bentley
d025d1ebf6 Add New Theme Event Handlers to plugins 2009-04-10 07:06:41 +01:00
Tim Bentley
6a0eaa2cfe Clean up Plugin Interface to be more Generic
Clean up Mainwindow for adding plugins
Add ThemeManager to Main window and pass to plugins 
Add event Manager code to plugins and define some listners
Update AlertDialog to send message and allow text to be entered
2009-03-22 07:13:34 +00:00
Tim Bentley
ca32157e9c Removal of Plugin utils continues
bzr-revno: 424
2009-03-18 17:19:30 +00:00
Raoul Snyman
051b314da8 Fixed the displayResults method of SongMediaItem to display 1 song + all authors, rather than an instance of a song for each author of that song.
Fixed up the topics management dialog a bit.
Corrected the spacing on the eventreceiver.py file.
Corrected the calling of the receiver to use the static methods without creating an instance of the Receiver class each time.

bzr-revno: 403
2009-03-10 16:46:25 +00:00
Raoul Snyman
86bde695ea Some tweaks to the songs plugin.
bzr-revno: 402
2009-03-09 18:47:37 +00:00
Raoul Snyman
735527d558 Moved code out into SongMediaItem
bzr-revno: 401
2009-03-09 12:49:55 +00:00
Raoul Snyman
036dfef2eb Added the verse editing form and modified the song editing form to accommodate verses.
bzr-revno: 396
2009-03-07 21:38:59 +00:00
Raoul Snyman
86115ec964 Plugins pass themselves as the parent to MediaManagerItem to facilitate easier communication between each plugin's set of objects.
bzr-revno: 357
2009-03-02 22:12:14 +00:00
Raoul Snyman
a0d5bb100c Added a songs settings tab.
bzr-revno: 352
2009-02-28 23:31:24 +00:00
Raoul Snyman
1c47f553f3 Rearranged the settings tab system to work the same way as the media manager item system.
bzr-revno: 351
2009-02-28 23:19:45 +00:00
Raoul Snyman
58606e2563 Updated look and feel of the Edit Song dialog.
Changed the form.show() to form.exec_() for dialogs.
Added the code for the (c) button.

bzr-revno: 325
2009-02-19 22:25:58 +00:00
Raoul Snyman
e67c1868e6 Tidied up and fixed up the song editing dialog.
bzr-revno: 320
2009-02-17 21:01:27 +00:00
Tim Bentley
11e3d43caf Fix merge problem.
Song search works again
Bible import fixes

bzr-revno: 297
2009-02-05 18:27:51 +00:00
Raoul Snyman
3f0ba7a3ba Added an initial ServiceItem, plus a few minor changes.
bzr-revno: 296
2009-02-04 20:16:56 +00:00