Commit Graph

5775 Commits

Author SHA1 Message Date
Jonathan Corwin
38fb5e54fe Prevent error if attempt to keep going off the end of a presentation.
Reduce memory usage by not resizing small thumbnails back up to full monitor size in the slidecontroller.

bzr-revno: 1643
2011-06-18 09:56:14 +01:00
Simon Scudder
18d6f4f9b9 Import Song Book Number correctly from OpenLyrics files
bzr-revno: 1642
2011-06-18 09:54:34 +01:00
Stevan Pettit
314b365270 Changed Custom plugin name to 'Custom' to match folder name, changed mediaitem.py signal receiver back to 'custom_edit' to match the plugin name change 2011-06-17 10:15:07 -04:00
Stevan Pettit
64d5318dd7 Changed name of Custom plugin to 'Custom_Slide', changed mediaitem Receiver to
'custom_slide_edit'
2011-06-16 21:36:33 -04:00
Jonathan Corwin
8cd128ddfe We don't want to resize 320x240 thumbnails back up to 1400x900 resolution just to display them in the slide controller! 2011-06-16 23:03:59 +01:00
Tim Bentley
440b5eee77 Head 2011-06-16 21:11:12 +01:00
Simon Scudder
1d2415808d Fixed Bug 707605 - Losing song book number on OpenLyrics import 2011-06-16 15:11:49 -03:00
Stevan Pettit
3c1f79f094 Fixed preview edit button not working for custom slides 2011-06-16 00:17:26 -04:00
Jonathan Corwin
f5e619584a Fix error if go next off end of powerpoint 2011-06-15 23:34:40 +01:00
Raoul Snyman
5901f959ce Half of bug #795068 fixed. 2011-06-14 21:55:17 +02:00
Raoul Snyman
487b007e49 Fixed bug #763064: Empty line in first verse prevents saving a song.
bzr-revno: 1641
2011-06-14 18:39:36 +02:00
Andreas Preikschat
bd6733eef1 we can replace before splitting 2011-06-14 08:58:49 +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
Raoul Snyman
75d89d22b7 Fixed bug #792204: SongShow Plus importer fails to import song. 2011-06-14 07:45:23 +02:00
Andreas Preikschat
18cbfe6f53 Correct Focus on entry to dialog
bzr-revno: 1639
2011-06-14 05:55:44 +01:00
Andreas Preikschat
79c0ef15e0 give text edit focus 2011-06-13 22:49:14 +02:00
Tim Bentley
c6afbec849 Fix names 2011-06-13 19:10:06 +01:00
Andreas Preikschat
7d5e349602 removed test lines 2011-06-13 17:19:49 +02:00
Andreas Preikschat
254cf20b9f fixed non sense 2011-06-13 16:41:52 +02:00
Andreas Preikschat
24e737fa99 fixed long line 2011-06-13 16:36:18 +02:00
Andreas Preikschat
9b10c81e7b comments 2011-06-13 14:59:52 +02:00
Andreas Preikschat
f22e1385be _paginate_slide_words detects long verses itself 2011-06-13 13:26:06 +02:00
Andreas Preikschat
f4c00009ed made _binary_shop less 'word by word' specific 2011-06-13 13:20:47 +02:00
Andreas Preikschat
772c36ed19 more clean ups, doc 2011-06-13 11:47:18 +02:00
Andreas Preikschat
ded49f74a3 clean ups 2011-06-13 11:05:22 +02:00
Andreas Preikschat
d7ea218342 clean ups 2011-06-13 10:16:50 +02:00
Tim Bentley
eef44f0174 Use a method call instead of a signal as the signal does other things as well
Fixes: https://launchpad.net/bugs/796324
2011-06-13 08:29:58 +01:00
Andreas Preikschat
062e52c6db r1636 2011-06-12 21:34:19 +02:00
Andreas Preikschat
3c29367223 started improving renderer speed 2011-06-12 21:27:19 +02:00
Andreas Preikschat
445c63ce8b 2011-06-12 20:38:04 +02:00
Tim Bentley
a0319d127c One and only Simon Scudder
bzr-revno: 1636
2011-06-12 18:56:11 +01: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
81c89e97f1 - fixed crash attempting to add a non existent image to the service
- fixed display of full presentation path in remote search
- fixed names
- fixed use of 'settingsSection' (the second argument is not a sections, rather a value name <-> using settingsSection is misleading)

bzr-revno: 1635
2011-06-12 17:00:21 +02:00
Simon Scudder
8c12b7d912 Function showtext in the html javascript was altered, so that the shadow layer (if present) will ignore all the font color settings. This is done using a regular expression replace, that searches for -webkit-text-fill-color and erases up to the first ; or "
If there is only a colour formatting command in the span tag, an empty class attribute is left behind, which shouldn't be a problem.

bzr-revno: 1634
2011-06-12 15:55:21 +01:00
Tim Bentley
1550239f5e Add Lock Toolbar feature - Beta 3 2011-06-12 15:19:32 +01:00
Simon Scudder
9aa9952609 Fixed bug #795945 "Text colour appearing in shadow" 2011-06-12 11:13:01 -03:00
Raoul Snyman
9e99146725 Fixed various strings.
bzr-revno: 1633
2011-06-12 15:41:58 +02:00
Andreas Preikschat
08a3a7aba6 hard coded misleading arguments 2011-06-12 15:01:46 +02:00
Andreas Preikschat
dc2bafaab9 removed not needed variable, removed obsolete comments 2011-06-12 14:13:04 +02:00
Andreas Preikschat
869ab41cad - fixed crash attempting to add a non existent image to the service
- fixed display of full presentation path in remote search
- fixed names
- fixed hard coded 'setting section'
2011-06-12 13:51:23 +02:00
Raoul Snyman
facbcfcbfc Fixed grammar. 2011-06-12 09:51:50 +02:00
Raoul Snyman
8bc3d9bc62 Fixed 789046 and minor cleanups
bzr-revno: 1632
Fixes: https://launchpad.net/bugs/789046
2011-06-12 08:13:18 +01:00
Raoul Snyman
4014267300 Fixed various strings. 2011-06-11 23:43:08 +02:00
Raoul Snyman
d337ecacb6 Fixed bug #789046 and cleaned up one or two other things. 2011-06-11 23:04:52 +02:00
Simon Scudder
0b2f446856 Fixed bug #795945 "Text colour appearing in shadow" now within 80 columns 2011-06-11 15:14:20 -03:00
Tim Bentley
26419d8f18 Speed up edit by not calling render until there is a match 2011-06-11 18:17:13 +01:00
Simon Scudder
335e276d6d Fixed bug #795945 "Text colour appearing in shadow" 2011-06-11 12:18:58 -03:00
Stevan Pettit
30b56d6fee Moved signals to end of SetupUI 2011-06-11 08:48:11 -04:00
Tim Bentley
0c549e33e5 Only mark the service as changed if it has changed
Fixes: https://launchpad.net/bugs/795890
2011-06-11 12:22:40 +01:00
Jonathan Corwin
d26c1b20f8 A few more from IRC 2011-06-11 09:41:32 +01:00
Jonathan Corwin
0c6049917a Head 2011-06-11 09:32:36 +01:00
Jonathan Corwin
b73a8a86a7 End times should be finished 2011-06-11 09:02:43 +01:00
Tim Bentley
8b331af6f7 Fix mediamanager bug
bzr-revno: 1628
2011-06-11 08:45:11 +01:00
Andreas Preikschat
76c1cbf4db fixed 'split' string
bzr-revno: 1627
2011-06-11 09:39:53 +02:00
Gerald Britton
b068128dfd Add LibreOffice to error messages.
Standardise error messages.

bzr-revno: 1626
2011-06-11 09:23:31 +02:00
Tim Bentley
0292d89bf4 Head 2011-06-11 08:05:39 +01:00
Tim Bentley
7ba44af92a Fix parentage bug
Fixes: https://launchpad.net/bugs/794380
2011-06-11 08:04:21 +01:00
Jonathan Corwin
ee8b11e4e9 More strings 2011-06-10 22:50:44 +01:00
Andreas Preikschat
c3cb264d93 fixed string 2011-06-10 21:51:51 +02:00
Stevan Pettit
317a12751f Added code to openlp/plugins/bibles/lib/manager.py to skip old_databases during load. (Would we want to delete them)?-----> Removed this change, reverted back to original code.
Added a routine to openlp/plugins/bibles/lib/db.py to close the DB "Cursor" and "Connection"

Added code to openlp/plugins/bibles/forms/bibleupgradeform.py to "close" the DB so the old DB file can be deleted afrter use.

bzr-revno: 1625
Fixes: https://launchpad.net/bugs/793552
2011-06-10 20:35:41 +01:00
Gerald Britton
430861030e fix indentation 2011-06-10 15:29:26 -04:00
Jonathan Corwin
865ccd867a Fix outstanding strings prior to string freeze
bzr-revno: 1624
2011-06-10 20:25:57 +01:00
Gerald Britton
f5980ecfc1 merging changes from trunk 2011-06-10 15:25:38 -04:00
Andreas Preikschat
2ceea5d72e - Improved image resizing speed
bzr-revno: 1623
2011-06-10 10:24:29 +02:00
Stevan Pettit
f0dde73530 Remove previous change to skip old_database bibles 2011-06-09 22:55:43 -04:00
Jonathan Corwin
dfd2468c4c String fixes 2011-06-09 23:03:30 +01:00
Stevan Pettit
729f38f158 Added code to close the oldBibleDB so it can be deleted after conversion 2011-06-09 17:17:04 -04:00
Stevan Pettit
1bdfd60d52 Skip old-database's during bible loading 2011-06-09 11:26:13 -04:00
Andreas Preikschat
c298146b1f give the title edit focus when creating a new customs 2011-06-09 17:14:41 +02:00
Andreas Preikschat
8fc4305b43 removed test lines 2011-06-09 12:41:02 +02:00
Andreas Preikschat
2b1cf6cb54 r1621 2011-06-09 12:09:05 +02:00
Jonathan Corwin
cff560a665 Close and delete old MainDisplay windows when a new one is created due to a screen change.
bzr-revno: 1621
2011-06-09 08:24:08 +01:00
Jonathan Corwin
7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
Jonathan Corwin
56783d8a41 Fix Bible error message if search from remote 2011-06-08 21:03:32 +01:00
Stevan Pettit
4213dad51c Confirm delete of Custom item 2011-06-07 21:37:07 -04:00
Tim Bentley
c6166453bb Correct the line count in theme wizard
bzr-revno: 1619
2011-06-07 17:33:46 +01:00
Andreas Preikschat
f263dfa0c8 2011-06-07 09:30:50 +02:00
Andreas Preikschat
5d426b5cca Improved thumbnail creation speed in the media manager
bzr-revno: 1618
2011-06-06 20:09:56 +02:00
Tim Bentley
6b73c842cb Head 2011-06-06 18:36:02 +01:00
Tim Bentley
b2bb583fb0 Fixes 2011-06-06 18:35:47 +01:00
Andreas Preikschat
5d9e6acfbf better comment 2011-06-06 16:58:14 +02:00
Andreas Preikschat
6047dd9f5b fixed bug 793537
Fixes: https://launchpad.net/bugs/793537
2011-06-06 16:17:39 +02:00
Andreas Preikschat
98e731ee9a fallback if thumb was not created 2011-06-06 09:05:10 +02:00
Andreas Preikschat
b5810b271e fixed bug #788770 2011-06-06 08:03:06 +02:00
Armin Köhler
e82a4e0972 Fix Bug #793091 - if plugin changed status from inactive to active plugin.appStartup now is called
bzr-revno: 1615
Fixes: https://launchpad.net/bugs/793091
2011-06-05 20:18:59 +01:00
Armin Köhler
d89b60a96f - Fix Bug #792811 - Traceback UnicodeEncodeError while importing a webbible
- If upgrade fails new bible databases which are failed now should be deleted always. If upgrade was successfull the old database is deleted immediately. So never should stay an old and a new version from one bible.
- changed behaviour if the user cancel the import so that after a traceback it is possible to cancel the dialog.
- Fix Bug #792831 - now the right parent is used for dialogs and error messages
- Biblegateway.com has changed it's Bible-Book-List Layout. Addapt the regex for importing the booklist of a bible from biblegateway to the new html layout.
- changed log usage
- remove unnecessary code
- small fixes

bzr-revno: 1614
Fixes: https://launchpad.net/bugs/792811, https://launchpad.net/bugs/792831
2011-06-05 20:17:09 +01:00
Armin Köhler
17209fcc29 define appStartup() in plugin.py
remove hassattr(plugin, appStartup)
2011-06-05 20:46:00 +02:00
Armin Köhler
5505644176 Fix Bug #793091 - if plugin changed status from inactive to active plugin.appStartup is called 2011-06-05 20:19:44 +02:00
Armin Köhler
c85e953d4e remove unnecessary code 2011-06-05 19:39:13 +02:00
Armin Köhler
1b2956a9e6 remove unnecessary code 2011-06-05 19:33:46 +02:00
Andreas Preikschat
e08c65aa45 fixed ratio 2011-06-05 18:33:28 +02:00
Armin Köhler
346bf24267 changed behaviour if the user cancel the import so that after a traceback it is possible to cancel the dialog 2011-06-05 14:40:26 +02:00
Tim Bentley
a652c8ef59 Fix selection in ServiceManager over theme change
bzr-revno: 1613
2011-06-05 08:44:04 +01:00
Armin Köhler
52bab3e415 Fix right parent for all used dialogs
small fixes
2011-06-04 22:35:24 +02:00
Armin Köhler
522e68c38c Biblegateway.com has changed it's Bible-Book-List Layout. Addapt the regex for importing booklist of a bible from biblegateway
changed log usage
2011-06-04 21:34:36 +02:00
Armin Köhler
937cfd2260 Fix Bug #792811 - Traceback UnicodeEncodeError while importing a webbible
If upgrade fails new bible databases now should be deleted always
2011-06-04 20:43:59 +02:00
Tim Bentley
b6d0f2243d Fix error if cnp 2011-06-04 19:14:32 +01:00
Tim Bentley
0841802ddc Fix state for service items 2011-06-04 19:08:48 +01:00
Jonathan Corwin
9230fbb116 In a song, replace apostrophes with an empty string instead of a space. This allows the searcher to find words containing "it's" and "Lord's" should they type "its" or "Lords" (and vice versa).
Also reinstate the setting of search_lyrics by clean_song.

bzr-revno: 1612
2011-06-04 17:07:42 +01:00
Armin Köhler
7e519464f6 Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles.
bzr-revno: 1611
2011-06-04 14:52:26 +01:00
Andreas Preikschat
47936e34a7 improved thumbnail creation speed 2011-06-03 17:57:56 +02:00
Armin Köhler
c4e6e91c81 change log usage 2011-06-03 14:43:54 +02:00
Jonathan Corwin
9aed776186 Change presentation log.exceptions to log.warn's 2011-06-03 07:52:16 +01:00
Armin Köhler
59f520ab6c - Fix bug #788762: only show the "No matching book" dialog once.
- If a second Bible is chosen, text search results will only contain passages which are in both Bibles.

bzr-revno: 1608
2011-06-03 07:43:02 +02: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
Stevan Pettit
4b20a3571f Song add clears search 2011-06-02 23:39:28 -04:00
Jonathan Corwin
604394a2eb head 2011-06-02 22:17:14 +01:00
Jonathan Corwin
d4031a62d3 More apostrophes 2011-06-02 22:13:32 +01:00
Andreas Preikschat
0b8fe770d5 Do not show qm files which start with qt_
Fixes: https://launchpad.net/bugs/791814
2011-06-02 15:58:49 +02:00
Andreas Preikschat
847d69cd2f - removed dangling list
- added debug message
- do not show an error message when the directory does not exist, instead create one
- do not override the file class
- clean ups

bzr-revno: 1605
2011-06-02 15:09:37 +02:00
Armin Köhler
eda3e9ebe0 change log usage 2011-06-02 13:52:06 +02:00
Armin Köhler
6bce97895d - Fix problems with non-ascii book names on Biblegateway
- Fix download problem with first verse on Biblegateway
- Remove unnecessary whitespace

bzr-revno: 1604
2011-06-02 13:04:39 +02:00
Armin Köhler
0b2cd7d936 Change string 2011-06-02 13:01:41 +02:00
Armin Köhler
877ea4e13d Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles. 2011-06-02 12:42:42 +02:00
Jonathan Corwin
596123dd06 Fix problems with remembering blank/hidden state when starting up, and with the startup logo flashing briefly on the screen. Also fix the Show blank warning box.
Fix toolbox appearing on the media manager when it's associated plugin is inactive.
Make the override display act like a dual display on startup. I.e. it appears.

bzr-revno: 1603
2011-06-02 07:16:45 +01:00
Armin Köhler
cbfa51ea73 Fix Bug 788762 - error " No matching book" is now only shown once.
If a Second Bible is choosen Text Search Results contains now only passages which are in both bibles
2011-06-02 07:57:11 +02:00
Armin Köhler
8067f669b1 Fix Bug 788762 - error "No matching book" is now only shown once
If a Second Bible is choosen Text Search Results contains now only Passages which are in both bibles.
2011-06-02 07:45:02 +02:00
Jonathan Corwin
364de1af86 aphrostrophe fix for song searching 2011-06-01 23:47:42 +01:00
Stevan Pettit
0969f4ffc3 Removed repeated calls to self.initalize() 2011-06-01 17:06:45 -04:00
Gerald Britton
8760f54674 Change messages to refer to OpenOffice or LibreOffice 2011-06-01 15:53:14 -04:00
Armin Köhler
975808d11e fix Traceback with appStartup() if plugin is disabled 2011-06-01 21:25:26 +02:00
Jonathan Corwin
40f2b4d138 Fix unhidden toolbox that appears in the media manager 2011-06-01 19:58:27 +01:00
Gerald Britton
7459255b65 Add robustness to Generic document and Songs of Fellowship importers.
bzr-revno: 1601
2011-06-01 17:43:29 +02:00
Andreas Preikschat
b9dfd1f7d2 more spelling fixes 2011-06-01 14:08:40 +02:00
Andreas Preikschat
6b1f8f36f2 fixed spelling 2011-06-01 11:35:08 +02:00
Jonathan Corwin
c7a90102a2 Fix some startup blank/hide problems 2011-06-01 08:38:19 +01:00
Andreas Preikschat
91718326ea removed dangling list 2011-06-01 08:47:19 +02:00
Andreas Preikschat
5494b20805 added more debug 2011-06-01 08:31:22 +02:00
Andreas Preikschat
d7ebb73fd1 - do not show an error message when the directory does not exist, instead create items
- trivial clean ups
2011-06-01 08:24:35 +02:00
Andreas Preikschat
9a81e8dbe6 added blank line 2011-06-01 07:46:34 +02: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
Gerald Britton
6856e3ef44 Ensure exception is raised if all attempts to connect with uno fail 2011-05-31 16:05:47 -04:00
Gerald Britton
6a6d0aa64d Log failing imports
bzr-revno: 1600
2011-05-31 21:01:49 +02:00
Raoul Snyman
d4a75148b8 Fixed bug #790382 by using the Mako template engine to pass Python variables into the template and tweaking a few things in the JS.
bzr-revno: 1599
2011-05-31 20:57:59 +02:00
Raoul Snyman
6572e7a225 Removed the int typecast and removed executable permissions from the json2.js file. 2011-05-31 20:20:23 +02:00
Raoul Snyman
09d63871d8 Converted the impromptu page to a dialog for better usability and more translation flexibility. 2011-05-31 19:36:32 +02:00
Gerald Britton
367dfa4585 Merging trunk changes 2011-05-31 10:58:03 -04:00
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
Andreas Preikschat
8602345491 removed print 2011-05-23 20:23:45 +02:00
Andreas Preikschat
ffd017799f new 'word by word' algorithm 2011-05-23 19:28:52 +02:00
Andreas Preikschat
ce5c354e06 fix for head 2011-05-23 13:49:14 +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
b6a85d0405 Add Split items to songs and custom, improve impress error handling
bzr-revno: 1564
2011-05-23 05:59:35 +01:00
Josh Miller
6d577395a4 A switch of code to see if it worked and doesn't for the enable loop 2011-05-22 17:39:37 -04:00
Tim Bentley
50a81cc3c9 png not jpg 2011-05-22 19:50:34 +01:00
Josh Miller
33dcf7c439 This is a run of the 'enable slide loop' code that gushie showed me plus my checkbox code for it 2011-05-22 14:49:16 -04:00
Tim Bentley
b544e519b1 Add tolltip and impress debugging 2011-05-22 19:48:14 +01:00