Martin Thompson
f7fafae09c
Fixed merge fail
2010-09-15 21:46:16 +01:00
rimach
ad6294ffcc
simplify icon name settings
2010-09-15 22:23:03 +02:00
Martin Thompson
ebf3ce587d
Tweaks from review
2010-09-15 21:12:03 +01:00
rimach
84a6c273fe
Python 2.5 cant handle unicode strings in optparse
2010-09-15 20:07:08 +02:00
rimach
a308c66aa9
Python 2.5 cant handle unicode strings in optparse
2010-09-15 20:06:30 +02:00
Tim Bentley
bc537365bd
Speed up render
2010-09-15 19:03:54 +01:00
rimach
915842a311
Head
2010-09-15 19:57:44 +02:00
rimach
3bc527e4fc
bugfixing
2010-09-15 19:55:27 +02:00
Tim Bentley
c21903cf32
Head
2010-09-15 18:36:39 +01:00
Andreas Preikschat
1fc64a6ebf
clean ups
2010-09-15 19:04:33 +02:00
Andreas Preikschat
d4ffc72c17
clean ups
2010-09-15 18:52:22 +02:00
Raoul Snyman
28d3544964
Fix for bug #635515 .
...
Added an option to disable the error form.
bzr-revno: 1034
2010-09-15 17:03:57 +02:00
Raoul Snyman
67eb7300d3
Re-aligned parser options.
...
Fixed a bug we all missed :-)
2010-09-15 14:23:42 +02:00
Raoul Snyman
096b55b0e8
Merged from remote branch.
2010-09-15 09:14:03 +02:00
Raoul Snyman
aa0d23d22f
Add in code to display a disabled message if an importer is not available.
...
bzr-revno: 1033
2010-09-15 07:16:27 +02:00
rimach
988b7506df
Head
2010-09-14 23:56:27 +02:00
Raoul Snyman
ef9684320c
HEAD
2010-09-14 22:34:44 +02:00
Raoul Snyman
2f33ae1bab
Add in code to display a disabled message if an importer is not available.
2010-09-14 22:33:33 +02:00
Raoul Snyman
da15d252bc
Fix for bug #635515 .
...
Added a command line parameter to bypass the exception form.
2010-09-14 22:06:01 +02:00
Raoul Snyman
bfd6439dc4
HEAD
2010-09-14 22:03:55 +02:00
rimach
c53731d74b
media items' __init__ methods
2010-09-14 20:34:39 +02:00
rimach
2d47e2523c
remove executable flag
2010-09-14 20:18:47 +02:00
Andreas Preikschat
4aba7e3357
change bible title in service manager (NOT nice)
2010-09-14 20:07:38 +02:00
rimach
43b7e84106
Head
2010-09-14 19:49:21 +02:00
rimach
33f49f7d4a
Head
2010-09-14 19:46:39 +02:00
rimach
22304d491d
correct coding rules, some optimizations
2010-09-14 19:46:21 +02:00
Tim Bentley
774c2ac61e
Fix whitespace and bugs
...
bzr-revno: 1032
2010-09-14 18:39:42 +01:00
Tim Bentley
627ba9626c
Fix errors in merge
2010-09-14 18:29:56 +01:00
Tim Bentley
fe21b6be12
Fix video crashing
...
Fixes: https://launchpad.net/bugs/637886
2010-09-14 18:06:08 +01:00
Tim Bentley
d476e63621
fix service editing crashing
...
Fixes: https://launchpad.net/bugs/637547
2010-09-14 18:05:05 +01:00
Tim Bentley
efb58a710f
Remove whitespace
2010-09-14 17:44:21 +01:00
Jon Tibble
28f8dbcfe3
Cleanups
...
bzr-revno: 1031
2010-09-14 16:32:39 +01:00
Jon Tibble
1968803619
More cleanups
2010-09-14 15:43:21 +01:00
Jon Tibble
5fe753c833
Cleanups
2010-09-14 15:21:44 +01:00
Jon Tibble
23859bb241
Head r1030
2010-09-14 14:04:04 +01:00
Raoul Snyman
0a84fc0bcc
Added extra labels to show that an item is disabled.
...
Added functionality to the SongFormat class to keep track of availability of importers.
2010-09-13 23:09:13 +02:00
Martin Thompson
a8dd0f5ddc
Merged and fixed importing of 'other' verse types
2010-09-13 21:12:45 +01:00
Jonathan Corwin
6f6a253163
Head
2010-09-13 20:23:37 +01:00
rimach
8e8a6e42ff
Head
2010-09-13 21:08:26 +02:00
Raoul Snyman
a1f7c9c5a0
Various string-related fixes:
...
- Removed a bunch of double spaces.
- Renamed the translation files.
- Updated the translation files.
- Fixed up a few widgets.
Also fixed up the layout on the Edit Song form.
bzr-revno: 1030
2010-09-13 08:17:07 +02:00
Tim Bentley
317a4ea8c6
Fix code so translations can be found
...
bzr-revno: 1029
2010-09-13 07:05:24 +01:00
Raoul Snyman
d4a0171203
HEAD
2010-09-13 07:16:16 +02:00
rimach
9546c338fc
Head
2010-09-12 23:03:45 +02:00
rimach
e2c8ee11f2
Fix removing dock with translation
2010-09-12 23:03:16 +02:00
Martin Thompson
062a88e2f2
Better handling of progress bar. Attempt to get 'other' type verses into database
2010-09-12 21:31:23 +01:00
Raoul Snyman
826e366880
Fixes bug #635330 and attempts to fix bug #635338
...
bzr-revno: 1028
2010-09-12 22:25:08 +02:00
Jonathan Corwin
d188d9e572
Loop video background
...
bzr-revno: 1027
2010-09-12 21:02:16 +01:00
Tim Bentley
37aecbefaf
Lanugages now work
2010-09-12 10:14:02 +01:00
Jonathan Corwin
15c868568f
Head
2010-09-11 22:40:26 +01:00
Jonathan Corwin
0d36cba0bb
Video background loop/change
2010-09-11 22:40:14 +01:00