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

859 Commits

Author SHA1 Message Date
Andreas Preikschat
770d245534 fixed non camelCase attributes 2012-06-04 11:57:45 +02:00
Samuel Findlay
6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay
7b97c15fc7 Refactor SongFormatAttr into SongFormat. PascalCase for enumeration. 2012-06-03 23:50:57 +10:00
Samuel Findlay
78c4906b55 2012-06-01 17:32:58 +10:00
Samuel Findlay
d9ed9aaa5c Removed obj_prefix (old code from r1055 and even < r990) 2012-06-01 00:24:24 +10:00
Samuel Findlay
606da7ab76 Typo 2012-05-31 23:58:10 +10:00
Samuel Findlay
5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay
dddd883ede Fixed alignment of filepathEdit widget by adjusting spacer size according to label width. 2012-05-31 22:42:44 +10:00
Samuel Findlay
d86caecbbf Refactored sourcePage validation: reimplemented QWizardPage.isComplete() so that Next button is disabled until source(s) are selected. validateCurrentPage gives each song format class chance to validate its input. 2012-05-31 19:15:45 +10:00
Samuel Findlay
c4060dc04b First working rev. Completed basic testing. 2012-05-31 00:59:54 +10:00
Samuel Findlay
504145d454 Completed refactor of songimportform.py 2012-05-30 23:53:31 +10:00
Samuel Findlay
e882607360 Completed refactor of importer.py 2012-05-30 19:11:44 +10:00
Samuel Findlay
465aecc61c Mostly complete attempt at refactor. Tidy ups needed. 2012-05-30 02:26:50 +10:00
Stevan Pettit
394a02c696 Merged trunk 2012-05-29 08:59:11 -04: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
Stevan Pettit
357f876331 Removed unused import qtcore 2012-05-21 08:41:33 -04:00
Stevan Pettit
968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Samuel Findlay
e01995eafd Tidy up 2012-05-20 11:42:07 +10:00
Andreas Preikschat
a085694be1 removed toString(), toPyObject() 2012-05-19 17:10:05 +02:00
Samuel Findlay
cdd867a755 Added static method isValidSource so importers can validate their input. Also tidyup: removed SongImport.errorLog 2012-05-19 20:43:19 +10:00
Andreas Preikschat
b124481ea2 continued with QVariant 2012-05-19 11:13:32 +02:00
Andreas Preikschat
b07fab7ff0 clean up 2012-05-19 10:50:33 +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
Stevan Pettit
f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Samuel Findlay
31debbe238 Improved PowerSong import wizard validation 2012-05-07 23:26:52 +10:00
Samuel Findlay
3483231a32 Adapted PowerSongImport class to receive a folder 2012-05-07 23:10:26 +10:00
Samuel Findlay
28d9a05731 Adapted all PowerSong import widgets for select folder 2012-05-07 21:24:46 +10:00
Samuel Findlay
bf4dcdde92 Added getFolder to OpenLPWizard 2012-05-07 20:36:39 +10:00
Samuel Findlay
416cbe465e Changed 'PowerSong' to 'PowerSong 1.0' 2012-05-03 22:50:10 +10:00
Samuel Findlay
76de0f0c60 Merge trunk r1961 2012-05-03 14:25:31 +10:00
Andreas Preikschat
63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range() 
bzr-revno: 1961
 2012-05-01 22:35:42 +02:00
Samuel Findlay
ecc943ae20 Update to trunk r1960 2012-05-02 00:00:53 +10:00
Andreas Preikschat
a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
Samuel Findlay
370603c779 PowerSong importer working. Successful on test set of 1057 songs 2012-04-30 20:57:44 +10:00
Samuel Findlay
ea9bfb160d Integrated module openlp.plugins.songs.lib.powersongimport 2012-04-30 16:24:04 +10:00
M2j
c6c62bdcad pythonifying code: 
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
 2012-04-29 17:31:56 +02:00
Philip Ridout
7b99c97174 Adds DreamBeam song importer. 
Small fix for SongShowPlus importer.

bzr-revno: 1955
 2012-04-25 20:50:08 +02:00
Raoul Snyman
4452d4834c Refactored various variable names. 
Refactored the names of the fields in the "metadata" table of Bibles, and provided an upgrade script to upgrade the Bibles seamlessly.
Refactored the name of a setting, and wrote some code to migrate it seamlessly.
 2012-04-22 00:29:08 +02:00
Raoul Snyman
7d5d7d7116 Changed the 'Split' button to say 'Optional Split' instead. 
bzr-revno: 1945
 2012-04-20 21:32:34 +02:00
Andreas Preikschat
3414763fff fixed spelling 2012-04-15 12:16:01 +02:00
Raoul Snyman
70d75b0f80 Removed an unused import. 
Changed the "Split" button to say "Optional Split" instead.
 2012-04-13 22:08:05 +02:00
Andreas Preikschat
620d858d68 clean ups 2012-04-12 16:16:12 +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
93a9b62abb Bug #959116: Split slide button inserts tag on its own line 
bzr-revno: 1931
Fixes: https://launchpad.net/bugs/959116
 2012-04-03 09:38:27 +02: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
41ff5b04df small fixes 2012-04-02 21:34:49 +02:00
M2j
36fc1b5339 Bug #959116: Split slide button inserts tag on its own line 2012-04-02 16:23:25 +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
6657e27694 add objectName parameter to create_button_box method 
remove QMetaObject.connectSlotsByName() calls as they do nothing in our code
 2012-04-02 00:44:09 +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
Philip Ridout
75212def12 Fixes bug #946581 'Prevent users from importing the wrong files' 
bzr-revno: 1922
 2012-03-31 15:38:35 +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
Philip Ridout
e2e63767f3 Change EasySlides DocString 2012-03-29 20:03:01 +01:00
Philip Ridout
a08a244084 Fixes bug #946581 "Prevent users from importing the wrong files" 
Checks for the song tag in OpenSong (as Gushie said it has no extensions)
Addes file extension filters for CCLI, EasyWorship & EasySlides

Fixes: https://launchpad.net/bugs/946581
 2012-03-24 18:35:09 +00:00
Philip Ridout
b68300bdc6 New importer for DreamBeam song files. 
One small fix to SongShowPlus importer
 2012-03-24 16:41:29 +00: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
M2j
1757436853 purge ICU integration from this branch 2012-01-18 14:50:06 +01:00
M2j
7491023005 Head 1868 2012-01-17 21:37:57 +01:00
Mattias Põldaru
a0ecae3f47 Rename EasiSlides to EasySlides. 
Fixes: https://launchpad.net/bugs/904384
 2011-12-31 16:18:05 +02:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
M2j
15449372e1 use ICU collator on Windows systems 2011-12-19 01:20:39 +01:00
Mattias Põldaru
13385116af Using toInt of QVariant for sure is better than a chain of toString, str and int. Thanks to superfly. 2011-12-13 23:04:16 +02:00
Mattias Põldaru
57d78d00df Make loading of variable slightly more bulletproof. 2011-12-13 21:52:57 +02:00
Mattias Põldaru
4f603d7353 Previous change of order was not enough, now is actually works. It also saves the type of import last time used and uses that value as default (as suggested), otherwise defaults to OpenLyrics. 2011-12-13 21:33:49 +02:00
Mattias Põldaru
88d7176900 Fix for #828385, more sensible and partly alphabetical order of import formats. 2011-12-13 02:34:46 +02:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +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
Tim Bentley
17bca693c6 Block song exports 2011-12-04 16:36:18 +00: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
Stevan Pettit
2a1d0009a8 Removed whitespace 2011-10-05 18:17:57 -04:00
Stevan Pettit
5dfa0c95ce Modified code so new Openlyrics song import description will appear for translate 2011-10-05 15:50:17 -04:00
Stevan Pettit
dc41fa4318 Added coded to translate the modified OpenLyrics import description 2011-10-01 10:34:30 -04:00
Stevan Pettit
d8fc6cd4dd Added additional desctiption to OpenLyrics import selection and added code to select xml files for import 2011-09-30 17:45:59 -04: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
017359ff5c Fixed up audio file import from version 1.2, plus a few bits I missed from renaming things. 2011-09-12 18:35:32 +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
0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman
f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Andreas Preikschat
d88a268c5c removed 'again' 2011-08-26 17:48:58 +02:00
Andreas Preikschat
fbb32a0278 added hints that exported files are OpenLyrics files 2011-08-26 17:30:51 +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
Raoul Snyman
122c2226bd Now copying files too\! 2011-08-24 13:53:22 +02:00
Raoul Snyman
d5e92c0d35 Added a media files form and populated it from the media plugin, if the media plugin is enabled. 2011-08-23 23:48:46 +02:00
Raoul Snyman
6a60ece204 Added Up, Down, Remove and Remove All buttons. Reworked the UI to make use of the buttons better. 2011-08-23 15:44:50 +02:00
Raoul Snyman
409a16eb35 Added the tab, list and buttons for linked audio. 2011-08-23 08:38:02 +02:00
Chris Blake
95f75ce266 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 15:15:45 -04:00
Chris Blake
e75631d7f5 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 13:30:45 -04:00
Chris Blake
2c6d14cfc8 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 12:59:56 -04:00
Andreas Preikschat
6c7c27a7c9 fixed bug #816186; fixed comments; fixed list comprehension 
Fixes: https://launchpad.net/bugs/816186
 2011-08-05 13:21:39 +02:00
Andreas Preikschat
69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Andreas Preikschat
b98e36aff2 regex clean ups 2011-07-13 15:32:19 +02:00
Andreas Preikschat
b68751835f r1673 2011-07-06 16:00:32 +02:00
Andreas Preikschat
bb5d8f74c4 r1665 2011-06-29 10:04:55 +02:00
Andreas Preikschat
8bb96b97bf - When creating/editing a custom slide give the title edit the focus (and not only when creating a new) 
- fixed long lines
- simplification
 2011-06-29 10:04:14 +02:00
Andreas Preikschat
795aae2277 r1665 2011-06-29 09:27:38 +02:00
Andreas Preikschat
86c0eea473 changed theme_manager to themeManager as it is Qt based 2011-06-27 13:51:25 +02:00
Raoul Snyman
fb320569cf Half of bug #795068 fixed. Just figured I might as well get this in before the release. 
bzr-revno: 1654
Fixes: https://launchpad.net/bugs/795068
 2011-06-23 22:02:03 +02:00
Raoul Snyman
1d648f9df6 Removed commented line. 2011-06-23 15:27:06 +02:00
Jonathan Corwin
59280d10b7 Preserve greyed out of next button in import wizard 2011-06-20 22:57:34 +01:00
Raoul Snyman
5901f959ce Half of bug #795068 fixed. 2011-06-14 21:55:17 +02:00
Raoul Snyman
45d992e956 Fixed bug #763064: Empty line in first verse prevents saving a song. 2011-06-14 08:18:44 +02:00
Tim Bentley
608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley
c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Andreas Preikschat
76c1cbf4db fixed 'split' string 
bzr-revno: 1627
 2011-06-11 09:39:53 +02:00
Andreas Preikschat
c3cb264d93 fixed string 2011-06-10 21:51:51 +02:00
Gerald Britton
f5980ecfc1 merging changes from trunk 2011-06-10 15:25:38 -04:00
Stevan Pettit
a10038991b Fixed bug-789102. "Editing song via service and saving it, highlights it in media manager" 
bzr-revno: 1607
Fixes: https://launchpad.net/bugs/789102
 2011-06-03 07:20:56 +02:00
Gerald Britton
8760f54674 Change messages to refer to OpenOffice or LibreOffice 2011-06-01 15:53:14 -04:00
Andreas Preikschat
4c81ac295d r1600 2011-06-01 07:43:41 +02:00
Andreas Preikschat
4ce960d0cc do not override the file class 2011-06-01 07:42:56 +02:00
Stevan Pettit
729fe2cfa3 bug-789102, moved mediaitem list updates out of editforms into mediaitems 2011-05-30 23:52:17 -04:00
Jonathan Corwin
147c41e16f Fix a couple of parents so the form opens in the right place 2011-05-28 20:38:19 +01:00
Jonathan Corwin
82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01:00
Jonathan Corwin
500ce5f720 head 2011-05-28 11:06:34 +01:00
Jonathan Corwin
4138d6fbd0 Change lots of parents 2011-05-28 10:53:37 +01:00
Andreas Preikschat
59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Stevan Pettit
35e6d2f97e Fix bug #788084, modified code to use object id instead of title. 
bzr-revno: 1580
 2011-05-27 07:52:45 +02:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Stevan Pettit
4f857f8921 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-25 23:34:42 -04:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Raoul Snyman
da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Tim Bentley
b544e519b1 Add tolltip and impress debugging 2011-05-22 19:48:14 +01:00
Tim Bentley
37679fc1db Finish slide spltting code 2011-05-22 14:08:43 +01:00
Stevan Pettit
206ee04db6 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-19 18:20:00 -04:00
Andreas Preikschat
55e4bad542 display 'No Search Results' if no song/bible verse matched the search keyword (bug #739759) 
Fixes: https://launchpad.net/bugs/739759
 2011-05-08 13:35:10 +02:00
Tim Bentley
b6b0819a50 fix the strip code 
Fixes: https://launchpad.net/bugs/742636
 2011-04-29 07:15:10 +01:00