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

3662 Commits

Author SHA1 Message Date
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02: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
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
Tim Bentley
ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley
88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Tim Bentley
c058c774fc revert 1757 2011-09-24 16:18:48 +01:00
Martin Zibricky
b66e07e98b Fixed bug #745636: Added export to openlyrics format with formatting tags. 
bzr-revno: 1758
Fixes: https://launchpad.net/bugs/745636
 2011-09-23 08:43:06 +02:00
Martin Zibricky
1ef223b4a3 Fix issues with ignoring comments and chords 2011-09-23 02:12:55 +02:00
Raoul Snyman
a6821c0b7d Removed some unnecessary experimental code. 2011-09-22 22:39:27 +02:00
Martin Zibricky
354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02: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
rimach
d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach
11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach
2284cee517 little corrections 2011-09-22 20:27:04 +02:00
rimach
18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky
8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Martin Zibricky
c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Martin Zibricky
6e4c619cbd Add openlyrics export with formatting tags support. 2011-09-21 01:06:43 +02:00
Raoul Snyman
54a1e25cb7 Trying to fix bug #803342 2011-09-20 18:24:07 +02:00
Martin Zibricky
74c5669194 Dropped <line> element for openlyrics parsing and allow to import formatting tags over multiple lines and tags with only starting tag 2011-09-20 17:52:19 +02:00
Martin Zibricky
039115c7f4 Fix issue with more new lines when having more <lines> element in openlyrics document. 2011-09-19 14:59:37 +02:00
Martin Zibricky
b27784e838 Add comments to some new functions 2011-09-19 01:00:55 +02:00
Martin Zibricky
2b7f51d4e9 Code cleanup of openlyrics import with formatting tags 2011-09-19 00:43:12 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Martin Zibricky
8a11e790e5 [merge] merge with trunk r1747 2011-09-17 09:37:04 +02:00
Martin Zibricky
614ad790ae Fix spelling mistake 2011-09-16 13:31:11 +02:00
Raoul Snyman
f6927ef5b7 Fixed bug #851653, where deleting a song without audio files raised an exception. 
bzr-revno: 1747
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 13:20:44 +02:00
Raoul Snyman
1afcbbc837 Fixed bug #851653, added an if statement, and fixed the orphaned variable. 
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 10:15:37 +02:00
Martin Zibricky
a7cd6c8a17 fix typo in comment 2011-09-15 19:44:03 +02:00
Martin Zibricky
82163867fe Add docstrings to some new openlyrics methods. 2011-09-15 14:23:40 +02:00
Tim Bentley
53b3b394e9 Turn off autopreview when deleting images. 
Stops images being deleted trying to preview themselves.

Fixes: https://launchpad.net/bugs/835033
 2011-09-14 21:27:30 +01:00
Martin Zibricky
526365153f rename in xml.py only_process_format_tags to parse_and_not_save 2011-09-13 22:40:34 +02:00
Martin Zibricky
8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Raoul Snyman
807aac95ee Delete audio files when you delete a song. 2011-09-12 19:09:11 +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
906b0fe67e Added support for copying files from openlp.org 1.2.x. 2011-09-12 08:29:58 +02:00
Martin Zibricky
5c13123cef Delete print statement 2011-09-10 22:15:23 +02:00
Martin Zibricky
a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Raoul Snyman
d1ae7a7f28 HEAD 2011-09-08 21:04:38 +02:00
Martin Zibricky
c8c8c7e654 code to expand <format> tag for openlyrics export 2011-09-08 01:16:14 +02:00
Martin Zibricky
9fb6936263 code to add formatting tags to openlyrics lyrics 2011-09-07 22:54:53 +02:00
Tim Bentley
a328d1c7c7 Bypass message if requested from remote plugin 
Fixes: https://launchpad.net/bugs/796195
 2011-09-06 18:53:43 +01:00
Martin Zibricky
6163bc99c3 Do not use depracated dict.has_key() function in openlyrics code 2011-09-06 15:22:17 +02:00
Martin Zibricky
5d2bde01c2 For openlyrics export skip adding format tags if not used. 2011-09-06 15:14:57 +02:00
Raoul Snyman
9659834430 Finished fixing variable names. 2011-09-06 07:47:33 +02:00
Raoul Snyman
564c7e4a5a Coding standards clean up. 2011-09-05 14:51:16 +02:00
Martin Zibricky
bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +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
Martin Zibricky
9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Raoul Snyman
79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman
2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +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
8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Mattias Põldaru
af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
rimach
2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach
c608301b0b review changes 2011-08-29 23:51:03 +02:00
rimach
20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach
c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman
bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit
7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Mattias Põldaru
44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Stevan Pettit
96076a4bac Removed import receiver 2011-08-29 08:59:19 -04:00
Stevan Pettit
7e48256534 Removed need for signal to run appStartup 2011-08-29 08:47:32 -04:00
Raoul Snyman
2658c94520 Add audio file support to updating songs from the service. 2011-08-28 22:58:21 +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
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit
d4e6c44d21 Fixed signal name 2011-08-27 16:42:22 -04:00
Andreas Preikschat
f3691516fd import tags from xml (part 1) 2011-08-27 16:00:24 +02:00
Andreas Preikschat
65630c6853 r1726 2011-08-27 13:24:24 +02:00
Andreas Preikschat
8020869dec - added some hints that the exporter export OpenLyrics files 
bzr-revno: 1726
 2011-08-27 13:19:55 +02:00
Tim Bentley
9949fba4ae Update songusage database to add plugin and what type of access. 
Amend triggers to record the correct data
Update report to output the new data items.

Apply fix in bug to allow Meda_data tables to be defined in core

bzr-revno: 1725
 2011-08-27 09:15:55 +01:00
Tim Bentley
611577577f Remove extra imports 2 2011-08-27 07:12:03 +01:00
Tim Bentley
9de4c0c118 Remove extra imports 2011-08-27 07:07:30 +01:00
Stevan Pettit
3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Raoul Snyman
f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Raoul Snyman
c81117991a HEAD 2011-08-26 22:59:27 +02:00
Tim Bentley
ed57b9bfbd Record timestamps of changes in songs database 
bzr-revno: 1724
 2011-08-26 20:51:14 +01:00
Tim Bentley
01128d4dc7 Fix report and triggers 2011-08-26 20:31:02 +01:00
Tim Bentley
2dd0aa234e remove prints 2011-08-26 19:07:44 +01:00
Tim Bentley
f266485001 Add fields to database 2011-08-26 18:56:36 +01:00
Andreas Preikschat
d88a268c5c removed 'again' 2011-08-26 17:48:58 +02:00
Andreas Preikschat
fa85525a68 r1723 2011-08-26 17:32:37 +02:00
Andreas Preikschat
fbb32a0278 added hints that exported files are OpenLyrics files 2011-08-26 17:30:51 +02:00
Andreas Preikschat
407b342f45 changed 'switch' name 2011-08-26 17:15:17 +02:00
Andreas Preikschat
953ff87ff5 do not delete temporary tags when resetting the list; preparations 2011-08-26 17:06:22 +02:00
Andreas Preikschat
dd00f95f64 r1723 2011-08-26 15:18:06 +02:00
Tim Bentley
4f0c7716bc Fix default value 2011-08-26 14:13:32 +01:00
Tim Bentley
dec8ce3a8d Add ability to set colours around borders of images and in themes. 
May not be to all tastes ;-)

bzr-revno: 1722
 2011-08-26 13:20:49 +01:00
Tim Bentley
1adac78588 Add date fields to songs 2011-08-26 13:02:06 +01:00
Raoul Snyman
2c0df18f35 - Implemented a seamless database upgrade system. 
- Added the first upgrade as a demonstration.
- Added database version check so that newer version databases are not loaded.

bzr-revno: 1721
 2011-08-26 13:39:32 +02:00
Tim Bentley
869bc9bb20 Fix field name 2011-08-26 09:21:27 +01:00
Raoul Snyman
4b1ce7102e A few more tweaks as requested by Andreas. 2011-08-25 22:14:02 +02:00
Raoul Snyman
bcf9b174ff Fixed a bug where the version number saved to the database was incorrect. Added the ability to throw an error message and not load the database if the db is too new or incorrect. 2011-08-25 22:02:55 +02:00
Tim Bentley
5f6b315c4a fix trace 2011-08-25 20:52:07 +01:00
Tim Bentley
803adc92c0 Fixes 2011-08-25 19:33:25 +01:00
Raoul Snyman
ddf148449d Now with exception handling. 2011-08-25 13:47:07 +02:00
Raoul Snyman
923261c59c Even better, got rid of 'upgrade_schema' function which is not really needed. 2011-08-25 11:22:48 +02:00