raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
3,615 Commits 5 Branches 0 Tags 296 MiB
28d3544964
Commit Graph

2899 Commits

Author SHA1 Message Date
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