Commit Graph

934 Commits

Author SHA1 Message Date
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