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

2209 Commits

Author SHA1 Message Date
Jon Tibble
33198ad86e Head r811 and trivialities 2010-05-06 03:02:19 +01:00
Martin Thompson
6f8e3f7ea2 Fixed a qt4.5ism 2010-05-05 20:57:20 +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
66ec680e4e remove else from toolbar.py 2010-05-05 19:17:00 +02: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
6c52ad359f head again, perhaps I should have waited 2010-05-01 10:02:47 +01:00
Jonathan Corwin
12810ad34a Head 2010-05-01 09:46:06 +01:00
Tim Bentley
13922b0599 Renames for consistancy 2010-05-01 07:58:41 +01:00
Tim Bentley
077933d703 Head 805 2010-05-01 07:50:43 +01:00
Jon Tibble
5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
rimach
32c635b2f0 resolve merge proposal comments 2010-05-01 00:07:51 +02: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
Tim Bentley
5614e10324 Fix again 2010-04-30 20:56:26 +01:00
Tim Bentley
22c2e4c38e Minor cleanups and add comments to code 2010-04-30 20:37:47 +01: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
79180c7f1c Text over video with loop 2010-04-30 17:57:53 +01:00
Tim Bentley
09da62f9cc Text over video 2010-04-30 17:30:25 +01:00
Tim Bentley
387e281da0 Fix up bugs from last merge 2010-04-30 16:41:48 +01:00
Tim Bentley
932560e81d Fix missing %s 2010-04-30 15:49:27 +01:00
Tim Bentley
c42054ec87 Fix up final 802 fallout 2010-04-30 15:30:07 +01:00
Tim Bentley
61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Tim Bentley
7491b30be0 Head 801 2010-04-30 10:38:28 +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
Tim Bentley
d28498611d Fix up video playing so main screen is hidden on start 2010-04-30 06:16:06 +01:00
Jon Tibble
c6a7549d12 Make settings_section/last directory entries consistent 2010-04-30 02:59:15 +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
Tim Bentley
39a4593bd3 Fix up display buttons 2010-04-29 20:33:45 +01:00
Jonathan Corwin
970d66d4ad head 2010-04-29 20:15:49 +01:00
Jon Tibble
32b7bca71e Help -> Website and disable unimplemented options 2010-04-29 13:35:40 +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
92ef8471b0 Add new tab for display sizing 2010-04-28 19:17:51 +01:00
Tim Bentley
b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Tim Bentley
d19d3eb213 Fix video display 2010-04-28 18:00:05 +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
97d9ab93f6 Migration tools settings conversion 2010-04-28 04:16:49 +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
Jon Tibble
ba17d94e77 Import fixes from trivialfixes branch 2010-04-26 23:24:03 +01:00
Jonathan Corwin
75829333c0 Control via web 2010-04-26 22:29:40 +01:00
Jon Tibble
f895c66eb1 Clean up saving UI settings 2010-04-26 17:41:31 +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
471f032b6e Save MainWindow position 2010-04-23 22:31:54 +01:00
Jon Tibble
b23a699a5a Save MainWindow state and geometry 2010-04-23 22:10:25 +01:00
Jon Tibble
b8f940565e Import fixes 2010-04-23 21:39:27 +01:00
Jon Tibble
50e555db40 Head r799 2010-04-23 21:33:48 +01:00
Jon Tibble
fde108d4b4 Warn before loading over unsaved service 2010-04-23 20:55:31 +01:00
Jon Tibble
e640041318 Document separators in add_actions 2010-04-23 20:42:51 +01:00
Raoul Snyman
e22e76e183 HEAD 2010-04-23 21:20:44 +02:00
Jon Tibble
fbc36e3e9a Add recent files functionality 2010-04-23 19:30:53 +01:00
Tim Bentley
b1e8419ee8 head 2010-04-23 17:04:20 +01:00
Tim Bentley
460964c371 fixes 2010-04-23 17:03:12 +01:00
Jon Tibble
37720b9cdb Add add_actions support function 2010-04-23 17:00:32 +01: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
rimach
b2918fc579 Head 2010-04-22 19:12:33 +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
rimach
707ad60850 reactivate old translate functionality 2010-04-20 21:09:14 +02:00
rimach
fe66e37a57 corrections 2010-04-19 21:12:34 +02: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
5a311c6f77 Clean up video class 2010-04-18 20:11:28 +01:00
Tim Bentley
d96126ee55 Head 794 2010-04-17 12:28:23 +01:00
Tim Bentley
1948da79ff Comments 2010-04-17 12:27:12 +01:00
Tim Bentley
a766542854 Display Hook cleanups 2010-04-17 08:53:06 +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
rimach
ea64675d65 update i18n implementation 2010-04-17 00:06:28 +02:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
rimach
95998f456a Head 2010-04-15 17:04:00 +02:00
Mattias Põldaru
5708528ba0 Fixed up the loading and saving of non-ascii values to the config file. 
bzr-revno: 794
 2010-04-14 21:58:47 +02:00
Mattias Põldaru
235748a9e9 indentation fix 2010-04-14 20:12:30 +03:00
Mattias Põldaru
57cc60e1bd Config file unicode encoding fix 2010-04-14 19:58:22 +03: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
Tim Bentley
571e91b20f Sort out screen display and add comments 2010-04-12 09:13:27 +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
Raoul Snyman
f8e3021162 Once and for all, fix the silly version problem! 2010-04-11 00:24:22 +02: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
e0be3b5705 refactor video display 2010-04-10 11:28:57 +01:00
rimach
ba1bd71caf Head 2010-04-10 11:57:49 +02:00
rimach
1a57939c73 Head 2010-04-09 21:27:32 +02:00
rimach
7a9d8c97aa Head 2010-04-09 21:27:22 +02: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
d74ff3393e head784 2010-04-07 20:10:47 +01:00
Tim Bentley
5c90f4944c remove display background 2010-04-07 20:09:13 +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
20cdcde1a1 Remove print 2010-04-06 19:34:51 +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
cef6d29a7c Plugin name case issues for additional items 2010-04-03 10:06:05 +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
a178ea447e Handle backward compatibility 2010-04-02 20:05:37 +01:00
Tim Bentley
8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Tim Bentley
3c8c20f2d4 cleanup the screen size code 2010-04-02 19:12:54 +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
Tim Bentley
60d7416e69 Fix service path errors 2010-03-30 20:01:23 +01:00
Raoul Snyman
ab9b72dfb5 Fixed a broken import. 2010-03-30 09:05:24 +02: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
e67e21f445 Fix loss of slide menu for save services 2010-03-28 15:18:36 +01:00
Tim Bentley
68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Tim Bentley
66cd5f042a Stop outlines for footers they are too small 2010-03-27 20:27:33 +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
Tim Bentley
a6bcdb4e56 Fix dates 
bzr-revno: 774
 2010-03-27 17:16:10 +00:00
Raoul Snyman
daa42bce71 Fixed the "Bible" item in the "Import" menu. 
bzr-revno: 773
 2010-03-27 19:06:13 +02:00
Tim Bentley
fb3abf7f36 Fix date 2010-03-27 16:46:52 +00: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
35255c250e Fix up theme bugs 2010-03-26 20:48:46 +00: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
Raoul Snyman
ee879774b8 Update the credits. 2010-03-26 21:44:18 +02:00
Tim Bentley
44f3e02a5c Fix outline rendering bug 2010-03-26 08:49:26 +00:00
Tim Bentley
e4db12423a Add Theme and Hide buttons to slide controller 2010-03-25 21:53:52 +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
Tim Bentley
ef77f58136 Head 2010-03-25 19:27:57 +00:00
Tim Bentley
51d6d2410b Fix QT4.4 bug in service manager 2010-03-25 19:27:46 +00:00
Tim Bentley
b20c29f45c Add delete to context menu 2010-03-25 18:52:16 +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
59dd69eee1 Do not display empty list 2010-03-24 19:10:08 +00:00
Tim Bentley
f158044d5e Fix row counts and bad code before superfly spots it 2010-03-24 19:05:45 +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
c4b49a1511 Import fixes 2010-03-23 16:00:52 +00: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
Jonathan Corwin
c4f9320f4d Fix up the bible migration. 
bzr-revno: 759
 2010-03-23 15:31:57 +02:00
Jonathan Corwin
f6e6357176 Fixed a bug with transparent backgrounds. 
bzr-revno: 758
 2010-03-23 15:30:29 +02:00
Jonathan Corwin
8524bf9174 Remove transparent error: QImage::scaled: Image is a null image 2010-03-22 23:50:32 +00:00
Raoul Snyman
1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Jonathan Corwin
16c510acf0 Head 2010-03-22 19:44:06 +00:00
Tim Bentley
fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Tim Bentley
32086cb877 Fix slide selection so looks nice 2010-03-22 18:31:43 +00:00
Jonathan Corwin
5f2a637b63 Commit verses at end 2010-03-22 08:45:45 +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
Jonathan Corwin
13f76ef2cb Head 2010-03-21 22:54:49 +00:00
Jonathan Corwin
3500167907 Bible migration 2010-03-21 22:54:26 +00: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
5c6289d13d Being overzealous about unicode. 
bzr-revno: 753
 2010-03-21 22:44:42 +02:00
Tim Bentley
c8a0c2a34b Stop double loading of Service items from service manager unless triggered by remote edit. 
bzr-revno: 752
 2010-03-21 20:38:58 +00:00
Raoul Snyman
12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02:00
Tim Bentley
2ff005cdc0 Add verse tag to live song rows 2010-03-21 19:55:51 +00:00
Tim Bentley
3e4683bd6d Fix up issues and confusion with service item edit 2010-03-21 17:56:56 +00: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
Tim Bentley
2d43cd2d8a Stop double loading of service items 2010-03-21 15:08:46 +00:00
Raoul Snyman
253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02:00
Tim Bentley
8f692d13be Remove prints 2010-03-21 14:30:18 +00: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
Jonathan Corwin
7866c8d031 Head 2010-03-20 21:21:34 +00:00
Raoul Snyman
7eaaf22467 Fixed a bug where failed/cancelled imported Bible files are not deleted. 
bzr-revno: 749
 2010-03-20 17:47:05 +02:00
Tim Bentley
92d39b1d98 Minor tidy ups and add stupidity block 2010-03-20 08:34:36 +00:00
rimach
9169870520 make Blank button workable 2010-03-20 00:02:23 +01: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
Tim Bentley
09f18fd96d Clean up maintenance - Complete 2010-03-19 07:23:48 +00:00
Raoul Snyman
2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02:00
Tim Bentley
66b23f6a6f Fix dialog 2010-03-18 22:06:51 +00: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
Jon Tibble
de767459bd Fix 2 for AppLocation changes 2010-03-18 16:25:25 +00:00
Jon Tibble
5d2fe81d71 Fix for AppLocation changes 2010-03-18 15:52:37 +00:00
Jon Tibble
fea160c5c4 AppLocation.PluginsDir changes 2010-03-18 15:43:27 +00:00
Tim Bentley
ff8145cef1 Add in maintenance page to service manager 2010-03-17 21:25:35 +00:00
Tim Bentley
72d2d8f83d Clean up service item form names 2010-03-17 21:08:18 +00: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
Jon Tibble
ed370650f8 Head r744 2010-03-16 20:58:34 +00:00
Jon Tibble
98a5dcd1b4 Some head 2010-03-16 20:57:57 +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
c63c09017e Merge to head. 2010-03-16 21:47:48 +02: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
1835a922e5 Merged in some translation fixes. 
bzr-revno: 743
 2010-03-15 20:54:09 +02:00
Raoul Snyman
90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02:00
Jon Tibble
366fe2f508 Head r742 and import fix 2010-03-14 23:22:44 +00:00
Tim Bentley
ba21b15214 Fix blank screen color 
Fix save and cancel of services
Fix tool shortcut
add a filter to the save dialog - "OpenLP Service Files (*.osz)

bzr-revno: 742
 2010-03-14 18:00:56 +00:00
Tim Bentley
36b9688695 Fix save service file name 2010-03-14 17:53:14 +00:00
Tim Bentley
23236b50e1 remove print 2010-03-14 17:14:38 +00:00
Tim Bentley
af5a52fa62 Fix service saving and cancelling 
Fix Red and Bla
 2010-03-14 17:05:50 +00:00
Tim Bentley
d0f3322aa5 Fix ServiceManager drag and drop` 
Fix rendering size issues
Fix screen sizes following display changes

bzr-revno: 741
 2010-03-14 14:36:48 +00:00
Tim Bentley
df8ffa53b2 Fix DND for service items 2010-03-14 07:56:39 +00: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
3b59525e98 Renderer screen and font fixes 2010-03-13 20:50:52 +00: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
Jon Tibble
af74e1d295 Head r738 2010-03-13 12:11:44 +00:00
Jon Tibble
660a35486b Head r737 2010-03-13 12:11:11 +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
Raoul Snyman
ccfa7501ce - Fixed up Mac OS X detection 
- Removed an unnecessary import
- Fixed an export
 2010-03-12 20:31:13 +02:00
Jon Tibble
9196a6b6f6 Head r736 2010-03-12 17:43:17 +00:00
Tim Bentley
80da6c5c61 Head 2010-03-12 16:55:21 +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
Raoul Snyman
c7c1a9c06a Added icons for: 
- Blank Screen
 - Show Desktop
 - Show Theme Background
 2010-03-12 17:38:56 +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
Jon Tibble
8124f0e8fe Import and weird character cleanups 2010-03-11 14:02:43 +00:00
Tim Bentley
e092dc85cd Song edit bug - save and preview on new song 2010-03-11 12:53:20 +00:00
Tim Bentley
dde75e2288 Head733 2010-03-11 12:48:19 +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
Tim Bentley
27d09b8be8 Blank text screens do not have footers 2010-03-11 08:29:32 +00:00
Tim Bentley
b3ce7bf940 Refactor theme outlines 2010-03-11 08:11:36 +00: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
Tim Bentley
74b288aa6a Head731 2010-03-10 16:58:07 +00:00
Tim Bentley
9bace991fa renderer changes 2010-03-10 16:57:33 +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
1e79260c5c Renamed the versionThread class to VersionThread to fit with our coding standards. 2010-03-09 22:29:45 +02:00
Raoul Snyman
16ea5dd0ad Tidied up the tabs on the media manager. 2010-03-09 22:26:12 +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
Tim Bentley
b75bc2abbf Remove Print statements 2010-03-08 19:55:13 +00:00
Tim Bentley
55c676dc03 Minor servicemanager fixes 2010-03-08 19:50:35 +00: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
Tim Bentley
5560aac575 Fix expanding service items 2010-03-07 19:22:54 +00:00
Tim Bentley
77e671bd78 Remove unneeded version tagging 2010-03-07 06:42:22 +00:00
Jonathan Corwin
714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Tim Bentley
d3564b2df7 Fix translation 2010-03-06 14:08:51 +00:00
Tim Bentley
88289475ec Head 724 2010-03-06 08:01:30 +00:00
Tim Bentley
1932ed886e Fix up service notes 2010-03-06 08:00:36 +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
Tim Bentley
56f8d3befb Cleaned up logging code 
Added code to stop themes in use being deleted
Added Service Notes to service items
Fixed ServiceManager context menu so it works based on the item selected
Various minor bug fixes
Fix up bug for Theme savings and OOS

bzr-revno: 723
 2010-03-05 13:27:42 +00:00
Tim Bentley
eec672c944 Fix up bug for Theme savings and OOS 2010-03-05 12:06:19 +00:00
Tim Bentley
d2b4bc4314 Fix up Copyright and utf8 2010-03-05 10:04:49 +00:00
Tim Bentley
763b7cfeed Fix up context menu for serviceitem 2010-03-05 09:24:42 +00: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
f4e25bf329 Finish logging cleanup 2010-03-04 22:09:03 +00:00
Tim Bentley
181c7c9946 Event clean ups and fixes 2010-03-04 22:03:43 +00:00
Raoul Snyman
977e896a21 Create the config directory if it doesn't exist yet, in order to save the log file. 
bzr-revno: 722
 2010-03-04 21:47:17 +02: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
Tim Bentley
3084140741 Remove extra line 2010-03-03 17:49:28 +00:00
Tim Bentley
6bff7936eb Add ServiceItemNoteForm and handling 2010-03-03 17:48:37 +00:00
Raoul Snyman
e0acec1274 A fix to the OSIS importer, and added the version file. 
bzr-revno: 721
 2010-03-03 15:28:14 +02: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
b949ab0054 Head719 2010-03-02 19:45:54 +00:00
Tim Bentley
4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman
e7f7fe8861 Added Service Edit and Service Notes icons. 2010-03-02 09:01:56 +02: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
Tim Bentley
d47fc53b78 Add Alternate rows to slide controller 2010-02-27 07:39:47 +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
Tim Bentley
38a8575989 Sort out startup http gets. 2010-02-25 21:09:27 +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
3cf8b491ea Fix field name 2010-02-23 19:37:07 +00: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
Jon Tibble
d02fc68a72 Fix unzipping theme files 2010-02-22 16:57:08 +00:00
Jon Tibble
61c7b6479f Fix theme import font colours 2010-02-22 16:42:10 +00:00