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

3190 Commits

Author SHA1 Message Date
Raoul Snyman
0a84fc0bcc Added extra labels to show that an item is disabled. 
Added functionality to the SongFormat class to keep track of availability of importers.
 2010-09-13 23:09:13 +02:00
Martin Thompson
a8dd0f5ddc Merged and fixed importing of 'other' verse types 2010-09-13 21:12:45 +01:00
rimach
8e8a6e42ff Head 2010-09-13 21:08:26 +02:00
Raoul Snyman
a1f7c9c5a0 Various string-related fixes: 
- Removed a bunch of double spaces.
- Renamed the translation files.
- Updated the translation files.
- Fixed up a few widgets.
Also fixed up the layout on the Edit Song form.

bzr-revno: 1030
 2010-09-13 08:17:07 +02:00
Tim Bentley
317a4ea8c6 Fix code so translations can be found 
bzr-revno: 1029
 2010-09-13 07:05:24 +01:00
Raoul Snyman
d4a0171203 HEAD 2010-09-13 07:16:16 +02:00
rimach
9546c338fc Head 2010-09-12 23:03:45 +02:00
rimach
e2c8ee11f2 Fix removing dock with translation 2010-09-12 23:03:16 +02:00
Martin Thompson
062a88e2f2 Better handling of progress bar. Attempt to get 'other' type verses into database 2010-09-12 21:31:23 +01:00
Raoul Snyman
826e366880 Fixes bug #635330 and attempts to fix bug #635338 
bzr-revno: 1028
 2010-09-12 22:25:08 +02:00
Tim Bentley
37aecbefaf Lanugages now work 2010-09-12 10:14:02 +01:00
Jonathan Corwin
15c868568f Head 2010-09-11 22:40:26 +01:00
Jonathan Corwin
0d36cba0bb Video background loop/change 2010-09-11 22:40:14 +01:00
Andreas Preikschat
6654a7993a started to rework bibles (dual/single verses) 2010-09-11 21:36:47 +02:00
Raoul Snyman
4e8f663444 Set the correct default encoding. 
Centralise decoding to a single function.
HEAD
 2010-09-11 21:00:01 +02:00
Raoul Snyman
c1ed2a76e2 Detect v1.0 database at the beginning of the import, not half way through. 
Do some detection of the encoding.
 2010-09-11 20:51:27 +02:00
Tim Bentley
7b46f33cde Space 2010-09-11 16:58:03 +01:00
Tim Bentley
8d51128e0c Fix translation code to find qm files 2010-09-11 15:03:10 +01:00
Tim Bentley
0412fca642 Remove execuitable flag 2010-09-11 13:42:50 +01:00
Tim Bentley
beedfb78e6 Change version checking code 2010-09-11 12:11:19 +01:00
Tim Bentley
36b3446d2c Theme Cleanup up 2010-09-11 07:59:36 +01:00
rimach
d542e2762a hopefully Line ending corrected part3 2010-09-10 21:47:33 +02:00
rimach
5b32a9f6a9 Head 2010-09-10 21:23:20 +02:00
rimach
6d7e7d7ad2 hopefully Line ending corrected and resolve merge conflict, part2 2010-09-10 21:21:14 +02:00
rimach
2b700c481f hopefully Line ending corrected and resolve merge conflict 2010-09-10 20:46:04 +02:00
Jonathan Corwin
02abcf24fc Head 2010-09-10 18:52:22 +01:00
Jonathan Corwin
d549935fa8 Bug 634771 - Check for no recent files 2010-09-10 18:49:22 +01:00
rimach
d4cabf9693 move translations from mediamanager to plugins with dict 2010-09-10 17:50:30 +02:00
rimach
fa328945d3 Head 2010-09-09 23:12:02 +02:00
Jonathan Corwin
81a1cfc815 Tidy up versetag counting 2010-09-09 20:34:45 +01:00
Raoul Snyman
1dcf3a2769 jQuery-fied the JavaScript, made the interface look a little prettier. 
bzr-revno: 1023
 2010-09-09 21:01:23 +02:00
Derek Scotney
198cd94011 All verse types have auto numbering 2010-09-09 20:30:38 +02:00
Derek Scotney
efd4b77ef8 All verse types have auto numbering 2010-09-09 20:30:25 +02:00
Jonathan Corwin
15a155044f Left+Bottom align footer, and prevent wrapping 
bzr-revno: 1021
 2010-09-09 19:05:08 +01:00
Jonathan Corwin
dd2136774b Remove height, so fix actually works 2010-09-09 08:30:14 +01:00
Jonathan Corwin
58dc96b124 Anchor footer from bottom, and prevent footer line wrapping 2010-09-08 22:55:24 +01:00
Raoul Snyman
158c612cf9 Fixed up the styles a little, and sync'ed to HEAD. 2010-09-08 22:38:37 +02:00
Tim Bentley
0eea3f40f3 Head 2010-09-08 20:39:39 +01:00
Tim Bentley
3bfea1c715 Proper fix for 632674 2010-09-08 20:36:39 +01:00
Tim Bentley
472da0cf27 Short term fix for 633354 
Fix display and text bugs

bzr-revno: 1019
Fixes: https://launchpad.net/bugs/594808, https://launchpad.net/bugs/632674
 2010-09-08 20:13:58 +01:00
Raoul Snyman
c2fdb62e74 Added a simple dialog to display any uncaught exceptions. 
bzr-revno: 1018
 2010-09-08 21:06:23 +02:00
rimach
8da2009413 Head 2010-09-08 20:40:19 +02:00
Tim Bentley
ccb75ad3b6 Fix display to work on 1024x768 resolution without nasty slider movements 
Fixes: https://launchpad.net/bugs/594808
 2010-09-08 19:12:16 +01:00
Tim Bentley
b39136782e Quick hack to get songs back 2010-09-08 19:00:48 +01:00
Tim Bentley
cfca50ff25 Fix setText bug when null list item 
Fixes: https://launchpad.net/bugs/632674
 2010-09-08 18:51:19 +01:00
Raoul Snyman
b8893f4ab2 Merge in the openlp.org 1.x importer. 
bzr-revno: 1017
 2010-09-08 06:57:13 +02:00
rimach
8bdedae911 Head 2010-09-07 23:04:13 +02:00
Raoul Snyman
7c2da6e2e3 Added a global exception catcher, so that our poor n00bs can see what happened. 2010-09-07 22:42:33 +02:00
Tim Bentley
1dd5ee185c Fix song editing bug 
bzr-revno: 1016
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 19:41:09 +01:00
Tim Bentley
4c648f142c Fix song editing display bug 
Fixes: https://launchpad.net/bugs/630247
 2010-09-07 17:12:47 +01:00
Raoul Snyman
60fa82b78c Fix bug #598805 2010-09-07 15:23:02 +02:00
Raoul Snyman
f30aecfd46 A couple of bugfixes. 2010-09-07 00:02:48 +02:00
Raoul Snyman
63139e8c3b Just check for the tracks table before importing from it. 2010-09-06 22:41:11 +02:00
Martin Thompson
c25b0aa8ff Test for multi character versetypes 2010-09-06 21:37:22 +01:00
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
rimach
44806ff859 Head 2010-09-05 23:04:25 +02: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
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
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
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