openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
17,901 Commits 6 Branches 56 Tags 310 MiB
Commit Graph

556 Commits

Author SHA1 Message Date
Samuel Mehrbrodt 577c7321ff Add new type for 'Words and Music' 2014-04-08 20:52:05 +02:00
Samuel Mehrbrodt fb85b9858a PEP8 2014-04-08 11:29:47 +02:00
Samuel Mehrbrodt 7f8e76b8dd Restore previous delete button behavior 2014-04-08 11:21:56 +02:00
Samuel Mehrbrodt cc635e9b96 SQLite doesn't support changing a primary key 2014-04-08 11:16:14 +02:00
Samuel Mehrbrodt 31b220c972 Indentation 2014-04-02 08:49:03 +02:00
Samuel Mehrbrodt 691247ffda Don't allow a song to be saved without an author 2014-04-02 08:47:27 +02:00
Samuel Mehrbrodt c7358e4a9f The author_type column is part of the primary key and thus can't be NULL 2014-03-30 19:38:26 +02:00
Samuel Mehrbrodt 87051a094a Put Author types in an own enum class 2014-03-30 19:23:36 +02:00
Samuel Mehrbrodt dadfbcfacb Merge head 2014-03-28 17:06:37 +01:00
Samuel Mehrbrodt 71b34578d7 Add support for the Author type property 2014-03-28 17:06:16 +01:00
Samuel Mehrbrodt 20533624e0 Fix method calls (broken with rev. 2329) 2014-03-23 23:27:07 +01:00
Tim Bentley bbe4169c24 Fix all formatting errors 2014-03-21 21:38:08 +00:00
Tim Bentley 0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00:00
Tim Bentley 43f156d9fe Update Songs forms 2014-03-04 18:49:30 +00:00
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Philip Ridout c41842125d HEAD 2013-11-16 20:32:50 +00:00
Tim Bentley 63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley a82c64237c Fix move of check_directory_exists 2013-10-13 18:23:52 +01:00
Tim Bentley b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley 257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Philip Ridout a06469fea0 head 2013-09-15 19:36:58 +01:00
Tim Bentley 8ab834c18e Fix up save and load# 2013-09-01 21:43:22 +01:00
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Andreas Preikschat ccf5d6535b head 2013-08-31 17:23:46 +02:00
Raoul Snyman 4a86d55a00 Fix song edit form to clear previous used fields 
bzr-revno: 2288
 2013-08-31 09:56:21 +01:00
Philip Ridout 49c9663dcf renamed var, removed some uneeded ()'s 2013-08-22 20:20:02 +00:00
Andreas Preikschat 9b0b88718d head 2013-08-22 20:47:08 +02:00
Raoul Snyman c83dbe7f63 Fix bug #1212801 where the song edit form did not clear a previously set theme. 
Fixes: https://launchpad.net/bugs/1212801
 2013-08-15 21:49:51 +02:00
Philip Ridout 364fde73c5 Fix #120515 by reimplementing QFileDialog.getOpenFileNames 2013-08-13 19:02:04 +01:00
s.mehrbrodt@gmail.com a52ffdb483 Fix indentation 2013-07-22 22:27:51 +02:00
s.mehrbrodt@gmail.com 4894ad6dc2 Improve message when an invalid order was entered 
It mentions that the delimiter has to be a space.

Fixes: https://launchpad.net/bugs/1094809
 2013-07-19 18:52:16 +02:00
Andreas Preikschat b0f0fb554f python3 does not have buffer 2013-07-06 20:15:44 +02:00
Andreas Preikschat 4f8d93638b fixes 2013-06-21 20:13:59 +02:00
Andreas Preikschat 6265ce93de fixed tests 2013-06-21 12:16:50 +02:00
Andreas Preikschat 6b881e312f added second error message 2013-06-16 19:28:44 +02:00
Andreas Preikschat 45313cb450 head 2013-06-16 19:20:51 +02:00
Andreas Preikschat 4063de2700 head 2013-04-20 22:34:46 +02:00
Andreas Preikschat 7682698cf1 media code standards 2013-04-19 21:15:12 +02:00
Andreas Preikschat 31aaafa254 clean ups 2013-04-18 20:27:54 +02:00
Andreas Preikschat e7f553afb1 added test 2013-04-18 20:27:22 +02:00
Andreas Preikschat b71d3e9e53 fixed bug-1170435 
Fixes: https://launchpad.net/bugs/1170435
 2013-04-18 19:50:39 +02:00
Andreas Preikschat c13c0a0474 renaming 2013-04-18 11:22:20 +02:00
Andreas Preikschat 643fa9436c fixed song editor regression 2013-03-28 22:36:18 +01:00
Tim Bentley 38ed9bdc35 missed bits 2013-03-20 18:35:28 +00:00
Tim Bentley f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Raoul Snyman e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Tim Bentley e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Raoul Snyman 211bd38bbf Some minor PyLint cleanups 2013-03-13 22:44:06 +02:00
Raoul Snyman 837118bf07 Cleanup EditVerseForm and friends, and expand the test. 2013-03-11 10:07:17 +02:00
Raoul Snyman d6d1ecf616 Naming convention cleanups and a few merges from the upstream branch. 2013-03-07 23:04:19 +02:00
Raoul Snyman 87212e5d1c More cleanups and more tests 2013-03-07 14:34:35 +02:00
Raoul Snyman e5c87ed6f2 HEAD 2013-03-07 08:47:43 +02:00
Philip Ridout 044c225fe3 Fixes bug:#1135392 by reraising the exception. 2013-03-04 20:58:28 +00:00
Raoul Snyman 6c1a0aa5e7 HEAD 2013-03-04 10:53:43 +02:00
Andreas Preikschat 31f28a7570 fixed same short lines 2013-02-24 19:13:50 +01:00
Raoul Snyman 74fc1d3988 HEAD 2013-02-18 23:05:08 +02:00
Andreas Preikschat a3a8957fd3 Inconvenient focus in Song Editor when adding authors) by reimplementing the keyPressEvent 
bzr-revno: 2179
 2013-02-16 06:50:28 +00:00
Andreas Preikschat 75b8ed55fa fixed bug 1047995 by reimplementing the keyPressEvent 
Fixes: https://launchpad.net/bugs/1047995
 2013-02-11 09:31:46 +01:00
Raoul Snyman 761bb6339d More code cleanups. 
- Corrected more naming conventions
- Changed old-style signal-slot connections
- Added properties to the author form
 2013-02-10 22:04:47 +02:00
Raoul Snyman 0f7f17f79c Various code cleanups. 
- Renamed variables to python_style
- Renamed some functions to python_style
- PEP8 compliance cleanup
 2013-02-10 12:39:28 +02:00
Tim Bentley cae39247d9 Final cleanup of variables 2013-02-07 11:33:47 +00:00
Tim Bentley c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Tim Bentley fae34b1b4d Head + fix merge problems 2013-02-07 07:17:19 +00:00
Andreas Preikschat a832377554 - removed not needed imports; removed not needed script 
- used += instead
- fixed short lines
- converted print statements
- reordered imports

bzr-revno: 2173
 2013-02-06 22:43:18 +01:00
Andreas Preikschat ea3e24096c use registry 2013-02-05 20:29:31 +01:00
Andreas Preikschat f1e8f9812c fixed rename error 2013-02-05 18:47:57 +01:00
Andreas Preikschat f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat f94da5c22c fixed spaces 2013-02-05 07:47:03 +01:00
Andreas Preikschat 86912ec2c3 removed not needed imports; removed not needed script 2013-02-04 22:22:12 +01:00
Tim Bentley b7b19a4180 Fix up Registry function processing 2013-02-04 19:25:12 +00:00
Tim Bentley ca5e46a2b1 Add test idea for the registry 2013-02-03 21:46:56 +00:00
Tim Bentley 80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00
Tim Bentley eb3e5b8642 Remote Edit cleanup and simplification 2013-01-27 09:57:03 +00:00
Tim Bentley aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley 76d259264d More cleanups 2013-01-23 19:53:40 +00:00
Andreas Preikschat 3bf4f401b1 r2148 2013-01-18 22:36:15 +01:00
Raoul Snyman 5a008c3910 Some more code cleanups to raise our code score on CI. 2013-01-17 23:58:38 +02:00
Andreas Preikschat 91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Tim Bentley 0e5a3aa045 More 120 cleanups 2013-01-05 22:17:30 +00:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Andreas Preikschat 6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Tim Bentley 3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Tim Bentley cdc810de67 Correct fix this time 2012-12-07 06:04:15 +00:00
Tim Bentley 901f835e90 Fix song edit media 2012-12-06 21:56:04 +00:00
Andreas Preikschat cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat 80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Andreas Preikschat ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat 4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
Philip Ridout f4b9cfd727 Fixed bug #1011286 and removed the constraint of no blank verses. 
bzr-revno: 2047
Fixes: https://launchpad.net/bugs/1011286
 2012-08-25 21:23:40 +02:00
Philip Ridout c6d85d3ab8 Implemented gushies changes 2012-07-22 21:20:53 +01:00
Philip Ridout 1d4e5c9430 I have actually fixed the entering of verses with no text! 2012-07-22 09:50:37 +01:00
Andreas Preikschat 978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02:00
Andreas Preikschat 3c69631b59 clean ups 2012-07-07 16:54:14 +02:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Andreas Preikschat 631535acfd another variable fix 2012-06-16 18:12:54 +02:00
Andreas Preikschat 999af73d14 variable naming conventions, converted dict to list 2012-06-16 17:51:04 +02:00
Andreas Preikschat fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02:00
Andreas Preikschat 8241808d65 fixed traceback when deleting an author/topic which has just been added to an unsaved song 2012-05-26 22:06:19 +02:00
Andreas Preikschat cf59d89afa fixed ticket 502 2012-05-26 21:56:12 +02:00
Andreas Preikschat a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Andreas Preikschat b124481ea2 continued with QVariant 2012-05-19 11:13:32 +02:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Andreas Preikschat a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
M2j 5ee446f694 Head 1933 2012-04-03 19:59:34 +02:00
Meinert Jordan b2abc5a060 Remove control characters from song copyright string 
bzr-revno: 1932
Fixes: https://launchpad.net/bugs/969282
 2012-04-03 17:24:52 +01:00
Meinert Jordan 1128b424e5 Bug #795068: Verse List in Song Editor did not resize properly 
bzr-revno: 1928
Fixes: https://launchpad.net/bugs/795068
 2012-04-02 23:11:41 +02:00
M2j 5dd334370d Head 2012-04-02 23:06:55 +02:00
M2j 84ee153fec Bug #795068: Verse List in Song Editor did not resize properly 2012-04-02 15:27:08 +02:00
M2j 1b056a74ec Bug #969282: Remove control characters from song copyright string 2012-04-02 13:38:22 +02:00
M2j c747baa2ea Trigger push button actions with click signal instead of push signal 2012-04-02 02:19:16 +02:00
M2j d7ab06cc7e - reorganisation of methods in openlp.core.lib.ui to make them more comprehensive 
- some small restatements of some code in bibles parse_reference() method
 2012-04-01 23:19:56 +02:00
Andreas Preikschat a9a40f7a47 clean up 2012-04-01 16:22:32 +02:00
Andreas Preikschat 2e587131f3 fixed bug-969909 ('Missing verse tag' warning is not updated after adding a new verse 
Fixes: https://launchpad.net/bugs/969909
 2012-03-31 11:58:34 +02:00
Raoul Snyman c152cde3b7 Actually, the else should not be there. 2012-03-22 23:31:01 +02:00
Raoul Snyman 58c2cd34b1 Added an else statement just to make sure we are setting the item index. 2012-03-22 22:26:14 +02:00
Raoul Snyman 591d70cde6 Added a comment referencing bug #812628 so that we know why we added a seemingly redundant if statement. 2012-03-22 22:25:11 +02:00
Raoul Snyman 5a42c87a92 Whoops, forgot about the first item being blank. Now the correct author is added. 2012-03-22 22:16:49 +02:00
Raoul Snyman d62fde1237 A potential fix for bug #812628. 2012-03-22 22:03:11 +02:00
Jon Tibble 6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Raoul Snyman 03f22ae150 Refactored things a bit so that I don't rewrite too much code, and fixed up some issues with invalid verses. 2012-03-11 23:32:43 +02:00
Raoul Snyman 8e54dcb1ee The message appears when your verse list is incomplete, and disappears when it is complete. 2012-03-05 22:34:23 +02:00
Raoul Snyman 5823bfbed5 Added label to warn of missing verses. 2012-03-05 21:45:32 +02:00
M2j ce7029776a localize separated item list format 2012-02-16 21:36:35 +01:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Andreas Preikschat 12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
Jon Tibble bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
Jon Tibble ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
M2j 286ec88fc4 make VerseType.Other default for VerseType encodings 2011-11-24 23:34:27 +01:00
M2j b2067bef43 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.
 2011-11-18 11:53:56 +01:00
Raoul Snyman 77e4e376c6 Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again. 
Fixes: https://launchpad.net/bugs/812289
 2011-09-22 22:07:31 +02:00
Raoul Snyman 79bb94c6b0 Removed empty directories. 2011-09-04 14:04:44 +02:00
Raoul Snyman a32e2b9d1b Hopefully fixed the problem where existing audio files are deleted. 2011-09-04 11:26:13 +02:00
Raoul Snyman 79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman 4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman 532ad84b87 - Bundle audio files with the song when adding it to the service 
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
 2011-08-28 22:51:44 +02:00
Raoul Snyman f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Raoul Snyman cdcfeaece8 Keeping things tidy: Actually save to DB now, and delete removed files. 2011-08-24 14:22:39 +02:00