Merge pull request #2134 from OpenShot/release

Release of 2.4.3 (Merge release branch into master branch)

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,31 +1,31 @@
----
-name: Bug report
-about: Create a report to help us improve OpenShot
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**System Details (please complete the following information):**
- - Operating System / Distro: [e.g. Windows 10, Linux Mint 17.1]
- - OpenShot Version [e.g. 2.4.1]
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Logs**
-If you are experiencing a crash, please collect and attach logs of the problem.
-
-**Additional context**
-Add any other context about the problem here.
+---
+name: Bug report
+about: Create a report to help us improve OpenShot
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**System Details (please complete the following information):**
+ - Operating System / Distro: [e.g. Windows 10, Linux Mint 17.1]
+ - OpenShot Version [e.g. 2.4.1]
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Logs**
+If you are experiencing a crash, please collect and attach logs of the problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,17 +1,17 @@
----
-name: Feature request
-about: Suggest an idea for OpenShot
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: Feature request
+about: Suggest an idea for OpenShot
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/i-have-a-question.md

@@ -0,0 +1,21 @@
+---
+name: I Have a Question
+about: Ask a question about obtaining, installing, or using OpenShot
+
+---
+
+<!--Give your question a descriptive title so that others will be able to understand at a glance how they can help. Then, explain in more detail under "My Question" below -->
+
+**My Question:**
+
+
+
+
+<!-- Please replace the following text in square brackets with details about your system -->
+
+**System Details**
+ - Operating System / Distro: [e.g. Windows 10, Linux Mint 17.1]
+ - OpenShot Version [e.g. 2.4.1]
+
+**Screenshots**
+<!-- If applicable, add screenshots to help illustrate your question. You can include screenshots by copy/pasting them here, dragging-and-dropping into this form, or clicking below and loading images saved to your computer. All images are public, so please don't post screenshots containing personal information. -->

.gitignore

@@ -4,3 +4,6 @@
 idea/*
 doc/_build
 **/__pycache__/
+build
+dist
+openshot_qt.egg-info

.gitlab-ci.yml

@@ -20,6 +20,8 @@ linux-builder:
     - python3 freeze.py build
     - python3 installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME"
   when: always
+  except:
+  - tags
   tags:
     - linux
 
@@ -55,6 +57,8 @@ mac-builder:
     - /Library/Frameworks/Python.Framework/Versions/3.6/bin/python3.6 freeze.py bdist_mac --iconfile=installer/openshot.icns --custom-info-plist=installer/Info.plist --bundle-name="OpenShot Video Editor"
     - /Library/Frameworks/Python.Framework/Versions/3.6/bin/python3.6 installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME"
   when: always
+  except:
+  - tags
   tags:
     - mac
 
@@ -76,6 +80,8 @@ windows-builder-x86:
     - editbin /LARGEADDRESSAWARE "$CI_PROJECT_DIR\build\exe.mingw-3.6\launch.exe"
     - python3 installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "True" "$CI_COMMIT_REF_NAME"
   when: always
+  except:
+  - tags
   tags:
     - windows
 
@@ -96,5 +102,7 @@ windows-builder-x64:
     - python3 freeze.py build
     - python3 installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME"
   when: always
+  except:
+  - tags
   tags:
     - windows

.travis.yml

@@ -0,0 +1,24 @@
+language: cpp
+dist: trusty
+
+before_install:
+  - sudo add-apt-repository ppa:openshot.developers/libopenshot-daily -y
+  - sudo apt-get update -qq
+  - sudo apt-get install gcc-4.8 xvfb tar cmake libopenshot-dev libopenshot-audio-dev libunittest++-dev swig doxygen doxypy libssl-dev python3 python3-dev python3-pip python3-pyqt5 python3-setuptools python3-openshot python3-pyqt5 python3-pyqt5.qtmultimedia python3-pyqt5.qtopengl python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-requests python3-xdg python3-zmq qttranslations5-l10n -y
+  - sudo apt autoremove -y
+  - wget https://files.pythonhosted.org/packages/d0/6d/9492644452727094543575de9846af5a2b9c764f760e2d414af7c876618c/cx_Freeze-5.0.1.tar.gz
+  - tar xf cx_Freeze-5.0.1.tar.gz
+  - cd cx_Freeze-5.0.1; python3 setup.py build; sudo python3 setup.py install; cd ..;
+  - pwd
+
+script:
+  - python3 freeze.py build;
+  - xvfb-run --auto-servernum --server-num=1 --server-args "-screen 0 1920x1080x24" python3 src/tests/query_tests.py
+
+notifications:
+  email: true
+
+env:
+  global:
+  - TRAVIS_LIBOPENSHOT=TEST
+  - LANG="en_US.UTF-8"

AUTHORS

@@ -7,7 +7,7 @@ developer credits.
 
 
 Translation:
-See src/locale/ folders for details on translation credits. Each
+See src/language/ folder for details on translation credits. Each
 translation contains a "translator-credits" key containing the
 details of each translator that contributed to that language.
 
@@ -35,4 +35,4 @@ https://github.com/OpenShot/openshot-qt/graphs/contributors
 https://github.com/OpenShot/libopenshot/graphs/contributors
 https://github.com/OpenShot/libopenshot-audio/graphs/contributors
 http://openshot.org/developers
-https://launchpad.net/~openshot.developers
+https://launchpad.net/~openshot.developers

README.md

@@ -73,7 +73,7 @@ copies all the code files to the /site-packages/ folder.
 Here is a tutorial of the current development features:
 
 #### Do you have a help manual?
-1) Yes, go to http://www.openshotusers.com/help/en/
+1) Yes, read it online at https://www.openshot.org/user-guide/
 
 #### How do I add media to my project?
 1) Drag and drop videos or music files from gnome into the "Project Files" tree.

freeze.py

@@ -125,16 +125,16 @@ def find_files(directory, patterns):
 build_exe_options = {}
 
 # Copy QT translations to local folder (to be packaged)
-qt_local_path = os.path.join(PATH, "openshot_qt", "locale", "QT")
+qt_local_path = os.path.join(PATH, "openshot_qt", "language")
 qt_system_path = QLibraryInfo.location(QLibraryInfo.TranslationsPath)
 if os.path.exists(qt_system_path):
     # Create local QT translation folder (if needed)
     if not os.path.exists(qt_local_path):
         os.mkdir(qt_local_path)
     # Loop through QT translation files and copy them
     for file in os.listdir(qt_system_path):
-        # Copy QT locale files
-        if file.startswith("qt_") and file.endswith(".qm"):
+        # Copy QT translation files
+        if (file.startswith("qt_") or file.startswith("qtbase_")) and file.endswith(".qm"):
             shutil.copyfile(os.path.join(qt_system_path, file), os.path.join(qt_local_path, file))
 
 if sys.platform == "win32":
@@ -214,7 +214,7 @@ def find_files(directory, patterns):
                     if (libpath \
                         and not libpath.startswith("/lib") \
                         and not "libnvidia-glcore.so" in libpath \
-                        and not libpath_file in ["libstdc++.so.6", "libGL.so.1", "libxcb.so.1", "libX11.so.6", "libasound.so.2", "libgcc_s.so.1 ", "libICE.so.6", "libp11-kit.so.0", "libSM.so.6", "libgobject-2.0.so.0"]) \
+                        and not libpath_file in ["libstdc++.so.6", "libGL.so.1", "libxcb.so.1", "libX11.so.6", "libasound.so.2", "libgcc_s.so.1 ", "libICE.so.6", "libp11-kit.so.0", "libSM.so.6", "libgobject-2.0.so.0", "libdrm.so.2"]) \
                             or libpath_file in ["libgcrypt.so.11", "libQt5DBus.so.5", "libpng12.so.0", "libbz2.so.1.0", "libqxcb.so"]:
 
                         # Ignore paths that start with /lib
@@ -272,4 +272,4 @@ def find_files(directory, patterns):
 
 # Remove temporary folder (if SRC folder present)
 if os.path.exists(os.path.join(PATH, "src")):
-    rmtree(os.path.join(PATH, "openshot_qt"), True)
+    rmtree(os.path.join(PATH, "openshot_qt"), True)

installer/analyze_errors.py

@@ -1,10 +1,14 @@
 """Analyze archived/exported error messages and aggregate data"""
 import re
+import sys
 import os
 import json
-import urllib.request
+from urllib.request import Request, urlopen
 from collections import OrderedDict
 
+# Read in slack token
+if len(sys.argv) >= 2:
+    slack_token = sys.argv[1]
 
 # Compile error message matching regex (file path, line number)
 error_regex = re.compile(r"([\\|/].*.py).*line (.*),")
@@ -13,10 +17,10 @@
 openshot_version_regex = re.compile(r"\((.*)\)")
 
 # Message folder with exported archived error messages
-messages_folder = "/home/jonathan/Downloads/OpenShot Project Slack export Jan 21 2018/library-exceptions"
+messages_folder = "/home/jonathan/Downloads/OpenShot Project Slack export Jul 9 2018 - Aug 8 2018/python-exceptions"
 cache_path = local_path = os.path.join(messages_folder, "cache")
-version_starts_with = "2.4.1"
-scan_cache = True
+version_starts_with = "2.4.2"
+scan_cache = False
 
 # Create cache folder (if needed)
 if not os.path.exists(cache_path):
@@ -29,9 +33,9 @@
         if os.path.isfile(message_path):
             with open(message_path, "r") as f:
                 for message in json.load(f):
-                    if message.get("file"):
-                        file_title = message.get("file").get("title")
-                        file_id = message.get("file").get("id")
+                    for file_details in message.get("files", []):
+                        file_title = file_details.get("title")
+                        file_id = file_details.get("id")
 
                         # Parse openshot version (if any)
                         version = "Unknown"
@@ -47,9 +51,10 @@
                         # Cache attachment (if needed)
                         local_path = os.path.join(cache_path, "%s-%s" % (version, file_id))
                         if not os.path.exists(local_path):
-                            attachment_url = message.get("file").get("url_private_download")
-                            response = urllib.request.urlopen(attachment_url)
-                            data = response.read()
+                            attachment_url = file_details.get("url_private_download").split("?")[0]
+                            q = Request(attachment_url)
+                            q.add_header('Authorization', slack_token)
+                            data = urlopen(q).read()
 
                             with open(local_path, "wb") as f1:
                                 print("Writing local file: %s-%s" % (version, file_id))

installer/build-mac-dmg.sh

@@ -31,7 +31,7 @@ mv "$OS_PATH/MacOS/blender" "$OS_PATH/Resources/blender"; ln -s "../Resources/bl
 mv "$OS_PATH/MacOS/classes" "$OS_PATH/Resources/classes"; ln -s "../Resources/classes" "$OS_PATH/MacOS/classes";
 mv "$OS_PATH/MacOS/effects" "$OS_PATH/Resources/effects"; ln -s "../Resources/effects" "$OS_PATH/MacOS/effects";
 mv "$OS_PATH/MacOS/images" "$OS_PATH/Resources/images"; ln -s "../Resources/images" "$OS_PATH/MacOS/images";
-mv "$OS_PATH/MacOS/locale" "$OS_PATH/Resources/locale"; ln -s "../Resources/locale" "$OS_PATH/MacOS/locale";
+mv "$OS_PATH/MacOS/language" "$OS_PATH/Resources/language"; ln -s "../Resources/language" "$OS_PATH/MacOS/language";
 mv "$OS_PATH/MacOS/presets" "$OS_PATH/Resources/presets"; ln -s "../Resources/presets" "$OS_PATH/MacOS/presets";
 mv "$OS_PATH/MacOS/profiles" "$OS_PATH/Resources/profiles"; ln -s "../Resources/profiles" "$OS_PATH/MacOS/profiles";
 mv "$OS_PATH/MacOS/settings" "$OS_PATH/Resources/settings"; ln -s "../Resources/settings" "$OS_PATH/MacOS/settings";

installer/build-server.py

@@ -39,6 +39,7 @@
 import subprocess
 import sys
 import tinys3
+import time
 import traceback
 from github3 import login
 
@@ -243,13 +244,14 @@ def parse_version_info(version_path):
         # Add num of commits from libopenshot and libopenshot-audio (for naming purposes)
         # If not an official release
         if git_branch_name == "develop":
-            # Make filename more descriptive for daily builds
+            # Make filename more descriptive for daily builds (add time epoch)
+            openshot_qt_git_desc = "OpenShot-v%s-%d" % (info.VERSION, int(time.time()))
             openshot_qt_git_desc = "%s-%s-%s" % (openshot_qt_git_desc, version_info.get('libopenshot').get('CI_COMMIT_SHA')[:8], version_info.get('libopenshot-audio').get('CI_COMMIT_SHA')[:8])
             # Get daily git_release object
             github_release = get_release(repo, "daily")
         elif git_branch_name == "release":
             # Get daily git_release object
-            openshot_qt_git_desc = "OpenShot-v%s" % info.VERSION
+            openshot_qt_git_desc = "OpenShot-v%s-release-candidate-%d" % (info.VERSION, int(time.time()))
             github_release = get_release(repo, "daily")
         elif git_branch_name == "master":
             # Get official version release (i.e. v2.1.0, v2.x.x)
@@ -261,15 +263,13 @@ def parse_version_info(version_path):
                 github_release = repo.create_release(git_description, target_commitish="master", prerelease=True)
         else:
             # Make filename more descriptive for daily builds
+            openshot_qt_git_desc = "OpenShot-v%s-%d" % (info.VERSION, int(time.time()))
             openshot_qt_git_desc = "%s-%s-%s" % (openshot_qt_git_desc, version_info.get('libopenshot').get('CI_COMMIT_SHA')[:8], version_info.get('libopenshot-audio').get('CI_COMMIT_SHA')[:8])
             # Get daily git_release object
             github_release = get_release(repo, "daily")
             needs_upload = False
 
-    # Output git desription
-    output("git description of openshot-qt-git: %s" % openshot_qt_git_desc)
-
-    # Output git desription
+    # Output git description
     output("git description of openshot-qt-git: %s" % openshot_qt_git_desc)
 
     # Detect version number from git description

installer/launch-linux.sh

@@ -5,8 +5,7 @@ LD_LIBRARY_PATH="."
 
 # Set some environment variables for ImageMagick and Qt5
 export QT_PLUGIN_PATH="."
-export QT_DEBUG_PLUGINS="1"
 
 # Launch application
 HERE="$(dirname "$(readlink -f "${0}")")"
-exec "${HERE}"/launch "$@"
+exec "${HERE}"/launch "$@"

setup.py

@@ -65,8 +65,15 @@
 os_files = [
     # XDG application description
     ('share/applications', ['xdg/openshot-qt.desktop']),
-    # XDG application icon
+    # AppStream metadata
+    ('share/metainfo', ['xdg/openshot-qt.appdata.xml']),
+    # Debian menu system application icon
     ('share/pixmaps', ['xdg/openshot-qt.svg']),
+    # XDG Freedesktop icon paths
+    ('share/icons/hicolor/scalable/apps', ['xdg/openshot-qt.svg']),
+    ('share/icons/hicolor/64/apps', ['xdg/icon/64/openshot-qt.png']),
+    ('share/icons/hicolor/256/apps', ['xdg/icon/256/openshot-qt.png']),
+    ('share/icons/hicolor/512/apps', ['xdg/icon/512/openshot-qt.png']),
     # XDG desktop mime types cache
     ('share/mime/packages', ['xdg/openshot-qt.xml']),
     # launcher (mime.types)