Commit Graph

14309 Commits

Author SHA1 Message Date
Tim Bentley
9751f5d8e5 head 2016-05-21 05:26:27 +01:00
suutari-olli
cabca18de5 - Removed unrequired % s complications from short search messsage. 2016-05-21 01:10:10 +03:00
suutari-olli
0a0a87078b - Removed the unrequired %s complications from "No Bibles installed" 2016-05-21 01:02:40 +03:00
suutari-olli
dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
0ca7390a9a "- Convert strings in openlp/core/ui files
- Updated projectordb test

--------------------------------
lp:~alisonken1/openlp/strings-core-ui (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1566/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1477/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1415/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1195/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/78..."

bzr-revno: 2666
2016-05-20 22:52:22 +02:00
7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
Ian Knight
e09e867ad1 Pep8 Errors 2016-05-20 23:07:23 +09:30
Ian Knight
2c1c7810b9 Improved test coverage. 2016-05-20 22:57:52 +09:30
Ian Knight
3b48a4b817 Housekeeping 2016-05-20 22:08:36 +09:30
Ian Knight
812c124528 Added test case for Auto option. 2016-05-20 22:06:59 +09:30
656af1e90e core_ui_aboutdialog strings conversions 2016-05-19 15:14:24 -07:00
Tim Bentley
77508d4d7a Fix ssl version to allow Android to use ssl. SSL is now auto negotiated. Fix SeriveManager service theme hiding. Bug since 1.9 series. Fix missing check dependancies for six, Fix PEP 8 errors
bzr-revno: 2665
2016-05-19 07:00:35 +01:00
Ian Knight
3ae5240d15 Implemented auto option & updated settings to use combo box 2016-05-19 04:10:27 +09:30
suutari-olli
165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
Tim Bentley
8507d3e263 fixes 2016-05-18 18:25:16 +01:00
Tim Bentley
fd33d9a0c5 fixes 2016-05-18 18:16:40 +01:00
Tim Bentley
7c1e922f10 pep8 2016-05-18 18:06:25 +01:00
Tim Bentley
2cb3d6b684 head 2016-05-17 22:35:01 +01:00
Tim Bentley
2f8b12934b fix theme display in servicemanager 2016-05-17 22:28:27 +01:00
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
a3df011409 Typo 2016-05-17 06:21:29 -07:00
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
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
403df406df Simplify a line with multiple references in format 2016-05-16 07:02:47 -07:00
1f5f457786 pep8 2016-05-16 06:44:57 -07:00
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
suutari-olli
45798e67f0 Removed 2nd blank line from end of the uistrings. 2016-05-15 23:41:58 +03:00
suutari-olli
c4318c6a22 - Fixed the test 2016-05-15 23:37:49 +03:00
suutari-olli
f0cc512704 - Fixed Settings().Value to .value 2016-05-15 22:52:22 +03:00
suutari-olli
334d16d81c - Noticed this had a conflict, fixed it, improved comments 2016-05-15 22:41:13 +03:00
7c4671b676 Convert strings to python3 in core.common.lib 2016-05-15 10:33:42 -07:00
07468f0093 Fix oops 2016-05-15 10:32:04 -07:00
suutari-olli
acde9cad5e - Fixed the dot chechk method.
(No longer removes dot after numbers, eg. 1.)
2016-05-15 18:04:15 +03:00
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
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
7e5b49ffdf - Merged trunk on 11.5.16 2016-05-11 18:37:58 +03:00
suutari-olli
ba4cd29b4c - Improved the timer method, resulting in much smoother searches. 2016-05-11 18:35:35 +03: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