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

765 Commits

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