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

1411 Commits

Author SHA1 Message Date
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
Jon Tibble
b8f940565e Import fixes 2010-04-23 21:39:27 +01:00
Raoul Snyman
e22e76e183 HEAD 2010-04-23 21:20:44 +02:00
Jonathan Corwin
496b7befce head 2010-04-22 22:23:14 +01:00
Jonathan Corwin
fa54f94905 Finish signal refactor 2010-04-22 22:22:09 +01:00
rimach
b83d115738 Copyright character solution 2010-04-22 19:27:26 +02:00
Jonathan Corwin
877af7ea2c More fixes 2010-04-21 22:56:48 +01:00
Jonathan Corwin
68685d1be5 head 2010-04-21 21:26:18 +01:00
Tim Bentley
e6d6541ca2 Presentation Thumbnails 2010-04-21 18:36:29 +01:00
Tim Bentley
88f4abf524 head 2010-04-21 18:22:47 +01:00
Tim Bentley
9d0c1c01f3 Alerts cleanup and fixes 2010-04-21 18:21:56 +01:00
Jonathan Corwin
40e6289102 head 2010-04-20 23:12:04 +01:00
Jonathan Corwin
29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
Jon Tibble
17ec820b79 Import and typo fixes 2010-04-19 19:43:20 +01:00
Tim Bentley
8242bac82f Presentation icons 2010-04-19 19:20:44 +01:00
Tim Bentley
4c8c3b7b1c Head 2010-04-19 17:45:40 +01:00
Tim Bentley
e463e83ed5 Icon fixes 2010-04-19 17:45:13 +01:00
Tim Bentley
884fdc513f Alert manager cleanups 
Improvements in video display

bzr-revno: 796
 2010-04-19 17:34:57 +01:00
Raoul Snyman
b45dcc6b81 Added autocompletion to the topics, songbooks and themes. 2010-04-19 07:31:31 +02:00
Raoul Snyman
7e747f7cc9 Added autocompletion to the Authors combobox. 2010-04-19 07:22:56 +02:00
Tim Bentley
d96126ee55 Head 794 2010-04-17 12:28:23 +01:00
Tim Bentley
dcd48d1042 Clean up alert dialog with new layout 
Alerts over video starting to work 
Fix bug in impress close down
 2010-04-17 08:31:15 +01:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley
3cc600a67b More changes and attempts 2010-04-13 16:53:00 +01:00
Jonathan Corwin
c7c4def38e error trap if no ooo 2010-04-13 08:33:58 +01:00
Jonathan Corwin
14bb4c2edb add missing file 2010-04-12 22:55:59 +01:00
Jonathan Corwin
4e504daa6e head 2010-04-12 22:54:19 +01:00
Jonathan Corwin
e4989f422b tidyups 2010-04-12 22:49:56 +01:00
Jonathan Corwin
578a81236a head 2010-04-12 08:28:30 +01:00
Jonathan Corwin
5371990777 Generic OOo import 2010-04-12 08:22:56 +01:00
Jon Tibble
cbc93259cb Import and line ending fixes 2010-04-11 18:52:51 +01:00
Jon Tibble
3f5ac846f6 Head r791 2010-04-11 18:47:39 +01:00
Tim Bentley
04b63cb20f remove weirdness 2010-04-10 19:11:24 +01:00
Tim Bentley
f99b91509c remove prints 2010-04-10 19:08:03 +01:00
Tim Bentley
76726e263e Head 2010-04-10 16:46:25 +01:00
Tim Bentley
aa7371eabf Fedora fixes 2010-04-09 20:15:26 +01:00
Tim Bentley
141a9b4358 Clean up custom plugin dialog 2010-04-08 20:46:50 +01:00
Tim Bentley
b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley
bc4f31ef93 More fixes and new features 2010-04-08 10:15:40 +01:00
Tim Bentley
cee89eadcd Head 2010-04-08 08:37:18 +01:00
Tim Bentley
150eaf7e56 Video changes and bug fixes part1 2010-04-08 08:37:01 +01:00
Tim Bentley
be7ed23c1d and again 2010-04-07 19:32:54 +01:00
Tim Bentley
abb3827817 Style fixes 2010-04-06 20:16:14 +01:00
Tim Bentley
b51998c760 Replace missing tags 2010-04-06 19:26:25 +01:00
Tim Bentley
04fa7bda1c fix missing method 2010-04-06 19:14:59 +01:00
Tim Bentley
a866b30491 Presentation bug fixes 2010-04-06 18:52:09 +01:00
Tim Bentley
e934c7e623 Compress Impress previews 2010-04-05 12:06:37 +01:00
Tim Bentley
f5a9f9ed89 Update Image thumbnail if original has changed 2010-04-05 09:13:45 +01:00
Tim Bentley
fa8c543556 Clean up Media mediaitem 2010-04-05 08:22:21 +01:00
Tim Bentley
5a3150a063 Fix up plugins for multiple service item generation 2010-04-05 07:45:01 +01:00
Tim Bentley
b17b83bb27 Add multiple songs to service manager 2010-04-04 14:53:39 +01:00
Tim Bentley
1cb25db4e9 Head785 2010-04-04 14:16:14 +01:00
Tim Bentley
5b9229777d fixes 2010-04-04 14:16:01 +01:00
Jonathan Corwin
728c524ff5 fixes 2010-04-04 09:26:53 +01:00
Raoul Snyman
513b7a10b7 Reworked the verse dialog. 2010-04-04 01:00:05 +02:00
Jonathan Corwin
b602dcafe0 A few more tidyups 2010-04-03 23:14:37 +01:00
Jonathan Corwin
3ceb0267e9 cleanups+multi-song delete 2010-04-03 20:17:37 +01:00
Raoul Snyman
646d8a658c A few changes. 2010-04-03 18:43:29 +02:00
Tim Bentley
4eca8e265a Consistancy 2010-04-03 12:59:17 +01:00
Tim Bentley
10c3c54db2 Correct error message 2010-04-03 12:11:57 +01:00
Tim Bentley
89bbdea0b9 Code fixes from last merge and presentation improvements 2010-04-03 09:42:51 +01:00
Tim Bentley
3c2fb96376 File housekeeping all files not touched for over 1 year 2010-04-03 09:10:26 +01:00
Tim Bentley
bd8598a00e Head 782 2010-04-03 09:04:58 +01:00
Tim Bentley
18eb768f2f Sort out multiple Chorus tags 2010-04-03 09:04:41 +01:00
Tim Bentley
66054c44e4 Display handling cleanups and changes to service item flags 
bzr-revno: 783
 2010-04-03 09:03:36 +01:00
Tim Bentley
828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Raoul Snyman
f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Jonathan Corwin
dad04bfd90 SOF fixes+delete all selected songs 2010-04-03 00:24:51 +01:00
Raoul Snyman
20636bf655 Wizard works, though not functional. 2010-04-02 22:03:51 +02:00
Tim Bentley
8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Jonathan Corwin
2cabfc67f3 Hook it all together 2010-04-02 15:10:10 +01:00
Raoul Snyman
21b6bedcb4 First go at the Song Import Wizard. 2010-04-02 14:23:40 +02:00
Jonathan Corwin
1f41039e07 Split song and sof specifics 2010-04-01 22:36:03 +01:00
Jonathan Corwin
949dfd927d head 2010-04-01 08:43:36 +01:00
Jonathan Corwin
33f4bc05f2 tidy 2010-04-01 08:42:42 +01:00
Jonathan Corwin
8d6d2b8272 standalone sof test script 2010-04-01 00:06:57 +01:00
Jon Tibble
d7ef6d5f41 Cleanups 2010-03-28 22:57:54 +01:00
Tim Bentley
afc1fbde17 Remove ...s 2010-03-28 17:11:33 +01:00
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley
68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Raoul Snyman
85d44554b0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

bzr-revno: 775
 2010-03-27 22:19:47 +02:00
Raoul Snyman
d2670b1cb0 Bible fixes: 
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.
 2010-03-27 21:59:35 +02:00
Raoul Snyman
daa42bce71 Fixed the "Bible" item in the "Import" menu. 
bzr-revno: 773
 2010-03-27 19:06:13 +02:00
Raoul Snyman
08ee7be551 Fixed the "Bible" item in the "Import" menu. 2010-03-27 16:53:41 +02:00
Raoul Snyman
abfc977b17 Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX"). 2010-03-27 14:37:21 +02:00
Tim Bentley
8df0053409 Fix Copyrights 2010-03-27 10:12:11 +00:00
Tim Bentley
d2b56fc719 Basic verse counting 2010-03-27 07:16:39 +00:00
Tim Bentley
097a414c59 oops string bug 2010-03-27 07:03:12 +00:00
Tim Bentley
611ae15790 Fix up tag editing 2010-03-27 07:01:50 +00:00
Tim Bentley
b90169a129 Song editing improvements 2010-03-26 21:04:50 +00:00
Raoul Snyman
8f095a2fc5 Fixed a bug with Strongs in CrossWalk. 2010-03-26 22:50:55 +02:00
Tim Bentley
92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley
49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Tim Bentley
463847c61c Correct image override process 2010-03-25 20:24:52 +00:00
Tim Bentley
63aa583942 Images bulk delete if selected 2010-03-25 20:01:15 +00:00
Jonathan Corwin
b490e74012 Start presentation apps in right place 2010-03-24 22:59:05 +00:00
Raoul Snyman
ff215ace3c Fixed two bugs in the web downloads import dealing with non-latin characters. 
bzr-revno: 765
 2010-03-24 23:59:39 +02:00
Raoul Snyman
0b596dab47 Fixed another possible bug. 2010-03-24 23:18:36 +02:00
Raoul Snyman
2eaadffea0 Fixed two bugs in the web downloads import dealing with non-latin characters. 2010-03-24 23:00:43 +02:00
Tim Bentley
a091c8f3b6 Fix Quick bible enter 2010-03-24 19:15:25 +00:00
Tim Bentley
161f7e88bb Head763 2010-03-24 18:59:48 +00:00
Tim Bentley
33d2de6f9b Heads 2010-03-24 18:59:37 +00:00
Jon Tibble
6578fb529e Test tweaks and remove unused variables 2010-03-23 21:51:20 +00:00
Jon Tibble
fd3b17f6fa Head r761 2010-03-23 20:33:17 +00:00
Jonathan Corwin
ab72e7d7cc Close down presentation apps at end correctly 
bzr-revno: 761
 2010-03-23 21:59:32 +02:00
Jon Tibble
fe1755c25f Head r760 2010-03-23 19:56:25 +00:00
Jonathan Corwin
00cb0d1277 Close down presentation apps at end correctly 2010-03-23 19:41:54 +00:00
Raoul Snyman
2c325d718b Changes: 
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
 2010-03-23 21:04:15 +02:00
Jon Tibble
317730be1f Head r759 2010-03-23 15:15:00 +00:00
Jon Tibble
310f790e8e Some head 2010-03-23 15:14:20 +00:00
Raoul Snyman
1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Tim Bentley
fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Raoul Snyman
19c5c07c54 Add Christian and Phill to the credits 
bzr-revno: 755
 2010-03-22 10:37:18 +02:00
Raoul Snyman
ea5ceaf00a Updated copyright. 
Updated credits.
 2010-03-22 01:58:01 +02:00
Raoul Snyman
be598da4f9 Fixed a number of issues in the Bibles: 
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
 2010-03-22 00:16:43 +02:00
Raoul Snyman
12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02:00
Jon Tibble
2f840944e9 Unused variable fixes 2010-03-21 15:55:45 +00:00
Raoul Snyman
82a6bc791f Bug fixes for the Bible imports. 
bzr-revno: 751
 2010-03-21 17:11:37 +02:00
Raoul Snyman
253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02:00
Tim Bentley
848eb601af Fix NONE appearing as song verses 
Delay the hidden window display
Fix missing add status for custom slides
 2010-03-21 14:24:41 +00:00
Raoul Snyman
eddd112811 Failed Bibles are deleted. 2010-03-20 00:08:06 +02:00
Tim Bentley
b011104deb Head747 2010-03-19 08:07:12 +00:00
Raoul Snyman
2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02:00
Tim Bentley
44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman
6414330b2c Reworked the BibleGateway Bibles. 
Changed some code to be standards compliant.
 2010-03-18 23:36:30 +02:00
Tim Bentley
a71505a10c Bible can add verses to service item 2010-03-17 19:09:09 +00:00
Tim Bentley
13608bedae Alter form removal complete 2010-03-17 19:04:39 +00:00
Jon Tibble
a81c39ca65 Import fix 2010-03-16 21:13:23 +00:00
Tim Bentley
60a3468edb remove alert dialog 2010-03-16 21:03:10 +00:00
Raoul Snyman
dc6c6bec31 - Removed commented code (just for you, TRB143!) 
- Removed any non-alphanumeric character for Bible names, just to be safe, since we don't actually use the filenames anymore.
 2010-03-16 22:43:41 +02:00
Tim Bentley
c1182aa9cc Add maintain menu item 2010-03-16 20:30:33 +00:00
Tim Bentley
de8d0f4d9c Add add to existing service item 2010-03-16 20:22:28 +00:00
Raoul Snyman
9044ed3a4a Fixed a bug where Bible names were being used for file names, and causing issues on various operating systems. 2010-03-16 21:46:19 +02:00
Raoul Snyman
223393e38b Fix a problem introduced per ongeluk. 2010-03-15 21:23:07 +02:00
Raoul Snyman
90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02:00
Raoul Snyman
5d8c1e42ba Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled. 2010-03-14 00:35:17 +02:00
Raoul Snyman
7da00bc26f Attempt to get Bibles to work properly. 
Merge from HEAD
 2010-03-13 23:48:04 +02:00
Tim Bentley
2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Tim Bentley
601abab854 Text string fixes 
bzr-revno: 739
 2010-03-13 13:02:50 +00:00
Tim Bentley
47dc69b194 More text fixes 2010-03-13 08:43:54 +00:00
Raoul Snyman
881c4cea18 Fixed locations to use the AppLocation class. 2010-03-12 23:55:52 +02:00
Tim Bentley
db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Tim Bentley
4c9bd6d34b Fix text 2010-03-12 16:55:01 +00:00
Raoul Snyman
04c1db2033 Merge from head. 2010-03-12 17:42:47 +02:00
Raoul Snyman
00b9305a51 Doing the docstring thing! 2010-03-12 17:41:15 +02:00
Tim Bentley
cd873b9196 add full stops 2010-03-12 07:31:59 +00:00
Tim Bentley
2607d23c00 String more strings and song edit error 2010-03-11 21:01:19 +00:00
Tim Bentley
68287b9604 String fixes 2010-03-11 19:28:49 +00:00
Tim Bentley
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Jonathan Corwin
9308669ec5 Fix issues regarding the blank button for presentations and added methods to extract presentation text and notes for use in the future. 
bzr-revno: 733
 2010-03-11 13:43:22 +02:00
Raoul Snyman
142f679098 Fix "red letter" versions of Crosswalk Bibles. 2010-03-11 08:15:29 +02:00
Jonathan Corwin
bfee664c94 fixes 2010-03-10 23:00:48 +00:00
Jonathan Corwin
1613610853 Good idea to test conflict resolutions before committing 2010-03-10 22:32:27 +00:00
Jonathan Corwin
99a963e509 Head 2010-03-10 22:28:19 +00:00
Jonathan Corwin
d48046c0c3 Blanking issues 2010-03-10 22:24:09 +00:00
Jon Tibble
26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Raoul Snyman
32b267fab9 Windows modifications: 
- Added Windows build files.
- Added Windows installer files.
- Modified the tabs in the media manager to look a little better on both Windows and Linux.
- Windows icon.

bzr-revno: 730
 2010-03-10 07:50:48 +02:00
Raoul Snyman
8e5e1dfc36 Merged from HEAD 2010-03-09 21:58:59 +02:00
Jon Tibble
56d2e30fe6 Head r729 2010-03-09 19:45:13 +00:00
Jon Tibble
e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Jon Tibble
51d95b661c Head r728 and truth test 2010-03-09 19:14:23 +00:00
Tim Bentley
47bf6252bb Head 728 2010-03-09 18:49:28 +00:00
Tim Bentley
0b1ce89017 Fix translation 2010-03-09 18:19:58 +00:00
Raoul Snyman
0ef8005b52 Fixed up some problems and inadvertant bugs from the move to the scripts directory. 2010-03-09 08:07:42 +02:00
Jon Tibble
54c4bc9c19 Head r727 and C style fix 2010-03-08 19:43:37 +00:00
Tim Bentley
6f87c362d1 Use Icon to show we have Notes 2010-03-07 20:45:27 +00:00
Jonathan Corwin
714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Jonathan Corwin
a33a6d53ca coding standards 2010-03-05 22:10:53 +00:00
Jon Tibble
d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Jonathan Corwin
edad400a73 Minor fixes 2010-03-05 19:50:51 +00:00
Jonathan Corwin
851f5a4e47 head 2010-03-05 19:39:30 +00:00
Raoul Snyman
250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Jonathan Corwin
77838615b3 Presentations - close app down correctly, and mode to automatically detect file type 2010-03-05 08:36:32 +00:00
Tim Bentley
9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Jon Tibble
132022205e None tests redux 2010-03-04 18:43:53 +00:00
Jon Tibble
0baa0e6884 Head r721 2010-03-04 18:34:53 +00:00
Tim Bentley
bb0a3f7293 Head 721 2010-03-03 17:51:19 +00:00
Raoul Snyman
98cd78c7b2 Merged to head. 2010-03-03 12:19:01 +02:00
Jonathan Corwin
5863541a61 Split live/preview presentation documents, plus fixes for Windows 
bzr-revno: 720
 2010-03-03 08:28:39 +02:00
Jonathan Corwin
aa5f21b50d Live/Preview presentation changes for Windows 2010-03-02 23:15:13 +00:00
Jonathan Corwin
743ae230a8 Split live/preview presentation documents 2010-03-02 21:01:23 +00:00
Tim Bentley
4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman
024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Raoul Snyman
e37ab565ad A fix to the OSIS importer, and added the version file. 2010-02-28 22:50:14 +02:00
Jon Tibble
0c97973469 Head r718 2010-02-27 19:29:57 +00:00
Tim Bentley
325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble
5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley
065986c33c Automate Media type list from phonon 2010-02-27 14:57:33 +00:00
Tim Bentley
86e03f0c11 Move editing to line 2 2010-02-27 10:10:03 +00:00
Tim Bentley
1979f24502 Fix song editing where text is lost 2010-02-27 09:55:44 +00:00
Tim Bentley
4a83e572e9 Fix bugs in last merge and fix comments 2010-02-27 09:18:26 +00:00
Jon Tibble
80d54dc1be None tests 2010-02-27 00:11:26 +00:00
Jon Tibble
2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Tim Bentley
0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +00:00
Raoul Snyman
2766081522 Merged from trunk. 
Fixed a conflict.
 2010-02-24 21:02:39 +02:00
Raoul Snyman
0ddaa2bf4a Some more visual tweaks. 
Fixes for older versions of PyQt4.
 2010-02-24 20:39:12 +02:00
Tim Bentley
8f985291ac Head 2010-02-23 19:19:22 +00:00
Tim Bentley
8e2efcb183 Fix spelllling 2010-02-23 19:19:06 +00:00
Tim Bentley
60dd3b36cf Fix presentation tab and repaint service item 2010-02-22 06:14:44 +00:00
Jon Tibble
ab43741dcb Head r709 and initial fix for theme importing 2010-02-21 13:20:39 +00:00
Jonathan Corwin
357c1e6a20 A few more small presentation fixes/cosmetics. 
bzr-revno: 708
 2010-02-19 21:38:56 +02:00
Jonathan Corwin
cf62d6187f More presentation fixes/tidies 2010-02-17 22:57:59 +00:00
Tim Bentley
516b05e0ad Fix URF8, copyright and alert error 2010-02-17 20:17:33 +00:00
Jon Tibble
711bd3cf00 Import fixes and copyright insertion 2010-02-17 19:13:04 +00:00
Jon Tibble
60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Jon Tibble
2287db11d7 head 2010-02-17 19:04:53 +00:00
Jonathan Corwin
959c2469a5 Fix PowerPoint and PowerPoint viewer screen lookup 2010-02-16 22:28:35 +00:00
Tim Bentley
0335547d73 Fix SongUsage Dialog so should be complete 
Minor bug fixes discovered and fixed.
Alerts - Major refactor
* Make a plugin
* Move code from maindisplay into plugin
* Add Location , Font size and History option to Font Tab and fix code to use them
* Add button to Alert Tab to allow History to be edited
* Amend Alert screen to be able to use History if option set
* Build screen to allow alerts to be Added / Edited and Deleted.

bzr-revno: 705
 2010-02-16 19:58:10 +00:00
Tim Bentley
04d79f72a1 Fix typos 2010-02-16 18:51:41 +00:00
Tim Bentley
e0b7c54ddc Minor fixes and unicode changes 2010-02-16 18:47:26 +00:00
Tim Bentley
2fefcef09d Alerts editing now work - history and pre determined 2010-02-14 20:19:57 +00:00
Tim Bentley
acc97f3c79 Alerts now have history 2010-02-14 13:27:32 +00:00
Tim Bentley
9c97660b73 Alerts now move between top and bottom 2010-02-13 07:37:03 +00:00
Tim Bentley
973d5e3dd8 Alerts move to top and bottom 2010-02-13 07:30:00 +00:00
Tim Bentley
47a61a6581 Finished moving alert code to plugin structure 2010-02-12 18:42:09 +00:00
Tim Bentley
944f45c8c8 Fix up song usage extract processing 2010-02-11 18:39:28 +00:00
Tim Bentley
edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley
73d6a24792 Add Fontsize and location to alerts settings 2010-02-09 14:56:31 +00:00
Tim Bentley
643801ae05 New alert tag features and song usage dialog 2010-02-09 14:44:36 +00:00
Jon Tibble
8240605839 Head r702 2010-02-09 12:20:56 +00:00
Jon Tibble
6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley
be4c40b401 Cleaner fix 2010-02-09 11:20:19 +00:00
Tim Bentley
fc9b8fcdad fix presentation import values 2010-02-09 08:28:34 +00:00
Tim Bentley
18760262ab Edit Cancel updating song by accident 2010-02-07 20:11:37 +00:00
Tim Bentley
8992f410a5 Bible fixes part 2 2010-02-06 16:51:18 +00:00
Jon Tibble
f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley
f5229ffaa4 Bible fixes 2010-02-06 15:33:23 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman
c1f5a78290 Merge from trunk 2010-02-06 15:39:14 +02:00
Raoul Snyman
bd4d2daa74 Removed now unnecessary file. 2010-02-06 15:23:38 +02:00
Raoul Snyman
f81968e62b Mis-named variable in QuickSearch click. 2010-02-06 15:22:26 +02:00
Raoul Snyman
92ef1f0d57 Fixed multi-verse dual bible. 2010-02-06 15:05:45 +02:00
Raoul Snyman
cf95b81a49 Last few fixes 2010-02-06 12:42:47 +02:00
Tim Bentley
a5dc0bd75d Set plugins up for alpha release 2010-02-06 10:33:33 +00:00
Raoul Snyman
78c525ab76 Moved data for web bibles to am SQLite database. 2010-02-06 12:22:20 +02:00
Tim Bentley
00e84d40f3 Cleanups and fix alerts for Presentations 2010-02-06 08:04:01 +00:00
Raoul Snyman
ce6738a976 Fixed up searching for non-latin characters in Bible book names. 
Removed an annoying exception to do with debug logging.
 2010-02-04 21:34:12 +02:00
Raoul Snyman
e465264630 Standardised manager name to "manager" 2010-02-04 19:38:21 +02:00
Tim Bentley
5838495bb4 Update remote client 2010-02-03 18:53:31 +00:00
Tim Bentley
b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00