From a4b936d876e4f7160b04c81e06604c5b7c57099d Mon Sep 17 00:00:00 2001 From: Alberto Sottile Date: Sat, 20 Mar 2021 22:16:29 +0100 Subject: [PATCH] Adapt codebase to third party notices format change --- MANIFEST.in | 1 + README.md | 2 +- buildPy2app.py | 2 +- buildPy2exe.py | 2 +- syncplay/ui/gui.py | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 29917cb..3cf7945 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,4 +4,5 @@ include syncplay/resources/*.png include syncplay/resources/*.mng include syncplay/resources/*.lua include syncplay/resources/*.rtf +include syncplay/resources/*.txt include syncplay/resources/lua/intf/*.lua diff --git a/README.md b/README.md index db1a2be..cfdb76e 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Syncplay is not a file sharing service. ## License -This project, the Syncplay released binaries, and all the files included in this repository unless stated otherwise in the header of the file, are licensed under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). A copy of this license is included in the LICENSE file of this repository. Licenses and attribution notices for third-party media are set out in [third-party-notices.rtf](syncplay/resources/third-party-notices.rtf). +This project, the Syncplay released binaries, and all the files included in this repository unless stated otherwise in the header of the file, are licensed under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). A copy of this license is included in the LICENSE file of this repository. Licenses and attribution notices for third-party media are set out in [third-party-notices.txt](syncplay/resources/third-party-notices.txt). ## Authors * *Initial concept and core internals developer* - Uriziel. diff --git a/buildPy2app.py b/buildPy2app.py index 659e575..f3271e1 100755 --- a/buildPy2app.py +++ b/buildPy2app.py @@ -11,7 +11,7 @@ import syncplay APP = ['syncplayClient.py'] DATA_FILES = [ - ('resources', glob('syncplay/resources/*.png') + glob('syncplay/resources/*.rtf') + glob('syncplay/resources/*.lua')), + ('resources', glob('syncplay/resources/*.png') + glob('syncplay/resources/*.rtf') + glob('syncplay/resources/*.txt') + glob('syncplay/resources/*.lua')), ('resources/lua/intf', glob('syncplay/resources/lua/intf/*.lua')) ] OPTIONS = { diff --git a/buildPy2exe.py b/buildPy2exe.py index b12af0c..362fa32 100755 --- a/buildPy2exe.py +++ b/buildPy2exe.py @@ -726,7 +726,7 @@ guiIcons = glob('syncplay/resources/*.ico') + glob('syncplay/resources/*.png') + resources = [ "syncplay/resources/syncplayintf.lua", "syncplay/resources/license.rtf", - "syncplay/resources/third-party-notices.rtf" + "syncplay/resources/third-party-notices.txt" ] resources.extend(guiIcons) intf_resources = ["syncplay/resources/lua/intf/syncplay.lua"] diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index 96ab007..a4884ef 100755 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -190,9 +190,9 @@ class AboutDialog(QtWidgets.QDialog): def openDependencies(self): if isWindows(): - QtGui.QDesktopServices.openUrl(QUrl("file:///" + resourcespath + "third-party-notices.rtf")) + QtGui.QDesktopServices.openUrl(QUrl("file:///" + resourcespath + "third-party-notices.txt")) else: - QtGui.QDesktopServices.openUrl(QUrl("file://" + resourcespath + "third-party-notices.rtf")) + QtGui.QDesktopServices.openUrl(QUrl("file://" + resourcespath + "third-party-notices.txt")) class CertificateDialog(QtWidgets.QDialog):