Commit Graph

617 Commits

Author SHA1 Message Date
Tim Bentley 2e02f1c94f Remove "Can_be_disabled" as no longer require
Sort out status handling in plugin form.
2009-11-07 07:42:18 +00:00
meths@btinternet.com eba4115490 Fix file handling
bzr-revno: 660
2009-11-07 06:45:25 +00:00
Jon Tibble ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Tim Bentley 38e3ca66cb Fix error in previous merge for ThemeManager
Get Custom Working with remote editing
2009-11-06 18:50:46 +00:00
Tim Bentley b6602e67d4 Headr658 2009-11-06 17:36:38 +00:00
Jon Tibble aa8b7c3fe5 Clean theme handling
bzr-revno: 658
2009-11-06 15:38:30 +00:00
Michael Gorven a89cec05da Change to Unicode string. 2009-11-06 11:52:04 +02:00
Michael Gorven 4ee481ca6e Change to Unicode string. 2009-11-06 11:52:04 +02:00
Tim Bentley 365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley f9f4cc2518 Renderer cleanups and fixes 2009-11-15 07:07:40 +00:00
Raoul Snyman 2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs
bzr-revno: 671
2009-11-15 09:02:27 +02:00
Tim Bentley 98e4b47d91 headr670 2009-11-14 17:01:14 +00:00
Tim Bentley 78fd8efdf7 Remove unneed varables
Move code into serviceItem
Fix up splitter code
2009-11-14 12:24:27 +00:00
Tim Bentley 26b9274604 ServiceItem cleanup - fix presentation issues 2009-11-14 11:47:10 +00:00
Tim Bentley 3ecec95aca ServiceItem cleanup - remove code duplication 2009-11-14 11:44:06 +00:00
Tim Bentley b0ae4e4ceb ServiceItem cleanup - fix media playing 2009-11-14 10:51:58 +00:00
Tim Bentley b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley 0aca1665be ServiceItem cleanup - remove CommandItem 2009-11-14 09:37:54 +00:00
Tim Bentley ad6abb1e9c ServiceItem cleanup - hide lists 2009-11-14 09:02:30 +00:00
Tim Bentley e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Jon Tibble f0e2fdd6f5 Fix multiple video plays 2009-11-13 17:43:58 +00:00
Jon Tibble 3defb3b4c5 SPG 2009-11-13 17:42:51 +00:00
Jon Tibble f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Jon Tibble b79d535e04 Fix theme loading logic and missing item from cleaning 2009-11-12 23:49:35 +00:00
Jon Tibble 1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Jon Tibble 1c0a86b17f Simplify OS path setting 2009-11-12 23:33:59 +00:00
Jon Tibble 74b08cb9c4 Clean theme loading 2009-11-06 02:12:56 +00:00
Jonathan Corwin e931fa023a Address some issues with preview slide controller and presentations 2009-11-05 23:21:23 +00:00
Tim Bentley cfd5b536c7 Headr657 2009-11-05 17:50:57 +00:00
Raoul Snyman 3853a257b3 Merged in display fixes from lp:~raoul-snyman/openlp/fixes
bzr-revno: 657
2009-11-05 19:33:38 +02:00
Tim Bentley 831281e293 More remote editing cleanups 2009-11-05 17:03:37 +00:00
Raoul snyman 7a359c047a Renamed DisplayLabel to DisplayWidget
Fixed typo in DisplayWidget.__init__
Changed MainDisplay.__init__ to call DisplayWidget.__init__ not QtGui.QWidget.__init__
Fixed issue where the display window was showing up on the primary display.
2009-11-05 08:06:43 +02:00
Jon Tibble 62031c24b9 Fix last theme.parse() without a cleanTheme() 2009-11-05 00:09:19 +00:00
Jon Tibble 3d56391d1c Fix typo 2009-11-04 23:16:33 +00:00
Raoul Snyman 08786fdcec Fixed incorrect showing of image based on splash screen configuration.
Fixed a bug where the display screen's image would not resize when the display screen was set to another desktop.
2009-11-04 22:06:46 +02: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 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 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 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 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
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 fcd5836e0f Fix i18n for tabs v3 2009-10-28 21:52:13 +00:00
Tim Bentley 19e8682bf8 Add BibleGateway List and access it 2009-10-28 18:35:06 +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
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
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 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 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
Raoul Snyman 2bf6fe0227 Made the dark->lighter selection colour slightly stronger. 2009-10-21 21:39:55 +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 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