rimach
|
eaef48e708
|
resolve merge proposal request
|
2010-05-12 23:44:00 +02:00 |
|
rimach
|
294b0abfc0
|
remove unused imports, correct import order
|
2010-05-11 23:05:08 +02:00 |
|
rimach
|
e0664a1e88
|
bugfixing for i18n
|
2010-05-11 21:00:21 +02:00 |
|
rimach
|
16b202d8b5
|
Head
|
2010-05-10 22:44:38 +02:00 |
|
Tim Bentley
|
a8fc728b99
|
Turbo change the screen renderer by adding a cache
Fix names which are incorrect
bzr-revno: 814
|
2010-05-10 21:08:55 +01:00 |
|
Tim Bentley
|
be85eb8999
|
Head813
|
2010-05-10 20:48:29 +01:00 |
|
Martin Thompson
|
dcc10d06db
|
Merged from mjthompson/qt4.4
bzr-revno: 813
|
2010-05-10 20:43:29 +01:00 |
|
Tim Bentley
|
f7244c5e6e
|
Remove comments and simplify
|
2010-05-10 19:29:51 +01:00 |
|
Tim Bentley
|
51728db0b6
|
Add cache to renderer
|
2010-05-10 19:19:45 +01:00 |
|
rimach
|
2ee1c5ed9b
|
load correct settings for translation
|
2010-05-10 19:56:29 +02:00 |
|
Martin Thompson
|
a8a7e675a4
|
Updated from review comments
|
2010-05-09 21:02:38 +01:00 |
|
rimach
|
ae36bc2bb9
|
Head
|
2010-05-09 10:47:57 +02:00 |
|
Martin Thompson
|
efa1e8c2d9
|
Quick fix to handle Bible config gets confused and returns None
|
2010-05-07 21:29:21 +01:00 |
|
Tim Bentley
|
fa99ba64b1
|
Fix names
|
2010-05-07 19:29:17 +01:00 |
|
Martin Thompson
|
d04d75ad41
|
More changes to suit pyqt4.4
|
2010-05-06 21:41:42 +01:00 |
|
Martin Thompson
|
c613773bfb
|
Merged trunk
|
2010-05-06 21:30:23 +01:00 |
|
Martin Thompson
|
dbdf681165
|
More changes to suit pyqt4.4
|
2010-05-06 21:30:08 +01:00 |
|
Tim Bentley
|
60116ee8d6
|
Correctly default initial display on 1st setup
Stop timer on New service Item
Stop serviceitems being played if no player available.
bzr-revno: 812
|
2010-05-06 18:55:04 +01:00 |
|
Tim Bentley
|
14912955ae
|
Remove ?
|
2010-05-06 17:51:57 +01:00 |
|
Tim Bentley
|
6c9c9848db
|
Clean up fixes
|
2010-05-06 17:49:12 +01:00 |
|
Martin Thompson
|
6f8e3f7ea2
|
Fixed a qt4.5ism
|
2010-05-05 20:57:20 +01:00 |
|
Tim Bentley
|
0e7fb1c80c
|
minor errors
|
2010-05-05 20:21:05 +01:00 |
|
Tim Bentley
|
fd22b01e59
|
Head811
|
2010-05-05 20:15:09 +01:00 |
|
Tim Bentley
|
27a963a9c2
|
Validate Service item viewer loading
|
2010-05-05 20:14:48 +01:00 |
|
Jonathan Corwin
|
3f569d428d
|
Remotes: support more filetypes and subfolders for web
presentation_hide signal support
bzr-revno: 811
|
2010-05-05 19:29:08 +01:00 |
|
Tim Bentley
|
a8bbd540d4
|
service loading prefix check
|
2010-05-05 19:07:57 +01:00 |
|
Tim Bentley
|
e1f97fc9b9
|
Fix initial display
|
2010-05-05 18:35:11 +01:00 |
|
rimach
|
66ec680e4e
|
remove else from toolbar.py
|
2010-05-05 19:17:00 +02:00 |
|
rimach
|
4661756d68
|
Head
|
2010-05-05 19:09:23 +02:00 |
|
Jonathan Corwin
|
4f8d058928
|
rename get to send and allow webpages to be served from subfolders
|
2010-05-04 22:49:02 +01:00 |
|
Tim Bentley
|
e0bfaf07bc
|
Cleanup and finish bits
|
2010-05-04 21:01:45 +01:00 |
|
Tim Bentley
|
a0d081186a
|
Head
|
2010-05-04 19:03:31 +01:00 |
|
Raoul Snyman
|
108d3244c9
|
Documentation!
bzr-revno: 810
|
2010-05-04 19:53:27 +02:00 |
|
Jonathan Corwin
|
465ce8c7f7
|
web fixes, allow more file types. Slidecontroller_hide event
|
2010-05-03 22:49:42 +01:00 |
|
rimach
|
0c061087e9
|
Head
|
2010-05-03 22:39:06 +02:00 |
|
Tim Bentley
|
4d9f429ae0
|
Fix bible spelling in database
bzr-revno: 809
|
2010-05-03 07:12:59 +01:00 |
|
Jonathan Corwin
|
456d35f2d4
|
Fix image qstring
|
2010-05-01 23:02:31 +01:00 |
|
rimach
|
850b4a507f
|
correction for last merge proposal
|
2010-05-01 22:01:32 +02:00 |
|
Raoul Snyman
|
fff2d780eb
|
HEAD
|
2010-05-01 22:00:01 +02:00 |
|
rimach
|
4e296bfb5f
|
changes
|
2010-05-01 21:45:06 +02:00 |
|
Tim Bentley
|
af10116c49
|
Fix Presentations and add DnD to serviceitem updates
bzr-revno: 808
|
2010-05-01 14:18:56 +01:00 |
|
Tim Bentley
|
40ad9729ba
|
Head 807
|
2010-05-01 14:06:22 +01:00 |
|
Tim Bentley
|
4ffb7d8a18
|
Fix up drag and Drop for service items
|
2010-05-01 14:05:17 +01:00 |
|
Jonathan Corwin
|
7c91c9f0c9
|
Remote operation via web
bzr-revno: 807
|
2010-05-01 14:04:31 +01:00 |
|
Jonathan Corwin
|
9ef2b13ad6
|
comments, update client, load html from disk, blanking
|
2010-05-01 13:10:48 +01:00 |
|
Jonathan Corwin
|
6c52ad359f
|
head again, perhaps I should have waited
|
2010-05-01 10:02:47 +01:00 |
|
Tim Bentley
|
4c133deb8d
|
Fix loop in ending video to stop crashes.
Add comments
rename _frame and _frameOP
bzr-revno: 806
|
2010-05-01 09:56:07 +01:00 |
|
Jonathan Corwin
|
12810ad34a
|
Head
|
2010-05-01 09:46:06 +01:00 |
|
Tim Bentley
|
13922b0599
|
Renames for consistancy
|
2010-05-01 07:58:41 +01:00 |
|
Tim Bentley
|
077933d703
|
Head 805
|
2010-05-01 07:50:43 +01:00 |
|