diff --git a/Application.py b/Application.py index c53ba2c..ca40fe1 100644 --- a/Application.py +++ b/Application.py @@ -1,8 +1,29 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import sys from os import path from enum import Enum -from PyQt5.Qt import ( - QApplication, QStandardPaths, QSettings +from PySide2.QtCore import ( + QStandardPaths, QSettings +) +from PySide2.QtWidgets import ( + QApplication ) from log import logger diff --git a/Makefile b/Makefile index 73ea973..3fd436c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,24 @@ #!/usr/bin/env make +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + + SHELL := /bin/bash DISTDIR := dist diff --git a/Pipfile b/Pipfile index c239f9c..7468967 100644 --- a/Pipfile +++ b/Pipfile @@ -5,11 +5,11 @@ name = "pypi" [packages] injector = "*" -"pyqt5" = "*" python-opensubtitles = {git = "https://github.com/agonzalezro/python-opensubtitles.git"} requests = "*" -pyinstaller = "*" +pyinstaller = {git = "https://github.com/pyinstaller/pyinstaller.git"} pywin32-ctypes = {version = "*",sys_platform = "== 'win32'"} +pyside2 = "*" [dev-packages] "autopep8" = "*" @@ -20,6 +20,8 @@ pyinstaller = "*" pypiwin32 = {version = "*",sys_platform = "== 'win32'"} pywin32 = {version = "*",sys_platform = "== 'win32'"} yapf = "*" +pyside-type-init = "*" +pyi-archive-viewer = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 325e2c8..7f001ce 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "c89d6c0e6f2a567a5b3c2e2a5abccfb1f653f0ef7d88d47e824ee7afb5eee2d5" + "sha256": "ace418bd750982396e03c064b05c2707acd39678df604e05f291d43774ee736b" }, "pipfile-spec": 6, "requires": { @@ -16,13 +16,6 @@ ] }, "default": { - "altgraph": { - "hashes": [ - "sha256:d6814989f242b2b43025cba7161fc1b8fb487a62cd49c49245d6fd01c18ac997", - "sha256:ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c" - ], - "version": "==0.16.1" - }, "certifi": { "hashes": [ "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", @@ -37,12 +30,6 @@ ], "version": "==3.0.4" }, - "future": { - "hashes": [ - "sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8" - ], - "version": "==0.17.1" - }, "idna": { "hashes": [ "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", @@ -52,58 +39,27 @@ }, "injector": { "hashes": [ - "sha256:1413e2b1dd90c594689bc292bcc02628b969840c1292131455927f292c65e99a", - "sha256:d3c5a8d1ace69cfb4f97042a0c6ab50f34e05b7fa1d8a62d541c2f64abed2830" + "sha256:6f9602671e19ec8c85e69160b1b5469211a3ce749ccbe5d311e6ae987617ca33", + "sha256:78cdce4b89a1635a6314d673a61516ff5af292337285898ffc2f2e72961d6773" ], "index": "pypi", - "version": "==0.14.1" - }, - "macholib": { - "hashes": [ - "sha256:ac02d29898cf66f27510d8f39e9112ae00590adb4a48ec57b25028d6962b1ae1", - "sha256:c4180ffc6f909bf8db6cd81cff4b6f601d575568f4d5dee148c830e9851eb9db" - ], - "version": "==1.11" - }, - "pefile": { - "hashes": [ - "sha256:4c5b7e2de0c8cb6c504592167acf83115cbbde01fe4a507c16a1422850e86cd6" - ], - "version": "==2018.8.8" + "version": "==0.15.0" }, "pyinstaller": { - "hashes": [ - "sha256:a5a6e04a66abfcf8761e89a2ebad937919c6be33a7b8963e1a961b55cb35986b" - ], - "index": "pypi", - "version": "==3.4" + "git": "https://github.com/pyinstaller/pyinstaller.git", + "ref": "73dfb3add14ab1cf5be46f40afce44f018936cb1" }, - "pyqt5": { + "pyside2": { "hashes": [ - "sha256:517e4339135c4874b799af0d484bc2e8c27b54850113a68eec40a0b56534f450", - "sha256:ac1eb5a114b6e7788e8be378be41c5e54b17d5158994504e85e43b5fca006a39", - "sha256:d2309296a5a79d0a1c0e6c387c30f0398b65523a6dcc8a19cc172e46b949e00d", - "sha256:e85936bae1581bcb908847d2038e5b34237a5e6acc03130099a78930770e7ead" + "sha256:171d0e43bb241a12c98ab7ae46706af8e7929c973225d1c9abaf18a73dc3dbf0", + "sha256:31ca082427d2104b9ab61520c0a1435ce23073e54734f3bd671b37be471da9c1", + "sha256:4d948c441d609868b77bdd8cdab7ac6e595a6f15ca82dde3fd700f73445da821", + "sha256:4f7518cfa049272ce64e43ce06cf151bdd648c6884272d480ee4b188dbffc7f2", + "sha256:d5e39cc5868e0b1415846df185a22940219bf1a5ec38a7d9be6c0cd15f413336", + "sha256:dba738ae3cbe7f90360e0729832d741c6f74698da44614b18d44393f72745022" ], "index": "pypi", - "version": "==5.11.3" - }, - "pyqt5-sip": { - "hashes": [ - "sha256:125f77c087572c9272219cda030a63c2f996b8507592b2a54d7ef9b75f9f054d", - "sha256:14c37b06e3fb7c2234cb208fa461ec4e62b4ba6d8b32ca3753c0b2cfd61b00e3", - "sha256:1cb2cf52979f9085fc0eab7e0b2438eb4430d4aea8edec89762527e17317175b", - "sha256:4babef08bccbf223ec34464e1ed0a23caeaeea390ca9a3529227d9a57f0d6ee4", - "sha256:53cb9c1208511cda0b9ed11cffee992a5a2f5d96eb88722569b2ce65ecf6b960", - "sha256:549449d9461d6c665cbe8af4a3808805c5e6e037cd2ce4fd93308d44a049bfac", - "sha256:5f5b3089b200ff33de3f636b398e7199b57a6b5c1bb724bdb884580a072a14b5", - "sha256:a4d9bf6e1fa2dd6e73f1873f1a47cee11a6ba0cf9ba8cf7002b28c76823600d0", - "sha256:a4ee6026216f1fbe25c8847f9e0fbce907df5b908f84816e21af16ec7666e6fe", - "sha256:a91a308a5e0cc99de1e97afd8f09f46dd7ca20cfaa5890ef254113eebaa1adff", - "sha256:b0342540da479d2713edc68fb21f307473f68da896ad5c04215dae97630e0069", - "sha256:f997e21b4e26a3397cb7b255b8d1db5b9772c8e0c94b6d870a5a0ab5c27eacaa" - ], - "version": "==4.19.13" + "version": "==5.12.1" }, "python-opensubtitles": { "git": "https://github.com/agonzalezro/python-opensubtitles.git", @@ -126,6 +82,17 @@ "index": "pypi", "version": "==2.21.0" }, + "shiboken2": { + "hashes": [ + "sha256:034ea9104506dcf1c77308a73a7840f1715054b3aaeb86c7ae8b260e6572e410", + "sha256:479a44f3b11c5d0ba3d581470db28b0788214526b2a26e173890aef47328d945", + "sha256:49cb68fddd8bd302c0a9eb09554a99cad1b63bfc9440dd016b4fcd300af5612a", + "sha256:c2a2261c906065b4fb1725bb075a841c72e44e28ca642adb06663d8299d0d9fc", + "sha256:cf10631e1970ce22b3bc40673288afd55ba9b8a0d803ab0e4ed525b4a68ef6b0", + "sha256:f4038e97eeffea96bcae932f005a3f7772734b38928e0d44e48af654525c38e3" + ], + "version": "==5.12.1" + }, "urllib3": { "hashes": [ "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", @@ -214,11 +181,8 @@ "version": "==2.1.0" }, "pyinstaller": { - "hashes": [ - "sha256:a5a6e04a66abfcf8761e89a2ebad937919c6be33a7b8963e1a961b55cb35986b" - ], - "index": "pypi", - "version": "==3.4" + "git": "https://github.com/pyinstaller/pyinstaller.git", + "ref": "73dfb3add14ab1cf5be46f40afce44f018936cb1" }, "pypiwin32": { "hashes": [ @@ -244,6 +208,15 @@ "markers": "sys_platform == 'win32'", "version": "==224" }, + "pywin32-ctypes": { + "hashes": [ + "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942", + "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98" + ], + "index": "pypi", + "markers": "sys_platform == 'win32'", + "version": "==0.2.0" + }, "rope": { "hashes": [ "sha256:a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2" diff --git a/Subtitles.pyinstaller.spec b/Subtitles.pyinstaller.spec index 5ccb32e..7f12209 100644 --- a/Subtitles.pyinstaller.spec +++ b/Subtitles.pyinstaller.spec @@ -1,4 +1,20 @@ -# -*- mode: python -*- +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . from PyInstaller.utils.hooks import collect_dynamic_libs from PyInstaller.building.datastruct import TOC @@ -32,7 +48,7 @@ def write_subst_file(in_filename, out_filename, subst_dict): # From https://github.com/spesmilo/electrum/blob/master/contrib/build-osx/osx.spec # Workaround for "Retro Look": binaries = [] -for b in collect_dynamic_libs('PyQt5'): +for b in collect_dynamic_libs('PySide2'): if re.match(r'.*style\..*', b[0]): print('*** Adding Qt5 Style {}'.format(b[0])) binaries.append(b) @@ -40,7 +56,7 @@ for b in collect_dynamic_libs('PyQt5'): data_files = [ ('doc/VERSION', RESOURCES_DIR), ('doc/ACKNOWLEDGEMENTS.html', RESOURCES_DIR), - # ('doc/LICENSE.PyQt5', RESOURCES_DIR), + # ('doc/LICENSE.PySide2', RESOURCES_DIR), ('doc/LICENSE.html', RESOURCES_DIR), ('resources/Subtitles.png', RESOURCES_DIR), ] @@ -101,7 +117,7 @@ QT_MODULE_EXCLUDES = [ MODULE_EXCLUDES = [] for x in QT_MODULE_EXCLUDES: - MODULE_EXCLUDES.extend([prefix + x for prefix in ['Qt', 'Qt5', 'PyQt5.']]) + MODULE_EXCLUDES.extend([prefix + x for prefix in ['Qt', 'Qt5', 'PySide2.']]) new_binaries = [] @@ -113,36 +129,36 @@ for module, file, typ in a.binaries: should_exclude = True if should_exclude: continue - # On Linux, some paths are relative to the qml/ subdirectory, e.g. - # .../lib/python3.7/site-packages/PyQt5/Qt/qml/Qt/labs/platform/../../../../lib/libQt5Widgets.so.5 + # On Linux, some paths are relative to the qml/ subdirectory, e.g. + # .../lib/python3.7/site-packages/PySide2/Qt/qml/Qt/labs/platform/../../../../lib/libQt5Widgets.so.5 # which causes essential Qt libraries to get excluded. # So, normalize the path here, and then check for a match. file = path.normpath(file) if not module.startswith('libpython') and \ ( file.startswith('/usr/') or file.startswith('/lib') - or 'PyQt5/Qt/qml/' in file - or module.startswith('PyQt5/Qt/plugins/sqldrivers') - or module.startswith('PyQt5/Qt/plugins/mediaservice') - or module.startswith('PyQt5/Qt/plugins/position') - or module.startswith('PyQt5/Qt/plugins/sensors') - or module.startswith('PyQt5/Qt/plugins/sensorgestures') - or module.startswith('PyQt5/Qt/plugins/audio') - or 'PyQt5/Qt/plugins/imageformats/libqtga' in module - or 'PyQt5/Qt/plugins/imageformats/libqgif' in module - or 'PyQt5/Qt/plugins/imageformats/libqicns' in module - or 'PyQt5/Qt/plugins/imageformats/libqico' in module - or 'PyQt5/Qt/plugins/imageformats/libqwbmp' in module - or 'PyQt5/Qt/plugins/imageformats/libqwebp' in module - or 'PyQt5/Qt/plugins/imageformats/libqtiff' in module - or 'PyQt5/Qt/plugins/platforms/libqeglfs' in module - or 'PyQt5/Qt/plugins/platforms/libqlinuxfb' in module - or 'PyQt5/Qt/plugins/platforms/libqminimal' in module - or 'PyQt5/Qt/plugins/platforms/libqminimalegl' in module - or 'PyQt5/Qt/plugins/platforms/libqvnc' in module - or 'PyQt5/Qt/plugins/platforms/libqwebgl' in module - or 'PyQt5/Qt/plugins/platforms/libqoffscreen' in module - or 'PyQt5/Qt/plugins/playlistformats/libqtmultimedia_m3u' in module + or 'PySide2/Qt/qml/' in file + or module.startswith('PySide2/Qt/plugins/sqldrivers') + or module.startswith('PySide2/Qt/plugins/mediaservice') + or module.startswith('PySide2/Qt/plugins/position') + or module.startswith('PySide2/Qt/plugins/sensors') + or module.startswith('PySide2/Qt/plugins/sensorgestures') + or module.startswith('PySide2/Qt/plugins/audio') + or 'PySide2/Qt/plugins/imageformats/libqtga' in module + or 'PySide2/Qt/plugins/imageformats/libqgif' in module + or 'PySide2/Qt/plugins/imageformats/libqicns' in module + or 'PySide2/Qt/plugins/imageformats/libqico' in module + or 'PySide2/Qt/plugins/imageformats/libqwbmp' in module + or 'PySide2/Qt/plugins/imageformats/libqwebp' in module + or 'PySide2/Qt/plugins/imageformats/libqtiff' in module + or 'PySide2/Qt/plugins/platforms/libqeglfs' in module + or 'PySide2/Qt/plugins/platforms/libqlinuxfb' in module + or 'PySide2/Qt/plugins/platforms/libqminimal' in module + or 'PySide2/Qt/plugins/platforms/libqminimalegl' in module + or 'PySide2/Qt/plugins/platforms/libqvnc' in module + or 'PySide2/Qt/plugins/platforms/libqwebgl' in module + or 'PySide2/Qt/plugins/platforms/libqoffscreen' in module + or 'PySide2/Qt/plugins/playlistformats/libqtmultimedia_m3u' in module or 'QtWebEngineCore.framework' in file ): # print(f"Excluding binary '{module}'") @@ -154,9 +170,9 @@ for module, file, typ in a.binaries: new_datas = [] for module, file, typ in a.datas: - if module.startswith('PyQt5/Qt/qml/') \ - or module.startswith('PyQt5/Qt/lib/QtWebEngineCore.framework') \ - or module.startswith('PyQt5/Qt/translations') \ + if module.startswith('PySide2/Qt/qml/') \ + or module.startswith('PySide2/Qt/lib/QtWebEngineCore.framework') \ + or module.startswith('PySide2/Qt/translations') \ or 'qtwebengine_devtools_resources' in module \ or 'qtwebengine_resources' in module \ or 'QtWebEngineProcess' in module: @@ -164,8 +180,8 @@ for module, file, typ in a.datas: new_datas.append((module, file, type)) -a.binaries = TOC(initlist=new_binaries) -a.datas = TOC(initlist=new_datas) +# a.binaries = TOC(initlist=new_binaries) +# a.datas = TOC(initlist=new_datas) # for attrib in ['scripts', 'pure', 'binaries', 'datas', 'zipfiles']: @@ -183,10 +199,12 @@ exe = EXE(pyz, a.scripts, exclude_binaries=True, name='Subtitles', - debug=False, - strip=True, + debug='all', + # Interpreter options + options = [ ('v', None, 'OPTION') ], + strip=False, upx=USE_UPX, - console=False) + console=True) if sys.platform == 'win32': icon = 'resources/Subtitles.ico' diff --git a/doc/ACKNOWLEDGEMENTS.html b/doc/ACKNOWLEDGEMENTS.html index 4d718da..391785e 100644 --- a/doc/ACKNOWLEDGEMENTS.html +++ b/doc/ACKNOWLEDGEMENTS.html @@ -5,14 +5,14 @@ -

PyQt5

- - https://www.riverbankcomputing.com/software/pyqt/intro +

PySide2

+ + https://wiki.qt.io/PySide

- Copyright © 2018 Riverbank Computing Limited + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.

- License + License
diff --git a/doc/LICENSE.PyQt5 b/doc/LICENSE.PyQt5 deleted file mode 100644 index 94a9ed0..0000000 --- a/doc/LICENSE.PyQt5 +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/doc/LICENSE.PySide2 b/doc/LICENSE.PySide2 new file mode 100644 index 0000000..1f78e05 --- /dev/null +++ b/doc/LICENSE.PySide2 @@ -0,0 +1,177 @@ + GNU LESSER GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ + + You may use, distribute and copy the Qt Toolkit under the terms of + GNU Lesser General Public License version 3, which is displayed below. + This license makes reference to the version 3 of the GNU General + Public License, which you can find in the LICENSE.GPLv3 file. + +------------------------------------------------------------------------- + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/log.py b/log.py index e5e9bdf..44be55e 100644 --- a/log.py +++ b/log.py @@ -1,3 +1,21 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import logging import sys diff --git a/main.py b/main.py index ce0c8ce..ef27a44 100755 --- a/main.py +++ b/main.py @@ -1,10 +1,29 @@ #!/usr/bin/env python3 + +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import sys import signal import log -from PyQt5.Qt import PYQT_VERSION_STR -from PyQt5.Qt import QSettings -from PyQt5.QtWidgets import QDesktopWidget +import PySide2 +from PySide2.QtCore import QSettings +from PySide2.QtWidgets import QDesktopWidget from log import logger from Application import Application from ui.MainWindow import MainWindow @@ -16,7 +35,7 @@ if __name__ == "__main__": log.init() - logger.info("Using PyQt5 version {}".format(PYQT_VERSION_STR)) + logger.info("Using PySide2 version {}".format(PySide2.__version__)) # Use INI files on Windows, NativeFormat on all other OS if sys.platform == 'win32': diff --git a/main.spec b/main.spec new file mode 100644 index 0000000..9abdd95 --- /dev/null +++ b/main.spec @@ -0,0 +1,36 @@ +# -*- mode: python ; coding: utf-8 -*- + +block_cipher = None + + +a = Analysis(['main.py'], + pathex=['C:\\Users\\pbelemez\\wdev\\Subtitles'], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=True) +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) +exe = EXE(pyz, + a.scripts, + [('v', None, 'OPTION')], + exclude_binaries=True, + name='main', + debug=True, + bootloader_ignore_signals=False, + strip=False, + upx=False, + console=True ) +coll = COLLECT(exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=False, + name='main') diff --git a/run_tests.py b/run_tests.py index 4312361..eb14d87 100644 --- a/run_tests.py +++ b/run_tests.py @@ -1,4 +1,22 @@ #!/usr/bin/env python3 +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import nose nose.run() diff --git a/service/EncodingService.py b/service/EncodingService.py index 714eb0b..512e662 100644 --- a/service/EncodingService.py +++ b/service/EncodingService.py @@ -1,3 +1,21 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import encodings diff --git a/service/OpenSubService.py b/service/OpenSubService.py index afb5716..346ae13 100644 --- a/service/OpenSubService.py +++ b/service/OpenSubService.py @@ -1,3 +1,21 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + from pythonopensubtitles.utils import File from pythonopensubtitles import opensubtitles from log import logger diff --git a/service/__init__.py b/service/__init__.py index 83004ac..7608e47 100644 --- a/service/__init__.py +++ b/service/__init__.py @@ -1 +1,19 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + from service.OpenSubService import OpenSubService diff --git a/test/OpenSubService_test.py b/test/OpenSubService_test.py index dcd3ee9..2c0f793 100644 --- a/test/OpenSubService_test.py +++ b/test/OpenSubService_test.py @@ -1,3 +1,21 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import unittest from .context import service @@ -15,4 +33,3 @@ def test_calculate_hash(self): def test_download_by_hash(self): svc = service.OpenSubService() svc.download_by_hash(TEST_HASH, lambda x: print(str(x))) - \ No newline at end of file diff --git a/test/__init__.py b/test/__init__.py index e69de29..9a0bf82 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -0,0 +1,17 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . diff --git a/test/context.py b/test/context.py index 9fc1e30..630c511 100644 --- a/test/context.py +++ b/test/context.py @@ -1,3 +1,21 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import os import sys sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))) diff --git a/ui/AboutDialog.py b/ui/AboutDialog.py index f2f2a33..b6fba86 100644 --- a/ui/AboutDialog.py +++ b/ui/AboutDialog.py @@ -1,29 +1,47 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import re import sys from typing import List, Tuple -from PyQt5.Qt import ( - PYQT_VERSION_STR, - pyqtSlot, - # QDesktopServices, - QFrame, - QIcon, - QSizePolicy, +import PySide2 +from PySide2.QtCore import ( + Slot, Qt, - # QUrl, ) -from PyQt5.QtWidgets import ( +from PySide2.QtWidgets import ( QDialog, QDialogButtonBox, QFormLayout, + QFrame, QGridLayout, QHBoxLayout, QLabel, QLayout, QPushButton, + QSizePolicy, QSpacerItem, QVBoxLayout, QWidget, ) +from PySide2.QtGui import ( + QIcon, +) from Application import Application from .TextDialog import TextDialog # from os import path @@ -142,7 +160,7 @@ def _createSelectableLabel(self, text): Qt.TextSelectableByKeyboard | Qt.TextSelectableByMouse) return label - @pyqtSlot() + @Slot() def showAcknowledgements(self): app = Application.instance() ackFilename = app.findResource('ACKNOWLEDGEMENTS.html') @@ -154,7 +172,7 @@ def showAcknowledgements(self): html_filename=ackFilename) textDialog.exec_() - @pyqtSlot() + @Slot() def showLicense(self): app = Application.instance() licenseFilename = app.findResource('LICENSE.html') @@ -187,8 +205,8 @@ def _readFile(filename): _VERSION_LABELS = [ {'label': Application.translate( 'AboutDialog', 'Version'), 'file': 'VERSION'}, - {'label': Application.translate('AboutDialog', 'PyQt Version'), - 'value': PYQT_VERSION_STR}, + {'label': Application.translate('AboutDialog', 'PySide2 Version'), + 'value': PySide2.__version__}, {'label': Application.translate('AboutDialog', 'Git Commit'), 'file': 'VERSION.commit'}, {'label': Application.translate('AboutDialog', 'Build Number'), diff --git a/ui/MainWindow.py b/ui/MainWindow.py index 50d74c4..0c8d07f 100644 --- a/ui/MainWindow.py +++ b/ui/MainWindow.py @@ -1,3 +1,21 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import shutil import os import gzip @@ -5,41 +23,39 @@ import requests from enum import IntEnum, auto, unique from os import path -from PyQt5.Qt import ( - pyqtSlot, - QAction, - QApplication, - QErrorMessage, - QKeySequence, - QMainWindow, - QMenu, +from PySide2.QtCore import ( QMimeDatabase, QMimeType, - QSizePolicy, Qt, QThreadPool, + Slot ) -from PyQt5.QtWidgets import ( +from PySide2.QtWidgets import ( + QAction, + QApplication, + QErrorMessage, QFileDialog, QLabel, + QMainWindow, + QMenu, QMenuBar, QMessageBox, QProgressBar, + QSizePolicy, QStackedLayout, QHBoxLayout, QVBoxLayout, QWidget, ) -# from PyQt5.QtSvg import QSvgWidget +from PySide2.QtGui import ( + QKeySequence, +) from .task import Task from .PreferencesDialog import PreferencesDialog from .AboutDialog import AboutDialog -# from pprint import pformat from service.OpenSubService import OpenSubService from service.EncodingService import EncodingService from log import logger -# import multiprocessing -# import rx from functools import partial from tempfile import NamedTemporaryFile @@ -113,7 +129,7 @@ def _initMenu(self): self.setMenuBar(mb) - @pyqtSlot() + @Slot() def showOpenFile(self): dlg = QFileDialog(self) dlg.setWindowTitle(self.tr("Open Video Files")) @@ -151,7 +167,7 @@ def showOpenFile(self): for f in filenames: self._processFile(f) - @pyqtSlot() + @Slot() def showAbout(self): dlg = AboutDialog(self) dlg.exec_() @@ -213,11 +229,11 @@ def createPageWithProgressBar(text: str) -> QWidget: self.setCentralPage(MainWindow.CentralPage.DRAG_FILES) - @pyqtSlot(int) + @Slot(int) def setCentralPage(self, page: CentralPage): self._stackLayout.setCurrentIndex(page.value) - @pyqtSlot() + @Slot() def showPreferences(self): prefDialog = PreferencesDialog( subtitleService=self._subService, diff --git a/ui/PreferencesDialog.py b/ui/PreferencesDialog.py index 044e9f7..d24761e 100644 --- a/ui/PreferencesDialog.py +++ b/ui/PreferencesDialog.py @@ -1,15 +1,32 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import sys from os import path -from PyQt5.Qt import ( - QApplication, - QIcon, +from PySide2.QtCore import ( QLocale, QMimeData, Qt, QTextCodec, ) -from PyQt5.QtWidgets import ( +from PySide2.QtWidgets import ( QAbstractItemView, + QApplication, QComboBox, QCheckBox, QDialog, @@ -24,6 +41,9 @@ QPushButton, QVBoxLayout ) +from PySide2.QtGui import ( + QIcon, +) from .Settings import Settings from Application import Application from log import logger @@ -114,7 +134,7 @@ def _initEncodingList(self): encList = QComboBox(self) codecs = QTextCodec.availableCodecs() - codecNames = sorted([str(x, encoding='ascii') + codecNames = sorted([str(x.data(), encoding='ascii') for x in codecs], key=lambda x: x.lower()) for codec in codecNames: @@ -160,7 +180,7 @@ def _getPreferredCodec(self): enc = settings.get(Settings.ENCODING) if enc: return enc - return str(QTextCodec.codecForLocale().name(), encoding='ascii') + return str(QTextCodec.codecForLocale().name().data(), encoding='ascii') def _getPreferredLanguages(self): settings = Settings() diff --git a/ui/Settings.py b/ui/Settings.py index 00f38f8..dc58804 100644 --- a/ui/Settings.py +++ b/ui/Settings.py @@ -1,8 +1,25 @@ -from PyQt5.QtCore import QSettings +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + +from PySide2.QtCore import QSettings from log import logger from os import path - class Settings(object): CORE = "core" LANGUAGES = CORE + "/languages" diff --git a/ui/TextDialog.py b/ui/TextDialog.py index 0831737..e20e122 100644 --- a/ui/TextDialog.py +++ b/ui/TextDialog.py @@ -1,10 +1,30 @@ +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + import sys -from PyQt5.Qt import ( +from PySide2.QtCore import ( + QRect, Qt, +) +from PySide2.QtGui import ( QFontMetrics, - QRect, ) -from PyQt5.QtWidgets import ( +from PySide2.QtWidgets import ( qApp, QDesktopWidget, QDialog, diff --git a/ui/__init__.py b/ui/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ui/busyIndicator.qml b/ui/busyIndicator.qml deleted file mode 100644 index eeb73d7..0000000 --- a/ui/busyIndicator.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.10 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles 1.4 - -BusyIndicator { - id: busyIndicator - anchors.centerIn: parent - // color: "blue" - running: true -} diff --git a/ui/task.py b/ui/task.py index 1d80e24..00bdb03 100644 --- a/ui/task.py +++ b/ui/task.py @@ -1,6 +1,23 @@ -from PyQt5.QtCore import QRunnable, QObject -from PyQt5.Qt import pyqtSlot, pyqtSignal, QErrorMessage -import traceback +# Copyright (C) 2018--2019 Philip Belemezov. +# All Rights Reserved. +# +# This file is part of Subtitles. +# +# Subtitles is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Subtitles is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Subtitles. If not, see . + +from PySide2.QtCore import QRunnable, QObject +from PySide2.QtCore import Slot, Signal from log import logger from typing import Callable @@ -10,8 +27,8 @@ class TaskSignals(QObject): - success = pyqtSignal(object, QRunnable) - error = pyqtSignal(Exception, QRunnable) + success = Signal(object, QRunnable) + error = Signal(Exception, QRunnable) def __init__(self): super().__init__() @@ -33,13 +50,14 @@ def __init__(self, self._on.success.connect(onSuccess) if onError: self._on.error.connect(onError) - # self.setAutoDelete(False) + # XXX: This is required with PySide2, but not with PyQt5! (?!?!) + self.setAutoDelete(False) # TODO: Verify this is OK - @pyqtSlot() + @Slot() def setStop(self): self.stop = True - @pyqtSlot() + @Slot() def run(self): if self.stop: return @@ -59,20 +77,9 @@ def run(self): self._on.error.emit(e, self) logger.debug(f"Task '{self.name}' returning") - def __del__(self): - logger.debug("") + # def __del__(self): + # logger.debug("") def __str__(self): return f"Task ('{self.name}', func={self.func}, onSuccess={self.onSuccess}, " \ f"onError={self.onError}, stop={self.stop})" - - # def getErrorFunc(self, message): - # def error_func(error_details): - # # TODO: Display the error message to the user - # msg = "Error: {}, {}\n{}".format( - # message, - # error_details.error_message, - # error_details.details) - # logger.error(msg) - # QErrorMessage.qtHandler().showMessage(msg) - # return error_func