Raoul Snyman
a2a912f6ea
Merge from head
2010-03-24 22:39:02 +02:00
Tim Bentley
1f7ec43f9d
Add enter to quick bible edit field
...
bzr-revno: 764
2010-03-24 20:38:38 +00:00
Tim Bentley
a091c8f3b6
Fix Quick bible enter
2010-03-24 19:15:25 +00:00
Tim Bentley
2459940146
Head763
2010-03-24 19:10:58 +00:00
Tim Bentley
59dd69eee1
Do not display empty list
2010-03-24 19:10:08 +00:00
Tim Bentley
f158044d5e
Fix row counts and bad code before superfly spots it
2010-03-24 19:05:45 +00:00
Tim Bentley
161f7e88bb
Head763
2010-03-24 18:59:48 +00:00
Tim Bentley
33d2de6f9b
Heads
2010-03-24 18:59:37 +00:00
Jon Tibble
5700407656
Change loop method and remove unused variables
...
bzr-revno: 763
2010-03-24 14:28:21 +00:00
Jon Tibble
6578fb529e
Test tweaks and remove unused variables
2010-03-23 21:51:20 +00:00
Tim Bentley
3df86e2fb2
head762
2010-03-23 20:49:41 +00:00
Jon Tibble
9090ad22b0
Head r762
2010-03-23 20:35:01 +00:00
Jon Tibble
fd3b17f6fa
Head r761
2010-03-23 20:33:17 +00:00
Jon Tibble
a6d2b0983c
Unused variable and import fixes
...
bzr-revno: 762
2010-03-23 20:27:54 +00:00
Jonathan Corwin
ab72e7d7cc
Close down presentation apps at end correctly
...
bzr-revno: 761
2010-03-23 21:59:32 +02:00
Jon Tibble
fe1755c25f
Head r760
2010-03-23 19:56:25 +00:00
Jonathan Corwin
00cb0d1277
Close down presentation apps at end correctly
2010-03-23 19:41:54 +00:00
Raoul Snyman
010161f96a
Changes:
...
- Changed the "New" icon to an "Import" icon for the Bibles plugin.
- Consolidated icons to make the resources file a little smaller.
- A few other small tweaks.
bzr-revno: 760
2010-03-23 21:41:50 +02:00
Jonathan Corwin
b68622a875
head
2010-03-23 19:11:39 +00:00
Raoul Snyman
2c325d718b
Changes:
...
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
2010-03-23 21:04:15 +02:00
Jon Tibble
c4b49a1511
Import fixes
2010-03-23 16:00:52 +00:00
Jon Tibble
317730be1f
Head r759
2010-03-23 15:15:00 +00:00
Jon Tibble
310f790e8e
Some head
2010-03-23 15:14:20 +00:00
Jonathan Corwin
c4f9320f4d
Fix up the bible migration.
...
bzr-revno: 759
2010-03-23 15:31:57 +02:00
Jonathan Corwin
f6e6357176
Fixed a bug with transparent backgrounds.
...
bzr-revno: 758
2010-03-23 15:30:29 +02:00
Raoul Snyman
0a704fa262
Change the "Live" icon.
...
bzr-revno: 757
2010-03-23 15:20:29 +02:00
Raoul Snyman
38d8467d19
Bugfixes in Bibles.
...
bzr-revno: 756
2010-03-23 15:18:24 +02:00
Jonathan Corwin
8524bf9174
Remove transparent error: QImage::scaled: Image is a null image
2010-03-22 23:50:32 +00:00
Jonathan Corwin
4e8b3e29bc
head
2010-03-22 23:02:02 +00:00
Raoul Snyman
1c7504cbb4
A small unicode conversion fix.
2010-03-22 22:54:38 +02:00
Raoul Snyman
76d0d8cf1a
Merge from trunk.
2010-03-22 22:43:16 +02:00
Raoul Snyman
c196d25807
Replaced "live" icon with a projector icon.
...
Replaced "preview" with a screen icon.
2010-03-22 22:38:50 +02:00
Jonathan Corwin
ca62429bad
Commented out two lines without realising it. I blame Noah
2010-03-22 19:57:24 +00:00
Jonathan Corwin
16c510acf0
Head
2010-03-22 19:44:06 +00:00
Tim Bentley
fd23dbc030
Head755
2010-03-22 18:33:54 +00:00
Tim Bentley
32086cb877
Fix slide selection so looks nice
2010-03-22 18:31:43 +00:00
Jonathan Corwin
5f2a637b63
Commit verses at end
2010-03-22 08:45:45 +00:00
Raoul Snyman
19c5c07c54
Add Christian and Phill to the credits
...
bzr-revno: 755
2010-03-22 10:37:18 +02:00
Raoul Snyman
9a4008489a
Various fixes to the Bibles plugin.
...
bzr-revno: 754
2010-03-22 10:33:21 +02:00
Raoul Snyman
ea5ceaf00a
Updated copyright.
...
Updated credits.
2010-03-22 01:58:01 +02:00
Jonathan Corwin
06342a0fa9
Bible migration
2010-03-21 23:00:17 +00:00
Jonathan Corwin
13f76ef2cb
Head
2010-03-21 22:54:49 +00:00
Jonathan Corwin
3500167907
Bible migration
2010-03-21 22:54:26 +00:00
Raoul Snyman
be598da4f9
Fixed a number of issues in the Bibles:
...
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
2010-03-22 00:16:43 +02:00
Tim Bentley
b181ba9a7f
Head753
2010-03-21 20:51:30 +00:00
Raoul Snyman
5c6289d13d
Being overzealous about unicode.
...
bzr-revno: 753
2010-03-21 22:44:42 +02:00
Tim Bentley
c8a0c2a34b
Stop double loading of Service items from service manager unless triggered by remote edit.
...
bzr-revno: 752
2010-03-21 20:38:58 +00:00
Raoul Snyman
12a7222eb1
Fixed a but in unicode conversions.
2010-03-21 22:33:57 +02:00
Tim Bentley
9664240e0b
Head751
2010-03-21 20:24:25 +00:00
Tim Bentley
2ff005cdc0
Add verse tag to live song rows
2010-03-21 19:55:51 +00:00