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

5658 Commits

Author SHA1 Message Date
Andreas Preikschat e50ca971d6 change queue name; remove image from queue when deleted from cache 2011-06-27 13:28:58 +02:00
Andreas Preikschat efe256c42a r1662 2011-06-27 10:57:19 +02:00
Andreas Preikschat c1e4ff0231 - removed not needed lists 
- some translation fixes
- remove close button on print dialog

bzr-revno: 1662
 2011-06-27 10:32:41 +02:00
Andreas Preikschat 7ac53156fb When you copy a theme the suggested theme name will be 'Copy of <theme name>' 
bzr-revno: 1661
 2011-06-27 10:31:16 +02:00
Andreas Preikschat c92e292518 - now you can resize the display tag dialog 
- changed the column widths
- make sure we always use the space available
- scroll to the bottom when adding a new tag

bzr-revno: 1659
 2011-06-27 10:26:15 +02:00
Stevan Pettit f7f20f9722 Add link to Windows help file from main window 2011-06-27 00:05:25 -04:00
Andreas Preikschat 943f2e1cb2 rearranged lines 2011-06-26 21:34:01 +02:00
Andreas Preikschat f2a243cfb4 change theme name to 'Copy of <theme name>' when copying a theme 2011-06-26 19:33:22 +02:00
Andreas Preikschat a05d9098ef - removed not needed code 
- some translation fixes
- remove close button on print dialog
 2011-06-26 18:15:13 +02:00
Andreas Preikschat ee985fde7d fixed margin; scroll to the bottom when adding a new tag 2011-06-26 16:37:38 +02:00
Andreas Preikschat cd3798573a improved display tag dialog resizing 2011-06-26 16:12:19 +02:00
Tim Bentley 217510281c Fix comments 2011-06-26 07:49:10 +01:00
Andreas Preikschat a077d83000 fixed saving 'Setup' mode shortcut 2011-06-26 07:58:29 +02:00
Andreas Preikschat f979233787 renamed method 2011-06-25 21:37:23 +02:00
Andreas Preikschat b1b29e9abf comment fix 2011-06-25 08:20:02 +02:00
Andreas Preikschat 1730f5a99f added new priority and fixed comments 2011-06-25 07:34:07 +02:00
Andreas Preikschat 356ea8fff8 - added an 'intelligent' image queue with priorities 
- resize image in the thread
- change instances variables (based on qt)
 2011-06-25 06:42:49 +02:00
Tim Bentley 94aae25333 1.9.6 2011-06-24 20:15:16 +01:00
Raoul Snyman e6cab2ce84 Fixed bug #791050 by hiding and then showing the toolbar. 
bzr-revno: 1657
 2011-06-24 14:25:31 +02:00
Raoul Snyman 509f739684 Fixed bug #791050 by hiding and then showing the toolbar. 2011-06-24 08:53:56 +02:00
Jonathan Corwin 4e216bdd13 Indent 2011-06-24 00:05:06 +01:00
Jonathan Corwin d58682ad6b SOF UNO constants too 2011-06-23 23:53:24 +01:00
Jonathan Corwin e1dc332be4 Trap meta key combinations for bug 743273. (Tested with Win key on Windows, don't have OS-X to test CMD key) 2011-06-23 23:30:56 +01:00
Jonathan Corwin 212103ce7b Some uno constants missing on some systems 2011-06-23 23:26:36 +01:00
Raoul Snyman fd1f4265ed Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error. 
bzr-revno: 1655
Fixes: https://launchpad.net/bugs/801000
 2011-06-23 22:04:40 +02:00
Raoul Snyman fb320569cf Half of bug #795068 fixed. Just figured I might as well get this in before the release. 
bzr-revno: 1654
Fixes: https://launchpad.net/bugs/795068
 2011-06-23 22:02:03 +02:00
Raoul Snyman 1d648f9df6 Removed commented line. 2011-06-23 15:27:06 +02:00
Raoul Snyman 114412e169 Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error. 2011-06-23 07:26:20 +02:00
Jonathan Corwin cb60e6e9ef 1. In the import wizard, if user goes back and next again, ensure a disabled button stays disabled. 
2. Check for missing attributes in the easislides import XML

bzr-revno: 1652
 2011-06-21 22:09:33 +01:00
Jonathan Corwin 6be7a1e06e When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay. 
bzr-revno: 1651
 2011-06-21 22:08:30 +01:00
Jonathan Corwin 488fc4831c 1. For openlyrics export, restrict the length of the filename to ensure it isn't too long for the filesystem. 
2. When adding a song from a loaded service file, the author list string was being split by comma and the count compared to the number of authors against the db song. This gave a false negative if one of the individual authors contained a comma. Change the author comparison technique.

bzr-revno: 1650
 2011-06-21 22:07:21 +01:00
Raoul Snyman faa9aca78b Fixed bug #800047 where the Preferences menu item in OS X was incorrect. 2011-06-21 08:10:03 +02:00
Benny 31dd4945ba fixed line endings 2011-06-21 07:55:11 +02:00
Benny 2939151ff1 EasyWorship importer: added conversion of Tags - basically working, but some issues remain 2011-06-21 07:40:53 +02:00
Jonathan Corwin 6c3190528d Fix easislides import when xml elements are missing 2011-06-20 23:11:05 +01:00
Jonathan Corwin 59280d10b7 Preserve greyed out of next button in import wizard 2011-06-20 22:57:34 +01:00
Jonathan Corwin cd75b33a4d Partial fix for the Unity top panel showing problem. However this doesn't fully fix it, since it appears the only way for a window to cover that bar is for it to have focus. This isn't possible in OpenLP, since the controlling window will have focus. 
bzr-revno: 1647
 2011-06-20 21:14:30 +01:00
Jonathan Corwin d692b11254 Fixing main display kerning problem for qtwebkit v534.3 
bzr-revno: 1646
 2011-06-20 21:13:20 +01:00
Jonathan Corwin 5082091426 Remove parent from live maindisplay, so videos work. Also means the display won't minimize when the main window is, or when the Windows show desktop facility is used 2011-06-20 20:44:56 +01:00
Jonathan Corwin f3b7e609e9 Don't duplicate songs if a single author contains a comma 2011-06-19 23:18:06 +01:00
Jonathan Corwin 099b62f233 Filename too long in openlyrics export 2011-06-19 22:11:29 +01:00
Jonathan Corwin 20522740f9 Shadow 2011-06-18 19:35:53 +01:00
Jonathan Corwin fe3278146d Kerning problems on maindisplay 2011-06-18 19:27:04 +01:00
Jonathan Corwin 658d4c2ecf Preserve service item notes between edits 2011-06-18 14:36:29 +01:00
Jonathan Corwin f3c83a19e1 maindisplay on top of X11 taskbar 2011-06-18 12:44:40 +01:00
Stevan Pettit 6f24d50316 Fixed problem with preview edit button not working for custom slides. 
Also restores backwards compatability with custom plugin settings with 1.9.5

bzr-revno: 1644
 2011-06-18 09:59:03 +01:00
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
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
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
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