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
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
Tim Bentley
226fa4ff97
Head
2011-05-27 17:31:03 +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
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
97dea99310
r1580
2011-05-27 09:05:09 +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
Andreas Preikschat
52894b5a78
- Fixed Bible verse display misalignment(Bug #788770 )
...
bzr-revno: 1579
Fixes: https://launchpad.net/bugs/788770
2011-05-27 07:06:09 +02:00
Armin Köhler
af38bf7cc8
HEAD r1578
2011-05-26 22:41:19 +02:00
