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

1804 Commits

Author SHA1 Message Date
Stevan Pettit
b52d00a623 Update local branch from trunk 2011-05-31 08:17:23 -04:00
Stevan Pettit
729fe2cfa3 bug-789102, moved mediaitem list updates out of editforms into mediaitems 2011-05-30 23:52:17 -04:00
Gerald Britton
cde0eb5ab5 Only import uno exceptions if not running Windoes 2011-05-30 17:15:34 -04:00
Gerald Britton
934a70b955 Relocate import logging statement 2011-05-30 16:14:36 -04:00
Raoul Snyman
3683e99152 Fix bug #714510 by removing the unnecessary indexes and defaulting the song_book_id on the songs table to NULL instead of 0. 
bzr-revno: 1596
 2011-05-30 22:03:09 +02:00
Gerald Britton
27b8ec3deb Add exception logging to import.py 2011-05-30 15:19:16 -04:00
Gerald Britton
c8a896cedd Merge changes from trunk 2011-05-30 13:41:56 -04:00
Raoul Snyman
99ae60aba3 Fixed up loading a song from a service. 2011-05-30 13:17:23 +02:00
Raoul Snyman
30ec309ff8 Fixed up various index errors on InnoDB tables. 2011-05-30 08:45:58 +02:00
Jonathan Corwin
3da3dd9869 Head 2011-05-29 21:47:12 +01:00
Gerald Britton
caa6639c7b Uglification to conform to weird standards :) 2011-05-28 16:43:33 -04:00
Gerald Britton
336adb7461 Merged updates from trunk 2011-05-28 16:36:46 -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
Andreas Preikschat
64b9b42321 better solution 2011-05-28 19:01:41 +02:00
Andreas Preikschat
5bedf62ec4 added more code back 2011-05-28 18:30:16 +02:00
Andreas Preikschat
6507b431b0 fix for older versions 2011-05-28 18:25:11 +02: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
42a8a4407e fixed bug 789143 
Fixes: https://launchpad.net/bugs/789143
 2011-05-27 16:28:38 +02:00
Andreas Preikschat
8ffb05bae3 - Improved 'Auto Select' feature 
- Fixed a traceback which occurs when you click the "Add" button in the slidecontroller when you are not previewing an item.
- Improved parentage
- clean ups

bzr-revno: 1584
 2011-05-27 13:59:19 +02:00
Andreas Preikschat
59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Jonathan Corwin
ee00c84dba Remove the index from the search_lyrics column to allow OpenLP to work with a MySQL MyISAM database 
bzr-revno: 1581
 2011-05-27 09:21:23 +01: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
Gerald Britton
dc2a304b16 Merge changes from trunk 2011-05-26 14:20:40 -04:00
Gerald Britton
74e47dcbc7 Add specific error messages for file problems. 
Remove unicode strings in calls to translate()
 2011-05-26 14:20:14 -04:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Jonathan Corwin
40222b23c8 Remove index from search_lyrics for mysql - myisam 2011-05-26 17:35:44 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Gerald Britton
e70ba41373 Add specific error messages if OoO open fails. Use a lambda to avoid repetition 2011-05-26 09:35:01 -04:00
Gerald Britton
c70c1a7c1a Merge changes from trunk 2011-05-26 09:10:46 -04:00
Raoul Snyman
38000b5e56 Give the media items the ability to do something when they are "focused". 
Make the search edits on the Songs, Bibles and Custom media items focus when the item is selected.
 2011-05-26 08:23:22 +02: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
Gerald Britton
4399fc108f Fixed a silent error when OpenOffice fails to open a file.\ 
Also, added the file name to the exception log and made the exception explicit
 2011-05-25 17:38:32 -04:00
Gerald Britton
3b7debfe81 merged with trunk 2011-05-25 16:41:23 -04:00
Andreas Preikschat
cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Gerald Britton
de7b7a072a fix up error messages in ooimport.py 2011-05-24 19:14:49 -04:00
Raoul Snyman
8c9728c3b2 HEAD 2011-05-24 22:53:41 +02: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
Gerald Britton
36e5406b14 Merge trunk changes 2011-05-24 16:41:56 -04:00
Gerald Britton
d05c349f41 Catch common errors during import and report to user 2011-05-24 16:41:14 -04:00
Raoul Snyman
da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Andreas Preikschat
d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +02:00
Andreas Preikschat
5473d3c817 added windows comment 2011-05-24 07:23:28 +02:00
Andreas Preikschat
987cd14fbf r1564 2011-05-23 13:16:28 +02:00
Andreas Preikschat
73293c2985 removed imports 2011-05-23 13:14:05 +02:00
Andreas Preikschat
594caf0a19 fix for windows 2011-05-23 12:34:42 +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
08932ad664 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-21 21:29:09 -04:00
Stevan Pettit
23e95892ec modified: 
openlp/plugins/songs/lib/wowimport.py
pending merges:
  Gerald Britton 2011-05-21 [merge] Words of Worship import where a file m...
    Gerald Britton 2011-05-20 Fix Words of Worship import to issue error...
 2011-05-21 10:49:25 -04:00
Stevan Pettit
48148bc297 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
pending merges:
  Tim Bentley 2011-05-20 [merge] Stop preview media and presentations when...
    Tim Bentley 2011-05-20 Fix extra indent
    Tim Bentley 2011-05-20 [merge] Head
    Tim Bentley 2011-05-20 Stop the media / presentation if going from P...
 2011-05-20 21:30:23 -04:00
Andreas Preikschat
f753070f53 fix for windows 2011-05-20 19:06:38 +02:00
Gerald Britton
a5a8c0d6d2 Fix Words of Worship import to issue error message for files missing the expected header 2011-05-20 12:34:44 -04:00
Andreas Preikschat
3359726be2 improved media item sorting 2011-05-20 17:14:10 +02: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
Tim Bentley
32127d51bb Add Search to Custom 
bzr-revno: 1557
 2011-05-19 17:10:49 +01:00
Andreas Preikschat
f537f91939 Improved regex usage. 
bzr-revno: 1555
 2011-05-19 07:29:50 +02:00
Tim Bentley
cff081066f Head 2011-05-19 05:42:10 +01:00
Armin Köhler
8c308ac4f8 Fixed bug #779995: FoilPresenter songs with verses without text cause a traceback. 
bzr-revno: 1554
 2011-05-18 22:56:18 +02:00
Armin Köhler
674260eadb fix bug https://bugs.launchpad.net/openlp/+bug/779995 2011-05-18 21:07:08 +02:00
Jonathan Corwin
7b534642b9 Plan B. Figure out what the code is actually meant to be doing 2011-05-18 19:59:36 +01:00
Jonathan Corwin
3add2de140 Fix song editing what I did broke. Oops 2011-05-18 19:32:18 +01:00
Tim Bentley
509811620d Head 2011-05-18 15:27:29 +01:00
Andreas Preikschat
4cd23308b8 regex clean ups 2011-05-18 16:26:19 +02:00
Jonathan Corwin
f701eb9417 Head 2011-05-15 21:34:32 +01:00
Tim Bentley
070d719961 Fixes 2011-05-15 20:18:50 +01:00
Tim Bentley
387c911fdb Head 2011-05-15 20:07:53 +01:00
Tim Bentley
70660b7b71 Add Search to Custom and cleanups 2011-05-15 20:07:40 +01:00
Jonathan Corwin
3f21b3e2ca Remote custom search. Revert a few remote web changes 2011-05-15 19:33:00 +01:00
Andreas Preikschat
c728559862 moved 'No Search Results' code 2011-05-15 14:11:08 +02:00
Jonathan Corwin
047287950c Remote song search and go live beginnings 2011-05-14 10:48:58 +01:00
Andreas Preikschat
78c3c3ef39 clean up 2011-05-10 16:08:11 +02:00
Andreas Preikschat
a042ef1132 fix for ticket 155 
bzr-revno: 1530
 2011-05-10 13:15:54 +02:00
Gerald Britton
71818097cd Fix for bug #762856. 
bzr-revno: 1529
Fixes: https://launchpad.net/bugs/762856
 2011-05-10 13:14:56 +02:00
Andreas Preikschat
c60ebb40b2 fix for ticket 155 2011-05-09 15:58:17 +02:00
Andreas Preikschat
b04292a9c6 Display "No Search Results" if the search did not match any song/bible verse. 
bzr-revno: 1527
Fixes: https://launchpad.net/bugs/739759
 2011-05-09 10:29:32 +02: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
Andreas Preikschat
c07f2f40c5 r1522 2011-05-07 13:06:43 +02:00
Gerald Britton
2def15c12f Bug 762856: Support Bridge section and make more robust error recovery 2011-05-06 13:56:58 -04:00
Andreas Preikschat
6cb329dbc4 - fixed missing periods in tooltips 
- removed period from string

bzr-revno: 1522
 2011-05-06 11:17:16 +02:00
Andreas Preikschat
68c1236a2a 2011-05-06 07:17:13 +02:00
Andreas Preikschat
de54c419ce fixed songshowplus importer 2011-05-06 06:36:22 +02:00
Andreas Preikschat
307ef744dd - fixed not closed file 
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
 2011-05-04 09:29:16 +02:00
Tim Bentley
0f7f03da30 Clean up Phonon media Object creation 
bzr-revno: 1503
 2011-04-29 20:22:20 +01:00
Tim Bentley
e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Tim Bentley
45d90db949 Allow leading space in song title 
bzr-revno: 1500
 2011-04-29 08:42:42 +01:00
Raoul Snyman
80b6135c5a Fixed bug #771529, dealing with 1.9.0 databases. 
bzr-revno: 1499
 2011-04-29 09:22:18 +02:00
Andreas Preikschat
44b071680c - modified song <-> xml converter to consider [---] and v1a respectively 
bzr-revno: 1498
 2011-04-29 09:08:53 +02:00
Raoul Snyman
19d085bb3c Changed [:] notation to .startswith(). 2011-04-29 08:28:09 +02:00
Tim Bentley
b6b0819a50 fix the strip code 
Fixes: https://launchpad.net/bugs/742636
 2011-04-29 07:15:10 +01:00
Raoul Snyman
7f1db15ab1 Fixed bug #771529, dealing with 1.9.0 databases. 2011-04-29 01:25:28 +02:00
Tim Bentley
3923c14d0c Head 2011-04-26 19:39:32 +01:00
Jonathan Corwin
4e6c61cc01 Fix issues when importing some OpenSong songs. Bug 759586 
bzr-revno: 1490
Fixes: https://launchpad.net/bugs/759586
 2011-04-26 19:18:14 +01:00
Meinert Jordan
62d55814d2 - fix the recreation of the song order to work with single character verse references 
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call

bzr-revno: 1489
 2011-04-26 19:16:13 +01:00
Jonathan Corwin
a080552081 head 2011-04-25 23:37:58 +01:00
Jonathan Corwin
5bc0c27970 OpenSong fixes bug 759586 2011-04-25 23:15:38 +01:00
Andreas Preikschat
77063381d2 call set_defaults() when logging an error 2011-04-25 09:23:45 +02:00
Andreas Preikschat
c12b4bc28f - improved the song importers by allowing to provide feedback to the user. 
- Do not abort a song import, always try to continue and log which songs could not be imported.
- Clean ups (close files, deduplication, ...)

bzr-revno: 1483
 2011-04-25 09:06:16 +02:00
Tim Bentley
6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Andreas Preikschat
393f25cd88 fixed a bug where a song's author/topic/songbooks might not be saved 2011-04-24 17:36:12 +02:00
Andreas Preikschat
ba45d7e113 fixed names; hide/show menu entries when disabeling/enabeling the songs plugin 2011-04-21 19:14:07 +02:00
M2j
2582b33768 syntax fix 2011-04-21 11:02:41 +02:00
M2j
8439d1ed4f fix verse order rebuild to handle single character verse references 
rename variable to avoid using the 'type' keyword
 2011-04-21 10:53:48 +02:00
Andreas Preikschat
8cd3742c87 added textEdit and buttons for better feedback 2011-04-20 19:36:16 +02:00
Andreas Preikschat
48d0d39a17 ask before creating an error report 
copy not imported files to a folder
 2011-04-19 17:55:36 +02:00
Andreas Preikschat
d45f93b594 return where possible instead of breaking 2011-04-19 13:46:25 +02:00
Andreas Preikschat
3b98cbe0fd fixed OpenSong import 2011-04-19 13:34:04 +02:00
Andreas Preikschat
974a90a173 no xml raises XMLSyntaxError, that is why this is not needed 2011-04-18 21:24:06 +02:00
Andreas Preikschat
6baefdadce more fixes 2011-04-18 20:57:58 +02:00
Andreas Preikschat
757933c448 clean ups 2011-04-18 20:03:41 +02:00
Andreas Preikschat
16fa78bbe3 fixes 2011-04-18 19:15:41 +02:00
Andreas Preikschat
a530851124 added error logger methods 2011-04-18 18:46:22 +02:00
Andreas Preikschat
0398b93f78 started clean up of song importers 2011-04-17 19:24:28 +02:00
Andreas Preikschat
2d02f3e9a0 2011-04-17 17:47:02 +02:00
Andreas Preikschat
6fb421825c r1471 2011-04-17 15:31:13 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley
7476b37ba4 Refactor the SettingsTab to be more KDE like. 
Sort out the Tabs parentage
Clean up the code paths to stop the Tab being loaded twice at startup.
Clean up the TAB Hide/Unhide code. Removed it and rebuild the UI if required.
Fix Bible Quick text to say right things.

bzr-revno: 1467
Fixes: https://launchpad.net/bugs/739762
 2011-04-15 21:47:19 +01:00
Andreas Preikschat
a13cf49940 idea to improve song import feedback 2011-04-15 18:01:15 +02:00
Andreas Preikschat
237cabfeff only try to import a database when it is a v1 database, clean ups 2011-04-15 16:10:31 +02:00
Andreas Preikschat
14a2e8e4c2 finished work on restoring current search methods 2011-04-15 14:55:56 +02:00
Andreas Preikschat
77559e0210 started to implement #746243 
Fixes: https://launchpad.net/bugs/746243
 2011-04-14 23:32:21 +02:00
Tim Bentley
6454b88a83 Fix Tab parentage 2011-04-13 20:12:47 +01:00
Tim Bentley
0b4fd3c585 r1458 2011-04-13 19:20:09 +01:00
Andreas Preikschat
1a4ee39767 Finished implementing shortcuts, this includes: 
- changing shortcuts,
- saving/loading them to the config, so that they will be restored
- shourtcuts can now be easily added/removed to the action list

- fixed bug #739779.
- fixed "+" shortcut in the service manager
- fixed bug #758206

bzr-revno: 1458
Fixes: https://launchpad.net/bugs/739779, https://launchpad.net/bugs/758206
 2011-04-13 20:08:37 +02:00
Andreas Preikschat
e72e9c8952 fixed bug #744337 
bzr-revno: 1457
Fixes: https://launchpad.net/bugs/744337
 2011-04-12 23:20:21 +02:00
Andreas Preikschat
1968991239 r1456 + resolved conflict 2011-04-12 23:07:08 +02:00
Tim Bentley
e00eaba884 Settings Cleanup part1 2011-04-12 18:45:32 +01:00
Andreas Preikschat
9a1be99781 added comments; same fix for import 2011-04-12 11:55:02 +02:00
Andreas Preikschat
962f038c9b fixed bug #744337 
Fixes: https://launchpad.net/bugs/744337
 2011-04-12 11:37:59 +02:00
Andreas Preikschat
f24a8f1365 fixed bug #754484 
bzr-revno: 1455
Fixes: https://launchpad.net/bugs/754484
 2011-04-11 20:16:35 +02:00
Andreas Preikschat
b669eded5d - disable/enable the next button if a bible/song importer is not available (http://support.openlp.org/issues/113) 
- fixed song importers being available even though they should not.

bzr-revno: 1454
 2011-04-11 20:15:02 +02:00
Andreas Preikschat
073d6c8403 disable 'next button' if importer is not available 2011-04-11 16:34:14 +02:00
Andreas Preikschat
de616b9d1a fixed OpenOffice import being available even if OpenOffice is not installed 2011-04-11 16:17:43 +02:00
Tim Bentley
1882c5366d Review fixes 2011-04-10 19:54:26 +01:00
Andreas Preikschat
9dbd54bf8f more fixes 2011-04-10 20:44:27 +02:00
Tim Bentley
29ef34b569 Add saving of selected Bible names in Quick and Advanced. 
Clean up combo box selection code (General)

Fixes: https://launchpad.net/bugs/755687
 2011-04-10 07:18:31 +01:00
Andreas Preikschat
9011c85a6b removed static methods 2011-04-09 18:11:02 +02:00
Andreas Preikschat
9c39f57d5a r1443 2011-04-03 15:37:53 +02:00
Andreas Preikschat
28b83aadae translate categories 2011-04-03 13:36:43 +02:00
Tim Bentley
6445964646 r1442 2011-04-03 07:19:28 +01:00
Jonathan Corwin
27fbd9594b Head 2011-04-02 10:53:08 +01:00
Jonathan Corwin
db68c0419f Fix bug when hit service live button, but nothing to go live. Add option to preview immediately in media manager. Add keyboard shortcuts to media manager 2011-04-02 10:52:32 +01:00
Tim Bentley
fbc94dda3a 1441 2011-04-01 05:48:21 +01:00
Andreas Preikschat
dee95a2f57 r1441 2011-03-31 21:06:09 +02:00
Andreas Preikschat
4ca738e9b3 staticmethod for adding/removing actions 2011-03-31 10:43:19 +02:00
Mattias Põldaru
f73577d708 Undo 2011-03-30 21:52:58 +03:00
Mattias Põldaru
df1db913cd merge 2011-03-30 21:35:48 +03:00
Andreas Preikschat
fb78350a44 added bible actions 2011-03-30 20:27:33 +02:00
Andreas Preikschat
fe92842c6b added ability to remove actions 2011-03-30 12:27:27 +02:00
Andreas Preikschat
253087e2c6 fixed verse sorting, change ### to --- 2011-03-30 09:13:04 +02:00
Andreas Preikschat
b9b0cbbe9c removed things, as this did not work 2011-03-29 21:52:21 +02:00
Andreas Preikschat
a0798b66bb changed wording 2011-03-29 20:23:01 +02:00
Andreas Preikschat
6342a2aaa0 changed --- to ### 2011-03-29 20:04:16 +02:00
Andreas Preikschat
dabf9d36fe r1437 2011-03-29 20:03:42 +02:00
Tim Bentley
2640decffc r1437 2011-03-29 16:49:57 +01:00
Tim Bentley
2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley
239b62a488 Render Ester 8:9 on more than 1 page 2011-03-28 18:04:31 +01:00
Andreas Preikschat
5a4b91b37c (suggestion) added support for multiple slides 2011-03-27 15:39:43 +02:00
Andreas Preikschat
dbefa29054 fixed mistake 2011-03-26 22:03:28 +01:00
Andreas Preikschat
f2acce4a77 missing spaces 2011-03-26 21:59:44 +01:00
Andreas Preikschat
252f316e0e missing spaces 2011-03-26 21:51:41 +01:00
Andreas Preikschat
41f0be38fb clean ups 2011-03-26 21:45:11 +01:00
Andreas Preikschat
baff5451c2 r1429 2011-03-26 21:32:10 +01:00
Andreas Preikschat
d83f14f8fb import topics from usr files, clean ups 2011-03-26 21:07:19 +01:00
Andreas Preikschat
2536e54677 r1418 2011-03-24 22:19:17 +01:00
Raoul Snyman
bf058430d2 Updated the copyright information and the contributors. 
bzr-revno: 1418
 2011-03-24 22:07:31 +02:00
Andreas Preikschat
67ee8394c2 moved version function 2011-03-24 20:12:27 +01:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Andreas Preikschat
682c32eaad changed hard coded version numbers 2011-03-24 17:09:05 +01:00
Andreas Preikschat
a43bd19bd9 convert verse order 2011-03-19 17:06:04 +01:00
Andreas Preikschat
d85991cdc8 changed SelectionMode 2011-03-18 20:15:45 +01:00
Andreas Preikschat
3022d9cb8e fixed doc, rebuild verse tags 2011-03-18 19:43:26 +01:00
Andreas Preikschat
b890158455 do not hard code verse tags 2011-03-18 06:56:18 +01:00
Andreas Preikschat
79bc31e69e - fixed adding "Verse" instead of "v" to the database. 
- add "other" if the verse_tag is unknown

bzr-revno: 1401
 2011-03-18 06:04:16 +01:00
Andreas Preikschat
d1542d2c2b now the right way around 2011-03-17 21:38:05 +01:00
Andreas Preikschat
6f58d7b856 imporved handling unknown verse tags 2011-03-17 21:23:26 +01:00
Andreas Preikschat
6db4d5247b fixed full version of verse tag 2011-03-17 21:00:19 +01:00
Andreas Preikschat
e9bcab13de fixed Verse Tag' column; clean up 2011-03-17 13:32:45 +01:00
Andreas Preikschat
e199927b97 - Added a function to clean songs before saving 
- fixed Bug #690774

bzr-revno: 1395
Fixes: https://launchpad.net/bugs/690774
 2011-03-17 06:19:54 +01:00
Philip Ridout
5b7c909444 Fix song order in SongshowPlus import 
bzr-revno: 1393
 2011-03-16 21:37:48 +00:00
Philip Ridout
136e12eb0b Up to gushies standards hopefully! 2011-03-16 17:50:37 +00:00
Andreas Preikschat
f2cf1304ef removed old hack, updated comment, typo 2011-03-16 18:21:03 +01:00
Andreas Preikschat
044f0c88e7 fixed duplication 2011-03-16 16:37:56 +01:00
Andreas Preikschat
a031784146 try to avoid duplicates when opening an old service file 2011-03-16 14:29:13 +01:00
Andreas Preikschat
e2bd77ea4d fix 2011-03-15 21:12:28 +01:00
Philip Ridout
b6d2423cb3 Fixed as appropiate according to TRB143. 2011-03-15 20:10:36 +00:00
Andreas Preikschat
f339c11ccf r1391 2011-03-15 20:45:56 +01:00
Andreas Preikschat
bf1e82838a coments 2011-03-15 20:33:11 +01:00
Philip Ridout
a8c45c619e Fixed bug #735357. 
Done it as I thought best, please suggest a more appropiate way if there is.
 2011-03-15 19:31:22 +00:00
Jonathan Corwin
fcc08aff9a Alert position, genearl import, Windows QPaint error, case insensitive song order and presentation issues 
bzr-revno: 1391
 2011-03-15 19:23:05 +00:00
Andreas Preikschat
8b49c39fa5 more clean ups 2011-03-15 19:38:56 +01:00
Andreas Preikschat
bf4ecad9d1 cleanup 2011-03-15 19:24:13 +01:00
Andreas Preikschat
441283c6a0 spelling 2011-03-15 18:56:34 +01:00
Andreas Preikschat
01efe60822 continued clean up 2011-03-15 18:52:42 +01:00
Andreas Preikschat
88cfbf5d02 r1390 2011-03-15 17:38:25 +01:00
Mattias Põldaru
18f9632dda Upstream 2011-03-15 16:39:49 +02:00
Jon Tibble
b25abc59aa Cleanups 2011-03-15 01:07:40 +00:00
Jonathan Corwin
a026189fac Head 2011-03-15 00:11:40 +00:00
Mattias Põldaru
e5b664663a Fix tracebacks, if user has no internet connection and he still presses Finish. 2011-03-15 01:05:31 +02:00
Mattias Põldaru
1ce88e7a2a Prevent possible crash, if label field is empty in database. 2011-03-15 00:29:02 +02:00
Andreas Preikschat
220d3efb4e clean up 2011-03-14 22:02:39 +01:00
Andreas Preikschat
6634a90bd3 continued with song edit; not finished 2011-03-14 21:36:30 +01:00
Andreas Preikschat
76612c18c0 adjusted usage of re-index tool 2011-03-14 20:23:59 +01:00
Andreas Preikschat
100088723a r1388 + resolved conflicts 2011-03-14 20:09:41 +01:00
Andreas Preikschat
e48322ed05 fix 2011-03-14 20:04:57 +01:00
Andreas Preikschat
97bec5b93f added a song clean up function 2011-03-14 19:59:59 +01:00
Raoul Snyman
e0ea2c57a3 Fixed up a bug where the song import progress dialog would show up and not disappear if a user did not select any song databases to import. 2011-03-14 20:40:27 +02:00
Raoul Snyman
82239abb92 Used a temporary string due to string freeze, and included the song reindex as per Andreas' request. 2011-03-14 20:34:48 +02:00
Raoul Snyman
a33a13ef05 Make first time wizard import songs, rather than overwrite them. 2011-03-14 08:48:23 +02:00
Andreas Preikschat
99eba705c5 add the verse tag fix back 2011-03-13 15:39:55 +01:00
Andreas Preikschat
8cc21cef79 removed need to have a verseOrder; removed attempt to fix missing verse_numbers 2011-03-13 14:50:14 +01:00
Jonathan Corwin
f04964e073 Song sequence, alert position and make OOo not invisible anymore 2011-03-12 00:12:52 +00:00
Andreas Preikschat
96a54a4fe9 Hacked the song database to speed up searches and the application start 
bzr-revno: 1376
 2011-03-11 20:38:57 +01:00
Andreas Preikschat
3ba4684d55 Fixed bug #719102 
bzr-revno: 1375
 2011-03-11 20:03:34 +01:00
Andreas Preikschat
94d7f4e932 speed up application start/song search 2011-03-11 19:03:16 +01:00
Andreas Preikschat
7c7410a218 complete fixe 2011-03-11 16:53:26 +01:00
Andreas Preikschat
f0379925bc fixed bug #719102 
Fixes: https://launchpad.net/bugs/719102
 2011-03-11 16:38:22 +01:00
Andreas Preikschat
2d1ab8d449 - Moved the version to the Plugin class. If a plugin does not provide a "version" the default will be used. 
- clean ups

bzr-revno: 1371
 2011-03-11 15:13:10 +00:00
Jonathan Corwin
0d64f4e758 Songs of Fellowship and Generic Document imports work once again 
Also repair auto-insert-chorus-into-verse-order for SoF

bzr-revno: 1370
 2011-03-11 15:11:55 +00:00
Jonathan Corwin
7336575067 SOF fixes, auto add chorus to verse order again 2011-03-11 08:46:21 +00:00
Jonathan Corwin
b4e8880671 Remove static methods and re-work code to avoid creation of additional SongImport's. 2011-03-11 08:33:22 +00:00
Jonathan Corwin
b522247094 Fix SoF/OOo imports 2011-03-10 22:25:58 +00:00
Jonathan Corwin
31d2ca5a2b Head 2011-03-10 20:12:35 +00:00
Andreas Preikschat
8374c2d449 redundant code 2011-03-10 20:17:05 +01:00
Andreas Preikschat
3298fa1e15 reverted changed, due to database problems 2011-03-10 17:05:12 +01:00
Andreas Preikschat
262b179d07 r1366 2011-03-09 20:58:26 +01:00
Andreas Preikschat
d668060cf9 fixed search_length 2011-03-09 19:43:50 +01:00
Andreas Preikschat
674e9713e7 serach comments 2011-03-09 19:14:50 +01:00
Andreas Preikschat
fcadc58e75 fixed bug #730979 
Fixes: https://launchpad.net/bugs/730979
 2011-03-08 22:09:52 +01:00
Andreas Preikschat
f73b8660e0 added more debug messages 2011-03-08 17:46:53 +01:00
Jonathan Corwin
ef00fcdc0b Fix ooo file open for windows 2011-03-07 23:12:31 +00:00
Tim Bentley
6ef78ef39d Fix song import duplication by removing training space on the search title. 
Fixed up all locations field was made and the reindex code.
Only tested with reindex!

Fixes: https://launchpad.net/bugs/712252
 2011-03-06 16:28:26 +00:00
Jon Tibble
8df9a5a18e Head r1353 2011-03-05 17:14:13 +00:00
Andreas Preikschat
f4e723ed1c fixed songs, without footer 2011-03-04 18:31:23 +01:00
Jon Tibble
2cd7c2c66e Cleanups 2011-03-04 14:44:21 +00:00
Mattias Põldaru
b01d6f7656 Fixed bug #728637 
bzr-revno: 1349
 2011-03-04 09:24:51 +02:00
Mattias Põldaru
3e5da3be9e address #728637 2011-03-03 22:18:17 +02:00
Mattias Põldaru
87aa8b9b5e fix, don't translate GPL at all 2011-03-03 08:34:17 +02:00
Mattias Põldaru
886f20aaff text fix + making it easier to translate 2011-03-03 03:40:18 +02:00
Armin Köhler
631d8e84ff adapt regex 
define author_temp again
 2011-02-26 09:14:37 +01:00
Andreas Preikschat
123b1beded added missing lines 2011-02-25 18:27:06 +01:00
Andreas Preikschat
0ed7e259fc removed white spaces 2011-02-25 18:05:01 +01:00
Andreas Preikschat
0dbc1c6e1a different clean ups 2011-02-25 17:29:03 +01:00
Jon Tibble
b549b4f065 Fix non-saving OpenLyrics authors (Bug 724568) 
bzr-revno: 1334
Fixes: https://launchpad.net/bugs/724568
 2011-02-25 06:39:49 +00:00
Jon Tibble
83fba055d5 Fix non-saving OpenLyrics authors 2011-02-25 01:03:25 +00:00
Armin Köhler
f91713b2ef removed double space and control line length 2011-02-24 22:27:14 +01:00
Armin Köhler
ff0e1266a7 changed the handling of author unknown 2011-02-24 21:56:31 +01:00
Raoul Snyman
382fe62cde Add Armin to the copyright notice. 
bzr-revno: 1330
 2011-02-24 17:54:21 +02:00
Raoul Snyman
780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Jon Tibble
5e2a7e1cde Fixes to foilpresenter author handling 2011-02-24 02:38:42 +00:00
Jon Tibble
3b31186114 Complete song import init cleanup 2011-02-24 00:32:27 +00:00
Jon Tibble
cca1064e42 Cleanups 2011-02-24 00:11:58 +00:00
Jon Tibble
205743a360 Head r1328 2011-02-23 23:45:59 +00:00
Andreas Preikschat
c8435f873e The re-index tool adds 'Author unknown' if songs do not have any author. 
bzr-revno: 1327
 2011-02-23 23:42:41 +00:00
Andreas Preikschat
8661c6e38e removed line 2011-02-23 21:28:25 +01:00
Andreas Preikschat
1eea1c97a4 moved code 2011-02-23 21:22:29 +01:00
Armin Köhler
b4b6fef70a change value to True/False 2011-02-23 20:48:37 +01:00
Andreas Preikschat
de584a8945 reworked author unknown 2011-02-23 18:35:27 +01:00
Andreas Preikschat
1e2e1ebdec r1324 2011-02-23 16:11:52 +01:00
Armin Köhler
71068d4eb6 fix inconsistant field names, refer now to the xml file 2011-02-22 21:35:18 +01:00
Jon Tibble
4d1f1e933e Make importer inits consistent 2011-02-21 22:27:27 +00:00
Armin Köhler
0ecc3c2dc9 adapt "Author unknown" similar to xml.py 
correct some whitespaces and quotation marks
 2011-02-21 23:03:09 +01:00
Armin Köhler
1e041d9158 remove some whitespaces 2011-02-21 17:02:28 +01:00
Armin Köhler
4aa69e53bb removed duplicate method registerFields() and sort some lines 2011-02-21 15:59:01 +01:00
Armin Köhler
b55ed9b471 merge r1320 2011-02-21 14:49:07 +01:00
Andreas Preikschat
72dd290d6b fixed enumeration 2011-02-20 18:52:22 +01:00
Andreas Preikschat
54f42cb52b added new property, replaced try 2011-02-20 18:34:57 +01:00
Tim Bentley
931f190f56 Revised Print Dialog and fix Preview Edit 
bzr-revno: 1317
 2011-02-20 13:49:00 +00:00
73fd616962 Fix two missing objects 
bzr-revno: 1316
 2011-02-20 08:03:40 +00:00
Tim Bentley
4fb831f96c r1315 2011-02-20 07:31:44 +00:00
Mattias Põldaru
5d947476ac two missing qobject init's 2011-02-20 02:05:50 +02:00
Armin Köhler
21bf01e6d2 merged with trunk 2011-02-19 22:43:10 +01:00
Armin Köhler
6208587b93 foilpresenterimport - some changes 2011-02-19 22:34:51 +01:00
Tim Bentley
966e3996ea r1314 2011-02-19 20:36:41 +00:00
Jon Tibble
bb39617b3b Try again 2011-02-19 20:31:21 +00:00
Jon Tibble
1f5d896fc1 Fix CCLI author import 2011-02-19 19:49:08 +00:00
Andreas Preikschat
810db5ca55 add the special author 2011-02-19 19:37:01 +01:00
Andreas Preikschat
ac8e435f93 2011-02-19 19:25:14 +01:00
Andreas Preikschat
1837fd5d0d r1313 2011-02-19 19:14:22 +01:00
Armin Köhler
4e6b967fc8 foilpresenterimport 2011-02-19 15:28:33 +01:00
Armin Köhler
b2d38da3d2 19.02.2011 2011-02-19 10:07:44 +01:00
Armin Köhler
e75c24bdd7 Changed 18.02.2011 2011-02-18 21:40:07 +01:00
Andreas Preikschat
e028947113 r1311 2011-02-18 21:07:58 +01:00
Tim Bentley
1f7d6b635d Preview Edit now works 2011-02-18 19:13:37 +00:00
Jon Tibble
e192ea438b Cleanup mistakes 2011-02-18 18:48:06 +00:00
Jon Tibble
23d57bb5ba Import fix 2011-02-18 17:45:14 +00:00
Jon Tibble
bcf35bf54e Sort out song importer initialisation 2011-02-18 17:34:43 +00:00
Jon Tibble
cb37a8bc17 Head r1311 2011-02-18 16:37:41 +00:00
Mattias Põldaru
4a8b29aae9 More changes, now internally tags are held not as Salm:1 (previously), nor v:1 (in the meantime), but just as in openlyrics format, v1. 
The v1a is not yet supported, it requires spinboxes to be changed first. The old and new should be handled silently side-by-side.

bzr-revno: 1310
 2011-02-18 17:51:04 +02:00
Mattias Põldaru
62091b92fe These would have been left behind. 2% less typos now. 2011-02-18 10:25:43 +02:00
Mattias Põldaru
1651e42bca more variable name changes 2011-02-18 09:53:40 +02:00
Jon Tibble
0d498bc3f0 UiStrings 2011-02-18 01:07:55 +00:00
Mattias Põldaru
aac40357ae better variable names, fixed translation issues for verse sequences 2011-02-18 02:48:58 +02:00
Mattias Põldaru
dff393b6a4 just another massive set of changes 2011-02-17 21:46:01 +02:00
Jon Tibble
9b48761590 Head r1308 2011-02-17 17:42:28 +00:00
Andreas Preikschat
0bc97a1978 - clear search edit line when starting the wizard again 
- changed the "uncheck all" and "check all" buttons check/uncheck only those songs which are currently visible. This enables the user to perform more advanced searches.

bzr-revno: 1308
 2011-02-17 17:40:12 +00:00
Andreas Preikschat
9e6cfcfed4 clear search edit, when starting the wizard again; check/uncheck button change state of visible songs 2011-02-17 17:11:32 +01:00
Mattias Põldaru
d870355064 fix when loading from db to show preview/live 2011-02-17 17:19:02 +02:00
Mattias Põldaru
02c1bd4413 first working example with unilanguage tags handling 2011-02-17 17:05:58 +02:00
Mattias Põldaru
18f43fc858 more lower case tags 2011-02-16 21:28:55 +02:00
Mattias Põldaru
425ec8ece0 more changes reflecting VerseType changes 2011-02-16 21:09:06 +02:00
Mattias Põldaru
89181e387d VerseType changes 2011-02-16 20:37:51 +02:00
Jon Tibble
032c48df60 Finish grammar corrections, more strings and cleanups 2011-02-16 17:54:31 +00:00
Mattias Põldaru
175bfd2f97 change back, leave massive change for later 2011-02-16 19:09:35 +02:00
Mattias Põldaru
04a90fe42b longer variable names 2011-02-16 16:51:40 +02:00
Mattias Põldaru
cd431652ca no translation for song tags in database 2011-02-16 12:20:25 +02:00
Mattias Põldaru
31fbb999f9 forgot one 2011-02-16 11:43:07 +02:00
Mattias Põldaru
7e18b8e3e6 fix opensong order shuffling + refactoring 2011-02-16 11:36:59 +02:00
Jon Tibble
1fbc873a8c Cleanups 2011-02-16 03:28:06 +00:00
Jon Tibble
a8d2d3661d Sort grammar breakers 2011-02-16 03:06:34 +00:00
Mattias Põldaru
f27e6755cc easislides import to work again 2011-02-15 23:19:45 +02:00
Jon Tibble
5c7bd57833 Head r1302 2011-02-15 14:19:57 +00:00
Jon Tibble
a0aba0a715 Remove grammar breaking strings 2011-02-15 14:17:35 +00:00
Andreas Preikschat
ef4bb199d8 r1301 2011-02-15 10:06:24 +01:00
Jon Tibble
cc96d96a6a Fix song overwriting 2011-02-15 01:58:18 +00:00
Jon Tibble
d9a26ae4d9 Cleanups 2011-02-14 20:32:19 +00:00
Jon Tibble
3f6f1940d9 Head r1301 2011-02-14 20:07:04 +00:00
Jon Tibble
5e8b8eedf3 Strings not variable names\! 2011-02-14 19:08:18 +00:00
Jon Tibble
ba8918a1ea Fixes 2011-02-14 18:20:59 +00:00
Jon Tibble
531e50a417 Fix translation breaking strings 2011-02-14 17:25:51 +00:00
Jon Tibble
d5596583ff Fixes, cleanups, strings 2011-02-14 16:08:17 +00:00
Armin Köhler
cafd7b397d 14.02.2011 2011-02-14 14:01:52 +01:00
Armin Köhler
35ef04697a 14.02.2011 2011-02-14 13:42:35 +01:00
Armin Köhler
68d6bc46d6 Comment 14.02.2011 2011-02-14 13:20:30 +01:00
Jon Tibble
910df1cfde More song items 2011-02-14 03:19:30 +00:00
Jon Tibble
2316ab4ed4 Deleting song items 2011-02-14 02:54:24 +00:00
Jon Tibble
71cbbfcbf2 Unused imports 2011-02-14 01:55:34 +00:00
Jon Tibble
1d91192e3b WizardStrings 2011-02-14 00:35:53 +00:00
Jon Tibble
043665d154 Fixes 2011-02-13 16:39:03 +00:00
Jon Tibble
63d6536d52 Head r1297 2011-02-13 16:15:52 +00:00
Jon Tibble
365072c05c SongStrings 2011-02-13 16:02:12 +00:00
Philip Ridout
1384688708 Importer for SongShow Plus 
bzr-revno: 1297
 2011-02-13 15:59:17 +00:00
Jon Tibble
d129085d87 Improve Author Unknown strings 2011-02-13 15:17:42 +00:00
Philip Ridout
1913da71cc Added SongShow Plus importer. 2011-02-13 15:13:52 +00:00
Jon Tibble
ffd4d41760 Strings including Author Unknown 2011-02-13 15:11:06 +00:00
Jon Tibble
816b17c245 UiStrings 2011-02-13 14:21:12 +00:00
Jon Tibble
321269b11b Fixes and cleanups 2011-02-13 01:24:47 +00:00
Jon Tibble
323ab52848 Strings and magic numbers 2011-02-13 01:09:04 +00:00
Jon Tibble
ad03f8588e Magic number -> SongSearch 2011-02-12 22:01:18 +00:00
Jon Tibble
bffa44a1cb Wizards and applications 2011-02-12 20:25:40 +00:00
Jon Tibble
0561fa2525 Strings 2011-02-12 18:43:23 +00:00
Jon Tibble
34cf16fd06 WizardStrings 2011-02-12 15:37:02 +00:00
Jon Tibble
0988158c56 Import fixes 2011-02-12 04:20:53 +00:00
Jon Tibble
a8f16262fc More string refactoring 2011-02-12 04:09:03 +00:00
Jon Tibble
8d18a51f09 WizardStrings 2011-02-12 02:43:13 +00:00
Jon Tibble
314697427d Fixes 2011-02-12 00:41:09 +00:00
Jon Tibble
23eb12be1a Fixes 2011-02-11 21:40:43 +00:00
Jon Tibble
9366155924 UiStrings and SongStrings 2011-02-11 21:17:56 +00:00