raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
4,443 Commits 5 Branches 0 Tags 296 MiB
0ce3848d0f
Commit Graph

3512 Commits

Author SHA1 Message Date
Tim Bentley
20844c8d28 Fix CCLI for songs 
Fixes: https://launchpad.net/bugs/622894
 2010-09-04 18:39:03 +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
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
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
rimach
95ffc8dd3b add translation code for MediaDocks and PluginList 2010-09-04 00:51:28 +02:00
Jonathan Corwin
1fca6ec81d Italics/Bold theme to CSS. Share css for both QTextDocument and QWebView 2010-09-03 23:03:54 +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
Tim Bentley
da88990549 Bug 625997 2010-09-03 19:24:11 +01:00
Raoul Snyman
5432daae57 Fix for bug #621695. 
bzr-revno: 1004
 2010-09-03 08:29:29 +02:00
Andreas Preikschat
b138a4c1e8 Improved dual Bible handling, fixed some edge-case bugs, including bug #625997. 
bzr-revno: 1003
 2010-09-03 08:26:43 +02:00
Raoul Snyman
a37fafa722 Fix the name of the keyword argument. 2010-09-03 07:33:03 +02:00
Jon Tibble
da658e8850 Silly space 2010-09-03 00:20:35 +01:00
Jonathan Corwin
8be66a0e6f A bit of python crept into the javascript 2010-09-02 22:24:44 +01:00
Jonathan Corwin
6b2b7c2f1e Head 2010-09-02 22:03:55 +01:00
Jonathan Corwin
96737c0bc0 Use QtGraphicsWebview. Reduce div count where possible 2010-09-02 21:41:24 +01:00
Martin Thompson
84bff09d03 REmoved prints 2010-09-02 21:30:01 +01:00
Martin Thompson
11a9d3d8f5 Handles versetypes like 'V3a' 2010-09-02 21:21:31 +01:00
Martin Thompson
192010588f Test for & in authors 2010-09-02 20:43:28 +01:00
Jon Tibble
1b00eb4f0c Head r1001 2010-09-02 13:46:42 +01:00
Raoul Snyman
952dfca9fc Updated translation files, removed some more double-spaces 2010-09-02 13:05:48 +02:00
Raoul Snyman
081c66a1ed More extra spaces removed. 2010-09-02 13:00:08 +02:00
Raoul Snyman
df007a438e Fixed double-spacing 2010-09-02 12:53:50 +02:00
Jonathan Corwin
a9281e4cb9 replace evil-tables(tm) with div's 2010-09-01 22:36:02 +01:00
Derek Scotney
56b5a037ae Conflicts resolved 2010-09-01 22:20:27 +02:00
Derek Scotney
9ed0df5023 Removed unnecessary commented out lines 2010-09-01 21:31:16 +02:00
Derek Scotney
ce73d86e0a More code convention corrections 2010-09-01 21:27:45 +02:00
Andreas Preikschat
cadfefe616 opps.. forgot the %s 2010-09-01 21:22:55 +02:00
Tim Bentley
b24467d32c cleanup 2010-09-01 20:20:40 +01:00
Tim Bentley
c7b65b3476 Head5 2010-09-01 20:15:49 +01:00
Andreas Preikschat
b21e164fd3 added permission to footer 2010-09-01 19:54:10 +02:00
Andreas Preikschat
80851ddfc4 added permission, changed formattig 2010-09-01 19:27:38 +02:00
Raoul Snyman
ad57ee0927 Removed an unnecessary space. 2010-09-01 08:19:45 +02:00
Raoul Snyman
8344bcb1f7 HEAD 2010-09-01 08:19:09 +02:00
Philip Ridout
7e0245344a Adding the Words of Worship importer. 
bzr-revno: 1001
 2010-09-01 07:11:31 +02:00
Jonathan Corwin
0c62215bb7 Less interesting, but hopefully slightly faster transitions 2010-08-31 23:15:19 +01:00
Martin Thompson
b4cfea211e Import completely unlabelled songs. Import unreferenced verses 2010-08-31 20:49:57 +01:00
Derek Scotney
5734c3052a Code convention corrections 2010-08-31 21:01:55 +02:00
Andreas Preikschat
60ced9e184 moved some code 2010-08-31 20:28:21 +02:00
Tim Bentley
fbc048e878 Renderer fixes 2010-08-31 18:51:48 +01:00
Raoul Snyman
cafd5fca54 Reduce "Go to Verse" to "Go To" 2010-08-31 15:23:21 +02:00
Raoul Snyman
d116196993 HEAD 2010-08-31 08:41:40 +02:00
Raoul Snyman
b5dc5bafc0 - Fix for "TextLabel" in translation. 
- HEAD
 2010-08-31 08:41:03 +02:00
Jon Tibble
941ef772a5 Cleanups 2010-08-31 00:19:04 +01:00
Jonathan Corwin
305610ed8e fixes 2010-08-30 21:57:59 +01:00
Derek Scotney
83c5ee3450 Removed openlp/plugins/songs/lib/.directory 2010-08-30 22:42:07 +02:00
Martin Thompson
733bedebe8 Passes first tests again 2010-08-30 21:19:16 +01:00
Jonathan Corwin
3ea9ed2643 Head 2010-08-30 20:07:54 +01:00
Jonathan Corwin
b96a284d9e transition changes 2010-08-30 19:55:59 +01:00
Derek Scotney
590aef4a87 Corrected docstring lengths 2010-08-30 20:32:00 +02:00
Raoul Snyman
2d9b39986a Some more fixes for the OpenSong import. 2010-08-29 22:05:36 +02:00
Raoul Snyman
0e919ab903 Only show the display screen on startup if it is not on the primary screen. 
bzr-revno: 1000
 2010-08-29 21:29:45 +02:00
Raoul Snyman
75d64a165c Removed the commented out line, since this works. 2010-08-29 21:16:17 +02:00
Derek Scotney
d3ee43965f Change comments to reStructuredText format 2010-08-29 20:24:09 +02:00
Raoul Snyman
90ac6da839 Don't show the display on startup if there's only one monitor. 2010-08-29 20:12:36 +02:00
Raoul Snyman
130e315333 HEAD 2010-08-29 19:54:36 +02:00
Andreas Preikschat
31aba2eadb removed commented lines, name change 2010-08-29 18:20:56 +02:00
Tim Bentley
002b5de1c3 remove slash 2010-08-29 15:44:14 +01:00
Tim Bentley
93c87c396b add space 2010-08-29 15:42:47 +01:00
Tim Bentley
4379004f0e rename theme suffix 2010-08-29 15:27:51 +01:00
Tim Bentley
f065f95d00 Head998 2010-08-29 15:20:21 +01:00
Andreas Preikschat
1911972177 head 2010-08-29 15:07:10 +02:00
Andreas Preikschat
9fc45065fc removed unnecessary line 2010-08-29 14:58:40 +02:00
Andreas Preikschat
87db3e98e6 clean ups, tweaks, fixed 625997 2010-08-29 14:49:45 +02:00
Jon Tibble
9a1ed78fd5 Cleanups 2010-08-29 00:52:10 +01:00
Raoul Snyman
59d2e2dab6 Fixed up the OpenSong importer. 2010-08-29 01:09:05 +02:00
Philip Ridout
271bbe22b2 Made the constants more like constants! 2010-08-28 21:46:03 +01:00
Jon Tibble
0abf1597eb Fix trunk merging 2010-08-28 20:54:50 +01:00
Raoul Snyman
7fcd2512ce HEAD 2010-08-28 21:49:12 +02:00
Andreas Preikschat
beaac2d923 removed everything which cannot work 2010-08-28 21:41:06 +02:00
Jon Tibble
168033566a Head r997 2010-08-28 20:40:27 +01:00
Jon Tibble
066a97f4d7 Really fix song maintenance as subform (Bug #612282) 2010-08-28 20:32:24 +01:00
Andreas Preikschat
37b2b1bb9d clean up 2010-08-28 21:28:50 +02:00
Andreas Preikschat
de3659bc92 commented everything out, which cannot work (currently) 2010-08-28 21:17:52 +02:00
Andreas Preikschat
521b06ee8c clean up - not working 2010-08-28 20:56:46 +02:00
Tim Bentley
10aa9432d6 Fix font sizes and performance of previews 2010-08-28 19:44:49 +01:00
Andreas Preikschat
36e2f2e33f fixed stuff messed up resolvesing the conflict 2010-08-28 19:32:44 +02:00
Andreas Preikschat
14dbfaa4b5 fixed stuff messed up resolvesing the conflict 2010-08-28 19:10:14 +02:00
Andreas Preikschat
8071a65720 head 2010-08-28 19:05:45 +02:00
Tim Bentley
618813f020 Display and renderer changes 
bzr-revno: 997
 2010-08-28 17:35:16 +01:00
Tim Bentley
5ba4de64ca String fixes 2010-08-28 16:49:51 +01:00
Derek Scotney
81b53ee21b Changs to comment formatting 2010-08-28 15:27:17 +02:00
Derek Scotney
676cc9305c Changes to CCLI file importer to work with import wizard 2010-08-28 15:17:27 +02:00
Derek Scotney
80ded239a8 Changes to CCLI file importer to work with import wizard 2010-08-28 15:15:12 +02:00
Philip Ridout
f712ccca50 Signal fix as mentioned by Meths 2010-08-28 03:51:29 +01:00
Jon Tibble
000d23f7c6 Cleanup long lines 2010-08-28 02:31:11 +01:00
Jonathan Corwin
c4f3bccb59 Problems with outlines in qtwebkit 533.3. Shadow colour and kerning 2010-08-28 00:19:50 +01:00
Jon Tibble
bb31492609 Fix song maintenance as subform (Bug #612282) 2010-08-27 23:49:27 +01:00
Philip Ridout
1611251ec2 and an empty line at the end 2010-08-27 21:18:48 +01:00
Philip Ridout
e4f4626f04 shortened some long lines. 2010-08-27 21:14:23 +01:00
Philip Ridout
4e059f8cc5 Forgot to add the wowimport.py file 2010-08-27 21:02:59 +01:00
Philip Ridout
6b6da86c54 wow_import implemented in to import wizard 
bug fix in wizzard, so that it starts from the first page if used previously
bux fix in importer, so that it resets the defualts after commiting a song to the db
 2010-08-27 20:53:22 +01:00
Tim Bentley
3645c9400e Fix theme bug reported on Redhat bugzilla 
bzr-revno: 996
 2010-08-27 20:18:37 +01:00
Jon Tibble
5cfdaf3b77 Update OpenLPv2 song importer 
bzr-revno: 995
 2010-08-27 19:50:08 +01:00
Tim Bentley
759019e5eb Fix theme import Redhat Bugzilla 2010-08-27 19:48:06 +01:00
Tim Bentley
a4f1b29cca Fix bug losing transitions 2010-08-27 19:28:19 +01:00
Tim Bentley
3c637f6c2d chnage theme suffix 2010-08-27 17:44:42 +01:00
Tim Bentley
e1afe3be94 Head994 2010-08-27 17:10:15 +01:00
Jon Tibble
6266c3369e Cleanup the OpenLPv2 song importer 2010-08-27 16:25:29 +01:00
Raoul Snyman
596b49af9e Fixed up some HTML that crept in somewhere. 2010-08-27 11:11:57 +02:00
Jonathan Corwin
f717dc10d4 Bring up to date 2010-08-26 23:08:09 +01:00
Jonathan Corwin
1c66c7cd2c Head 2010-08-26 22:34:34 +01:00
Jonathan Corwin
ea2419924c progressbar 2010-08-26 22:32:31 +01:00
Raoul Snyman
3d60cc894d Added the initial openlp.org 1.x importer. 2010-08-26 22:53:24 +02:00
Raoul Snyman
dfe8bbae9c Some minor syntactic sugar. 2010-08-26 22:52:54 +02:00
Derek Scotney
ab7cd33c8d Updates to CCLI handling 2010-08-26 21:45:09 +02:00
Tim Bentley
ba4821e5f8 Screen re-sizing now works 2010-08-26 17:51:27 +01:00
Tim Bentley
2e6c06ad1f Screen switching now works 2010-08-26 17:08:26 +01:00
Tim Bentley
ca58541cb5 Head993 2010-08-26 16:50:11 +01:00
Tim Bentley
d6a67e7382 Screen fixes 2010-08-26 16:50:03 +01:00
Raoul Snyman
364940c547 Additional failover for version problems. 
bzr-revno: 993
 2010-08-26 15:54:05 +02:00
Jon Tibble
53295b08e0 Cleanups and a version check fix 
bzr-revno: 992
 2010-08-26 14:45:56 +01:00
Raoul Snyman
8c27f92ee3 Fix a string. 2010-08-26 07:52:30 +02:00
Raoul Snyman
3b1c151e15 Fail silently on version problems. 
Renamed a variable to be a little more sensible.
 2010-08-26 07:35:34 +02:00
Tim Bentley
adb757cd2f Cleanups and screen fixes 2010-08-26 06:01:29 +01:00
Jon Tibble
06fd68b3d8 Cleanups & fix version check 2010-08-26 01:37:25 +01:00
Tim Bentley
492389b715 Head990 2010-08-25 18:08:36 +01:00
Tim Bentley
2ec84cc5d9 White Space cleanup 2010-08-25 18:08:24 +01:00
Raoul Snyman
8b141b0942 Fixed the couple of issues Jon T. pointed out. 2010-08-24 21:08:57 +02:00
Tim Bentley
fcb62e41b8 Cut paste bug 2010-08-24 18:53:41 +01:00
Tim Bentley
46e35ead28 Spotted video bug 2010-08-24 18:28:13 +01:00
Tim Bentley
7359e91283 Fix bible titles 2010-08-24 18:12:47 +01:00
Tim Bentley
b2234ae269 Remove Unused variables 2010-08-24 17:39:51 +01:00
Raoul Snyman
78889633f6 Changed incrementProgressBar again slightly so that passing a blank string or None to the text will not update the text. 2010-08-24 17:31:33 +02:00
Raoul Snyman
70cd4bc700 Added an extra argument to the incrementProgressBar function so that an increment can be specified (like 0, if you don't want an increment). 2010-08-24 17:28:45 +02:00
Raoul Snyman
25f6bb33e7 Made changes suggested/requested by Jonathan C. 2010-08-24 17:25:26 +02:00
Jonathan Corwin
0066edecbb Remove comments 2010-08-24 13:50:26 +01:00
Raoul Snyman
788e8a2b55 Fixed a problem with the getListOfFiles function which was returning a list of repr'd QListWidgetItems instead of a list of strings. 
Made a SongFormat.ccli -> SongFormat.CCLI after renaming some fields caught this too.
 2010-08-24 10:08:07 +02:00
Jonathan Corwin
5c90fae68d Footer and css fixes 2010-08-23 23:24:42 +01:00
Jonathan Corwin
2c3e732453 SongImport.__init__() 2010-08-23 22:52:21 +01:00
Raoul Snyman
ef44dc72c6 Changed the Generic importer to multifile as well. 2010-08-23 21:29:39 +02:00
Tim Bentley
9403beb8b8 Fix blinking screen on Settings 2010-08-23 20:14:05 +01:00
Tim Bentley
6ab5447159 Fix up image deletion bug 2010-08-23 18:48:52 +01:00
Derek Scotney
0f7fb002b4 Added SongSelectFileImport to source control 2010-08-23 19:42:59 +02:00
Raoul Snyman
6d0b229860 Merge from HEAD. 
Add file I forgot to add previously.
Change Songs Of Fellowship importer to multi-file.
 2010-08-23 19:36:42 +02:00
Derek Scotney
558ec5dd38 Update to SongSelect functionality 2010-08-23 19:31:16 +02:00
Tim Bentley
37d1ab68b4 Remove border and handle missing enchant 2010-08-23 05:58:32 +01:00
Jonathan Corwin
8b79abdfe6 sof wizard 2010-08-22 23:36:11 +01:00
Raoul Snyman
530530d791 Got the song wizard working. Pity none of the importers seems to work at the moment. 2010-08-22 21:50:30 +02:00
Tim Bentley
a4e58c3349 Finish off spelling and tags for Custom and Song dialogs 2010-08-22 09:27:08 +01:00
Tim Bentley
ed4801b48a Add Html Tags to context menu 2010-08-22 08:39:23 +01:00
Tim Bentley
f705b69e20 Spellchecking of songs and custom 2010-08-22 08:05:05 +01:00
Tim Bentley
9f4066bf3f More fixes and update song editing 2010-08-21 20:35:32 +01:00
Tim Bentley
076215435b Fix up tags for renderer 2010-08-21 20:17:56 +01:00
Derek Scotney
54736fdac0 Implementation of SongSelect file import 2010-08-21 17:33:31 +02:00
Tim Bentley
06901951a6 Bug Fixes 2010-08-21 11:07:59 +01:00
Tim Bentley
3698f4abd9 cleanups for merge 2010-08-21 09:24:14 +01:00
Tim Bentley
086cf2d814 Head988 2010-08-21 08:46:42 +01:00
Tim Bentley
58f7f248e3 Remove text indentation 2010-08-21 08:46:00 +01:00
Tim Bentley
8459cf1c25 Fix service item focus bug 2010-08-21 08:25:54 +01:00
Tim Bentley
1e86aa98ba Fix theme text weight and html tag cleanups 2010-08-21 07:00:46 +01:00
Raoul Snyman
d4c274866d Moved the SVG file because it's not an icon SVG, it's the original logo file. 2010-08-20 22:07:02 +02:00
Raoul Snyman
3d478ec975 Song Wizard! 2010-08-20 21:40:07 +02:00
Jonathan Corwin
1e0d68016f Jonathans changes 2010-08-20 20:06:42 +01:00
Tim Bentley
def949fc9a Head987 2010-08-20 19:14:58 +01:00
Andreas Preikschat
5a22e67346 clean up 2010-08-18 17:04:16 +02:00
Andreas Preikschat
1b1261a1a4 - improved usage of different bibles and/or books in one service item 2010-08-15 17:35:20 +02:00
Andreas Preikschat
30e867e020 - rework 
- improved usage of different bibles
 2010-08-15 16:49:07 +02:00
Andreas Preikschat
a043407e25 Dual bible fixes 
bzr-revno: 987
 2010-08-11 20:47:24 +01:00
Andreas Preikschat
c41bb80a95 made lines more readable 2010-08-10 18:49:52 +02:00
Andreas Preikschat
df8b064058 made lines more readable 2010-08-10 18:48:10 +02:00
Andreas Preikschat
47125ba600 made lines more readable 2010-08-10 18:44:04 +02:00
Jonathan Corwin
51f35dc9ce Alerts over presentations + tidyups 2010-08-09 22:21:04 +01:00
Andreas Preikschat
403ee4cd53 more convenient names 2010-08-08 20:05:33 +02:00
Raoul Snyman
d992fb1e07 First add and delete buttons working! 2010-08-08 16:38:51 +02:00
Tim Bentley
6c3f21dfb0 Theme Editing now previews and RenderManager Cleanups 2010-08-07 14:37:10 +01:00
Tim Bentley
45b12cf462 Theme preview updates 2010-08-07 09:50:58 +01:00
Tim Bentley
efd5c60dfd Display fixes amd theme updates 2010-08-07 07:18:05 +01:00
Tim Bentley
bec051a502 Fade previews now work 2010-08-06 17:38:52 +01:00
Andreas Preikschat
24de78680e cleanup 2010-08-06 09:23:32 +02:00
Andreas Preikschat
719268f121 cleanup 2010-08-06 09:07:20 +02:00
Andreas Preikschat
3bee58e314 'if' not necessary 2010-08-06 09:00:34 +02:00
Tim Bentley
956017da0e Start to fix preview for fades 2010-08-06 06:09:32 +01:00
Tim Bentley
15c6e47f4e Cleanups 2010-08-05 21:39:20 +01:00
Tim Bentley
b612ece199 Fix theme editing display size 2010-08-05 21:26:39 +01:00
Andreas Preikschat
60b179b2ed improved single and dual bible usage in one service item 2010-08-05 21:32:58 +02:00
Tim Bentley
9722b4e382 Theme cleanups 2010-08-05 20:01:24 +01:00
Tim Bentley
ab37fdbcf8 Theme blanking works now 2010-08-05 08:49:25 +01:00
Tim Bentley
003d0552eb Theme blanking works 2010-08-05 06:37:26 +01:00
Tim Bentley
6d352df382 Video cleanups 2010-08-04 20:09:43 +01:00
Andreas Preikschat
e6f0fde98d tweaks and cleanups 2010-08-04 10:02:52 +02:00
Tim Bentley
821911503e Alerts now work 2010-08-04 05:59:41 +01:00
Tim Bentley
f3e62c9f14 Bible text display cleanups 2010-08-03 20:23:05 +01:00
Tim Bentley
6d5eae7377 Update to alert 2010-08-03 19:30:38 +01:00
Andreas Preikschat
444a219a20 removed unused list 2010-08-03 19:17:09 +02:00
Andreas Preikschat
6df4e2cfef continued fixing + cleaned my work up 2010-08-03 19:04:08 +02:00
Andreas Preikschat
b3d17de18a fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:49:04 +02:00
Andreas Preikschat
569377e7d0 fixed second bible when using Keep to create multiple bible verses in one service item 2010-08-03 12:46:12 +02:00
Tim Bentley
7152d60a16 Fix up for alerts. 2010-08-03 06:15:50 +01:00
Tim Bentley
9539e5b2a6 Head986 2010-08-03 05:56:33 +01:00
Tim Bentley
bdda14740b More changes 2010-08-03 05:56:21 +01:00
Andreas Preikschat
778388b2ae search result are dependent (in regard to 2nd bible) 2010-08-02 22:03:20 +02:00
Tim Bentley
197fe4cb08 Fix song usage 
Fix 598407

bzr-revno: 986
Fixes: https://launchpad.net/bugs/598407
 2010-08-02 20:32:40 +01:00
Tim Bentley
9bdc7db801 Fixes 2010-08-02 20:23:39 +01:00
Andreas Preikschat
06752ffa66 show both bible versions in the title 2010-08-02 21:11:05 +02:00
Tim Bentley
39be81f8b2 Fix bug #598407 2010-08-02 20:08:55 +01:00
Tim Bentley
9da35664bb Fix up songusage 2010-08-02 20:05:40 +01:00
Tim Bentley
929b36705a Remove blank lines 2010-08-02 18:56:50 +01:00
Tim Bentley
4e0a3ca40b Fix song usage missing code 2010-08-02 18:51:44 +01:00
Jon Tibble
3ce079240f Work with SQLAlchemy 0.6 
bzr-revno: 985
Fixes: https://launchpad.net/bugs/611889
 2010-08-02 12:59:38 +01:00
Tim Bentley
82aa9c333a Add Volume slider and document APIs 2010-08-02 06:16:07 +01:00
Jon Tibble
72c2336d84 Work with SQLAlchemy 0.6 (Bug #611889) 2010-08-02 03:53:14 +01:00
Tim Bentley
c10fc012a3 Video starts to work 2010-08-01 17:46:24 +01:00
Tim Bentley
992cebb05c Head984 2010-08-01 16:48:26 +01:00
Andreas Preikschat
839d5da3ef Disable buttons when no item to act on 
bzr-revno: 984
 2010-08-01 16:32:09 +01:00
Jon Tibble
41ed61bfe3 Fix previous fix 2010-08-01 15:28:40 +01:00
Tim Bentley
6787a41eae Fix disply settings again - alerts coded 2010-08-01 14:11:54 +01:00
Tim Bentley
047e8efe1f Head982 2010-08-01 09:44:58 +01:00
Jon Tibble
65c95057b7 Fix alerts and screen resizing 
bzr-revno: 982
 2010-08-01 09:35:17 +01:00
Tim Bentley
fb4bd1a8c2 Head981 2010-08-01 09:30:42 +01:00
Tim Bentley
f10e478438 Alert workings 2010-08-01 09:28:31 +01:00
Jon Tibble
4b0093e97b Fix alerts width 2010-07-31 23:23:48 +01:00
Jon Tibble
e815a5ff08 Fix non-updating screen when unchecking override 2010-07-31 22:58:56 +01:00
Andreas Preikschat
23022c095d improved button behaviour 2010-07-31 13:52:17 +02:00
Philip Ridout
f6e91b4198 A very minor presentation fix. About text for remotes was not going on to next line after heading. 
bzr-revno: 981
 2010-07-31 12:57:12 +02:00
Jon Tibble
c9edfb9508 Cleanup QMessageBoxes using defaults 2010-07-31 03:06:44 +01:00
Jon Tibble
8eb7fd4c30 Fix alert form parenting 2010-07-31 01:46:15 +01:00
Jon Tibble
8f0d30c48b Fix plugin forms 2010-07-31 01:34:37 +01:00
Jon Tibble
ab3efd2b3b Fix issues with plugins (inc. bug #605655) 2010-07-31 01:05:27 +01:00
Jon Tibble
ee80308997 Code sorting, refactoring and cleaning 2010-07-30 23:48:09 +01:00
Philip Ridout
a36f922be6 A very minor presentation fix. About text for remotes was not going on to next line after heading. 2010-07-30 23:12:04 +01:00
Tim Bentley
e95ea60d9b Alerts start to work 2010-07-30 20:15:55 +01:00
Tim Bentley
c46dfab8a1 Head979 2010-07-30 19:02:57 +01:00
Tim Bentley
0518f4987a Bibles do not loop 2010-07-30 19:02:03 +01:00
Tim Bentley
50691074b8 Head978 2010-07-30 18:49:55 +01:00
Tim Bentley
f357ed6f84 Cleanups 2010-07-30 18:49:46 +01:00
Tim Bentley
0e7712aecc Code cleanups 2010-07-30 17:36:11 +01:00
Jon Tibble
751d16e2e0 ServiceManager naming 2010-07-30 17:19:32 +01:00
Jon Tibble
003cfd1e68 Fix unused var and standardise loop vars 2010-07-30 17:13:17 +01:00
Jon Tibble
9df8cb11f9 Fix doc text location 2010-07-30 13:04:15 +01:00
Tim Bentley
b191f1391c Fixed shadows and added transitions 2010-07-30 06:08:49 +01:00
Tim Bentley
ee7b50a770 Fix html color location 2010-07-29 18:08:01 +01:00
Jon Tibble
26bae2e35b Fix message parenting 2010-07-29 16:10:40 +01:00
Jon Tibble
7729ba3ced Bible reference error message 2010-07-29 16:04:09 +01:00
Jon Tibble
fc849398a9 Bible reference refactor 2010-07-29 15:36:02 +01:00
Tim Bentley
ee6f6d0618 Code cleanups and add text colouring for songs etc 2010-07-29 06:05:04 +01:00
Tim Bentley
625e652fcc Line height 2010-07-28 21:29:01 +01:00
Tim Bentley
b7c241cf36 Outline works - Irsh shadow 2010-07-28 18:21:32 +01:00
Tim Bentley
ca0c98e72e Head974 2010-07-28 17:58:34 +01:00
Tim Bentley
353f2c97be Outline changes 2010-07-28 17:53:54 +01:00
Jon Tibble
8838e9563e Naming cleanup fixes 2010-07-28 14:36:29 +01:00
Jon Tibble
c099e6f808 Naming cleanup 2010-07-28 14:32:12 +01:00
Jon Tibble
2bd442ff4f More naming cleanup 2010-07-28 14:15:39 +01:00
Jon Tibble
3b5c29dc07 Missing space 2010-07-28 13:44:33 +01:00
Jon Tibble
b350356c35 Head r976 2010-07-28 12:52:36 +01:00
Philip Ridout
51f47d206d Moved loop settings to a more appropriate tab, removed image tab as a result. 
bzr-revno: 976
 2010-07-28 12:01:01 +02:00
Philip Ridout
a35fac56da Fix for bug #609442. 
bzr-revno: 975
 2010-07-28 11:58:11 +02:00
Philip Ridout
73650e6536 Moved loop delay on to the general tab from the image tab, as it was being used in songs and custom slides as well. 
Deleted image tab, as the loop delay was the only setting on it!
 2010-07-27 21:35:50 +01:00
Tim Bentley
b66287f822 Fix alignment 2010-07-27 20:13:56 +01:00
Tim Bentley
44fd8f31e0 Head974 2010-07-27 19:54:53 +01:00
Tim Bentley
059af571c0 Alerts part 1 2010-07-27 19:42:53 +01:00
Philip Ridout
2b9bc517ae Removal of comment 2010-07-27 17:14:11 +01:00
Jon Tibble
db87a9e7dd Exception handling fixes in bible import 2010-07-27 16:07:00 +01:00
Jon Tibble
dfcd2f6293 Explicit exception handling 
bzr-revno: 974
 2010-07-27 16:01:06 +01:00
Jon Tibble
d0fa9228a8 Head r972 2010-07-27 13:56:03 +01:00
Jon Tibble
cc38e0f367 Explicit exception catching 2010-07-27 13:54:26 +01:00
Jon Tibble
c3594624d3 ServiceNote, Settings & ThemeManager naming 2010-07-27 13:18:10 +01:00
Jon Tibble
62be523f10 PluginForm naming 2010-07-27 12:57:25 +01:00
Jon Tibble
88be71f625 Missing bits 2010-07-27 12:42:38 +01:00
Jon Tibble
9482b40b8c EditCustom & SongUsage naming 2010-07-27 12:21:11 +01:00
Jon Tibble
7f6920e220 Missed a few bits 2010-07-27 11:46:39 +01:00
Jon Tibble
41eaa2cd29 AmendTheme naming and missed trailing new line 2010-07-27 11:20:20 +01:00
Jon Tibble
37b2304eeb Trailing new lines 2010-07-27 10:32:52 +01:00
Jon Tibble
c2ee4e842b ServiceItemEditDialog naming 2010-07-27 09:22:01 +01:00
Jon Tibble
468ab12ffc GeneralTab naming 2010-07-27 08:48:23 +01:00
Jon Tibble
5ae5a5d63f Fix showing screen after black and cleanups 
bzr-revno: 972
 2010-07-27 07:58:35 +01:00
Raoul Snyman
6abb0c7cc3 Fixed a small bug where there was a "u" in the verse label with () brackets. 
bzr-revno: 971
 2010-07-27 07:31:35 +02:00
Jon Tibble
16924808bd Fixes and cleanups 2010-07-26 21:31:05 +01:00
Philip Ridout
4344751198 self.screens.display, is always true, no matter which mode you use (single or dual screen) 
self.screens.current['primary'] is true, in single screen mode, or when the operator screen is also used as the main display!
 2010-07-26 21:14:11 +01:00
Tim Bentley
271a5f598f Head970 2010-07-26 17:42:36 +01:00
Tim Bentley
2cde65ba70 html cleanup - text over video works 2010-07-26 17:42:19 +01:00
Tim Bentley
82acc32b78 Theme editing now works again 2010-07-26 16:51:18 +01:00
Jon Tibble
21eca36576 Fix last commit 2010-07-26 16:48:54 +01:00
Jon Tibble
37d2e910b7 Long lines 2010-07-26 16:19:11 +01:00
Raoul Snyman
2ef095dd98 Fixed a small bug where there was a "u" in the verse label with () brackets. 2010-07-26 08:06:17 +02:00
Jon Tibble
96033624aa Head r968 2010-07-25 12:47:53 +01:00
Tim Bentley
fbe647b896 Head968 2010-07-25 10:03:01 +01:00
Tim Bentley
ede8ae6f09 Theme updates 2010-07-25 09:58:08 +01:00
Tim Bentley
5814a491c7 Add display update trigger missed in cleanup 
bzr-revno: 968
 2010-07-25 09:54:58 +01:00
Raoul Snyman
f6c5a9788c Update the copyright notice and the credits. 
bzr-revno: 967
 2010-07-25 10:21:02 +02:00
Tim Bentley
6421e18bba Themes editing now displays 2010-07-25 08:21:10 +01:00
Tim Bentley
9efad8da66 Head966 - and fix mediaitem 2010-07-25 07:21:29 +01:00
Tim Bentley
8a96d7f87f Fix word uage 2010-07-25 07:14:45 +01:00
Tim Bentley
e4350e982f Head966 2010-07-25 07:12:13 +01:00
Jon Tibble
69ffb9124e Fix some pesky bits 2010-07-25 00:12:36 +01:00
Raoul Snyman
da018275af A few more credits. 2010-07-25 00:45:48 +02:00
Raoul Snyman
7303f1de05 Add a few folks to the about dialog. 2010-07-25 00:13:21 +02:00
Raoul Snyman
2f2b339863 Update the copyright notice. 2010-07-25 00:10:47 +02:00
Raoul Snyman
81441f3e79 Remove some unused imports. 
Remove an unused variable.
Fix up a couple of strings I missed in the previous string fix merge.
 2010-07-24 23:20:02 +02:00
Jon Tibble
6e6d44710f Head r965 2010-07-24 22:03:58 +01:00
Jon Tibble
7df342ff1a Fix bible search strictness for web bibles 2010-07-24 21:52:37 +01:00
Raoul Snyman
d29ffb72c5 Going through all the strings and making them decent, user-friendly English. 
bzr-revno: 965
 2010-07-24 22:34:16 +02:00
Tim Bentley
3801a80d7d Head 964 2010-07-24 20:27:48 +01:00
Tim Bentley
9a519f2ff0 Fix missing code from previous merge 2010-07-24 20:27:25 +01:00
Tim Bentley
4165b94d22 Fix screen size bug and screen changing 2010-07-24 20:19:33 +01:00
Tim Bentley
ec788f33c9 Head964 2010-07-24 17:56:02 +01:00
Tim Bentley
63b4696621 Cleanups and ratio changes 2010-07-24 17:55:06 +01:00
Jon Tibble
87fc38fb6f Head r964 and book spelling 2010-07-24 17:54:55 +01:00
Jon Tibble
3ea6ce9520 Use urllib.urlencode() 2010-07-24 15:03:04 +01:00
Jon Tibble
4b5ad13eec Fix numbered book BG bibles 2010-07-24 13:59:02 +01:00
Philip Ridout
5c6f7da055 Hopefully a fix for bug #609442 2010-07-24 11:44:28 +01:00
Jon Tibble
8004bc4c18 Import fix for last commit 2010-07-24 03:19:24 +01:00
Jon Tibble
323090e141 Bible search fixes (Bug #608409) 2010-07-24 03:14:08 +01:00
Jon Tibble
ccda22a962 Fix BG refactor 2010-07-24 02:10:57 +01:00
Raoul Snyman
651ee535f6 Hopefully the last of the string fixes. 2010-07-23 21:17:36 +02:00
Raoul Snyman
3c303365b1 HEAD 2010-07-23 20:07:27 +02:00
Raoul Snyman
2b7d7f3ba5 More string updating. 2010-07-23 20:03:19 +02:00
Jon Tibble
c8c65120cf Head r963 2010-07-23 17:33:03 +01:00
Jon Tibble
9b425cb52d Fix BibleGateway refactor 2010-07-23 17:21:27 +01:00
Jon Tibble
1ea37f8d77 Cleanup refactor 2010-07-23 16:25:54 +01:00
Jon Tibble
c1ddaa2dd1 DocStrings 
bzr-revno: 963
 2010-07-23 12:17:18 +01:00
Raoul Snyman
60e1c7002e More string fixes. 2010-07-23 11:01:17 +02:00
Raoul Snyman
ea0997c6e0 Tweak the display of the media manager items to make them stand out slightly more. 
bzr-revno: 962
 2010-07-23 10:35:54 +02:00
Tim Bentley
b76a946bff Head961 2010-07-23 06:06:42 +01:00
Tim Bentley
8219a9c222 Code Cleanup 2010-07-23 06:05:34 +01:00
Jon Tibble
e9edb0c7a4 Refactor BibleGateway retrieval 2010-07-23 03:19:35 +01:00
Jon Tibble
b5ceb59e27 Cleanup getters and setters 2010-07-23 01:01:06 +01:00
Jon Tibble
150968dd05 Head r961 2010-07-22 23:54:23 +01:00
Raoul Snyman
f3b44b40be Some newlines to make Jon T happy. 2010-07-22 22:01:03 +02:00
Raoul Snyman
306a403195 Another tweak for Windows. 2010-07-22 21:55:09 +02:00
Raoul Snyman
4263d541dc Minor tweak to make the active tab's text bold in Windows. 2010-07-22 21:30:16 +02:00
Raoul Snyman
b0ad5ea1cd Merge from HEAD, plus Jon T's suggested changes. 2010-07-22 20:25:25 +02:00
Tim Bentley
4761589d0c Head960 2010-07-22 19:09:35 +01:00
Tim Bentley
047cc6205a HTML - sort of fixes 2010-07-22 19:04:48 +01:00
Jonathan Corwin
efdc2bcb0d Presentations no longer startup blanked 2010-07-22 08:32:55 +01:00
Jonathan Corwin
d628956c1a Bug 608149 - Enable presentation controllers by default, and simplify default workflow 
bzr-revno: 960
 2010-07-22 08:00:32 +01:00
Raoul Snyman
2c7fcef2af More string updated. 2010-07-22 08:02:31 +02:00
Raoul Snyman
935d6602e5 HEAD 2010-07-22 07:26:19 +02:00
Jon Tibble
d232133b35 Remove wildcard import 2010-07-22 01:39:00 +01:00
Jon Tibble
d2372850e4 DocStrings 2010-07-22 01:28:56 +01:00
Jonathan Corwin
475bab8215 [Bug 608149] [NEW] Presentations are not intuitive 2010-07-21 23:46:25 +01:00
Jon Tibble
5178172c80 Importer fix 
bzr-revno: 959
 2010-07-21 23:42:17 +01:00
Raoul Snyman
5665e2af94 HEAD 2010-07-21 23:36:31 +02:00
Raoul Snyman
d105ee8dfb Playing some more with the tabs of the media manager. 2010-07-21 23:27:36 +02:00
Tim Bentley
225ef69b0d Head 2010-07-21 21:07:51 +01:00
Jon Tibble
66fcf1db40 Another importer fix 2010-07-21 14:41:10 +01:00
Andreas Preikschat
5b0ca457a1 Fix song authors and books 
bzr-revno: 958
 2010-07-21 14:31:25 +01:00
andreas
c4a59586a6 improvement + fix 2010-07-21 15:13:03 +02:00
Jon Tibble
d368f15713 Import fix 2010-07-21 13:28:41 +01:00
Jon Tibble
cf02c71001 Fix v2 song DB importing 2010-07-21 13:11:32 +01:00
andreas
2691636e71 fixed Song Book publisher 
fixed Authors like "0123hallo" which cannot be splitted
 2010-07-21 12:30:29 +02:00
Jon Tibble
42619d455b deleteTheme cleanups 2010-07-21 10:52:00 +01:00
Raoul Snyman
2efb7cd34a Update more strings, and just tweak the display of the remotes plugin settings tab. 2010-07-21 08:24:32 +02:00
Raoul Snyman
33fa1541a7 HEAD 2010-07-21 07:20:30 +02:00
Raoul Snyman
7ec7235676 Updated more strings and things. 2010-07-21 07:20:03 +02:00
Jon Tibble
db025be243 Do not rename when name has not changed 2010-07-21 02:34:27 +01:00
Jon Tibble
5bb55fb63e Form parent cleanup 2010-07-21 01:36:15 +01:00
Raoul Snyman
9c5e9f1443 Some tweaks to the display of the media items. 2010-07-20 23:27:21 +02:00
Jon Tibble
3560277684 Cleanups 2010-07-20 21:43:42 +01:00
Tim Bentley
85c40e4e16 Head956 2010-07-20 21:17:12 +01:00
Jon Tibble
425b80d57a DATABASE SCHEMA CHANGE, fixes and cleanups 
bzr-revno: 956
 2010-07-20 20:46:04 +01:00
Jon Tibble
ee4802735d Fix topic/author adding (Bug #607034) 
bzr-revno: 955
 2010-07-20 18:03:04 +01:00
andreas
99fc77d4dc head953 2010-07-20 18:45:45 +02:00
Jon Tibble
cb431fea2a Fix song object creation (Bug #607034) 2010-07-20 16:22:05 +01:00
Jon Tibble
cb17897d47 Media rather than Audio 2010-07-20 13:43:21 +01:00
Jon Tibble
1738040b87 Save Song Book (Bug #607030) 2010-07-20 12:02:03 +01:00
Jon Tibble
a4bbb0ef28 Clarify import type 2010-07-20 10:21:15 +01:00
Jon Tibble
11c90c3eb7 Fix song book form ampersands 2010-07-20 09:37:15 +01:00
Jon Tibble
7e623ea226 OpenLP v2 song DB importer 2010-07-20 09:33:22 +01:00
Tim Bentley
e31a039568 Head952 and cleanups 2010-07-20 06:16:06 +01:00
Tim Bentley
77fbd8ce3d Cleanups - remove more old code 2010-07-20 06:01:40 +01:00
Raoul Snyman
71ee0eff8c HEAD 2010-07-20 06:58:20 +02:00
Raoul Snyman
35bcb8eabd HEAD 2010-07-20 06:58:01 +02:00
Jon Tibble
80eb8e36af Import fix 2010-07-19 21:48:10 +01:00
Jon Tibble
42cff45762 Complete refactor for new code 2010-07-19 21:45:53 +01:00
Jon Tibble
7691418bc3 Head r952 and cleanups 2010-07-19 21:43:02 +01:00
Andreas Preikschat
a266a54641 Cleanups and song data merging 
bzr-revno: 952
 2010-07-19 21:30:45 +01:00
Tim Bentley
c5e8a4cdab Tidy up image background workflow and make it work 2010-07-19 21:05:25 +01:00
Martin Thompson
acb9cca5d3 Missed a rename 2010-07-19 20:35:33 +01:00
andreas
978372ca9f added check preventing adding a topic/author twice to the song 2010-07-19 20:34:03 +02:00
Tim Bentley
50aea9128d Footers now 2010-07-19 19:03:00 +01:00
Jon Tibble
86ad4b1071 Fix DB definition ordering 2010-07-19 16:39:42 +01:00
andreas
6eb260a64e fix 2010-07-19 17:03:49 +02:00
andreas
dd662dc277 now filtering songs 2010-07-19 16:56:24 +02:00
andreas
a21154addc names 2010-07-19 15:39:18 +02:00
Jon Tibble
9e2b876be3 Add audio files to DB 2010-07-19 13:18:56 +01:00
andreas
30cbaafb09 fixed comment 2010-07-19 12:17:41 +02:00
andreas
3502149556 reworked code 2010-07-19 10:50:44 +02:00
Jon Tibble
dd8c6f378b Fix alt title field 2010-07-19 09:50:16 +01:00
andreas
1a462e1a65 reverted changes 2010-07-19 09:54:57 +02:00
andreas
6ab287cfaa reverted changes 2010-07-19 09:54:22 +02:00
andreas
2009e95ff0 head 2010-07-19 09:51:20 +02:00
Jon Tibble
f71f27c890 Database refactor 2010-07-19 00:37:24 +01:00
Martin Thompson
cd7f0167a1 Merged from trunk - handle lack of getters/setters in songimport through direct attribute use 2010-07-18 20:44:49 +01:00
Martin Thompson
168aeea3e1 Tweaks from review 2010-07-18 20:27:27 +01:00
Tim Bentley
bf0dad308f More cleanups - page break bibles 2010-07-18 20:04:12 +01:00
Tim Bentley
44592ae579 Html cleanups 2010-07-18 19:01:35 +01:00
Jon Tibble
bf71742308 Head r950 2010-07-18 15:36:59 +01:00
Tim Bentley
ea2d0cdb72 Preview Works 2010-07-18 15:08:17 +01:00
Billy Lange
7e12cda88f Add confirm before theme delete 
bzr-revno: 950
 2010-07-18 08:07:01 +01:00
Billy Lange
ca1d6c8675 Fixed spaces 2010-07-17 21:53:17 +02:00
Jon Tibble
f757117771 Fixes and cleanups 
bzr-revno: 949
 2010-07-17 19:47:55 +01:00
Jon Tibble
f964c5d1ce Add alternate_title field 2010-07-17 18:36:03 +01:00
andreas
d0e914a681 name standardisation + reloads song list after author(s) have been edited/merged 2010-07-17 18:03:59 +02:00
andreas
c7f32e280c docs 2010-07-17 17:10:46 +02:00
andreas
f458f80ce2 added check to prevent an author/topic being associated (with one song) twice (causing an error) 2010-07-17 17:01:47 +02:00
andreas
dacfe58bea continued working on 'merging' song books, topics, authors (still not finished) 2010-07-17 13:49:54 +02:00
Tim Bentley
0d7f81c020 Live display for Images 2010-07-17 12:00:36 +01:00
Tim Bentley
996f779602 Text and Previews for Live 2010-07-17 11:25:52 +01:00
andreas
94660ee798 continued working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-17 11:55:48 +02:00
andreas
b844687abd head947 2010-07-17 11:27:45 +02:00
Tim Bentley
f45625ac92 Head 2010-07-17 09:59:29 +01:00
Tim Bentley
443ff3fecd More refactoring and improvements 2010-07-17 09:59:15 +01:00
Tim Bentley
885e5d8ea2 Fix bug #606437 2010-07-17 07:04:52 +01:00
Jon Tibble
096e0e8b61 Fixes and cleanups 2010-07-16 23:36:53 +01:00
Jon Tibble
c7904f613e Fix set_last_dir call 2010-07-16 22:32:36 +01:00
Jon Tibble
c7a8bbee8b More getters and setters 2010-07-16 22:26:57 +01:00
Jon Tibble
5097cbaf9c Start cleaning getters and setters 2010-07-16 22:06:10 +01:00
Jon Tibble
65d5f89302 Fix English and alignment 2010-07-16 19:53:49 +01:00
andreas
1f3656f792 continued working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 20:20:18 +02:00
Jon Tibble
e83cb035ac Tab Order and Theme fix (Bug #606256) 
bzr-revno: 946
 2010-07-16 17:43:02 +01:00
andreas
fedde147ae started working on 'merging' song books, topics, authors (NOT finished yet) 2010-07-16 18:39:18 +02:00
Tim Bentley
53c6e93d08 Fix conflict in head945 2010-07-16 17:03:00 +01:00
andreas
e11ebea963 error messages changes 2010-07-16 15:22:53 +02:00
Jon Tibble
897929967a Add Theme fix and form tab ordering 2010-07-16 13:31:47 +01:00
Jon Tibble
d04a09f317 Use populate() for DB objects 
bzr-revno: 945
 2010-07-16 12:50:37 +01:00
andreas
84416b0bdc head944 2010-07-16 11:25:01 +02:00
andreas
1050e216e1 comment cleanup 2010-07-16 11:19:02 +02:00
andreas
0c03809526 comment cleanup 2010-07-16 11:16:40 +02:00
andreas
853ae906d3 reverted changed done before we official changed line length from 79 to 80 2010-07-16 11:09:11 +02:00
andreas
eaf2f568f4 error messages added 2010-07-16 11:00:20 +02:00
Philip Ridout
b410590267 Sorted out the show/hide desktop. 
bzr-revno: 944
 2010-07-16 07:23:14 +02:00
Jon Tibble
96ed86a13a Use populate() for DB objects 2010-07-15 23:45:55 +01:00
Martin Thompson
059032f237 Changed internal 'song' attribute to clearer 'song_import'. OpenSong themes now map to Topics. Text cleaning called 2010-07-15 21:29:24 +01:00
Martin Thompson
bb34a304a9 Tweaked Topics handler 2010-07-15 21:27:44 +01:00
Martin Thompson
294a02af45 Renamed back and fixed a couple of = signs 2010-07-15 21:26:57 +01:00
Phill Ridout
42d627ec5b Extra line removed 2010-07-15 19:07:23 +01:00
Billy Lange
d1c41fae7a Confirm deletion of theme 2010-07-15 18:36:09 +02:00
andreas
dd2137bf07 fixed import 2010-07-15 11:34:03 +02:00
Jon Tibble
f8ead8e7c8 Fix service save location (Bug #605649) 
bzr-revno: 942
 2010-07-15 09:20:40 +01:00
Raoul Snyman
3838a16fdf Removed the display tab, moved options to general tab, plus some cleanups. 
bzr-revno: 941
 2010-07-15 10:07:48 +02:00
Raoul Snyman
cce709218f Removed comments and now-defunct display tab. 2010-07-15 07:38:23 +02:00
Jon Tibble
c15fb864ec Fix service save location (Bug #605649) 2010-07-15 01:06:20 +01:00
Jon Tibble
afd28025a5 Fix service save icon save method 2010-07-14 23:16:59 +01:00
Raoul Snyman
1d65cc4e6f Renamed "tab_index" to "tabIndex" as well. 2010-07-14 23:28:20 +02:00
Martin Thompson
222f10ba45 Now fixed the trunk merge 2010-07-14 21:52:45 +01:00
Martin Thompson
76a731c725 Merged from trunk 2010-07-14 21:47:40 +01:00
Martin Thompson
490e2451e0 spaces 2010-07-14 21:46:23 +01:00
Martin Thompson
d54770646d Rename cclino to ccli_number and theme to theme_name in all song import related files 2010-07-14 21:38:46 +01:00
Raoul Snyman
dc4f60516f Some modifications to the Configure dialog: 
- Moved single display option to General tab
- Removed Display tab
- Renamed variables to be Qt compliant
 2010-07-14 22:37:54 +02:00
Phill Ridout
484b1c227e Finally got round to sorting out the show/hide desktop. 2010-07-14 21:34:14 +01:00
Martin Thompson
0f4c7276b3 Using new manager 2010-07-14 21:10:27 +01:00
Tim Bentley
366c11e15a More updates 2010-07-14 18:36:48 +01:00
Raoul Snyman
38afbbdd5b HEAD 2010-07-14 17:59:13 +02:00
Raoul Snyman
0cf1acf97b Removed an unnecessary import. 
Fixed margins.
Moved the "display" tab into the general tab.
 2010-07-14 17:58:28 +02:00
Jon Tibble
e1c8aabe0a Fix AdvancedTab layout 2010-07-13 19:45:40 +01:00
Jon Tibble
b5f667fe51 Fix theme editing (Bug #594909 part 1) 
bzr-revno: 938
 2010-07-13 19:32:29 +01:00
Tim Bentley
84792a779a Head 937 2010-07-13 19:16:23 +01:00
Tim Bentley
957e7294c8 Latest changes parked 2010-07-13 18:23:05 +01:00
Jon Tibble
022935fe58 Fix last merge 2010-07-13 17:31:19 +01:00
Jon Tibble
44506f2c84 AdvancedTab: Double click to live 2010-07-13 17:00:33 +01:00
Jon Tibble
9d3085ba6c Head r935 2010-07-12 23:35:28 +01:00
Jon Tibble
02b33ed660 Theme background images (Bug #594911) 2010-07-12 23:32:46 +01:00
Jon Tibble
767214bb13 Proper theme name editing (Bug #594909) 2010-07-12 22:11:00 +01:00
andreas
1031125932 code style 2010-07-12 23:02:06 +02:00
andreas
d4780cb37b code style 2010-07-12 22:56:09 +02:00
Tim Bentley
166fabbd5f Output now on main screen 2010-07-12 20:36:42 +01:00
Tim Bentley
4d69120225 Head 2010-07-12 18:14:04 +01:00
Tim Bentley
a071dcc879 Head 2010-07-12 18:13:59 +01:00
Jon Tibble
a2704186a5 Save current media plugin (Bug #596540) 
bzr-revno: 935
 2010-07-12 17:50:54 +01:00
Tim Bentley
5989140c0d More updates 2010-07-12 17:49:38 +01:00
Andreas Preikschat
13c0496553 Improve song data integrity 
bzr-revno: 934
 2010-07-12 17:48:54 +01:00
Jon Tibble
eac602389c Code layout tweaks 2010-07-12 15:45:55 +01:00
Jon Tibble
46d561b320 Add saving current media plugin (Bug #596540) 2010-07-12 15:32:48 +01:00
andreas
75f9f809a8 use database for checking 2010-07-12 15:18:07 +02:00
Jon Tibble
4bffb39567 Import fixes 2010-07-12 11:59:48 +01:00
Jonathan Corwin
e77d6ec981 Common thumbnails for all presentation types and create when presentation first added 
bzr-revno: 932
 2010-07-12 08:25:17 +01:00
Jonathan Corwin
bff74507d7 Coding standards 2010-07-11 21:53:53 +01:00
Jonathan Corwin
fe5b3e6771 pptview/impress fixes to thumbnails on Windows 2010-07-11 21:22:53 +01:00
Tim Bentley
19400843d4 Renderer replacement- text now output and pages 2010-07-11 17:02:20 +01:00
Tim Bentley
3d9fca212f Renderer replacement- text now outputs 2010-07-11 16:53:40 +01:00
andreas
488ead8162 cleanup 2010-07-11 15:23:12 +02:00
Tim Bentley
f3b4a1dae5 Renderer replacement- display splash now. 2010-07-11 13:35:41 +01:00
Tim Bentley
c46901cb8a Renderer replacement- screen fix 2010-07-11 12:38:09 +01:00
Tim Bentley
44ae86e82b Renderer replacement humm 2010-07-11 11:58:36 +01:00
Tim Bentley
02c0fe9e89 Renderer replacement started 2010-07-11 08:45:49 +01:00
Tim Bentley
1a2dfc863d Head931 2010-07-11 06:41:17 +01:00
Tim Bentley
0bd6d297c7 Add new renderer code 2010-07-11 06:40:56 +01:00
Jonathan Corwin
fb4faf0dbb Powerpoint fix 2010-07-10 23:41:36 +01:00
Jonathan Corwin
08c36f7e1c Got a conflict fix wrong 2010-07-10 23:33:09 +01:00
Jonathan Corwin
968eaad46a Head 2010-07-10 23:28:59 +01:00
Jonathan Corwin
91b3c06849 Missed one 2010-07-10 23:21:50 +01:00
Jonathan Corwin
27bccda0b6 Presentation thumbnail changes 2010-07-10 23:21:14 +01:00
andreas
0623d2bb4e fixes for merge 2010-07-10 23:44:43 +02:00
andreas
931f572a4e spelling mistakes 2010-07-10 23:39:54 +02:00
andreas
ab179f8e12 fixes for merge 2010-07-10 23:26:09 +02:00
andreas
d6fe2d1c9f oppps... spelling 2010-07-10 20:19:54 +02:00
andreas
639ce2bfbc fixed double whitespace 2010-07-10 19:30:01 +02:00
andreas
1b536ab0c8 Books, Topics and Authors redundancy imporvements. 2010-07-10 19:02:42 +02:00
Jon Tibble
4eb067343c Fix mismerge 2010-07-10 11:44:23 +01:00
Jon Tibble
f3a56ecee6 Fix service saving (Bug #603798) 
bzr-revno: 930
 2010-07-10 11:31:36 +01:00
Jon Tibble
4c08162e33 Fix docstring for last commit 2010-07-10 02:21:03 +01:00
Jon Tibble
60b5568979 Fix bug then fix fix! (Bug #603798) 2010-07-10 02:01:14 +01:00
Jon Tibble
9d92f358d4 AdvancedTab: Creation & Recent files 2010-07-09 22:32:32 +01:00
Tim Bentley
9d77444ddf Revert Changes 2010-07-09 21:27:18 +01:00
Tim Bentley
b438cb22a5 Head928 2010-07-09 20:46:40 +01:00
Tim Bentley
341e0a165b Fix bug 594909 2010-07-09 20:46:09 +01:00
Martin Thompson
bd6337af0d Changed opensong import file extension to All files *.* 2010-07-09 19:17:48 +01:00
Martin Thompson
3c21924e03 Fixed some coding stds. HAndles unnumbered choruses etc by putting a '1' on the end. Strip out page and column breaks. Theme and CCLI no currently not imported correctly 2010-07-09 19:08:03 +01:00
Jon Tibble
f1f5a61ef6 build_icon fixes 2010-07-09 12:26:31 +01:00
Jon Tibble
520d0ea36f Head r926 2010-07-08 14:50:06 +01:00
andreas
1ef947c4fc name fix 2010-07-08 14:38:48 +02:00
andreas
f514bfc1ba coding standard fixes 2010-07-08 14:32:09 +02:00
Jon Tibble
7a65d5ff08 Fix build_icon patch 2010-07-08 13:25:17 +01:00
andreas
f09843e55b import menu fixes 2010-07-08 14:19:22 +02:00
Jon Tibble
1b9830429b Use build_icon 2010-07-08 12:46:03 +01:00
Jon Tibble
6e57776884 Icons and naming for aboutdialog 2010-07-08 12:24:45 +01:00
Jon Tibble
cea09a4214 Remove dead code 2010-07-08 11:26:52 +01:00
Jon Tibble
a913c47254 Remove initPluginNameVisible hack 2010-07-08 10:14:00 +01:00
Jon Tibble
38977e81ea Cleanups 2010-07-08 09:14:10 +01:00
Martin Thompson
e4b7e23c42 Added test data 2010-07-07 21:18:38 +01:00
Martin Thompson
b04c93e9a7 test theme, alttheme -> our theme 2010-07-07 21:17:58 +01:00
Martin Thompson
860d3e2923 Removed opensong code from songxml 2010-07-07 21:17:16 +01:00
Martin Thompson
b3559a993d test theme, alttheme -> our theme 2010-07-07 21:16:14 +01:00
Martin Thompson
7297248d88 Sets CCLI info 2010-07-07 20:38:23 +01:00
Jon Tibble
88a739c1d5 Head r925 2010-07-07 18:19:31 +01:00
Jon Tibble
19a831d9cf Naming fixes for toolbar and maindisplay 2010-07-07 18:06:31 +01:00
Jon Tibble
cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
andreas
bc15cc8104 -coding standard fixes 2010-07-07 18:00:44 +02:00
andreas
03a3d7b3f5 (small) coding standard fixes 2010-07-07 17:40:17 +02:00
Jon Tibble
961df67a33 Cleanups 2010-07-07 15:44:22 +01:00
Raoul Snyman
167c60345b Updated translation files. 
Fixed a few more strings.
 2010-07-07 14:58:03 +02:00
Jon Tibble
f813c98fdd Refactor view mode code 
bzr-revno: 924
 2010-07-07 10:51:41 +01:00
Jon Tibble
6de04962bd Head r922 2010-07-06 23:30:02 +01:00
Jon Tibble
09fb6e6dda Parent tweaks 2010-07-06 22:59:52 +01:00
Jon Tibble
8de0de9921 Rename methods to better indicate function 2010-07-06 22:23:09 +01:00
Jon Tibble
b225a96d09 Small modes refactoring 2010-07-06 22:18:55 +01:00
Raoul Snyman
9e7f98e33c Fixed a small bug where the item in the menu would remain checked despite the fact that the element on the form was no longer visible. 2010-07-06 22:27:57 +02:00
Raoul Snyman
4c291bbed0 Added View Modes. 2010-07-06 22:05:48 +02:00
Jon Tibble
e85c39e7a5 Head r920 2010-07-06 18:24:20 +01:00
Raoul Snyman
08293786c7 Fix up some strings and come bugs in the alerts plugin. 
bzr-revno: 920
 2010-07-06 19:12:54 +02:00
Raoul Snyman
5c6ab2ee1a Some more fixes. 2010-07-06 17:59:29 +02:00
Raoul Snyman
f1eeaff633 Some more string fixes. 2010-07-06 17:54:15 +02:00
Raoul Snyman
9a46ebca56 More string fixes 2010-07-06 17:44:15 +02:00
Raoul Snyman
0e53994ca6 String fixes. 2010-07-06 17:41:56 +02:00
Raoul Snyman
a167d759a5 String fixes. 2010-07-06 17:40:25 +02:00
Raoul Snyman
419b21a2b1 Fix up some strings and come bugs in the alerts plugin. 2010-07-06 17:26:52 +02:00
Raoul Snyman
33be4fe2f6 HEAD 2010-07-06 16:58:25 +02:00
Jon Tibble
6504d74fa0 Rename CheckedBoxen 2010-07-06 13:58:33 +01:00
Jonathan Corwin
c75d29eaa7 Must get TRB143 a new mop for Christmas 2010-07-05 23:17:14 +01:00
Jon Tibble
d1482d4a60 Fix song saving 
bzr-revno: 917
 2010-07-05 22:49:28 +01:00
Jon Tibble
c8faf0cc08 Fix song saving 2010-07-05 22:23:39 +01:00
Martin Thompson
cfc9c72845 Merged from trunk - updated to lxml 2010-07-05 21:11:13 +01:00
Martin Thompson
ab1f040aaa Working on non-ascii characters in zipfiles 2010-07-05 21:00:05 +01:00
Tim Bentley
667d44eb8c and add_to_list 2010-07-05 17:33:45 +01:00
Tim Bentley
cbe65f921a Head915 2010-07-05 17:01:29 +01:00
Tim Bentley
08f650871a Signature Cleanups 2010-07-05 17:00:48 +01:00
Jon Tibble
4439625013 Fixes and cleanups 2010-07-05 12:39:48 +01:00
Jon Tibble
e2a2500a1a XML: merge song XML handling 2010-07-04 17:40:53 +01:00
Jon Tibble
765cc6ddbe Head r913 2010-07-04 17:15:29 +01:00
Jon Tibble
9910655223 Start customisation 2010-07-04 14:42:01 +01:00
Jon Tibble
46df1164d4 Import fix 
bzr-revno: 913
 2010-07-04 13:02:37 +01:00
Jon Tibble
b7563ae075 Import fix 2010-07-04 00:10:28 +01:00
Jon Tibble
0f53c65f4f Importish fix 2010-07-03 22:52:28 +01:00
Jon Tibble
aa390e9831 Cleanups 2010-07-03 22:50:42 +01:00
Raoul Snyman
0a4c9481bf Add a nice little icon for the plugin list. 2010-07-03 23:07:21 +02:00
Raoul Snyman
3a19271a18 Shuffle the menus. 2010-07-03 22:39:29 +02:00
Phill Ridout
a180c4c321 corrected video tag 2010-07-03 20:45:14 +01:00
Phill Ridout
02f86d0603 hopefully should be go for this one! :-p 2010-07-03 20:02:36 +01:00
Phill Ridout
9b89788b21 removed escapes 2010-07-03 19:55:53 +01:00
Phill Ridout
b58d501e28 removed unecessary escapes! 2010-07-03 19:26:11 +01:00
Jon Tibble
1e4a11f4e5 XML: Objecify it to make it run 2010-07-03 18:46:00 +01:00
Jon Tibble
732bf24ef8 XML: Cleanups 2010-07-03 14:26:29 +01:00
Phill Ridout
2b85659031 Removal of HTMLIMAGE at the request of TRB143 2010-07-03 11:46:13 +01:00
Phill Ridout
5f15b2fd7d added missing </head> 2010-07-03 06:41:24 +01:00
Phill Ridout
fda7412f75 added css to remove white space arround background video 
adjusted spacing, added escapes to double quotes and moved the > on the body tag to its proper place!
 2010-07-03 04:06:02 +01:00
Jon Tibble
497d1c9dc9 XML: Put it where it should be 2010-07-03 02:33:40 +01:00
Jon Tibble
0c184d5e60 Remove some unused methods 2010-07-03 02:07:36 +01:00
Jon Tibble
989ffb9fc5 Head r911 2010-07-03 01:24:17 +01:00
Jonathan Corwin
db961c76db Clean up after TRB143's attempts to outclean Meths 
Fix pptview plugin when running as exe
 2010-07-02 23:18:54 +01:00
Tim Bentley
64de9f1d7a Head909 2010-07-02 19:21:59 +01:00
Tim Bentley
0656b34df9 Cleanups 2010-07-02 19:21:45 +01:00
Andreas Preikschat
f519e037b9 Some random fix ;-) 
bzr-revno: 909
 2010-07-02 19:18:54 +01:00
andreas
c93cad3a20 fixed a small bug 2010-07-02 19:00:23 +02:00
Tim Bentley
603c2e7be2 Head907 2010-07-02 17:54:22 +01:00
Tim Bentley
ecbef6a00b Fix up display layers 2010-07-02 17:54:08 +01:00
Jon Tibble
3447c7fed6 XML: Start refactoring 2010-07-02 15:57:48 +01:00
Jon Tibble
45375e7442 Cleanup plugins (Bug #600996) 2010-07-02 13:13:46 +01:00
Jon Tibble
9e1474e851 Fix songs and wildcard import 2010-07-02 11:29:36 +01:00
Tim Bentley
e3e6c82eac Fix up display levels and renames 2010-07-02 06:16:30 +01:00
Tim Bentley
c892f9b38f Fix up transitions so they work 2010-07-02 05:36:13 +01:00
Jon Tibble
f67457c378 Revert bug fix 2010-07-01 20:34:48 +01:00
Jon Tibble
d939a39895 Cleanup signals (Bug #599146) 2010-07-01 16:46:51 +01:00
Jon Tibble
254ac02561 Alerts: Import and long lines 2010-07-01 13:56:02 +01:00
Jon Tibble
c61121bb51 DB cleanups 2010-07-01 11:31:37 +01:00
Jon Tibble
079d72f93f Database refactoring 2010-06-30 23:05:51 +01:00
Martin Thompson
38ccc21f89 Added GUI for importing OpenSong 2010-06-30 22:19:18 +01:00
Martin Thompson
02fd6fe4da Main class handles zipfiles 2010-06-30 21:05:43 +01:00
Martin Thompson
94553048e3 Merged from trunk 2010-06-30 20:54:30 +01:00
Martin Thompson
7ce01d0e65 Moved test scripts and data to a test folder 2010-06-30 20:53:08 +01:00
Raoul Snyman
eda9093064 Change namespace of other plugin icons and make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 
bzr-revno: 903
 2010-06-30 21:29:08 +02:00
Raoul Snyman
6038d46a56 Make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure. 2010-06-30 20:36:57 +02:00
Raoul Snyman
568e80748c Change namespace of other plugin icons. 2010-06-30 20:16:07 +02:00
Tim Bentley
9ebdc1e2d3 Update missing checks 2010-06-30 18:05:12 +01:00
Tim Bentley
8b5931d50c Video and Image updates 2010-06-30 17:30:25 +01:00
Tim Bentley
6cd1e520a1 Head 901 2010-06-30 17:11:09 +01:00
Tim Bentley
7198148a48 Replaceable Backgound images now work 2010-06-30 17:10:54 +01:00
Jon Tibble
0359fbbc57 Head r900 2010-06-30 12:59:55 +01:00
Jon Tibble
912516e8f0 Really fix service loading! 2010-06-30 12:59:09 +01:00
Tim Bentley
56e4e38b99 Head900 2010-06-30 05:53:09 +01:00
Tim Bentley
4767ec08a2 Image display refactoring 2010-06-30 05:52:52 +01:00
Raoul Snyman
5c4a835dac Added decent images for remotes, alerts and song usage. 2010-06-29 23:23:56 +02:00
Jon Tibble
0b48e66466 Fix service loading 
bzr-revno: 899
 2010-06-29 17:14:50 +01:00
Jon Tibble
c0a924e304 Fix service loading 2010-06-29 17:07:45 +01:00
Jon Tibble
cede98c0cb Head 897 2010-06-29 16:40:46 +01:00
Jon Tibble
d37b4d1e8d Plugin and other docstrings 2010-06-29 16:25:24 +01:00
Jon Tibble
6235140868 Head r896 2010-06-29 11:04:22 +01:00
Jon Tibble
0b8e4f2845 Fix filter usage (Fixes theme deletion) 2010-06-29 11:02:23 +01:00
Jon Tibble
4a4da4ba2c Naming and docstrings 2010-06-29 08:07:03 +01:00
andreas
6d233a75a0 - small fixes 2010-06-28 22:02:56 +02:00
andreas
68a934de71 - small fixes 2010-06-28 22:00:35 +02:00
Martin Thompson
75c6ba2284 Improved =s 2010-06-28 20:55:04 +01:00
andreas
93ae2b9cf8 resolved conflicts 2010-06-28 21:28:28 +02:00
Tim Bentley
ebb368559f Head894 2010-06-28 20:14:31 +01:00
Jon Tibble
19ff5dec55 Refactor database code 
bzr-revno: 894
 2010-06-28 20:12:08 +01:00
andreas
51e07d66df fixed deletion bug in media manager (custom, media, images, presentations) 2010-06-28 21:05:55 +02:00
andreas
eccd2999ee started fixing deletion bug in media manager (custom still to be done) 2010-06-28 20:20:05 +02:00
Tim Bentley
fd09e3d5a0 Tidy up loop icons 2010-06-28 18:54:29 +01:00
Tim Bentley
109ef118c4 Head893 2010-06-28 17:48:36 +01:00
Tim Bentley
eafdf71e5c Fix up screen blanking and videos 2010-06-28 17:48:21 +01:00
andreas
5de4832ae7 changed the variable name 2010-06-28 18:23:59 +02:00
andreas
4f05a42627 fixed bug #599066 2010-06-28 17:43:40 +02:00
Jon Tibble
3be57e57e7 Rename method to save_object() 2010-06-28 14:38:29 +01:00
Jon Tibble
f0896422d4 Fix off-by-one in song saving 2010-06-28 13:43:14 +01:00
Jon Tibble
ad9328a30f RFC: Fix couple of leftovers 2010-06-28 12:24:18 +01:00
Jon Tibble
6c182ef70b Head r892 2010-06-28 11:48:58 +01:00
Jonathan Corwin
b9896bb915 Trap presentation errors when OpenOffice.org is not installed 
bzr-revno: 892
 2010-06-28 07:35:06 +01:00
Jonathan Corwin
9a2b05f830 Prevent crash if OpenOffice not installed on Windows 2010-06-27 23:34:33 +01:00
Raoul Snyman
b188592c32 Fixed up problems with version checking. 2010-06-27 14:49:01 +02:00
Tim Bentley
5ba7febc3b Video cleanups for display 2010-06-27 08:19:34 +01:00
Jonathan Corwin
7cf31532b8 Remove error trace if no impress 2010-06-26 21:34:26 +01:00
andreas
9c4f565776 fixed double spaces 2010-06-26 18:13:52 +02:00
andreas
696c413cee Improved delete button behaviour 2010-06-26 18:08:38 +02:00
Tim Bentley
4b38c22d30 Alerts now work and more hiding cleanups 2010-06-26 15:13:10 +01:00
Jonathan Corwin
d4b70b34e7 sofimport error trap if ooo not installed 2010-06-26 12:16:59 +01:00
Tim Bentley
d82f94e326 Refactor Alert code for Html 2010-06-26 09:09:09 +01:00
Tim Bentley
b59b2bdafa Fix bug #596541 hide theme combo for global themes 2010-06-26 08:19:30 +01:00
Tim Bentley
4820d5d15f Head 2010-06-26 07:24:53 +01:00
Tim Bentley
90cf4428c4 Hide buttons to menu part 1 2010-06-26 07:24:38 +01:00
Tim Bentley
89ccc8f390 Head 2010-06-25 21:44:21 +01:00
Tim Bentley
780e45891c More fixes 2010-06-25 21:44:13 +01:00
Jonathan Corwin
e5da1cb5f9 head 2010-06-25 21:21:40 +01:00
Jonathan Corwin
217b40c26f Bug 598361 - Preview presentation error. Ensure presentations close correctly 2010-06-25 21:20:03 +01:00
Jon Tibble
4d1a7e8b41 Cleanup last few commits 2010-06-25 20:01:03 +01:00
andreas
5135706761 ListWidget usability improvement 
bzr-revno: 886
 2010-06-25 19:38:16 +01:00
Jon Tibble
51ca897c77 Docstrings 
bzr-revno: 885
 2010-06-25 19:34:36 +01:00
Martin Thompson
baec9d5c2f Unicode chars in my testcase work OK 2010-06-25 19:20:45 +01:00
andreas
1800ae4ddb improvement in regard to bug #598415 2010-06-25 20:18:52 +02:00
Jon Tibble
f5a8a846b7 Head r883 2010-06-25 19:16:39 +01:00
Jon Tibble
01421770ed Head r883 2010-06-25 19:14:38 +01:00
Tim Bentley
72ef67512c Head883 2010-06-25 17:50:49 +01:00
Tim Bentley
7c873ada58 Fix bug #598415 2010-06-25 17:50:35 +01:00
Frode Woldsund
4807fed62e Fixed (c) symbol. 
bzr-revno: 883
 2010-06-25 16:28:55 +02:00
Frode Woldsund
5c5427d963 Merged with current trunk and used '\xa9' as (c) symbol 2010-06-25 10:07:51 +02:00
Raoul Snyman
0034691bd0 pptviewlib changes 2010-06-25 07:22:58 +02:00
Tim Bentley
4be942efe3 Head 2010-06-25 06:11:01 +01:00
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +01:00
Jon Tibble
3cee3f0f8e Fix grammo 2010-06-25 01:25:21 +01:00
Jon Tibble
6798f3402c Head r881 2010-06-25 01:24:56 +01:00
Jonathan Corwin
adb5776d61 pptviewlib changes 
bzr-revno: 881
 2010-06-24 22:01:57 +01:00
Raoul Snyman
ae17e3b6b3 Some more OOo related fixes. 2010-06-24 22:48:38 +02:00
Jonathan Corwin
a23a354532 pptviewlib.dll 2010-06-24 21:25:35 +01:00
Jonathan Corwin
6f525dc0c2 Presentation tidies 
bzr-revno: 880
 2010-06-24 21:16:34 +01:00
Martin Thompson
76e3538127 Imports all of SOF and the opensong default songs without crashing 2010-06-24 21:13:32 +01:00
Jon Tibble
95945c622f Fix check_item_selection 
bzr-revno: 879
 2010-06-24 21:05:04 +01:00
Jonathan Corwin
1ea6d1da50 Merge excepts together (again) 2010-06-24 20:58:45 +01:00
Raoul Snyman
10663be6bc Fix bug #595676i, improve the OSIS importer and add source languages from Pootle. 
bzr-revno: 878
 2010-06-24 21:46:53 +02:00
Jonathan Corwin
84b7a4f4ad head 2010-06-24 20:43:06 +01:00
Jonathan Corwin
30f8441ce9 Merge excepts together 2010-06-24 20:42:15 +01:00
Raoul Snyman
9dc12ac522 Try to fix the song plugin's dependence on OOo. 2010-06-24 21:40:41 +02:00
Jon Tibble
78b1c8d1af Do the fix properly 2010-06-24 20:36:33 +01:00
Raoul Snyman
e29127477e Merge from trunk. 2010-06-24 21:18:50 +02:00
Jon Tibble
b402cc5639 Fix check_item_selection 2010-06-24 20:04:18 +01:00
Raoul Snyman
aa2d1586ea Fix bug #595676 and improve the OSIS importer. 2010-06-24 20:35:01 +02:00
Jon Tibble
4ac7ce16c0 Ampersands and item selection checking 
bzr-revno: 877
 2010-06-24 19:16:43 +01:00
Tim Bentley
b4626d80eb Screen sizes now work 2010-06-24 19:06:34 +01:00
Jon Tibble
2c42aa0289 Refactor check_item_selected 2010-06-24 16:50:40 +01:00
Jon Tibble
ca7f3eb599 Fix and add some ampersands 2010-06-24 16:28:42 +01:00
Jonathan Corwin
bbf5ecf0fc Head 2010-06-23 23:30:15 +01:00
Jonathan Corwin
fe01718d46 Presentation tidyups 2010-06-23 23:26:54 +01:00
Tim Bentley
da5ff6c3db Update version numbers and white space 2010-06-23 18:37:01 +01:00
Frode Woldsund
56f87c3a35 Fixed (c) symbol 2010-06-23 15:39:36 +02:00
Frode Woldsund
07db3c4c21 removed u' 2010-06-23 09:22:05 +02:00
Frode Woldsund
4826408536 stupid whitespace ... 2010-06-23 09:05:43 +02:00
Frode Woldsund
b95b598340 Forgot to import translate from openlp.core.lib :( 2010-06-23 08:54:11 +02:00
Tim Bentley
d2af535c70 Start to clean up display code. 
Make Video Hide / Reappear
Add Audio player to play audio with no display
Replace Labels with QGraphicXXXXItems
 2010-06-23 06:13:32 +01:00
Martin Thompson
f7b8095f68 Handles [1] type verse numbering, parses all of SOF and Songs.zip 2010-06-22 22:54:10 +01:00
Frode Woldsund
683a53c594 Fixed 2 translate() functions in songplugin 2010-06-22 23:53:18 +02:00