Update latest from dev

.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

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":
@@ -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/build-mac-dmg.sh

@@ -31,7 +31,6 @@ 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";

installer/build-server.py

@@ -251,7 +251,7 @@ def parse_version_info(version_path):
             github_release = get_release(repo, "daily")
         elif git_branch_name == "release":
             # Get daily git_release object
-            openshot_qt_git_desc = "OpenShot-v%s-%d" % (info.VERSION, int(time.time()))
+            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)

setup.py

@@ -67,8 +67,13 @@
     ('share/applications', ['xdg/openshot-qt.desktop']),
     # AppStream metadata
     ('share/metainfo', ['xdg/openshot-qt.appdata.xml']),
-    # XDG application icon
+    # 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)

src/classes/app.py

@@ -93,7 +93,7 @@ def __init__(self, *args, mode=None):
         # Detect minimum libopenshot version
         _ = self._tr
         libopenshot_version = openshot.GetVersion().ToString()
-        if libopenshot_version < info.MINIMUM_LIBOPENSHOT_VERSION:
+        if mode != "unittest" and libopenshot_version < info.MINIMUM_LIBOPENSHOT_VERSION:
             QMessageBox.warning(None, _("Wrong Version of libopenshot Detected"),
                                       _("<b>Version %(minimum_version)s is required</b>, but %(current_version)s was detected. Please update libopenshot or download our latest installer.") %
                                 {"minimum_version": info.MINIMUM_LIBOPENSHOT_VERSION, "current_version": libopenshot_version})

src/classes/conversion.py

@@ -40,12 +40,11 @@ def zoomToSeconds(zoomValue):
 def secondsToZoom(scaleValue):
     """ Convert a number of seconds to a timeline zoom factor """
     if scaleValue in zoomSeconds:
-        return zoomSeconds[scaleValue]
+        return zoomSeconds.index(scaleValue)
     else:
         # Find closest zoom
         closestValue = zoomSeconds[0]
         for zoomValue in zoomSeconds:
             if zoomValue < scaleValue:
                 closestValue = zoomValue
         return zoomSeconds.index(closestValue)
-

src/classes/info.py

@@ -27,9 +27,11 @@
 
 import os
 
-VERSION = "2.4.2"
-MINIMUM_LIBOPENSHOT_VERSION = "0.2.0"
-DATE = "20180630000000"
+from PyQt5.QtCore import QDir
+
+VERSION = "2.4.3"
+MINIMUM_LIBOPENSHOT_VERSION = "0.2.2"
+DATE = "20180922000000"
 NAME = "openshot-qt"
 PRODUCT_NAME = "OpenShot Video Editor"
 GPL_VERSION = "3"

src/classes/language.py

@@ -60,10 +60,10 @@ def init_language():
          "path": QLibraryInfo.location(QLibraryInfo.TranslationsPath)},
         {"type": 'QT',
          "prefix": 'qt_',
-         "path": os.path.join(info.PATH, 'locale', 'QT')}, # Optional path where we package QT translations
+         "path": os.path.join(info.PATH, 'language')}, # Optional path where we package QT translations
         {"type": 'QT',
          "prefix": 'qtbase_',
-         "path": os.path.join(info.PATH, 'locale', 'QT')}, # Optional path where we package QT translations
+         "path": os.path.join(info.PATH, 'language')}, # Optional path where we package QT translations
         {"type": 'OpenShot',
          "prefix": 'OpenShot.',  # Our custom translations
          "path": language_path},

src/classes/updates.py

@@ -71,13 +71,17 @@ def json(self, is_array=False, only_value=False):
 
         # Build the dictionary to be serialized
         if only_value:
-            data_dict = self.values
+            data_dict = copy.deepcopy(self.values)
         else:
             data_dict = {"type": self.type,
                          "key": self.key,
-                         "value": self.values,
+                         "value": copy.deepcopy(self.values),
                          "partial": self.partial_update,
-                         "old_values": self.old_values}
+                         "old_values": copy.deepcopy(self.old_values)}
+
+        # Always remove 'history' key (if found)
+        if "history" in data_dict:
+            data_dict.pop("history")
 
         if not is_array:
             # Use a JSON Object as the root object
@@ -126,13 +130,15 @@ def load_history(self, project):
 
         # Loop through each, and load serialized data into updateAction objects
         for actionDict in history.get("redo", []):
-            action = UpdateAction()
-            action.load_json(json.dumps(actionDict))
-            self.redoHistory.append(action)
+            if "history" not in actionDict.keys():
+                action = UpdateAction()
+                action.load_json(json.dumps(actionDict))
+                self.redoHistory.append(action)
         for actionDict in history.get("undo", []):
-            action = UpdateAction()
-            action.load_json(json.dumps(actionDict))
-            self.actionHistory.append(action)
+            if "history" not in actionDict.keys():
+                action = UpdateAction()
+                action.load_json(json.dumps(actionDict))
+                self.actionHistory.append(action)
 
         # Notify watchers of new status
         self.update_watchers()
@@ -268,8 +274,6 @@ def load(self, values):
 
         self.last_action = UpdateAction('load', '', values)
         self.redoHistory.clear()
-        if not self.ignore_history:
-            self.actionHistory.append(self.last_action)
         self.dispatch_action(self.last_action)
 
     # Perform new actions, clearing redo history for taking a new path