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

2150 Commits

Author SHA1 Message Date
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
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
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
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
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
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
b350356c35 Head r976 2010-07-28 12:52:36 +01: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
44fd8f31e0 Head974 2010-07-27 19:54:53 +01:00
Tim Bentley
059af571c0 Alerts part 1 2010-07-27 19:42:53 +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
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
37b2304eeb Trailing new lines 2010-07-27 10:32:52 +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
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
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
Raoul Snyman
f6c5a9788c Update the copyright notice and the credits. 
bzr-revno: 967
 2010-07-25 10:21:02 +02:00
Tim Bentley
9efad8da66 Head966 - and fix mediaitem 2010-07-25 07:21:29 +01:00
Jon Tibble
69ffb9124e Fix some pesky bits 2010-07-25 00:12:36 +01: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
ec788f33c9 Head964 2010-07-24 17:56:02 +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
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
Tim Bentley
b76a946bff Head961 2010-07-23 06:06:42 +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
Tim Bentley
4761589d0c Head960 2010-07-22 19:09:35 +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
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
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
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
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
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
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
Jon Tibble
bf71742308 Head r950 2010-07-18 15:36:59 +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
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
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
andreas
84416b0bdc head944 2010-07-16 11:25:01 +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
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
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
Martin Thompson
0f4c7276b3 Using new manager 2010-07-14 21:10:27 +01:00
Jon Tibble
b5f667fe51 Fix theme editing (Bug #594909 part 1) 
bzr-revno: 938
 2010-07-13 19:32:29 +01:00
Jon Tibble
767214bb13 Proper theme name editing (Bug #594909) 2010-07-12 22:11:00 +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
Andreas Preikschat
13c0496553 Improve song data integrity 
bzr-revno: 934
 2010-07-12 17:48:54 +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
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
andreas
488ead8162 cleanup 2010-07-11 15:23:12 +02: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
60b5568979 Fix bug then fix fix! (Bug #603798) 2010-07-10 02:01:14 +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
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
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
cde04a9218 Naming fixes for mediamanageritem 2010-07-07 17:03:30 +01:00
Raoul Snyman
167c60345b Updated translation files. 
Fixed a few more strings.
 2010-07-07 14:58:03 +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
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
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
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
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
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
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
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
7198148a48 Replaceable Backgound images now work 2010-06-30 17:10:54 +01:00
Raoul Snyman
5c4a835dac Added decent images for remotes, alerts and song usage. 2010-06-29 23:23:56 +02: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
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
109ef118c4 Head893 2010-06-28 17:48:36 +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
9a2b05f830 Prevent crash if OpenOffice not installed on Windows 2010-06-27 23:34:33 +01:00
Jonathan Corwin
7cf31532b8 Remove error trace if no impress 2010-06-26 21:34:26 +01: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
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
Martin Thompson
baec9d5c2f Unicode chars in my testcase work OK 2010-06-25 19:20:45 +01:00
Jon Tibble
01421770ed Head r883 2010-06-25 19:14:38 +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
Jon Tibble
585ffbdc6d Head r881 2010-06-25 01:30:26 +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
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
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
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
Martin Thompson
9c573d7bef Handles [C] followed by non-numbered lines, by assigned them all to [C1] 2010-06-22 22:24:24 +01:00
Martin Thompson
e8a397d3ec Handles songs without a preliminary V tag 2010-06-22 21:41:31 +01:00
Jon Tibble
d9d976d64b Cleanup and import fix 2010-06-22 16:09:49 +01:00
Jon Tibble
43a4eaed96 Head r872 2010-06-22 15:34:03 +01:00
Jon Tibble
70df49476d Long lines 2010-06-22 00:38:54 +01:00
Jon Tibble
1cf85205ce More translate() 2010-06-21 22:04:56 +01:00
Jon Tibble
2a71670149 Stray trailing backslashes 2010-06-21 21:52:25 +01:00
Tim Bentley
a4d7ae1600 Final extermination of translate u"s 2010-06-21 19:28:36 +01:00
Raoul Snyman
c8bbd65349 Updated the majority of the translate() functions. 
bzr-revno: 866
 2010-06-21 20:00:21 +02:00
Raoul Snyman
74767e3874 Merge from trunk 2010-06-21 18:47:34 +02:00
Raoul Snyman
6c1b5a6fad Updated the majority of the translate() functions. 
Removed .qm files.
Ignore .qm files.
 2010-06-21 18:43:59 +02:00
Tim Bentley
b08707cc80 Head864 2010-06-21 17:21:00 +01:00
Tim Bentley
af5ae6047a Fix bug with Inactive not working 2010-06-21 17:20:41 +01:00
Jon Tibble
e7b4e16405 Couple o' Cleanups 2010-06-20 14:03:06 +01:00
Jon Tibble
700b41390e Head r863 2010-06-20 13:43:09 +01:00
M2j
888bc50622 fixes 2010-06-20 08:48:32 +02:00
M2j
8e25f3850e corrected one string 2010-06-20 01:58:42 +02:00
M2j
87c21201e7 HEAD 2010-06-20 01:31:32 +02:00
M2j
3061c319d5 Automatic verse order entry expanding 
deleted a misplaced QSpacerItem
 2010-06-20 01:16:15 +02:00
Jon Tibble
afefd3c45f Head r861 2010-06-20 00:12:00 +01:00
M2j
735ae40996 single character verse entries 2010-06-19 23:54:53 +02:00
Jon Tibble
e3a07c1e57 Cleanups 2010-06-19 21:21:36 +01:00
Raoul Snyman
d321249366 Removed unnecessary comments. 2010-06-19 20:38:17 +02:00
Jon Tibble
1005a3c1b1 Cleanup unneeded trailing backslashes 2010-06-19 19:29:18 +01:00
Raoul Snyman
38255ffdb6 Merge from trunk 2010-06-19 20:03:21 +02:00
Raoul Snyman
e615401007 Make image formats filter in a central location. 2010-06-19 20:00:50 +02:00
Jon Tibble
91c0fcb9e7 Head r860 2010-06-19 18:30:41 +01:00
Jon Tibble
0235f251bf Cleanups 2010-06-19 14:18:38 +01:00
Jon Tibble
2d050b07db Head r858 2010-06-19 12:53:20 +01:00
Jon Tibble
14cafa91c2 Complete openlp.migration removal 
bzr-revno: 858
 2010-06-19 12:42:33 +01:00
Tim Bentley
0a3bf10fb9 Translation updates 
Remove Text over video for now.
Fix song editing bug

bzr-revno: 856
Fixes: https://launchpad.net/bugs/596211
 2010-06-19 12:02:18 +01:00
Tim Bentley
cf73f77e0d Fix bug #596211 2010-06-19 11:37:58 +01:00
Tim Bentley
18a32a2217 Remove Media dynamic backgrounds for now. 
Clean up Media, Image and Custom translate strings
 2010-06-19 04:43:10 +01:00
Jon Tibble
f7fb45e69e Complete openlp.migration removal 2010-06-18 23:13:10 +01:00
Raoul Snyman
a616a7d160 - Fixed a problem where authors with null names in the db were not editable. 
- Fixed the add author shortcut on the edit song form to split up the author's name so that the above error doesn't occur.
- Made the Clear Search button run a blank search (which is what the user expects).
 2010-06-19 00:09:41 +02:00
Raoul Snyman
d48daa2c98 Added last bits of streamlining of Song Maintenance form. 2010-06-18 21:55:45 +02:00
Raoul Snyman
cc2db3a5f4 Merge from trunk 2010-06-18 18:44:10 +02:00
Jon Tibble
226277e55d Head r852 2010-06-18 12:57:50 +01:00
Tim Bentley
d143b197a3 Head851 2010-06-18 06:59:31 +01:00
Tim Bentley
e4f77dbacb Bug fixes 2010-06-18 06:58:40 +01:00
Jon Tibble
7f88043177 RFC: Cleanups 2010-06-18 02:26:01 +01:00
Jon Tibble
5dc87d3ede Cleanups 2010-06-17 22:07:01 +01:00
Jon Tibble
16ab2da4d6 Fix HTTPBible verse counts 2010-06-17 22:01:30 +01:00
Jon Tibble
d395438173 Head r851 2010-06-17 18:00:14 +01:00
Jon Tibble
1af5f700e2 Bible search fix 
Edit and Delete feedback for Media Manager Items
Fix Bible Import Wizard setField errors
Fix addToServiceItem locations
Remove unused scripts/get-strings.py

bzr-revno: 850
 2010-06-17 15:06:47 +01:00
Frode Woldsund
d5bd675489 Complete trUtf8 -> translate conversion 
bzr-revno: 849
 2010-06-17 15:03:10 +01:00
Frode Woldsund
7c6b5c0b99 translate(pluginName.pluginName) -> translate(pluginName) and removed some spaces 2010-06-17 14:02:18 +02:00
Jon Tibble
9d9464aee5 Head r848 2010-06-17 12:45:45 +01:00
Jon Tibble
4683e20860 Fix addToServiceItem location 2010-06-17 02:56:05 +01:00
Frode Woldsund
cc7b6a9ec3 Merged whit current trunk 2010-06-17 00:14:46 +02:00
Jonathan Corwin
674b9e00ad Remove the main display so we can see the ppt's 2010-06-16 22:22:02 +01:00
Jonathan Corwin
62376aa93d Head 2010-06-16 21:54:41 +01:00
Jon Tibble
04f2a9797b Bible search fix: 
* Add feedback
* cater for partial file-based bibles
* Prevent an uncaught exception
 2010-06-16 02:48:52 +01:00
Jon Tibble
5e0ab4a7f6 Fix lack of feedback for edit and delete 2010-06-16 02:23:57 +01:00
Jon Tibble
814a4f023d Fix Bible Import setField errors 2010-06-16 01:31:44 +01:00
Martin Thompson
fc27f8107e First test looks promsing 2010-06-15 22:25:50 +01:00
Martin Thompson
2f077c3982 Renamed so as not to conflict with the Pthon XML library which is still used by the Song XML class 2010-06-15 22:24:49 +01:00
Martin Thompson
f709c90f0a Start opensong importer 2010-06-15 21:03:47 +01:00
Jon Tibble
b7e3ec4441 RFC: Refactor a filter method 2010-06-15 19:08:02 +01:00
Jon Tibble
37dd8888ca Head r847 2010-06-15 16:43:52 +01:00
Jon Tibble
85661fe6e4 RFC: Tweaks 2010-06-15 16:42:52 +01:00
Meinert Jordan
48619f72cc Various i18n fixes. 
bzr-revno: 847
 2010-06-15 17:22:26 +02:00
Jon Tibble
e92b017348 RFC PT4: The other DB plugins 2010-06-15 03:08:22 +01:00
Jon Tibble
554ab59caf RFC PT3: Bibles 2010-06-15 01:44:06 +01:00
Jonathan Corwin
f2a0fb9f29 Well at least you can open a presentation now. Can't see it yet though cos of some silly black window in the way 2010-06-14 23:01:04 +01:00
Jonathan Corwin
89e78b6528 Head 2010-06-14 22:12:22 +01:00
Jonathan Corwin
b6057c0156 resize thumbs 2010-06-14 21:59:07 +01:00
Jon Tibble
e71caf43e7 Head r846 2010-06-14 19:22:08 +01:00
Jon Tibble
7c2c8f26e1 Revert resource location 2010-06-14 18:56:42 +01:00
Jon Tibble
754da4c28e Fix PEBKAC 2010-06-14 14:43:04 +01:00
Jon Tibble
a4f0df76cc Fix QColorDialog usage 2010-06-14 14:23:19 +01:00
Frode Woldsund
e94bba463b The translate() function is a static method. Fixed. 2010-06-14 14:24:30 +02:00
Frode Woldsund
7b43146421 merged with current trunk 2010-06-14 08:38:51 +02:00
Jon Tibble
0558900951 Head r843 2010-06-14 03:48:12 +01:00
Jon Tibble
f54a423832 Fix bible runtime data location 2010-06-14 03:42:47 +01:00
Raoul Snyman
b5aa2f86f9 Added in dynamic adding of authors and topics to the song edit form. 2010-06-13 22:29:47 +02:00
Raoul Snyman
4af5e1d8ef Tidied up the UI of the Song Maintenance Dialog to make it look good on all OSes. 2010-06-13 20:28:59 +02:00
Jon Tibble
54aa8958fe RFC PT2: Refactor Manager 2010-06-13 00:00:14 +01:00
Jon Tibble
ec4d54e66a Fix variable naming 2010-06-12 21:22:58 +01:00
Jon Tibble
e70ad3ca90 addToServiceItem is not an Icon 2010-06-12 21:22:20 +01:00
Jon Tibble
999df4e296 Fix db settings location 2010-06-12 21:06:01 +01:00
Jon Tibble
13c646153f Keep library classes/methods in lib dirs 2010-06-12 13:33:04 +01:00
Jon Tibble
5f2042168d RFC: Cleanup DB metadata for RFC 2010-06-12 03:14:18 +01:00
Jon Tibble
55f6197212 RFC: Refactor database setup code 
A possible way to refactor database code to remove code duplication and,
I hope, provide a simpler, more intuitive model to be copied by others
 2010-06-12 02:52:04 +01:00
M2j
96415d47a4 revert change in verse ordering 2010-06-11 19:07:33 +02:00
Jon Tibble
914a710f95 More docstrings 2010-06-10 22:30:50 +01:00
Jon Tibble
78114b8063 Apply docstrings feedback 2010-06-10 20:45:02 +01:00
Jon Tibble
7ddaff2843 Head r839 2010-06-10 17:36:49 +01:00
M2j
69c6e0ef02 use filesystem char encoding for file operations 2010-06-10 16:42:55 +02:00
Jon Tibble
5868a37018 Small refactorings 2010-06-10 14:28:41 +01:00
Jon Tibble
31c3be39e4 Remove old song import/export forms 2010-06-10 14:18:08 +01:00
M2j
2dac357fa7 HEAD 2010-06-10 15:17:39 +02:00
Jon Tibble
3a7ca9a185 Fix module name thinkos 2010-06-10 14:12:19 +01:00
M2j
f8580333bd realized too late, that you may not test for NoneType 2010-06-10 11:10:54 +02:00
M2j
0229b362af phrase verse index decoding more pythonish 2010-06-10 11:05:56 +02:00
Jon Tibble
8d059fb84e Add DocStrings 2010-06-10 02:57:59 +01:00
M2j
50f123490f fix: verses in comboBox of editverseform 2010-06-09 23:50:55 +02:00
M2j
8296b8dc84 Additional translatable strings 
Removed string_to_unicode and variant_to_unicode
 2010-06-09 23:15:37 +02:00
M2j
940c6fd44f Set theme and service file content to UTF-8 
Replaced replaced all non-ASCII chars in the sources (exept of comments)
Fixed theme background images bug
 2010-06-09 21:10:57 +02:00
M2j
8733ceac70 HEAD 2010-06-09 20:33:47 +02:00
Jon Tibble
0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01:00
Frode Woldsund
f5b02659b6 Replaces missed trUtf8('...') -> translate(u'PluginName.ClassName', '...') 2010-06-09 13:11:01 +02:00
Jon Tibble
559e4c4d63 Cleanups 2010-06-08 16:38:09 +01:00
M2j
62d7649e2b reenable verses without number in the verse order 2010-06-08 15:47:23 +02:00
Frode Woldsund
2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
M2j
69b98a44e8 fix for image names 2010-06-07 11:37:27 +02:00
M2j
d7a84fb592 derive captable image formats from Qt 2010-06-07 01:40:24 +02:00
M2j
69608de08c fix: bug introduced in 833 2010-06-07 01:23:29 +02:00
Frode Woldsund
23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
M2j
761f30ec00 fix: set editverseform comboBox only for valid verse names 2010-06-06 21:56:41 +02:00
Tim Bentley
b624ba0ed0 Fixed for now - could be better 2010-06-06 18:03:48 +01:00
Tim Bentley
950dc73d2b try again and fix from last merge 2010-06-06 17:25:39 +01:00
Tim Bentley
cb35fb7be4 Head832 + fix 2010-06-06 16:59:01 +01:00
Frode Woldsund
6e1ef3cc70 Fixed translate() function in songsPlugin and songusagePlugin 2010-06-06 16:22:00 +02:00
Frode Woldsund
5e64814133 Fixed translate() function in RemotePlugin 2010-06-06 15:44:07 +02:00
Frode Woldsund
3c096b4d0a Fixed translate() function in PresentationPlugin 2010-06-06 15:42:24 +02:00
Frode Woldsund
4571e808ba Fixed translate() function in MediaPlugin 2010-06-06 15:30:57 +02:00
Frode Woldsund
febb743acd Fixed all translate() function in ImagePlugin 2010-06-06 15:26:42 +02:00
Tim Bentley
0e5450f9d1 Fix tag error 2010-06-06 13:39:13 +01:00
Frode Woldsund
0788937721 Fixed translate() function in BiblesPlugin 2010-06-06 13:49:39 +02:00
Frode Woldsund
2c1f1f9455 Fixed translate() funtion in alertsplugin 2010-06-06 13:34:35 +02:00
M2j
604a6d0c77 identify button from object name 
revert some only cosmetic changes
 2010-06-06 12:15:12 +02:00
Frode Woldsund
dc35faf1ae Fixed all errors from the feedback I got from IRC 2010-06-06 12:07:48 +02:00
Tim Bentley
4714502f67 Clean up song imports 2010-06-06 08:28:07 +01:00
Tim Bentley
e06556489e Finish converting tags 2010-06-06 07:40:08 +01:00
M2j
5a238e663b string recoding cleanups 2010-06-06 01:05:53 +02:00
Tim Bentley
3bfa515c12 Verse Translations part 2 - fixed 2010-06-05 21:12:13 +01:00
Tim Bentley
af3932f182 Verse Translations part 2 - revised 2010-06-05 21:00:50 +01:00
Tim Bentley
9d4cb86a6e Verse Translations part 1 2010-06-05 18:48:26 +01:00
Tim Bentley
8da2167ebe Live generation cleaned up 2010-06-05 17:06:39 +01:00
Tim Bentley
7bf8e71acf Song editing cleaned up 2010-06-05 16:46:14 +01:00
Tim Bentley
c022e6a89f Fix cursor position 2010-06-05 15:29:06 +01:00
Tim Bentley
4b0dc2a83f Head831 2010-06-05 14:28:53 +01:00
Tim Bentley
2143a24182 tidy ups 2010-06-05 14:28:34 +01:00
M2j
262d125b00 HEAD 2010-06-03 12:28:54 +02:00
M2j
ffcdddf928 fixing string encoding in songmaintenanceform 
making verses w/o index a alias for the first one
 2010-06-02 17:33:55 +02:00
Jon Tibble
08f0c1ff49 Cleanup including diff check fixes 2010-06-01 18:13:54 +01:00
Jon Tibble
bea44a5124 Fix __init__ calling and imports 2010-06-01 01:05:05 +01:00
Jon Tibble
83354166da Whitespace and unused variable 2010-06-01 00:23:08 +01:00
Frode Woldsund
3be909c5c0 Replaced { self.trUtf8() } with { translate() } which is the new standar. I also imported the translate library on the following files. I did not remove any import sinse I do not know how this { self.trUtf8() } does work. 2010-06-01 00:06:16 +02:00
Raoul Snyman
07d402ee59 Fix the alerts not being sent. 2010-05-31 22:07:27 +02:00
Raoul Snyman
b5af6bb5b9 - Improve HTML 
- Improve layout
- Pull JavaScript and CSS out into their own files.
- Add jQuery
- jQuery-fy JavaScript.
 2010-05-30 20:01:17 +02:00
Jon Tibble
4a4bf00140 Head r829 2010-05-30 16:26:45 +01:00
Raoul Snyman
7c47e24cf0 Fixed up json import. 
Started JavaScript framework.
Started implementing Service Management.
 2010-05-30 00:28:28 +02:00
Jon Tibble
dcd5b62524 Fix redefinition of init_models() 2010-05-29 22:28:40 +01:00
Raoul Snyman
0b8d8b8832 HEAD. 2010-05-29 23:25:43 +02:00
Jon Tibble
fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble
f41cadd17b CONSTANTS and an exception 2010-05-28 16:01:50 +01:00
Jon Tibble
bbcfd7729c Refactor BaseModel 2010-05-28 01:26:49 +01:00
Jon Tibble
85b5437f80 Head r827 2010-05-28 01:20:50 +01:00
Jon Tibble
d33a719172 Imports for declared exceptions 2010-05-27 21:56:34 +01:00
Raoul Snyman
2ddde15875 Moved Jonathan's JS over to jQuery 2010-05-27 21:40:44 +02:00
andreas
039792104b - again changes done to the bible footer 2010-05-27 18:58:00 +02:00
andreas
dfd53e5628 - footer now displays both bible versions/copyright information (dual bible view) 
- small fix
 2010-05-27 18:13:25 +02:00
Jon Tibble
4616bbcb36 Explicitly declare exceptions 2010-05-27 17:00:51 +01:00
Tim Bentley
fbbcdc20da Head826 2010-05-27 16:58:04 +01:00
Jon Tibble
dc96d471e6 Variable cleanup 2010-05-27 15:41:47 +01:00
Tim Bentley
7443c4af72 Head 2010-05-26 18:38:04 +01:00
Tim Bentley
9032935219 Fix tags 2010-05-26 18:36:06 +01:00
Jon Tibble
15038a9184 More cleanups 2010-05-26 16:52:33 +01:00
Jon Tibble
e195f0ffb7 Match method and overridden method arguments and cleanups 2010-05-26 00:47:26 +01:00
Jon Tibble
f0c03ad2cb Cleanups 2010-05-26 00:07:50 +01:00
Jon Tibble
871640c374 Whitespace 2010-05-25 17:16:43 +01:00
Jon Tibble
e29f3d30c0 Remove unnecessary semicolons 2010-05-25 16:35:34 +01:00
Jon Tibble
29cfcee29f Fix undefined variables 2010-05-25 16:04:37 +01:00
Jon Tibble
c7d420d4b9 Fix class defs and name redefinitions 2010-05-25 15:30:34 +01:00
Jon Tibble
14307fcc8a Fix indentation 2010-05-25 01:48:42 +01:00
Jon Tibble
122756eca5 Fix indentations 2010-05-24 23:37:20 +01:00
Tim Bentley
f6d7743905 Fix memory leak and improve slide controller tags 
bzr-revno: 823
 2010-05-24 19:04:22 +01:00
Tim Bentley
f7987501b9 Stop memory growth, improve verse display 2010-05-23 08:03:28 +01:00
Jon Tibble
3e9176d8c9 Head r820 2010-05-20 22:02:53 +01:00
Jon Tibble
c8b6a3640d Import fixes 2010-05-20 17:49:47 +01:00
Jon Tibble
1ee3ccd180 Head r819 2010-05-20 17:47:24 +01:00
Jon Tibble
1609f589e4 Some head 2010-05-20 17:46:53 +01:00
Tim Bentley
38290cb804 Head819 2010-05-20 17:43:18 +01:00
Tim Bentley
cd8f59c7d0 Remove extra blank line 2010-05-20 17:40:56 +01:00
Raoul Snyman
28a403bd07 Some other minor touchups. 2010-05-18 23:32:58 +02:00
Raoul Snyman
304aed1c1e Fixed up problems with adding and removing songs from the service manager. 2010-05-18 23:18:52 +02:00
Tim Bentley
0dfda8ff27 Finish tagging the songs 2010-05-18 20:29:40 +01:00
Raoul Snyman
09bcb066eb HEAD+fixes 2010-05-17 22:48:16 +02:00
Tim Bentley
d86f0285c9 Song Edit tableisation 2010-05-17 19:39:28 +01:00
andreas@andypc
005dccb5d8 Fix bug in bibles with 2 bible displays 
bzr-revno: 817
 2010-05-16 16:24:16 +01:00
andreas
bfb3143cfc fix for empty slide in dual bible view 2010-05-15 21:59:21 +02:00
Jon Tibble
ed233039ad Head r814 2010-05-11 17:41:19 +01:00
rimach
16b202d8b5 Head 2010-05-10 22:44:38 +02:00
Martin Thompson
a8a7e675a4 Updated from review comments 2010-05-09 21:02:38 +01:00
rimach
ae36bc2bb9 Head 2010-05-09 10:47:57 +02:00
Martin Thompson
efa1e8c2d9 Quick fix to handle Bible config gets confused and returns None 2010-05-07 21:29:21 +01:00
Jon Tibble
dfb02e4996 Head r812 2010-05-07 01:21:03 +01:00
Martin Thompson
d04d75ad41 More changes to suit pyqt4.4 2010-05-06 21:41:42 +01:00
Martin Thompson
c613773bfb Merged trunk 2010-05-06 21:30:23 +01:00
Martin Thompson
dbdf681165 More changes to suit pyqt4.4 2010-05-06 21:30:08 +01:00
Tim Bentley
6c9c9848db Clean up fixes 2010-05-06 17:49:12 +01:00
Jon Tibble
33198ad86e Head r811 and trivialities 2010-05-06 03:02:19 +01:00
Tim Bentley
0e7fb1c80c minor errors 2010-05-05 20:21:05 +01:00
Tim Bentley
fd22b01e59 Head811 2010-05-05 20:15:09 +01:00
Tim Bentley
27a963a9c2 Validate Service item viewer loading 2010-05-05 20:14:48 +01:00
Jonathan Corwin
3f569d428d Remotes: support more filetypes and subfolders for web 
presentation_hide signal support

bzr-revno: 811
 2010-05-05 19:29:08 +01:00
Tim Bentley
a8bbd540d4 service loading prefix check 2010-05-05 19:07:57 +01:00
Tim Bentley
e1f97fc9b9 Fix initial display 2010-05-05 18:35:11 +01:00
rimach
4661756d68 Head 2010-05-05 19:09:23 +02:00
Jonathan Corwin
4f8d058928 rename get to send and allow webpages to be served from subfolders 2010-05-04 22:49:02 +01:00
Jon Tibble
a8f2cd2e1f Import fixes 2010-05-04 22:19:40 +01:00
Tim Bentley
e0bfaf07bc Cleanup and finish bits 2010-05-04 21:01:45 +01:00
Raoul Snyman
108d3244c9 Documentation! 
bzr-revno: 810
 2010-05-04 19:53:27 +02:00
Jonathan Corwin
465ce8c7f7 web fixes, allow more file types. Slidecontroller_hide event 2010-05-03 22:49:42 +01:00
rimach
0c061087e9 Head 2010-05-03 22:39:06 +02:00
Tim Bentley
4d9f429ae0 Fix bible spelling in database 
bzr-revno: 809
 2010-05-03 07:12:59 +01:00
Jonathan Corwin
456d35f2d4 Fix image qstring 2010-05-01 23:02:31 +01:00
rimach
850b4a507f correction for last merge proposal 2010-05-01 22:01:32 +02:00
Raoul Snyman
fff2d780eb HEAD 2010-05-01 22:00:01 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Tim Bentley
40ad9729ba Head 807 2010-05-01 14:06:22 +01:00
Tim Bentley
4ffb7d8a18 Fix up drag and Drop for service items 2010-05-01 14:05:17 +01:00
Jonathan Corwin
9ef2b13ad6 comments, update client, load html from disk, blanking 2010-05-01 13:10:48 +01:00
Jonathan Corwin
12810ad34a Head 2010-05-01 09:46:06 +01:00
Jon Tibble
5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
Jon Tibble
b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
rimach
190a6d4819 Head 2010-04-30 22:03:26 +02:00
rimach
faffe729f8 Head 2010-04-30 21:30:50 +02:00
rimach
b74dec5446 update 2010-04-30 21:23:02 +02:00
Tim Bentley
09da62f9cc Text over video 2010-04-30 17:30:25 +01:00
Tim Bentley
932560e81d Fix missing %s 2010-04-30 15:49:27 +01:00
Tim Bentley
61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Tim Bentley
8e630c5adf Fixes 2010-04-30 10:38:17 +01:00
Tim Bentley
591dc07354 Fix up presentations so they work again 2010-04-30 06:50:52 +01:00
Jon Tibble
8d6a624c6c Fix break 2010-04-30 02:43:05 +01:00
Jon Tibble
a582d09752 Make plugin tab file locations consistent 2010-04-30 02:35:41 +01:00
Jon Tibble
22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Jonathan Corwin
72fa923937 update browser if slide changes 2010-04-29 23:52:23 +01:00
Tim Bentley
4e6c56c430 Video clean ups and bug fixes from 800 2010-04-29 21:56:27 +01:00
Jonathan Corwin
f4cc91f529 Show service and song text. Click on service item/song verse to go live 2010-04-28 23:08:37 +01:00
Jonathan Corwin
3d6dc75c23 head 2010-04-28 20:13:48 +01:00
Tim Bentley
b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Tim Bentley
17ee4f00fa remove plugin 2010-04-28 17:41:04 +01:00
Jon Tibble
bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
Jon Tibble
507cd19739 Cleanups and diff reading fixes 2010-04-28 02:28:37 +01:00
Jon Tibble
5a8cd52acf File list refactor 2010-04-28 00:49:21 +01:00
Jon Tibble
c626653092 Fix bible reloading 2010-04-27 23:51:16 +01:00
Jon Tibble
484a76289c Fix presentations a bit more 2010-04-27 23:36:50 +01:00
Jon Tibble
55dd795a45 Unbreak presentations slightly 2010-04-27 22:30:04 +01:00
rimach
181c19d112 futher changes 2010-04-27 22:54:55 +02:00
Tim Bentley
d0c6cf9639 move display to core 2010-04-27 20:59:44 +01:00
Jonathan Corwin
d5df10576e Adding the httpserver.py which contains the functionality might help 2010-04-27 19:39:51 +01:00
Jon Tibble
9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Jonathan Corwin
75829333c0 Control via web 2010-04-26 22:29:40 +01:00
rimach
95a1419d9c Head 2010-04-25 21:29:39 +02:00
Tim Bentley
b0763714c8 Fix up object copy and get to work. 2010-04-24 20:57:29 +01:00
Tim Bentley
d7e060c503 Start to add ability to set display screen size for a session 2010-04-24 19:42:01 +01:00
Jonathan Corwin
80e9f94a52 Basic http support 2010-04-24 14:19:08 +01:00
Tim Bentley
a29ea3f861 Add line spacing adjustment to renderer 
Remove .thumbnail directories
 2010-04-24 08:21:35 +01:00