Commit Graph

14021 Commits

Author SHA1 Message Date
suutari-olli 165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
Ken Roberts 306f027b53 Convert strings from python2 to python3 format
- Strings converted except as noted
- Updated projector pjlink test
- Simplify lines with multiple references to single variable

--------------------------------
lp:~alisonken1/openlp/strings-lib (revision 2665)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1559/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1470/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1408/
[SUCCESS] https://ci.openlp.io/job/Branch-04a...

bzr-revno: 2664
2016-05-17 22:22:24 +01:00
Tim Bentley 8cf6b2df3e Service Manager themes are not updated in service items when the settings theme is changed
bzr-revno: 2663
2016-05-17 22:19:20 +01:00
simon.hanna@serve-me.info 63f478d910 * Change the Combobox used for the state of plugins to a checkbox.
* Do not show the plugins version numbers as they provide no additional information
* Show the plugin details (about text) even if the plugin is disabled

bzr-revno: 2662
Fixes: https://launchpad.net/bugs/1530073
2016-05-17 22:16:16 +01:00
Simon Hanna f3e1194956 Add comments to test 2016-05-17 21:35:25 +02:00
Simon Hanna 6bbf783a2e Add test 2016-05-17 21:31:56 +02:00
Ken Roberts a3df011409 Typo 2016-05-17 06:21:29 -07:00
Ken Roberts 8cc6f1dbcb Fix duplicate tags in strings 2016-05-17 06:15:53 -07:00
Simon Hanna 2a0868dee3 merge trunk 2016-05-17 10:48:19 +02:00
ian@knightly.xyz 05e9e5dca0 Fixes bug 1080596 where presentations in the preview pane display live view rather than preview of selected slide.
In addition, fixes the aspect ratio & quality of thumbnails by saving them in the correct aspect ratio at a higher resolution, and loading them through the image manager.

New test cases implemented, or existing cases modified to test coverage complete for changes.

lp:~knightrider0xd/openlp/preview-shows-live-fix-1080596 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2661
Fixes: https://launchpad.net/bugs/1080596
2016-05-16 17:26:29 +01:00
Ken Roberts 173a4910ee - Convert strings from python2 to python3 in openlp/core/common files
- Added another projector db test

python2: "%s inline" % 'text1'
python2: "%s inline %s" % ('text1', text2')
python3: "{text1} inline {text2}".format(text1="text1", text2="text2")

--------------------------------
lp:~alisonken1/openlp/strings-common (revision 2661)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1550/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1461/
[SUCCESS] https://ci.openlp.io/job/...

bzr-revno: 2660
2016-05-16 16:51:25 +01:00
Ken Roberts 403df406df Simplify a line with multiple references in format 2016-05-16 07:02:47 -07:00
Ken Roberts 1f5f457786 pep8 2016-05-16 06:44:57 -07:00
Ken Roberts b4329ff781 Revert a few items plus cleanups 2016-05-16 06:41:26 -07:00
Ian Knight a7466f1ea7 Check for Div0 and added unit test cases 2016-05-16 22:05:58 +09:30
Ken Roberts 7c4671b676 Convert strings to python3 in core.common.lib 2016-05-15 10:33:42 -07:00
Ken Roberts 07468f0093 Fix oops 2016-05-15 10:32:04 -07:00
Ken Roberts f51132e876 core/common convert strings to python3 format 2016-05-13 21:24:46 -07:00
tim.bentley@gmail.com f37722dd73 "Allow themes to have video files so allow for background videos behind text.
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

bzr-revno: 2659
2016-05-12 23:00:54 +02:00
Ken Roberts c58ce31e8b "Convert __init__.py file strings from python2 to python3 format
Python2 "%s text" % value1
Python2 "%s text %s" % (value1, value2)
Python3 "{var1} text {var2:02d}".format(var1=text, var2=number)

- String conversions in init files
- Added test for projector power state change
- Remove extraneous print() call in mediainfo plugin
- Fix translate() string formatting
- Revert string format for re.compile() until further testing is done
- Skip crosswalk.com test until their server is fixed

-----..."

bzr-revno: 2658
2016-05-12 22:34:57 +02:00
suutari-olli 524adae71f - Pep8 fixes 2016-05-10 14:13:41 +03:00
suutari-olli 46e7ad4983 - Changes based on comments by TRB143 2016-05-10 14:06:00 +03:00
Tim Bentley 33eb1ba274 remove rogue print 2016-05-10 05:40:59 +01:00
Tim Bentley df654d72fb change net to com 2016-05-10 05:36:25 +01:00
suutari-olli 77e9e1ad27 Lowercapped bunch of stuff, splitted expection error 2016-05-10 04:55:26 +03:00
suutari-olli d7f3e4a9f2 Lowercapped some settings. 2016-05-10 04:11:49 +03:00
suutari-olli bd9c9a8430 - Merged trunk 2016-05-10 03:58:37 +03:00
suutari-olli e4bce11a03 Commiting for merging trunk, some new changes. 2016-05-10 03:53:14 +03:00
second@tgc.dk e76652762c Added support for detected the new version of mutool which now contains the functionality of mudraw.
Improve mediainfo detection on windows and mac.
Fix crosswalk bible list download.

bzr-revno: 2657
Fixes: https://launchpad.net/bugs/1579648
2016-05-09 21:34:18 +02:00
Tomas Groth fa9a29d303 Fix crosswalk bible list download 2016-05-06 07:33:43 +02:00
Ian Knight 3cdbaff2a6 Housekeeping 2016-05-06 11:16:49 +09:30
Tomas Groth 7ee0af01b2 fix traceback if bible list download fails. 2016-05-05 22:30:00 +02:00
Ken Roberts 9ac95cf665 Skip crosswalk.com test while server down 2016-05-05 12:37:48 -07:00
Ian Knight aac09c0afb Fixed create_thumb_invalid_size_test 2016-05-06 04:33:12 +09:30
Ian Knight 55002518ef Added Functional Tests, cleaned PEP8 errors 2016-05-06 04:27:32 +09:30
Tomas Groth 26e72a1fec make mediainfo detection work on win and mac. 2016-05-05 20:17:45 +02:00
Tomas Groth 907282d3cd make mudraw/mutool detection work on mac 2016-05-05 20:14:33 +02:00
Ken Roberts 72fc30d600 merge trunk 2016-05-05 08:51:07 -07:00
Ken Roberts 16c0ebfcda Revert regex string conversion until more testing 2016-05-05 08:41:48 -07:00
Ian Knight bc6253a627 Housekeeping, added check for thumbnails to avoid icon scaling issues 2016-05-05 13:27:04 +09:30
Tomas Groth 17fa45b1dd Added tests. 2016-05-04 22:58:44 +02:00
Tomas Groth 166b222765 trunk 2016-05-04 22:05:46 +02:00
Ian Knight a2bc59b3d9 Merge from trunk 2016-05-04 21:50:37 +09:30
Ian Knight f0d7cf7f36 Corrected aspect ratio on slide previews 2016-05-04 21:40:42 +09:30
Tim Bentley 51613fd32d fix strings 2016-05-02 09:12:39 +01:00
Tim Bentley 0efd1931b4 head 2016-05-02 09:05:47 +01:00
Ken Roberts e42c6a9071 - Convert strings in mainwindow.py
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...

bzr-revno: 2656
2016-05-02 06:49:54 +01:00
Tim Bentley 6d7039ed41 minor fixes 2016-04-30 18:19:55 +01:00
Tim Bentley 38cd4b1f67 with tests 2016-04-30 18:12:40 +01:00
Tim Bentley 162f1ecbe9 remove old loop 2016-04-30 16:49:06 +01:00