Commit Graph

3829 Commits

Author SHA1 Message Date
Raoul Snyman
f82513f11d Finally done the openlp.org 1.x song importer. 2010-09-06 22:33:28 +02:00
Martin Thompson
db118196a5 test_opensong passes again 2010-09-06 20:56:20 +01:00
Martin Thompson
53dc52c7c8 merged 2010-09-06 20:43:37 +01:00
Martin Thompson
2ae4c5a1b1 Merged 2010-09-06 20:42:39 +01:00
Raoul Snyman
5e61bf938e HEAD 2010-09-06 20:05:08 +02:00
Tim Bentley
991d8f1caf Fix bugs regarding screen blanking
bzr-revno: 1015
Fixes: https://launchpad.net/bugs/639285, https://launchpad.net/bugs/630254
2010-09-06 16:35:33 +01:00
Raoul Snyman
035bf7577f Update some strings, fix up the layout in the edit song dialog. 2010-09-06 07:54:51 +02:00
Raoul Snyman
08e97a67cb More string fixes and updates from Pootle. 2010-09-06 06:53:48 +02:00
Jonathan Corwin
436bcc9ad1 Hook generic and sof song imports into the wizard
bzr-revno: 1014
2010-09-05 21:24:47 +01:00
Tim Bentley
91eff095a5 Fix hiding of screen and adding items behind it and showing them.
Fixes: https://launchpad.net/bugs/630285
2010-09-05 20:52:49 +01:00
Tim Bentley
a4d8e225c0 Allow images to blank to theme.
As none defined cos it's an image use global

Fixes: https://launchpad.net/bugs/630254
2010-09-05 17:11:50 +01:00
Jonathan Corwin
aa0f4f7af0 Finish wizard integration 2010-09-05 16:16:48 +01:00
Jonathan Corwin
3d550e383c Head 2010-09-05 15:18:38 +01:00
Tim Bentley
789147ad94 Head1013 2010-09-05 07:11:48 +01:00
Tim Bentley
2617e8d67b Fix bug for song CCLI setting
Fix bug for dual bible tab which was a general settings bug.

bzr-revno: 1013
Fixes: https://launchpad.net/bugs/629848, https://launchpad.net/bugs/622894
2010-09-05 07:05:00 +01:00
Jonathan Corwin
301a190483 Size maindisplay to full screen correctly, and eliminate maindisplay scrollbars
bzr-revno: 1012
2010-09-04 22:31:32 +01:00
Jonathan Corwin
277f5e1380 Always use screenGeometry 2010-09-04 21:08:36 +01:00
Tim Bentley
e2c117034a Fix up bug for bible settings of duel drop down
Fixes: https://launchpad.net/bugs/629848
2010-09-04 20:40:28 +01:00
Jonathan Corwin
e54340d8f3 scrollbar attempt 2 2010-09-04 20:13:26 +01:00
Tim Bentley
da64f5147c Head1011 2010-09-04 19:14:51 +01:00
Tim Bentley
2cc3b8543c Clean up the renderer
bzr-revno: 1011
2010-09-04 19:12:48 +01:00
Philip Ridout
cefc155441 Rearranged the screen co-ordinate fields.
bzr-revno: 1010
2010-09-04 20:08:13 +02:00
Philip Ridout
55982e4b74 Fix incorrect method
bzr-revno: 1009
2010-09-04 19:01:17 +01:00
Jonathan Corwin
9c0391fe73 Screen size and scrollbar fix? 2010-09-04 18:55:10 +01:00
Raoul Snyman
a44ae94de7 HEAD 2010-09-04 19:53:10 +02:00
Raoul Snyman
2901c79ed6 Start work on the openlp.org 1.x importer.
Add a couple of fixes to the song import.
Add a few fixes to the OpenSong importer.
2010-09-04 19:51:41 +02:00
Tim Bentley
20844c8d28 Fix CCLI for songs
Fixes: https://launchpad.net/bugs/622894
2010-09-04 18:39:03 +01:00
Jonathan Corwin
f9445956bc Head 2010-09-04 18:00:31 +01:00
Philip Ridout
cd9a7d4951 Changed with and height arround on the general tab. This brings it in line with the standard way of specifing a screen res, as well as bring it in line with the x & y cords before the height and width! 2010-09-04 17:36:07 +01:00
Tim Bentley
b9bb5b8c4f Cleanups 2010-09-04 17:14:56 +01:00
Tim Bentley
e521e986c4 Head1008 2010-09-04 16:51:28 +01:00
Tim Bentley
62a031982e Renderer cleanup 2010-09-04 16:51:18 +01:00
Jonathan Corwin
451e4fd563 Calculate page breaks more accurately, and other HTML/CSS tidies
bzr-revno: 1008
2010-09-04 15:51:22 +01:00
Philip Ridout
163bf9d2f4 Corrected one line that was missed (not by me :-p) 2010-09-04 15:26:04 +01:00
Jonathan Corwin
5dd5e15060 Subtract shadow from width, not add it 2010-09-04 15:23:20 +01:00
Jonathan Corwin
704502b05d Head 2010-09-04 14:35:15 +01:00
Tim Bentley
f9c442d90a Speed up backgrounds by removing images and using CSS instead
move spelling text widget to own file
fix up highlighting of fields for spelling and tagging.

bzr-revno: 1007
2010-09-04 14:13:50 +01:00
Jonathan Corwin
a74af25265 tidy 2010-09-04 14:09:47 +01:00
Jonathan Corwin
1899fc3415 css tidies, attempt to get paging correct, replacing qtextdoc with qwebview 2010-09-04 14:06:06 +01:00
Tim Bentley
26bceb84b9 Sort out spelling highlighting 2010-09-04 11:39:48 +01:00
Tim Bentley
04cfa6a730 Move spell and tag dialog to it"s own file 2010-09-04 09:12:54 +01:00
Tim Bentley
e5b2ff9e06 Move backgrounds to css from images 2010-09-04 08:48:58 +01:00
Tim Bentley
6deac45c2c Head1006 2010-09-04 07:26:33 +01:00
Jonathan Corwin
1fca6ec81d Italics/Bold theme to CSS. Share css for both QTextDocument and QWebView 2010-09-03 23:03:54 +01:00
Jonathan Corwin
b2563f0ce0 head 2010-09-03 21:10:05 +01:00
Jon Tibble
9fa6039557 Head r1006 2010-09-03 21:08:38 +01:00
Jonathan Corwin
1275fdb35a Fix {} colour substitutions and problems displaying first slide
bzr-revno: 1006
2010-09-03 20:49:09 +01:00
Tim Bentley
3f93a44519 Fix bugs with renderer
bzr-revno: 1005
2010-09-03 20:44:56 +01:00
Tim Bentley
27dd493d40 debug cleanups 2010-09-03 19:33:55 +01:00
Jonathan Corwin
e292748b83 Colour and poss blank verse fix? 2010-09-03 19:30:56 +01:00