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

784 Commits

Author SHA1 Message Date
rimach 2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Andreas Preikschat 71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00
Andreas Preikschat 94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat 5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat 2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat 360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat 33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat a42940b6bb - shortcuts only for live controller 
- removed v shortcut
 2011-10-24 17:36:59 +02:00
Andreas Preikschat cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat b603017b1c started work on shortcuts allowing jumping between different verses 
Fixes: https://launchpad.net/bugs/827862
 2011-10-23 19:47:15 +02:00
Andreas Preikschat 05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
rimach 599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley 9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Andreas Preikschat 45b296b741 clean up 2011-10-05 19:04:59 +02:00
Andreas Preikschat 1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat 201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat 360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat 88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
rimach c299efab1a update 2011-09-28 22:54:43 +02:00
rimach d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
Raoul Snyman 2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Tim Bentley e93a1d2687 Hide the screen on startup if only 1 screen 
Fixes: https://launchpad.net/bugs/800156
 2011-09-06 20:32:30 +01:00
Raoul Snyman 2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman 0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
rimach 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach c608301b0b review changes 2011-08-29 23:51:03 +02:00
rimach c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman 015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
rimach 565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
rimach crichter@web.de ed9d704db9 Head 2011-07-25 23:06:43 +02:00
Stevan Pettit 0d9f6a946e modified slidecontroller to "reset" the loop button when new item is sent live 2011-07-24 15:41:33 -04:00
rimach crichter@web.de 210926867f bugfixing 2011-07-20 22:47:29 +02:00
rimach crichter@web.de 146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de 65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Jon Tibble a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
rimach crichter@web.de 98e1028705 update 2011-07-10 23:43:07 +02:00
Tim Bentley 77a055a304 Head 2011-07-10 13:07:10 +01:00
Tim Bentley e9fb8e59c1 Allow service item themes to change and be added back to slide controller 
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
 2011-07-09 08:43:35 +01:00
Stevan Pettit 6a612ee107 Modified slidecontroller to change loop button icons and captions when user select a loop to run. 
Lines 1060-1061 and 1081-1082 cover the case if the user uses the dropdown to change the loop type (continuous or once)

Added the translated button captions to ui.py

in slidecontroller, changed Qicon to build_icon

bzr-revno: 1676
 2011-07-08 07:41:30 +01:00
Jon Tibble 1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble 623b56742c Cleanups 2011-07-07 19:03:12 +01:00
Stevan Pettit 856d44270f Changed use of Qicon to build_icon in slidecontroller 2011-07-07 13:38:13 -04:00
Stevan Pettit 1ffd5713b0 Modified slide controller to change loop button icons when selecting slide loops 2011-07-07 11:23:55 -04:00
Tim Bentley 091cdbbc24 Slow down slidecontroller events to allow buffers to clear. 
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
 2011-07-02 07:48:17 +01:00
Andreas Preikschat 1ff42f59de - added comments 
- qt name change
- remove test lines
 2011-06-25 06:36:43 +02:00
Raoul Snyman 509f739684 Fixed bug #791050 by hiding and then showing the toolbar. 2011-06-24 08:53:56 +02:00
Andreas Preikschat 47f5332bc3 Initial work on new image queuing (not working) 2011-06-21 22:28:22 +02:00
Andreas Preikschat 11cb39d2dc resize image in the thread not when adding the image 2011-06-21 13:37:28 +02:00
Andreas Preikschat dbef87021c minor clean ups; do not create qimage and then convert to qpixmap, instad create qpixmap directly 2011-06-21 12:10:53 +02:00
Jonathan Corwin 8cd128ddfe We don't want to resize 320x240 thumbnails back up to 1400x900 resolution just to display them in the slide controller! 2011-06-16 23:03:59 +01:00
rimach crichter@web.de 9dfb50951f bugfixing 2011-06-14 18:10:20 +02:00
rimach crichter@web.de 2c62a819b3 Head 2011-06-13 23:20:20 +02:00
Tim Bentley 608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Raoul Snyman d337ecacb6 Fixed bug #789046 and cleaned up one or two other things. 2011-06-11 23:04:52 +02:00
Jonathan Corwin 7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
rimach crichter@web.de c628b3aa09 bugfixing 2011-06-08 16:49:48 +02:00
rimach crichter@web.de 592af0e181 bugfixing 2011-06-08 15:18:05 +02:00
rimach crichter@web.de 43fe38c129 sync 2011-06-06 21:12:14 +02:00
rimach crichter@web.de dbce448da1 update 2011-06-05 23:10:49 +02:00
Jonathan Corwin c7a90102a2 Fix some startup blank/hide problems 2011-06-01 08:38:19 +01:00
Jonathan Corwin 9cd536e137 Fix the parent that whydoubt sneaked in 2011-05-29 21:46:13 +01:00
Jonathan Corwin 02da22c349 Head 2011-05-29 16:33:09 +01:00
Jeffrey S. Smith f80eb74e62 Merge changes from trunk 2011-05-28 14:03:31 -05:00
Jonathan Corwin 82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01:00
Jeffrey S. Smith 88f1f4065e Make 'continuous loop' button into a selection ('loop' or 'play to end') 2011-05-28 08:45:44 -05:00
Stevan Pettit 7ed1be6612 Fixed bug #788335 - Changed slidecontroller to correctly blank screen 2011-05-28 00:05:33 -04:00
Jonathan Corwin 37377b959d Change timed slide button tooltip to remove reference to looping, and add a few full stops to a few others. 
bzr-revno: 1586
 2011-05-27 21:14:41 +01:00
Jonathan Corwin cd4942657d Change timed slide tooltip to remove reference to looping, and fix periods on others 2011-05-27 18:42:54 +01:00
Andreas Preikschat 59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Tim Bentley 3ff2aa8006 Copyright updates 
bzr-revno: 1576
 2011-05-26 18:25:59 +01:00
Tim Bentley acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley 8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Joshua Miller 93ec7f52a1 Enable or disable looping of slides based on a checkbox in the general settings 
bzr-revno: 1575
Fixes: https://launchpad.net/bugs/739777
 2011-05-26 16:52:02 +01:00
Josh Miller 6b90adea6e Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py and changes can_loop directly to the setting required 2011-05-26 07:01:48 -04:00
Josh Miller 9221c8cb60 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too 2011-05-26 06:37:36 -04:00
Josh Miller 0a5155b822 Final changes to enabling looping of slides now it works 2011-05-25 20:11:56 -04:00
Andreas Preikschat 98d7cb5fe5 fixed object name 2011-05-25 11:10:57 +02:00
Andreas Preikschat 981c2f8c5b more name fixes 2011-05-25 10:32:37 +02:00
Josh Miller b92b733828 corrections and enable slide loop updates 2011-05-24 18:32:30 -04:00
Raoul Snyman 7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
rimach crichter@web.de 82a14745e3 cleanup, correct settings tab 2011-05-24 22:03:57 +02:00
Josh Miller 541feef8ea Another try at the code for enabling loop through a checkbox, seems to work as far as i see 2011-05-24 07:23:55 -04:00
Josh Miller 6b046d9afb Another try at the code for enabling loop through a checkbox in general settings as the signal but ignores it in slidecontroller for some odd reason acting like it's not there... 2011-05-23 19:23:00 -04:00
rimach crichter@web.de d39ecb8e8e Sync 2011-05-23 21:42:10 +02:00
Josh Miller 6d577395a4 A switch of code to see if it worked and doesn't for the enable loop 2011-05-22 17:39:37 -04:00
Josh Miller 33dcf7c439 This is a run of the 'enable slide loop' code that gushie showed me plus my checkbox code for it 2011-05-22 14:49:16 -04:00
Stevan Pettit cfe1903883 modified: 
openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
 2011-05-21 16:21:05 -04:00
Josh Miller eedecf6434 testing 2011-05-21 15:01:40 -04:00
rimach crichter@web.de 578e0fea3f cleanups, add settings dialog 2011-05-21 10:18:52 +02:00
Stevan Pettit 48148bc297 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
pending merges:
  Tim Bentley 2011-05-20 [merge] Stop preview media and presentations when...
    Tim Bentley 2011-05-20 Fix extra indent
    Tim Bentley 2011-05-20 [merge] Head
    Tim Bentley 2011-05-20 Stop the media / presentation if going from P...
 2011-05-20 21:30:23 -04:00
Stevan Pettit 31c1d23070 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
 2011-05-20 17:30:28 -04:00
Tim Bentley f09d64c1be Fix extra indent 2011-05-20 11:23:48 +01:00
Tim Bentley 66d851887a Stop the media / presentation if going from Preview to Live 
Fixes: https://launchpad.net/bugs/780095
 2011-05-20 11:01:48 +01:00
Stevan Pettit c4b0862979 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
 2011-05-20 01:01:49 -04:00
rimach crichter@web.de 43a55c7087 Sync 2011-05-17 23:11:46 +02:00
rimach crichter@web.de aebc0e240e further progress 2011-05-17 21:50:00 +02:00
Andreas Preikschat 6d1ec4ae10 - prevent setting the loop delay spin box to 0 
- Changed title for the stage view html
 2011-05-15 12:38:11 +02:00
Jonathan Corwin 55a5480ea4 Stage view changes: show all slides for a verse and tidy verse tags 
bzr-revno: 1540
 2011-05-13 18:43:38 +01:00
Jonathan Corwin e940279b34 More stageview changes 2011-05-12 00:16:53 +01:00
rimach crichter@web.de 2ccf6a67fa sync 2011-05-10 22:54:26 +02:00
rimach crichter@web.de d4162e814c next steps 2011-05-10 22:39:17 +02:00
Andreas Preikschat cd8e96b6a3 Fixed the order of components which need to update their screen information 2011-05-07 17:51:44 +02:00
Andreas Preikschat e1b1f7c6d0 fixed alert bug 2011-05-05 20:40:04 +02:00
Andreas Preikschat 2a7c5bd4de names changes 2011-05-05 17:16:55 +02:00
Andreas Preikschat 0c9bea3b50 - removed obsolete code 
- fixes
 2011-05-05 15:02:12 +02:00
Andreas Preikschat e25145a81b 2011-05-05 13:51:47 +02:00
Andreas Preikschat cbd7ae2afc - make start up smoother by setting up the displays correct the first time 
- do not pass screens as argument
 2011-05-04 19:31:02 +02:00
Tim Bentley 9e721a4824 More improvements 2011-04-29 19:43:29 +01:00
Andreas Preikschat 3ded22fc47 - added Start Loop and Stop Loop to the list of available shortcut actions 
- added a new (hidden) action to toggle the loop

bzr-revno: 1497
Fixes: https://launchpad.net/bugs/771966
 2011-04-29 07:26:20 +02:00
Tim Bentley e50dc0cfbf head1945 2011-04-28 17:52:46 +01:00
Andreas Preikschat aea4909201 added missing space 2011-04-28 18:36:53 +02:00
Andreas Preikschat e9ec8aaaaf added shorcuts for start/stop/toggle loop (#771966) 
Fixes: https://launchpad.net/bugs/771966
 2011-04-28 18:32:37 +02:00
Andreas Preikschat 9aa1f580d2 fixed right/left shortcuts 2011-04-28 08:36:04 +02:00
rimach crichter@web.de 392b5ecb47 head 2011-04-19 14:10:38 +02:00
rimach crichter@web.de 942fe8a141 further changes 2011-04-19 14:03:36 +02:00
rimach crichter@web.de 50ff8438a0 Video reimplementations issues 2011-04-18 21:50:12 +02:00
Tim Bentley f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Raoul Snyman 8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Jonathan Corwin 4a74230c6d Head 2011-04-14 22:34:35 +01:00
Jonathan Corwin 4286f6389d Switching from ppt to songs now fine 2011-04-14 22:34:01 +01:00
Andreas Preikschat 83e06b6eb1 don't allow to change the up/down shortcuts in the slidecontrollers 2011-04-14 20:05:00 +02:00
Jonathan Corwin d45423569f Head 2011-04-13 23:11:21 +01:00
Jonathan Corwin 5f93ff657e PPT's are getting there. Going from blank ppt to song broken now 2011-04-13 23:10:41 +01:00
Jonathan Corwin 1ce94d1c20 Fix theme image appearing between media images. Try and do same for ppt, but not yet. Broken the blank button... (it'll get worse before it gets better!) 2011-04-10 23:10:23 +01:00
Andreas Preikschat 9011c85a6b removed static methods 2011-04-09 18:11:02 +02:00
Andreas Preikschat 283171e296 use weight to sort categories 2011-04-09 16:50:44 +02:00
Jonathan Corwin 78a9c89025 Fix stuttering powerpoint start 2011-04-07 23:57:12 +01:00
Jonathan Corwin 9b04385f34 Blanking and switching between song and ppt and back 2011-04-06 23:54:47 +01:00
Andreas Preikschat 65f134ab1b removed fix (I'll deal with this in another branch) 2011-04-03 15:36:59 +02:00
Andreas Preikschat 28b83aadae translate categories 2011-04-03 13:36:43 +02:00
Andreas Preikschat e3d822f07a fixed strange save bug 2011-04-02 17:37:14 +02:00
Andreas Preikschat 7260f91825 restore butto nnow works 2011-04-02 16:22:08 +02:00
Andreas Preikschat 1a493b1fc8 possible fix for not working 'move selection down' 2011-04-01 18:53:39 +02:00
Andreas Preikschat df4de23df0 Added Theme, Blank, Desktop shortcuts, further clean ups 
Fixes: https://launchpad.net/bugs/739779
 2011-04-01 16:28:25 +02:00
Andreas Preikschat b17ad26672 make sure we save the default shortcut 2011-03-31 20:53:50 +02:00
Andreas Preikschat 4ca738e9b3 staticmethod for adding/removing actions 2011-03-31 10:43:19 +02:00
Andreas Preikschat d9c2d92c8c 2011-03-29 18:44:36 +02:00
Andreas Preikschat 19138cd9e5 started reworking shortcuts 2011-03-29 15:56:49 +02:00
Tim Bentley 2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley c8a7594685 Bye Bye RenderManager 2011-03-28 19:12:46 +01:00
Tim Bentley 70ca844473 Fix comments and errors 2011-03-26 19:50:15 +00:00
Tim Bentley afaf10f986 r1428 and fixes 2011-03-26 19:00:47 +00:00
Tim Bentley be7eeb9e6a r1421 2011-03-25 17:49:53 +00:00
Andreas Preikschat 2536e54677 r1418 2011-03-24 22:19:17 +01:00
Tim Bentley 5a80d5a606 remove print 2011-03-24 19:50:40 +00:00
Andreas Preikschat 67ee8394c2 moved version function 2011-03-24 20:12:27 +01:00
Raoul Snyman efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Tim Bentley 9836131025 Allow Preview Controller to request servicemanger to make the preview item live and add next to preview. 
Fixes: https://launchpad.net/bugs/730294
 2011-03-23 21:08:24 +00:00
Tim Bentley 63309d4f1a head 2011-03-20 18:43:51 +00:00
Tim Bentley caaf004f4c theme changes 2011-03-20 18:42:24 +00:00
Tim Bentley 333d654905 Fix slide advance for direct selection 
Fixes: https://launchpad.net/bugs/738694
 2011-03-20 14:11:24 +00:00
Andreas Preikschat d85991cdc8 changed SelectionMode 2011-03-18 20:15:45 +01:00
Andreas Preikschat e535c4e040 fixed Bug #727710 
Fixes: https://launchpad.net/bugs/727710
 2011-03-07 19:04:40 +01:00
Andreas Preikschat 632c1f8ade display 'Show Desktop' even with one screen 2011-03-05 19:38:33 +01:00
Andreas Preikschat 1ac13fa3ba 1353 2011-03-05 19:34:25 +01:00
Tim Bentley 128a24a57b Update comments 2011-03-04 17:21:50 +00:00
Andreas Preikschat 9ae56fa754 clean up 2011-03-04 16:31:34 +01:00
Andreas Preikschat 50818a6311 set 'Show Display' visible after changing the monitor setup 2011-03-04 16:21:50 +01:00
Tim Bentley b088e143f0 Speedup start up and remove black display 2011-03-03 21:10:55 +00:00
Raoul Snyman 780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Jon Tibble cb37a8bc17 Head r1311 2011-02-18 16:37:41 +00:00
Mattias Põldaru 4a8b29aae9 More changes, now internally tags are held not as Salm:1 (previously), nor v:1 (in the meantime), but just as in openlyrics format, v1. 
The v1a is not yet supported, it requires spinboxes to be changed first. The old and new should be handled silently side-by-side.

bzr-revno: 1310
 2011-02-18 17:51:04 +02:00
Mattias Põldaru aac40357ae better variable names, fixed translation issues for verse sequences 2011-02-18 02:48:58 +02:00
Mattias Põldaru dff393b6a4 just another massive set of changes 2011-02-17 21:46:01 +02:00
Jon Tibble 3951905e50 Head r1305 2011-02-16 14:21:10 +00:00
Jon Tibble 1fbc873a8c Cleanups 2011-02-16 03:28:06 +00:00
rimach 5fa9ace1ce at output for alternate shortcut 2011-02-14 22:06:48 +01:00
Jon Tibble ffd4d41760 Strings including Author Unknown 2011-02-13 15:11:06 +00:00
Jon Tibble e69819a3d3 Fix alertTabs 2011-02-12 16:07:11 +00:00
Tim Bentley 4a4f7d7ef4 Fix crash on blank of single display screen 
Fixes: https://launchpad.net/bugs/716843
 2011-02-11 17:28:14 +00:00
Jon Tibble 12d0867623 Plugin refactor: icons, tabs, mediaitems 2011-02-11 04:04:05 +00:00
Jon Tibble 45f9fa8f2f More translation refactors 2011-02-09 17:30:38 +00:00
Jon Tibble 5607b09f0d Dedupe translations 2011-02-09 05:04:12 +00:00
Tim Bentley 48e5fc0ced Fix previews after screen blanking on live controller 
bzr-revno: 1279
 2011-02-08 18:42:24 +00:00
Jon Tibble 943dcf1ffc Naming cleanups 2011-02-07 22:07:48 +00:00
Tim Bentley 975d9f6a1c Fix Song previews when returning from blank screen 2011-02-07 18:46:22 +00:00
Jon Tibble 3831e5d1c9 Slim down slidecontroller 2011-02-04 03:31:06 +00:00
Jon Tibble 70e7b549d5 UI library - shortcut_action 2011-02-04 02:56:59 +00:00
Jon Tibble 91540c221a Cleanups and fix song edit form 2011-02-01 18:05:59 +00:00
Jon Tibble 9744d246d6 Deduplication 2011-02-01 00:33:50 +00:00
Andreas Preikschat a2894b850f only allow to select one slide in the slidecontrollers 2011-01-27 17:40:17 +01:00
Andreas Preikschat 425c50cdb4 clean ups 2011-01-22 20:32:02 +01:00
Andreas Preikschat 4ff9157adf update preview frame, when using 'blank to screen/theme'; fixed bug when replacing live background when no item is live 2011-01-22 19:16:25 +01:00
Tim Bentley 479aa7a921 r1238 2011-01-22 11:20:50 +00:00
Tim Bentley b9cd9ca5a5 Merge Fix ups 2011-01-22 11:19:48 +00:00
Andreas Preikschat 8a26a6ef65 Service item selection (Bug #598393) 
bzr-revno: 1237
 2011-01-22 11:07:54 +00:00
Tim Bentley ac28cb5183 SlideController clean 2011-01-22 08:59:46 +00:00
Tim Bentley 98e1faef9a SlideController cleanups 2 2011-01-21 20:56:09 +00:00