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

6079 Commits

Author SHA1 Message Date
Stevan Pettit
8800b41749 Added confirmation message prior to re-start of FTW 2011-07-23 14:09:13 -04:00
Stevan Pettit
f7a222da6c modified mainwindow.py code to make first time wizard re-run inline code 2011-07-23 08:52:43 -04:00
Tim Bentley
c813b31427 Correct up and down selection for service manage panel 
Fixes: https://launchpad.net/bugs/805084
 2011-07-23 06:48:55 +01:00
Stevan Pettit
b15fd4df49 modified mainwondow.py to allow first time wizard to be re-run 2011-07-22 09:39:49 -04:00
rimach crichter@web.de
f1463a4467 bugfixing 2011-07-20 23:17:05 +02:00
rimach crichter@web.de
c61f23370c bugfixing 2011-07-20 23:16:36 +02:00
rimach crichter@web.de
6881dd95c3 bugfixing 2011-07-20 22:48:33 +02:00
rimach crichter@web.de
210926867f bugfixing 2011-07-20 22:47:29 +02:00
Andreas Preikschat
823831e075 removed doctype for now 2011-07-20 15:05:30 +02:00
rimach crichter@web.de
58f7ab3dbc Head 2011-07-19 22:06:29 +02:00
rimach crichter@web.de
146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de
45dfb28c54 update 2011-07-19 22:04:32 +02:00
rimach crichter@web.de
65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Andreas Preikschat
1214706d2a removed debug help 2011-07-18 18:20:40 +02:00
Andreas Preikschat
baec0f5c69 added margin back; added missing spaces 2011-07-18 18:01:42 +02:00
Andreas Preikschat
988e632676 possible fix for not working gradient 2011-07-18 17:34:38 +02:00
Andreas Preikschat
7483c8dfe8 r1690 2011-07-18 15:24:58 +02:00
Jon Tibble
4ae1a12b59 Unused function: string_is_unicode 2011-07-17 16:09:30 +01:00
Andreas Preikschat
f869b047ad changed spaces 2011-07-17 15:15:13 +02:00
Andreas Preikschat
46fa64b43d reverted some changes 2011-07-17 15:01:28 +02:00
Jon Tibble
0f89b9f771 Unused import 2011-07-17 13:59:26 +01:00
Jon Tibble
60b286ca3e Head r1689 2011-07-17 12:56:17 +01:00
Andreas Preikschat
1da64528f5 removed the ZIP support for the OpenSong importer (bug #795027) 
bzr-revno: 1688
Fixes: https://launchpad.net/bugs/795027
 2011-07-17 13:34:33 +02:00
Andreas Preikschat
47e43404aa - added doctype to html 
- added encoding to html
- changed <br /> to <br>
- removed obsolete language attribute
 2011-07-16 11:00:30 +02:00
Andreas Preikschat
b51f9b2a0c - do not set a service modified when using the up/down arrows to change the selected service item 
- only set the service modified when an item is selected while using the 'move button' and 'delete button'
 2011-07-16 09:20:13 +02:00
Andreas Preikschat
69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Andreas Preikschat
bc5d2cce46 removed zip support for OpenSong importer 
Fixes: https://launchpad.net/bugs/795027
 2011-07-15 20:18:11 +02:00
Jon Tibble
40d31106b3 Head r1686 2011-07-14 19:42:38 +01:00
Andreas Preikschat
822db59c4f - use map instead of list comprehension 
- make some instance variables (in connection with re) constants
- removed some blank lines

bzr-revno: 1686
 2011-07-14 17:20:25 +01:00
Tim Bentley
72cd870e48 Fix 1.9.6 String errors 
bzr-revno: 1685
 2011-07-14 17:18:23 +01:00
Jon Tibble
42acff98ab Unused import 2011-07-13 22:00:35 +01:00
Tim Bentley
f1cf256d99 Fix 2011-07-13 18:41:37 +01:00
Andreas Preikschat
b98e36aff2 regex clean ups 2011-07-13 15:32:19 +02:00
Jon Tibble
8d4369adb8 Head r1684 2011-07-12 20:06:37 +01:00
Andreas Preikschat
84d1a0d35d - Fixed bug #805082 
- Removed trailing "Help"

bzr-revno: 1684
 2011-07-12 16:49:19 +02:00
Jon Tibble
a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
Tim Bentley
b83048ff4e Fix outstanding strings in Error for translations 
Fixes: https://launchpad.net/bugs/796440
 2011-07-11 17:32:25 +01:00
rimach crichter@web.de
98e1028705 update 2011-07-10 23:43:07 +02:00
Tim Bentley
d58ed2da56 Add visual button to status bar for Song usage active / inactive and connect to F4 button. 
Code cleanups

bzr-revno: 1682
 2011-07-10 16:04:55 +01:00
Tim Bentley
2bf6dbafeb Improve ServiceManager tool tips to include theme. 
Fix change of theme in servicemanager to allow live to be updated.

bzr-revno: 1681
Fixes: https://launchpad.net/bugs/806829, https://launchpad.net/bugs/806834
 2011-07-10 16:03:47 +01:00
Tim Bentley
77a055a304 Head 2011-07-10 13:07:10 +01:00
Tim Bentley
7d21d45764 missing : 2011-07-10 13:02:58 +01:00
Tim Bentley
4651ec35b6 Fixes 2011-07-10 12:59:23 +01:00
Andreas Preikschat
50bc672f59 removed the trailing 'help' 2011-07-10 12:52:30 +02:00
Andreas Preikschat
3c63ffd4a6 fixed bug 805082 
Fixes: https://launchpad.net/bugs/805082
 2011-07-10 12:45:52 +02:00
Tim Bentley
dd302537ec Fix code 2011-07-10 07:58:15 +01:00
Tim Bentley
e9fb8e59c1 Allow service item themes to change and be added back to slide controller 
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
 2011-07-09 08:43:35 +01:00
Tim Bentley
cf9355d725 Add some formatting 2011-07-09 07:03:52 +01:00
Tim Bentley
b94115d4b2 Amend tooltips so show theme for service item if present. 
Fixes: https://launchpad.net/bugs/806834
 2011-07-08 21:55:18 +01:00
Tim Bentley
f264cc4c4e correct tooltip text 2011-07-08 16:07:53 +01:00
Andreas Preikschat
2c2000f488 r1680 + conflicts 2011-07-08 15:20:14 +02:00
Raoul Snyman
b4358a2005 Fixed bug #794971 by typecasting the title and lyrics fields to unicode objects if they are buffer objects. 
bzr-revno: 1679
 2011-07-08 14:53:36 +02:00
Raoul Snyman
2ddcd717bf Fixed bug #803031: If UTF-8 decoding fails, try the standard Windows codepage. 
bzr-revno: 1678
 2011-07-08 14:52:36 +02:00
Andreas Preikschat
5ff8d9d326 - small image queue fix 
- refactoring

bzr-revno: 1677
 2011-07-08 14:41:44 +02:00
Tim Bentley
5efe717137 Head 2011-07-08 08:46:25 +01:00
Stevan Pettit
6a612ee107 Modified slidecontroller to change loop button icons and captions when user select a loop to run. 
Lines 1060-1061 and 1081-1082 cover the case if the user uses the dropdown to change the loop type (continuous or once)

Added the translated button captions to ui.py

in slidecontroller, changed Qicon to build_icon

bzr-revno: 1676
 2011-07-08 07:41:30 +01:00
Raoul Snyman
5581a74034 Changed typecast to rather check for buffer. 2011-07-08 08:40:50 +02:00
Raoul Snyman
897f7a7dbb Fixed bug #794971: Typecast the buffer object to a unicode object. 2011-07-08 08:31:34 +02:00
Tim Bentley
1a611dcd60 Add tooltip 2011-07-08 07:03:09 +01:00
Raoul Snyman
ce1abaf332 Fixed bug #803031: If UTF-8 decoding fails, try the standard Windows codepage. 2011-07-08 07:57:39 +02:00
Jon Tibble
1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble
1899961965 Long lines 2011-07-07 22:22:41 +01:00
Tim Bentley
d02ee451f2 Add ability to clone a song with a full copy of it. 
Add missing build_icon and line wrap error.

Slow down event generation to stop flood of messages which crash the system. UI does not notice the change.

Changes for 795980 also included

bzr-revno: 1675
Fixes: https://launchpad.net/bugs/795980, https://launchpad.net/bugs/752374, https://launchpad.net/bugs/763583
 2011-07-07 21:14:12 +01:00
Jon Tibble
3ab1c606e5 Head r1674 2011-07-07 19:04:26 +01:00
Jon Tibble
623b56742c Cleanups 2011-07-07 19:03:12 +01:00
Stevan Pettit
856d44270f Changed use of Qicon to build_icon in slidecontroller 2011-07-07 13:38:13 -04:00
Tim Bentley
37fdcc62a4 Fix comment 2011-07-07 18:03:38 +01:00
Andreas Preikschat
f7ab82518b doc 2011-07-07 17:37:43 +02:00
Stevan Pettit
1ffd5713b0 Modified slide controller to change loop button icons when selecting slide loops 2011-07-07 11:23:55 -04:00
Andreas Preikschat
2b419d8a4e implementation fix: set priority to low instead of lowerest when the image was requested 2011-07-07 17:15:48 +02:00
Andreas Preikschat
3e8c91cbd5 refactor some code 2011-07-07 16:53:05 +02:00
Andreas Preikschat
b68751835f r1673 2011-07-06 16:00:32 +02:00
Benny
1876d520ae review fixes 2011-07-05 14:00:34 +02:00
Benny
6436b05240 changes from review (cosmetic & regex performance) 2011-07-05 12:50:55 +02:00
Benny
ae8ac35d2c merge head 2011-07-05 01:02:49 +02:00
Benny
3c0c9c5b78 EasyWorship importer: some work to create more reasonable verse numbers if EW tags are missing or without numbers 2011-07-05 00:55:57 +02:00
Benny
4bf45ad2de ewimport: workaround for RTF stripping bug 2011-07-04 22:51:43 +02:00
Tim Bentley
b2b8dd1d4d Extra fix 2011-07-03 19:33:04 +01:00
Tim Bentley
4d82e55ca0 Correct code 2011-07-03 18:45:48 +01:00
Tim Bentley
1c454b606f Fix fullstop and add icon 2011-07-03 13:43:31 +01:00
Tim Bentley
2a73f1b188 Prevent Images and Media backgrounds being added when No service Item is present in the live controller. 
Fixes: https://launchpad.net/bugs/795980
 2011-07-03 09:13:48 +01:00
Tim Bentley
222d4c228c Method fix 2011-07-03 06:43:32 +01:00
Tim Bentley
091cdbbc24 Slow down slidecontroller events to allow buffers to clear. 
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
 2011-07-02 07:48:17 +01:00
Tim Bentley
6a259e0489 Correct build icon 2011-07-02 06:51:03 +01:00
Benny
bc808ade93 EasyWorshipSongImport: use tag from previous slide for slides without tag, fix regex for notes 2011-07-02 00:45:27 +02:00
Tim Bentley
219218161b 6am spelling fix 2011-07-01 17:59:56 +01:00
Tim Bentley
bddf91ddcb Add ability to clone songs 
Amend framework for plugins to add  non toolbar context items

Fixes: https://launchpad.net/bugs/763583
 2011-07-01 17:55:07 +01:00
Andreas Preikschat
418c3b9c18 - use the functions context_menu_action and context_menu_separator from core/lib/ui 
bzr-revno: 1672
 2011-07-01 10:26:26 +02:00
Raoul Snyman
dcd10f0b8f A couple of minor UI tweaks. 
bzr-revno: 1671
 2011-07-01 10:09:36 +02:00
Tim Bentley
43f4b30d02 Head 2011-06-30 20:00:03 +01:00
Tim Bentley
0b41274f8e Fix up button 2011-06-30 19:59:51 +01:00
Andreas Preikschat
a60fc8ea23 - When creating/editing a custom slide give the title edit the focus (and not only when creating a new) 
- fixed long lines
- simplification

bzr-revno: 1670
 2011-06-30 16:59:30 +02:00
Andreas Preikschat
54f8ae82e7 - improved collapse/expand all buttons in the service manager 
bzr-revno: 1669
 2011-06-30 16:57:42 +02:00
Andreas Preikschat
deddee5668 - fixed theme copy 
bzr-revno: 1668
 2011-06-30 16:56:55 +02:00
Stevan Pettit
ab993842ff Added code to create a main window menu item to display the Windows help file (openlp.chm) if it exists on the users machine: 
- If it exists, F1 will display the local file, Alt-F1 will display the online help.
- If the help file does not exist, F1 will display the Online help (as it currently does).

bzr-revno: 1667
 2011-06-30 09:48:20 +02:00
Tim Bentley
870d0b51e9 Move SongUsage active to toolbar 2011-06-29 22:04:08 +01:00
Benny
306826bbeb merge with trunk 2011-06-29 21:33:48 +02:00
Benny
5df77e4ed6 Easyworship importer: improved recognition of slide divisions 
merged with trunk
 2011-06-29 21:26:14 +02:00
Stevan Pettit
97a76369bf Changed Windows test to os.name 2011-06-29 13:30:53 -04:00
Tim Bentley
b77094beb6 Head 2011-06-29 17:11:37 +01:00
Tim Bentley
143e697281 Add middle splitter 2011-06-29 17:11:19 +01:00
Stevan Pettit
0612a93964 Changed helpfile check to Windows condition check. Modified build script to create OpenLP.chm 2011-06-29 10:42:14 -04:00
Andreas Preikschat
c2fb73dde6 do not regenerate all service items when collapsing/expanding all items 2011-06-29 16:28:10 +02:00
Andreas Preikschat
6980299697 use help function 2011-06-29 11:23:42 +02:00
Andreas Preikschat
6e3343c606 fixed theme copy 2011-06-29 11:08:53 +02:00
Andreas Preikschat
bb5d8f74c4 r1665 2011-06-29 10:04:55 +02:00
Andreas Preikschat
8bb96b97bf - When creating/editing a custom slide give the title edit the focus (and not only when creating a new) 
- fixed long lines
- simplification
 2011-06-29 10:04:14 +02:00
Andreas Preikschat
95743de19f more html fixes 2011-06-29 09:38:04 +02:00
Andreas Preikschat
795aae2277 r1665 2011-06-29 09:27:38 +02:00
Stevan Pettit
a0e0746ed8 - Ask for delete confirmation when attempting to delete custom slide(s) 
- Changed dialog heading to "Confirm Delete"

bzr-revno: 1665
 2011-06-29 08:53:15 +02:00
Tim Bentley
30df723358 Fixes 2011-06-29 07:12:32 +01:00
Stevan Pettit
da45d09e48 Moved delete dialog heading translate to ui.py 2011-06-28 16:35:28 -04:00
Raoul Snyman
486a427794 Minor UI tweaks. 2011-06-28 21:24:29 +02:00
Stevan Pettit
334bf4ab44 Changed dialog heading. Changed Songs delete confirm to match Custom Slides 2011-06-28 15:05:05 -04:00
Tim Bentley
a167f6ef86 Make progressbar smaller 2011-06-28 17:40:17 +01:00
Tim Bentley
75550b505b Save Controller Toolbars 
Fixes: https://launchpad.net/bugs/765239
 2011-06-28 17:35:50 +01:00
Tim Bentley
70709e9b12 Add ability to lock toolbar 
bzr-revno: 1664
 2011-06-28 17:12:41 +01:00
Stevan Pettit
f14fa78081 Modified delete message and dialog buttons 2011-06-28 09:29:36 -04:00
Stevan Pettit
c363165925 Removed some whitespace 2011-06-28 00:59:26 -04:00
Stevan Pettit
231c47db53 Remove settings for confirm delete 2011-06-28 00:52:46 -04:00
Tim Bentley
2d60f3842a review comment 2011-06-27 16:56:48 +01:00
Tim Bentley
372dcedb88 Head 2011-06-27 16:54:21 +01:00
Andreas Preikschat
86c0eea473 changed theme_manager to themeManager as it is Qt based 2011-06-27 13:51:25 +02:00
Andreas Preikschat
74d2b2d25c replaced <br> by <br /> 2011-06-27 13:44:57 +02:00
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
Andreas Preikschat
39caaca8d9 comment fixes 2011-06-23 16:34:43 +02:00
Andreas Preikschat
4d20334cce changed instance variable to camelCase as the class is Qt based 2011-06-23 15:32:32 +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
Andreas Preikschat
25fcdc2600 r1652 2011-06-22 21:23:21 +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
rimach crichter@web.de
f0b03daa78 Head 2011-06-14 22:51:55 +02:00
rimach crichter@web.de
d84098348b Head 2011-06-14 22:51:29 +02:00
rimach crichter@web.de
a4c46723a9 Head 2011-06-14 22:43:02 +02: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
rimach crichter@web.de
cbb6b8d405 bugfixing 2011-06-14 18:12:39 +02:00
rimach crichter@web.de
9dfb50951f bugfixing 2011-06-14 18:10:20 +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
rimach crichter@web.de
ec9162995f Head 2011-06-13 23:20:46 +02:00
rimach crichter@web.de
2c62a819b3 Head 2011-06-13 23:20:20 +02: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
rimach crichter@web.de
81ebf05b8f Head 2011-06-08 20:11:39 +02:00
rimach crichter@web.de
99079b1c95 Head 2011-06-08 20:11:20 +02:00
rimach crichter@web.de
beaa25c9ba bugfixing 2011-06-08 16:50:21 +02:00
rimach crichter@web.de
34144b36d8 bugfixing 2011-06-08 16:50:10 +02:00
rimach crichter@web.de
c628b3aa09 bugfixing 2011-06-08 16:49:48 +02:00
rimach crichter@web.de
592af0e181 bugfixing 2011-06-08 15:18:05 +02: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
rimach crichter@web.de
805821b13c initiation 2011-06-06 21:39:16 +02:00
rimach crichter@web.de
ac7126d929 head 2011-06-06 21:20:19 +02:00
rimach crichter@web.de
cd1bf815d1 corrections 2011-06-06 21:19:35 +02:00
rimach crichter@web.de
43fe38c129 sync 2011-06-06 21:12:14 +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
rimach crichter@web.de
dbce448da1 update 2011-06-05 23:10:49 +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