Commit Graph

851 Commits

Author SHA1 Message Date
Tim Bentley
4a05f6e9cf Fix song editing 2009-11-04 17:48:46 +00:00
Jon Tibble
2136155f48 Fix theme loading and song editing 2009-11-04 01:16:15 +00:00
Jon Tibble
5b4ce8124d Fix theme loading 2009-11-03 20:04:38 +00:00
Jon Tibble
85d4466c76 Head r653 2009-11-03 19:21:58 +00:00
Tim Bentley
2d690c209d Fix phantom expansion in Service Manager 2009-11-03 18:39:58 +00:00
Jon Tibble
84ce96f989 More truth testing cleanup - core 2009-11-03 18:14:25 +00:00
Jon Tibble
51915d0e97 Truth testing cleanup 2009-11-03 15:13:52 +00:00
Tim Bentley
89e0aee373 Headr651 2009-11-03 06:16:27 +00:00
Tim Bentley
8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +00:00
Jon Tibble
7f176bf16f Improve iterator use 2009-11-03 01:37:08 +00:00
Jon Tibble
7767746f7a More usability fixes 2009-11-03 01:12:35 +00:00
Jon Tibble
066cfcc830 Single monitor and usability fixes 2009-11-03 00:04:41 +00:00
Jon Tibble
d0145bd1e4 Video on multi-monitor setups 2009-11-02 18:05:52 +00:00
Tim Bentley
e3dd7842d4 Merge it right this time
bzr-revno: 650
2009-11-02 17:37:41 +00:00
Tim Bentley
0a6e3f47c7 Headr468 and fix 2009-11-02 17:24:27 +00:00
Jon Tibble
ad69f754b8 Enable multiple videos without restart 2009-11-02 01:03:27 +00:00
Tim Bentley
8751433da8 Fixes from last few merges 2009-11-01 21:02:31 +00:00
Tim Bentley
d58327435a Media is starting to work - just
bzr-revno: 646
2009-11-01 20:21:49 +00:00
Tim Bentley
8880a1b016 It works as long as you wont to play only 1 thing per service 2009-11-01 19:41:13 +00:00
Tim Bentley
c06b64fdbe Start to add the menu items to slide controller 2009-11-01 19:22:51 +00:00
Tim Bentley
6df0649fbc Video cleanup part1 2009-11-01 16:06:59 +00:00
Tim Bentley
70b04f5821 Headr644 2009-11-01 15:31:22 +00:00
Tim Bentley
201fce5bba Headr642 2009-11-01 15:29:53 +00:00
Tim Bentley
9dae67ac0a Clean up version notifications and checking 2009-11-01 09:07:10 +00:00
Tim Bentley
7a349c998e Fix up handling of service items in the slide controllers and stop editing issues 2009-10-31 20:27:08 +00:00
Tim Bentley
9eeaf98b66 Fix error handling for double exception call. Added debugging for Song XML class 2009-10-31 10:19:30 +00:00
Tim Bentley
258bf403c8 Sort out number of buttons on SlideController to match song and make more KITT like 2009-10-31 09:03:54 +00:00
Tim Bentley
4eaa7a1535 Finish remote editing of ServiceManager by updating live 2009-10-31 08:45:24 +00:00
Tim Bentley
4695d711f8 Fix names before Raoul sees them 2009-10-30 22:03:09 +00:00
Tim Bentley
b16a8cc452 Headr639 2009-10-30 21:47:15 +00:00
Tim Bentley
7b1de0f995 Move version check 2009-10-30 21:45:38 +00:00
Jon Tibble
28a223bc06 Fix double loading 2009-10-30 20:34:11 +00:00
Tim Bentley
2f12c075c2 Fix theme editing where previous image is cached on change of image 2009-10-30 20:21:36 +00:00
Tim Bentley
48e750ded2 Add Save service on New code, and configuration to turn it off. 2009-10-30 20:14:55 +00:00
Jon Tibble
7eb86b1580 Plugin cleanups and more i18n 2009-10-30 17:44:16 +00:00
Tim Bentley
0d959fbfb1 Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit 2009-10-30 06:43:28 +00:00
Jon Tibble
e662b785db Fix font names in theme editing 2009-10-29 23:27:45 +00:00
Jon Tibble
490b19ddc2 Enable media additions to ServiceManager and fixes 2009-10-29 18:25:34 +00:00
Jon Tibble
1db3cda76b Head r637 2009-10-29 17:19:04 +00:00
Jon Tibble
359c2bee42 TRB Fixes 2009-10-29 17:16:24 +00:00
Tim Bentley
2f03004bcd Minor fixes
bzr-revno: 637
2009-10-29 16:21:58 +00:00
Jon Tibble
e519f729f1 Fix unnecessary screen setup 2009-10-29 16:01:33 +00:00
Tim Bentley
81de929460 Minor fixes 2009-10-29 15:57:58 +00:00
Jon Tibble
1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +00:00
Tim Bentley
dd919d4ccf Headr633 and merge resolution 2009-10-29 13:58:03 +00:00
Tim Bentley
472857535f headr632 2009-10-29 13:44:52 +00:00
Tim Bentley
302d29ea85 More remote edit changes 2009-10-29 13:44:33 +00:00
Jon Tibble
2a0e5d6726 Fix i18n for New Theme typo 2009-10-29 13:19:31 +00:00
Jon Tibble
c6f6624605 Fix i18n for New Theme 2009-10-29 13:11:45 +00:00
Jon Tibble
eb61003c8e Fix plugintabs i18n
bzr-revno: 632
2009-10-29 13:00:48 +00:00
Tim Bentley
0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +00:00
Tim Bentley
8e4f69383c Style fixes 2009-10-29 06:24:53 +00:00
Jon Tibble
8de21d057f PluginNameVisible without splitting __init__ 2009-10-29 01:48:43 +00:00
Jon Tibble
fcd5836e0f Fix i18n for tabs v3 2009-10-28 21:52:13 +00:00
Jon Tibble
439c3c90ca Fix i18n for visible and non-visible title use 2009-10-28 21:04:14 +00:00
Tim Bentley
19e8682bf8 Add BibleGateway List and access it 2009-10-28 18:35:06 +00:00
Jon Tibble
2eccd57aca Fix mediaitem.pys i18n 2009-10-28 01:36:24 +00:00
Tim Bentley
60649e3624 Move Audit to SongUsage 2009-10-27 08:38:02 +00:00
Tim Bentley
03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +00:00
Jon Tibble
abafa78958 Head r629 2009-10-26 23:51:48 +00:00
Tim Bentley
3ee930f6ae Fix Line split code. Stop SlideController being editied 2009-10-26 16:19:26 +00:00
Tim Bentley
4833f7cd0b Add Song Tab option to remove them 2009-10-26 06:30:08 +00:00
Tim Bentley
19e27dbc95 Add Song verses to menu bar 2009-10-26 06:09:33 +00:00
raoul.snyman@saturnlaboratories.co.za
706db6923b Fix i18n issues
bzr-revno: 629
2009-10-26 05:34:44 +00:00
Raoul Snyman
d54a023611 Merged in Windows changes. 2009-10-25 23:36:04 +02:00
Raoul Snyman
e95eb437e2 Removed the QLabels from text service items. It's nigh impossible to dynamically style QLabels in QTableWdigetItems. 2009-10-25 23:33:07 +02:00
Raoul Snyman
07468597aa Just changed the SlideController selection back for the moment. 2009-10-25 22:20:03 +02:00
Raoul Snyman
8133cea273 Merge from trunk 2009-10-25 21:19:25 +02:00
Tim Bentley
3f69bb7635 "Save and Preview" added to Song editor 2009-10-25 18:07:23 +00:00
Tim Bentley
da4a26ef5f Service Items can now have their theme changes at run time. 2009-10-25 16:26:03 +00:00
Raoul Snyman
8de8638ba9 Merged trunk, Fixed up odd trUtf8 2009-10-25 18:12:41 +02:00
Tim Bentley
5f25ffd267 Headr626 2009-10-25 14:41:29 +00:00
Tim Bentley
68bc9bf526 Audit report work 2009-10-25 14:41:15 +00:00
j@corwin.co.uk
4871acd05c More presentation fixes
bzr-revno: 626
2009-10-25 14:39:45 +00:00
Tim Bentley
bad24ee614 Finally fix redisplaying of correct slide 2009-10-25 08:09:41 +00:00
Jonathan Corwin
60b0120e56 Fix merge conflict 2009-10-24 20:53:49 +01:00
Tim Bentley
7b85b9c7af More Song editing fixes 2009-10-24 20:43:16 +01:00
Jonathan Corwin
e0f9f3f09e Keep item in slidecontroller in sync with presentation, and detect external slide changes. 2009-10-24 20:22:00 +01:00
Tim Bentley
8c86edb0b6 Headr624 2009-10-24 19:16:04 +01:00
Tim Bentley
7b54d89039 Preserve selected slide on editing 2009-10-24 19:11:02 +01:00
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley
abd66af1c4 Fix extra utf8 strings 2009-10-24 17:00:43 +01:00
Tim Bentley
23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +01:00
Raoul Snyman
08c852f8ee Fixed problem in "AmendThemForm" 2009-10-24 13:46:57 +02:00
Raoul Snyman
803987d402 Not quite - I needed to cast it to unicode. 2009-10-24 13:14:26 +02:00
Raoul Snyman
47edd31b58 Let's try fix the version check message. 2009-10-24 13:12:10 +02:00
Tim Bentley
4f211d24e0 Fix theme editor 2009-10-24 11:04:35 +01:00
Tim Bentley
76fa3438c4 Headr621 2009-10-24 10:55:25 +01:00
Raoul Snyman
a94f5c9e0d Merge from lp:~raoul-snyman/openlp/i18n
bzr-revno: 621
2009-10-24 11:33:20 +02:00
Tim Bentley
2c1c202e5b Fixed edit theme to preview render bug 2009-10-24 08:22:44 +01:00
Tim Bentley
2181655239 Headr620 2009-10-24 06:59:07 +01:00
Jon Tibble
fac8bb8dd3 Fix ServiceType -> ServiceItemType change 2009-10-23 23:54:29 +01:00
Jonathan Corwin
ee076e306e First stab at showing ppt output in mini-live-display 2009-10-23 23:47:22 +01:00
Raoul Snyman
90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Tim Bentley
4c35fc81a5 Fix rendering bug 2009-10-23 18:09:09 +01:00
Tim Bentley
6c5ccc101b Font Siziing and rendering improvements 2009-10-23 17:10:09 +01:00
Raoul Snyman
8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Tim Bentley
67ab01df01 Minor corrections 2009-10-22 20:07:32 +01:00
Tim Bentley
979ba02b02 Add Lines per slide and wrap indentation 2009-10-22 20:03:08 +01:00
Jon Tibble
27d92e9202 Head r617 2009-10-22 14:44:24 +01:00
Jon Tibble
b37b95d928 Rename to ServiceItemType and add Video type 2009-10-22 14:43:49 +01:00
Raoul Snyman
2bf6fe0227 Made the dark->lighter selection colour slightly stronger. 2009-10-21 21:39:55 +02:00
Raoul Snyman
5035f79f50 Started working on a non-UI converter (for web-based import). 2009-10-21 18:11:58 +02:00
raoul.snyman@saturnlaboratories.co.za
adc769fff0 Fix Bible Media manager look and feel
bzr-revno: 615
2009-10-21 05:57:45 +01:00
Raoul Snyman
ee6465d8a5 Made highlight colour slightly lighter/darker than background. 2009-10-20 21:41:15 +02:00
Raoul Snyman
8c3370d803 Fixed up the styling on selected items in the slide controllers. 2009-10-20 19:28:34 +02:00
Tim Bentley
44e57316f2 SlideControler UI fixes - take 3 2009-10-20 18:15:37 +01:00
Tim Bentley
791b38e0ef SlideControler UI fixes - take 2 2009-10-20 18:01:12 +01:00
Tim Bentley
ca96d0fda6 SlideControler UI fixes 2009-10-20 17:33:00 +01:00
Jon Tibble
e37ae62079 Initial video fudging! 2009-10-19 18:51:21 +01:00
Tim Bentley
2f153475f9 General Tab Changes
bzr-revno: 611
2009-10-19 18:31:02 +01:00
Jon Tibble
7f773a314b General fixes
bzr-revno: 610
2009-10-19 18:17:38 +01:00
Tim Bentley
a95f4feb83 Blanked out message now works 2009-10-19 18:14:26 +01:00
Tim Bentley
0bbbf8b6b8 General Tab fixes 2009-10-19 17:18:32 +01:00
Jon Tibble
fc61d7fe55 Fixups 2009-10-19 15:56:44 +01:00
Tim Bentley
2004edf876 Head 2009-10-18 16:14:48 +01:00
Tim Bentley
1cfa0e560b Theme Image and Presentation fixes
bzr-revno: 609
2009-10-18 16:12:28 +01:00
Raoul Snyman
2d8073fcb5 Lighten the gradient of the toolbox titles. 2009-10-18 17:09:09 +02:00
Raoul Snyman
a7eadfc70b Merged lp:~raoul-snyman/openlp/uifixes
bzr-revno: 608
2009-10-18 17:02:58 +02:00
Tim Bentley
2f618d8504 Fix Message popup on windows , load last service 2009-10-18 15:53:04 +01:00
Tim Bentley
efec5e1e95 Backgounds now appear in Theme editor 2009-10-18 08:49:47 +01:00
Tim Bentley
486f5ce709 Head 2009-10-18 07:27:15 +01:00
Raoul Snyman
13305ab6bb Some more UI fixes (mostly for Windows). 2009-10-18 00:06:38 +02:00
Jonathan Corwin
c491a19be8 Merged in lp:~j-corwin/openlp/present
bzr-revno: 607
2009-10-17 22:04:12 +02:00
Tim Bentley
2961a8b020 Head 2009-10-17 20:17:44 +01:00
Raoul Snyman
3e4f07be6e Merge from lp:~raoul-snyman/openlp/uifixes
bzr-revno: 606
2009-10-17 21:14:39 +02:00
Tim Bentley
3c9ffae002 Fix name standards 2009-10-17 20:13:11 +01:00
Jonathan Corwin
2ae79a4480 HEAD 2009-10-17 20:06:06 +01:00
Raoul Snyman
c4c8c36e7f Some spacing fixes. 2009-10-17 20:52:42 +02:00
Raoul Snyman
68f8b1e45f Fixed a bug where a warning was generated about layouts.
Made the media manager items stand out a little more, and enhanced the currently selected one.
2009-10-17 20:41:56 +02:00
Tim Bentley
d5b5549ca0 Head 2009-10-17 19:20:55 +01:00
Tim Bentley
e9800d8ecc Fix theme saving 2009-10-17 19:20:07 +01:00
Raoul Snyman
7607d80254 Merged in lp:~raoul-snyman/openlp/uifixes
bzr-revno: 605
2009-10-17 20:16:27 +02:00
Jon Tibble
f4439200b5 Python 2.5 fixes
bzr-revno: 604
2009-10-17 19:14:49 +01:00
Tim Bentley
7273ff3d2f Display Screen handling improvements 2009-10-17 17:11:41 +01:00
Tim Bentley
1082428926 Show Splash screen option now works 2009-10-17 14:29:01 +01:00
Tim Bentley
7ae0e045d3 Rename Alert menu 2009-10-17 14:17:04 +01:00
Raoul Snyman
f2058a516a Playing around with the look and feel of tabs on the ToolBox 2009-10-17 12:55:28 +02:00
Tim Bentley
0828335939 Bible Plugin - Hide Duel verse Combo be default 2009-10-17 07:12:38 +01:00
Tim Bentley
025d7c86d2 Songs Plugin get search as you type 2009-10-17 06:47:17 +01:00
Jonathan Corwin
bb619ce325 Show powerpoint slide thumbnails in slidecontroller 2009-10-17 00:34:56 +01:00
Jon Tibble
770751899c Fix urlopen() and mainDisplay closing 2009-10-16 22:29:38 +01:00
Raoul Snyman
a35d205cea Reducing spacing on media manager items. 2009-10-16 20:41:41 +02:00
Tim Bentley
cbb17039d5 Fix missing serviceitem handling 2009-10-16 19:22:14 +01:00
Tim Bentley
0f54bb81e7 Save Theme import directory 2009-10-16 05:46:32 +01:00
Tim Bentley
aa1830c0b6 head 2009-10-14 19:29:06 +01:00
Tim Bentley
fa6cb6020a fixes from merge 2009-10-14 19:27:44 +01:00
Raoul Snyman
db47de92ad Added in a line to fix the logging. 2009-10-14 19:52:50 +02:00
Tim Bentley
1bca1cf4cf More bible changes 2009-10-14 06:08:36 +01:00
Tim Bentley
0273fd508f Fix Logging exception in check_version 2009-10-13 20:24:27 +01:00
Tim Bentley
cc71923682 Bible plugin clean up and Quick web setup 2009-10-12 11:18:54 +01:00
Tim Bentley
4a1b826e66 Cleanups 2009-10-12 07:21:17 +01:00
Tim Bentley
d0b501bd2f Fixes to last merge request 2009-10-12 05:43:02 +01:00
Tim Bentley
7ee0549df2 Small fix ups and corrections. Plugin list obeys can_be_diabled 2009-10-11 20:31:46 +01:00
Tim Bentley
7431eeb65c Servie Manager DnD part 2 2009-10-11 10:31:27 +01:00
Tim Bentley
aa0450f543 Servie Manager DnD part 1 2009-10-11 08:30:16 +01:00
Tim Bentley
d74b9f6d16 Quick code cleanup and fix test for version checking 2009-10-11 07:29:25 +01:00
Tim Bentley
56930f1e65 Correct Theme name for Export if default 2009-10-11 07:25:37 +01:00
Tim Bentley
f53a6fddeb Latest Version checking added 2009-10-11 06:47:38 +01:00
Tim Bentley
268aadde4c Theme improvements 2009-10-10 19:36:58 +01:00
Tim Bentley
08aec01ce2 Remove all print statements 2009-10-10 15:06:59 +01:00
Tim Bentley
018d217b61 Plugins now hide and reappear correctly 2009-10-10 14:39:32 +01:00
Tim Bentley
3915fc24f1 Head 2009-10-10 14:14:09 +01:00
Tim Bentley
4f1241e60f More hiding changes 2009-10-10 14:13:57 +01:00
Raoul Snyman
855174ce3e Merged in lp:~raoul-snyman/openlp/pluginlist
bzr-revno: 594
2009-10-10 14:10:05 +02:00
Tim Bentley
444e1796cf Head 2009-10-10 05:56:25 +01:00
Tim Bentley
25c730a8f2 More dock hiding work 2009-10-10 05:56:06 +01:00
Jon Tibble
75af51b460 Song theme fix and remove unused variables 2009-10-09 23:46:35 +01:00
Raoul Snyman
7d2a7dda4c Fixed up a bug that caused Active/Inactive inconsistencies. 2009-10-08 21:58:49 +02:00
Raoul Snyman
0c0bc504ac Removed a lone debug. 2009-10-08 21:37:14 +02:00
Raoul Snyman
87b12a1e27 Fixed up lines so that compileall will work. 2009-10-08 21:34:40 +02:00
Raoul Snyman
b4c81a3153 Removed the old plugin list dialog. 2009-10-08 21:17:24 +02:00
Tim Bentley
5d32ce5e66 More cleanups, Bibles and media done 2009-10-08 06:02:39 +01:00
Tim Bentley
85a0c245ea Clean up disenablement 2009-10-07 17:16:21 +01:00
Tim Bentley
34062ab7b9 New file 2009-10-07 06:10:06 +01:00
Tim Bentley
cfc82e7407 Cleanup hinding code and move to disable for now 2009-10-07 06:09:35 +01:00
Raoul Snyman
317fc7875c Reworked the plugin list dialog. 2009-10-06 23:07:12 +02:00
Tim Bentley
9a8c045f2b Add Ability to hide plugins
bzr-revno: 587
2009-10-05 16:14:48 +01:00
Tim Bentley
9325ed0521 Head 2009-10-04 16:01:11 +01:00
Tim Bentley
582dd56ed2 Fix int issue 2009-10-04 16:00:52 +01:00
Jonathan Corwin
1cf3c9a223 Support blank/first/last buttons in presentations 2009-10-03 20:18:59 +01:00
Tim Bentley
b94d1d1b8f Sort out Settings tab items 2009-10-03 20:02:40 +01:00
Tim Bentley
39a9f8efac Media Itmes now hide them selves correctly 2009-10-03 19:39:44 +01:00
Tim Bentley
c4f8fc86cd Sort out Initialistion order and Plugin Status code 2009-10-03 14:08:18 +01:00
Tim Bentley
9ec94494e8 Audit can now be disabled dynamically 2009-10-03 12:07:58 +01:00
Tim Bentley
37a9b5fb4e Plugin List Combo boxhandling finished 2009-10-03 08:25:41 +01:00
Tim Bentley
0408a0a320 Start of Active / Inactive work 2009-10-02 20:06:07 +01:00
Tim Bentley
e25c9937c7 Update UI 2009-10-02 15:19:36 +01:00
Tim Bentley
6c3fd8b096 Sort out text display on dialog 2009-10-02 14:50:45 +01:00
Tim Bentley
1a8ad648ad head 2009-10-02 13:18:21 +01:00
Tim Bentley
9741d0e10a More Plugin list work 2009-10-02 13:16:54 +01:00
Jon Tibble
6d00aef525 Dialogs, Exceptions and Toolbars
bzr-revno: 584
2009-10-02 12:50:57 +01:00
Jon Tibble
ce18ee8e7a Dialogs, Exceptions and PushButtons 2009-10-02 00:43:16 +01:00
Tim Bentley
e0f28ce493 Plugin abouts 2009-10-01 17:56:42 +01:00
Tim Bentley
5185578f24 Fix order of names 2009-09-29 18:18:18 +01:00
Tim Bentley
9efa28ce07 Head 2009-09-29 18:05:34 +01:00
Jon Tibble
b2827d4e25 Use standards for Qt imports 2009-09-29 13:51:38 +01:00
Tim Bentley
a175216cd5 Add comments to correct layout 2009-09-29 05:58:26 +01:00
Tim Bentley
aeba391642 Add Jon to about 2009-09-29 05:51:38 +01:00
Jon Tibble
1a7ad33bf9 Use buildIcon and general fixes all over 2009-09-29 03:54:32 +01:00