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

6694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
14435e9725 Stop preview media and presentations when moving them live 
bzr-revno: 1558
 2011-05-20 17:15:24 +01: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
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
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
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
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
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
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
Andreas Preikschat
957f4accb0 fixed broken html head 2011-05-17 20:55:45 +02:00
Andreas Preikschat
df86a729e6 r1549 2011-05-17 20:50:37 +02:00
Jonathan Corwin
7a857290a6 More fixes 2011-05-17 19:48:04 +01:00
Jonathan Corwin
5fcb41bc9d fixes 2011-05-16 22:01:21 +01:00
Tim Bentley
a66b582484 Head 2011-05-16 18:59:02 +01:00
Tim Bentley
dfbf368c8a Sort images 2011-05-16 18:58:52 +01:00
Andreas Preikschat
b92d437a8d - fixed a traceback which occurred when performing a text search but no bible is available 
bzr-revno: 1549
 2011-05-16 13:13:57 +02:00
Jonathan Corwin
274c4ee87a tidies 2011-05-15 21:53:25 +01:00
Jonathan Corwin
f701eb9417 Head 2011-05-15 21:34:32 +01:00
Jonathan Corwin
2655c1b133 Remote searches presentations, media and images 2011-05-15 21:03:45 +01:00
Tim Bentley
070d719961 Fixes 2011-05-15 20:18:50 +01:00
Tim Bentley
387c911fdb Head 2011-05-15 20:07:53 +01:00
Tim Bentley
70660b7b71 Add Search to Custom and cleanups 2011-05-15 20:07:40 +01:00
Tim Bentley
1ea9c51c20 Reset dialogs on Cancel and minor cleanups 
bzr-revno: 1548
 2011-05-15 20:06:34 +01:00
Jonathan Corwin
3f21b3e2ca Remote custom search. Revert a few remote web changes 2011-05-15 19:33:00 +01:00
Tim Bentley
9fc67eba68 Spelling 2011-05-15 17:36:34 +01:00
Tim Bentley
0786f2059e Add dialog reset on cancelled exit of Settings. 
Remove PreLoad() is no longer needed.
Rename preLoad is displayTags to say what it means.

Fixes: https://launchpad.net/bugs/778537
 2011-05-15 16:52:20 +01:00