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

1806 Commits

Author SHA1 Message Date
Philip Ridout
7e0245344a Adding the Words of Worship importer. 
bzr-revno: 1001
 2010-09-01 07:11:31 +02:00
Derek Scotney
5734c3052a Code convention corrections 2010-08-31 21:01:55 +02:00
Andreas Preikschat
60ced9e184 moved some code 2010-08-31 20:28:21 +02:00
Derek Scotney
83c5ee3450 Removed openlp/plugins/songs/lib/.directory 2010-08-30 22:42:07 +02:00
Derek Scotney
590aef4a87 Corrected docstring lengths 2010-08-30 20:32:00 +02:00
Raoul Snyman
2d9b39986a Some more fixes for the OpenSong import. 2010-08-29 22:05:36 +02:00
Derek Scotney
d3ee43965f Change comments to reStructuredText format 2010-08-29 20:24:09 +02:00
Raoul Snyman
130e315333 HEAD 2010-08-29 19:54:36 +02:00
Andreas Preikschat
31aba2eadb removed commented lines, name change 2010-08-29 18:20:56 +02:00
Andreas Preikschat
1911972177 head 2010-08-29 15:07:10 +02:00
Andreas Preikschat
9fc45065fc removed unnecessary line 2010-08-29 14:58:40 +02:00
Andreas Preikschat
87db3e98e6 clean ups, tweaks, fixed 625997 2010-08-29 14:49:45 +02:00
Jon Tibble
9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Raoul Snyman
59d2e2dab6 Fixed up the OpenSong importer. 2010-08-29 01:09:05 +02:00
Philip Ridout
271bbe22b2 Made the constants more like constants! 2010-08-28 21:46:03 +01:00
Jon Tibble
0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Raoul Snyman
7fcd2512ce HEAD 2010-08-28 21:49:12 +02:00
Andreas Preikschat
beaac2d923 removed everything which cannot work 2010-08-28 21:41:06 +02:00
Jon Tibble
168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble
066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Andreas Preikschat
37b2b1bb9d clean up 2010-08-28 21:28:50 +02:00
Andreas Preikschat
de3659bc92 commented everything out, which cannot work (currently) 2010-08-28 21:17:52 +02:00
Andreas Preikschat
521b06ee8c clean up - not working 2010-08-28 20:56:46 +02:00
Andreas Preikschat
36e2f2e33f fixed stuff messed up resolvesing the conflict 2010-08-28 19:32:44 +02:00
Andreas Preikschat
14dbfaa4b5 fixed stuff messed up resolvesing the conflict 2010-08-28 19:10:14 +02:00
Andreas Preikschat
8071a65720 head 2010-08-28 19:05:45 +02:00
Tim Bentley
618813f020 Display and renderer changes 
bzr-revno: 997
 2010-08-28 17:35:16 +01:00
Tim Bentley
5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Derek Scotney
81b53ee21b Changs to comment formatting 2010-08-28 15:27:17 +02:00
Derek Scotney
676cc9305c Changes to CCLI file importer to work with import wizard 2010-08-28 15:17:27 +02:00
Derek Scotney
80ded239a8 Changes to CCLI file importer to work with import wizard 2010-08-28 15:15:12 +02:00
Philip Ridout
f712ccca50 Signal fix as mentioned by Meths 2010-08-28 03:51:29 +01:00
Jon Tibble
000d23f7c6 Cleanup long lines 2010-08-28 02:31:11 +01:00
Jon Tibble
bb31492609 Fix song maintenance as subform (Bug #612282) 2010-08-27 23:49:27 +01:00
Philip Ridout
1611251ec2 and an empty line at the end 2010-08-27 21:18:48 +01:00
Philip Ridout
e4f4626f04 shortened some long lines. 2010-08-27 21:14:23 +01:00
Philip Ridout
4e059f8cc5 Forgot to add the wowimport.py file 2010-08-27 21:02:59 +01:00
Philip Ridout
6b6da86c54 wow_import implemented in to import wizard 
bug fix in wizzard, so that it starts from the first page if used previously
bux fix in importer, so that it resets the defualts after commiting a song to the db
 2010-08-27 20:53:22 +01:00
Jon Tibble
6266c3369e Cleanup the OpenLPv2 song importer 2010-08-27 16:25:29 +01:00
Jonathan Corwin
f717dc10d4 Bring up to date 2010-08-26 23:08:09 +01:00
Jonathan Corwin
1c66c7cd2c Head 2010-08-26 22:34:34 +01:00
Jonathan Corwin
ea2419924c progressbar 2010-08-26 22:32:31 +01:00
Raoul Snyman
3d60cc894d Added the initial openlp.org 1.x importer. 2010-08-26 22:53:24 +02:00
Raoul Snyman
dfe8bbae9c Some minor syntactic sugar. 2010-08-26 22:52:54 +02:00
Derek Scotney
ab7cd33c8d Updates to CCLI handling 2010-08-26 21:45:09 +02:00
Tim Bentley
ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Jon Tibble
53295b08e0 Cleanups and a version check fix 
bzr-revno: 992
 2010-08-26 14:45:56 +01:00
Raoul Snyman
8c27f92ee3 Fix a string. 2010-08-26 07:52:30 +02:00
Jon Tibble
06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley
492389b715 Head990 2010-08-25 18:08:36 +01:00
Raoul Snyman
8b141b0942 Fixed the couple of issues Jon T. pointed out. 2010-08-24 21:08:57 +02:00
Tim Bentley
b2234ae269 Remove Unused variables 2010-08-24 17:39:51 +01:00
Raoul Snyman
78889633f6 Changed incrementProgressBar again slightly so that passing a blank string or None to the text will not update the text. 2010-08-24 17:31:33 +02:00
Raoul Snyman
70cd4bc700 Added an extra argument to the incrementProgressBar function so that an increment can be specified (like 0, if you don't want an increment). 2010-08-24 17:28:45 +02:00
Raoul Snyman
25f6bb33e7 Made changes suggested/requested by Jonathan C. 2010-08-24 17:25:26 +02:00
Jonathan Corwin
0066edecbb Remove comments 2010-08-24 13:50:26 +01:00
Raoul Snyman
788e8a2b55 Fixed a problem with the getListOfFiles function which was returning a list of repr'd QListWidgetItems instead of a list of strings. 
Made a SongFormat.ccli -> SongFormat.CCLI after renaming some fields caught this too.
 2010-08-24 10:08:07 +02:00
Jonathan Corwin
2c3e732453 SongImport.__init__() 2010-08-23 22:52:21 +01:00
Raoul Snyman
ef44dc72c6 Changed the Generic importer to multifile as well. 2010-08-23 21:29:39 +02:00
Derek Scotney
0f7fb002b4 Added SongSelectFileImport to source control 2010-08-23 19:42:59 +02:00
Raoul Snyman
6d0b229860 Merge from HEAD. 
Add file I forgot to add previously.
Change Songs Of Fellowship importer to multi-file.
 2010-08-23 19:36:42 +02:00
Jonathan Corwin
8b79abdfe6 sof wizard 2010-08-22 23:36:11 +01:00
Raoul Snyman
530530d791 Got the song wizard working. Pity none of the importers seems to work at the moment. 2010-08-22 21:50:30 +02:00
Tim Bentley
a4e58c3349 Finish off spelling and tags for Custom and Song dialogs 2010-08-22 09:27:08 +01:00
Tim Bentley
f705b69e20 Spellchecking of songs and custom 2010-08-22 08:05:05 +01:00
Tim Bentley
9f4066bf3f More fixes and update song editing 2010-08-21 20:35:32 +01:00
Derek Scotney
54736fdac0 Implementation of SongSelect file import 2010-08-21 17:33:31 +02:00
Tim Bentley
1e86aa98ba Fix theme text weight and html tag cleanups 2010-08-21 07:00:46 +01:00
Raoul Snyman
3d478ec975 Song Wizard! 2010-08-20 21:40:07 +02:00
Tim Bentley
def949fc9a Head987 2010-08-20 19:14:58 +01:00
Andreas Preikschat
5a22e67346 clean up 2010-08-18 17:04:16 +02:00
Andreas Preikschat
1b1261a1a4 - improved usage of different bibles and/or books in one service item 2010-08-15 17:35:20 +02:00
Andreas Preikschat
30e867e020 - rework 
- improved usage of different bibles
 2010-08-15 16:49:07 +02:00
Andreas Preikschat
a043407e25 Dual bible fixes 
bzr-revno: 987
 2010-08-11 20:47:24 +01:00
Andreas Preikschat
c41bb80a95 made lines more readable 2010-08-10 18:49:52 +02:00
Andreas Preikschat
df8b064058 made lines more readable 2010-08-10 18:48:10 +02:00
Andreas Preikschat
47125ba600 made lines more readable 2010-08-10 18:44:04 +02:00
Andreas Preikschat
403ee4cd53 more convenient names 2010-08-08 20:05:33 +02:00
Raoul Snyman
d992fb1e07 First add and delete buttons working! 2010-08-08 16:38:51 +02:00
Andreas Preikschat
24de78680e cleanup 2010-08-06 09:23:32 +02:00
Andreas Preikschat
719268f121 cleanup 2010-08-06 09:07:20 +02:00
Andreas Preikschat
3bee58e314 'if' not necessary 2010-08-06 09:00:34 +02:00
Andreas Preikschat
60b179b2ed improved single and dual bible usage in one service item 2010-08-05 21:32:58 +02:00
Tim Bentley
6d352df382 Video cleanups 2010-08-04 20:09:43 +01:00
Andreas Preikschat
e6f0fde98d tweaks and cleanups 2010-08-04 10:02:52 +02:00
Tim Bentley
821911503e Alerts now work 2010-08-04 05:59:41 +01:00
Tim Bentley
f3e62c9f14 Bible text display cleanups 2010-08-03 20:23:05 +01:00
Andreas Preikschat
444a219a20 removed unused list 2010-08-03 19:17:09 +02:00
Andreas Preikschat
6df4e2cfef continued fixing + cleaned my work up 2010-08-03 19:04:08 +02:00
Andreas Preikschat
b3d17de18a fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:49:04 +02:00
Andreas Preikschat
569377e7d0 fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:46:12 +02:00
Tim Bentley
9539e5b2a6 Head986 2010-08-03 05:56:33 +01:00
Andreas Preikschat
778388b2ae search result are dependent (in regard to 2nd bible) 2010-08-02 22:03:20 +02:00
Tim Bentley
9bdc7db801 Fixes 2010-08-02 20:23:39 +01:00
Andreas Preikschat
06752ffa66 show both bible versions in the title 2010-08-02 21:11:05 +02:00
Tim Bentley
9da35664bb Fix up songusage 2010-08-02 20:05:40 +01:00
Tim Bentley
4e0a3ca40b Fix song usage missing code 2010-08-02 18:51:44 +01:00
Tim Bentley
992cebb05c Head984 2010-08-01 16:48:26 +01:00
Andreas Preikschat
839d5da3ef Disable buttons when no item to act on 
bzr-revno: 984
 2010-08-01 16:32:09 +01:00
Tim Bentley
047e8efe1f Head982 2010-08-01 09:44:58 +01:00