raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,926 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

11936 Commits

Author SHA1 Message Date
Tomas Groth 4d8661b669 Improve service loading 2018-10-28 17:34:17 +01:00
Tomas Groth 055d165830 Fixed loading and viewing presentations. 2018-10-28 07:28:33 +01:00
Bastian Germann 191273fbe8 Remove unused imports 2018-10-27 13:05:41 +02:00
Bastian Germann 6aa998edd0 Replace PyICU with PyQt's QCollator 
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
 2018-10-27 12:50:15 +02:00
Tim Bentley 26a9b2430d Head 2018-10-27 07:00:51 +01:00
Tim Bentley b09a3a5b5a minor 2018-10-27 06:58:03 +01:00
Raoul Snyman dc5a9590ba Fix up some more linting issues 2018-10-26 21:13:33 -07:00
Raoul Snyman 417912aae2 Fix the tests 2018-10-26 18:53:43 -07:00
Raoul Snyman d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
Raoul Snyman ec479e589b Fix a bunch of linting issues (which should also help resolve other circular dependencies) 2018-10-26 16:15:31 -07:00
Tim Bentley bcd917d360 finish plugin migartion and clean up main window 2018-10-26 20:30:39 +01:00
Tim Bentley 20dc4f81ed fix plugin loading 2018-10-26 19:30:59 +01:00
Raoul Snyman 4bed8eabed Attempt to remove/reduce circular imports 2018-10-26 11:26:12 -07:00
Tim Bentley 9546c1d9bf Head 2018-10-25 17:38:39 +01:00
Tim Bentley 59c5c7bed7 more cleanups 2018-10-25 17:37:12 +01:00
Philip Ridout a867c54b94 HEAD 2018-10-24 22:02:06 +01:00
Tomas Groth 7f5bd854db 2018-10-24 22:10:32 +02:00
Phill 891f1dc397 Migrate bibles to use the centeral proxy settings. Upgrade settings and bible meta data accordingly. 
bzr-revno: 2837
 2018-10-24 20:35:22 +01:00
Tomas Groth 8ad8eeb60d Update some header years. 2018-10-24 20:44:17 +02:00
Bastian Germann cd5939eb3b This fixes setuptools' dependencies according to scripts/check_dependencies.py. 
The minimum Python version is set to 3.6 because this was agreed to on the mailing list.
Some packages which are optional in the source are declared as optional (uno, pyenchant, pyodbc).

To overcome a module conflict, openlp.py is replaced with run_openlp.py which setuptools installs as /usr/bin/openlp (or openlp.exe on Windows).

Additionally, pyxdg is replaced with appdirs (see License violations issue).

bzr-revno: 2836
 2018-10-24 20:22:28 +02:00
Tim Bentley 9c30b2e5a9 More plugin state cleanups 2018-10-23 17:43:52 +01:00
Philip Ridout aa744e0d99 PEP fixes 2018-10-22 21:42:25 +01:00
Philip Ridout bdec3f407b Remove proxy settings from individual bibles and use the centeral OpenLP proxy server settings. 2018-10-22 21:17:55 +01:00
Tomas Groth 27dfa68240 Fixed actual creation of themes. Thumbnail creation does not work yet. 2018-10-21 22:12:53 +02:00
Tim Bentley c08347ca3e more fixes 2018-10-21 16:35:59 +01:00
Tim Bentley bc7b772ed2 head 2018-10-20 15:43:33 +01:00
Tim Bentley 1d4a414240 more state stuff 2018-10-20 15:41:32 +01:00
Ken Roberts a3f2030349 PJLink2 Update T and pep8 2018-10-19 21:33:32 -07:00
Bastian Germann e458622fcc Revert the mediainfo upstreaming 
Keep the pymediainfo dependency for later
 2018-10-16 22:58:39 +02:00
Bastian Germann 0484d0bf23 Move the openlp.__main__ module to run_openlp 2018-10-16 22:07:00 +02:00
Bastian Germann b11079526d Decode byte string for MediaInfo 2018-10-16 21:24:47 +02:00
Bastian Germann 45a1c3d3f1 Find macOS problem 2018-10-16 21:07:31 +02:00
Bastian Germann dd346487f5 Find macOS problem 2018-10-16 20:55:25 +02:00
Bastian Germann ddc66fcd2f Try to fix macOS tests 2018-10-16 20:32:30 +02:00
Bastian Germann 7eafbac68d Make Code-Analysis happy 2018-10-16 09:29:58 +02:00
Bastian Germann b5e717a0bd Make Code-Analysis happy 2018-10-16 09:18:48 +02:00
Tomas Groth 66ce7db46f Fixed the theme layout preview and made preview widget scaling use HTML scaling. 2018-10-13 22:55:36 +02:00
Tim Bentley 92492ab0e8 initial phase of vlc and statemanagement 2018-10-13 11:24:01 +01:00
Bastian Germann ba01cd35e1 Optionally depend on launchpadlib 2018-10-13 00:11:04 +02:00
Tomas Groth bb9aa4a561 Initial support for transparent backgrounds. 2018-10-12 21:51:51 +02:00
Bastian Germann e124229040 Try to fix CI 2018-10-11 20:25:53 +02:00
Bastian Germann 0e61b22a10 Add OFL for FontAwesome 2018-10-11 00:05:02 +02:00
Bastian Germann 5f23d3adea Use appdirs instead of pyxdg 
appdirs is used for all systems except Windows.
It has Windows support, so it could be used there as well.
 2018-10-08 01:34:00 +02:00
Bastian Germann bd3015babf Media plugin checks for libmediainfo 2018-10-08 00:05:04 +02:00
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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 393823c0ab Forgot the screens tab -_- 2018-09-12 07:26:04 -07:00
Raoul Snyman 514f2a16c6 Merge from shared branch 2018-09-11 22:48:08 -07:00
Raoul Snyman 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
Raoul Snyman 0794015765 Remove all the screen settings for now 2018-09-07 19:01:07 -07:00
Raoul Snyman 37424b3b13 HEAD 2018-09-07 07:59:21 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
Ken Roberts 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
Raoul Snyman 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
Ken Roberts 64524318b3 Updated fix for server error when getting version 2018-06-28 09:51:35 -07:00
Ken Roberts 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
Ken Roberts 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
Ken Roberts 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
Ken Roberts 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 1f9d00f47c Fix non-song text items not updating the display (missing verse tags, essentially) 2018-04-11 09:37:28 -07:00
Raoul Snyman b521b9aeba HEAD 2018-04-11 09:08:34 -07:00
Raoul Snyman 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