Commit Graph

2029 Commits

Author SHA1 Message Date
Raoul Snyman 8f095a2fc5 Fixed a bug with Strongs in CrossWalk. 2010-03-26 22:50:55 +02:00
Raoul Snyman cda8cceb7a Merge from trunk 2010-03-26 22:22:04 +02:00
Raoul Snyman 5dfe1343f5 Update the credits.
bzr-revno: 770
2010-03-26 22:00:22 +02:00
Raoul Snyman ee879774b8 Update the credits. 2010-03-26 21:44:18 +02:00
Tim Bentley 01dc362689 Fix text outlines
bzr-revno: 769
2010-03-26 19:32:49 +00:00
Michael Gorven 5c7599e71a Correct .desktop file syntax so that rpmbuild doesn't fail.
https://code.launchpad.net/~mgorven/openlp/desktop-file-rpmbuild/+merge/22231

bzr-revno: 768
2010-03-26 19:25:54 +02:00
Raoul Snyman 663792b762 Merge from head. 2010-03-26 19:22:10 +02:00
Michael Gorven d4717c4809 Correct .desktop file syntax so that rpmbuild doesn't fail. 2010-03-26 17:14:52 +02:00
Tim Bentley f6e17119d0 Head767 2010-03-26 08:55:41 +00:00
Tim Bentley 44f3e02a5c Fix outline rendering bug 2010-03-26 08:49:26 +00:00
Tim Bentley 4eb64c4e6d Fix bug for PyTQ4.4
bzr-revno: 767
2010-03-25 19:37:56 +00:00
Tim Bentley ef77f58136 Head 2010-03-25 19:27:57 +00:00
Tim Bentley 51d6d2410b Fix QT4.4 bug in service manager 2010-03-25 19:27:46 +00:00
Raoul Snyman 6b07f952b9 Start presentation apps in right place.
bzr-revno: 766
2010-03-25 19:41:57 +02:00
Jonathan Corwin b490e74012 Start presentation apps in right place 2010-03-24 22:59:05 +00:00
Jonathan Corwin 95afcfec79 head 2010-03-24 22:42:00 +00:00
Raoul Snyman ff215ace3c Fixed two bugs in the web downloads import dealing with non-latin characters.
bzr-revno: 765
2010-03-24 23:59:39 +02:00
Raoul Snyman 0b596dab47 Fixed another possible bug. 2010-03-24 23:18:36 +02:00
Raoul Snyman 2eaadffea0 Fixed two bugs in the web downloads import dealing with non-latin characters. 2010-03-24 23:00:43 +02:00
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
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
Jonathan Corwin 5f2a637b63 Commit verses at end 2010-03-22 08:45:45 +00:00