Tomas Groth
72c435633c
fix merge issues
2016-04-26 21:04:22 +02:00
Tomas Groth
58ac52a30e
merge trunk
2016-04-26 20:58:03 +02:00
chris@minkus.me.uk
b43349e3ea
Natural sort for authors, topics, songbooks, themes in Edit Song comboboxen & Song Maintenance form, as mentioned previously by Raoul - Matthew 21:28–29! :)
...
Also some minor fixes that I picked up after merge 2637 for natural sorting:
x Author, Topics, Theme search were performing two sorts (one database sort, then a natural sort in code). Removed the first database sort.
x Changed all sorting to use in-place sort() rather than copy sorted(), as apparently there's a speed bonus (http://stacko ...
bzr-revno: 2651
2016-04-26 17:07:18 +01:00
Ian Knight
56f5bbac52
Testing
2016-04-26 12:17:38 +09:30
Ian Knight
b8173f7f0e
Added Test to HTML Builder
2016-04-26 12:13:29 +09:30
Chris Hill
a5cd1e15bc
resolve pep8 W293 warning
2016-04-25 12:01:32 +01:00
Chris Hill
bb15b4ce71
merge w/ trunk
2016-04-25 11:54:08 +01:00
Chris Hill
1e9b7148f5
Resolve pep8 errors - separate def, two line split
2016-04-25 11:53:20 +01:00
884f060dea
Oops and text in projector test
2016-04-24 04:22:04 -07:00
28e14012a8
Remove unneeded print statement
2016-04-24 04:04:32 -07:00
292606ba38
Fix translate() string format and some missed conversions
2016-04-23 14:38:43 -07:00
3e0769d946
Fix extraneous print() in media plugin
2016-04-23 14:12:28 -07:00
d5b98b7308
Added projector power test
2016-04-23 12:55:47 -07:00
591ed15ab7
Merge upstream
2016-04-23 12:28:52 -07:00
Tomas Groth
ebaf99f4fb
Fix traceback
2016-04-23 20:33:53 +02:00
907e1df129
- Update string format to Python3 style
...
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)
Convert string format from Python2
'%s %s' % (value1, value2)
to Python3
'{key1} {key2}'.format(key1=value1, key2=value2)
Jenkins down - local pep8 and tests (except windows tests) passed.
Previous Jenkins test:
--------------------------------
lp:~alisonken1/openlp/string...
bzr-revno: 2650
2016-04-23 14:48:27 +01:00
Tim Bentley
071a4438e9
Finish moving things around
...
bzr-revno: 2649
2016-04-23 14:46:59 +01:00
Tim Bentley
fed2466ad6
Add Icon and defense tests for missing mediainfo
...
bzr-revno: 2648
2016-04-23 14:45:55 +01:00
c1222dc2bb
Convert strings to python3 in __init__ files
2016-04-22 17:40:59 -07:00
Tim Bentley
37ea1c5da1
fix
2016-04-22 20:25:28 +01:00
Tim Bentley
f2784decc7
fix
2016-04-22 20:04:17 +01:00
Tim Bentley
d9d31c4626
tests
2016-04-22 19:35:23 +01:00
Tim Bentley
123a7f02a7
yet more files
2016-04-22 19:32:59 +01:00
Tim Bentley
0d755e3354
more files
2016-04-22 19:32:45 +01:00
Tim Bentley
38996c81cc
more files
2016-04-22 19:25:57 +01:00
Tim Bentley
20acc90951
Pep8
2016-04-22 17:37:21 +01:00
bec015142b
Merge trunk to fix conflicts
2016-04-22 04:41:29 -07:00
suutari.olli@gmail.com
f0d75a29c2
This branch introduces the following fixes/features:
...
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
(Added a hidden setting for controlling this)
- Locking Panels now also locks “View” menu so view menu can’t
be set if panels are locked.
- Panels are now locked by default, this prevents users from
totally messing their UI so easily.
- Added a checkbox for disabling/enabling Projectors during first time wizard
(By default disabled, added a hidden setting fo...
bzr-revno: 2647
Fixes: https://launchpad.net/bugs/1508582 , https://launchpad.net/bugs/1565447
2016-04-21 22:16:24 +01:00
Tim Bentley
59b3c7b053
head
2016-04-21 17:27:04 +01:00
Tim Bentley
bd8ddf7506
fix tests
2016-04-21 17:26:34 +01:00
gabriel.loo@gmail.com
c3e27b44f0
Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault).
...
bzr-revno: 2646
Fixes: https://launchpad.net/bugs/1570228
2016-04-21 17:03:36 +01:00
Tomas Groth
89ce4131e7
Skip pysword tests is pysword isn't installed.
2016-04-20 21:29:04 +02:00
Tim Bentley
f2537981e4
update
2016-04-20 17:36:37 +01:00
suutari-olli
c1d9991acb
Noticed I had removed one test from end of the file, added it back.
2016-04-20 19:01:58 +03:00
suutari-olli
55061b8fc1
- Added two tests for checking if doubleclicking preview should add item to service or send it to live.
2016-04-20 18:56:10 +03:00
Chris Hill
4b088acc93
Coding standards fix - E731 do not assign a lambda expression, use a def for pep8
2016-04-19 20:32:23 +01:00
Chris Hill
d76965f8fd
Extracted lambdas from sorts in song plugin - improve performance
2016-04-19 20:00:45 +01:00
suutari-olli
a0859a5694
Noticed I had created 2 unneeded blank lines to test file.
2016-04-18 21:30:22 +03:00
suutari-olli
3639ad1bd4
Added two tests.
...
One to check projectors panel is set visible
after the wizard, the other for the opposite.
2016-04-18 20:18:04 +03:00
Ian Knight
631aea771e
Housekeeping
2016-04-18 16:26:28 +09:30
Ian Knight
dffac25933
Ran generate_resources.sh
2016-04-18 16:24:49 +09:30
Ian Knight
225708102c
Added QR code and link for iOS app to remote plugin ui
2016-04-18 15:05:21 +09:30
b5c9f96ccf
oops fix - typo
2016-04-17 16:57:33 -07:00
b2ed6bb84c
Fix split in string formatting
2016-04-17 16:47:44 -07:00
Gabriel Loo
caa9c59c75
Added unit tests for SongSelect Importer search
2016-04-17 18:55:40 -04:00
Chris Hill
a38daf9779
natural sort for theme in edit song form
2016-04-17 22:41:29 +01:00
Chris Hill
2dd3cdc5ea
Remove theme natural sort - already done by filename
2016-04-17 22:32:42 +01:00
Chris Hill
66fc2ff7c3
merge w/ trunk
2016-04-17 22:23:50 +01:00
Chris Hill
0c8f9e3b71
Removed auto-select for searches where multiple IDs selected, added tests to hide temporary songs
2016-04-17 22:22:30 +01:00
Tim Bentley
1942a8ac14
fix
2016-04-17 21:11:55 +01:00
