Commit Graph

603 Commits

Author SHA1 Message Date
Raoul Snyman
583d96b5d1 Song Verses Toolbar: Phase 1
- Convert verse icons to drop-down verse menu.
2009-12-06 09:14:11 +02:00
Tim Bentley
b8149cc826 Fix up Icon code to use isinstance
Fix up code to ignore cases when doing tests.
2009-12-04 20:25:48 +00:00
Tim Bentley
a2ff6433ba Build Dynamic Icons for SlideController 2009-12-02 10:59:54 +00:00
Tim Bentley
ca7d032aa5 Correct Icon Path 2009-12-02 09:20:40 +00:00
Tim Bentley
250fd4e41b Fix Icons on toolbar 2009-12-02 08:55:15 +00:00
Tim Bentley
6ebd1d9e60 Cleanup from rendering changes 2009-12-01 17:02:18 +00:00
Raoul Snyman
17548726a1 Merge from HEAD 2009-11-30 22:34:45 +02:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice.
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
2009-11-30 22:29:26 +02:00
Tim Bentley
9f80c5a742 Fix problem with slide controller
soften the renderer transition
2009-11-30 19:51:29 +00:00
Raoul Snyman
a6d8813a50 Merge from HEAD, started changing the copyright to include Michael Gorven. 2009-11-29 22:30:41 +02:00
Raoul Snyman
910a61ce3f Merged in HEAD 2009-11-29 22:01:23 +02:00
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Raoul Snyman
420b0ef68d Merged in Michael's changes from the AST module and resolved some conflicts. 2009-11-29 16:18:42 +02:00
Tim Bentley
d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Tim Bentley
1c60a29d68 Basic Tranisitions 2009-11-28 09:12:22 +00:00
Tim Bentley
23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
2009-11-27 21:54:37 +00:00
Raoul Snyman
ce63999383 Various configuration option cleanups and changes. 2009-11-27 23:37:01 +02:00
Tim Bentley
8dc0742e1e Headr676 2009-11-26 18:42:00 +00:00
Raoul Snyman
4d715a3d5d Moved i18n to resources (better place for it).
Fixed up openlp-get-strings.py to use the new TS file location.
Started fixing up the trUtf8() strings.
2009-11-24 21:51:41 +02:00
Raoul Snyman
d42a6a53e1 Merged in changes from trunk 2009-11-24 21:10:54 +02:00
Raoul Snyman
a3714e98d1 Lowercased config settings (they are case insensitive).
Made text render antialiased.
2009-11-24 21:08:53 +02:00
Tim Bentley
388a596922 Add verse number code to song plugin 2009-11-22 20:33:39 +00:00
Tim Bentley
56c69bd8e8 Fix up renderer to protect it from Gushie 2009-11-21 14:32:19 +00:00
Tim Bentley
6139f049d4 Refactor Service Item and clean up Slide Controller
bzr-revno: 673
2009-11-15 16:57:11 +00: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
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
02ad0595d7 ServiceItem cleanup - hide lists 2 2009-11-14 09:06:25 +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
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking.
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
2009-11-13 23:24:59 +02:00
Raoul Snyman
8c599b6707 Fixed up an issue between the display screen and the blank button 2009-11-13 22:10:35 +02:00
Raoul Snyman
262577bd6e Removed an unused parameter from addToolbarButton, and added a "checkable" argument. 2009-11-13 20:46:47 +02:00
Jon Tibble
1c92f157c7 Refactor file_to_xml => get_text_file_string 2009-11-12 23:43:47 +00:00
Tim Bentley
04873758e9 Remove extra Video 2009-11-12 19:05:24 +00:00
Tim Bentley
124c511385 Fix saving and reloading of media items 2009-11-12 18:44:45 +00:00
Tim Bentley
7a1f2ee855 Headr668 2009-11-12 17:21:34 +00:00
Tim Bentley
e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +00:00
Jon Tibble
a821179a63 A unicode fix for themes 2009-11-12 00:49:55 +00:00
Jon Tibble
b100731dc4 A unicode fix for songs 2009-11-12 00:44:26 +00:00
Tim Bentley
1eb41aab78 SlideController cleanups 2009-11-11 19:10:38 +00:00
Tim Bentley
ebce104f30 Clean up slide sizes part 1 2009-11-08 17:02:46 +00:00
Tim Bentley
f18ba14fc9 remove print for log 2009-11-08 14:16:02 +00:00
Tim Bentley
5b154b5941 Fix bugs in previous merges with icons and themes 2009-11-08 13:56:25 +00:00
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
831281e293 More remote editing cleanups 2009-11-05 17:03:37 +00:00
Jon Tibble
c8226bf2fc Fix mismerge 2009-11-04 23:13:17 +00:00
Jon Tibble
0ea45cd366 Head with correct song edit fix 2009-11-04 18:21:08 +00:00
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
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
8c77de16c4 Cleanup Remote Editing again 2009-11-03 06:15:35 +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
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
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
b16a8cc452 Headr639 2009-10-30 21:47:15 +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
Jon Tibble
7eb86b1580 Plugin cleanups and more i18n 2009-10-30 17:44:16 +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
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
472857535f headr632 2009-10-29 13:44:52 +00:00
Tim Bentley
0ffbc050de Songs now have remote edit working 2009-10-29 09:18:26 +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
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
Jon Tibble
abafa78958 Head r629 2009-10-26 23:51:48 +00:00
Raoul Snyman
d54a023611 Merged in Windows changes. 2009-10-25 23:36:04 +02:00
Tim Bentley
da4a26ef5f Service Items can now have their theme changes at run time. 2009-10-25 16:26:03 +00:00
j@corwin.co.uk
4871acd05c More presentation fixes
bzr-revno: 626
2009-10-25 14:39:45 +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
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley
23fd584f63 Add Preview Song Editing 2009-10-24 14:07:41 +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
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
5035f79f50 Started working on a non-UI converter (for web-based import). 2009-10-21 18:11:58 +02: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
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
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
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
7607d80254 Merged in lp:~raoul-snyman/openlp/uifixes
bzr-revno: 605
2009-10-17 20:16:27 +02: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
Raoul Snyman
a35d205cea Reducing spacing on media manager items. 2009-10-16 20:41:41 +02:00
Tim Bentley
fa6cb6020a fixes from merge 2009-10-14 19:27:44 +01:00
Tim Bentley
4a1b826e66 Cleanups 2009-10-12 07:21:17 +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
d74b9f6d16 Quick code cleanup and fix test for version checking 2009-10-11 07:29:25 +01:00
Tim Bentley
268aadde4c Theme improvements 2009-10-10 19:36:58 +01: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
Tim Bentley
cfc82e7407 Cleanup hinding code and move to disable for now 2009-10-07 06:09:35 +01:00
Tim Bentley
582dd56ed2 Fix int issue 2009-10-04 16:00:52 +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
0408a0a320 Start of Active / Inactive work 2009-10-02 20:06:07 +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
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
Tim Bentley
b11a068a8f Inspired by Jon 2009-09-28 21:45:04 +01:00
Tim Bentley
9ff310eebe Cleanups 2009-09-27 13:56:14 +01:00
Tim Bentley
9c4e5ae137 General cleanups Jon missed 2009-09-26 19:22:10 +01:00
Tim Bentley
6637f88892 Plugin updates
bzr-revno: 574
2009-09-26 13:10:41 +01:00
Tim Bentley
2c64f1186a Plugin standardisation and clanups 2009-09-26 10:11:39 +01:00
Tim Bentley
9f04b6f478 More audit changes and dynamic image backgrounds 2009-09-26 07:46:26 +01:00
Jon Tibble
8a44484aee Fix None testing and general cleanups 2009-09-26 00:06:54 +01:00
Jon Tibble
e5db2456e7 Remove unused imports 2009-09-25 01:43:42 +01:00
Jon Tibble
2aa5c4104b Code clean ups
bzr-revno: 567
2009-09-24 11:53:13 +01:00
Jon Tibble
44ae06703c Head r564 2009-09-23 02:56:45 +01:00
Tim Bentley
341916d610 head and merge fixes 2009-09-22 20:23:12 +01:00
Tim Bentley
85f727962f Best merge ever
bzr-revno: 564
2009-09-22 19:53:47 +01:00
Jon Tibble
873e16f3a6 Double space cleanup 2009-09-22 00:11:50 +01:00
Jon Tibble
f1901a653e Fix def variable alignment 2009-09-21 20:57:36 +01:00
Jon Tibble
a224d6a895 Improve readability for white space patch 2009-09-21 20:26:10 +01:00
Tim Bentley
d23f03bf9c Plugin cleanups - Image and Audit 2009-09-21 20:23:51 +01:00
Tim Bentley
38e0c1bc77 head 2009-09-21 19:59:35 +01:00
Tim Bentley
4dccb390c0 updates 2009-09-21 19:59:14 +01:00
Jon Tibble
9c6ddbf109 Improve readability choices... 2009-09-21 19:49:06 +01:00
Jon Tibble
c18594c7ef Improve readability 2009-09-21 19:25:28 +01:00
Jon Tibble
98ea9141f4 More white space and line length fixes 2009-09-21 18:56:36 +01:00
Tim Bentley
83d645fe47 Change slide titles in Service to mean somthing 2009-09-20 19:47:18 +01:00
Tim Bentley
97131a3dbc Renderer Fixes
bzr-revno: 559
2009-09-20 14:21:05 +01:00
Tim Bentley
9d959d5aab Clean up serviceitem 2009-09-20 08:17:20 +01:00
Tim Bentley
5c91bb7fe4 Clean up renderer 2009-09-20 08:15:15 +01:00
Tim Bentley
5046b31f16 Clean up slide controller 2009-09-20 08:12:47 +01:00
Jon Tibble
2fbce78381 Clean up code and fixes 2009-09-20 00:05:30 +01:00
Jon Tibble
becaf33dde Refactor services 2009-09-19 22:45:50 +01:00
Tim Bentley
88c66b368c Add audit File and state handling 2009-09-19 20:31:18 +01:00
Jon Tibble
7c2c87b4cb Refactor dock widget visibility saving 2009-09-19 12:25:01 +01:00
Tim Bentley
109d09ec89 Plugin cleanup
bzr-revno: 552
2009-09-18 19:08:58 +01:00
Tim Bentley
50b1493f84 Fix plugin arrays 2 2009-09-18 18:37:11 +01:00
Tim Bentley
2726479988 Arrival of the Audit
bzr-revno: 551
2009-09-18 17:33:35 +01:00
Jon Tibble
39499c712c Merge log.exception() conversion
bzr-revno: 550
2009-09-18 17:06:25 +01:00
Tim Bentley
66ec702dec head 2009-09-18 11:36:32 +01:00
Tim Bentley
8b65992307 requested cleanups 1 2009-09-17 19:24:13 +01:00
Jon Tibble
62f70d65ae Head 2009-09-17 18:05:42 +01:00
Tim Bentley
0c6a1d5762 head 2009-09-16 20:03:11 +01:00
Tim Bentley
30acdbd5a9 head 2009-09-16 20:00:39 +01:00
Tim Bentley
8b969449e7 changes 2009-09-16 20:00:17 +01:00
Tim Bentley
02f839f5cc Audit UI 3 2009-09-16 19:37:25 +01:00
Tim Bentley
74ac4adfe4 Audit UI 2009-09-16 05:59:38 +01:00
Jon Tibble
45ab7f80d8 Head 2009-09-15 21:06:39 +01:00
Tim Bentley
90584efee6 Renderer handling changes
bzr-revno: 543
2009-09-15 20:14:03 +01:00
Tim Bentley
41ec7a2108 render improvments part 3 2009-09-15 20:06:40 +01:00
Jon Tibble
ccb1289c14 User interface tweaks 2009-09-15 19:56:56 +01:00
Tim Bentley
1074f4b98f render improvments part 2 2009-09-15 19:37:03 +01:00
Tim Bentley
9f6caa5426 render improvments part 1 2009-09-15 18:45:32 +01:00
Tim Bentley
111c007526 Add audit event to slide times and trigger when added to live 2009-09-15 06:13:33 +01:00
Jon Tibble
77edf564fa Temp fix for size issue, cleanups in media and runtime output 2009-09-14 23:10:08 +01:00
Tim Bentley
1ef543253c Fix up Presentations so Impress works! 2009-09-13 08:39:48 +01:00
Tim Bentley
baf967bf2a head 2009-09-12 19:27:17 +01:00
Raoul Snyman
43dc7e6b90 Merged in lp:~raoul-snyman/openlp/docstrings
bzr-revno: 532
2009-09-12 19:24:16 +02:00
Tim Bentley
b005954e7e Head 2009-09-11 20:51:16 +01:00