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

545 Commits

Author SHA1 Message Date
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 cc9ef10821 Songs get created correctly and displays refreshed 2010-11-29 16:02:41 +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 1cf4914862 fixes from last merge and more code for song management 2010-11-27 20:51:54 +00:00
Andreas Preikschat 66f230169d SongBeamer import clean ups and tweaks 2010-11-26 15:23:48 +01:00
Andreas Preikschat e4e2892ec7 trunk r1119 2010-11-21 12:00:37 +01:00
Tim Bentley 94fb7d49d6 Remove stray print statements 2010-11-18 17:57:51 +00:00
M2j 4ccb48ffce HEAD 1114 2010-11-12 14:40:24 +01:00
Andreas Preikschat f8b793ca3b removed whitespaces, added second blank line before class 2010-11-09 18:10:37 +01:00
M2j 4294ae83b8 split song verse order at consecutive whitespaces and not just u' ' 2010-11-04 20:32:43 +01:00
Andreas Preikschat f4b86d1f14 songmanager -> manager, fixed traceback 2010-11-03 19:18:44 +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 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
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 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
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
rimach 5049aab6d2 Changes for SongBeamer Import 2010-09-27 06:51:16 +02:00
Jonathan Corwin 3615fe5d13 Fix save/load of songnumber/book 2010-09-25 12:55:01 +01:00
Raoul Snyman 697cc79b3a Fix bug #598805 2010-09-24 22:54:52 +02:00
Jeffrey S. Smith e99ebe64c7 Replace disablable with can_disable. Change obj_prefix default 2010-09-23 14:23:56 -05:00
rimach 9111a1885e add SongBeamer import 2010-09-23 21:01:52 +02:00
Jeffrey S. Smith 29cfa96ce8 Factorize code for making song import wizard pages 2010-09-22 10:01:37 -05:00
Raoul Snyman c235b793b0 Fix bug #644106 
Fix a related bug in the song importer.
 2010-09-21 20:12:46 +02:00
Jeffrey S. Smith d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05: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 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
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
Raoul Snyman d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
Raoul Snyman b8893f4ab2 Merge in the openlp.org 1.x importer. 
bzr-revno: 1017
 2010-09-08 06:57:13 +02: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 035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Tim Bentley 04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
Derek Scotney 56b5a037ae Conflicts resolved 2010-09-01 22:20:27 +02:00
Philip Ridout 7e0245344a Adding the Words of Worship importer. 
bzr-revno: 1001
 2010-09-01 07:11:31 +02:00
Jon Tibble 0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01: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 80ded239a8 Changes to CCLI file importer to work with import wizard 2010-08-28 15:15:12 +02: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 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
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
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
Raoul Snyman ef44dc72c6 Changed the Generic importer to multifile as well. 2010-08-23 21:29:39 +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
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
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
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 003cfd1e68 Fix unused var and standardise loop vars 2010-07-30 17:13:17 +01:00
Jon Tibble 37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Raoul Snyman 2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Raoul Snyman 651ee535f6 Hopefully the last of the string fixes. 2010-07-23 21:17:36 +02: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
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 1738040b87 Save Song Book (Bug #607030) 2010-07-20 12:02:03 +01:00
Jon Tibble 11c90c3eb7 Fix song book form ampersands 2010-07-20 09:37:15 +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 978372ca9f added check preventing adding a topic/author twice to the song 2010-07-19 20:34:03 +02: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
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 2009e95ff0 head 2010-07-19 09:51:20 +02:00
Jon Tibble f71f27c890 Database refactor 2010-07-19 00:37:24 +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 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
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 eaf2f568f4 error messages added 2010-07-16 11:00:20 +02: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 1b9830429b Use build_icon 2010-07-08 12:46:03 +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 497d1c9dc9 XML: Put it where it should be 2010-07-03 02:33:40 +01:00
Tim Bentley 0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Jon Tibble 079d72f93f Database refactoring 2010-06-30 23:05:51 +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 01421770ed Head r883 2010-06-25 19:14:38 +01: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
Jon Tibble ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Frode Woldsund 56f87c3a35 Fixed (c) symbol 2010-06-23 15:39:36 +02:00
Jon Tibble 43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Tim Bentley a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01: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
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 5dc87d3ede Cleanups 2010-06-17 22:07:01 +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 e71caf43e7 Head r846 2010-06-14 19:22:08 +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 13c646153f Keep library classes/methods in lib dirs 2010-06-12 13:33:04 +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
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 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
Jon Tibble 559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
Frode Woldsund 2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +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 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
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 fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +01:00
Jon Tibble e195f0ffb7 Match method and overridden method arguments and cleanups 2010-05-26 00:47:26 +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