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
Jonathan Corwin
732f5321dd
indent
2011-05-20 23:32:46 +01:00
Jonathan Corwin
bbbf0d3435
Go live/add to service via list
2011-05-20 23:30:20 +01:00
Stevan Pettit
31c1d23070
modified:
...
openlp/core/lib/mediamanageritem.py
openlp/core/ui/slidecontroller.py
2011-05-20 17:30:28 -04:00
Andreas Preikschat
f753070f53
fix for windows
2011-05-20 19:06:38 +02:00
Gerald Britton
a5a8c0d6d2
Fix Words of Worship import to issue error message for files missing the expected header
2011-05-20 12:34:44 -04:00
Tim Bentley
14435e9725
Stop preview media and presentations when moving them live
...
bzr-revno: 1558
2011-05-20 17:15:24 +01:00
Andreas Preikschat
5a7aa2fb9f
do not override list
2011-05-20 17:18:57 +02:00
Andreas Preikschat
3359726be2
improved media item sorting
2011-05-20 17:14:10 +02:00
Andreas Preikschat
383670e446
use the awesome mainwindow progress bar
2011-05-20 17:00:27 +02:00
Andreas Preikschat
304f4ff732
added menu entry to update the theme images
2011-05-20 13:45:39 +02:00
Tim Bentley
f09d64c1be
Fix extra indent
2011-05-20 11:23:48 +01:00
Tim Bentley
cec32eae0f
Head
2011-05-20 11:09:51 +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
Andreas Preikschat
7098bcd4f5
r1557
2011-05-20 07:50:57 +02:00
Stevan Pettit
00a2a7b771
modified:
...
openlp/core/lib/mediamanageritem.py
2011-05-20 01:19:26 -04:00
Stevan Pettit
c4b0862979
modified:
...
openlp/core/lib/mediamanageritem.py
openlp/core/ui/slidecontroller.py
2011-05-20 01:01:49 -04:00
Jonathan Corwin
d4e83ae45a
Remote web add to service
2011-05-20 00:09:42 +01:00
Stevan Pettit
af5fdcf73d
modified:
...
openlp/plugins/custom/lib/mediaitem.py
2011-05-19 18:34:46 -04:00
Stevan Pettit
206ee04db6
modified:
...
openlp/plugins/custom/forms/editcustomform.py
openlp/plugins/custom/lib/mediaitem.py
openlp/plugins/songs/forms/editsongform.py
openlp/plugins/songs/lib/mediaitem.py
2011-05-19 18:20:00 -04:00
Tim Bentley
32127d51bb
Add Search to Custom
...
bzr-revno: 1557
2011-05-19 17:10:49 +01:00
Andreas Preikschat
875202deca
reverted changes
2011-05-19 08:01:28 +02:00
Stevan Pettit
fc5b72b0b4
Add the ability to double-click a slide entry in custom to edit the slide.
...
bzr-revno: 1556
2011-05-19 07:37:05 +02:00
Andreas Preikschat
f537f91939
Improved regex usage.
...
bzr-revno: 1555
2011-05-19 07:29:50 +02:00
Tim Bentley
0c2196339a
Fix search order
2011-05-19 05:48:10 +01:00
Tim Bentley
cff081066f
Head
2011-05-19 05:42:10 +01:00
Stevan Pettit
e3ca10b46f
modified:
...
openlp/plugins/custom/forms/editcustomform.py
2011-05-18 23:19:36 -04:00
Armin Köhler
8c308ac4f8
Fixed bug #779995 : FoilPresenter songs with verses without text cause a traceback.
...
bzr-revno: 1554
2011-05-18 22:56:18 +02:00
Jonathan Corwin
4a64dfe3db
Fix stack trace when editing a song
...
bzr-revno: 1553
Fixes: https://launchpad.net/bugs/784800
2011-05-18 20:57:31 +01:00
Armin Köhler
674260eadb
fix bug https://bugs.launchpad.net/openlp/+bug/779995
2011-05-18 21:07:08 +02:00
Jonathan Corwin
7b534642b9
Plan B. Figure out what the code is actually meant to be doing
2011-05-18 19:59:36 +01:00
Armin Köhler
f222c3d583
HEAD r1552
2011-05-18 20:46:34 +02:00
Jonathan Corwin
3add2de140
Fix song editing what I did broke. Oops
2011-05-18 19:32:18 +01:00
Jonathan Corwin
6af93d4561
head
2011-05-18 19:26:27 +01:00
Armin Köhler
c51d8182a6
delete all sucessfull imported bibles by default
...
remove the possibility to choose which bibles should be deleted after the upgrade
2011-05-18 20:19:11 +02:00
Armin Köhler
236ca44105
HEAD r1552
2011-05-18 20:00:40 +02:00
Tim Bentley
d6ea529411
Fix description 2
2011-05-18 16:01:33 +01:00
Tim Bentley
67be2937be
Fix description
2011-05-18 15:34:35 +01:00
Tim Bentley
509811620d
Head
2011-05-18 15:27:29 +01:00
Andreas Preikschat
4cd23308b8
regex clean ups
2011-05-18 16:26:19 +02:00
Andreas Preikschat
a56f98baee
r1552
2011-05-18 16:06:33 +02:00
Andreas Preikschat
856689e72c
r1552
2011-05-18 15:46:56 +02:00
Andreas Preikschat
30a6d46cd8
Added missing html tag.
...
bzr-revno: 1552
2011-05-18 12:48:21 +02:00
Jonathan Corwin
e29e8fa024
For non-text items, populate verse fields with the filename so remote apps have something useful to display. Update web remote to display the verse tag in the slide controller.
...
bzr-revno: 1551
2011-05-18 07:59:23 +01:00
Josh Miller
fab9706402
this is a test
2011-05-17 21:46:20 -04:00
Jonathan Corwin
2d5d16b40b
Return filename in text for non-text types. Display verse tag in remote view
2011-05-17 23:00:50 +01:00
Jonathan Corwin
c23e5e784e
head
2011-05-17 22:28:46 +01:00
Jonathan Corwin
0323dfcb90
Add ability to search and go live on all media manager items via the web remote. Also tweak the web interface to fit better on a phone screen
...
bzr-revno: 1550
2011-05-17 22:22:24 +01:00
rimach crichter@web.de
43a55c7087
Sync
2011-05-17 23:11:46 +02:00
