Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick 5dbb993a from release branch #3202

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Cherry-pick 5dbb993a from release branch #3202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/windows/models/properties_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
"""
"""
@file
@brief This file contains the clip properties model, used by the properties view
@author Jonathan Thomas <jonathan@openshot.org>

@section LICENSE

Copyright (c) 2008-2018 OpenShot Studios, LLC
(http://www.openshotstudios.com). This file is part of
OpenShot Video Editor (http://www.openshot.org), an open-source project
dedicated to delivering high quality video editing and animation solutions
to the world.

OpenShot Video Editor 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.

OpenShot Video Editor 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 OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
"""
Expand Down Expand Up @@ -564,7 +564,6 @@ def update_model(self, filter=""):
# Get raw unordered JSON properties
raw_properties = json.loads(c.PropertiesJSON(self.frame_number))
all_properties = OrderedDict(sorted(raw_properties.items(), key=lambda x: x[1]['name']))
log.info("Getting properties for frame %s: %s" % (self.frame_number, str(all_properties)))

# Check if filter was changed (if so, wipe previous model data)
if self.previous_filter != filter:
Expand Down