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

5486 Commits

Author SHA1 Message Date
Stevan Pettit 227cd75b5c Cleanup whitespace, remove debug prints 2011-05-31 10:02:44 -04:00
Raoul Snyman de56462c8f Pull the translated plugin names through. 2011-05-31 14:30:21 +02:00
Stevan Pettit b52d00a623 Update local branch from trunk 2011-05-31 08:17:23 -04:00
Raoul Snyman 5c943ff1eb Fixed up another missing translation. 2011-05-31 13:58:18 +02:00
Raoul Snyman 2df9e6a55a Fixed up some more missing translations. 2011-05-31 13:30:04 +02:00
Raoul Snyman 9f7a96c315 Fixed up some missing translations. 2011-05-31 13:25:35 +02:00
Raoul Snyman ee151cde2a Fixed bug #790382 by using the Mako template engine to pass Python variables into the template. 2011-05-31 12:59:05 +02:00
Andreas Preikschat 79b107138a - fixed bug #789618 "Large gap between two parts of a verse in Service Order Print" 
bzr-revno: 1598
Fixes: https://launchpad.net/bugs/789618
 2011-05-31 12:53:35 +02:00
Armin Köhler 63102855e8 remove unnecessary whitespace 2011-05-31 09:31:38 +02:00
Armin Köhler efc678d518 bug fix 2011-05-31 09:26:44 +02: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
Armin Köhler 8a8580f359 Fix unicode bookname handling on Biblegateway 2011-05-30 22:58:30 +02:00
Armin Köhler 77281d3142 Change content of booklist combobox in advanced search and autocomplete suggestionlist in quick search if a second bible is choosen the lists refresh and contain only books which are in both bibles. 
bzr-revno: 1597
 2011-05-30 21:53:47 +01: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
Armin Köhler e356c5a4a1 HEAD r1595 2011-05-30 22:00:36 +02:00
Armin Köhler ab3896ce6f removed unnecessary code 2011-05-30 21:41:02 +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
Andreas Preikschat ed3a608b8d fixed tag deletion (bug #789929 
Fixes: https://launchpad.net/bugs/789929
 2011-05-30 17:07:49 +02: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
Andreas Preikschat 0a2d97021c added spaces 2011-05-30 07:03:46 +02:00
Jonathan Corwin 3da3dd9869 Head 2011-05-29 21:47:12 +01:00
Jonathan Corwin 9cd536e137 Fix the parent that whydoubt sneaked in 2011-05-29 21:46:13 +01:00
Armin Köhler 17b97e87a8 HEAD r1593 2011-05-29 19:03:48 +02:00
Andreas Preikschat 571765c84f - changed a few camelCase names 
- changed object names

bzr-revno: 1593
 2011-05-29 18:00:37 +02:00
Andreas Preikschat fd4d316097 - fixed bug #789143 
bzr-revno: 1592
Fixes: https://launchpad.net/bugs/789143
 2011-05-29 17:59:47 +02:00
Jonathan Corwin 02da22c349 Head 2011-05-29 16:33:09 +01:00
Armin Köhler f701ae71bd Monster change to Bibles: 
- Web Bibles import their books on registration
- Added a book_reference_id to the books table of Bibles
- Moved various sqlite and csv resources into a single sqlite database
- Added an upgrade wizard to upgrade existing Bibles
- Check on startup if a user has older Bibles
- Various other bug fixes and cleanups

bzr-revno: 1591
 2011-05-29 17:18:17 +02:00
Andreas Preikschat 22ad88d3ee fix for bug #789618 
Fixes: https://launchpad.net/bugs/789618
 2011-05-29 08:26:14 +02:00
Andreas Preikschat b56f93aad5 camelCase fixes and shortcut fixes 2011-05-29 08:23:12 +02:00
Jonathan Corwin 975dd3cb00 mediaitem() -> mediaitem 2011-05-28 22:23:07 +01:00
Armin Köhler 81fca6bedb change layout of backup page 
change some strings
 2011-05-28 23:01:27 +02: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 ddf11d4681 Live dangerously, and pass parent None to MainDisplay 2011-05-28 21:12:32 +01: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
Jeffrey S. Smith f80eb74e62 Merge changes from trunk 2011-05-28 14:03:31 -05: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
Jeffrey S. Smith 88f1f4065e Make 'continuous loop' button into a selection ('loop' or 'play to end') 2011-05-28 08:45:44 -05:00
Armin Köhler 9b9f47a5be small fix 2011-05-28 15:33:15 +02:00
Armin Köhler 8caece6af0 HEAD r1588 2011-05-28 14:50:29 +02:00
Armin Köhler 6a1ee02cdd add Backup page to the wizard 
remove blank item on Combobox in BookNameForm
 2011-05-28 14:48:10 +02:00
Jonathan Corwin 01a89abe52 merge fixes 2011-05-28 11:15:10 +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
Stevan Pettit 86a077b353 Fixed bug #788335: Modified slidecontroller to properly blank the display when OpenLP is started and no item has been sent to live. 
bzr-revno: 1588
 2011-05-28 09:01:05 +02:00
Raoul Snyman 12bb7b4e25 Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. 
bzr-revno: 1587
 2011-05-28 08:48:01 +02:00
Stevan Pettit 7ed1be6612 Fixed bug #788335 - Changed slidecontroller to correctly blank screen 2011-05-28 00:05:33 -04:00
Armin Köhler e550665b23 bug fix 2011-05-27 23:11:53 +02:00
Armin Köhler 5f9b23f8e7 remove unnecessary line 2011-05-27 22:53:46 +02:00
Armin Köhler b4303195c3 HEAD 2011-05-27 22:50:57 +02:00
Armin Köhler 8699e36b37 HEAD r1586 2011-05-27 22:38:06 +02:00
Armin Köhler 010373b798 Fixed Traceback if BookNameDialog was canceled while upgrading non webbibles 
Replace LineEdit in BookNameDialog with Label
 2011-05-27 22:33:23 +02:00
Jonathan Corwin 37377b959d Change timed slide button tooltip to remove reference to looping, and add a few full stops to a few others. 
bzr-revno: 1586
 2011-05-27 21:14:41 +01:00
Raoul Snyman 665fc82c94 Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. 2011-05-27 21:25:03 +02:00
Jonathan Corwin cd4942657d Change timed slide tooltip to remove reference to looping, and fix periods on others 2011-05-27 18:42:54 +01:00
Andreas Preikschat 42a8a4407e fixed bug 789143 
Fixes: https://launchpad.net/bugs/789143
 2011-05-27 16:28:38 +02:00
Jonathan Corwin 41601b9ec1 Make the slide loop/slide delay settings labels less misleading 
bzr-revno: 1585
 2011-05-27 14:34:01 +01: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
Jonathan Corwin f1b778fb24 Change loop and timed slide settings labels 2011-05-27 12:54:52 +01:00
Andreas Preikschat 78404882d9 - Hide the theme menu when theme level is not 'Song'. 
- clean ups

bzr-revno: 1583
 2011-05-27 13:44:04 +02:00
Andreas Preikschat c63382e41c - hide the theme menu when theme level is not 'Song' 
- clean ups
 2011-05-27 12:17:59 +02:00
Andreas Preikschat 62fe00cc13 - Themes in service item theme menu are checkable. 
- Allow the user to reset the theme to the (global/service) default theme.

bzr-revno: 1582
 2011-05-27 12:17:01 +02:00
Armin Köhler 8eb261ee88 bug fixes 
setFocus to the Combobox in booknameform
 2011-05-27 11:39:58 +02:00
Andreas Preikschat 59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Armin Köhler e5231aba41 change using old bible databases in bibleupgradeform 2011-05-27 11:23:46 +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
Armin Köhler d3148f90f8 fix Traceback like Jonathan recommand 2011-05-27 09:54:49 +02:00
Andreas Preikschat 18e3cb0232 removed not needed import 2011-05-27 09:02:02 +02:00
Andreas Preikschat 8a38c0b766 do not hide the menu 2011-05-27 08:45:42 +02:00
Andreas Preikschat 0d443c3691 r1580 2011-05-27 08:39:32 +02:00
Andreas Preikschat b890b52a8d finished the theme menu 2011-05-27 08:29: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
Armin Köhler af38bf7cc8 HEAD r1578 2011-05-26 22:41:19 +02:00
Armin Köhler f29830b98e change BookNameDialog like Raoul want. 2011-05-26 22:38:07 +02:00
Andreas Preikschat 39537f9ef7 fixed bug 788770 
Fixes: https://launchpad.net/bugs/788770
 2011-05-26 22:17:52 +02:00
Armin Köhler b5c392112b test close database 2011-05-26 22:15:38 +02:00
Armin Köhler c435127585 some fixes in relation with the extened LanguageForm 
close cursor from OldBibleDB
 2011-05-26 21:13:11 +02:00
Andreas Preikschat 6aca4600b7 fixed bug 788770 
Fixes: https://launchpad.net/bugs/788770
 2011-05-26 20:52:05 +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
Andreas Preikschat 8aef6f3c8e r1576 2011-05-26 20:13:50 +02:00
Andreas Preikschat af961afa78 removed the 'default' button 2011-05-26 20:00:25 +02:00
Andreas Preikschat 7ec12f15ea r1576 2011-05-26 19:56:08 +02:00
Tim Bentley 3ff2aa8006 Copyright updates 
bzr-revno: 1576
 2011-05-26 18:25:59 +01: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
Joshua Miller 93ec7f52a1 Enable or disable looping of slides based on a checkbox in the general settings 
bzr-revno: 1575
Fixes: https://launchpad.net/bugs/739777
 2011-05-26 16:52:02 +01:00
Tim Bentley fe4b5fb147 More busy and sort changes 
bzr-revno: 1574
 2011-05-26 16:44:25 +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
Josh Miller 6b90adea6e Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py and changes can_loop directly to the setting required 2011-05-26 07:01:48 -04:00
Josh Miller 254bac86d4 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py 2011-05-26 06:56:21 -04:00
Josh Miller 9221c8cb60 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too 2011-05-26 06:37:36 -04:00
Andreas Preikschat 98614f629c make themes in menu checkable 2011-05-26 10:15:56 +02:00
Armin Köhler 24d7b7b038 small spelling change 2011-05-26 09:34:29 +02:00
Armin Köhler f3864cb4aa HEAD r1572 2011-05-26 09:27:50 +02:00
Armin Köhler 6486d41b8c correct some words and code 
changed behaviour if the "cancel" button is pressed while upgrading
 2011-05-26 09:25:17 +02:00
Armin Köhler 2930510461 change languageform like Raoul suggest 2011-05-26 09:00:40 +02:00
Andreas Preikschat 6e4b15833e r1572 2011-05-26 08:47:06 +02:00
Andreas Preikschat aae9724f34 allow html tags to be translated 
Fixes: https://launchpad.net/bugs/787552
 2011-05-26 08:45:22 +02: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
Meinert Jordan 548e41f15c Localized sorting for various lists. 
bzr-revno: 1572
 2011-05-26 07:37:52 +02:00
Tim Bentley 3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +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
Josh Miller 0a5155b822 Final changes to enabling looping of slides now it works 2011-05-25 20:11:56 -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
Andreas Preikschat 6e235f6bff - Fixed bug #786896 
- New display tag {br}
- Better regex usage in the SongBeamer import

bzr-revno: 1571
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 23:11:15 +02:00
Gerald Britton 3b7debfe81 merged with trunk 2011-05-25 16:41:23 -04:00
Armin Köhler 0f98c4fd8f change behaviour if "Cancel" button is pushed. 2011-05-25 22:20:17 +02:00
Armin Köhler 175d6cebb2 add Bible Name to LanguageDialog 
renamed "Importing" to "Upgrading" and "Choose" to "Select"
fixed traceback while textsearch
removed unnecessary code
 2011-05-25 21:13:37 +02:00
M2j 6f0bdad784 all lower() for theme sorting to consider Windows 2011-05-25 20:47:13 +02:00
M2j 7a1a83a98a Head 1570 2011-05-25 20:42:03 +02:00
Armin Köhler e8cdba44be small clean up 2011-05-25 16:52:46 +02:00
Armin Köhler dd4543ad2d HEAD r1569 2011-05-25 16:29:16 +02:00
Armin Köhler 0c83471ee4 move some code 
stop moving bibles to subfolders
some fixes
 2011-05-25 16:18:03 +02:00
Andreas Preikschat 3a91365e5a fixed space 
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 15:14:59 +02:00
Andreas Preikschat cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Andreas Preikschat 638a72301c mention the need of an object name in the doc string 2011-05-25 13:26:18 +02:00
Andreas Preikschat 98d7cb5fe5 fixed object name 2011-05-25 11:10:57 +02:00
Andreas Preikschat 981c2f8c5b more name fixes 2011-05-25 10:32:37 +02:00
Andreas Preikschat 10f59d0313 started to fix camelCase names 2011-05-25 09:59:51 +02:00
Raoul Snyman 1797848d6e Updated online help action to use utility functions, and added an icon needed by the utility functions. 2011-05-25 08:56:33 +02:00
Gerald Britton de7b7a072a fix up error messages in ooimport.py 2011-05-24 19:14:49 -04:00
Josh Miller b92b733828 corrections and enable slide loop updates 2011-05-24 18:32:30 -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
Andreas Preikschat 0db69c93ed Implemented the binary chop algorithm to speed up 'word by word' rendering. 
bzr-revno: 1567
 2011-05-24 21:33:12 +02:00
Raoul Snyman becbff524b More translation updates. 2011-05-24 21:29:02 +02:00
Raoul Snyman 8d1d642c06 More translation updates. 2011-05-24 20:38:06 +02:00
Raoul Snyman 55dfd67a5c More translation updates. 2011-05-24 19:42:30 +02:00
Raoul Snyman da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Andreas Preikschat b9bcd98716 removed not need line 2011-05-24 18:51:40 +02:00
Andreas Preikschat d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +02:00
Josh Miller 541feef8ea Another try at the code for enabling loop through a checkbox, seems to work as far as i see 2011-05-24 07:23:55 -04:00
Andreas Preikschat 2377a5f5ff fix for Esther 8:7 2011-05-24 09:02:13 +02:00
Andreas Preikschat 5473d3c817 added windows comment 2011-05-24 07:23:28 +02:00
Josh Miller 6b046d9afb Another try at the code for enabling loop through a checkbox in general settings as the signal but ignores it in slidecontroller for some odd reason acting like it's not there... 2011-05-23 19:23:00 -04:00
M2j 06d561f9fc localized string sorting 2011-05-23 22:42:07 +02:00
Andreas Preikschat 5b7dc62112 comments 2011-05-23 20:41:49 +02:00
Andreas Preikschat 84999905bd r1564 2011-05-23 20:24:38 +02:00