diff -Nru openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/debian/changelog openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/debian/changelog --- openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/debian/changelog 2022-06-20 20:33:18.000000000 +0000 +++ openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/debian/changelog 2022-06-22 19:33:08.000000000 +0000 @@ -1,8 +1,8 @@ -openshot-qt (2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1) impish; urgency=low +openshot-qt (2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1) impish; urgency=low * Auto build. - -- OpenShot Code Mon, 20 Jun 2022 20:33:18 +0000 + -- OpenShot Code Wed, 22 Jun 2022 19:33:08 +0000 openshot-qt (2.6.1-1) UNRELEASED; urgency=medium diff -Nru openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/debian/git-build-recipe.manifest openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/debian/git-build-recipe.manifest --- openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/debian/git-build-recipe.manifest 2022-06-20 20:33:18.000000000 +0000 +++ openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/debian/git-build-recipe.manifest 2022-06-22 19:33:08.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+dfsg2+1552+202206202033 -lp:openshot git-commit:9792abe156649e243131c00cad36d3d45ed9f4d1 +# git-build-recipe format 0.4 deb-version {debupstream}+dfsg2+1553+202206221933 +lp:openshot git-commit:baca896a76a59601f7448aedcbe73a24f4000b07 nest-part packaging lp:openshot-packaging openshot-qt/debian debian git-commit:0b65bfa3c1c3fbe90abba4c47775e54bdeec1b9c diff -Nru openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/classes/effect_init.py openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/classes/effect_init.py --- openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/classes/effect_init.py 2022-06-20 20:33:04.000000000 +0000 +++ openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/classes/effect_init.py 2022-06-22 19:32:58.000000000 +0000 @@ -149,7 +149,7 @@ } ], - "Object Detector": [ + "ObjectDetection": [ { "value": "https://github.com/OpenShot/openshot-qt/wiki/Object-Detection-Effect-(dependencies)", "title": "Click here for instructions and dependencies...", Binary files /tmp/tmp92yplh_j/TUlZgHTQZn/openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/effects/icons/objectdetection@2x.png and /tmp/tmp92yplh_j/pW8eyJJp5m/openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/effects/icons/objectdetection@2x.png differ Binary files /tmp/tmp92yplh_j/TUlZgHTQZn/openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/effects/icons/objectdetection.png and /tmp/tmp92yplh_j/pW8eyJJp5m/openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/effects/icons/objectdetection.png differ Binary files /tmp/tmp92yplh_j/TUlZgHTQZn/openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/effects/icons/objectdetector@2x.png and /tmp/tmp92yplh_j/pW8eyJJp5m/openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/effects/icons/objectdetector@2x.png differ Binary files /tmp/tmp92yplh_j/TUlZgHTQZn/openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/effects/icons/objectdetector.png and /tmp/tmp92yplh_j/pW8eyJJp5m/openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/effects/icons/objectdetector.png differ diff -Nru openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/timeline/js/controllers.js openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/timeline/js/controllers.js --- openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/timeline/js/controllers.js 2022-06-20 20:33:04.000000000 +0000 +++ openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/timeline/js/controllers.js 2022-06-22 19:32:58.000000000 +0000 @@ -498,7 +498,7 @@ return "#ff9700"; case "Noise": return "#a9a9a9"; - case "Object Detector": + case "ObjectDetection": return "#636363"; case "Parametric EQ": return "#708090"; diff -Nru openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/windows/process_effect.py openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/windows/process_effect.py --- openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/windows/process_effect.py 2022-06-20 20:33:04.000000000 +0000 +++ openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/windows/process_effect.py 2022-06-22 19:32:58.000000000 +0000 @@ -49,7 +49,7 @@ # Path to ui file ui_path = os.path.join(info.PATH, 'windows', 'ui', 'process-effect.ui') - def __init__(self, clip_id, effect_name, effect_params): + def __init__(self, clip_id, effect_class, effect_params): if not openshot.Clip().COMPILED_WITH_CV: raise ModuleNotFoundError("Openshot not compiled with OpenCV") @@ -58,9 +58,17 @@ QDialog.__init__(self) # Track effect details self.clip_id = clip_id - self.effect_name = effect_name + self.effect_name = "" + self.effect_class = effect_class self.context = {} + # Get all effect JSON data, and find effect's display name (based on the class name) + raw_effects_list = json.loads(openshot.EffectInfo.Json()) + for raw_effect in raw_effects_list: + if raw_effect.get("class_name") == self.effect_class: + self.effect_name = raw_effect.get("name") + break + # Access C++ timeline and find the Clip instance which this effect should be applied to timeline_instance = get_app().window.timeline_sync.timeline for clip_instance in timeline_instance.Clips(): @@ -72,12 +80,12 @@ ui_util.load_ui(self, self.ui_path) ui_util.init_ui(self) - # Update window title - self.setWindowTitle(self.windowTitle() % self.effect_name) - # get translations _ = get_app()._tr + # Update window title + self.setWindowTitle(self.windowTitle() % _(self.effect_name)) + # Pause playback get_app().window.PauseSignal.emit() @@ -331,7 +339,7 @@ jsonString = json.dumps(self.context) # Generate processed data - processing = openshot.ClipProcessingJobs(self.effect_name, jsonString) + processing = openshot.ClipProcessingJobs(self.effect_class, jsonString) processing.processClip(self.clip_instance, jsonString) # TODO: This is just a temporary fix. We need to find a better way to allow the user to fix the error @@ -364,7 +372,7 @@ if(not self.cancel_clip_processing): # Load processed data into effect - self.effect = openshot.EffectInfo().CreateEffect(self.effect_name) + self.effect = openshot.EffectInfo().CreateEffect(self.effect_class) self.effect.SetJson( '{"protobuf_data_path": "%s"}' % protobufPath ) self.effect.Id(ID) diff -Nru openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/windows/views/webview.py openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/windows/views/webview.py --- openshot-qt-2.6.1+dfsg2+1552+202206202033~ubuntu21.10.1/src/windows/views/webview.py 2022-06-20 20:33:04.000000000 +0000 +++ openshot-qt-2.6.1+dfsg2+1553+202206221933~ubuntu21.10.1/src/windows/views/webview.py 2022-06-22 19:32:58.000000000 +0000 @@ -2987,7 +2987,7 @@ js_position = callback_data.get('position', 0.0) js_nearest_track = callback_data.get('track', 0) - # Get name of effect + # Get class name of effect name = effect_names[0] # Loop through clips on the closest layer