Commit Graph

12004 Commits

Author SHA1 Message Date
Bastian Germann
79e7ea487f Correct the help message 2018-10-07 23:40:36 +02:00
Tomas Groth
2fb0050531 Fixed some crashes when creating a new theme. Still some work to do... 2018-10-07 22:36:04 +02:00
Bastian Germann
d1e1975394 Use upstream pymediainfo
Current pymediainfo versions load a DLL/so. Use a very thin
wrapper to make sure that the executable is used if the DLL
is not available.
2018-10-07 02:24:29 +02:00
Bastian Germann
4784cdf152 Reapply OpenLP's changes to pymediainfo 2018-10-07 01:00:18 +02:00
Bastian Germann
7fb3ad4e9e Reimport pymediainfo with its correct license
The mediainfoWrapper.py file was taken from
https://github.com/sbraz/pymediainfo/blob/a24c4b79c5/pymediainfo/__init__.py
and slightly modified.

It is licensed undre MIT but the license information was not copied.
Instead it was relicensed as GPLv2 with OpenLP's default copyright.

This is the original version.
2018-10-07 00:44:01 +02:00
Bastian Germann
9f6b03047b Support running ./setup.py test
setuptools can run tests. Use nose2 to run the tests.
If it is not installed on your system, it is downloaded
and temporarily used.
2018-10-06 22:49:13 +02:00
Bastian Germann
0b1ba4ba6d Fix setup's requirements
Move the startup script so that its name does not
conflict with the openlp namespace.
Codify scripts/check_dependencies.py in setup.py.
The name on PyPI is used to declare the dependencies.
This is a first step to enable OpenLP distribution via
PyPI.

The differences are:
* pyenchant and pyodbc are declared optional because
  they are optional in the code and pyenchant is not
  maintained anymore.
* pyenchant's required version is set to 1.6 not only
  for windows. This version is quite old.
* The 5.0 version checks for PyQt5 are left out because
  this is the first version anyway.
* LibreOffice's uno does not exist on PyPI
* sqlite3, asyncio and mock are available in Python
  >= 3.4 anyway and not noted as dependencies.
* six is not defined as dependency because the code
  should be py3 only.

The situation with regards to platform wheels being
published looks quite promising.
As Linux users typically install via their package
manager wheel availability is not as import for them
as for Win or Mac users.
Both of them are available for most dependencies with
native extensions.
The few exceptions:
* PyICU does not publish any platform wheels.
  More info: https://github.com/ovalhub/pyicu/issues/79
* mysql-connector-python does not publish win32 wheels.
* pyenchant does not publish win64 wheels.

The wheels are typically available for Py=2.7 and Py>=3.4,
although some (mysql-connector-python, PyQt5, pywin32)
need Py>=3.5
2018-10-03 01:19:49 +02:00
e45be1a50f Fixed issue where screens were being loaded twice; Fixed an issue where an underlying C++ object was being deleted before the Python object was finished with it 2018-10-01 23:00:25 -07:00
aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
Tomas Groth
12a2a90ea6 Readded the Renderer class for calculating slide sizes. 2018-09-28 21:33:40 +02:00
393823c0ab Forgot the screens tab -_- 2018-09-12 07:26:04 -07:00
514f2a16c6 Merge from shared branch 2018-09-11 22:48:08 -07:00
0c8156b4c4 Loading and saving of screens is working; Refractored retranslateUi => retranslate_ui 2018-09-11 22:43:27 -07:00
Tomas Groth
1d0770b4c9 First step to make displays work. 2018-09-10 22:14:13 +02:00
0794015765 Remove all the screen settings for now 2018-09-07 19:01:07 -07:00
37424b3b13 HEAD 2018-09-07 07:59:21 -07:00
67e6806924 HEAD, plus loading screens from settings 2018-09-06 23:43:01 -07:00
Kyle Russell
8a5a2628dc Fix pycodestyle line spacing warnings 2018-08-31 20:27:53 -04:00
Kyle Russell
6dc1c37d59 Merge lp:openlp for manifest test resources and font fix 2018-08-31 13:35:30 -04:00
c2a60fb0e9 Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal.
bzr-revno: 2833
2018-08-31 16:46:54 +01:00
8d379e6785 Add some tests, we're up to 52% coverage now! 2018-08-30 22:49:26 -07:00
Kyle Russell
c366e58683 Improve usability of image plugin choosegroupform
In order to add an image to an existing group when no group was preselected,
the user must currently choose the existing group name from the comboxbox
and also select the Existing Group radio button.  It should be assumed that
by selecting a group name from the combobox, the user intendeds to add the
image to an existing group, and the accompanying radio button should
automatically be selected.  This reduces the number of required clicks, and
the likelihood of not actually adding the image to the correct group.

Likewise, if a user enters text into the New Group field, the dialog
should assume that the user's intent is to create a new group and auto
select the appropriate radio button.

Also removes some choosegroupdialog specific component logic from mediaitem,
since it's now covered by the choosegroupdialog implementation.  Better
encapsulation, and improves testability. (Testing that the existing group
radio button was selected when choosedialogform was initialized with a
preselected group requires much more effort when the radio button selection
logic spanned two components.)

Adds simple test cases for the scenarios described above.
2018-08-29 23:11:30 -04:00
thelinuxguy
2f465a9dd9 fix warning in reges
bzr-revno: 2832
2018-08-29 19:01:27 +01:00
Simon Hanna
7321810e78 Improve the regex, removing the displayed warning 2018-08-27 16:16:26 +02:00
Simon Hanna
aa4a57a2bf Fix typo 2018-08-26 09:28:43 +02:00
Simon Hanna
aaef55106c Remove imports from openlp/core/ui/__init__.py and update related files 2018-08-25 16:36:46 +02:00
Simon Hanna
a4c1e306b5 Remote imports from openlp/core/lib/__init__.py and update other files accordingly 2018-08-25 16:08:19 +02:00
Simon Hanna
3ae978e4be Log an error instead of debug output 2018-08-12 13:14:47 +02:00
Simon Hanna
3e5eb698d9 Return None instead of raising an error when converting path objects 2018-08-12 13:12:03 +02:00
Tomas Groth
0aadec661f Fix some pylint failures and add qtawesome to appveyor install. 2018-08-05 22:28:01 +02:00
Tim Bentley
753a8946c3 fix icons 2018-08-04 22:01:15 +01:00
Tim Bentley
3a0d0ff2ea Head 2018-08-04 21:58:13 +01:00
edada54d7e Fix windows not using lo as network interface 2018-08-03 15:32:32 -07:00
Tim Bentley
023753b2fc fix tests 2018-07-15 20:54:41 +01:00
Phill Ridout
6a8bf83d27 Add cetralised proxy support
bzr-revno: 2823
2018-07-12 21:10:35 +01:00
Tomas Groth
4dd16d1bd6 pep8 fix 2018-07-05 22:43:55 +02:00
Tomas Groth
5bb449455d Disable broken pylint check on specific line 2018-07-04 22:50:31 +02:00
Tomas Groth
56a811c094 More pycodestyle fixes 2018-07-04 22:42:55 +02:00
Tomas Groth
318e90f893 Fixes for pycodestyle 2018-07-02 22:38:47 +02:00
0d0ec8f818 Remove an unnecessary exception; Notify the user if one of the plugins fails to initialise; Try to make image slides work properly. 2018-06-30 21:36:32 -07:00
Tim Bentley
c064259e7e fix up after projector merge 2018-06-28 21:40:54 +01:00
64524318b3 Updated fix for server error when getting version 2018-06-28 09:51:35 -07:00
bc832c7c72 PJLink2 update S 2018-06-28 08:37:37 -07:00
Tim Bentley
0966f8c782 fix mission openlp 2018-06-26 19:59:17 +01:00
Tim Bentley
13f52e96db new tree 2018-06-26 18:08:36 +01:00
Tim Bentley
2bb842b21c Conversion finished 2018-06-24 07:56:50 +01:00
Tim Bentley
206decbb7e finish projector 2018-06-16 07:09:15 +01:00
Tim Bentley
b6dc37fb0b remove more and fix code 2018-06-10 20:29:00 +01:00
Phill Ridout
70c777b7e3 Add translate methods 2018-06-10 07:38:16 +01:00
Phill Ridout
2e02060707 fix 2018-06-08 21:55:20 +01:00
Phill Ridout
fac5d4b798 Fixes 2018-06-08 07:12:23 +01:00
Phill Ridout
dce509e909 Add some forgetten files 2018-06-07 18:45:24 +01:00
Phill Ridout
6f34f8f2b8 Start on implementing global OpenLP proxying 2018-06-07 18:44:35 +01:00
Tim Bentley
d8e6dfaf19 more projector 2018-06-03 18:30:11 +01:00
Tim Bentley
d0950f2bd5 start projector 2018-06-03 18:10:29 +01:00
Tim Bentley
2f144c79d8 more icons 2018-06-03 17:07:20 +01:00
Tim Bentley
be1d7c687b More icons 2018-06-02 07:37:31 +01:00
81ca409e4c Fix settings calls 2018-05-18 17:48:33 -07:00
Tim Bentley
6f9d662064 Yet more updates 2018-05-08 20:45:34 +01:00
Tim Bentley
0023359915 Add custom font file and handling 2018-05-08 19:44:47 +01:00
Tim Bentley
55f34aee03 fix color 2018-05-07 07:44:57 +01:00
Tim Bentley
cd011842a0 more bits 2018-05-06 21:11:06 +01:00
Tim Bentley
8ab45c342e more bits 2018-05-06 20:50:41 +01:00
Tim Bentley
ccafcfe0e5 add attributes 2018-05-06 09:03:42 +01:00
991b2880bf PJLink2 update R 2018-05-03 07:58:50 -07:00
Tim Bentley
7487721e26 more gone 2018-04-22 08:17:38 +01:00
Tim Bentley
44bb70122e more bits 2018-04-22 07:59:35 +01:00
Tim Bentley
e2c3d9d3f1 fix code errors 2018-04-21 21:15:43 +01:00
Tim Bentley
7d5e742c90 more cleanups 2018-04-21 20:57:51 +01:00
Tim Bentley
a74d2b6bd2 more cleanups 2018-04-21 06:59:03 +01:00
Tim Bentley
606efa47b9 more cleanups print finished 2018-04-21 06:47:20 +01:00
Tim Bentley
50511dc31d head 2018-04-20 18:35:57 +01:00
604581c71a PJLink2 update Q 2018-04-19 23:04:43 -07:00
Tim Bentley
1dfd7403bd fix up service print 2018-04-17 21:50:27 +01:00
Simon Hanna
9f6999940a Change parameter name 2018-04-17 21:26:18 +02:00
Simon Hanna
2a557f3973 Fix typo 2018-04-16 21:30:48 +02:00
Simon Hanna
a523fddeb3 Add requested changes 2018-04-16 13:31:29 +02:00
Simon Hanna
5045d51df4 Give the parameter an easier name 2018-04-14 21:53:35 +02:00
Simon Hanna
255b1efe3a Fix bug where newlines where stripped when normalizing string 2018-04-14 21:52:28 +02:00
Tim Bentley
f5645f91d3 more bits 2018-04-13 21:07:09 +01:00
Tim Bentley
eef1472dd0 more 2018-04-13 20:02:32 +01:00
Tim Bentley
faee3109e5 more 2018-04-13 19:54:42 +01:00
Tim Bentley
e6fbdc4f9b more 2018-04-13 18:52:40 +01:00
Tim Bentley
57235cbd36 More bits 2018-04-13 17:57:22 +01:00
af446d31b9 First go at making images work 2018-04-12 23:28:13 -07:00
Tim Bentley
fdd8289808 Fix loading of singletons and add error handling 2018-04-12 20:15:56 +01:00
3ff3f501fa Fixed displaying slides in slide controller vs actual rendered slides; Fixed <sup> tag not showing up correctly 2018-04-11 23:20:55 -07:00
1f9d00f47c Fix non-song text items not updating the display (missing verse tags, essentially) 2018-04-11 09:37:28 -07:00
b521b9aeba HEAD 2018-04-11 09:08:34 -07:00
6bee4ba21f Make more things work 2018-04-11 09:07:24 -07:00
Tim Bentley
195b172b1c fix up some more 2018-04-10 22:10:09 +01:00
Tim Bentley
4760343899 fix up location of icons 2018-04-10 20:26:56 +01:00
Tim Bentley
cd418f7825 more bits 2018-04-08 20:54:28 +01:00
Tim Bentley
8c2afe67e3 more bits 2018-04-08 19:21:22 +01:00
Tim Bentley
e5305643c9 more bits 2018-04-08 18:24:31 +01:00
Tim Bentley
fdae4dc939 cleanups and more icons 2018-04-07 21:31:54 +01:00
Tim Bentley
d67379c622 More icons and fixes 2018-04-07 20:41:00 +01:00
Tim Bentley
ecb1ee7d3e more bits 2018-04-07 17:57:44 +01:00
Tim Bentley
154ca14120 more bits 2018-04-07 17:16:42 +01:00
Tim Bentley
422823eff5 start to add awsome fonts 2018-04-07 12:12:31 +01:00
Tim Bentley
cc0dcd6b75 fix message from previous 2018-04-06 20:55:08 +01:00
Tim Bentley
819d5d830d Add a load of tests 2018-03-29 20:52:59 +01:00
Tim Bentley
127f1dc7fd fix up tests 2018-03-29 18:22:02 +01:00
Tim Bentley
c6076e1054 start to add tests 2018-03-29 18:10:29 +01:00
Tim Bentley
fada29080c fix a bit of the tests 2018-03-29 17:25:10 +01:00
Tim Bentley
db0f131e15 Add the removal of the version code part 1 2018-03-29 16:54:55 +01:00
Tim Bentley
be5de55e0b cleanup up the code 2018-03-29 16:16:55 +01:00
Tim Bentley
de8b731686 get the service file handling right 2018-03-29 15:50:08 +01:00
Tim Bentley
e828867f23 first release of transfer server 2018-03-29 13:04:48 +01:00
1a744383e5 More stuff working! Now you can see the text items in the slide controller and you can change the current slide 2018-03-27 22:39:47 -07:00
8b826f29c4 Fixed backgrounds not showing 2018-03-25 00:14:38 -07:00
552dc60d21 Figured out what my problem was -- black text on a black background 2018-03-24 17:31:12 -07:00
7f0d4c635f Managed to get the page loading, but there are 4 displays where there should only be 2. Confusing 2018-03-24 00:19:06 -07:00
Tim Bentley
d74e63773e fix media suffix issues 2018-03-18 15:33:50 +00:00
Tim Bentley
297d86f561 fix vlc bug 2018-03-18 14:56:02 +00:00
Tim Bentley
f77026b5c7 Fix issues 2018-03-18 07:45:46 +00:00
Tim Bentley
e6f7e107b8 fix string 2018-03-16 06:05:18 +00:00
Tim Bentley
2531e56910 Fix quotes 2018-03-09 21:58:45 +00:00
df140019cf Fix a problem in the settings which prevented the plugins from showing up in the library 2018-03-07 21:57:43 -07:00
a0d6f2d94a HEAD 2018-03-07 21:46:50 -07:00
Tim Bentley
bff8b193dc fix up PEP8 2018-02-24 16:10:02 +00:00
Tim Bentley
f16828dd5d fix comment 2018-02-23 15:54:25 +00:00
Tim Bentley
c3c2bf91ae Clone Custom item 2018-02-23 13:24:37 +00:00
Tim Bentley
2ae8951b3b add title to display api 2018-02-23 12:16:13 +00:00
Tim Bentley
c99c2694db simplify visibility interface 2018-02-23 09:17:21 +00:00
Tim Bentley
8e33175477 clear preview bar and fix visibility 2018-02-23 09:11:07 +00:00
Tim Bentley
e01396c427 clear preview bar 2018-02-23 08:56:01 +00:00
Tim Bentley
9e0cb247d6 add song book as first slide 2018-02-23 08:27:33 +00:00
Tim Bentley
351a0d53df Add more meta 2 2018-02-22 21:42:39 +00:00
Tim Bentley
7f899dc35d Add more meta 2018-02-22 21:36:20 +00:00
Tim Bentley
5696655768 Fix up text 2018-02-20 22:03:32 +00:00
Tim Bentley
8188650486 display metadata 2018-02-18 16:48:49 +00:00
Tim Bentley
14b8aedc76 Add metadata 2018-02-18 16:16:52 +00:00
Tim Bentley
b9b9e0b558 new branch 2018-02-17 07:18:03 +00:00
8e5fb217d3 - manager: Remove unused signal disconnect projectorNetwork.disconnect()
- Change PJLinkUDP.pjlink_udp_commands to dict with link to processing methods
- Add test_projector_pjlink_udp.test_process_ackn_duplicate
- Add test_projector_pjlink_udp.test_process_ackn_multiple
- Add test_projector_pjlink_udp.test_process_ackn_single
- Add test_projector_pjlink_udp.test_process_srch
- Add PJLinkUDP.get_datagram method
- Add PJLinkUDP._trash_udp_buffer method
- Add PJLinkUDP.process_ackn method
- Add ...

bzr-revno: 2813
2018-02-16 21:09:49 +00:00
ed347492e9 Move MY_IP4 dict to get_local_ip4 function 2018-02-11 13:52:04 -08:00
Tim Bentley
d0fd6b2903 Remove the FTW options which do nothing 2018-02-11 18:15:24 +00:00
Tim Bentley
5328b81c70 Fix controller error 2018-02-11 18:06:33 +00:00
f1996d2cb7 PJLink2 Update P 2018-02-11 03:42:13 -08:00
a1b8b431fb Comment out a whole lot of code to make OpenLP start. Also figured out that OpenLP now requires OpenGL 2018-02-10 22:34:14 -07:00
Tim Bentley
aa9aec4a7d fix comments 2018-02-03 14:17:46 +00:00
Tim Bentley
7f39fe90d1 head 2018-02-03 14:07:07 +00:00
Tim Bentley
beffb3b5bd remove extra line 2018-02-03 12:19:37 +00:00
Tim Bentley
602b115f43 remove extra line 2018-02-03 12:03:37 +00:00
Tim Bentley
340b3f6597 Finish clean up logging code 2018-02-03 11:32:49 +00:00
Tim Bentley
6c8ec8a840 Add logging to mainwindow and clean up logging code 2018-02-03 11:24:39 +00:00
Tim Bentley
6ff1015205 close the splash screen 2018-02-03 07:59:36 +00:00
Tim Bentley
f7169ee708 remove ppt viewer 2018-02-02 21:33:41 +00:00
b758bb2f52 Disable theme preview generation for now 2018-01-30 22:02:38 -07:00
9c4f5857fc For the moment, work around some screen issues in the FTW - we probably need to revisit this later 2018-01-30 21:58:52 -07:00
f3d0c0f433 Fix the screen list issues 2018-01-30 21:58:31 -07:00
97172efba5 HEAD 2018-01-30 21:10:09 -07:00
Tim Bentley
cffd8e603d cleanups 2018-01-27 11:15:49 +00:00
Tim Bentley
c9ff4b2209 fix web api 2018-01-27 09:41:11 +00:00
1f53453ff6 Fixed an issue with the FTW not displaying any download progress.
Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/fix-ftw-download-progress (revision 2811)
https://ci.openlp.io/job/Branch-01-Pull/2430/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2331/                  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/125/                   [SUCCESS]
https:/...

bzr-revno: 2811
2018-01-24 21:36:15 +00:00
Phill Ridout
4423b61fc9 Small fix 2018-01-22 21:37:00 +00:00
Phill Ridout
ee144ad68b Save the temp file in a different dir 2018-01-22 20:41:30 +00:00
James Muscat
7539483959 Use point size for text outline.
The previous code matched the erroneous behaviour of the original Python method, which used `em` as a measurement; the theme wizard uses `pt` as a unit and doesn't allow fractional values, which meant that it was not possible to specify very thin outlines at large font sizes.

Now, both UI and rendering code use `pt` as a unit, which allows thin outlines.
2018-01-21 11:07:04 -07:00
James Muscat
bbadd9fbce Use pt for outline size.
This matches the units used in the theme settings UI, and allows thin outlines
to be used with large font sizes.
2018-01-21 13:08:24 +00:00
James Muscat
c96c7fefea Fix broken syntax. 2018-01-21 12:28:00 +00:00
Phill Ridout
7c68e9d022 pep 2018-01-21 07:40:26 +00:00
Phill Ridout
368b0ce75c Tidy ups 2018-01-20 09:30:30 +00:00
Tim Bentley
0ce0231a5f text clean ups 2018-01-19 21:31:36 +00:00
Phill Ridout
7ced39594f Add test 2018-01-19 21:00:56 +00:00
Phill Ridout
89042982d6 HEAD 2018-01-16 20:49:18 +00:00
Phill Ridout
21b362c9a2 doc string! 2018-01-14 09:01:00 +00:00
7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
331554a038 HEAD 2018-01-13 17:45:24 -07:00
d6087813ae - Ongoing conversions from self.asserts to plain asserts
- Remove test_ part of method name for bugfix tests no longer used
- Move tests *_change_status_* from pjlink_commands_01 to pjlink_base
- Move test projector_reset_information from pjlink_commands_01 to pjlink_commands_02
- Move lamp_nonstandard_reply from bugfix to pjlink_commands_01
- Move clss_nonstandard_reply 1/2 from bugfix to pjlink_commands_01
- Move test_projector_get_* tests from pjlink_commands_01 to pjlink_base
- Added pjli...

bzr-revno: 2809
2018-01-13 17:44:36 -07:00
d758ed257c Fix progress not showing in the FTW 2018-01-13 16:24:26 -07:00
Phill Ridout
42465605ac fix saving and loading progress bar
Fixes: https://launchpad.net/bugs/1734432
2018-01-13 09:02:29 +00:00
Phill Ridout
c88a08f9e4 HEAD 2018-01-13 07:25:07 +00:00
Phill Ridout
2095a00dc9 Fix up code so test passes 2018-01-13 07:24:20 +00:00
372051067d Update pjlink_class define in db 2018-01-12 23:17:15 -08:00
9e184ebbfd Go back to the way I was doing it originally. Much more succint. 2018-01-12 22:59:44 -07:00
17ff6a7d31 PJLink2 update o 2018-01-12 21:41:42 -08:00
11f528d09c Change is_thread_finished() to return True if a thread is missing 2018-01-12 22:24:53 -07:00
83bc19520a Removed a duplicate test file, fixed up some tests, added some more tests 2018-01-12 21:57:16 -07:00
ff421df2bf Fix bug #1742910
Fixes: https://launchpad.net/bugs/1742910
2018-01-12 11:29:32 -07:00
7e99381dba Fix some issues highlighted by Tim and Phill, and added a file that was erroneously removed 2018-01-07 10:50:29 -07:00
35fd553024 If XDG is available, log files belong in the real cache dir 2018-01-06 21:45:13 -07:00
738e8e0283 Remove the Qt style option - it never worked anyway 2018-01-06 21:40:40 -07:00
954d1618bc Fix the direction of the '--no-web-server' command line option 2018-01-06 21:36:45 -07:00
7b28262987 Fix a mismatch of arguments in a call to reload_bibles() 2018-01-06 21:36:17 -07:00
Phill Ridout
dd6887d388 HEAD 2018-01-06 09:56:10 +00:00
Phill Ridout
e1400dc227 Finally merge the save lite method in to the 'standard' save method' 2018-01-06 09:55:19 +00:00
5612be1b5a Stop the HTTP server properly too 2018-01-06 00:02:45 -07:00
f693d3aa37 Call close() to stop everything properly 2018-01-05 21:41:49 -07:00
3e9073275a Fix an issue with versions of websockets > 4.0 2018-01-04 22:32:12 -07:00
2d009f1884 Change a log.error to a log.exception 2018-01-04 14:13:24 -07:00
0601cf1543 Move cleanup to after thread wait; Figured out why the webserver was exiting early 2018-01-04 14:03:15 -07:00
db7ff02abb Move the thread code to after the event has been accepted 2018-01-04 10:17:20 -07:00
544c396bbc Fix some linting issues 2018-01-04 00:00:55 -07:00
64b26774a1 For some reason, the thumbnail downloader was still using a string path 2018-01-03 23:37:59 -07:00
13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
f1575dd50b Updated various thread usages 2018-01-03 23:01:35 -07:00
20c1579a55 Just commit some of my recent changes 2018-01-02 23:57:12 -07:00
d97ca9e54b Merge trunk 2018-01-02 16:35:14 -08:00
Simon Hanna
399b40745d Fixed the version checking to be more robust
* Strip the response so empty responses that contain whitespace are in fact empty
* Change http to https to result in one less query
* Add test for responses containing white space
* Add .cache to bzrignore (generated by pytest when tests fail)

bzr-revno: 2805
2018-01-02 21:00:54 +00:00
Phill Ridout
a1ea35c4e7 continued refactor of saving packaged files 2017-12-30 08:08:10 +00:00
Simon Hanna
d490a32f94 Remove sleep statement 2017-12-29 14:59:08 +01:00
Simon Hanna
0f23d12d72 Fix version checking if response is empty 2017-12-29 11:27:58 +01:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
cfc487d623 tests 2017-12-28 08:27:44 +00:00
Tim Bentley
5495ba8cf3 plugins done and tested 2017-12-28 08:08:12 +00:00
Phill Ridout
4b1965520c Start on refactoring file saving 2017-12-27 16:06:36 +00:00
33da95371f Cleanups and assert updates 2017-12-25 20:14:39 -08:00
598a373929 PJLink Updates N 2017-12-25 00:44:30 -08:00
ca581d00bd HEAD 2017-12-23 14:53:54 -07:00
2eb89c8361 Some enhancements to projectors 2017-12-23 14:53:13 -07:00
Phill Ridout
a866bc5499 Test fixes 2017-12-22 22:35:09 +00:00
Phill Ridout
3bdf6d0bd6 HEAD 2017-12-22 21:21:39 +00:00
Phill Ridout
c3c1f1dc66 Test tidy ups 2017-12-22 21:20:49 +00:00
Tim Bentley
0ed4ac5224 more assert updates and py.test fixes
py.test now runs on the whole test without major errors.

lp:~trb143/openlp/asserts (revision 2826)
https://ci.openlp.io/job/Branch-01-Pull/2371/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2272/              [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2132/               [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1458/                [SUCCESS]
https://ci.openlp.io/job/Branch-04...

bzr-revno: 2799
2017-12-22 15:11:30 +00:00
Phill
2db71e57c0 Number of fixes, including:
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread


lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/              [WAITING]
[RUNNING]
[SUCC...

bzr-revno: 2798
2017-12-21 20:23:26 +00:00
2fa88b17db Refactor threads to use new openlp.core.threading module 2017-12-20 07:17:07 -07:00
Tim Bentley
8f0779f600 Start media 2017-12-20 08:15:53 +00:00
Tim Bentley
5764551e3e fix up widgets 2017-12-19 19:47:02 +00:00
Phill Ridout
590f44e212 HEad 2017-12-18 19:59:35 +00:00
Phill Ridout
370ec244d8 Fix osx finding 'temp' files instead of the python source files
Fixes: https://launchpad.net/bugs/1738047
2017-12-17 15:25:54 +00:00
Phill Ridout
8717d62188 Set word wrap on SWORD importer info label
Fixes: https://launchpad.net/bugs/1736274
2017-12-17 15:23:38 +00:00
786462148f Fix an old run_thread() call 2017-12-16 23:54:21 -07:00
187714cd87 HEAD 2017-12-16 23:51:23 -07:00
1dda8f339f Refactor threading to a centralised location which can keep track of all the threads 2017-12-16 23:50:23 -07:00
Phill Ridout
f629504b5b Mostly minor path tidy-ups 2017-12-17 04:29:53 +00:00
9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
63aa4927a5 - Added pjlink.process_pjlink
- Split pjlink.check_login() to use process_pjlink()
- Added QAbstractSocket connect enum to constants
- Minor code cleanups for connection and command processing
- Updated packet queueing
- Fix get_object_filtered()
- Fix tests in test_projector_pjlink_base
- Fix tests in test_projector_pjlink_cmd_routing
- Added tests for process_pjlink method
- Updated test_projector_bugfixes_01
- Some OLP style cleanups

-------------------------------------------------------...

bzr-revno: 2795
2017-12-09 14:47:23 +00:00
eec0e325df OLP Style cleanups 2017-12-09 03:17:05 -08:00
Phill Ridout
b0b80649d4 Service maganger fix 2017-12-09 08:22:14 +00:00
44b82d8ca2 Fix mocks to use correct python version tests 2017-12-04 16:54:15 -08:00
Phill Ridout
baed193444 PEP8 2017-12-04 20:49:59 +00:00
159056f06f PJLink2-M updates 2017-12-03 16:24:47 -08:00
Phill Ridout
582e2e267a Minor fixes
Fixes: https://launchpad.net/bugs/1735765
2017-12-02 21:47:11 +00:00
Phill Ridout
4014179032 head 2017-12-02 21:37:06 +00:00
Tim Bentley
90118af85c fix abend 2017-12-02 09:11:22 +00:00
c7ea4c460e Fix up some stuff around the screen list 2017-12-01 17:35:21 -07:00
64a245bef9 HEAD 2017-12-01 14:58:34 -07:00
d4daa05686 Create Screen objects (rather than dictionaries) and capture more details about the screens 2017-12-01 14:53:32 -07:00
b650ef5730 Refactor mocks 2017-11-24 11:08:23 -08:00
2b9d2a994b Bugfix 1734275 Nonstandard LAMP reply 2017-11-24 00:30:37 -08:00
Phill Ridout
572e1efb9c Fix dvd clip selection. Pretty much coppied from lp:~mikey74/openlp/dvdplayerfix/
Fixes: https://launchpad.net/bugs/1514545
2017-11-22 21:56:56 +00:00
Phill Ridout
29f7d8967f service fixes 2017-11-22 21:39:40 +00:00
Phill Ridout
a4cfd2cdda HEAD 2017-11-22 20:22:15 +00:00
Phill Ridout
7badbca8cf Pathfixes 2017-11-22 20:21:57 +00:00
Phill Ridout
bd2efc8ec0 PEP8 2017-11-21 07:23:02 +00:00
Phill Ridout
7d0b841269 tidyups 2017-11-20 21:57:34 +00:00
Phill Ridout
a864dbbbc9 Minor tidyups 2017-11-19 21:57:38 +00:00
Phill Ridout
1b168dd7bf More pathlib refactors 2017-11-18 23:14:28 +00:00
Phill Ridout
a79ec45055 HEAD 2017-11-18 22:40:05 +00:00
Phill Ridout
f07d6e736c Moar pathlib refactors 2017-11-18 22:37:24 +00:00