Tim Bentley
77b0da2c41
Tidy ups pre merge
2009-11-29 19:00:10 +00:00
Tim Bentley
829e4976e2
Slide Controller refactoring ready for Verse changes
2009-11-29 08:33:46 +00: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
Raoul Snyman
d0832a2c86
Changed all the trUtf8(u'...') to trUtf8('...')
2009-11-26 20:43:49 +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
Raoul Snyman
9e96aac849
Make sure screen and button are still black after coming back from media.
2009-11-13 23:37:11 +02: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
3defb3b4c5
SPG
2009-11-13 17:42:51 +00:00
Jon Tibble
f764eb7d59
Fix imports
2009-11-12 23:58:19 +00:00
Tim Bentley
e62c482a2e
Slide Controller and Transition changes
2009-11-12 17:21:15 +00:00
Tim Bentley
1eb41aab78
SlideController cleanups
2009-11-11 19:10:38 +00:00
Tim Bentley
ab12f73a21
spacing cleanups
2009-11-10 20:44:02 +00:00
Tim Bentley
f778948abb
Reset Preview when exiting media
2009-11-10 06:13:59 +00:00
Tim Bentley
1c3c672e9b
Add Media Preview to slideController
2009-11-09 20:27:25 +00:00
Tim Bentley
bf63b2ae2f
Fix up toolbar handing to stop toolbar going off screen
...
Added Media Toolbar for the media items
Added it to Preview
Added and wired in a volume control
2009-11-09 05:58:45 +00:00
Tim Bentley
bc28e3e78f
Clean up slide sizes part 2
2009-11-08 17:40:43 +00:00
Tim Bentley
ebce104f30
Clean up slide sizes part 1
2009-11-08 17:02:46 +00:00
Tim Bentley
5b154b5941
Fix bugs in previous merges with icons and themes
2009-11-08 13:56:25 +00:00
Tim Bentley
f3f3906ca0
Add test to stop icons going over the limit
2009-11-08 09:09:23 +00:00
Tim Bentley
66a6dfd42a
Add icon to slidecontroller/nAdd inital icons /nFix ToolBar for Media"
2009-11-08 08:58:31 +00:00
Jonathan Corwin
c10b4742be
Presentation fixes
...
bzr-revno: 662
2009-11-07 19:39:52 +00:00
Jonathan Corwin
337df8da9f
Fix Impress off-by-one and slow slide update problems Meths found
2009-11-07 16:45:49 +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
Jonathan Corwin
e931fa023a
Address some issues with preview slide controller and presentations
2009-11-05 23:21:23 +00:00
Tim Bentley
831281e293
More remote editing cleanups
2009-11-05 17:03:37 +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
Jon Tibble
84ce96f989
More truth testing cleanup - core
2009-11-03 18:14:25 +00:00
Tim Bentley
8c77de16c4
Cleanup Remote Editing again
2009-11-03 06:15:35 +00:00
Jon Tibble
ad69f754b8
Enable multiple videos without restart
2009-11-02 01:03:27 +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
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
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
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
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
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
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
a94f5c9e0d
Merge from lp:~raoul-snyman/openlp/i18n
...
bzr-revno: 621
2009-10-24 11:33:20 +02: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
Raoul Snyman
8d4cdc71ba
Initial go at i18n
2009-10-23 15:17:43 +02:00
Raoul Snyman
2bf6fe0227
Made the dark->lighter selection colour slightly stronger.
2009-10-21 21:39:55 +02: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
Raoul Snyman
a7eadfc70b
Merged lp:~raoul-snyman/openlp/uifixes
...
bzr-revno: 608
2009-10-18 17:02:58 +02:00
Raoul Snyman
13305ab6bb
Some more UI fixes (mostly for Windows).
2009-10-18 00:06:38 +02:00
Jonathan Corwin
2ae79a4480
HEAD
2009-10-17 20:06:06 +01:00
Tim Bentley
7273ff3d2f
Display Screen handling improvements
2009-10-17 17:11:41 +01:00
Jonathan Corwin
bb619ce325
Show powerpoint slide thumbnails in slidecontroller
2009-10-17 00:34:56 +01:00
Tim Bentley
cbb17039d5
Fix missing serviceitem handling
2009-10-16 19:22:14 +01:00
Jonathan Corwin
1cf3c9a223
Support blank/first/last buttons in presentations
2009-10-03 20:18:59 +01:00
Jon Tibble
ce18ee8e7a
Dialogs, Exceptions and PushButtons
2009-10-02 00:43:16 +01:00
Jon Tibble
8a44484aee
Fix None testing and general cleanups
2009-09-26 00:06:54 +01:00
Jon Tibble
8777ca29a7
Import fixes
2009-09-25 15:13:33 +01:00
Jon Tibble
e5db2456e7
Remove unused imports
2009-09-25 01:43:42 +01:00
Jon Tibble
98ea9141f4
More white space and line length fixes
2009-09-21 18:56:36 +01:00
Tim Bentley
aff79f0f35
Stop audit in being fired in error
2009-09-20 08:38:23 +01:00
Tim Bentley
5046b31f16
Clean up slide controller
2009-09-20 08:12:47 +01:00
Tim Bentley
66ec702dec
head
2009-09-18 11:36:32 +01:00
Tim Bentley
43b7951693
Fix presentation array issue
2009-09-18 07:07:10 +01:00
Tim Bentley
0c6a1d5762
head
2009-09-16 20:03:11 +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
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
Tim Bentley
bb6c4b091a
Fix merge error
2009-09-14 20:37:29 +01:00
Tim Bentley
942932a45e
Fix merge error
...
bzr-revno: 541
2009-09-14 20:36:50 +01:00
Tim Bentley
dd70e31779
Themes and Timer points
...
bzr-revno: 540
2009-09-14 20:29:52 +01:00
maikelstuivenberg@gmail.com
66ef9d8579
For Maikel
...
bzr-revno: 539
2009-09-14 20:28:56 +01:00
Tim Bentley
a500e283a1
Add Rendering timer points
2009-09-14 20:18:49 +01:00
Maikel Stuivenberg
3d4f221c19
Added: Button on PreviewController to go live
2009-09-14 14:16:04 +02:00
Tim Bentley
f4599bf947
Fixed reset presentation bug
2009-09-13 20:31:31 +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
43b374a994
Impress issues
2009-09-11 20:51:06 +01:00
Tim Bentley
07452df24a
fixes to custom and save state of screen
2009-09-11 20:29:57 +01:00
Raoul Snyman
fb9914fb08
Changed the license info from docstrings to normal comments.
2009-09-08 21:58:05 +02:00
Tim Bentley
feca90483a
Cleanups from Last merge and documentation
2009-09-07 06:13:39 +01:00
Tim Bentley
4a5767a5cf
Move fixups for Presentations
2009-09-06 20:23:57 +01:00
Tim Bentley
7e398174cf
Presentation plugin - getting there
2009-09-05 20:58:02 +01:00
Tim Bentley
3784838a36
Presentations - service item handling
2009-09-05 14:30:09 +01:00
Tim Bentley
555b9b92a5
Renderer - speed up adding to slide controller
2009-09-03 05:41:30 +01:00
Tim Bentley
4c2b9fe426
Presentation changes - Items to service Manager
2009-08-31 15:04:00 +01:00
Tim Bentley
9931eaa881
Slide Controller fix preview size
2009-08-29 09:17:40 +01:00
Tim Bentley
eca69df868
Slide Controller rewrite complete
2009-08-29 08:17:56 +01:00
Tim Bentley
66a543125b
Slide Controller fix keyboard and Image timer loop
2009-08-29 07:12:01 +01:00
Tim Bentley
af82682348
Images can only loop if more than 1
2009-08-28 19:27:32 +01:00
Tim Bentley
0c9fcd0571
Fix toolbar code to hide / add items
2009-08-28 18:40:07 +01:00
Tim Bentley
ed385ec31d
SlideController cleanup - merge Main and Image
2009-08-27 06:17:20 +01:00
Tim Bentley
41782ae8a7
SlideController clean up part 3
2009-08-24 06:10:04 +01:00
Tim Bentley
7ec0a53d77
SlideController clean up part 2
2009-08-24 05:30:04 +01:00
Tim Bentley
57f04820f0
SlideController clean up part 1
2009-08-23 21:15:05 +01:00
Tim Bentley
161973eef6
Clean up exit code so plugins can be called
...
Clean up Alerts Tab so can be called from UI and Remote via events
Start to get events to be called sequentially not nested
Fix up merge issues
2009-08-10 21:10:20 +01:00
Raoul Snyman
82101b8c65
Fixed a few bits and bobs
2009-08-09 14:05:54 +02:00
Raoul Snyman
7a0f9d3e06
Added some fixes to the operation and layout of the slide controllers.
2009-07-12 22:38:34 +02:00
Tim Bentley
ccb85f8f4b
Docstring cleanups
...
Finish adding base preview pluing
2009-07-11 06:18:34 +01:00
Tim Bentley
209f92439c
Remove Not used files and References
...
Fixes from Last Merge
ThemeManager Cleanup MVC.
2009-07-06 17:34:13 +01:00
Tim Bentley
1110713529
Fix bug in bibles with invalid method name
...
Add Image Tab to get loop delay
Fix loss of Bible Icons
Add Loop delay to ImageController
Get Controllers to swap correctly
2009-07-03 21:32:33 +01:00
Tim Bentley
f586d9bf5e
Update images and rename some.
...
More changes to slidecontroller and friends
2009-07-03 20:08:21 +01:00
Tim Bentley
3c71e91498
Fix up rendering a bit
...
Re-write the slide controller so it looks better (big clean up)
Fix themes where backgrounds are png files so they do not become phantom themes
start to sort out conversions
Hide openoffice at startup
2009-07-02 20:04:50 +01:00
Tim Bentley
560584d8f6
Added ImageToolBar to show what I am thinking
...
Cleanup mainwindow from mark 1 attempt.
Fix bug in Thememanager so themes are not deleted
2009-06-29 06:07:32 +01:00
Tim Bentley
7927080838
More changes to get plugable slideControllers to work
2009-06-28 07:54:12 +01:00
Tim Bentley
0b0013331a
Commit Fixes to Conversion Utilities
...
Changes to Presentation Plugin
2009-06-23 17:25:40 +01:00
Raoul Snyman
cd11ae92a7
Changed key events to up/down = up/down slides, pgup = first, pgdn = last
2009-06-21 21:41:01 +02:00
Tim Bentley
c0df49e551
Page Up / Down work on Slide Controller
...
Remove print statements
2009-06-21 17:26:33 +01:00
Tim Bentley
5303d0673b
Fix up Image plugin so it now works again!
...
Render the images correctly to reflect the screen size
Add images to slide controller
Fix ImagePlugin selction criteria
Amend the loing format.
2009-06-20 11:44:12 +01:00
Tim Bentley
e2b8af7073
Mass Unicode migration
...
Fix bugs found in retesting the app.
2009-06-16 19:21:24 +01:00
Tim Bentley
c7b650be01
More performance changes
2009-06-10 17:20:57 +01:00
Tim Bentley
7a05a944ef
Changes to improve performance.
2009-06-10 16:54:46 +01:00
Raoul Snyman
a8307e430b
Changed QPixmaps to QImages to see the difference.
2009-06-10 17:37:33 +02:00
Tim Bentley
ed73a78e95
Add double clicks to songs and customSlide
...
More code cleanups
2009-06-07 20:34:24 +01:00
Tim Bentley
2157699814
Fix up serviceitem for better interface
...
Fix extra rndering cycle from Servicemanager
Fix Image / Custom / Bibles / Songs to use new interface
2009-06-05 20:00:57 +01:00
Tim Bentley
5b58f7137f
Fix Database defaults
...
Add Topic Dialog and add functionality
Add Topic code to Song window
2009-06-04 20:00:41 +01:00
Raoul Snyman
3561ede5b0
A number of style cleanups.
...
bzr-revno: 453
2009-06-02 21:02:12 +02:00
Tim Bentley
a2034dd132
Fixed Renderer to split lines and pages,
...
ServiceItem now handles them.
2009-06-02 17:25:36 +01:00
Raoul Snyman
624b466b57
Changed the SlideController to look MUCH nicer.
...
bzr-revno: 451
2009-06-01 21:47:05 +02:00
Tim Bentley
47ca07ae15
fixes
2009-06-01 19:52:22 +01:00
Tim Bentley
971be91bad
Fix commit due to missing
2009-06-01 19:37:06 +01:00
Tim Bentley
30154f2127
Lots for fixes:
...
- General Tab now saves and retrieves
- Alert Dialogs now alerts
- Renderer - More fixes
- SlideController looks better.
- Removal of poked in Managers all accessed via Parent.
2009-06-01 18:50:37 +01:00
Tim Bentley
da0acea229
Phase1 operation superfly
2009-05-20 21:17:20 +01:00
Tim Bentley
df51cd18d4
Close display window on exit
...
Performance improvements in renderer
Performance improvements in Thememanager
Fix review comments from last few reviews
Add new media types to media plugin_helpers
Code format cleanups.
2009-05-16 11:24:03 +01:00
Tim Bentley
93a175a50e
ServiceManager now sends data to Preview and Live Controllers
...
ServiceManager now selects verses to start with.
2009-05-14 19:00:36 +01:00
Tim Bentley
0ba52fbd66
Added context menus to ServiceManager
...
Refactored Icon Construction to single method
2009-05-13 20:47:25 +01:00
Tim Bentley
8c7c71e0c0
Add Preview , Live and Service to ServiceManager
...
Remove unwanted Drag and drop stuff
Clean up remanants
2009-05-13 17:41:05 +01:00
Tim Bentley
bc1c714693
Add drag and drop eventing to Bibles and Images
...
Revamp Pluging drag and drop code to handle class clashing
Add Drag and drop code to SlideController
Start to hook up servicemanger with slide controller.
2009-05-12 22:06:35 +01:00
Tim Bentley
b2d2de6ad8
Add Preformance Monitoring for Renderer
...
Fix Pixmap problems with pixelation
Remove duplicate image plugin issue.
2009-05-11 06:09:43 +01:00
Tim Bentley
a7d1ba85ed
Add drag and drop to customplugin and expand it on servicemanager.py
...
Replace MVC in servicemanager.py
Add Event processing to trigger plugin to pust item to service manager
2009-05-09 08:01:33 +01:00
Tim Bentley
13766fc7c7
Fixes to formatting and rendering
...
Add Blank screen functionality
2009-05-04 14:48:12 +01:00
Tim Bentley
ce3d1cffc6
Add Buttonsbar to slidecontroller and add actions
...
Add Buttons to ServiceManager
Add Slide up/Down to slidecontroller.py
Fix missing data on selection in bibles and custom plugins
2009-05-04 09:15:48 +01:00
Tim Bentley
e5ba8b73a6
More servicing changes (Preview and Live) behave and can be selected.
...
Setup Slidecontroller so it has an identity
Setup SlideController so it knows anout the display
Fix maindisplay view bugs
2009-05-03 08:20:15 +01:00
Tim Bentley
183a7e54c7
Add servicemanager access from Plugins
...
Add bibles to preview , live and servicemanager.py
Add icons to servicemanager lists
Fix thememanager to work with missing theme
2009-05-02 19:56:27 +01:00
Tim Bentley
0d27d61b7f
At last first attemp at serviceitem
2009-05-02 12:16:08 +01:00
Tim Bentley
ca0893caba
Undo changes so diffs can be applied.
2009-05-02 12:12:32 +01:00
Tim Bentley
b201aa30d5
First attempt at serviceitem code
2009-05-02 12:00:35 +01:00
Tim Bentley
4fc7b974fa
Fix Rendering to allow dynamic placement of Main and Footers
...
Fix bugs in CustomPlugin
2009-04-30 22:02:28 +01:00
Tim Bentley
2457da9d88
Add version number to splash screem
...
Add ability to preview to preview controller
Add render manager to control rendering
Fix bugs in renderer
Add inital rendering to custom and bible plugins
2009-04-25 07:11:15 +01:00
Martin Thompson
ad48e1f4e6
Allowed slide contrllers to be passed to the plugins. It's broken at
...
the moment though!
bzr-revno: 331
2009-02-20 21:13:04 +00:00
Martin Thompson
2c85368ee2
Split slide controllers out - but now they don't size properly...
...
bzr-revno: 303
2009-02-10 20:47:44 +00:00
Martin Thompson
f758850865
Started adding stuff for slide controller
...
bzr-revno: 302
2009-02-10 20:47:16 +00:00