Gerald Britton
cde0eb5ab5
Only import uno exceptions if not running Windoes
2011-05-30 17:15:34 -04:00
Gerald Britton
c8a896cedd
Merge changes from trunk
2011-05-30 13:41:56 -04:00
Andreas Preikschat
6c870f7f7f
- Fixed bug #789929 (Display Tags cannot be deleted)
...
bzr-revno: 1595
Fixes: https://launchpad.net/bugs/789929
2011-05-30 18:54:45 +02:00
Andreas Preikschat
ed3a608b8d
fixed tag deletion (bug #789929
...
Fixes: https://launchpad.net/bugs/789929
2011-05-30 17:07:49 +02:00
Andreas Preikschat
166b1c5b68
r1594
2011-05-30 16:48:05 +02:00
Jonathan Corwin
98489da6ea
MediaManagerItems need to inherit from the TabBox inside the media dock, or the media dock itself.
...
Fix parentage of several classes
bzr-revno: 1594
Fixes: https://launchpad.net/bugs/739771
2011-05-30 09:56:23 +01: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
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
b56f93aad5
camelCase fixes and shortcut fixes
2011-05-29 08:23:12 +02:00
Andreas Preikschat
0e53bdfefa
head
2011-05-29 08:05:18 +02:00
Raoul Snyman
0c81f7c976
Added a simple file to point users to the online manual. This is necessary for the Debian and Ubuntu builds.
...
bzr-revno: 1590
2011-05-28 23:29:39 +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
Jeffrey Smith
7c3f7a2358
Make 'continuous loop' button into a selection ('loop' or 'play to end')
...
bzr-revno: 1589
2011-05-28 21:49:15 +01:00
Gerald Britton
caa6639c7b
Uglification to conform to weird standards :)
2011-05-28 16:43:33 -04:00
Gerald Britton
336adb7461
Merged updates from trunk
2011-05-28 16:36:46 -04:00
Raoul Snyman
382e2f11c8
Added a simple file to point users to the online manual. This is necessary for the Debian and Ubuntu builds.
2011-05-28 22:26:55 +02: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
5f9b23f8e7
remove unnecessary line
2011-05-27 22:53:46 +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
Jonathan Corwin
0f3233efdd
Head
2011-05-27 12:51:57 +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
