We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 7
flowblade.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sun Apr 1 18:22:22 UTC 2018 - avvissu@yandex.by4
+5
+- Update to 1.16:6
+ * see /usr/share/doc/packages/flowblade/RELEASE_NOTES7
+- Change the home page8
+- Refresh dependencies9
+- Fix: non-executable-script10
+- Spec file cleanup11
+12
+-------------------------------------------------------------------13
Wed Oct 4 23:03:03 UTC 2017 - avvissu@yandex.by14
15
- Update to 1.14:16
flowblade.spec
Changed
144
1
2
#3
# spec file for package flowblade4
#5
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.6
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.7
#8
# All modifications and additions to the file contributed by third parties9
# remain the property of their copyright owners, unless otherwise agreed10
11
# Please submit bugfixes or comments via http://bugs.opensuse.org/12
#13
14
-%define prjname Flowblade15
+16
Name: flowblade17
-Version: 1.1418
+Version: 1.1619
Release: 020
Summary: Multitrack non-linear video editor21
-License: GPL-3.022
+License: GPL-3.0-only23
Group: Productivity/Multimedia/Video/Editors and Convertors24
-Url: https://code.google.com/p/flowblade/25
+URL: http://jliljebl.github.io/flowblade26
Source: https://github.com/jliljebl/flowblade/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz27
-BuildRequires: python-devel >= 2.7.028
-BuildRequires: update-desktop-files29
-BuildRequires: shared-mime-info30
BuildRequires: fdupes31
BuildRequires: frei0r-plugins >= 1.432
-# Check list of dependencies:33
-BuildRequires: pkgconfig(cairomm-1.0)34
-BuildRequires: pkgconfig(librsvg-2.0)35
-BuildRequires: libmlt6-modules36
-BuildRequires: dbus-1-python37
-BuildRequires: python-cairo38
-BuildRequires: python-gnomevfs39
-BuildRequires: python-imaging40
-BuildRequires: python-mlt41
-BuildRequires: python-numpy42
+BuildRequires: gobject-introspection43
+BuildRequires: python-devel >= 2.7.044
+BuildRequires: shared-mime-info45
+BuildRequires: update-desktop-files46
Requires: dbus-1-python47
Requires: ffmpeg48
Requires: frei0r-plugins >= 1.449
Requires: ladspa50
Requires: ladspa-swh-plugins51
+Requires: libmlt6-data52
Requires: libmlt6-modules53
Requires: python-cairo54
-Requires: python-gnomevfs55
-Requires: python-gobject-Gdk56
Requires: python-gobject57
+Requires: python-gobject-Gdk58
Requires: python-imaging59
Requires: python-mlt60
Requires: python-numpy61
+Requires: rsvg-view62
Requires: sox63
-Requires: %(rpm -qf $(readlink -qne %{_libdir}/libcairomm-1.0.so) --qf '%{NAME} >= %{VERSION}')64
-Requires: %(rpm -qf $(readlink -qne %{_libdir}/librsvg-2.so) --qf '%{NAME} >= %{VERSION}')65
-BuildRoot: %{_tmppath}/%{name}-%{version}-build66
+Recommends: gmic67
BuildArch: noarch68
+# SECTION Check dependencies:69
+BuildRequires: dbus-1-python70
+BuildRequires: libmlt6-modules >= 6.6.071
+BuildRequires: python-cairo72
+BuildRequires: python-imaging73
+BuildRequires: python-mlt74
+BuildRequires: python-numpy75
+BuildRequires: rsvg-view76
+# / SECTION77
78
%description79
Flowblade is designed to provide a fast, precise and robust editing experience.80
81
%prep82
%setup -q -n %{name}-%{version}/%{name}-trunk83
84
+# Check MLT build with SDL 1.285
+rpm -qR libmlt6-modules | grep -w libSDL || 'SDL 1.2 not found' 2> /dev/null86
+#87
sed -i 's|%{_datadir}/pyshared|%{python_sitelib}|' %{name}88
89
%build90
91
python setup.py install --prefix=%{_prefix} --root=%{buildroot}92
93
mkdir -p %{buildroot}%{_datadir}/locale94
-mv %{buildroot}{%{python_sitelib}/%{prjname}/locale/*,%{_datadir}/locale/}95
+mv %{buildroot}{%{python_sitelib}/Flowblade/locale/*,%{_datadir}/locale/}96
find %{buildroot} -type f -name "*.po*" -delete -print97
98
rm -rf %{buildroot}%{_libexecdir}/mime/packages/%{name}99
100
-%fdupes -s %{buildroot}%{python_sitelib}101
+%fdupes %{buildroot}%{python_sitelib}102
%find_lang %{name}103
104
+# Fix: non-executable-script105
+pushd %{buildroot}106
+for _file in $(grep -rl '^\#\!\/'); do107
+ ! echo $_file | grep '\/usr\/bin\|\/launch' || chmod 0755 $_file 108
+ find -name ${_file##*/} -type f -perm 644 -exec sed '/^\#\!/d' -i {} \+109
+ find -name ${_file##*/} -type f -perm 755 -exec sed '/^\#\!\/.\+py/c\#\!%{_bindir}/python' -i {} \+110
+ find -name ${_file##*/} -type f -perm 755 -exec sed '/^\#\!\/.\+sh/c\#\!/bin/bash' -i {} \+111
+done112
+%py_compile .%{python_sitelib}113
+popd114
+115
%post116
%mime_database_post117
%desktop_database_post118
119
%desktop_database_postun120
121
%files122
-%defattr(0644,root,root)123
-%doc AUTHORS COPYING README docs/RELEASE_NOTES*124
-%attr(0755,root,root) %{_bindir}/%{name}125
+%license COPYING126
+%doc AUTHORS README docs/RELEASE_NOTES*127
+%{_bindir}/%{name}128
%{_datadir}/applications/%{name}.desktop129
-%{_mandir}/man?/%{name}.?%{ext_info}130
-%{_datadir}/pixmaps/%{name}.png131
+%{_datadir}/pixmaps/%{name}.??g132
%{_datadir}/mime/packages/%{name}.xml133
-%{python_sitelib}/%{prjname}134
-%attr(0755,root,root) %{python_sitelib}/%{prjname}/launch/%{name}*135
-%{python_sitelib}/%{name}-*.egg-info136
+%{_mandir}/man?/%{name}.?%{ext_info}137
+%{python_sitelib}/Flowblade/138
+%{python_sitelib}/%{name}*info139
140
%files lang -f %{name}.lang141
-%defattr(0644,root,root)142
143
%changelog144
flowblade-1.14.tar.gz/README.md -> flowblade-1.16.tar.gz/README.md
Changed
22
1
2
3
4
5
-**Coming soon: Target date for release 1.14 further post-poned to August 6th 2017.**6
+**Updating to MLT 6.6.0 from 6.5.0 version fixes startup crashes, [more info](./flowblade-trunk/docs/SDL_2_AND_MLT_6_6_0.md).**7
8
**Contents:**9
1. [Introduction](https://github.com/jliljebl/flowblade#introduction)10
11
12
# Releases13
14
-**Latest release:** Flowblade Movie Editor 1.12 was released on March 2017.15
+**Latest release:** Flowblade Movie Editor 1.14 was released on October 2017.16
17
-**Next release:** Flowblade Movie Editor 1.14 will be out on August 2017.18
+**Next release:** Flowblade Movie Editor 1.16 will be out on March 2018.19
20
# Installing Flowblade21
22
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/app.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/app.py
Changed
63
1
2
BATCH_DIR = "batchrender/"3
autosave_timeout_id = -14
recovery_dialog_id = -15
+sdl2_timeout_id = -16
loaded_autosave_file = None7
8
splash_screen = None9
10
except:11
editorstate.mlt_version = "0.0.99" # magic string for "not found"12
13
+14
+ #print "SDL version:", str(editorstate.get_sdl_version())15
+ 16
# passing -xdg as a flag will change the user_dir location with XDG_CONFIG_HOME17
# For full xdg-app support all the launch processes need to add this too, currently not impl.18
19
20
# maintain a simpler and/or non-circular import structure21
monkeypatch_callbacks()22
23
+ # File in assoc_file_path is opened after very short delay24
if not(check_crash == True and len(autosave_files) > 0):25
if assoc_file_path != None:26
print "Launch assoc file:", assoc_file_path27
global assoc_timeout_id28
assoc_timeout_id = GObject.timeout_add(10, open_assoc_file)29
- 30
+31
+ # SDL 2 consumer needs to created after Gtk.main() has run enough for window to be visble32
+ #if editorstate.get_sdl_version() == editorstate.SDL_2: # needs more state considerion still33
+ # print "SDL2 timeout launch"34
+ # global sdl2_timeout_id35
+ # sdl2_timeout_id = GObject.timeout_add(1500, create_sdl_2_consumer)36
+ 37
# Launch gtk+ main loop38
Gtk.main()39
40
41
42
# These provide clues for further module refactoring 43
44
+# ---------------------------------- SDL2 consumer45
+#def create_sdl_2_consumer():46
+# GObject.source_remove(sdl2_timeout_id)47
+# print "Creating SDL2 consumer..."48
+# editorstate.PLAYER().create_sdl2_video_consumer()49
+50
# ---------------------------------- program, sequence and project init51
def get_assoc_file_path():52
"""53
54
55
editorstate.project = new_project56
editorstate.media_view_filter = appconsts.SHOW_ALL_FILES57
- 58
+ editorstate.auto_follow = editorstate.project.get_project_property(appconsts.P_PROP_AUTO_FOLLOW)59
+60
# Inits widgets with project data61
init_project_gui()62
63
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/appconsts.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/appconsts.py
Changed
84
1
2
FILE_DOES_NOT_EXIST = 73
IMAGE_SEQUENCE = 84
5
-# Mediaview filtering options6
+# Media view filtering options7
SHOW_ALL_FILES = 08
SHOW_VIDEO_FILES = 19
SHOW_AUDIO_FILES = 210
11
SHOW_IMAGE_SEQUENCES = 412
SHOW_PATTERN_PRODUCERS = 513
14
-# Used to draw indicators that tell if more frames are available while trimming15
+# These are used to draw indicators that tell if more frames are available while trimming16
ON_FIRST_FRAME = 017
ON_LAST_FRAME = 118
ON_BETWEEN_FRAME = 219
20
# Display heights for tracks and timeline.21
TRACK_HEIGHT_NORMAL = 50 # track height in canvas and column22
TRACK_HEIGHT_SMALL = 25 # track height in canvas and column23
-TRACK_HEIGHT_SMALLEST = 25 # maybe remove as it is no longer meaningful24
+TRACK_HEIGHT_SMALLEST = 25 # maybe remove this as it is no longer used25
TLINE_HEIGHT = 26026
27
# Notebook widths28
-NOTEBOOK_WIDTH = 600 # defines app min width with MONITOR_AREA_WIDTH29
+NOTEBOOK_WIDTH = 600 # defines app min width together with MONITOR_AREA_WIDTH30
NOTEBOOK_WIDTH_WIDESCREEN = 50031
TOP_ROW_HEIGHT = 50032
33
34
MLT_SERVICE = "mlt_service"35
EXTRA_EDITOR = "extraeditor"36
37
-# Available tracks max for flowblade38
+# Available tracks maximum for Flowblade39
MAX_TRACKS = 940
41
# Thumbnail image dimensions42
43
MIDBAR_COLOR = "#bdbdbd"44
45
# Media log event types46
-MEDIA_LOG_ALL = -1 # no MediaLogEvent has this type, this used when filtering events for display47
+MEDIA_LOG_ALL = -1 # no MediaLogEvent has this type, this is used when filtering events for display48
MEDIA_LOG_INSERT = 049
MEDIA_LOG_MARKS_SET = 150
51
52
# Jack options (not used currently)53
JACK_ON_START_UP_NO = 054
JACK_ON_START_UP_YES = 155
-56
JACK_OUT_AUDIO = 057
JACK_OUT_SYNC = 058
59
60
TRIM_VIEW_SINGLE = 161
TRIM_VIEW_OFF = 262
63
-# MIdbar layout64
+# Midbar layout65
MIDBAR_TC_LEFT = 066
MIDBAR_TC_CENTER = 167
MIDBAR_COMPONENTS_CENTERED = 268
69
P_PROP_TLINE_SHRINK_VERTICAL = "tline_shrink_vertical"70
P_PROP_LAST_RENDER_SELECTIONS = "P_PROP_LAST_RENDER_SELECTIONS"71
P_PROP_TRANSITION_ENCODING = "P_PROP_TRANSITION_ENCODING"72
+P_PROP_AUTO_FOLLOW = "P_PROP_AUTO_FOLLOW"73
+74
+# A context defining action taken when mouse press happens based on edit mode ands mouse position75
+POINTER_CONTEXT_NONE = 076
+POINTER_CONTEXT_END_DRAG_LEFT = 177
+POINTER_CONTEXT_END_DRAG_RIGHT = 278
+POINTER_CONTEXT_COMPOSITOR_MOVE = 379
+POINTER_CONTEXT_COMPOSITOR_END_DRAG_LEFT = 480
+POINTER_CONTEXT_COMPOSITOR_END_DRAG_RIGHT = 581
+POINTER_CONTEXT_TRIM_LEFT = 682
+POINTER_CONTEXT_TRIM_RIGHT = 783
+POINTER_CONTEXT_BOX_SIDEWAYS = 884
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/atomicfile.py
Added
182
1
2
+"""3
+ Flowblade Movie Editor is a nonlinear video editor.4
+ Copyright 2017 Janne Liljeblad and contributors.5
+6
+ This file is part of Flowblade Movie Editor <http://code.google.com/p/flowblade>.7
+8
+ Flowblade Movie Editor is free software: you can redistribute it and/or modify9
+ it under the terms of the GNU General Public License as published by10
+ the Free Software Foundation, either version 3 of the License, or11
+ (at your option) any later version.12
+13
+ Flowblade Movie Editor is distributed in the hope that it will be useful,14
+ but WITHOUT ANY WARRANTY; without even the implied warranty of15
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
+ GNU General Public License for more details.17
+18
+ You should have received a copy of the GNU General Public License19
+ along with Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.20
+"""21
+22
+"""23
+Atomic file write support.24
+"""25
+26
+import md527
+import os28
+import shutil29
+30
+MAX_CREATE_FILE_ATTEMPTS = 1031
+32
+class AtomicFileWriteError(Exception):33
+ def __init__(self, value):34
+ self.value = value35
+ def __str__(self):36
+ return repr(self.value)37
+38
+39
+class AtomicFileWriter(object):40
+ """41
+ Context manager for writing files atomically.42
+43
+ Usage:44
+45
+ with AtomicFileWriter("/path/to/file") as afw:46
+ f = afw.get_file()47
+48
+ # do stuff with writable file object49
+ f.write("hello world\n")50
+51
+ Behind the scenes, a temp file will be created in /path/to/, and when52
+ the context manager block goes out of scope, the temp file will be53
+ atomically renamed to /path/to/file.54
+55
+ Because of the atomic nature of this write, /path/to/file will either56
+ contain the complete contents of the written file, or retain its57
+ previous state.58
+ """59
+60
+ def __init__(self, file_path, mode=None):61
+ """62
+ AtomicFileWriter constructor.63
+64
+ Accepts a file path to write to (eventually)65
+ """66
+67
+ # absolute path to the temp file used for writing68
+ self.tmp_file_path = None69
+70
+ if mode is None:71
+ self.mode = "w"72
+ elif (mode == "w") or (mode == "wb"):73
+ self.mode = mode74
+ else:75
+ raise ValueError("AtomicFileWriter only accepts 'w' or 'wb' as valid modes")76
+77
+ # absolute path to the file that the caller eventually wants to write78
+ self.dest_file_path = os.path.abspath(file_path)79
+80
+ # absolute path to the directory containing the files81
+ self.dir_path = os.path.dirname(file_path)82
+83
+ # destination base filename (without the parent path)84
+ self.basename = os.path.basename(file_path)85
+86
+ # temp file object87
+ self.file_obj = None88
+89
+ def __enter__(self):90
+ """91
+ Context manager starting point.92
+93
+ Creates a temp file, and returns a reference to this instance.94
+ """95
+96
+ # try several times to create a new temp file97
+ for i in range(MAX_CREATE_FILE_ATTEMPTS):98
+ # pick a temp filename that we hope is unique99
+ maybe_tmp_file_path = self.__get_random_filename(self.basename)100
+101
+ try:102
+ # create the temp file, with a guarantee that it didn't exist before103
+ # this returns a numeric file descriptor104
+ # the mode of 666 is passed in because it will be filtered by the user's umask105
+ fd = os.open(maybe_tmp_file_path, os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0o666)106
+107
+ # if we didn't get an OSError by now, turn the numeric108
+ # file descriptor into a Python file object109
+ self.file_obj = os.fdopen(fd, "w")110
+111
+ # remember the temp file path112
+ self.tmp_file_path = maybe_tmp_file_path113
+114
+ # we created a file, stop trying115
+ break116
+117
+ except OSError:118
+ pass119
+120
+ # if we were unable to create a temp file, raise an error121
+ if not self.tmp_file_path:122
+ raise AtomicFileWriteError("could not open '%s' for writing" % (self.dest_file_path,))123
+124
+ # return a reference to this instance so it can be used as a context manager125
+ return self126
+127
+ def __exit__(self, exception_type, exception_value, traceback):128
+ """129
+ Context manager cleanup.130
+131
+ Flushes and closes the temp file (if necessary),132
+ and atomically renames it into place.133
+ """134
+135
+ # if we caught an exception from inside the context manager block,136
+ # then remove the temp file and let the exception bubble up137
+ if exception_type:138
+ try:139
+ # close the temp file if necessary140
+ if not self.file_obj.closed:141
+ self.file_obj.close()142
+143
+ # remove the temp file144
+ os.unlink(self.tmp_file_path)145
+146
+ except:147
+ print "Error cleaning up temp file: " + self.tmp_file_path148
+149
+ # let the original exception that was passed into this method bubble up150
+ return False151
+152
+ # if the caller didn't already close the file153
+ if not self.file_obj.closed:154
+ # flush the file buffer to disk155
+ self.file_obj.flush()156
+157
+ # close the file158
+ self.file_obj.close()159
+160
+ # rename the temp file into the final destination161
+ # Issue 459, uncomment os.... if problems162
+ #os.rename(self.tmp_file_path, self.dest_file_path)163
+ shutil.move(self.tmp_file_path, self.dest_file_path)164
+165
+ def get_file(self):166
+ """167
+ Get a reference to the writable temp file object.168
+169
+ This returns a regular Python file object.170
+ """171
+172
+ return self.file_obj173
+174
+ def __get_random_filename(self, basepath):175
+ """176
+ Create a candidate temp filename, without touching the filesystem.177
+ """178
+179
+ uuid_str = md5.new(str(os.urandom(32))).hexdigest()180
+ return ".tmp-" + uuid_str + "-" + basepath181
+182
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/audiomonitoring.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/audiomonitoring.py
Changed
86
1
2
3
_update_ticker.start_ticker()4
5
+def update_mute_states():6
+ if _monitor_window != None:7
+ _monitor_window.update_tracks_mute_states()8
+9
def close():10
close_audio_monitor()11
close_master_meter()12
13
return level_float14
15
16
+17
class AudioMonitorWindow(Gtk.Window):18
def __init__(self):19
GObject.GObject.__init__(self)20
21
self.set_resizable(False)22
self.set_keep_above(True) # Perhaps configurable later23
24
+ def update_tracks_mute_states(self):25
+ for i in range(1, len(self.gain_controls)):26
+ self.gain_controls[i].mute_changed()27
+28
+29
30
class MetersArea:31
def __init__(self, meters_count):32
33
meter.display_value(cr, x, l_value, r_value, grad)34
35
36
+37
class AudioMeter:38
def __init__(self, height):39
self.left_channel = ChannelMeter(height, "L")40
41
cr.set_line_width(self.meter_width)42
self.right_channel.display_value(cr, x + self.x_pad_r, value_right)43
44
- 45
+46
+47
class ChannelMeter:48
def __init__(self, height, channel_text):49
self.height = height50
51
PangoCairo.show_layout(cr, layout)52
53
54
+55
class GainControl(Gtk.Frame):56
def __init__(self, name, seq, producer, is_master=False):57
GObject.GObject.__init__(self)58
59
self.add(vbox)60
self.set_size_request(SLOT_W, CONTROL_SLOT_H)61
62
+ self.mute_changed()63
+64
def gain_changed(self, slider):65
gain = slider.get_value() / 100.066
if self.is_master == True:67
68
else:69
self.seq.set_track_pan_value(self.producer, pan_value)70
71
+ def mute_changed(self):72
+ if self.is_master == False:73
+ if hasattr(self.producer, "mute_state"):74
+ if self.producer.mute_state == appconsts.TRACK_MUTE_NOTHING or self.producer.mute_state == appconsts.TRACK_MUTE_VIDEO:75
+ self.slider.set_sensitive(True)76
+ self.pan_slider.set_sensitive(True)77
+ self.pan_button.set_sensitive(True)78
+ else:79
+ self.slider.set_sensitive(False)80
+ self.pan_slider.set_sensitive(False)81
+ self.pan_button.set_sensitive(False)82
+ 83
84
85
class MasterVolumeMeter:86
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/audiosync.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/audiosync.py
Changed
34
1
2
3
if utils.is_mlt_xml_file(sync_clip.path) == True:4
# This isn't translated because 1.14 translation window is close, translation coming for 1.165
- dialogutils.warning_message("Cannot Timeline Audio Sync with Compound Clips!", 6
- "Audio syncing for Compound Clips is not supported.",7
+ dialogutils.warning_message(_("Cannot Timeline Audio Sync with Compound Clips!"), 8
+ _("Audio syncing for Compound Clips is not supported."),9
gui.editor_window.window,10
True)11
return12
13
# Can't sync coumpound clips14
if utils.is_mlt_xml_file(video_file.path) == True or utils.is_mlt_xml_file(audio_file.path) == True:15
# This isn't translated because 1.14 translation window is close, translation coming for 1.1616
- dialogutils.warning_message("Cannot Create Audio Sync Compound Clip from Compound Clips!", 17
- "Audio syncing Compound Clips is not supported.",18
+ dialogutils.warning_message(_("Cannot Create Audio Sync Compound Clip from Compound Clips!"), 19
+ _("Audio syncing Compound Clips is not supported."),20
gui.editor_window.window,21
True)22
return23
24
# Can't sync 2 audio clips25
if video_file.type == appconsts.AUDIO and audio_file.type == appconsts.AUDIO:26
# This isn't translated because 1.14 translation window is close, translation coming for 1.1627
- dialogutils.warning_message("Cannot Create Audio Sync Compound Clip from 2 Audio Clips!", 28
- "One of the media items needs to be a video clip.",29
+ dialogutils.warning_message(_("Cannot Create Audio Sync Compound Clip from 2 Audio Clips!"), 30
+ _("One of the media items needs to be a video clip."),31
gui.editor_window.window,32
True)33
return34
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/boxmove.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/boxmove.py
Changed
96
1
2
"""3
4
"""5
-Handles Overwrite Box tool functionality.6
+Handles Box tool functionality.7
"""8
9
import edit10
11
edit_data = None12
13
def clear_data():14
- # these need to cleared when box move tool is activated15
+ # These need to cleared when box tool is activated16
global box_selection_data, edit_data17
box_selection_data = None18
edit_data = None19
20
def mouse_press(event, frame):21
global edit_data, box_selection_data22
- if box_selection_data == None: # mouse action to select23
+ if box_selection_data == None: # mouse action is to select24
press_point = (event.x, event.y)25
26
edit_data = {"action_on":True,27
"press_point":press_point,28
"mouse_point":press_point,29
"box_selection_data":None}30
- else: # mouse action to move31
+ else: # mouse action is to move32
if box_selection_data.is_hit(event.x, event.y) == False:33
- # Back to start state34
+ # Back to start state if selection box missed35
edit_data = None36
box_selection_data = None37
else:38
39
global edit_data40
if edit_data == None:41
return42
- if box_selection_data == None: # mouse action to select43
+ if box_selection_data == None: # mouse action is to select44
edit_data["mouse_point"] = (x, y)45
46
- else: # mouse move to move47
+ else: # mouse action is to move48
delta = frame - edit_data["press_frame"]49
edit_data["delta"] = delta50
51
52
if edit_data == None:53
return54
55
- if box_selection_data == None: # mouse action to select56
+ if box_selection_data == None: # mouse action is to select57
box_selection_data = BoxMoveData(edit_data["press_point"], (x, y))58
if box_selection_data.is_empty() == False:59
edit_data = {"action_on":True,60
61
"press_frame":-1,62
"delta":0,63
"box_selection_data":box_selection_data}64
- else: # mouse action to move65
+ else: # mouse action is to move66
delta = frame - edit_data["press_frame"]67
edit_data["delta"] = delta68
69
70
71
class BoxMoveData:72
"""73
- This class collects and data needed for boxovewrite moves.74
+ This class collects data needed for Box tool edits.75
"""76
def __init__(self, p1, p2):77
self.topleft_frame = -178
79
80
class BoxTrackSelection:81
"""82
- This class collects data on track's box selected clips.83
+ This class collects data on track's Box selected clips.84
"""85
def __init__(self, i, start_frame, end_frame):86
self.track_id = i87
88
return # box selection was on last clip, nothing is elected89
else:90
if start_frame == 0:91
- self.selected_range_in = 0 # first clip on timeline can be selected by selecting frame 092
+ self.selected_range_in = 0 # first clip on timeline can be selected by selecting frame 0, no outer selection required here93
else:94
self.selected_range_in = start_bound_index + 195
if self.selected_range_in == len(current_sequence().tracks):96
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/cairoarea.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/cairoarea.py
Changed
33
1
2
"""3
4
"""5
-Module contains CairoDrawableArea widget. You can draw onto it using 6
-Cairo, and listen to its mouse and keyboard events.7
+Module contains CairoDrawableArea2 widget. You can draw onto it using 8
+Cairo by setting the raw function on ceation, and listen to its mouse and keyboard events.9
"""10
11
from gi.repository import Gtk12
13
self.set_property("can-focus", True)14
self.grab_focus_on_press = True15
16
+ def add_pointer_motion_mask(self):17
+ self.add_events(Gdk.EventMask.POINTER_MOTION_MASK)18
+ #self.connect('pointer-motion-event', listener)19
+20
def set_pref_size(self, pref_width, pref_height):21
self.set_size_request(pref_width, pref_height)22
23
def _draw_event(self, widget, cr):24
a = self.get_allocation() 25
- self._draw_func(None, cr, (a.x, a.y, a.width, a.height)) # 'None' is event object that was used to pass through here. Can be removed.26
+ self._draw_func(None, cr, (a.x, a.y, a.width, a.height)) # 'None' is event object that was used to pass through here.27
# GTK2 used a tuple for allocation and all draw funcs expect it, so we provide28
- # allocation as tuple29
+ # allocation as tuple.30
return False31
32
# ------------------------------------------------------------ Signal listeners 33
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/clipeffectseditor.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/clipeffectseditor.py
Changed
201
1
2
Module handles clip effects editing logic and gui3
"""4
5
-6
+import cairo7
+import copy8
from gi.repository import GLib9
from gi.repository import Gtk10
+import pickle11
import time12
13
+import atomicfile14
+import dialogs15
+import dialogutils16
import dnd17
import edit18
+import editorpersistance19
import editorstate20
from editorstate import PROJECT21
import gui22
23
track = None # Track of the clip being editeds24
clip_index = None # Index of clip being edited25
block_changed_update = False # Used to block unwanted callback update from "changed", hack and a broken one, look to fix26
+current_filter_index = -1 # Needed to find right filter object when saving/loading effect values27
28
# This is updated when filter panel is displayed and cleared when removed.29
# Used to update kfeditors with external tline frame position changes30
31
32
def get_filter_add_action(filter_info, target_clip):33
if filter_info.multipart_filter == False:34
+ # Maybe show info on using alpha filters35
+ if filter_info.group == "Alpha":36
+ GLib.idle_add(_alpha_filter_add_maybe_info, filter_info)37
+ 38
data = {"clip":target_clip, 39
"filter_info":filter_info,40
"filter_edit_done_func":filter_edit_done}41
42
action = edit.add_multipart_filter_action(data)43
return action44
45
+def _alpha_filter_add_maybe_info(filter_info):46
+ if editorpersistance.prefs.show_alpha_info_message == True:47
+ dialogs.alpha_info_msg(_alpha_info_dialog_cb, translations.get_filter_name(filter_info.name))48
+49
+def _alpha_info_dialog_cb(dialog, response_id, dont_show_check):50
+ if dont_show_check.get_active() == True:51
+ editorpersistance.prefs.show_alpha_info_message = False52
+ editorpersistance.save()53
+54
+ dialog.destroy()55
+56
def get_selected_filter_info():57
# Get current selection on effects treeview - that's a vertical list.58
treeselection = gui.effect_select_list_view.treeview.get_selection()59
60
# Block updates until we have set selected row61
global edit_effect_update_blocked62
edit_effect_update_blocked = True63
-64
+ 65
+ """66
treeselection = widgets.effect_stack_view.treeview.get_selection()67
(model, rows) = treeselection.get_selected_rows()68
69
70
row = rows[0]71
except:72
return # This fails when there are filters but no rows are selected73
- 74
- row_index = max(row)75
+ """76
+ 77
+ #row_index = current_filter_index78
data = {"clip":clip,79
- "index":row_index,80
+ "index":current_filter_index,81
"filter_edit_done_func":filter_edit_done}82
action = edit.remove_filter_action(data)83
action.do_edit()84
85
86
filter_object = clip.filters[filter_index]87
88
+ global current_filter_index89
+ current_filter_index = filter_index90
+ 91
# Create EditableProperty wrappers for properties92
editable_properties = propertyedit.get_filter_editable_properties(93
clip, 94
95
vbox.pack_start(editor_row, False, False, 0)96
if not hasattr(editor_row, "no_separator"):97
vbox.pack_start(guicomponents.EditorSeparator().widget, False, False, 0)98
+ vbox.pack_start(guiutils.pad_label(12,12), False, False, 0)99
+ 100
+ hamburger_launcher_surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "hamburger_big.png")101
+ hamburger_launcher = guicomponents.PressLaunch(_hamburger_launch_pressed, hamburger_launcher_surface, 24, 24)102
+ 103
+ sl_row = guiutils.get_left_justified_box([hamburger_launcher.widget])104
+ vbox.pack_start(sl_row, False, False, 0)105
106
vbox.pack_start(Gtk.Label(), True, True, 0)107
+108
else:109
vbox.pack_start(Gtk.Label(label=_("No editable parameters")), True, True, 0)110
vbox.show_all()111
112
return113
for kf_widget in keyframe_editor_widgets:114
kf_widget.update_clip_pos()115
+116
+# ------------------------------------------------ SAVE; LOAD etc. from hamburger menu117
+def _hamburger_launch_pressed(widget, event):118
+ guicomponents.get_clip_effects_editor_hamburger_menu(event, _clip_hamburger_item_activated)119
+ 120
+def _clip_hamburger_item_activated(widget, msg):121
+ if msg == "save":122
+ filter_object = clip.filters[current_filter_index]123
+ default_name = filter_object.info.name + _("_effect_values") + ".data"124
+ dialogs.save_effects_compositors_values(_save_effect_values_dialog_callback, default_name)125
+ elif msg == "load":126
+ dialogs.load_effects_compositors_values_dialog(_load_effect_values_dialog_callback)127
+ elif msg == "reset":128
+ _reset_filter_values()129
+ elif msg == "delete":130
+ _delete_effect()131
+ 132
+def _save_effect_values_dialog_callback(dialog, response_id):133
+ if response_id == Gtk.ResponseType.ACCEPT:134
+ save_path = dialog.get_filenames()[0]135
+ filter_object = clip.filters[current_filter_index]136
+ effect_data = EffectValuesSaveData(filter_object)137
+ effect_data.save(save_path)138
+ 139
+ dialog.destroy()140
+141
+def _load_effect_values_dialog_callback(dialog, response_id):142
+ if response_id == Gtk.ResponseType.ACCEPT:143
+ load_path = dialog.get_filenames()[0]144
+ f = open(load_path)145
+ effect_data = pickle.load(f)146
+ 147
+ filter_object = clip.filters[current_filter_index]148
+ 149
+ if effect_data.data_applicable(filter_object.info):150
+ effect_data.set_effect_values(filter_object)151
+ effect_selection_changed()152
+ else:153
+ # Info window154
+ saved_effect_name = effect_data.info.name155
+ current_effect_name = filter_object.info.name156
+ primary_txt = _("Saved Filter data not applicaple for this Filter!")157
+ secondary_txt = _("Saved data is for ") + saved_effect_name + " Filter,\n" + _("current edited Filter is ") + current_effect_name + "."158
+ dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window)159
+ 160
+ dialog.destroy()161
+162
+def _reset_filter_values():163
+ filter_object = clip.filters[current_filter_index]164
+ info = filter_object.info165
+ if filter_object.info.multipart_filter == True:166
+ filter_object.value = info.multipart_value167
+168
+ filter_object.properties = copy.deepcopy(info.properties)169
+ filter_object.non_mlt_properties = copy.deepcopy(info.non_mlt_properties)170
+ 171
+ effect_selection_changed()172
+173
+def _delete_effect():174
+ delete_effect_pressed()175
+176
+177
+class EffectValuesSaveData:178
+ 179
+ def __init__(self, filter_object):180
+ self.info = filter_object.info181
+ self.multipart_filter = self.info.multipart_filter182
+183
+ # Values of these are edited by the user.184
+ self.properties = copy.deepcopy(filter_object.properties)185
+ try:186
+ self.non_mlt_properties = copy.deepcopy(filter_object.non_mlt_properties)187
+ except:188
+ self.non_mlt_properties = [] # Versions prior 0.14 do not have non_mlt_properties and fail here on load189
+190
+ if self.multipart_filter == True:191
+ self.value = filter_object.value192
+ else:193
+ self.value = None194
+ 195
+ def save(self, save_path):196
+ with atomicfile.AtomicFileWriter(save_path, "wb") as afw:197
+ write_file = afw.get_file()198
+ pickle.dump(self, write_file)199
+ 200
+ def data_applicable(self, filter_info):201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/clipenddragmode.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/clipenddragmode.py
Changed
38
1
2
"""3
4
"""5
-Module handles clip effects editing logic and gui6
+Module handles clip end dragging edits.7
"""8
9
+10
+import appconsts11
import gui12
import edit13
from editorstate import current_sequence14
15
16
tlinewidgets.set_edit_mode(_edit_data, tlinewidgets.draw_clip_end_drag_overlay)17
18
+ if tlinewidgets.pointer_context == appconsts.POINTER_CONTEXT_NONE:19
+ # We did CTRL + Mouse Right to get here, we need to set pointer context to left or right20
+ if editing_clip_end == True:21
+ tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_END_DRAG_RIGHT22
+ else:23
+ tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_END_DRAG_LEFT24
+25
gui.editor_window.set_cursor_to_mode()26
27
def mouse_press(event, frame):28
29
# Go back to enter mode30
editorstate.edit_mode = _enter_mode31
tlinewidgets.set_edit_mode(None, _enter_draw_func)32
- 33
+ tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_NONE34
+ 35
gui.editor_window.set_cursor_to_mode()36
updater.repaint_tline()37
38
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/clipmenuaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/clipmenuaction.py
Changed
166
1
2
from gi.repository import Gtk3
4
import mlt5
+from operator import itemgetter6
import os7
import shutil8
import time9
10
from editorstate import current_sequence11
from editorstate import get_track12
from editorstate import PROJECT13
+from editorstate import PLAYER14
+import mlttransitions15
import movemodes16
import syncsplitevent17
import tlinewidgets18
19
action.do_edit()20
elif action_id == "sync with origin":21
tlineaction.sync_compositor(compositor)22
+ elif action_id == "set auto follow":23
+ compositor.obey_autofollow = widget.get_active()24
+ updater.repaint_tline()25
26
def _open_clip_in_effects_editor(data):27
updater.open_clip_in_effects_editor(data)28
29
action.do_edit()30
31
updater.repaint_tline()32
- 33
+34
+35
+def _re_render_transition_or_fade(data):36
+ clip, track, item_id, item_data = data37
+ from_clip_id, to_clip_id, from_out, from_in, to_out, to_in, transition_type_index, sorted_wipe_luma_index, color_str = clip.creation_data38
+ name, type_id = mlttransitions.rendered_transitions[transition_type_index]39
+ if type_id < appconsts.RENDERED_FADE_IN:40
+ tlineaction.re_render_transition(data)41
+ else:42
+ tlineaction.re_render_fade(data)43
+ 44
def _mute_clip(data):45
clip, track, item_id, item_data = data46
set_clip_muted = item_data47
48
data = {"clip":clip}49
action = edit.mute_clip(data)50
action.do_edit()51
- else:# then we're stting clip unmuted52
+ else:# then we're sitting clip unmuted53
data = {"clip":clip}54
action = edit.unmute_clip(data)55
action.do_edit()56
57
if not called_from_next_clip:58
clip_index = movemodes.selected_range_out + 159
blank_index = movemodes.selected_range_in60
- if clip_index < 0: # we're not getting legal clip index61
+ if clip_index < 0: # we are not getting a legal clip index62
return63
cover_clip = track.clips[clip_index]64
else:65
66
tlinewidgets.set_match_frame(-1, -1, True)67
gui.monitor_widget.set_default_view_force()68
updater.repaint_tline()69
- 70
+71
+72
class MatchFrameWriter:73
def __init__(self, clip, clip_frame, track, display_on_right):74
self.clip = clip75
76
# Update view77
updater.repaint_tline()78
79
+80
+def _add_clip_marker(data):81
+ clip, track, item_id, item_data = data82
+ current_frame = PLAYER().current_frame()83
+84
+ playhead_on_popup_clip = True85
+ try:86
+ current_frame_clip_index = track.get_clip_index_at(current_frame)87
+ current_frame_clip = track.clips[current_frame_clip_index]88
+ except:89
+ current_frame_clip = None90
+ 91
+ if current_frame_clip != clip:92
+ # Playhead is not on popup clip93
+ 94
+ return95
+96
+ clip_start_in_tline = track.clip_start(current_frame_clip_index)97
+ clip_frame = current_frame - clip_start_in_tline + clip.clip_in98
+ 99
+ dialogs.clip_marker_name_dialog(utils.get_tc_string(clip_frame), utils.get_tc_string(current_frame), _clip_marker_add_dialog_callback, (clip, track, clip_frame))100
+101
+def _clip_marker_add_dialog_callback(dialog, response_id, name_entry, data):102
+ clip, track, clip_frame = data103
+ name = name_entry.get_text()104
+ dialog.destroy()105
+ 106
+ # remove older on same frame107
+ dupl_index = -1108
+ for i in range(0, len(clip.markers)):109
+ marker_name, frame = clip.markers[i]110
+ if frame == clip_frame:111
+ dupl_index = i112
+ if dupl_index != -1:113
+ current_sequence().markers.pop(dupl_index)114
+115
+ clip.markers.append((name, clip_frame))116
+ clip.markers = sorted(clip.markers, key=itemgetter(1))117
+ updater.repaint_tline()118
+119
+def _go_to_clip_marker(data):120
+ clip, track, item_id, item_data = data121
+ marker = clip.markers[int(item_data)]122
+ name, clip_frame = marker123
124
+ clip_start_in_tline = track.clip_start(track.clips.index(clip))125
+ marker_frame = clip_start_in_tline + clip_frame - clip.clip_in126
+127
+ PLAYER().seek_frame(marker_frame)128
+129
+def _delete_clip_marker(data):130
+ clip, track, item_id, item_data = data131
+132
+ clip_start_in_tline = track.clip_start(track.clips.index(clip))133
+ current_frame = PLAYER().current_frame()134
+135
+ mrk_index = -1136
+ for i in range(0, len(clip.markers)):137
+ name, marker_clip_frame = clip.markers[i]138
+ marker_tline_frame = clip_start_in_tline + marker_clip_frame - clip.clip_in139
+ if marker_tline_frame == current_frame:140
+ mrk_index = i141
+ if mrk_index != -1:142
+ clip.markers.pop(mrk_index)143
+ updater.repaint_tline()144
+145
+def _delete_all_clip_markers(data):146
+ clip, track, item_id, item_data = data147
+ clip.markers = []148
+ updater.repaint_tline()149
+150
+151
+152
# Functions to handle popup menu selections for strings 153
# set as activation messages in guicomponents.py154
# activation_message -> _handler_func155
156
"stretch_next":_stretch_next, 157
"stretch_prev":_stretch_prev,158
"add_autofade":_add_autofade,159
- "set_audio_sync_clip":audiosync.init_select_tline_sync_clip}160
+ "set_audio_sync_clip":audiosync.init_select_tline_sync_clip,161
+ "re_render":_re_render_transition_or_fade,162
+ "add_clip_marker":_add_clip_marker,163
+ "go_to_clip_marker":_go_to_clip_marker,164
+ "delete_clip_marker":_delete_clip_marker,165
+ "deleteall_clip_markers":_delete_all_clip_markers}166
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py
Changed
150
1
2
Module handles Compositors edit panel.3
"""4
5
+import cairo6
import copy7
-8
from gi.repository import Gtk9
+import pickle10
11
+import atomicfile12
import compositorfades13
+import dialogs14
+import dialogutils15
import gui16
import guicomponents17
import guiutils18
import edit19
+import editorstate20
from editorstate import current_sequence21
import editorpersistance22
import keyframeeditor23
24
import propertyeditorbuilder25
import propertyedit26
import propertyparse27
+import respaths28
import utils29
30
COMPOSITOR_PANEL_LEFT_WIDTH = 16031
32
33
def get_compositor_clip_panel():34
create_widgets()35
+ small = (editorstate.SCREEN_HEIGHT < 1000)36
37
compositor_vbox = Gtk.VBox(False, 2)38
compositor_vbox.pack_start(widgets.compositor_info, False, False, 0)39
- compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)40
+ if not small:41
+ compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)42
compositor_vbox.pack_start(widgets.fade_in_b, False, False, 0)43
compositor_vbox.pack_start(widgets.fade_in_spin, False, False, 0)44
- compositor_vbox.pack_start(guiutils.get_pad_label(5, 12), False, False, 0)45
+ if not small:46
+ compositor_vbox.pack_start(guiutils.get_pad_label(5, 12), False, False, 0)47
compositor_vbox.pack_start(widgets.fade_out_b, False, False, 0)48
compositor_vbox.pack_start(widgets.fade_out_spin, False, False, 0)49
- compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)50
+ if not small:51
+ compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)52
compositor_vbox.pack_start(Gtk.Label(), True, True, 0)53
compositor_vbox.pack_start(widgets.reset_b, False, False, 0)54
- compositor_vbox.pack_start(widgets.delete_b, False, False, 0)55
- compositor_vbox.pack_start(guiutils.get_pad_label(5, 3), False, False, 0)56
+ if not small:57
+ compositor_vbox.pack_start(widgets.delete_b, False, False, 0)58
+ compositor_vbox.pack_start(guiutils.get_pad_label(5, 3), False, False, 0)59
60
set_enabled(False)61
62
63
editor_rows = propertyeditorbuilder.get_transition_extra_editor_rows(compositor, t_editable_properties)64
for editor_row in editor_rows:65
# These are added to keyframe editor based on editor type, not based on EditableProperty type as above66
- # because one editor set values for multiple EditableProperty objects67
+ # because one editor sets values for multiple EditableProperty objects68
if editor_row.__class__ == keyframeeditor.RotatingGeometryEditor:69
keyframe_editor_widgets.append(editor_row)70
vbox.pack_start(editor_row, False, False, 0)71
vbox.pack_start(guicomponents.EditorSeparator().widget, False, False, 0)72
- 73
+74
+ hamburger_launcher_surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "hamburger_big.png")75
+ hamburger_launcher = guicomponents.PressLaunch(_hamburger_launch_pressed, hamburger_launcher_surface, 24, 24)76
+ sl_row = guiutils.get_left_justified_box([hamburger_launcher.widget])77
+ vbox.pack_start(sl_row, False, False, 0)78
+ 79
vbox.pack_start(Gtk.Label(), True, True, 0) 80
vbox.show_all()81
82
83
def update_kfeditors_positions():84
for kf_widget in keyframe_editor_widgets:85
kf_widget.update_clip_pos()86
+87
+# ----------------------------------------------------------- hamburger menu88
+def _hamburger_launch_pressed(widget, event):89
+ guicomponents.get_compositor_editor_hamburger_menu(event, _compositor_hamburger_item_activated)90
+91
+def _compositor_hamburger_item_activated(widget, msg):92
+ if msg == "save":93
+ comp_name = mlttransitions.name_for_type[compositor.transition.info.name]94
+ default_name = comp_name.replace(" ", "_") + _("_compositor_values") + ".data"95
+ dialogs.save_effects_compositors_values(_save_compositor_values_dialog_callback, default_name, False)96
+ elif msg == "load":97
+ dialogs.load_effects_compositors_values_dialog(_load_compositor_values_dialog_callback, False)98
+ elif msg == "reset":99
+ _reset_compositor_pressed()100
+ elif msg == "delete":101
+ _delete_compositor_pressed()102
+103
+def _save_compositor_values_dialog_callback(dialog, response_id):104
+ if response_id == Gtk.ResponseType.ACCEPT:105
+ save_path = dialog.get_filenames()[0]106
+ compositor_data = CompositorValuesSaveData(compositor.transition.info, compositor.transition.properties)107
+ compositor_data.save(save_path)108
+ 109
+ dialog.destroy()110
+111
+def _load_compositor_values_dialog_callback(dialog, response_id):112
+ if response_id == Gtk.ResponseType.ACCEPT:113
+ load_path = dialog.get_filenames()[0]114
+ f = open(load_path)115
+ compositor_data = pickle.load(f)116
+117
+ if compositor_data.data_applicable(compositor.transition.info):118
+ compositor_data.set_values(compositor)119
+ set_compositor(compositor)120
+ else:121
+ saved_name_comp_name = mlttransitions.name_for_type[compositor_data.info.name]122
+ current_comp_name = mlttransitions.name_for_type[compositor.transition.info.name]123
+ primary_txt = _("Saved Compositor data not applicaple for this compositor!")124
+ secondary_txt = _("Saved data is for ") + saved_name_comp_name + " compositor,\n" + _(", current compositor is ") + current_comp_name + "."125
+ dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window)126
+127
+ dialog.destroy()128
+129
+130
+class CompositorValuesSaveData:131
+ 132
+ def __init__(self, info, properties):133
+ self.info = info134
+ self.properties = copy.deepcopy(properties)135
+136
+ def save(self, save_path):137
+ with atomicfile.AtomicFileWriter(save_path, "wb") as afw:138
+ write_file = afw.get_file()139
+ pickle.dump(self, write_file)140
+ 141
+ def data_applicable(self, compositor_info): 142
+ if isinstance(self.info, compositor_info.__class__):143
+ return self.info.__dict__ == compositor_info.__dict__144
+ return False145
+ 146
+ def set_values(self, compositor):147
+ compositor.transition.properties = copy.deepcopy(self.properties)148
+ compositor.transition.update_editable_mlt_properties()149
+ 150
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/compositormodes.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/compositormodes.py
Changed
34
1
2
"""3
Module handles editing positions and clip ends of compositors on timeline.4
"""5
+import appconsts6
import gui7
import edit8
import editorstate9
10
sub_mode = MOVE_EDIT11
updater.repaint_tline()12
13
+def get_pointer_context(compositor, x): 14
+ if abs(x - tlinewidgets._get_frame_x(compositor.clip_in)) < TRIM_HANDLE_WIDTH:15
+ return appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_LEFT16
+ elif abs(x - tlinewidgets._get_frame_x(compositor.clip_out + 1)) < TRIM_HANDLE_WIDTH:17
+ return appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_RIGHT18
+ else:19
+ return appconsts.POINTER_CONTEXT_COMPOSITOR_MOVE20
+ 21
def mouse_move(x, y, frame, state):22
global edit_data23
if sub_mode == TRIM_EDIT:24
25
26
def mouse_release(x, y, frame, state):27
global sub_mode28
- 29
+ tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_NONE30
+31
editorstate.edit_mode = prev_edit_mode32
if editorstate.edit_mode == editorstate.INSERT_MOVE:33
tlinewidgets.set_edit_mode(None, tlinewidgets.draw_insert_overlay)34
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/dialogs.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/dialogs.py
Changed
201
1
2
dialog.connect('response', callback)3
dialog.show()4
5
+def save_effects_compositors_values(callback, default_name, saving_effect=True):6
+ parent = gui.editor_window.window7
+8
+ if saving_effect == True:9
+ title = _("Save Effect Values Data")10
+ else:11
+ title = _("Save Compositor Values Data")12
+ 13
+ dialog = Gtk.FileChooserDialog(title, parent,14
+ Gtk.FileChooserAction.SAVE,15
+ (_("Cancel").encode('utf-8'), Gtk.ResponseType.CANCEL,16
+ _("Save").encode('utf-8'), Gtk.ResponseType.ACCEPT))17
+ dialog.set_action(Gtk.FileChooserAction.SAVE)18
+ dialog.set_current_name(default_name)19
+ dialog.set_do_overwrite_confirmation(True)20
+21
+ dialog.set_select_multiple(False)22
+ file_filter = Gtk.FileFilter()23
+ file_filter.set_name(_("Effect/Compositor Values Data"))24
+ file_filter.add_pattern("*" + "data")25
+ dialog.add_filter(file_filter)26
+ dialog.connect('response', callback)27
+ dialog.show()28
+29
+def load_effects_compositors_values_dialog(callback, loading_effect=True):30
+ parent = gui.editor_window.window31
+32
+ if loading_effect == True:33
+ title_text = _("Load Effect Values Data")34
+ else:35
+ title_text = _("Load Compositor Values Data") 36
+37
+ dialog = Gtk.FileChooserDialog(title_text, parent,38
+ Gtk.FileChooserAction.OPEN,39
+ (_("Cancel").encode('utf-8'), Gtk.ResponseType.CANCEL,40
+ _("OK").encode('utf-8'), Gtk.ResponseType.ACCEPT))41
+ dialog.set_action(Gtk.FileChooserAction.OPEN)42
+ dialog.set_select_multiple(False)43
+ file_filter = Gtk.FileFilter()44
+ file_filter.set_name(_("Effect/Compositor Values Data"))45
+ file_filter.add_pattern("*" + "data")46
+ dialog.add_filter(file_filter)47
+ dialog.connect('response', callback)48
+ dialog.show()49
+ 50
def export_xml_dialog(callback, project_name):51
_export_file_name_dialog(callback, project_name, _("Export Project as XML to"))52
53
54
# Application tab55
img = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")56
flow_label = Gtk.Label(label="Flowblade Movie Editor")57
- ver_label = Gtk.Label(label="1.14.0")58
- janne_label = Gtk.Label(label="Copyright 2017 Janne Liljeblad and contributors")59
+ ver_label = Gtk.Label(label="1.16.0")60
+ janne_label = Gtk.Label(label="Copyright 2018 Janne Liljeblad and contributors")61
page_label = Gtk.Label(label=_("Project page:") + " " + "<a href=\"https://github.com/jliljebl/flowblade\">https://github.com/jliljebl/flowblade</a>")62
page_label.set_use_markup(True)63
flow_label.modify_font(Pango.FontDescription("sans bold 14"))64
65
autosaves_view.set_size_request(300, 300)66
autosaves_view.fill_data_model(autosaves)67
68
- delete_all = Gtk.Button("Delete all autosaves")69
+ delete_all = Gtk.Button(_("Delete all autosaves"))70
delete_all.connect("clicked", lambda w : _autosaves_delete_all_clicked(autosaves, autosaves_view, dialog))71
- delete_all_but_selected = Gtk.Button("Delete all but selected autosave")72
+ delete_all_but_selected = Gtk.Button(_("Delete all but selected autosave"))73
delete_all_but_selected.connect("clicked", lambda w : _autosaves_delete_unselected(autosaves, autosaves_view))74
75
delete_buttons_vbox = Gtk.HBox()76
77
dialog.connect('response', callback, name_entry)78
dialog.show_all()79
80
+def clip_marker_name_dialog(clip_frame_str, tline_frame_str, callback, data):81
+ dialog = Gtk.Dialog(_("New Marker"), gui.editor_window.window,82
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,83
+ (_("Add Marker").encode('utf-8'), Gtk.ResponseType.ACCEPT))84
+85
+ tline_frame_info = guiutils.get_left_justified_box([Gtk.Label(_("Timeline position: ") + tline_frame_str),Gtk.Label()])86
+87
+ name_entry = Gtk.Entry()88
+ name_entry.set_width_chars(30)89
+ name_entry.set_text("")90
+ name_entry.set_activates_default(True)91
+92
+ name_select = panels.get_two_column_box(Gtk.Label(label=_("Name for clip marker at ") + clip_frame_str),93
+ name_entry,94
+ 250)95
+96
+ rows_vbox = Gtk.VBox(False, 2)97
+ rows_vbox.pack_start(tline_frame_info, False, False, 0)98
+ rows_vbox.pack_start(name_select, False, False, 0)99
+ #rows_vbox.pack_start(guiutils.get_pad_label(12, 2), False, False, 0)100
+ 101
+ alignment = dialogutils.get_default_alignment(rows_vbox)102
+ 103
+ dialog.vbox.pack_start(alignment, True, True, 0)104
+ dialogutils.set_outer_margins(dialog.vbox)105
+ dialog.set_default_response(Gtk.ResponseType.ACCEPT)106
+ _default_behaviour(dialog)107
+ dialog.connect('response', callback, name_entry, data)108
+ dialog.show_all()109
+110
+def alpha_info_msg(callback, filter_name):111
+ dialog = Gtk.Dialog(_("Alpha Filters Info"), gui.editor_window.window,112
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,113
+ (_("Ok").encode('utf-8'), Gtk.ResponseType.ACCEPT))114
+115
+ line_label = Gtk.Label(_("You are adding <b>Alpha Filter '") + filter_name + _("'</b> into a clip. Here is some info on how <b>Alpha Filters</b> work on Flowblade:"))116
+ line_label.set_use_markup(True)117
+ row1 = guiutils.get_left_justified_box([line_label])118
+ 119
+ info_text = u"\u2022" + _(" <b>Alpha Filters</b> work by modifying image's alpha channel.\n") + \120
+ u"\u2022" + _(" To see the effect of <b>Alpha Filter</b> you need composite this clip on track below by adding a <b>Compositor like 'Dissolve'</b> into this clip.\n") + \121
+ u"\u2022" + _(" <b>Alpha Filters</b> on clips on <b>Track V1</b> have no effect.")122
+ info_label = Gtk.Label(label=info_text)123
+ info_label.set_use_markup(True)124
+ info_box = guiutils.get_left_justified_box([info_label])125
+126
+ dont_show_check = Gtk.CheckButton.new_with_label (_("Don't show this message again."))127
+ row2 = guiutils.get_left_justified_box([dont_show_check])128
+129
+ vbox = Gtk.VBox(False, 2)130
+ vbox.pack_start(row1, False, False, 0)131
+ vbox.pack_start(guiutils.pad_label(24, 12), False, False, 0)132
+ vbox.pack_start(info_box, False, False, 0)133
+ vbox.pack_start(guiutils.pad_label(24, 24), False, False, 0)134
+ vbox.pack_start(row2, False, False, 0)135
+ 136
+ alignment = dialogutils.get_default_alignment(vbox)137
+138
+ dialog.vbox.pack_start(alignment, True, True, 0)139
+ dialogutils.set_outer_margins(dialog.vbox)140
+ dialog.set_default_response(Gtk.ResponseType.ACCEPT)141
+ _default_behaviour(dialog)142
+ dialog.connect('response', callback, dont_show_check)143
+ dialog.show_all()144
+145
def open_image_sequence_dialog(callback, parent_window):146
cancel_str = _("Cancel").encode('utf-8')147
ok_str = _("Ok").encode('utf-8')148
149
_default_behaviour(dialog)150
dialog.show_all()151
152
+def transition_re_render_dialog(callback, transition_data):153
+ dialog = Gtk.Dialog(_("Rerender Transition").encode('utf-8'), gui.editor_window.window,154
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,155
+ (_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,156
+ _("Rerender").encode('utf-8'), Gtk.ResponseType.ACCEPT))157
+158
+ alignment, encodings_cb, quality_cb = panels.get_transition_re_render_panel(transition_data)159
+ widgets = (encodings_cb, quality_cb)160
+ dialog.connect('response', callback, widgets, transition_data)161
+ dialog.vbox.pack_start(alignment, True, True, 0)162
+ dialogutils.set_outer_margins(dialog.vbox)163
+ _default_behaviour(dialog)164
+ dialog.show_all()165
+166
+def fade_re_render_dialog(callback, fade_data):167
+ dialog = Gtk.Dialog(_("Rerender Fade").encode('utf-8'), gui.editor_window.window,168
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,169
+ (_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,170
+ _("Rerender").encode('utf-8'), Gtk.ResponseType.ACCEPT))171
+172
+ alignment, encodings_cb, quality_cb = panels.get_fade_re_render_panel(fade_data)173
+ widgets = (encodings_cb, quality_cb)174
+ dialog.connect('response', callback, widgets, fade_data)175
+ dialog.vbox.pack_start(alignment, True, True, 0)176
+ dialogutils.set_outer_margins(dialog.vbox)177
+ _default_behaviour(dialog)178
+ dialog.show_all()179
+180
+def re_render_all_dialog(callback, rerender_list, unrenderable):181
+ dialog = Gtk.Dialog(_("Rerender All Transitions and Fades").encode('utf-8'), gui.editor_window.window,182
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,183
+ (_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,184
+ _("Rerender All").encode('utf-8'), Gtk.ResponseType.ACCEPT))185
+186
+ alignment, encodings_cb, quality_cb = panels.get_re_render_all_panel(rerender_list, unrenderable)187
+ widgets = (encodings_cb, quality_cb)188
+ dialog.connect('response', callback, widgets, rerender_list)189
+ dialog.vbox.pack_start(alignment, True, True, 0)190
+ dialogutils.set_outer_margins(dialog.vbox)191
+ _default_behaviour(dialog)192
+ dialog.show_all()193
+194
def fade_edit_dialog(callback, transition_data):195
dialog = Gtk.Dialog(_("Add Fade"), gui.editor_window.window,196
Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,197
198
add_button = Gtk.Button(_("Set Watermark File"))199
remove_button = Gtk.Button(_("Remove Watermark"))200
if editorstate.current_sequence().watermark_file_path == None:201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/dnd.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/dnd.py
Changed
10
1
2
URI_DND_TARGET = Gtk.TargetEntry.new('text/uri-list', 0, 0)3
4
5
-# These used to hold data needed on drag drop instead of the API provided GtkSelectionData.6
+# These are used to hold data needed on drag drop instead of the API provided by GtkSelectionData.7
drag_data = None 8
drag_source = None9
10
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/edit.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/edit.py
Changed
201
1
2
from editorstate import current_sequence3
from editorstate import get_track4
from editorstate import PLAYER5
+from editorstate import auto_follow_active6
import mltfilters7
import movemodes8
import resync9
10
11
def _create_clip_clone(clip):12
if clip.media_type != appconsts.PATTERN_PRODUCER:13
- new_clip = current_sequence().create_file_producer_clip(clip.path)14
+ new_clip = current_sequence().create_file_producer_clip(clip.path, None, False, clip.ttl)15
else:16
new_clip = current_sequence().create_pattern_producer(clip.create_data)17
new_clip.name = clip.name18
19
# Grabs data as object members.20
self.__dict__.update(data)21
22
+ # Compositor auto follow is saved with each edit and is computed on first do and later done on redo/undo23
+ self.compositor_autofollow_data = None24
+ 25
# Other then actual trim edits, attempting all edits exits active trimodes and enters <X>_NO_EDIT trim mode.26
self.exit_active_trimmode_on_edit = True27
28
29
if self.turn_on_stop_for_edit:30
self.stop_for_edit = True31
32
+ # Create autofollow data if needed and update GUI.33
+ # If autofollow and no data, then GUI update happens in do_edit()34
+ # Added complexity here is to avoid two GUI updates35
+ if auto_follow_active() == True:36
+ self.compositor_autofollow_data = get_full_compositor_sync_data()37
+ self.redo_auto_follow()38
+ # This wasn'rt done in redo() because no auto follow data available39
+ if do_gui_update:40
+ self._update_gui()41
+42
def undo(self):43
PLAYER().stop_playback()44
45
46
47
resync.calculate_and_set_child_clip_sync_states()48
49
+ if self.compositor_autofollow_data != None:50
+ self.undo_auto_follow()51
+ 52
# HACK, see above.53
if self.stop_for_edit:54
PLAYER().consumer.start()55
56
_remove_trailing_blanks_redo(self)57
resync.calculate_and_set_child_clip_sync_states()58
59
+ if self.compositor_autofollow_data != None:60
+ self.redo_auto_follow()61
+62
tlinewidgets.set_match_frame(-1, -1, True)63
64
# HACK, see above.65
if self.stop_for_edit:66
PLAYER().consumer.start()67
68
- if do_gui_update:69
+ # Update GUI if no autofollow or if autofollow data is available.70
+ # If autofollow and no data, then GUI update happens in do_edit()71
+ # Added complexity here is to avoid two GUI updates72
+ if ((do_gui_update and auto_follow_active() == False) or 73
+ (do_gui_update and auto_follow_active() == True and self.compositor_autofollow_data != None)):74
self._update_gui()75
76
+ def undo_auto_follow(self):77
+ for sync_item in self.compositor_autofollow_data:78
+ # real compositor objects get recreated and destroyed all the time and in redo/undo they need to identified by destroy_id79
+ destroy_id, orig_in, orig_out, clip_start, clip_end = sync_item80
+ try:81
+ sync_compositor = current_sequence().get_compositor_for_destroy_id(destroy_id)82
+ if sync_compositor.obey_autofollow == True:83
+ sync_compositor.set_in_and_out(orig_in, orig_out) 84
+ except:85
+ # Compositor or clip not found86
+ pass87
+88
+ def redo_auto_follow(self):89
+ do_autofollow_redo(self.compositor_autofollow_data)90
+ 91
def _update_gui(self): # This copied with small modifications into projectaction.py for sequence imports, update there too if needed...yeah.92
updater.update_tline_scrollbar() # Slider needs to adjust to possily new program length.93
# This REPAINTS TIMELINE as a side effect.94
95
96
updater. update_seqence_info_text()97
98
+# ---------------------------------------------------- compositor sync util methods99
+def get_full_compositor_sync_data():100
+ # Returns list of tuples in form (compositor, orig_in, orig_out, clip_start, clip_end)101
+ # Pair all compositors with their origin clips ids102
+ comp_clip_pairings = {}103
+ for compositor in current_sequence().compositors:104
+ if compositor.origin_clip_id in comp_clip_pairings:105
+ comp_clip_pairings[compositor.origin_clip_id].append(compositor)106
+ else:107
+ comp_clip_pairings[compositor.origin_clip_id] = [compositor]108
+ 109
+ # Create resync list110
+ resync_list = []111
+ for i in range(current_sequence().first_video_index, len(current_sequence().tracks) - 1): # -1, there is a topmost hidden track 112
+ track = current_sequence().tracks[i] # b_track is source track where origin clip is113
+ for j in range(0, len(track.clips)):114
+ clip = track.clips[j]115
+ if clip.id in comp_clip_pairings:116
+ compositor_list = comp_clip_pairings[clip.id]117
+ for compositor in compositor_list:118
+ resync_list.append((clip, track, j, compositor))119
+ 120
+ # Create full data121
+ full_sync_data = []122
+ for resync_item in resync_list:123
+ try:124
+ clip, track, clip_index, compositor = resync_item125
+ clip_start = track.clip_start(clip_index)126
+ clip_end = clip_start + clip.clip_out - clip.clip_in127
+ 128
+ # Auto fades need to go to start or end of clips and maintain their lengths129
+ if compositor.transition.info.auto_fade_compositor == True:130
+ if compositor.transition.info.name == "##auto_fade_in":131
+ clip_end = clip_start + compositor.get_length() - 1132
+ else:133
+ clip_start = clip_end - compositor.get_length() + 1134
+ 135
+ orig_in = compositor.clip_in136
+ orig_out = compositor.clip_out137
+ 138
+ destroy_id = compositor.destroy_id139
+ 140
+ full_sync_data_item = (destroy_id, orig_in, orig_out, clip_start, clip_end)141
+ full_sync_data.append(full_sync_data_item)142
+ except:143
+ # Clip is probably deleted144
+ pass145
+ 146
+ return full_sync_data147
+148
+def do_autofollow_redo(compositor_autofollow_data):149
+ for sync_item in compositor_autofollow_data:150
+ # real compositor objects get recreated and destroyed all the time and in redo/undo they need to identified by destroy_id151
+ destroy_id, orig_in, orig_out, clip_start, clip_end = sync_item152
+ try:153
+ sync_compositor = current_sequence().get_compositor_for_destroy_id(destroy_id)154
+ if sync_compositor.obey_autofollow == True:155
+ sync_compositor.set_in_and_out(clip_start, clip_end)156
+ except:157
+ # Compositor or clip not found158
+ pass159
+ 160
# ---------------------------------------------------- SYNC DATA161
class SyncData:162
"""163
164
def _gap_append_redo(self):165
pass166
167
-168
#----------------- TWO_ROLL_TRIM169
# "track","index","from_clip","to_clip","delta","edit_done_callback"170
# "cut_frame"171
172
_insert_clip(track, transition_clip, 173
self.transition_index, 1, # first frame is dropped as it is 100% from clip174
transition_clip.get_length() - 1)175
- 176
+177
+178
+#------------------- REPLACE CENTERED TRANSITION179
+# "track", "transition_clip","transition_index"180
+def replace_centered_transition_action(data):181
+ action = EditAction(_replace_centered_transition_undo, _replace_centered_transition_redo, data)182
+ return action183
+184
+def _replace_centered_transition_undo(self):185
+ # Remove new186
+ _remove_clip(self.track, self.transition_index)187
+188
+ # Insert old 189
+ _insert_clip(self.track, self.removed_clip, 190
+ self.transition_index, 1, # first frame is dropped as it is 100% from clip191
+ self.removed_clip.clip_out)192
+193
+def _replace_centered_transition_redo(self):194
+ # Remove old 195
+ self.removed_clip = _remove_clip(self.track, self.transition_index)196
+ 197
+ # Insert new 198
+ _insert_clip(self.track, self.transition_clip, 199
+ self.transition_index, 1, # first frame is dropped as it is 100% from clip200
+ self.transition_clip.clip_out)201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editevent.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editevent.py
Changed
120
1
2
import clipenddragmode3
import compositeeditor4
import compositormodes5
+import dialogs6
import dialogutils7
import edit8
import editorstate9
10
audiosync.select_sync_clip_mouse_pressed(event, frame)11
mouse_disabled = True12
# Set INSERT_MODE13
- set_default_edit_mode() 14
+ set_default_edit_mode()15
return16
17
# Hitting timeline in clip display mode displays timeline in18
19
updater.repaint_tline()20
return21
22
- # Check if compositor is hit and if so handle compositor editing23
+ # Check if compositor is hit and if so, handle compositor editing24
if editorstate.current_is_move_mode() and timeline_visible():25
hit_compositor = tlinewidgets.compositor_hit(frame, event.y, current_sequence().compositors)26
- if hit_compositor != None:27
- movemodes.clear_selected_clips()28
- if event.button == 1 or (event.button == 3 and event.get_state() & Gdk.ModifierType.CONTROL_MASK):29
- compositormodes.set_compositor_mode(hit_compositor)30
- mode_funcs = EDIT_MODE_FUNCS[editorstate.COMPOSITOR_EDIT]31
- press_func = mode_funcs[TL_MOUSE_PRESS]32
- press_func(event, frame)33
- elif event.button == 3:34
+ if hit_compositor != None: 35
+ if editorstate.auto_follow == False or hit_compositor.obey_autofollow == False:36
+ movemodes.clear_selected_clips()37
+ if event.button == 1 or (event.button == 3 and event.get_state() & Gdk.ModifierType.CONTROL_MASK):38
+ compositormodes.set_compositor_mode(hit_compositor)39
+ mode_funcs = EDIT_MODE_FUNCS[editorstate.COMPOSITOR_EDIT]40
+ press_func = mode_funcs[TL_MOUSE_PRESS]41
+ press_func(event, frame)42
+ return43
+ if event.button == 3:44
mouse_disabled == True45
compositormodes.set_compositor_selected(hit_compositor)46
guicomponents.display_compositor_popup_menu(event, hit_compositor,47
compositor_menu_item_activated)48
+ return49
elif event.button == 2:50
updater.zoom_project_length()51
- return52
+ return53
54
compositormodes.clear_compositor_selection()55
56
- # Check if we should enter clip end drag mode.57
+ # Check if we should enter clip end drag mode58
if (event.button == 3 and editorstate.current_is_move_mode()59
and timeline_visible() and (event.get_state() & Gdk.ModifierType.CONTROL_MASK)):60
+ # with CTRL right mouse61
+ clipenddragmode.maybe_init_for_mouse_press(event, frame)62
+ elif (timeline_visible() and (EDIT_MODE() == editorstate.INSERT_MOVE or EDIT_MODE() == editorstate.OVERWRITE_MOVE)63
+ and (tlinewidgets.pointer_context == appconsts.POINTER_CONTEXT_END_DRAG_LEFT or tlinewidgets.pointer_context == appconsts.POINTER_CONTEXT_END_DRAG_RIGHT)):64
+ # with pointer context65
clipenddragmode.maybe_init_for_mouse_press(event, frame)66
67
# Handle mouse button presses depending which button was pressed and68
69
success = display_clip_menu_pop_up(event.y, event, frame)70
if not success:71
PLAYER().seek_frame(frame)72
- #else:73
- # PLAYER().seek_frame(frame) 74
else:75
# For trim modes set <X>_NO_EDIT edit mode and seek frame. and seek frame76
trimmodes.set_no_edit_trim_mode()77
PLAYER().seek_frame(frame)78
return79
# LEFT BUTTON + CTRL: Select new trimmed clip in one roll trim mode80
- elif (event.button == 1 81
+ elif ((event.button == 1 82
and (event.get_state() & Gdk.ModifierType.CONTROL_MASK)83
- and EDIT_MODE() == editorstate.ONE_ROLL_TRIM):84
+ and EDIT_MODE() == editorstate.ONE_ROLL_TRIM) or 85
+ (event.button == 1 and editorstate.cursor_is_tline_sensitive == True and EDIT_MODE() == editorstate.ONE_ROLL_TRIM)):86
track = tlinewidgets.get_track(event.y)87
if track == None:88
if editorpersistance.prefs.empty_click_exits_trims == True:89
90
if (not success) and editorpersistance.prefs.empty_click_exits_trims == True:91
set_default_edit_mode(True)92
return93
- gui.editor_window.set_cursor_to_mode()94
+ 95
+ if trimmodes.edit_data["to_side_being_edited"] == True:96
+ pointer_context = appconsts.POINTER_CONTEXT_TRIM_LEFT97
+ else:98
+ pointer_context = appconsts.POINTER_CONTEXT_TRIM_RIGHT99
+ gui.editor_window.set_tline_cursor_to_context(pointer_context)100
gui.editor_window.set_mode_selector_to_mode()101
if not editorpersistance.prefs.quick_enter_trims:102
mouse_disabled = True103
104
data = (clip, track, None, x)105
updater.open_clip_in_effects_editor(data)106
107
+108
# -------------------------------------------------- DND release event callbacks109
def tline_effect_drop(x, y):110
clip, track, index = tlinewidgets.get_clip_track_and_index_for_pos(x, y)111
112
113
# Create new clip.114
if media_file.type != appconsts.PATTERN_PRODUCER:115
- new_clip = current_sequence().create_file_producer_clip(media_file.path, media_file.name)116
+ new_clip = current_sequence().create_file_producer_clip(media_file.path, media_file.name, False, media_file.ttl)117
else:118
new_clip = current_sequence().create_pattern_producer(media_file)119
120
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py
Changed
53
1
2
3
def update_prefs_from_widgets(widgets_tuples_tuple):4
# Unpack widgets5
- gen_opts_widgets, edit_prefs_widgets, view_prefs_widgets, performance_widgets = widgets_tuples_tuple6
+ gen_opts_widgets, edit_prefs_widgets, playback_prefs_widgets, view_prefs_widgets, performance_widgets = widgets_tuples_tuple7
8
default_profile_combo, open_in_last_opened_check, open_in_last_rendered_check, undo_max_spin, load_order_combo = gen_opts_widgets9
10
# Jul-2016 - SvdB - Added play_pause_button11
# Apr-2017 - SvdB - Added ffwd / rev values12
- auto_play_in_clip_monitor_check, auto_center_check, grfx_insert_length_spin, \13
- trim_exit_click, trim_quick_enter, remember_clip_frame, overwrite_clip_drop, cover_delete, \14
- play_pause_button, mouse_scroll_action, hide_file_ext_button, auto_center_on_updown, \15
- ffwd_rev_shift, ffwd_rev_ctrl, ffwd_rev_caps = edit_prefs_widgets16
+ gfx_length_spin, trim_exit_on_empty, trim_quick_enter, remember_clip_frame, \17
+ overwrite_clip_drop, cover_delete, mouse_scroll_action, hide_file_ext_button = edit_prefs_widgets18
+ 19
+ auto_play_in_clip_monitor_check, auto_center_check, play_pause_button, auto_center_on_updown, \20
+ ffwd_rev_shift_spin, ffwd_rev_ctrl_spin, ffwd_rev_caps_spin = playback_prefs_widgets21
22
use_english, disp_splash, buttons_style, dark_theme, theme_combo, audio_levels_combo, window_mode_combo, full_names, double_track_hights = view_prefs_widgets23
24
25
26
prefs.auto_play_in_clip_monitor = auto_play_in_clip_monitor_check.get_active()27
prefs.auto_center_on_play_stop = auto_center_check.get_active()28
- prefs.default_grfx_length = int(grfx_insert_length_spin.get_adjustment().get_value())29
- prefs.empty_click_exits_trims = trim_exit_click.get_active()30
+ prefs.default_grfx_length = int(gfx_length_spin.get_adjustment().get_value())31
+ prefs.empty_click_exits_trims = trim_exit_on_empty.get_active()32
prefs.quick_enter_trims = trim_quick_enter.get_active()33
prefs.remember_monitor_clip_frame = remember_clip_frame.get_active()34
prefs.overwrite_clip_drop = (overwrite_clip_drop.get_active() == 0)35
36
prefs.hide_file_ext = hide_file_ext_button.get_active()37
prefs.mouse_scroll_action_is_zoom = (mouse_scroll_action.get_active() == 0)38
# Apr-2017 - SvdB - ffwd / rev values39
- prefs.ffwd_rev_shift = int(ffwd_rev_shift.get_adjustment().get_value())40
- prefs.ffwd_rev_ctrl = int(ffwd_rev_ctrl.get_adjustment().get_value())41
- prefs.ffwd_rev_caps = int(ffwd_rev_caps.get_adjustment().get_value())42
+ prefs.ffwd_rev_shift = int(ffwd_rev_shift_spin.get_adjustment().get_value())43
+ prefs.ffwd_rev_ctrl = int(ffwd_rev_ctrl_spin.get_adjustment().get_value())44
+ prefs.ffwd_rev_caps = int(ffwd_rev_caps_spin.get_adjustment().get_value())45
46
prefs.use_english_always = use_english.get_active()47
prefs.display_splash_screen = disp_splash.get_active()48
49
self.shortcuts = "flowblade.xml"50
self.double_track_hights = False51
self.delta_overlay = True52
+ self.show_alpha_info_message = True53
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editorstate.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editorstate.py
Changed
102
1
2
CLIP_END_DRAG = 113
SELECT_TLINE_SYNC_CLIP = 124
5
+6
+# SDL version (Not used currently)7
+SDL_1 = 18
+SDL_2 = 29
+10
# Project being edited11
project = None12
13
14
# Current edit mode15
edit_mode = INSERT_MOVE16
17
+# Compositor autofollow state. If true when edit is performed, all compositors are auto resynced on first do, redo and undo actions.18
+auto_follow = False19
+20
# Trim tool ripple mode is expressed as a flag21
trim_mode_ripple = False22
23
24
# Whether to let the user set their user_dir using XDG Base dir spec25
use_xdg = False26
27
-# Cursor pos28
+# Cursor position and sensitivity29
cursor_on_tline = False30
+cursor_is_tline_sensitive = True31
32
# Flag for running JACK audio server. If this is on when SDLConsumer created in mltplayer.py33
# jack rack filter will bw taached to it34
35
# Trim view mode36
show_trim_view = appconsts.TRIM_VIEW_OFF37
38
-# Remember fade and transition lengths39
+# Remember fade and transition lengths for next invocation, users prefer this over one default value.40
fade_length = -141
transition_length = -142
43
44
def MONITOR_MEDIA_FILE():45
return _monitor_media_file46
47
+def auto_follow_active():48
+ return auto_follow49
+50
def get_track(index):51
return project.c_seq.tracks[index]52
53
54
55
return False56
57
+def mlt_version_is_equal_or_greater_correct(test_version):58
+ runtime_ver = mlt_version.split(".")59
+ test_ver = test_version.split(".")60
+ 61
+ if runtime_ver[0] > test_ver[0]:62
+ return True63
+ elif runtime_ver[0] == test_ver[0]:64
+ if runtime_ver[1] > test_ver[1]:65
+ return True66
+ elif runtime_ver[1] == test_ver[1]:67
+ if runtime_ver[2] > test_ver[2]:68
+ return True69
+ 70
+ return False71
+ 72
def set_copy_paste_objects(objs):73
global _copy_paste_objects74
_copy_paste_objects = objs75
76
77
return False78
79
+def screen_size_small_height():80
+ if SCREEN_HEIGHT < 898:81
+ return True82
+ else:83
+ return False84
+85
def get_cached_trim_clip(path):86
try:87
return _trim_clips_cache[path]88
89
def clear_trim_clip_cache():90
global _trim_clips_cache91
_trim_clips_cache = {}92
+93
+"""94
+def get_sdl_version(): # This ain't true anymore, 6.6.0 has both available95
+ if mlt_version_is_equal_or_greater_correct("6.4.2") == True:96
+ return SDL_297
+ else:98
+ return SDL_199
+"""100
+ 101
+ 102
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editorwindow.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editorwindow.py
Changed
89
1
2
ONEROLL_TOOL = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "oneroll_tool.png")3
OVERWRITE_TOOL = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "overwrite_tool.png")4
5
+ # Context cursors 6
+ self.context_cursors = {appconsts.POINTER_CONTEXT_END_DRAG_LEFT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_left.png"), 3, 7),7
+ appconsts.POINTER_CONTEXT_END_DRAG_RIGHT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_right.png"), 14, 7),8
+ appconsts.POINTER_CONTEXT_TRIM_LEFT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_trim_left.png"), 9, 9),9
+ appconsts.POINTER_CONTEXT_TRIM_RIGHT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_trim_right.png"), 9, 9),10
+ appconsts.POINTER_CONTEXT_BOX_SIDEWAYS:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_sideways.png"), 9, 9),11
+ appconsts.POINTER_CONTEXT_COMPOSITOR_MOVE:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_sideways.png"), 9, 9),12
+ appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_LEFT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_left.png"), 9, 9),13
+ appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_RIGHT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_right.png"), 9, 9)}14
+15
# Window16
self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)17
self.window.set_icon_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")18
19
('RenderMenu', None, _('Render')),20
('AddToQueue', None, _('Add To Batch Render Queue...'), None, None, lambda a:projectaction.add_to_render_queue()),21
('BatchRender', None, _('Batch Render Queue'), None, None, lambda a:batchrendering.launch_batch_rendering()),22
+ ('ReRenderTransitionsFades', None, _('Rerender All Rendered Transitions And Fades '), None, None, lambda a:tlineaction.rerender_all_rendered_transitions_and_fades()),23
('Render', None, _('Render Timeline'), None, None, lambda a:projectaction.do_rendering()),24
('ToolsMenu', None, _('Tools')),25
('Titler', None, _('Titler'), None, None, lambda a:titler.show_titler()),26
27
<menuitem action='AddToQueue'/>28
<menuitem action='BatchRender'/>29
<separator/>30
+ <menuitem action='ReRenderTransitionsFades'/>31
+ <separator/>32
<menuitem action='Render'/>33
</menu>34
<menu action='ToolsMenu'>35
36
cursor = self.get_own_cursor(display, INSERTMOVE_CURSOR, 0, 0)37
elif mode == editorstate.OVERWRITE_MOVE:38
if editorstate.overwrite_mode_box == False:39
- cursor = self.get_own_cursor(display, OVERWRITE_CURSOR, 6, 15)40
+ cursor = self.get_own_cursor(display, OVERWRITE_CURSOR, 0, 0)41
else:42
cursor = self.get_own_cursor(display, OVERWRITE_BOX_CURSOR, 6, 15)43
elif mode == editorstate.TWO_ROLL_TRIM:44
- cursor = self.get_own_cursor(display, TWOROLL_CURSOR, 11, 9)45
+ cursor = self.get_own_cursor(display, TWOROLL_NO_EDIT_CURSOR, 11, 9) 46
elif mode == editorstate.TWO_ROLL_TRIM_NO_EDIT:47
cursor = self.get_own_cursor(display, TWOROLL_NO_EDIT_CURSOR, 11, 9)48
elif mode == editorstate.ONE_ROLL_TRIM:49
if editorstate.trim_mode_ripple == False:50
- cursor = self.get_own_cursor(display, ONEROLL_CURSOR, 9, 9)51
+ cursor = self.get_own_cursor(display, ONEROLL_NO_EDIT_CURSOR, 9, 9)52
else:53
cursor = self.get_own_cursor(display, ONEROLL_RIPPLE_CURSOR, 9, 9)54
elif mode == editorstate.ONE_ROLL_TRIM_NO_EDIT:55
56
else:57
cursor = self.get_own_cursor(display, ONEROLL_RIPPLE_CURSOR, 9, 9)58
elif mode == editorstate.SLIDE_TRIM:59
- cursor = self.get_own_cursor(display, SLIDE_CURSOR, 9, 9)60
+ cursor = self.get_own_cursor(display, SLIDE_NO_EDIT_CURSOR, 9, 9)61
elif mode == editorstate.SLIDE_TRIM_NO_EDIT:62
cursor = self.get_own_cursor(display, SLIDE_NO_EDIT_CURSOR, 9, 9)63
elif mode == editorstate.SELECT_PARENT_CLIP:64
65
elif mode == editorstate.MULTI_MOVE:66
cursor = self.get_own_cursor(display, MULTIMOVE_CURSOR, 4, 8)67
elif mode == editorstate.CLIP_END_DRAG:68
- cursor = Gdk.Cursor.new(Gdk.CursorType.SB_H_DOUBLE_ARROW)69
+ surface, px, py = self.context_cursors[tlinewidgets.pointer_context]70
+ cursor = self.get_own_cursor(display, surface, px, py)71
+ #cursor = Gdk.Cursor.new(Gdk.CursorType.SB_H_DOUBLE_ARROW)72
else:73
cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)74
75
gdk_window.set_cursor(cursor) 76
- 77
+78
+ def set_tline_cursor_to_context(self, pointer_context):79
+ display = Gdk.Display.get_default()80
+ gdk_window = self.window.get_window()81
+ 82
+ surface, px, py = self.context_cursors[pointer_context]83
+ cursor = self.get_own_cursor(display, surface, px, py)84
+ gdk_window.set_cursor(cursor)85
+86
def set_mode_selector_to_mode(self):87
if editorstate.EDIT_MODE() == editorstate.INSERT_MOVE:88
self.modes_selector.set_pixbuf(0)89
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/exporting.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/exporting.py
Changed
10
1
2
def screenshot_export():3
length = current_sequence().tractor.get_length()4
if length < 2:5
- dialogutils.info_message("Sequence is too short", "Sequence needs to be at least 2 frames long to allow frame export.", None)6
+ dialogutils.info_message(_("Sequence is too short"), _("Sequence needs to be at least 2 frames long to allow frame export."), None)7
return8
9
frame = PLAYER().current_frame()10
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/extraeditors.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/extraeditors.py
Changed
7
1
2
cr.close_path()3
cr.fill()4
5
-6
-7
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/guicomponents.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/guicomponents.py
Changed
201
1
2
from gi.repository import Gdk3
from gi.repository import Pango4
from gi.repository import PangoCairo5
+from gi.repository import GLib6
7
import appconsts8
import cairoarea9
10
media_linker_popup_menu = Gtk.Menu()11
log_event_popup_menu = Gtk.Menu()12
levels_menu = Gtk.Menu()13
+clip_effects_hamburger_menu = Gtk.Menu()14
15
# ------------------------------------------------- item lists16
class ImageTextTextListView(Gtk.VBox):17
18
self.storemodel.clear()19
for autosave_object in autosaves:20
since_time_str = utils.get_time_str_for_sec_float(autosave_object.age)21
- row_data = ["Autosave created " + since_time_str + " ago."]22
+ row_data = [_("Autosave created ") + since_time_str + _(" ago.")]23
self.storemodel.append(row_data)24
25
self.treeview.set_cursor("0")26
27
def media_object_selected(self, media_object, widget, event):28
if event.type == Gdk.EventType._2BUTTON_PRESS:29
widget.grab_focus()30
- self.double_click_cb(media_object.media_file)31
+ self.clear_selection()32
+ media_object.widget.override_background_color(Gtk.StateType.NORMAL, gui.get_selected_bg_color())33
+ self.selected_objects.append(media_object)34
+ self.widget.queue_draw()35
+ GLib.idle_add(self.double_click_cb, media_object.media_file)36
+ return37
38
# HACK! We're using event times to exclude double events when icon is pressed39
now = time.time()40
41
self.selected_objects.remove(media_object)42
bg_color = gui.get_bg_color()43
media_object.widget.override_background_color(Gtk.StateType.NORMAL, bg_color)44
- return True45
+ return46
except:47
self.selected_objects.append(media_object)48
else:49
50
_add_separetor(clip_menu)51
52
if track.type == appconsts.VIDEO:53
-54
+ active = True55
+ if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:56
+ active = False57
clip_menu.add(_get_menu_item(_("Split Audio"), callback,\58
- (clip, track, "split_audio", event.x), True))59
+ (clip, track, "split_audio", event.x), active))60
if track.id == current_sequence().first_video_index:61
active = True62
else:63
active = False64
+ if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:65
+ active = False66
clip_menu.add(_get_menu_item(_("Split Audio Synched"), callback,\67
(clip, track, "split_audio_synched", event.x), active))68
69
70
audio_sync_item = _get_menu_item(_("Select Clip to Audio Sync With..."), callback, (clip, track, "set_audio_sync_clip", event.x))71
if utils.is_mlt_xml_file(clip.path) == True:72
audio_sync_item.set_sensitive(False)73
+ if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:74
+ audio_sync_item.set_sensitive(False)75
+ 76
clip_menu.add(audio_sync_item)77
78
_add_separetor(clip_menu)79
80
clip_menu.add(_get_menu_item(_("Clear Filters"), callback, (clip, track, "clear_filters", event.x)))81
82
_add_separetor(clip_menu)83
-84
- clip_menu.add(_get_menu_item(_("Rename Clip"), callback,\85
- (clip, track, "rename_clip", event.x)))86
- clip_menu.add(_get_color_menu_item(clip, track, callback))87
+ clip_menu.add(_get_clip_properties_menu_item(event, clip, track, callback))88
+ clip_menu.add(_get_clip_markers_menu_item(event, clip, track, callback))89
clip_menu.add(_get_menu_item(_("Clip Info"), callback,\90
(clip, track, "clip_info", event.x)))91
92
93
94
clip_menu.popup(None, None, None, None, event.button, event.time)95
96
-97
def display_transition_clip_popup_menu(event, clip, track, callback):98
clip_menu = transition_clip_menu99
guiutils.remove_children(clip_menu)100
101
+ clip_menu.add(_get_menu_item(_("Rerender"), callback, (clip, track, "re_render", event.x)))102
+ 103
clip_menu.add(_get_menu_item(_("Open in Filters Editor"), callback, (clip, track, "open_in_editor", event.x)))104
105
_add_separetor(clip_menu)106
107
compositor_menu.add(_get_menu_item(_("Open In Compositor Editor"), callback, ("open in editor",compositor)))108
_add_separetor(compositor_menu)109
compositor_menu.add(_get_menu_item(_("Sync with Origin Clip"), callback, ("sync with origin",compositor)))110
+111
+ autofollow_item = Gtk.CheckMenuItem()112
+ autofollow_item.set_label(_("Obey Auto Follow"))113
+ autofollow_item.set_active(compositor.obey_autofollow)114
+ autofollow_item.connect("activate", callback, ("set auto follow", compositor))115
+ autofollow_item.set_sensitive(editorstate.auto_follow_active())116
+ autofollow_item.show()117
+118
+ compositor_menu.append(autofollow_item)119
+ 120
_add_separetor(compositor_menu)121
compositor_menu.add(_get_menu_item(_("Delete"), callback, ("delete",compositor)))122
compositor_menu.popup(None, None, None, None, event.button, event.time)123
124
sub_menu.append(lift_item)125
126
_add_separetor(sub_menu)127
-128
+ 129
length_item = _get_menu_item(_("Set Clip Length..."), callback, (clip, track, "length", event.x))130
sub_menu.append(length_item)131
132
133
menu_item.show()134
return menu_item135
136
+def _get_clip_properties_menu_item(event, clip, track, callback):137
+ properties_menu_item = Gtk.MenuItem(_("Properties"))138
+ properties_menu = Gtk.Menu()139
+ properties_menu.add(_get_menu_item(_("Rename Clip"), callback,\140
+ (clip, track, "rename_clip", event.x)))141
+ properties_menu.add(_get_color_menu_item(clip, track, callback))142
+ properties_menu_item.set_submenu(properties_menu)143
+ properties_menu_item.show_all()144
+ return properties_menu_item145
+146
def _get_color_menu_item(clip, track, callback):147
color_menu_item = Gtk.MenuItem(_("Clip Color"))148
color_menu = Gtk.Menu()149
150
color_menu_item.show_all()151
return color_menu_item152
153
+def _get_clip_markers_menu_item(event, clip, track, callback):154
+ markers_menu_item = Gtk.MenuItem(_("Markers"))155
+ markers_menu = Gtk.Menu()156
+ markers_exist = len(clip.markers) != 0157
+ #menu = markers_menu158
+ #guiutils.remove_children(menu)159
+ if markers_exist:160
+ for i in range(0, len(clip.markers)):161
+ marker = clip.markers[i]162
+ name, frame = marker163
+ item_str = utils.get_tc_string(frame) + " " + name164
+ markers_menu.add(_get_menu_item(item_str, callback, (clip, track, "go_to_clip_marker", str(i))))165
+ _add_separetor(markers_menu)166
+ else:167
+ no_markers_item = _get_menu_item(_("No Clip Markers"), callback, "dummy", False)168
+ markers_menu.add(no_markers_item)169
+ _add_separetor(markers_menu)170
+ 171
+ markers_menu.add(_get_menu_item(_("Add Clip Marker At Playhead Position"), callback, (clip, track, "add_clip_marker", None)))172
+ del_item = _get_menu_item(_("Delete Clip Marker At Playhead Position"), callback, (clip, track, "delete_clip_marker", None), markers_exist==True)173
+ markers_menu.add(del_item)174
+ del_all_item = _get_menu_item(_("Delete All Clip Markers"), callback, (clip, track, "deleteall_clip_markers", None), markers_exist==True)175
+ markers_menu.add(del_all_item)176
+ markers_menu_item.set_submenu(markers_menu)177
+ markers_menu_item.show_all()178
+ return markers_menu_item179
+180
def _set_non_sensitive_if_state_matches(mutable, item, state):181
if mutable.mute_state == state:182
item.set_sensitive(False)183
184
menu.popup(None, None, None, None, event.button, event.time)185
186
def get_audio_levels_popup_menu(event, callback):187
+ # needs renaming188
menu = levels_menu189
guiutils.remove_children(menu)190
191
+ autofollow_item = Gtk.CheckMenuItem()192
+ autofollow_item.set_label(_("Compositors Auto Follow"))193
+ autofollow_item.set_active(editorstate.auto_follow_active())194
+ autofollow_item.connect("activate", callback, "autofollow")195
+196
+ menu.append(autofollow_item)197
+198
+ _add_separetor(menu)199
+200
+ ponter_sensitive_item = Gtk.CheckMenuItem()201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/guiutils.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/guiutils.py
Changed
9
1
2
def get_checkbox_row_box(checkbox, widget2):3
hbox = Gtk.HBox()4
hbox.pack_start(checkbox, False, False, 0)5
+ hbox.pack_start(get_pad_label(4, 1), False, False, 0)6
hbox.pack_start(widget2, False, False, 0)7
hbox.pack_start(Gtk.Label(), True, True, 0)8
return hbox9
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot
Changed
201
1
2
msgstr ""3
"Project-Id-Version: PACKAGE VERSION\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"8
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"9
"Language-Team: LANGUAGE <LL@li.org>\n"10
11
"Content-Type: text/plain; charset=CHARSET\n"12
"Content-Transfer-Encoding: 8bit\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr ""18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr ""23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr ""28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr ""33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr ""38
39
40
"\n"41
msgstr ""42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
msgid "Selected folder contains files"51
msgstr ""52
53
"has to be empty."54
msgstr ""55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr ""60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
msgid "Saving project file"64
msgstr ""65
66
-#: projectaction.py:72767
+#: projectaction.py:70668
msgid "Project not found on disk"69
msgstr ""70
71
-#: projectaction.py:72872
+#: projectaction.py:70773
msgid "Project can't be loaded."74
msgstr ""75
76
-#: projectaction.py:73677
+#: projectaction.py:71578
msgid "Project has not been saved since it was opened."79
msgstr ""80
81
-#: projectaction.py:74182
+#: projectaction.py:72083
msgid "Project was saved less than a minute ago."84
msgstr ""85
86
-#: projectaction.py:74487
+#: projectaction.py:72388
msgid "Project was saved one minute ago."89
msgstr ""90
91
-#: projectaction.py:74692
+#: projectaction.py:72593
msgid "Project was saved "94
msgstr ""95
96
-#: projectaction.py:74697
+#: projectaction.py:72598
msgid " minutes ago."99
msgstr ""100
101
-#: projectaction.py:753102
+#: projectaction.py:732103
msgid "Render target file exists!"104
msgstr ""105
106
-#: projectaction.py:754107
+#: projectaction.py:733108
msgid "Confirm overwriting existing file."109
msgstr ""110
111
-#: projectaction.py:760112
+#: projectaction.py:739113
msgid "Project is currently using proxy media!"114
msgstr ""115
116
-#: projectaction.py:761117
+#: projectaction.py:740118
msgid ""119
"Rendering from proxy media will produce worse quality than rendering from "120
"original media.\n"121
122
"Select 'Confirm' to render from proxy media anyway."123
msgstr ""124
125
-#: projectaction.py:838126
+#: projectaction.py:817127
msgid "Render launch failed!"128
msgstr ""129
130
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299131
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301132
msgid "Error message: "133
msgstr ""134
135
-#: projectaction.py:852136
+#: projectaction.py:831137
msgid "Adding item to render queue failed!"138
msgstr ""139
140
-#: projectaction.py:871141
+#: projectaction.py:850142
msgid "Open.."143
msgstr ""144
145
-#: projectaction.py:896146
+#: projectaction.py:875147
msgid "Opening .mlt or .xml file as media was disallowed!"148
msgstr ""149
150
-#: projectaction.py:897151
+#: projectaction.py:876152
msgid ""153
"Because of current MLT behaviour of overwriting projct properties when "154
"opening MLT XML files\n"155
"it is not allowed to open these files as media."156
msgstr ""157
158
-#: projectaction.py:917159
+#: projectaction.py:896160
msgid "No file was selected"161
msgstr ""162
163
-#: projectaction.py:917164
+#: projectaction.py:896165
msgid "Select a numbered file to add an Image Sequence to Project."166
msgstr ""167
168
-#: projectaction.py:925169
+#: projectaction.py:904170
msgid "Not a sequence file!"171
msgstr ""172
173
-#: projectaction.py:925174
+#: projectaction.py:904175
msgid ""176
"Selected file does not have a number part in it,\n"177
"so it can't be an image sequence file."178
msgstr ""179
180
-#: projectaction.py:976181
+#: projectaction.py:955182
msgid "Can't make home folder thumbnails folder"183
msgstr ""184
185
-#: projectaction.py:977 dialogs.py:395186
+#: projectaction.py:956 dialogs.py:440187
msgid "Please create and select some other folder then '"188
msgstr ""189
190
-#: projectaction.py:978191
+#: projectaction.py:957192
msgid "' as thumbnails folder"193
msgstr ""194
195
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107196
-#: projectaction.py:1115 projectaction.py:1122197
+#: projectaction.py:1075 projectaction.py:1077 projectaction.py:1086198
+#: projectaction.py:1094 projectaction.py:1101 clipmenuaction.py:144199
+#: clipmenuaction.py:146200
msgid "N/A"201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/create_pot -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/create_pot
Changed
7
1
2
ROOT_DIR=$(pwd)3
4
# Creates .pot file that can be turned to .po file for each language5
-xgettext -o locale/Flowblade/flowblade.pot app.py projectaction.py editorwindow.py clipeffectseditor.py compositeeditor.py dialogs.py editevent.py editorpersistance.py guicomponents.py movemodes.py panels.py persistance.py projectdata.py render.py syncsplitevent.py translations.py mlttransitions.py propertyeditorbuilder.py keyframeeditor.py middlebar.py medialog.py projectinfogui.py tools/titler.py rendergui.py profilesmanager.py preferenceswindow.py tools/batchrendering.py proxyediting.py tlineaction.py extraeditors.py trackaction.py medialinker.py patternproducer.py tools/gmic.py tools/gmic.py tools/toolsencoding.py monitorevent.py compositorfades.py audiosync.py diskcachemanagement.py toolsintegration.py projectmediaimport.py shortcuts.py6
+xgettext -o locale/Flowblade/flowblade.pot app.py projectaction.py editorwindow.py clipeffectseditor.py compositeeditor.py dialogs.py editevent.py editorpersistance.py guicomponents.py movemodes.py panels.py persistance.py projectdata.py render.py syncsplitevent.py translations.py mlttransitions.py propertyeditorbuilder.py keyframeeditor.py middlebar.py medialog.py projectinfogui.py tools/titler.py rendergui.py profilesmanager.py preferenceswindow.py tools/batchrendering.py proxyediting.py tlineaction.py extraeditors.py trackaction.py medialinker.py patternproducer.py tools/gmic.py tools/gmic.py tools/toolsencoding.py monitorevent.py compositorfades.py audiosync.py diskcachemanagement.py toolsintegration.py projectmediaimport.py shortcuts.py clipmenuaction.py dialogutils.py trimmodes.py menuactions.py exporting.py7
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: \n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2017-09-09 21:07+0200\n"8
"Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"9
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"10
11
"X-Language: cs_CZ\n"12
"X-Source-Language: C\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "Příliš malá obrazovka pro tento program."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "Nejmenší rozměry obrazovky pro tento program jsou 1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "Rozměry vaší obrazovky jsou "28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "Projekt předtím byl uložen"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr "Uložte projekt před zavření pomocí Soubor → Uložit."38
39
40
"Soubory již přítomné:\n"41
"\n"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
msgid "Selected folder contains files"51
msgstr "Vybraná složka obsahuje soubory"52
53
msgstr ""54
"Při ukládání záložního snímku projektu musí být vybraná složka prázdná."55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr "Kopírují se položky záznamů projektu"60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
msgid "Saving project file"64
msgstr "Ukládá se soubor s projektem"65
66
-#: projectaction.py:72767
+#: projectaction.py:70668
msgid "Project not found on disk"69
msgstr "Projekt nebyl na disku nalezen"70
71
-#: projectaction.py:72872
+#: projectaction.py:70773
msgid "Project can't be loaded."74
msgstr "Projekt nelze nahrát."75
76
-#: projectaction.py:73677
+#: projectaction.py:71578
msgid "Project has not been saved since it was opened."79
msgstr "Projekt nebyl od té doby, co byl otevřen, uložen."80
81
-#: projectaction.py:74182
+#: projectaction.py:72083
msgid "Project was saved less than a minute ago."84
msgstr "Projekt byl uložen před méně než minutou."85
86
-#: projectaction.py:74487
+#: projectaction.py:72388
msgid "Project was saved one minute ago."89
msgstr "Projekt byl uložen před jednou minutou."90
91
-#: projectaction.py:74692
+#: projectaction.py:72593
msgid "Project was saved "94
msgstr "Projekt byl uložen před "95
96
-#: projectaction.py:74697
+#: projectaction.py:72598
msgid " minutes ago."99
msgstr " minutami"100
101
-#: projectaction.py:753102
+#: projectaction.py:732103
msgid "Render target file exists!"104
msgstr "Cílový soubor se zpracováním existuje!!"105
106
-#: projectaction.py:754107
+#: projectaction.py:733108
msgid "Confirm overwriting existing file."109
msgstr "Potvrdit přepsání stávajícího souboru."110
111
-#: projectaction.py:760112
+#: projectaction.py:739113
msgid "Project is currently using proxy media!"114
msgstr "Projekt nyní používá náhradní záznam!"115
116
-#: projectaction.py:761117
+#: projectaction.py:740118
msgid ""119
"Rendering from proxy media will produce worse quality than rendering from "120
"original media.\n"121
122
"\n"123
"Vyberte Potvrdit, aby se přesto provedlo zpracování z náhradního záznamu."124
125
-#: projectaction.py:838126
+#: projectaction.py:817127
msgid "Render launch failed!"128
msgstr "Spuštění zpracování se nezdařilo!"129
130
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299131
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301132
msgid "Error message: "133
msgstr "Zpráva o chybě: "134
135
-#: projectaction.py:852136
+#: projectaction.py:831137
msgid "Adding item to render queue failed!"138
msgstr "Přidání položky do řady ke zpracování se nezdařilo!"139
140
-#: projectaction.py:871141
+#: projectaction.py:850142
msgid "Open.."143
msgstr "Otevřít..."144
145
-#: projectaction.py:896146
+#: projectaction.py:875147
msgid "Opening .mlt or .xml file as media was disallowed!"148
msgstr "Otevření souboru .mlt nebo .xml jako záznamu nebylo povoleno!"149
150
-#: projectaction.py:897151
+#: projectaction.py:876152
msgid ""153
"Because of current MLT behaviour of overwriting projct properties when "154
"opening MLT XML files\n"155
156
"souborů XML MLT\n"157
"není tyto soubory povoleno otevírat jako záznamy."158
159
-#: projectaction.py:917160
+#: projectaction.py:896161
msgid "No file was selected"162
msgstr "Nebyl vybrán žádný soubor"163
164
-#: projectaction.py:917165
+#: projectaction.py:896166
msgid "Select a numbered file to add an Image Sequence to Project."167
msgstr "Vyberte číslovaný soubor pro přidání obrázkové řady do projektu."168
169
-#: projectaction.py:925170
+#: projectaction.py:904171
msgid "Not a sequence file!"172
msgstr "Není souborem řady!"173
174
-#: projectaction.py:925175
+#: projectaction.py:904176
msgid ""177
"Selected file does not have a number part in it,\n"178
"so it can't be an image sequence file."179
180
"Vybraný soubor nemá ve svém názvu část s číslem.\n"181
"Nemůže to tedy být soubor obrázkové řady."182
183
-#: projectaction.py:976184
+#: projectaction.py:955185
msgid "Can't make home folder thumbnails folder"186
msgstr "Nelze udělat složku pro náhledy z domovské složky"187
188
-#: projectaction.py:977 dialogs.py:395189
+#: projectaction.py:956 dialogs.py:440190
msgid "Please create and select some other folder then '"191
msgstr "Vytvořte a vyberte, prosím, nějakou jinou složku než '"192
193
-#: projectaction.py:978194
+#: projectaction.py:957195
msgid "' as thumbnails folder"196
msgstr "' jako složku pro náhledy"197
198
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107199
-#: projectaction.py:1115 projectaction.py:1122200
+#: projectaction.py:1075 projectaction.py:1077 projectaction.py:1086201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: PACKAGE VERSION\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2014-11-23 14:22+0100\n"8
"Last-Translator: Mario Dejanovic <mario.dejanovic@gmx.at>\n"9
"Language-Team: German\n"10
11
"Content-Transfer-Encoding: 8bit\n"12
"Plural-Forms: nplurals=2; plural=(n != 1);\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "Zu kleiner Bildschirm für diese Applikation."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "Minimale Auflösung für diese Applikation ist 1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "Ihre Auflösung beträgt "28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "Projekt wurde noch nicht gesichert"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr "Projekt vor dem Schließen sichern mit 'Datei -> Sichern als...'."38
39
40
"Bereits vorhandene Dateien:\n"41
"\n"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
msgid "Selected folder contains files"51
msgstr "Gewählter Ordner enthält Dateien"52
53
"Für das Sichern einer Sicherungskopie muss der gewählte Ordner\n"54
"leer sein."55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr "Kopiere Projektmediendaten"60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
msgid "Saving project file"64
msgstr "Sichere Projektdatei"65
66
-#: projectaction.py:72767
+#: projectaction.py:70668
msgid "Project not found on disk"69
msgstr "Projekt nicht gefunden"70
71
-#: projectaction.py:72872
+#: projectaction.py:70773
msgid "Project can't be loaded."74
msgstr "Projekt kann nicht geladen werden."75
76
-#: projectaction.py:73677
+#: projectaction.py:71578
msgid "Project has not been saved since it was opened."79
msgstr "Projekt wurde seit dem Öffnen nicht gesichert."80
81
-#: projectaction.py:74182
+#: projectaction.py:72083
msgid "Project was saved less than a minute ago."84
msgstr "Projekt wurde vor weniger als einer Minute gesichert."85
86
-#: projectaction.py:74487
+#: projectaction.py:72388
msgid "Project was saved one minute ago."89
msgstr "Projekt wurde vor einer Minute gesichert."90
91
-#: projectaction.py:74692
+#: projectaction.py:72593
msgid "Project was saved "94
msgstr "Projekt wurde vor "95
96
-#: projectaction.py:74697
+#: projectaction.py:72598
msgid " minutes ago."99
msgstr " Minuten gesichert."100
101
-#: projectaction.py:753102
+#: projectaction.py:732103
#, fuzzy104
msgid "Render target file exists!"105
msgstr "Renderbereich nicht definiert!"106
107
-#: projectaction.py:754108
+#: projectaction.py:733109
#, fuzzy110
msgid "Confirm overwriting existing file."111
msgstr "Wollen Sie die existierende Datei überschreiben?"112
113
-#: projectaction.py:760114
+#: projectaction.py:739115
msgid "Project is currently using proxy media!"116
msgstr ""117
118
-#: projectaction.py:761119
+#: projectaction.py:740120
msgid ""121
"Rendering from proxy media will produce worse quality than rendering from "122
"original media.\n"123
124
"Select 'Confirm' to render from proxy media anyway."125
msgstr ""126
127
-#: projectaction.py:838128
+#: projectaction.py:817129
msgid "Render launch failed!"130
msgstr "Renderstart fehlgeschlagen!"131
132
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299133
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301134
msgid "Error message: "135
msgstr "Fehlermeldung: "136
137
-#: projectaction.py:852138
+#: projectaction.py:831139
msgid "Adding item to render queue failed!"140
msgstr "Hinzufügen eines Elements zur Warteschlange fehlgeschlagen!"141
142
-#: projectaction.py:871143
+#: projectaction.py:850144
msgid "Open.."145
msgstr "Öffnen.."146
147
-#: projectaction.py:896148
+#: projectaction.py:875149
msgid "Opening .mlt or .xml file as media was disallowed!"150
msgstr ""151
152
-#: projectaction.py:897153
+#: projectaction.py:876154
msgid ""155
"Because of current MLT behaviour of overwriting projct properties when "156
"opening MLT XML files\n"157
"it is not allowed to open these files as media."158
msgstr ""159
160
-#: projectaction.py:917161
+#: projectaction.py:896162
msgid "No file was selected"163
msgstr "Keine Datei ausgewählt"164
165
-#: projectaction.py:917166
+#: projectaction.py:896167
msgid "Select a numbered file to add an Image Sequence to Project."168
msgstr "Datei mit Ziffern wählen, um Bildsequenz in Projekt einzufügen."169
170
-#: projectaction.py:925171
+#: projectaction.py:904172
msgid "Not a sequence file!"173
msgstr "Keine Sequenz-Datei!"174
175
-#: projectaction.py:925176
+#: projectaction.py:904177
msgid ""178
"Selected file does not have a number part in it,\n"179
"so it can't be an image sequence file."180
181
"Ausgewählte Datei enthält keine Ziffern,\n"182
"so dass sie keine Bildsequenz-Datei sein kann."183
184
-#: projectaction.py:976185
+#: projectaction.py:955186
msgid "Can't make home folder thumbnails folder"187
msgstr "Kann Ordner für Miniaturen nicht anlegen"188
189
-#: projectaction.py:977 dialogs.py:395190
+#: projectaction.py:956 dialogs.py:440191
msgid "Please create and select some other folder then '"192
msgstr "Bitte anderen Ordner erzeugen und wählen, als '"193
194
-#: projectaction.py:978195
+#: projectaction.py:957196
msgid "' as thumbnails folder"197
msgstr "' für Miniatur-Ordner"198
199
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107200
-#: projectaction.py:1115 projectaction.py:1122201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: PACKAGE VERSION\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2014-02-21 12:08+0200\n"8
"Last-Translator: David Gámiz Jiménez <david.gamiz@gmail.com>\n"9
"Language-Team: David Gamiz Jimenez\n"10
11
"Plural-Forms: nplurals=2; plural=(n != 1);\n"12
"X-Generator: Virtaal 0.7.0\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "La pantalla es demasiado pequeña para esta aplicación."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr ""23
"La dimensión de pantalla mínima para esta aplicación es de 1152 x 768.\n"24
25
-#: app.py:78426
+#: app.py:80227
msgid "Your screen dimensions are "28
msgstr "Las dimensiones de su pantalla son "29
30
-#: app.py:817 projectaction.py:380 projectaction.py:71431
+#: app.py:835 projectaction.py:380 projectaction.py:69332
msgid "Project has not been saved previously"33
msgstr "El proyecto no se ha salvado antes"34
35
-#: app.py:818 projectaction.py:381 projectaction.py:71536
+#: app.py:836 projectaction.py:381 projectaction.py:69437
msgid "Save project with File -> Save As before closing."38
msgstr "Salvar el proyecto en un Archivo -> Salvar como antes de cerrar."39
40
41
"\n"42
msgstr " ya existe!"43
44
+#: projectaction.py:30145
+msgid ""46
+"\n"47
+"No duplicate media items were added to project."48
+msgstr ""49
+50
#: projectaction.py:49551
#, fuzzy52
msgid "Selected folder contains files"53
54
"has to be empty."55
msgstr ""56
57
-#: projectaction.py:57158
+#: projectaction.py:55059
msgid "Copying project media assets"60
msgstr ""61
62
-#: projectaction.py:57263
+#: projectaction.py:55164
#, fuzzy65
msgid "Saving project file"66
msgstr "¿Guardar proyecto '"67
68
-#: projectaction.py:72769
+#: projectaction.py:70670
msgid "Project not found on disk"71
msgstr "El proyecto no se encuentra en el disco"72
73
-#: projectaction.py:72874
+#: projectaction.py:70775
msgid "Project can't be loaded."76
msgstr "El proyecto no puede ser cargado."77
78
-#: projectaction.py:73679
+#: projectaction.py:71580
msgid "Project has not been saved since it was opened."81
msgstr "El proyecto no ha sido salvado desde que se abrió."82
83
-#: projectaction.py:74184
+#: projectaction.py:72085
msgid "Project was saved less than a minute ago."86
msgstr "El proyecto fue salvado hace menos de un minuto."87
88
-#: projectaction.py:74489
+#: projectaction.py:72390
msgid "Project was saved one minute ago."91
msgstr "El proyecto fue salvado hace un minuto."92
93
-#: projectaction.py:74694
+#: projectaction.py:72595
msgid "Project was saved "96
msgstr "El proyecto salvado "97
98
-#: projectaction.py:74699
+#: projectaction.py:725100
msgid " minutes ago."101
msgstr " hace minutos."102
103
-#: projectaction.py:753104
+#: projectaction.py:732105
#, fuzzy106
msgid "Render target file exists!"107
msgstr "Render rango no definido!"108
109
-#: projectaction.py:754110
+#: projectaction.py:733111
#, fuzzy112
msgid "Confirm overwriting existing file."113
msgstr "¿Usted desea sobrescribir el archivo existente?"114
115
-#: projectaction.py:760116
+#: projectaction.py:739117
msgid "Project is currently using proxy media!"118
msgstr ""119
120
-#: projectaction.py:761121
+#: projectaction.py:740122
msgid ""123
"Rendering from proxy media will produce worse quality than rendering from "124
"original media.\n"125
126
"Select 'Confirm' to render from proxy media anyway."127
msgstr ""128
129
-#: projectaction.py:838130
+#: projectaction.py:817131
#, fuzzy132
msgid "Render launch failed!"133
msgstr "Render rango no definido!"134
135
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299136
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301137
msgid "Error message: "138
msgstr "Mensaje de error:"139
140
-#: projectaction.py:852141
+#: projectaction.py:831142
msgid "Adding item to render queue failed!"143
msgstr "¡Fallo al añadir un elemento a la cola de renderizado!"144
145
-#: projectaction.py:871146
+#: projectaction.py:850147
msgid "Open.."148
msgstr "Abrir…"149
150
-#: projectaction.py:896151
+#: projectaction.py:875152
msgid "Opening .mlt or .xml file as media was disallowed!"153
msgstr ""154
155
-#: projectaction.py:897156
+#: projectaction.py:876157
msgid ""158
"Because of current MLT behaviour of overwriting projct properties when "159
"opening MLT XML files\n"160
"it is not allowed to open these files as media."161
msgstr ""162
163
-#: projectaction.py:917164
+#: projectaction.py:896165
msgid "No file was selected"166
msgstr "Ningún archivo seleccionado."167
168
-#: projectaction.py:917169
+#: projectaction.py:896170
msgid "Select a numbered file to add an Image Sequence to Project."171
msgstr ""172
"Seleccione un archivo numerado para agregar una secuencia de imágenes de "173
"Proyecto."174
175
-#: projectaction.py:925176
+#: projectaction.py:904177
msgid "Not a sequence file!"178
msgstr "¡No hay archivo de secuencia!"179
180
-#: projectaction.py:925181
+#: projectaction.py:904182
msgid ""183
"Selected file does not have a number part in it,\n"184
"so it can't be an image sequence file."185
186
"El archivo seleccionado no tiene un número de parte en el mismo, \n"187
" so no puede ser un archivo de secuencia de imágenes."188
189
-#: projectaction.py:976190
+#: projectaction.py:955191
msgid "Can't make home folder thumbnails folder"192
msgstr "No se puede hacer la carpeta miniaturas de carpeta home"193
194
-#: projectaction.py:977 dialogs.py:395195
+#: projectaction.py:956 dialogs.py:440196
msgid "Please create and select some other folder then '"197
msgstr "Por favor, crear y seleccionar otra carpeta y luego '"198
199
-#: projectaction.py:978200
+#: projectaction.py:957201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po
Changed
201
1
2
-# Finnish translations for PACKAGE package.3
-# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER4
-# This file is distributed under the same license as the PACKAGE package.5
-# Janne Liljeblad <janne@janne-kx557aa-uuw-a6521-sc>, 2011.6
-#7
msgid ""8
msgstr ""9
-"Project-Id-Version: PACKAGE VERSION\n"10
+"Project-Id-Version: Flowblade\n"11
"Report-Msgid-Bugs-To: \n"12
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"13
-"PO-Revision-Date: 2011-12-13 23:55+0200\n"14
-"Last-Translator: Janne Liljeblad <janne@janne-kx557aa-uuw-a6521-sc>\n"15
-"Language-Team: Finnish\n"16
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"17
"Language: fi\n"18
"MIME-Version: 1.0\n"19
"Content-Type: text/plain; charset=UTF-8\n"20
"Content-Transfer-Encoding: 8bit\n"21
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"22
+"X-Generator: POEditor.com\n"23
24
-#: app.py:78025
+#: app.py:79826
msgid "Too small screen for this application."27
msgstr "Näyttö on liian pieni tälle ohjelmalle."28
29
-#: app.py:78330
+#: app.py:80131
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"32
msgstr "Minimi näyttökoko tällle ohjelmalle on 1152 x 768.\n"33
34
-#: app.py:78435
+#: app.py:80236
msgid "Your screen dimensions are "37
msgstr "Sinun näyttösi koko on "38
39
-#: app.py:817 projectaction.py:380 projectaction.py:71440
+#: app.py:835 projectaction.py:380 projectaction.py:69341
msgid "Project has not been saved previously"42
msgstr "Projektia ei ole tallennettu aikaisemmin"43
44
-#: app.py:818 projectaction.py:381 projectaction.py:71545
+#: app.py:836 projectaction.py:381 projectaction.py:69446
msgid "Save project with File -> Save As before closing."47
msgstr ""48
"Tallenna projekti valinnalla Tiedosto -> Tallenna nimellä ennen sulkemista."49
50
51
#: projectaction.py:12252
msgid "Path of missing asset:"53
-msgstr ""54
+msgstr "Puuttuvan median polku:"55
56
#: projectaction.py:12357
msgid ""58
"Relative search for replacement file in sub folders of project file failed."59
msgstr ""60
+"Puuttuvien tiedostojen korvausetsintä projektitiedoston alikansioista "61
+"epäonnistui."62
63
#: projectaction.py:12464
msgid "To load the project you will need to either:"65
-msgstr ""66
+msgstr "Ladataksesi projektin tarvitset joko:"67
68
#: projectaction.py:12569
msgid ""70
"Open project in 'Media Relinker' tool to relink media assets to new files, or"71
msgstr ""72
+"Avaa projekti median uudelleenlinkitys työkalussa ja linkkaa tiedostot, tai"73
74
#: projectaction.py:12675
msgid "Place a file with the same exact name and path on the hard drive"76
77
78
#: projectaction.py:12779
msgid "Open project in Media Relinker tool"80
-msgstr ""81
+msgstr "Avaa projekti Median uudelleenlinkitys työkalussa"82
83
#: projectaction.py:14684
msgid "Profile with Description: '"85
86
87
#: projectaction.py:14888
msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."89
-msgstr ""90
+msgstr "Käyttäjäprofiili luodaan valitsemalla 'Muokkaa->Profiili'"91
92
#: projectaction.py:15593
msgid "Opening"94
95
96
#: projectaction.py:28897
msgid "Media files already present in project were opened!"98
-msgstr "Avattiin media tiedostoja, jotka jo ovat projektissa"99
+msgstr "Avattiin mediatiedostoja, jotka jo ovat projektissa"100
101
#: projectaction.py:294102
msgid ""103
104
"Projektissa jo olevat tiedostot:\n"105
"\n"106
107
+#: projectaction.py:301108
+msgid ""109
+"\n"110
+"No duplicate media items were added to project."111
+msgstr ""112
+"\n"113
+"Kaksoiskappaleita mediatiedostoista ei lisätty projektiin."114
+115
#: projectaction.py:495116
msgid "Selected folder contains files"117
msgstr "Valitussa kansiossa on tiedostoja"118
119
"Kun tallennetaan projektia ja mediaa yhtä aikaa\n"120
"täytyy kansion olla tyhjä."121
122
-#: projectaction.py:571123
+#: projectaction.py:550124
msgid "Copying project media assets"125
msgstr "Kopioidaan mediaa"126
127
-#: projectaction.py:572128
+#: projectaction.py:551129
msgid "Saving project file"130
msgstr "Tallennetaan projektia"131
132
-#: projectaction.py:727133
+#: projectaction.py:706134
msgid "Project not found on disk"135
msgstr "Projektia ei löytynyt kovalevyltä"136
137
-#: projectaction.py:728138
+#: projectaction.py:707139
msgid "Project can't be loaded."140
msgstr "Projektia ei voida ladata."141
142
-#: projectaction.py:736143
+#: projectaction.py:715144
msgid "Project has not been saved since it was opened."145
msgstr "Projektia ei ole tallennettu aikaisemmin."146
147
-#: projectaction.py:741148
+#: projectaction.py:720149
msgid "Project was saved less than a minute ago."150
msgstr "Projekti tallennettiin viimeksi alle minuutti sitten."151
152
-#: projectaction.py:744153
+#: projectaction.py:723154
msgid "Project was saved one minute ago."155
msgstr "Projekti tallennettiin viimeksi minuutti sitten."156
157
-#: projectaction.py:746158
+#: projectaction.py:725159
msgid "Project was saved "160
msgstr "Projektia ei ole tallennettu aikaisemmin"161
162
-#: projectaction.py:746163
+#: projectaction.py:725164
msgid " minutes ago."165
msgstr " minuuttia sitten."166
167
-#: projectaction.py:753168
-#, fuzzy169
+#: projectaction.py:732170
msgid "Render target file exists!"171
-msgstr "Renderöinti alue ei ole määritelty"172
+msgstr "Renderöinti tiedosto on jo olemassa!"173
174
-#: projectaction.py:754175
-#, fuzzy176
+#: projectaction.py:733177
msgid "Confirm overwriting existing file."178
msgstr "Haluatko kirjoittaa olemassa olevan tiedoston päälle?"179
180
-#: projectaction.py:760181
+#: projectaction.py:739182
msgid "Project is currently using proxy media!"183
-msgstr ""184
+msgstr "Projekti käyttää proxytiedostoja!"185
186
-#: projectaction.py:761187
+#: projectaction.py:740188
msgid ""189
"Rendering from proxy media will produce worse quality than rendering from "190
"original media.\n"191
192
"\n"193
"Select 'Confirm' to render from proxy media anyway."194
msgstr ""195
+"Proxymediasta rendaaminen tuottaa huonomman lopputuloksen kuin "196
+"alkuperäisestä mediasta rendaaminen.\n"197
+"\n"198
+"Valitse 'Vahvista' rendataksesi proxytiedostoista."199
200
-#: projectaction.py:838201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: PACKAGE VERSION\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2013-09-20 18:54+0200\n"8
"Last-Translator: Loïc Vanderstichelen <lv@loicvanderstichelen.com>\n"9
"Language-Team: French\n"10
11
"Content-Transfer-Encoding: 8bit\n"12
"Plural-Forms: nplurals=2; plural=(n > 1);\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "Votre écran est trop petit pour cette application."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "La résolution minimum pour cet application est de 1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "Votre résolution actuelle est "28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "Le projet n'a jamais été sauvegardé"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr "Sauvegardez le projet avec Fichier -> Enregistrer sous."38
39
40
"\n"41
msgstr " existe déjà!"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
#, fuzzy51
msgid "Selected folder contains files"52
53
"has to be empty."54
msgstr ""55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr ""60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
#, fuzzy64
msgid "Saving project file"65
msgstr "Sauvegarder le projet '"66
67
-#: projectaction.py:72768
+#: projectaction.py:70669
msgid "Project not found on disk"70
msgstr "Le projet n'a pas été trouvé sur le disque"71
72
-#: projectaction.py:72873
+#: projectaction.py:70774
msgid "Project can't be loaded."75
msgstr "Le projet ne peut pas être chargé."76
77
-#: projectaction.py:73678
+#: projectaction.py:71579
msgid "Project has not been saved since it was opened."80
msgstr "Ce projet n'a pas été enregistré depuis qu'il a été ouvert."81
82
-#: projectaction.py:74183
+#: projectaction.py:72084
msgid "Project was saved less than a minute ago."85
msgstr "Le projet a été sauvegardé il y a moins d'une minute."86
87
-#: projectaction.py:74488
+#: projectaction.py:72389
msgid "Project was saved one minute ago."90
msgstr "Le projet a été sauvegardé il y a une minute."91
92
-#: projectaction.py:74693
+#: projectaction.py:72594
msgid "Project was saved "95
msgstr "Le projet a été sauvegardé il y a "96
97
-#: projectaction.py:74698
+#: projectaction.py:72599
msgid " minutes ago."100
msgstr " minutes."101
102
-#: projectaction.py:753103
+#: projectaction.py:732104
#, fuzzy105
msgid "Render target file exists!"106
msgstr "Zone de rendu non définie!"107
108
-#: projectaction.py:754109
+#: projectaction.py:733110
#, fuzzy111
msgid "Confirm overwriting existing file."112
msgstr "Voulez-vous écraser le fichier existant?"113
114
-#: projectaction.py:760115
+#: projectaction.py:739116
msgid "Project is currently using proxy media!"117
msgstr ""118
119
-#: projectaction.py:761120
+#: projectaction.py:740121
msgid ""122
"Rendering from proxy media will produce worse quality than rendering from "123
"original media.\n"124
125
"Select 'Confirm' to render from proxy media anyway."126
msgstr ""127
128
-#: projectaction.py:838129
+#: projectaction.py:817130
#, fuzzy131
msgid "Render launch failed!"132
msgstr "Zone de rendu non définie!"133
134
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299135
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301136
#, fuzzy137
msgid "Error message: "138
msgstr "Message d'erreur: "139
140
-#: projectaction.py:852141
+#: projectaction.py:831142
msgid "Adding item to render queue failed!"143
msgstr "Echec de l'ajout d'élément à la liste de rendu!"144
145
-#: projectaction.py:871146
+#: projectaction.py:850147
msgid "Open.."148
msgstr "Ouvrir..."149
150
-#: projectaction.py:896151
+#: projectaction.py:875152
msgid "Opening .mlt or .xml file as media was disallowed!"153
msgstr ""154
155
-#: projectaction.py:897156
+#: projectaction.py:876157
msgid ""158
"Because of current MLT behaviour of overwriting projct properties when "159
"opening MLT XML files\n"160
"it is not allowed to open these files as media."161
msgstr ""162
163
-#: projectaction.py:917164
+#: projectaction.py:896165
msgid "No file was selected"166
msgstr "Aucun fichier sélectionné"167
168
-#: projectaction.py:917169
+#: projectaction.py:896170
msgid "Select a numbered file to add an Image Sequence to Project."171
msgstr ""172
"Sélectionnez un fichier numéroté pour ajouter une séquence d'images au "173
"projet."174
175
-#: projectaction.py:925176
+#: projectaction.py:904177
msgid "Not a sequence file!"178
msgstr "Ce n'est pas un fichier de séquence!"179
180
-#: projectaction.py:925181
+#: projectaction.py:904182
msgid ""183
"Selected file does not have a number part in it,\n"184
"so it can't be an image sequence file."185
186
"Le fichier sélectionné ne contient pas de numérotation,\n"187
"il ne peut donc pas constituer une séquence d'images."188
189
-#: projectaction.py:976190
+#: projectaction.py:955191
msgid "Can't make home folder thumbnails folder"192
msgstr "Le dossier home ne peut pas être le dossier des miniatures"193
194
-#: projectaction.py:977 dialogs.py:395195
+#: projectaction.py:956 dialogs.py:440196
msgid "Please create and select some other folder then '"197
msgstr "Créez et sélectionnez un autre dossier '"198
199
-#: projectaction.py:978200
+#: projectaction.py:957201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: \n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2017-03-24 08:40+0100\n"8
"Last-Translator: Péter Gábor <ptrg@freemail.hu>\n"9
"Language-Team: \n"10
11
"Content-Transfer-Encoding: 8bit\n"12
"X-Generator: Poedit 1.5.4\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "Túl kicsi a képernyő az alkalmazás számára."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "A minimális képernyőfelbontás ezen alkalmazás számára 1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "Az ön képernyőjének felbontása "28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "A projekt korábban még nem volt mentve"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr ""38
"Mentse a projektet a Fájl -> Mentés másként menüpont használatával mielőtt "39
40
"Már jelenlévő fájlok:\n"41
"\n"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
msgid "Selected folder contains files"51
msgstr "A választott könyvtár fájlokat tartalmaz"52
53
"Egy projekt állapotának mentésekor a választott mappának\n"54
"üresnek kell lennie."55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr "A projekt média összetevőinek másolása"60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
msgid "Saving project file"64
msgstr "Projekt fájl mentése"65
66
-#: projectaction.py:72767
+#: projectaction.py:70668
msgid "Project not found on disk"69
msgstr "A projekt nem található a lemezen"70
71
-#: projectaction.py:72872
+#: projectaction.py:70773
msgid "Project can't be loaded."74
msgstr "A projekt nem tölthető be."75
76
-#: projectaction.py:73677
+#: projectaction.py:71578
msgid "Project has not been saved since it was opened."79
msgstr "A projekt még nem volt mentve a megnyitás óta."80
81
-#: projectaction.py:74182
+#: projectaction.py:72083
msgid "Project was saved less than a minute ago."84
msgstr "A projekt kevesebb mint egy perce volt mentve"85
86
-#: projectaction.py:74487
+#: projectaction.py:72388
msgid "Project was saved one minute ago."89
msgstr "A projekt egy perce volt mentve."90
91
-#: projectaction.py:74692
+#: projectaction.py:72593
msgid "Project was saved "94
msgstr "A projekt mentése "95
96
-#: projectaction.py:74697
+#: projectaction.py:72598
msgid " minutes ago."99
msgstr " perce történt."100
101
-#: projectaction.py:753102
+#: projectaction.py:732103
#, fuzzy104
msgid "Render target file exists!"105
msgstr "Renderelendő tartomány nincs meghatározva!"106
107
-#: projectaction.py:754108
+#: projectaction.py:733109
msgid "Confirm overwriting existing file."110
msgstr ""111
112
-#: projectaction.py:760113
+#: projectaction.py:739114
msgid "Project is currently using proxy media!"115
msgstr ""116
117
-#: projectaction.py:761118
+#: projectaction.py:740119
msgid ""120
"Rendering from proxy media will produce worse quality than rendering from "121
"original media.\n"122
123
"Select 'Confirm' to render from proxy media anyway."124
msgstr ""125
126
-#: projectaction.py:838127
+#: projectaction.py:817128
msgid "Render launch failed!"129
msgstr "Nem sikerült elindítani a renderelést!"130
131
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299132
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301133
msgid "Error message: "134
msgstr "Hibaüzenet: "135
136
-#: projectaction.py:852137
+#: projectaction.py:831138
msgid "Adding item to render queue failed!"139
msgstr "Nem sikerült hozzáadni az elemet a renderelés várólistájához!"140
141
-#: projectaction.py:871142
+#: projectaction.py:850143
msgid "Open.."144
msgstr "Megnyitás..."145
146
-#: projectaction.py:896147
+#: projectaction.py:875148
msgid "Opening .mlt or .xml file as media was disallowed!"149
msgstr ""150
151
-#: projectaction.py:897152
+#: projectaction.py:876153
msgid ""154
"Because of current MLT behaviour of overwriting projct properties when "155
"opening MLT XML files\n"156
"it is not allowed to open these files as media."157
msgstr ""158
159
-#: projectaction.py:917160
+#: projectaction.py:896161
msgid "No file was selected"162
msgstr "Nem lett fájl kiválasztva"163
164
-#: projectaction.py:917165
+#: projectaction.py:896166
msgid "Select a numbered file to add an Image Sequence to Project."167
msgstr ""168
"Válasszon egy sorszámozott fájlt, hogy képsorozatot adjon a projekthez."169
170
-#: projectaction.py:925171
+#: projectaction.py:904172
msgid "Not a sequence file!"173
msgstr "Nem jelenetfájl!"174
175
-#: projectaction.py:925176
+#: projectaction.py:904177
msgid ""178
"Selected file does not have a number part in it,\n"179
"so it can't be an image sequence file."180
181
"A kiválasztott fájl nem tartalmaz számot a nevében,\n"182
"így nem is lehet képsorozat része."183
184
-#: projectaction.py:976185
+#: projectaction.py:955186
msgid "Can't make home folder thumbnails folder"187
msgstr "A \"Saját mappa\" nem állítható be a bélyegképek mappájaként"188
189
-#: projectaction.py:977 dialogs.py:395190
+#: projectaction.py:956 dialogs.py:440191
msgid "Please create and select some other folder then '"192
msgstr "Hozzon létre és válasszon egy másik mappát e helyett '"193
194
-#: projectaction.py:978195
+#: projectaction.py:957196
msgid "' as thumbnails folder"197
msgstr "' a bélyegképek számára"198
199
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107200
-#: projectaction.py:1115 projectaction.py:1122201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: Floblade Italian Translation 0.14\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2014-09-15 23:42+0100\n"8
"Last-Translator: Massimo Stella <info@massimostella.it>\n"9
"Language-Team: Italiano\n"10
11
"Plural-Forms: nplurals=2; plural=(n > 1);\n"12
"X-Generator: Poedit 1.5.4\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "Lo schermo è troppo piccolo per questa applicazione."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "La risoluzione minima per questa applicazione è 1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "La risoluzione corrente è"28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "Il progetto non è mai stato salvato"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr "Salva il progetto da File -> Salva con nome"38
39
40
"File già esistenti:\n"41
"\n"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
#, fuzzy51
msgid "Selected folder contains files"52
53
"has to be empty."54
msgstr ""55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr ""60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
#, fuzzy64
msgid "Saving project file"65
msgstr "Salvo il progetto '"66
67
-#: projectaction.py:72768
+#: projectaction.py:70669
msgid "Project not found on disk"70
msgstr "Il progetto non è stato trovato sul disco"71
72
-#: projectaction.py:72873
+#: projectaction.py:70774
msgid "Project can't be loaded."75
msgstr "Il progetto non può essere caricato."76
77
-#: projectaction.py:73678
+#: projectaction.py:71579
msgid "Project has not been saved since it was opened."80
msgstr "Questo progetto non è ancora stato salvato dall'apertura."81
82
-#: projectaction.py:74183
+#: projectaction.py:72084
msgid "Project was saved less than a minute ago."85
msgstr "Il progetto è stato salvato meno di un minuto fa."86
87
-#: projectaction.py:74488
+#: projectaction.py:72389
msgid "Project was saved one minute ago."90
msgstr "Il progetto è stato salvato un minuto fa."91
92
-#: projectaction.py:74693
+#: projectaction.py:72594
msgid "Project was saved "95
msgstr "Il progetto è stato salvato"96
97
-#: projectaction.py:74698
+#: projectaction.py:72599
msgid " minutes ago."100
msgstr " minuti fa."101
102
-#: projectaction.py:753103
+#: projectaction.py:732104
#, fuzzy105
msgid "Render target file exists!"106
msgstr "Area di calcolo non definita!"107
108
-#: projectaction.py:754109
+#: projectaction.py:733110
#, fuzzy111
msgid "Confirm overwriting existing file."112
msgstr "Vuoi sovrascriverlo?"113
114
-#: projectaction.py:760115
+#: projectaction.py:739116
msgid "Project is currently using proxy media!"117
msgstr ""118
119
-#: projectaction.py:761120
+#: projectaction.py:740121
msgid ""122
"Rendering from proxy media will produce worse quality than rendering from "123
"original media.\n"124
125
"Select 'Confirm' to render from proxy media anyway."126
msgstr ""127
128
-#: projectaction.py:838129
+#: projectaction.py:817130
#, fuzzy131
msgid "Render launch failed!"132
msgstr "Area di calcolo non definita!"133
134
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299135
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301136
msgid "Error message: "137
msgstr "Messaggio d'errore: "138
139
-#: projectaction.py:852140
+#: projectaction.py:831141
msgid "Adding item to render queue failed!"142
msgstr "Aggiunta alla coda dei render fallita!"143
144
-#: projectaction.py:871145
+#: projectaction.py:850146
msgid "Open.."147
msgstr "Apri..."148
149
-#: projectaction.py:896150
+#: projectaction.py:875151
msgid "Opening .mlt or .xml file as media was disallowed!"152
msgstr ""153
154
-#: projectaction.py:897155
+#: projectaction.py:876156
msgid ""157
"Because of current MLT behaviour of overwriting projct properties when "158
"opening MLT XML files\n"159
"it is not allowed to open these files as media."160
msgstr ""161
162
-#: projectaction.py:917163
+#: projectaction.py:896164
msgid "No file was selected"165
msgstr "Nessun file selezionato"166
167
-#: projectaction.py:917168
+#: projectaction.py:896169
msgid "Select a numbered file to add an Image Sequence to Project."170
msgstr "Selezionare un file numerato per aggiungere una sequenza di immagini"171
172
-#: projectaction.py:925173
+#: projectaction.py:904174
msgid "Not a sequence file!"175
msgstr "Questa non è una sequenza!"176
177
-#: projectaction.py:925178
+#: projectaction.py:904179
msgid ""180
"Selected file does not have a number part in it,\n"181
"so it can't be an image sequence file."182
183
"Il file selezionato non è numerato, \n"184
"quindi non può essere una sequenza di immagini."185
186
-#: projectaction.py:976187
+#: projectaction.py:955188
msgid "Can't make home folder thumbnails folder"189
msgstr "Non si può usare la carella Home per le miniature"190
191
-#: projectaction.py:977 dialogs.py:395192
+#: projectaction.py:956 dialogs.py:440193
msgid "Please create and select some other folder then '"194
msgstr "Creare e selezionare una cartella differente da '"195
196
-#: projectaction.py:978197
+#: projectaction.py:957198
msgid "' as thumbnails folder"199
msgstr "' per le miniature"200
201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: PACKAGE VERSION\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2017-05-27 08:50+0200\n"8
"Last-Translator: Stanislaw Polak <polak@icsr.agh.edu.pl>\n"9
"Language-Team: Polish\n"10
11
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "12
"|| n%100>=20) ? 1 : 2);\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "Zbyt mały ekran dla tej aplikacji."18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "Minimalne wymiary ekranu dla tej aplikacji to 1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "Wymiary twojego ekranu to "28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "Projekt nie został wcześniej zapisany"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr "Przed zamknięciem, zapisz projekt za pomocą Plik -> Zapisz jako."38
39
40
"Pliki, które już występują:\n"41
"\n"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
msgid "Selected folder contains files"51
msgstr "Wybrany folder zawiera pliki"52
53
"Podczas zapisywania kopii migawkowej projektu, wybrany folder\n"54
"musi być pusty."55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr "Kopiowanie zasobów multimedialnych projektu"60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
msgid "Saving project file"64
msgstr "Zapisywanie pliku projektu"65
66
-#: projectaction.py:72767
+#: projectaction.py:70668
msgid "Project not found on disk"69
msgstr "Nie znaleziono projektu na dysku"70
71
-#: projectaction.py:72872
+#: projectaction.py:70773
msgid "Project can't be loaded."74
msgstr "Nie można załadować projektu."75
76
-#: projectaction.py:73677
+#: projectaction.py:71578
msgid "Project has not been saved since it was opened."79
msgstr "Od czasu jego otwarcia projekt nie został zapisany."80
81
-#: projectaction.py:74182
+#: projectaction.py:72083
msgid "Project was saved less than a minute ago."84
msgstr "Projekt został zapisany mniej niż minutę temu."85
86
-#: projectaction.py:74487
+#: projectaction.py:72388
msgid "Project was saved one minute ago."89
msgstr "Projekt został zapisany minutę temu."90
91
-#: projectaction.py:74692
+#: projectaction.py:72593
msgid "Project was saved "94
msgstr "Projekt został zapisany "95
96
-#: projectaction.py:74697
+#: projectaction.py:72598
msgid " minutes ago."99
msgstr " minut temu."100
101
-#: projectaction.py:753102
+#: projectaction.py:732103
#, fuzzy104
msgid "Render target file exists!"105
msgstr "Niezdefiniowany zakres renderowania"106
107
-#: projectaction.py:754108
+#: projectaction.py:733109
msgid "Confirm overwriting existing file."110
msgstr ""111
112
-#: projectaction.py:760113
+#: projectaction.py:739114
msgid "Project is currently using proxy media!"115
msgstr ""116
117
-#: projectaction.py:761118
+#: projectaction.py:740119
msgid ""120
"Rendering from proxy media will produce worse quality than rendering from "121
"original media.\n"122
123
"Select 'Confirm' to render from proxy media anyway."124
msgstr ""125
126
-#: projectaction.py:838127
+#: projectaction.py:817128
msgid "Render launch failed!"129
msgstr "Renderowanie nie powiodło się!"130
131
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299132
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301133
msgid "Error message: "134
msgstr "Komunikat o błędzie: "135
136
-#: projectaction.py:852137
+#: projectaction.py:831138
msgid "Adding item to render queue failed!"139
msgstr "Dodawanie elementu do kolejki renderowania nie powiodło się!"140
141
-#: projectaction.py:871142
+#: projectaction.py:850143
msgid "Open.."144
msgstr "Otwórz.."145
146
-#: projectaction.py:896147
+#: projectaction.py:875148
msgid "Opening .mlt or .xml file as media was disallowed!"149
msgstr "Otwarcie pliku .mlt lub .xml jako multimediów było niedozwolone!"150
151
-#: projectaction.py:897152
+#: projectaction.py:876153
msgid ""154
"Because of current MLT behaviour of overwriting projct properties when "155
"opening MLT XML files\n"156
157
"projektu, podczas otwierania plików MLT XML\n"158
"nie wolno otwierać tych plików jako multimediów."159
160
-#: projectaction.py:917161
+#: projectaction.py:896162
msgid "No file was selected"163
msgstr "Nie wybrano żadnego pliku"164
165
-#: projectaction.py:917166
+#: projectaction.py:896167
msgid "Select a numbered file to add an Image Sequence to Project."168
msgstr "Wybierz numerowany plik, aby dodać sekwencję obrazów do projektu."169
170
-#: projectaction.py:925171
+#: projectaction.py:904172
msgid "Not a sequence file!"173
msgstr "Nie jest plikem sekwencji!"174
175
-#: projectaction.py:925176
+#: projectaction.py:904177
msgid ""178
"Selected file does not have a number part in it,\n"179
"so it can't be an image sequence file."180
181
"Wybrany plik nie posiada numerów,\n"182
"więc nie może on być plikiem sekwencji obrazów."183
184
-#: projectaction.py:976185
+#: projectaction.py:955186
msgid "Can't make home folder thumbnails folder"187
msgstr "Nie można utworzyć folderu miniatur"188
189
-#: projectaction.py:977 dialogs.py:395190
+#: projectaction.py:956 dialogs.py:440191
msgid "Please create and select some other folder then '"192
msgstr "Proszę utworzyć i wybrać inny folder niż '"193
194
-#: projectaction.py:978195
+#: projectaction.py:957196
msgid "' as thumbnails folder"197
msgstr "' jako folder miniatur"198
199
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107200
-#: projectaction.py:1115 projectaction.py:1122201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po
Changed
201
1
2
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER3
-# This file is distributed under the same license as the PACKAGE package.4
-# 5
-# Николай Смольянинов <smolianinow.colya2016@yandex.ru>, 2017.6
+# Russian translations for Flowblade package.7
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER8
+# This file is distributed under the same license as the Flowblade package.9
+# Николай Смольянинов <smolianinow.colya2016@yandex.ru>, 2017, 2018.10
+#11
msgid ""12
msgstr ""13
-"Project-Id-Version: Flowblade\n"14
+"Project-Id-Version: Flowblade 1.16\n"15
"Report-Msgid-Bugs-To: \n"16
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"17
-"PO-Revision-Date: 2017-09-17 22:05+0300\n"18
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"19
+"PO-Revision-Date: 2018-03-06 11:31+0300\n"20
"Last-Translator: Николай Смольянинов <smolianinow.colya2016@yandex.ru>\n"21
-"Language-Team: Russian\n"22
+"Language-Team: vk.com/flowblade\n"23
"Language: ru_RU\n"24
"MIME-Version: 1.0\n"25
"Content-Type: text/plain; charset=UTF-8\n"26
"Content-Transfer-Encoding: 8bit\n"27
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"28
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"29
-"X-Generator: Poedit 1.8.7.1\n"30
+"X-Generator: Poedit 2.0.6\n"31
32
-#: app.py:78033
+#: app.py:79834
msgid "Too small screen for this application."35
msgstr "Недостаточное разрешение экрана."36
37
-#: app.py:78338
+#: app.py:80139
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"40
msgstr "Разрешение экрана должно быть не ниже 1152 х 768.\n"41
42
-#: app.py:78443
+#: app.py:80244
msgid "Your screen dimensions are "45
-msgstr "Ваше разрешение экрана"46
+msgstr "Ваше разрешение экрана "47
48
-#: app.py:817 projectaction.py:380 projectaction.py:71449
+#: app.py:835 projectaction.py:380 projectaction.py:69350
msgid "Project has not been saved previously"51
msgstr "Проект не был сохранён"52
53
-#: app.py:818 projectaction.py:381 projectaction.py:71554
+#: app.py:836 projectaction.py:381 projectaction.py:69455
msgid "Save project with File -> Save As before closing."56
msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."57
58
59
60
#: projectaction.py:12261
msgid "Path of missing asset:"62
-msgstr "Путь к недостающему активу"63
+msgstr "Путь к недостающему активу:"64
65
#: projectaction.py:12366
msgid ""67
"Relative search for replacement file in sub folders of project file failed."68
msgstr ""69
-"Относительный поиск пути для замены файла во вложенных папках файла проекта "70
-"не удался."71
+"Поиск по относительному пути для замены файла в подпапках проекта не удался."72
73
#: projectaction.py:12474
msgid "To load the project you will need to either:"75
-msgstr "Для загрузки проекта требуется, либо:"76
+msgstr "Для загрузки проекта выполните одно из действий:"77
78
#: projectaction.py:12579
msgid ""80
"Open project in 'Media Relinker' tool to relink media assets to new files, or"81
msgstr ""82
-"Откройте проект в инструменте \"Перелинковщике медиа\" для повторной связи "83
-"ресурсов медиа с новыми файлами или"84
+"Откройте проект в инструменте \"Перелинковщик медиа\" для повторной связи "85
+"ресурсов медиа с новыми файлами"86
87
#: projectaction.py:12688
msgid "Place a file with the same exact name and path on the hard drive"89
-msgstr "Создать резервный файл с тем же именем и содержанием"90
+msgstr "Создайте резервный файл с тем же именем и содержанием"91
92
#: projectaction.py:12793
msgid "Open project in Media Relinker tool"94
-msgstr "Проект открыт в Перелинковщике медиа"95
+msgstr "Открыть проект в Перелинковщике медиа"96
97
#: projectaction.py:14698
msgid "Profile with Description: '"99
100
"Файлы уже присутствуют:\n"101
"\n"102
103
+#: projectaction.py:301104
+msgid ""105
+"\n"106
+"No duplicate media items were added to project."107
+msgstr ""108
+"\n"109
+"Дублирующие медиафайлы не были добавлены в проект."110
+111
#: projectaction.py:495112
msgid "Selected folder contains files"113
msgstr "Выбранная папка содержит файлы"114
115
"При сохранении резервной копии проекта, выбираемая папка\n"116
"должна быть пустой."117
118
-#: projectaction.py:571119
+#: projectaction.py:550120
msgid "Copying project media assets"121
-msgstr "Копирование медиа-активов проекта"122
+msgstr "Копирование медиа активов проекта"123
124
-#: projectaction.py:572125
+#: projectaction.py:551126
msgid "Saving project file"127
msgstr "Сохранение файла проекта"128
129
-#: projectaction.py:727130
+#: projectaction.py:706131
msgid "Project not found on disk"132
msgstr "Проект не найден"133
134
-#: projectaction.py:728135
+#: projectaction.py:707136
msgid "Project can't be loaded."137
-msgstr "Невозможно загрузить проект"138
+msgstr "Невозможно загрузить проект."139
140
-#: projectaction.py:736141
+#: projectaction.py:715142
msgid "Project has not been saved since it was opened."143
msgstr "Открыт несохранённый проект."144
145
-#: projectaction.py:741146
+#: projectaction.py:720147
msgid "Project was saved less than a minute ago."148
msgstr "Проект был сохранён менее минуты назад."149
150
-#: projectaction.py:744151
+#: projectaction.py:723152
msgid "Project was saved one minute ago."153
msgstr "Проект был сохранён минуту назад."154
155
-#: projectaction.py:746156
+#: projectaction.py:725157
msgid "Project was saved "158
msgstr "Проект был сохранён "159
160
-#: projectaction.py:746161
+#: projectaction.py:725162
msgid " minutes ago."163
msgstr " минут назад."164
165
-#: projectaction.py:753166
+#: projectaction.py:732167
msgid "Render target file exists!"168
msgstr "Целевой файл существует!"169
170
-#: projectaction.py:754171
+#: projectaction.py:733172
msgid "Confirm overwriting existing file."173
msgstr "Подтвердите перезапись существующего файла."174
175
-#: projectaction.py:760176
+#: projectaction.py:739177
msgid "Project is currently using proxy media!"178
msgstr "В проекте используются прокси-клипы!"179
180
-#: projectaction.py:761181
+#: projectaction.py:740182
msgid ""183
"Rendering from proxy media will produce worse quality than rendering from "184
"original media.\n"185
186
"Качество выходного видео собранного из прокси-клипов будет ниже, чем "187
"собранного из\n"188
" оригинальных клипов. Для улучшения качества сборки в Менеджере прокси "189
-"выберете \n"190
+"выберите \n"191
"Использование оригинальных клипов. \n"192
"\n"193
"Выберите «Подтвердить» для сборки из прокси-клипов."194
195
-#: projectaction.py:838196
+#: projectaction.py:817197
msgid "Render launch failed!"198
msgstr "Не удалось запустить сборку!"199
200
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.po
Changed
201
1
2
msgstr ""3
"Project-Id-Version: PACKAGE VERSION\n"4
"Report-Msgid-Bugs-To: \n"5
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"6
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"7
"PO-Revision-Date: 2017-04-15 18:47+0800\n"8
"Last-Translator: wu <laowudebox@126.com>\n"9
"Language-Team: Language LANGUAGE\n"10
11
"Content-Type: text/plain; charset=UTF-8\n"12
"Content-Transfer-Encoding: 8bit\n"13
14
-#: app.py:78015
+#: app.py:79816
msgid "Too small screen for this application."17
msgstr "对于这个应用，画面太小。"18
19
-#: app.py:78320
+#: app.py:80121
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "对于这个应用，最小画面尺寸是1152 x 768.\n"23
24
-#: app.py:78425
+#: app.py:80226
msgid "Your screen dimensions are "27
msgstr "你的画面尺寸是"28
29
-#: app.py:817 projectaction.py:380 projectaction.py:71430
+#: app.py:835 projectaction.py:380 projectaction.py:69331
msgid "Project has not been saved previously"32
msgstr "项目还未被保存过"33
34
-#: app.py:818 projectaction.py:381 projectaction.py:71535
+#: app.py:836 projectaction.py:381 projectaction.py:69436
msgid "Save project with File -> Save As before closing."37
msgstr "保存项目为 -> 与关闭之前一致"38
39
40
"文件已经发送\n"41
"\n"42
43
+#: projectaction.py:30144
+msgid ""45
+"\n"46
+"No duplicate media items were added to project."47
+msgstr ""48
+49
#: projectaction.py:49550
msgid "Selected folder contains files"51
msgstr "选中的目录包含文件"52
53
"当保存一个项目的快照备份时，被选中的目录\n"54
"必须为空。"55
56
-#: projectaction.py:57157
+#: projectaction.py:55058
msgid "Copying project media assets"59
msgstr "正在复制相关项目媒体"60
61
-#: projectaction.py:57262
+#: projectaction.py:55163
msgid "Saving project file"64
msgstr "正在保存项目文件"65
66
-#: projectaction.py:72767
+#: projectaction.py:70668
msgid "Project not found on disk"69
msgstr "项目未在磁盘找到"70
71
-#: projectaction.py:72872
+#: projectaction.py:70773
msgid "Project can't be loaded."74
msgstr "项目不能被加载。"75
76
-#: projectaction.py:73677
+#: projectaction.py:71578
msgid "Project has not been saved since it was opened."79
msgstr "由于被打开，项目未被保存"80
81
-#: projectaction.py:74182
+#: projectaction.py:72083
msgid "Project was saved less than a minute ago."84
msgstr "不到1分钟之前，项目已被保存"85
86
-#: projectaction.py:74487
+#: projectaction.py:72388
msgid "Project was saved one minute ago."89
msgstr "1分钟之前，项目已被保存"90
91
-#: projectaction.py:74692
+#: projectaction.py:72593
msgid "Project was saved "94
msgstr "项目已被保存"95
96
-#: projectaction.py:74697
+#: projectaction.py:72598
msgid " minutes ago."99
msgstr "几分钟之前"100
101
-#: projectaction.py:753102
+#: projectaction.py:732103
#, fuzzy104
msgid "Render target file exists!"105
msgstr "渲染范围未明确"106
107
-#: projectaction.py:754108
+#: projectaction.py:733109
msgid "Confirm overwriting existing file."110
msgstr ""111
112
-#: projectaction.py:760113
+#: projectaction.py:739114
msgid "Project is currently using proxy media!"115
msgstr ""116
117
-#: projectaction.py:761118
+#: projectaction.py:740119
msgid ""120
"Rendering from proxy media will produce worse quality than rendering from "121
"original media.\n"122
123
"Select 'Confirm' to render from proxy media anyway."124
msgstr ""125
126
-#: projectaction.py:838127
+#: projectaction.py:817128
msgid "Render launch failed!"129
msgstr "导致启动失败！"130
131
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299132
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301133
msgid "Error message: "134
msgstr "错误信息"135
136
-#: projectaction.py:852137
+#: projectaction.py:831138
msgid "Adding item to render queue failed!"139
msgstr "添加条款导致列队失败！"140
141
-#: projectaction.py:871142
+#: projectaction.py:850143
msgid "Open.."144
msgstr "打开.."145
146
-#: projectaction.py:896147
+#: projectaction.py:875148
msgid "Opening .mlt or .xml file as media was disallowed!"149
msgstr ""150
151
-#: projectaction.py:897152
+#: projectaction.py:876153
msgid ""154
"Because of current MLT behaviour of overwriting projct properties when "155
"opening MLT XML files\n"156
"it is not allowed to open these files as media."157
msgstr ""158
159
-#: projectaction.py:917160
+#: projectaction.py:896161
msgid "No file was selected"162
msgstr "未选中文件"163
164
-#: projectaction.py:917165
+#: projectaction.py:896166
msgid "Select a numbered file to add an Image Sequence to Project."167
msgstr "选择一个编号的文件，给项目添加一个影像序列。"168
169
-#: projectaction.py:925170
+#: projectaction.py:904171
msgid "Not a sequence file!"172
msgstr "不是序列文件！"173
174
-#: projectaction.py:925175
+#: projectaction.py:904176
msgid ""177
"Selected file does not have a number part in it,\n"178
"so it can't be an image sequence file."179
180
"选择的文件没有编号部分。\n"181
"所以它不能作为一个影像序列文件。"182
183
-#: projectaction.py:976184
+#: projectaction.py:955185
msgid "Can't make home folder thumbnails folder"186
msgstr "不能生成家目录缩略图目录"187
188
-#: projectaction.py:977 dialogs.py:395189
+#: projectaction.py:956 dialogs.py:440190
msgid "Please create and select some other folder then '"191
msgstr "请之后创建和选择其他一些目录'"192
193
-#: projectaction.py:978194
+#: projectaction.py:957195
msgid "' as thumbnails folder"196
msgstr "'作为缩略图目录’"197
198
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107199
-#: projectaction.py:1115 projectaction.py:1122200
+#: projectaction.py:1075 projectaction.py:1077 projectaction.py:1086201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/medialinker.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/medialinker.py
Changed
10
1
2
panel.pack_start(guiutils.pad_label(12, 12), False, False, 0)3
panel.pack_start(relink_path, False, False, 0)4
5
- dialogutils.panel_ok_dialog("Media Asset Paths", panel)6
+ dialogutils.panel_ok_dialog(_("Media Asset Paths"), panel)7
8
def _save_project_pressed():9
if target_project.last_save_path != None:10
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/medialog.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/medialog.py
Changed
40
1
2
# ----------------------------------------------------------- dnd drop3
def clips_drop(clips):4
for clip in clips:5
- if clip.media_type == appconsts.VIDEO or clip.media_type == appconsts.AUDIO:6
+ if clip.media_type == appconsts.VIDEO or clip.media_type == appconsts.AUDIO or clip.media_type == appconsts.IMAGE_SEQUENCE:7
log_event = MediaLogEvent( appconsts.MEDIA_LOG_MARKS_SET,8
clip.clip_in,9
clip.clip_out,10
clip.name,11
clip.path)12
+ log_event.ttl = clip.ttl13
editorstate.PROJECT().media_log.append(log_event)14
_update_list_view(log_event)15
16
17
media_file.mark_out,18
media_file.name,19
media_file.path)20
+ log_event.ttl = media_file.ttl21
+22
editorstate.PROJECT().media_log.append(log_event)23
editorstate.PROJECT().add_to_group(_get_current_group_index(), [log_event])24
_update_list_view(log_event)25
26
do_multiple_clip_insert_func(track, clips, tline_pos)27
28
def get_log_event_clip(log_event):29
- # currently quarateed not to be a pattern producer30
- new_clip = editorstate.current_sequence().create_file_producer_clip(log_event.path)31
+ # pre versions 1.16 do not have this attr in log_event objects32
+ if not hasattr(log_event, "ttl"):33
+ log_event.ttl = None34
+35
+ # currently quaranteed not to be a pattern producer36
+ new_clip = editorstate.current_sequence().create_file_producer_clip(log_event.path, None, False, log_event.ttl)37
38
# Set clip in and out points39
new_clip.clip_in = log_event.mark_in40
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/menuactions.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/menuactions.py
Changed
10
1
2
add_button, remove_button, file_path_value_label = widgets3
add_button.set_sensitive(True)4
remove_button.set_sensitive(False)5
- file_path_value_label.set_text("Not Set")6
+ file_path_value_label.set_text(_("Not Set"))7
current_sequence().remove_watermark()8
9
def jack_output_managing():10
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/mltfilters.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/mltfilters.py
Changed
12
1
2
3
"""4
Module handles creating mlt.Filter objects and their FilterObject python wrappers that5
-are attached to mlt:Producer objects.6
+are attached to mlt.Producer objects.7
"""8
+9
import copy10
11
from gi.repository import Gtk12
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/mltplayer.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/mltplayer.py
Changed
109
1
2
class Player:3
4
def __init__(self, profile):5
- 6
+ #self.consumer = None7
+8
self.init_for_profile(profile)9
10
self.ticker = utils.Ticker(self._ticker_event, TICKER_DELAY)11
12
"""13
Creates consumer with sdl output to a gtk+ widget.14
"""15
+ # SDL 2 consumer is created after16
+ #if editorstate.get_sdl_version() == editorstate.SDL_2:17
+ # print "refuse SDL1 consumer"18
+ # return19
+20
+ print "Create SDL1 consumer..."21
# Create consumer and set params22
self.consumer = mlt.Consumer(self.profile, "sdl")23
self.consumer.set("real_time", 1)24
25
26
# Hold ref to switch back from rendering27
self.sdl_consumer = self.consumer 28
+29
+ """30
+ def create_sdl2_video_consumer(self):31
+32
+ widget = gui.editor_window.tline_display33
+ self.set_sdl_xwindow(widget)34
+ 35
+ # Create consumer and set params36
+ self.consumer = mlt.Consumer(self.profile, "sdl")37
+ self.consumer.set("real_time", 1)38
+ self.consumer.set("rescale", "bicubic") # MLT options "nearest", "bilinear", "bicubic", "hyper"39
+ self.consumer.set("resize", 1)40
+ self.consumer.set("progressive", 1)41
+ self.consumer.set("window_id", str(self.xid))42
+ alloc = gui.editor_window.tline_display.get_allocation()43
+ self.consumer.set("window_width", str(alloc.width))44
+ self.consumer.set("window_height", str(alloc.height))45
+ self.consumer.set("window_type", "widget")46
+ self.consumer.set("renderer_type", "software")47
+ # Hold ref to switch back from rendering48
+ self.sdl_consumer = self.consumer 49
50
+ self.connect_and_start()51
+ """52
+ 53
def set_sdl_xwindow(self, widget):54
"""55
Connects SDL output to display widget's xwindow56
"""57
os.putenv('SDL_WINDOWID', str(widget.get_window().get_xid()))58
+ #self.xid = widget.get_window().get_xid()59
Gdk.flush()60
- 61
+62
def set_tracktor_producer(self, tractor):63
"""64
Sets a MLT producer from multitrack timeline to be displayed.65
66
def refresh(self): # Window events need this to get picture back67
self.consumer.stop()68
self.consumer.start()69
-70
+ 71
+ """72
+ if self.consumer == None:73
+ return 74
+ if editorstate.get_sdl_version() == editorstate.SDL_2:75
+ alloc = gui.editor_window.tline_display.get_allocation()76
+ self.consumer.set("window_width", str(alloc.width))77
+ self.consumer.set("window_height", str(alloc.height))78
+ 79
+ self.consumer.stop()80
+ self.consumer.start()81
+ else:82
+ self.consumer.stop()83
+ self.consumer.start()84
+ """85
+ 86
def is_stopped(self):87
return (self.producer.get_speed() == 0)88
89
90
"""91
Connects current procer and consumer and92
"""93
+ #if self.consumer == None:94
+ # return 95
+96
self.consumer.purge()97
self.producer.set_speed(0)98
self.consumer.connect(self.producer)99
100
return (self.producer.get_speed() != 0)101
102
def _ticker_event(self):103
+ #if self.consumer == None:104
+ # return 105
+ 106
# Stop ticker if playback has stopped.107
if (self.consumer.is_stopped() or self.producer.get_speed() == 0):108
self.ticker.stop_ticker()109
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/mlttransitions.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/mlttransitions.py
Changed
64
1
2
name, comp_type = fade3
name_for_type[comp_type] = name4
5
- # change this, tuples are not need we only need list of translatd names6
+ # Rendered transition names and types7
rendered_transitions = [ (_("Dissolve"), RENDERED_DISSOLVE), 8
(_("Wipe"), RENDERED_WIPE),9
(_("Color Dip"), RENDERED_COLOR_DIP),10
11
# Property args saved in propertyname -> propertyargs_string dict12
self.property_args = propertyparse.node_list_to_args_dict(p_node_list)13
14
- # Extra editors that handle properties that have been set "no_editor"15
+ # Extra editors handle properties that have been set "no_editor"16
e_node_list = compositor_node.getElementsByTagName(EXTRA_EDITOR)17
self.extra_editors = propertyparse.node_list_to_extraeditors_array(e_node_list) 18
19
20
self.mlt_transition.set("a_track", str(a_track))21
self.mlt_transition.set("b_track", str(b_track))22
23
-24
def set_target_track(self, a_track, force_track):25
self.a_track = a_track26
self.mlt_transition.set("a_track", str(a_track))27
28
self.name = None # ducktyping as clip for property editors29
self.selected = False30
self.origin_clip_id = None31
- 32
+ self.obey_autofollow = True33
+ 34
self.destroy_id = os.urandom(16) # HACK, HACK, HACK - find a way to remove this stuff 35
# Compositors are recreated often in Sequence.restack_compositors()36
# and cannot be destroyd in undo/redo with object identidy.37
38
39
# New from clip40
if orig_from.media_type != appconsts.PATTERN_PRODUCER:41
- from_clip = current_sequence.create_file_producer_clip(orig_from.path)# File producer42
+ from_clip = current_sequence.create_file_producer_clip(orig_from.path, None, False, orig_from.ttl)# File producer43
else:44
from_clip = current_sequence.create_pattern_producer(orig_from.create_data) # pattern producer45
current_sequence.clone_clip_and_filters(orig_from, from_clip)46
47
# New to clip48
if not(transition_type == RENDERED_FADE_IN or transition_type == RENDERED_FADE_OUT): # fades to not use to_clip49
if orig_to.media_type != appconsts.PATTERN_PRODUCER:50
- to_clip = current_sequence.create_file_producer_clip(orig_to.path)# File producer51
+ to_clip = current_sequence.create_file_producer_clip(orig_to.path, None, False, orig_to.ttl)# File producer52
else:53
to_clip = current_sequence.create_pattern_producer(orig_to.create_data) # pattern producer54
current_sequence.clone_clip_and_filters(orig_to, to_clip)55
56
from_clip.clip_in = 057
from_clip.clip_out = length58
59
- # Add clips to tracks and create keyframe string to contron mixing60
+ # Add clips to tracks and create keyframe string for mixing61
if transition_type == RENDERED_DISSOLVE or transition_type == RENDERED_WIPE:62
# Add clips. Images and pattern producers always fill full track.63
if from_clip.media_type != appconsts.IMAGE and from_clip.media_type != appconsts.PATTERN_PRODUCER:64
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/panels.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/panels.py
Changed
125
1
2
3
return (alignment, type_combo_box, length_entry, encodings_cb, quality_cb, wipe_luma_combo_box, color_button)4
5
+def get_transition_re_render_panel(trans_data):6
+ transition_length = trans_data["clip"] .clip_out - trans_data["clip"].clip_in + 1 # +1 out inclusive7
+ transition_length_label = Gtk.Label(label=_("Length:"))8
+ transition_length_value = Gtk.Label(label=str(transition_length))9
+ transition_length_row = get_two_column_box(transition_length_label, transition_length_value)10
+11
+ # Encoding widgets12
+ encodings_cb = Gtk.ComboBoxText()13
+ for encoding in renderconsumer.encoding_options:14
+ encodings_cb.append_text(encoding.name)15
+ encodings_cb.set_active(0)16
+17
+ quality_cb = Gtk.ComboBoxText()18
+ transition_widgets = (encodings_cb, quality_cb)19
+ encodings_cb.connect("changed", 20
+ lambda w,e: _transition_encoding_changed(transition_widgets), 21
+ None)22
+ _fill_transition_quality_combo_box(transition_widgets, 10)23
+ 24
+ _set_saved_encoding(transition_widgets)25
+26
+ transition_vbox = Gtk.VBox(False, 2)27
+ transition_vbox.pack_start(transition_length_row, False, False, 0)28
+ 29
+ enconding_vbox = Gtk.VBox(False, 2)30
+ enconding_vbox.pack_start(encodings_cb, False, False, 0)31
+ enconding_vbox.pack_start(quality_cb, False, False, 0)32
+ 33
+ vbox = Gtk.VBox(False, 2)34
+ vbox.pack_start(get_named_frame(_("Transition"), transition_vbox), True, True, 0)35
+ vbox.pack_start(get_named_frame(_("Encoding"), enconding_vbox), True, True, 0)36
+37
+ alignment = guiutils.set_margins(vbox, 12, 24, 12, 12)38
+ alignment.set_size_request(450, 200)39
+ 40
+ return (alignment, encodings_cb, quality_cb)41
+42
+def get_fade_re_render_panel(trans_data):43
+ fade_length = trans_data["clip"] .clip_out - trans_data["clip"].clip_in + 1 # +1 out inclusive44
+ fade_length_label = Gtk.Label(label=_("Length:"))45
+ fade_length_value = Gtk.Label(label=str(fade_length))46
+ fade_length_row = get_two_column_box(fade_length_label, fade_length_value)47
+48
+ # Encoding widgets49
+ encodings_cb = Gtk.ComboBoxText()50
+ for encoding in renderconsumer.encoding_options:51
+ encodings_cb.append_text(encoding.name)52
+ encodings_cb.set_active(0)53
+54
+ quality_cb = Gtk.ComboBoxText()55
+ transition_widgets = (encodings_cb, quality_cb)56
+ encodings_cb.connect("changed", 57
+ lambda w,e: _transition_encoding_changed(transition_widgets), 58
+ None)59
+ _fill_transition_quality_combo_box(transition_widgets, 10)60
+ 61
+ _set_saved_encoding(transition_widgets)62
+63
+ fade_vbox = Gtk.VBox(False, 2)64
+ fade_vbox.pack_start(fade_length_row, False, False, 0)65
+ 66
+ enconding_vbox = Gtk.VBox(False, 2)67
+ enconding_vbox.pack_start(encodings_cb, False, False, 0)68
+ enconding_vbox.pack_start(quality_cb, False, False, 0)69
+ 70
+ vbox = Gtk.VBox(False, 2)71
+ vbox.pack_start(get_named_frame(_("Fade"), fade_vbox), True, True, 0)72
+ vbox.pack_start(get_named_frame(_("Encoding"), enconding_vbox), True, True, 0)73
+74
+ alignment = guiutils.set_margins(vbox, 12, 24, 12, 12)75
+ alignment.set_size_request(450, 200)76
+ 77
+ return (alignment, encodings_cb, quality_cb)78
+79
+def get_re_render_all_panel(rerender_list, unrenderable):80
+ rerendercount_label = Gtk.Label(label=_("Transitions / Fades to be rerendered:"))81
+ rerendercount_value = Gtk.Label(label=str(len(rerender_list)))82
+ rerendercount_row = get_two_column_box(rerendercount_label, rerendercount_value)83
+ 84
+ if unrenderable > 0:85
+ unrenderable_info = _("There are ") + str(unrenderable) + _(" Transitions / Fades that cannot be rerendered, either because they are\ncreated with Flowblade version <=1.14 or the source clips are no longer on timeline.")86
+ unrenderable_info_label = Gtk.Label(unrenderable_info)87
+ 88
+ info_vbox = Gtk.VBox(False, 2)89
+ info_vbox.pack_start(rerendercount_row, False, False, 0)90
+ if unrenderable > 0:91
+ info_vbox.pack_start(guiutils.pad_label(12,12), False, False, 0)92
+ info_vbox.pack_start(unrenderable_info_label, False, False, 0)93
+ 94
+ # Encoding widgets95
+ encodings_cb = Gtk.ComboBoxText()96
+ for encoding in renderconsumer.encoding_options:97
+ encodings_cb.append_text(encoding.name)98
+ encodings_cb.set_active(0)99
+100
+ quality_cb = Gtk.ComboBoxText()101
+ transition_widgets = (encodings_cb, quality_cb)102
+ encodings_cb.connect("changed", 103
+ lambda w,e: _transition_encoding_changed(transition_widgets), 104
+ None)105
+ _fill_transition_quality_combo_box(transition_widgets, 10)106
+ 107
+ _set_saved_encoding(transition_widgets)108
+ 109
+ enconding_vbox = Gtk.VBox(False, 2)110
+ enconding_vbox.pack_start(encodings_cb, False, False, 0)111
+ enconding_vbox.pack_start(quality_cb, False, False, 0)112
+ 113
+ vbox = Gtk.VBox(False, 2)114
+ vbox.pack_start(get_named_frame(_("Info"), info_vbox), True, True, 0)115
+ vbox.pack_start(get_named_frame(_("Encoding"), enconding_vbox), True, True, 0)116
+117
+ alignment = guiutils.set_margins(vbox, 12, 24, 12, 12)118
+ alignment.set_size_request(450, 120)119
+ 120
+ return (alignment, encodings_cb, quality_cb)121
+ 122
def get_fade_panel(fade_data):123
type_combo_box = Gtk.ComboBoxText() 124
type_combo_box.append_text(_("Fade In"))125
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/persistance.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/persistance.py
Changed
179
1
2
from gi.repository import Gdk3
4
import appconsts5
+import atomicfile6
import editorstate7
import editorpersistance8
import mltprofiles9
10
"""11
Creates pickleable project object12
"""13
- print "Save project " + os.path.basename(file_path)14
+ print "Saving project..." # + os.path.basename(file_path)15
16
# Get shallow copy17
s_proj = copy.copy(project)18
19
s_proj.profile_desc = changed_profile_desc20
_xml_new_paths_for_profile_change = {} # dict acts also as a flag to show that profile change save is happening21
new_profile = mltprofiles.get_profile(changed_profile_desc)22
- print "Saving changed profile project: ", changed_profile_desc23
- print "FPS conversion multiplier:", _fps_conv_mult24
+ #print "Saving changed profile project: ", changed_profile_desc25
+ #print "FPS conversion multiplier:", _fps_conv_mult26
else:27
_xml_new_paths_for_profile_change = None # None value acts also as a flag to show that profile change save is _not_ happening28
29
30
new_xml_file_path = _save_changed_xml_file(s_media_file, new_profile)31
_xml_new_paths_for_profile_change[s_media_file.path] = new_xml_file_path32
s_media_file.path = new_xml_file_path33
- print "XML path replace for media:", s_media_file.path, new_xml_file_path34
+ #print "XML path replace for media:", s_media_file.path, new_xml_file_path35
36
# Remove unpicleable attrs37
remove_attrs(s_media_file, MEDIA_FILE_REMOVE)38
39
remove_attrs(s_proj, PROJECT_REMOVE)40
41
# Write out file.42
- write_file = file(file_path, "wb")43
- pickle.dump(s_proj, write_file)44
+ with atomicfile.AtomicFileWriter(file_path, "wb") as afw:45
+ write_file = afw.get_file()46
+ pickle.dump(s_proj, write_file)47
48
def get_p_sequence(sequence):49
"""50
51
if _xml_new_paths_for_profile_change != None and hasattr(s_clip, "path") and s_clip.path != None and utils.is_mlt_xml_file(s_clip.path) == True:52
try:53
new_path = _xml_new_paths_for_profile_change[s_clip.path]54
- print "XML path replace for clip:", s_clip.path, new_path55
+ #print "XML path replace for clip:", s_clip.path, new_path56
s_clip.path = new_path57
except:58
# Something is really wrong, this should not be possible59
- print "Failed to find a new XML file for path:", s_clip.path60
+ # print "Failed to find a new XML file for path:", s_clip.path61
+ pass 62
63
# Set 'type' attribute for MLT object type64
# This IS NOT USED anywhere anymore and should be removed.65
66
uuid_str = md5.new(str(os.urandom(32))).hexdigest()67
new_xml_file_path = folder + "/"+ uuid_str + ".xml"68
69
- new_xml_file = open(new_xml_file_path, "w")70
- new_xml_file.write(new_xml_text)71
- new_xml_file.close()72
+ with atomicfile.AtomicFileWriter(new_xml_file_path, "w") as afw:73
+ new_xml_file = afw.get_file()74
+ new_xml_file.write(new_xml_text)75
76
return new_xml_file_path77
78
79
80
# Add MLT objects to sequences.81
global all_clips, sync_clips82
+ seq_count = 183
for seq in project.sequences:84
FIX_N_TO_3_SEQUENCE_COMPATIBILITY(seq)85
- _show_msg(_("Building sequence ") + seq.name)86
+ _show_msg(_("Building sequence ") + str(seq_count))87
all_clips = {}88
sync_clips = []89
90
91
if not hasattr(seq, "seq_len"):92
seq.update_edit_tracks_length()93
94
+ seq_count = seq_count + 195
+96
all_clips = {}97
sync_clips = []98
99
100
# This attr was added for 1.8. It is not computed for older projects.101
if (not hasattr(media_file, "info")):102
media_file.info = None103
- 104
+ # We need this in all media files, used only by img seq media105
+ if not hasattr(media_file, "ttl"):106
+ media_file.ttl = None107
+ 108
if(not hasattr(project, "update_media_lengths_on_load")):109
project.update_media_lengths_on_load = True # old projects < 1.10 had wrong media length data which just was never used.110
# 1.10 needed that data for the first time and required recreating it correctly for older projects111
112
# Keeping backwards compability113
if SAVEFILE_VERSION < 3:114
FIX_N_TO_3_COMPOSITOR_COMPABILITY(py_compositor, SAVEFILE_VERSION)115
- 116
+ if not hasattr(py_compositor, "obey_autofollow"): # "obey_autofollow" attr was added for 1.16117
+ py_compositor.obey_autofollow = True118
+ 119
# Create new compositor object120
compositor = mlttransitions.create_compositor(py_compositor.type_id) 121
compositor.create_mlt_objects(seq.profile)122
123
compositor.transition.set_tracks(py_compositor.transition.a_track, py_compositor.transition.b_track)124
compositor.set_in_and_out(py_compositor.clip_in, py_compositor.clip_out)125
compositor.origin_clip_id = py_compositor.origin_clip_id126
+ compositor.obey_autofollow = py_compositor.obey_autofollow127
128
mlt_compositors.append(compositor)129
130
131
# Add color attribute if not found132
if not hasattr(clip, "color"):133
clip.color = None134
+ 135
+ # Add markers list if not found136
+ if not hasattr(clip, "markers"):137
+ clip.markers = []138
139
+ # Add img seq ttl value for all clips if not found, we need this present in every clip so we test for 'clip.ttl == None' to get stuff working140
+ if not hasattr(clip, "ttl"):141
+ clip.ttl = None142
+ 143
# normal clip144
if (clip.is_blanck_clip == False and (clip.media_type != appconsts.PATTERN_PRODUCER)):145
orig_path = clip.path # Save the path for error message146
147
else:148
clip.path = get_img_seq_media_path(clip.path, _load_file_path)149
150
- mlt_clip = sequence.create_file_producer_clip(clip.path)151
+ mlt_clip = sequence.create_file_producer_clip(clip.path, None, False, clip.ttl)152
+ 153
if mlt_clip == None:154
raise FileProducerNotFoundError(orig_path)155
mlt_clip.__dict__.update(clip.__dict__)156
157
for filename in fnmatch.filter(filenames, asset_file_name):158
matches.append(os.path.join(root, filename))159
if len(matches) == 1:160
- print "relative path for: ", asset_file_name161
+ #print "relative path for: ", asset_file_name162
return matches[0]163
elif len(matches) > 1:164
# some error handling may be needed?165
- print "relative path for: ", asset_file_name166
+ #print "relative path for: ", asset_file_name167
return matches[0]168
else:169
return NOT_FOUND # no relative path found170
171
look_up_path = root + "/" + look_up_file_name172
listing = glob.glob(look_up_path)173
if len(listing) > 0:174
- print "relative path for: ", asset_file_name175
+ #print "relative path for: ", asset_file_name176
return root + "/" + asset_file_name177
178
return NOT_FOUND # no relative path found179
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py
Changed
156
1
2
3
gen_opts_panel, gen_opts_widgets = _general_options_panel(_thumbs_select_clicked, _renders_select_clicked)4
edit_prefs_panel, edit_prefs_widgets = _edit_prefs_panel()5
+ playback_prefs_panel, playback_prefs_widgets = _playback_prefs_panel()6
view_pres_panel, view_pref_widgets = _view_prefs_panel()7
# Jan-2017 - SvdB8
performance_panel, performance_widgets = _performance_panel()9
10
notebook.set_size_request(PREFERENCES_WIDTH, PREFERENCES_HEIGHT)11
notebook.append_page(gen_opts_panel, Gtk.Label(label=_("General")))12
notebook.append_page(edit_prefs_panel, Gtk.Label(label=_("Editing")))13
+ notebook.append_page(playback_prefs_panel, Gtk.Label(label=_("Playback")))14
notebook.append_page(view_pres_panel, Gtk.Label(label=_("View")))15
notebook.append_page(performance_panel, Gtk.Label(label=_("Performance")))16
#notebook.append_page(shortcuts_panel, Gtk.Label(label=_("Shortcuts")))17
guiutils.set_margins(notebook, 4, 24, 6, 0)18
19
- dialog.connect('response', _preferences_dialog_callback, (gen_opts_widgets, edit_prefs_widgets, view_pref_widgets, \20
+ dialog.connect('response', _preferences_dialog_callback, (gen_opts_widgets, edit_prefs_widgets, playback_prefs_widgets, view_pref_widgets, \21
performance_widgets))22
dialog.vbox.pack_start(notebook, True, True, 0)23
dialogutils.set_outer_margins(dialog.vbox)24
25
prefs = editorpersistance.prefs26
27
# Widgets28
- auto_play_in_clip_monitor = Gtk.CheckButton()29
- auto_play_in_clip_monitor.set_active(prefs.auto_play_in_clip_monitor)30
-31
- auto_center_on_stop = Gtk.CheckButton()32
- auto_center_on_stop.set_active(prefs.auto_center_on_play_stop)33
-34
spin_adj = Gtk.Adjustment(prefs.default_grfx_length, 1, 15000, 1)35
gfx_length_spin = Gtk.SpinButton()36
gfx_length_spin.set_adjustment(spin_adj)37
38
cover_delete = Gtk.CheckButton()39
cover_delete.set_active(prefs.trans_cover_delete)40
41
- # Jul-2016 - SvdB - For play_pause button42
- play_pause_button = Gtk.CheckButton()43
- # The following test is to make sure play_pause can be used for the initial value. If not found, then leave uninitialized44
- if hasattr(prefs, 'play_pause'):45
- play_pause_button.set_active(prefs.play_pause) 46
- 47
active = 048
if prefs.mouse_scroll_action_is_zoom == False:49
active = 150
51
hide_file_ext_button = Gtk.CheckButton()52
if hasattr(prefs, 'hide_file_ext'):53
hide_file_ext_button.set_active(prefs.hide_file_ext)54
+ 55
+ # Layout56
+ row4 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Graphics default length:")), gfx_length_spin, PREFERENCES_LEFT))57
+ row5 = _row(guiutils.get_checkbox_row_box(trim_exit_on_empty, Gtk.Label(label=_("Trim Modes exit on empty click"))))58
+ row6 = _row(guiutils.get_checkbox_row_box(quick_enter_trim, Gtk.Label(label=_("Quick enter Trim Modes"))))59
+ row7 = _row(guiutils.get_checkbox_row_box(remember_clip_frame, Gtk.Label(label=_("Remember Monitor Clip Frame"))))60
+ row8 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Media drag'n'drop action on non-V1 tracks")), overwrite_clip_drop, PREFERENCES_LEFT))61
+ row9 = _row(guiutils.get_checkbox_row_box(cover_delete, Gtk.Label(label=_("Cover Transition/Fade clips on delete if possible"))))62
+ # Jul-2016 - SvdB - For play_pause button63
+ row11 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Mouse Middle Button Scroll Action")), mouse_scroll_action, PREFERENCES_LEFT))64
+ row12 = _row(guiutils.get_checkbox_row_box(hide_file_ext_button, Gtk.Label(label=_("Hide file extensions when importing Clips"))))65
+ # Apr-2017 - SvdB - For Fast Forward / Reverse options66
+ 67
+ vbox = Gtk.VBox(False, 2)68
+ vbox.pack_start(row5, False, False, 0)69
+ vbox.pack_start(row6, False, False, 0)70
+ vbox.pack_start(row4, False, False, 0)71
+ vbox.pack_start(row7, False, False, 0)72
+ vbox.pack_start(row9, False, False, 0)73
+ vbox.pack_start(row8, False, False, 0)74
+ vbox.pack_start(row11, False, False, 0)75
+ vbox.pack_start(row12, False, False, 0)76
+ vbox.pack_start(Gtk.Label(), True, True, 0)77
+78
+ guiutils.set_margins(vbox, 12, 0, 12, 12)79
+80
+ # Jul-2016 - SvdB - Added play_pause_button81
+ # Apr-2017 - SvdB - Added ffwd / rev values82
+ return vbox, (gfx_length_spin, trim_exit_on_empty, quick_enter_trim, remember_clip_frame, overwrite_clip_drop, cover_delete,83
+ mouse_scroll_action, hide_file_ext_button)84
+85
+def _playback_prefs_panel():86
+ prefs = editorpersistance.prefs87
+88
+ # Widgets89
+ auto_play_in_clip_monitor = Gtk.CheckButton()90
+ auto_play_in_clip_monitor.set_active(prefs.auto_play_in_clip_monitor)91
92
+ auto_center_on_stop = Gtk.CheckButton()93
+ auto_center_on_stop.set_active(prefs.auto_center_on_play_stop)94
+ 95
+ # Jul-2016 - SvdB - For play_pause button96
+ play_pause_button = Gtk.CheckButton()97
+ # The following test is to make sure play_pause can be used for the initial value. If not found, then leave uninitialized98
+ if hasattr(prefs, 'play_pause'):99
+ play_pause_button.set_active(prefs.play_pause) 100
+ 101
auto_center_on_updown = Gtk.CheckButton()102
auto_center_on_updown.set_active(prefs.center_on_arrow_move)103
104
105
row1 = _row(guiutils.get_checkbox_row_box(auto_play_in_clip_monitor, Gtk.Label(label=_("Autoplay new Clips in Clip Monitor"))))106
row2 = _row(guiutils.get_checkbox_row_box(auto_center_on_stop, Gtk.Label(label=_("Center Current Frame on Playback Stop"))))107
row13 = _row(guiutils.get_checkbox_row_box(auto_center_on_updown, Gtk.Label(label=_("Center Current Frame after Up/Down Arrow"))))108
- row4 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Graphics default length:")), gfx_length_spin, PREFERENCES_LEFT))109
- row5 = _row(guiutils.get_checkbox_row_box(trim_exit_on_empty, Gtk.Label(label=_("Trim Modes exit on empty click"))))110
- row6 = _row(guiutils.get_checkbox_row_box(quick_enter_trim, Gtk.Label(label=_("Quick enter Trim Modes"))))111
- row7 = _row(guiutils.get_checkbox_row_box(remember_clip_frame, Gtk.Label(label=_("Remember Monitor Clip Frame"))))112
- row8 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Media drag'n'drop action on non-V1 tracks")), overwrite_clip_drop, PREFERENCES_LEFT))113
- row9 = _row(guiutils.get_checkbox_row_box(cover_delete, Gtk.Label(label=_("Cover Transition/Fade clips on delete if possible"))))114
# Jul-2016 - SvdB - For play_pause button115
row10 = _row(guiutils.get_checkbox_row_box(play_pause_button, Gtk.Label(label=_("Enable single Play/Pause button"))))116
- row11 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Mouse Middle Button Scroll Action")), mouse_scroll_action, PREFERENCES_LEFT))117
- row12 = _row(guiutils.get_checkbox_row_box(hide_file_ext_button, Gtk.Label(label=_("Hide file extensions when importing Clips"))))118
# Apr-2017 - SvdB - For Fast Forward / Reverse options119
row14 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Fast Forward / Reverse Speed for Shift Key:")), ffwd_rev_shift_spin, PREFERENCES_LEFT))120
row14.set_tooltip_text(_("Speed of Forward / Reverse will be multiplied by this value if Shift Key is held (Only using KEYS).\n" \121
122
row16.set_tooltip_text(_("Speed of Forward / Reverse will be multiplied by this value if Caps Lock is set (Only using KEYS)."))123
124
vbox = Gtk.VBox(False, 2)125
- vbox.pack_start(row5, False, False, 0)126
- vbox.pack_start(row6, False, False, 0)127
vbox.pack_start(row1, False, False, 0)128
vbox.pack_start(row2, False, False, 0)129
vbox.pack_start(row13, False, False, 0)130
- vbox.pack_start(row4, False, False, 0)131
- vbox.pack_start(row7, False, False, 0)132
- vbox.pack_start(row8, False, False, 0)133
- vbox.pack_start(row9, False, False, 0)134
# Jul-2016 - SvdB - For play_pause button135
vbox.pack_start(row10, False, False, 0)136
- vbox.pack_start(row11, False, False, 0)137
- vbox.pack_start(row12, False, False, 0)138
# Apr-2017 - SvdB - For ffwd / rev speed139
vbox.pack_start(row14, False, False, 0)140
vbox.pack_start(row15, False, False, 0)141
142
143
# Jul-2016 - SvdB - Added play_pause_button144
# Apr-2017 - SvdB - Added ffwd / rev values145
- return vbox, (auto_play_in_clip_monitor, auto_center_on_stop, gfx_length_spin,146
- trim_exit_on_empty, quick_enter_trim, remember_clip_frame, overwrite_clip_drop, cover_delete,147
- play_pause_button, mouse_scroll_action, hide_file_ext_button, auto_center_on_updown,148
+ return vbox, (auto_play_in_clip_monitor, auto_center_on_stop, 149
+ play_pause_button, auto_center_on_updown,150
ffwd_rev_shift_spin, ffwd_rev_ctrl_spin, ffwd_rev_caps_spin)151
-152
+ 153
def _view_prefs_panel():154
prefs = editorpersistance.prefs155
156
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/projectaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/projectaction.py
Changed
68
1
2
if len(duplicates) > MAX_DISPLAYED_ITEMS:3
secondary_txt = secondary_txt + "\n" + "and " + str(len(duplicates) - MAX_DISPLAYED_ITEMS) + " other items.\n"4
5
- secondary_txt = secondary_txt + "\nNo duplicate media items were added to project."6
+ secondary_txt = secondary_txt + _("\nNo duplicate media items were added to project.")7
8
dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)9
return False10
11
else:12
dialog.destroy()13
14
-""" Feature disabled, maybe reactivated later15
-def change_profile_to_match_media(media_file):16
- dialogs.change_profile_project_to_match_media_dialog(PROJECT(), media_file, _change_project_profile_to_match_media_callback)17
-18
-def _change_project_profile_to_match_media_callback(dialog, response_id, match_profile_index, out_folder, project_name_entry):19
- if response_id == Gtk.ResponseType.ACCEPT:20
- folder = "/" + out_folder.get_uri().lstrip("file:/")21
- name = project_name_entry.get_text()22
- profile = mltprofiles.get_profile_for_index(match_profile_index)23
- path = folder + "/" + name24
- 25
- PROJECT().update_media_lengths_on_load = True # saved version needs to do this26
- 27
- persistance.save_project(PROJECT(), path, profile.description()) #<----- HERE28
-29
- PROJECT().update_media_lengths_on_load = False30
-31
- dialog.destroy()32
- else:33
- dialog.destroy()34
-"""35
36
class SnaphotSaveThread(threading.Thread):37
38
39
40
file_chooser, spin = data41
frame_file = file_chooser.get_filename()42
- dialog.destroy()43
+ ttl = int(spin.get_value())44
45
if frame_file == None:46
dialogutils.info_message(_("No file was selected"), _("Select a numbered file to add an Image Sequence to Project."), gui.editor_window.window)47
48
dialog.destroy()49
50
resource_path = folder + "/" + resource_name_str51
- length = highest_number_part - int(number_part)52
+ length = (highest_number_part - int(number_part)) * ttl53
54
- PROJECT().add_image_sequence_media_object(resource_path, file_name + "(img_seq)", length)55
+ PROJECT().add_image_sequence_media_object(resource_path, file_name + "(img_seq)", length, ttl)56
57
gui.media_list_view.fill_data_model()58
gui.bin_list_view.fill_data_model()59
60
61
def _display_file_info(media_file):62
# get info63
- clip = current_sequence().create_file_producer_clip(media_file.path)64
+ clip = current_sequence().create_file_producer_clip(media_file.path, None, False, media_file.ttl)65
info = utils.get_file_producer_info(clip)66
67
width = info["width"]68
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/projectdata.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/projectdata.py
Changed
56
1
2
3
thumbnailer = None4
5
-_project_properties_default_values = {appconsts.P_PROP_TLINE_SHRINK_VERTICAL:False,6
- appconsts.P_PROP_DISSOLVE_GROUP_FADE_IN:-1,7
- appconsts.P_PROP_DISSOLVE_GROUP_FADE_OUT:-1,8
- appconsts.P_PROP_ANIM_GROUP_FADE_IN:-1,9
- appconsts.P_PROP_ANIM_GROUP_FADE_OUT:-1,10
- appconsts.P_PROP_LAST_RENDER_SELECTIONS: None,11
- appconsts.P_PROP_TRANSITION_ENCODING: None}12
+_project_properties_default_values = {appconsts.P_PROP_TLINE_SHRINK_VERTICAL:False, # Shink timeline max height if < 9 tracks13
+ appconsts.P_PROP_DISSOLVE_GROUP_FADE_IN:-1, # not used, dropped feature (auto fades on creation)14
+ appconsts.P_PROP_DISSOLVE_GROUP_FADE_OUT:-1, # not used, dropped feature (auto fades on creation)15
+ appconsts.P_PROP_ANIM_GROUP_FADE_IN:-1, # not used, dropped feature (auto fades on creation)16
+ appconsts.P_PROP_ANIM_GROUP_FADE_OUT:-1, # not used, dropped feature (auto fades on creation)17
+ appconsts.P_PROP_LAST_RENDER_SELECTIONS: None, # tuple for last render selections data18
+ appconsts.P_PROP_TRANSITION_ENCODING: None, # tuple for last renderered transition render selections data19
+ appconsts.P_PROP_AUTO_FOLLOW: False} # Global compositor auto follow20
21
class Project:22
"""23
24
thumbnailer = Thumbnailer()25
thumbnailer.set_context(self.profile)26
27
- def add_image_sequence_media_object(self, resource_path, name, length):28
+ def add_image_sequence_media_object(self, resource_path, name, length, ttl):29
+ print resource_path30
media_object = self.add_media_file(resource_path)31
media_object.length = length32
media_object.name = name33
+ media_object.ttl = ttl34
35
def add_media_file(self, file_path, compound_clip_name=None):36
"""37
38
# Create media file object39
media_object = MediaFile(self.next_media_file_id, file_path, 40
clip_name, media_type, length, icon_path, info)41
+ media_object.ttl = None42
43
self._add_media_object(media_object)44
45
46
except:47
return None # No default values for all properties exist, action value decided at callsite in that case48
49
- def set_project_property(self, key, value):50
- self.project_properties[key] = value51
+ def set_project_property(self, property_name, value):52
+ self.project_properties[property_name] = value53
54
55
class MediaFile:56
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/proxyediting.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/proxyediting.py
Changed
34
1
2
if is_proxy_file > 0:3
text = _("You are trying to create proxies for ") + str(not_video_files) + _(" proxy file(s).\n")4
rows = rows + self.issues_str() + text5
- issues_box = dialogutils.get_warning_message_dialog_panel("There are some issues with proxy render request", 6
+ issues_box = dialogutils.get_warning_message_dialog_panel(_("There are some issues with proxy render request"), 7
rows,8
True)9
+ 10
+ proxy_mode = editorstate.PROJECT().proxy_data.proxy_mode11
+ if proxy_mode == appconsts.USE_PROXY_MEDIA:12
+ info_label = Gtk.Label(_("<b>Rerendering proxies currently not possible!</b>\nChange to 'Use Original Media' mode to rerender proxies."))13
+ info_label.set_use_markup(True)14
+ info_row = guiutils.get_left_justified_box([guiutils.get_pad_label(24, 10), info_label])15
+16
self.action_select = Gtk.ComboBoxText()17
18
self.action_select.append_text(_("Render Unrendered Possible & Use existing"))19
- self.action_select.append_text(_("Rerender All Possible" ))20
+ if proxy_mode != appconsts.USE_PROXY_MEDIA:21
+ self.action_select.append_text(_("Rerender All Possible" ))22
self.action_select.set_active(0)23
+ 24
action_row = guiutils.get_left_justified_box([guiutils.get_pad_label(24, 10), Gtk.Label(label=_("Select Render Action: ")), self.action_select])25
26
info_box = Gtk.VBox()27
info_box.pack_start(issues_box, False, False, 0)28
+ if proxy_mode == appconsts.USE_PROXY_MEDIA:29
+ info_box.pack_start(info_row, False, False, 0)30
+ info_box.pack_start(guiutils.get_pad_label(12, 24), False, False, 0)31
info_box.pack_start(action_row, False, False, 0)32
33
guiutils.set_margins(info_box, 12, 48, 12, 0)34
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/render.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/render.py
Changed
49
1
2
_preset_selection_changed()3
widgets.args_panel.opts_save_button.set_sensitive(False)4
widgets.args_panel.opts_load_button.set_sensitive(False)5
- widgets.args_panel.load_selection_button.set_sensitive(False)6
- widgets.args_panel.opts_view.set_sensitive(False)7
- widgets.args_panel.opts_view.get_buffer().set_text("")8
+ if editorstate.screen_size_small_height() == False:9
+ widgets.args_panel.load_selection_button.set_sensitive(False)10
+ widgets.args_panel.opts_view.set_sensitive(False)11
+ widgets.args_panel.opts_view.get_buffer().set_text("")12
13
def _out_profile_changed():14
selected_index = widgets.profile_panel.out_profile_combo.widget.get_active()15
16
if media_file.is_proxy_file == True:17
source_path = media_file.second_file_path18
19
- fr_path = "framebuffer:" + source_path + "?" + str(speed)20
- motion_producer = mlt.Producer(profile, None, str(fr_path))21
+ motion_producer = mlt.Producer(profile, None, str("timewarp:" + str(speed) + ":" + str(source_path)))22
+ if motion_producer.is_valid() == False:23
+ print "Using framebuffer producer, no sound."24
+ fr_path = "framebuffer:" + source_path + "?" + str(speed)25
+ motion_producer = mlt.Producer(profile, None, str(fr_path))26
+ else:27
+ print "Using timewarp producer, sound available."28
mltrefhold.hold_ref(motion_producer)29
30
# Create sequence and add motion producer into it31
32
track = seq.tracks[seq.first_video_index]33
track.append(motion_producer, 0, motion_producer.get_length() - 1)34
35
- print "motion clip render starting..."36
+ print "Motion clip render starting..."37
38
consumer = renderconsumer.get_render_consumer_for_encoding_and_quality(write_file, profile, encoding_option_index, quality_option_index)39
40
41
end_frame = transition_producer.get_length() - 142
43
# Launch render44
- # TODO: fix naming this isn't motion renderer45
+ # TODO: fix naming, this isn't motion renderer46
global motion_renderer, motion_progress_update47
motion_renderer = renderconsumer.FileRenderPlayer(write_file, transition_producer, consumer, start_frame, end_frame)48
motion_renderer.start()49
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/rendergui.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/rendergui.py
Changed
10
1
2
3
# ------------------------------------------------------------ panels4
def get_render_panel_left(render_widgets):5
- small_height = (editorstate.SCREEN_HEIGHT < 898)6
+ small_height = editorstate.screen_size_small_height()7
8
file_opts_panel = guiutils.get_named_frame(_("File"), render_widgets.file_panel.vbox, 4) 9
profile_panel = guiutils.get_named_frame(_("Render Profile"), render_widgets.profile_panel.vbox, 4)10
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/clip_marker.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_drag_left.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_drag_right.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_sideways.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_trim_left.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_trim_right.png
Added
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png
Changed
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/hamburger_big.png
Added
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_active.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_not_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_not_active.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_noedit_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_noedit_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_noedit_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/filters/compositors.xml -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/filters/compositors.xml
Changed
9
1
2
<property name="resource" args="editor=wipe_select exptype=wipe_resource displayname=Wipe!Type">WIPE_PATHbi-linear_y.pgm</property>3
<property name="invert" args="editor=booleancheckbox displayname=Invert">0</property>4
<property name="softness" args="range_in=0,100 displayname=Softness">0.0</property>5
+ <property name="reverse" args="editor=combobox exptype=default cbopts=Forward:0,Backward:1 displayname=Wipe!Direction">0</property>6
</compositortransition>7
<compositortransition mlt_service="region">8
<name>##region</name>9
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/gmic/gmic2scripts.xml
Added
201
1
2
+<gmic>3
+ 4
+ <gmicscript>5
+ <name>Charcoal</name>6
+ <group>Black and White</group>7
+ <script>-fx_charcoal 65,70,170,0,1,0,50,70,255,255,255,0,0,0,0,0</script>8
+ </gmicscript>9
+ 10
+ <gmicscript>11
+ <name>Glow 2</name>12
+ <group>Glow</group>13
+ <script>-glow 10%</script>14
+ </gmicscript>15
+16
+ <gmicscript>17
+ <name>Pencil Portrait</name>18
+ <group>Drawing</group>19
+ <script>-fx_pencil_portraitbw 30,120,1,0.5,144,79,21,0</script>20
+ </gmicscript>21
+22
+ <gmicscript>23
+ <name>Ink Wash</name>24
+ <group>Black and White</group>25
+ <script>-fx_ink_wash 0.14,23,0,0.5,0.54,2.25,0,2,6,5,20</script>26
+ </gmicscript>27
+28
+ <gmicscript>29
+ <name>Dither BW</name>30
+ <group>Black and White</group>31
+ <script>-ditheredbw</script>32
+ </gmicscript>33
+ 34
+ <gmicscript>35
+ <name>Angular Blur</name>36
+ <group>Blur</group>37
+ <script>-blur_angular 10</script>38
+ </gmicscript>39
+40
+ <gmicscript>41
+ <name>Rodilius</name>42
+ <group>Glow</group>43
+ <script>-rodilius 20,5,200,17,2,1</script>44
+ </gmicscript>45
+46
+ <gmicscript>47
+ <name>Cartoon</name>48
+ <group>Painting</group>49
+ <script>-cartoon 3,200,20,0.25,1.5,8,0</script>50
+ </gmicscript>51
+ 52
+ <gmicscript>53
+ <name>Circlism</name>54
+ <group>Painting</group>55
+ <script>-fx_circle_abstraction 8,5,0.8,0,1,1,1,0</script>56
+ </gmicscript>57
+58
+ <gmicscript>59
+ <name>Poster Hope</name>60
+ <group>Painting</group>61
+ <script>-fx_poster_hope 0,3,0</script>62
+ </gmicscript>63
+64
+ <gmicscript>65
+ <name>Polygonize</name>66
+ <group>Geometric</group>67
+ <script>-fx_polygonize 300,10,10,10,10,0,0,0,255,0</script>68
+ </gmicscript>69
+70
+ <gmicscript>71
+ <name>Pen Drawing</name>72
+ <group>Drawing</group>73
+ <script>-fx_pen_drawing 10,0</script>74
+ </gmicscript>75
+76
+ <gmicscript>77
+ <name>Feltpen</name>78
+ <group>Drawing</group>79
+ <script>-fx_feltpen 300,50,1,0.1,20,5,0</script>80
+ </gmicscript>81
+82
+ <gmicscript>83
+ <name>Fractalize</name>84
+ <group>Special Effect</group>85
+ <script>-fractalize 0.8</script>86
+ </gmicscript>87
+88
+ <gmicscript>89
+ <name>Rotate Tiles</name>90
+ <group>Transform</group>91
+ <script>-fx_rotate_tiles 5,5,15,3,3,1.8</script>92
+ </gmicscript>93
+94
+ <gmicscript>95
+ <name>Shift Tiles</name>96
+ <group>Transform</group>97
+ <script>-fx_shift_tiles 10,10,10,1</script>98
+ </gmicscript>99
+ 100
+ <gmicscript>101
+ <name>Imagegrid</name>102
+ <group>Transform</group>103
+ <script>-fx_imagegrid 10,10</script>104
+ </gmicscript>105
+106
+ <gmicscript>107
+ <name>Whirl</name>108
+ <group>Artistic</group>109
+ <script>-draw_whirl 20,0</script>110
+ </gmicscript>111
+112
+ <gmicscript>113
+ <name>Warhol</name>114
+ <group>Painting</group>115
+ <script>-warhol 3,3,2,40</script>116
+ </gmicscript>117
+ 118
+ <gmicscript>119
+ <name>Shapeism</name>120
+ <group>Geometric</group>121
+ <script>-fx_shapeism 2,7,0.38,0,1,5,32,8,3,1,5,0.5,1,0,0,0,255</script>122
+ </gmicscript>123
+124
+ <gmicscript>125
+ <name>Poster Edges</name>126
+ <group>Edges</group>127
+ <script>-fx_poster_edges 20,60,5,0,10,0,0,0</script>128
+ </gmicscript>129
+130
+ <gmicscript>131
+ <name>Delaunay</name>132
+ <group>Geometric</group>133
+ <script>-fx_delaunay 5,75,1,3,0,0,0,128,1,1,0</script>134
+ </gmicscript>135
+136
+ <gmicscript>137
+ <name>Painting</name>138
+ <group>Painting</group>139
+ <script>-fx_painting 5,2.5,1.5,50,1,0</script>140
+ </gmicscript>141
+142
+ <gmicscript>143
+ <name>Lylejk</name>144
+ <group>Painting</group>145
+ <script>-fx_lylejk_painting 10,2,4,10,0</script>146
+ </gmicscript>147
+148
+ <gmicscript>149
+ <name>Kuwahara</name>150
+ <group>Painting</group>151
+ <script>-fx_kuwahara 2,5,0,0,0</script>152
+ </gmicscript>153
+154
+ <gmicscript>155
+ <name>Color Abstraction</name>156
+ <group>Painting</group>157
+ <script>-fx_color_abstraction 1,10,0.2,0</script>158
+ </gmicscript>159
+160
+ <gmicscript>161
+ <name>Stamp</name>162
+ <group>Black and White</group>163
+ <script>-fx_stamp 1,50,0,0,0,0,1,0</script>164
+ </gmicscript>165
+166
+ <gmicscript>167
+ <name>Sketch</name>168
+ <group>Drawing</group>169
+ <script>-fx_sketchbw 2,45,180,30,1,0.03,0,0.6,0.1,0.6,0.25,1,0,1,0,0</script>170
+ </gmicscript>171
+172
+ <gmicscript>173
+ <name>PencilBW</name>174
+ <group>Black and White</group>175
+ <script>-fx_pencilbw 0.3,60,0,0,0</script>176
+ </gmicscript>177
+178
+ <gmicscript>179
+ <name>Hough Sketch</name>180
+ <group>Black and White</group>181
+ <script>-fx_houghsketchbw 1.25,10,5,80,0.1,0,0</script>182
+ </gmicscript>183
+184
+ <gmicscript>185
+ <name>Hard Sketch</name>186
+ <group>Drawing</group>187
+ <script>-fx_hardsketchbw 300,50,1,0.1,20,0,0,0</script>188
+ </gmicscript>189
+190
+ <gmicscript>191
+ <name>Engrave</name>192
+ <group>Black and White</group>193
+ <script>-fx_engrave 0.5,50,0,8,40,0,0,0,10,1,0,0,0,1,0</script>194
+ </gmicscript>195
+196
+ <gmicscript>197
+ <name>Segment Watershed</name>198
+ <group>Painting</group>199
+ <script>-fx_segment_watershed 2,1,0,0,0</script>200
+ </gmicscript>201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/help/compositor.html -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/help/compositor.html
Changed
18
1
2
</ul>3
</ol>4
5
+<h4>Compositor Auto Follow</h4>6
+<p>7
+On the tracks popup menu is check box item <b>Compositor Auto Follow</b> which when set will make Compositors always move to follow their origin clips if possible.8
+</p>9
+10
+<p>11
+It is possible to make individual Compositors freely movable when <b>Compositor Auto Follow</b> is set by unchecking option <b>Obey Auto Follow</b> in Compositor popup menu.12
+13
+14
+</p>15
<h3>Compositor are executed from top to bottom</h3>16
In Flowblade Movie Editor <b>the order of rendering is top-to-bottom</b>,17
instead of bottom-to-top like in Gimp or Photoshop.18
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/help/edit_tools.html -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/help/edit_tools.html
Changed
69
1
2
</ul>3
</ol>4
5
+<h4>Cursor context sensitive changes</h4>6
+<p>7
+When cursor changes appenrance you have access to some different edit actions.8
+</p>9
+<ul>10
+<li> <b>Cursor changes on clip's end.</b> You can drag clip's end to lengthen or shorten it.</li>11
+<li> <b>Cursor changes on Compositor's end.</b> You can drag Compositor's end to lengthen or shorten it.</li>12
+<li> <b>Cursor changes on Compositor.</b> You can move Compositor.</li>13
+</ul>14
+15
<a id="overwrite"></a>16
<h3>Overwrite Tool</h3>17
18
19
</ul>20
</ol>21
22
+<h4>Cursor context sensitive changes</h4>23
+<p>24
+When cursor changes appenrance you have access to some different edit actions.25
+</p>26
+<ul>27
+<li> <b>Cursor changes on clip's end.</b> You can drag clip's end to lengthen or shorten it.</li>28
+<li> <b>Cursor changes on Compositor's end.</b> You can drag Compositor's end to lengthen or shorten it.</li>29
+<li> <b>Cursor changes on Compositor.</b> You can move Compositor.</li>30
+</ul>31
+32
<a id="trim"></a>33
<h3>Trim Tool</h3>34
<p>35
36
</ul>37
<li> Select trimmed cut and select new in or out frame</li>38
<ul>39
- <li> Press with <b>Left Mouse</b> on a clip near the side you wish to trim</li>40
+ <li> Press with <b>Left Mouse</b> on a clip near the side you wish to trim. Cursor changes appearance to show which end of clip is to be trimmed.</li>41
<li> Continue on to <b>Left drag</b> on clip to select new in or out frame</li>42
</ul>43
<li> View trimmed cut</li>44
<ul>45
<li> Press <b>Play Loop</b> button to view edit.</li>46
</ul>47
-<li> Select new trim from another clip</li>48
+<li> Select new trim</li>49
<ul>50
<li> Click with <b>Left Mouse</b> on another clip near the side you wish to trim</li>51
</ul>52
-<li> Select other end of same clip to trim</li>53
- <ul>54
- <li> Click on empty space on the Timeline</li>55
- <li> Click with <b>Left Mouse</b> on the original clip near the side you wish to trim</li>56
- </ul>57
</ol>58
59
<a id="rippletrim"></a>60
61
</ul>62
<li>Select an area on Timeline by dragging a box selection with <b>Left Mouse</b> around all items you wish to move and release mouse button.</li>63
64
-<li>Press <b>Left Mouse</b> inside the box selection and drag the box into new position on timeline and release mouse.</li>65
+<li>Press <b>Left Mouse</b> inside the box selection and drag the box into new position on timeline and release mouse. Cursor changes when inside selected area to show that you now move selected items.</li>66
<li>Box contents are overwritten on new position and Compositors are moved.</li>67
68
</ol>69
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/help/rendering.html -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/help/rendering.html
Changed
36
1
2
<h3>Rendering Panel</h3>3
4
<h4>Widgets</h4>5
-6
-<h5>Folder select button</h5> <div class="r-widget">Select folder to place the output file in.</div>7
-<h5>Name entry widget</h5> <div class="r-widget">Set the name of the output file.</div>8
-<h5>Type drop down menu</h5> <div class="r-widget">Select between rendering with user defined parameter or use preset render params and file types.</div>9
-<h5>Presets drop down menu</h5> <div class="r-widget">Select preset rendering params and file type.</div>10
-<h5>Encoding / File Type drop down menu</h5> <div class="r-widget">Select encoding and container format for rendering.</div>11
-<h5>Bitrate drop down menu</h5> <div class="r-widget">Select bitrate for rendering.</div>12
-<h5>Render Using Args check box</h5> <div class="r-widget">Rendering using arguments set in text edit area below.</div>13
-<h5>Args text area</h5> <div class="r-widget">Set arguments for rendering.</div>14
-<h5>Load Selection button</h5> <div class="r-widget">Load rendering arguments defined in left panel into args text area.</div>15
-<h5>Ext entry widget drop down menu</h5> <div class="r-widget">Set file extension for args rendered file.</div>16
-<h5>Open File In Bin check box</h5> <div class="r-widget">Open the rendererd file as media item in current bin.</div>17
-<h5>Render Range drop down menu</h5> <div class="r-widget">OSelect between rending the complete program or the marked range.</div>18
+<h5><b>Folder</b> select button</h5> <div class="r-widget">Select folder to place the output file in.</div>19
+<h5><b>Name</b> entry widget</h5> <div class="r-widget">Set the name of the output file.</div>20
+<h5><b>Type</b> drop down menu</h5> <div class="r-widget">Select between rendering with user defined parameter or use preset render params and file types.</div>21
+<h5><b>Presets</b> drop down menu</h5> <div class="r-widget">Select preset rendering params and file type.</div>22
+<h5><b>Use Project Profile</b> check box</h5> <div class="r-widget">Uncheck to select some other then project profile to used for rendered video.</div>23
+<h5><b>Profile</b> drop down menu</h5> <div class="r-widget">Select project profile for rendering</div>24
+<h5><b>Encoding / File Type</b> drop down menu</h5> <div class="r-widget">Select encoding and container format for rendering.</div>25
+<h5><b>Bitrate</b> drop down menu</h5> <div class="r-widget">Select bitrate for rendering.</div>26
+<h5><b>Render Using Args</b> check box</h5> <div class="r-widget">Rendering using arguments set in text edit area below.</div>27
+<h5><b>Args</b> text area</h5> <div class="r-widget">Set arguments for rendering.</div>28
+<h5><b>Load Selection</b> button</h5> <div class="r-widget">Load rendering arguments defined in left panel into args text area.</div>29
+<h5><b>Ext</b> entry widget drop down menu</h5> <div class="r-widget">Set file extension for args rendered file.</div>30
+<h5><b>Open File In Bin</b> check box</h5> <div class="r-widget">Open the rendererd file as media item in current bin.</div>31
+<h5><b>Render Range</b> drop down menu</h5> <div class="r-widget">Select between rending the complete program or the marked range.</div>32
+<h5><b>Render</b> button</h5> <div class="r-widget">Renders timeline into a file.</div>33
</ul>34
35
<h4>Rendering output</h4>36
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/clip_marker.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_drag_left.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_drag_right.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_sideways.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_trim_left.png
Added
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_trim_right.png
Added
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png
Changed
flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/hamburger_big.png
Added
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/kf_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/kf_active.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/kf_not_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/kf_not_active.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_noedit_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/overwrite_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/overwrite_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/slide_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/slide_noedit_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/tworoll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/tworoll_noedit_cursor.png
Changed
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/respaths.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/respaths.py
Changed
10
1
2
def apply_dark_theme():3
global IMAGE_PATH4
IMAGE_PATH = ROOT_PATH + "/res/darktheme/"5
+6
+def set_gmic2(root_path):7
+ global GMIC_SCRIPTS_DOC8
+ GMIC_SCRIPTS_DOC = root_path + "/res/gmic/gmic2scripts.xml"9
+ 10
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/sequence.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/sequence.py
Changed
182
1
2
# Mix all audio to track 1 by combining them one after another 3
# using an always active field transition.4
if ((new_track.id > AUDIO_MIX_DOWN_TRACK) # black bg or track1 it's self does not need to be mixed5
- and (is_hidden == False)): # We actually do want hidden track to cover all audio below, which happens if it is not mixed.6
+ and (is_hidden == False)): # We actually do want the hidden track to cover all audio below, which happens if it is not mixed.7
self._mix_audio_for_track(new_track)8
9
# Add method that returns track name10
11
return True12
13
# -------------------------------------------------- clips14
- def create_file_producer_clip(self, path, new_clip_name=None, novalidate=False):15
+ def create_file_producer_clip(self, path, new_clip_name=None, novalidate=False, ttl=None):16
"""17
Creates MLT Producer and adds attributes to it, but does 18
not add it to track/playlist object.19
- """20
+ """ 21
producer = mlt.Producer(self.profile, str(path)) # this runs 0.5s+ on some clips22
if novalidate == True:23
producer.set("mlt_service", "avformat-novalidate")24
25
if new_clip_name != None:26
producer.name = new_clip_name27
producer.media_type = get_media_type(path)28
+29
if producer.media_type == FILE_DOES_NOT_EXIST:30
print "file does not exist"31
return None32
33
self.add_clip_attr(producer)34
35
+ # Img seq ttl value36
+ producer.ttl = ttl37
+ if ttl != None:38
+ producer.set("ttl", int(ttl))39
+40
return producer41
42
def create_slowmotion_producer(self, path, speed):43
44
return clip45
46
def create_rendered_transition_clip(self, path, rendered_type):47
- clip = self.create_file_producer_clip(path)48
+ clip = self.create_file_producer_clip(path) # this can't have ttl so we can use simpler constructor49
clip.rendered_type = rendered_type50
return clip51
52
53
clip.clip_length = lambda: _clip_length(clip) # MLT get_length gives wrong values for blanks54
clip.waveform_data = None55
clip.color = None # None means that clip type default color is displayed56
-57
+ clip.markers = []58
+ 59
def clone_track_clip(self, track, index):60
orig_clip = track.clips[index]61
return self.create_clone_clip(orig_clip)62
63
def create_clone_clip(self, clip):64
if clip.media_type != appconsts.PATTERN_PRODUCER:65
- clone_clip = self.create_file_producer_clip(clip.path) # file producer66
+ clone_clip = self.create_file_producer_clip(clip.path, None, False, clip.ttl) # file producer67
else:68
clone_clip = self.create_pattern_producer(clip.create_data) # pattern producer69
self.clone_clip_and_filters(clip, clone_clip)70
71
compositor.clone_properties(old_compositor)72
compositor.set_in_and_out(old_compositor.clip_in, old_compositor.clip_out)73
compositor.transition.set_tracks(old_compositor.transition.a_track, old_compositor.transition.b_track)74
+ compositor.obey_autofollow = old_compositor.obey_autofollow75
self._plant_compositor(compositor)76
return compositor77
78
79
return track_compositors80
81
# -------------------------- monitor clip, trimming display, output mode and hidden track82
- def display_monitor_clip(self, path, pattern_producer_data=None):83
+ def display_monitor_clip(self, path, pattern_producer_data=None, ttl=None):84
"""85
Adds media clip to hidden track for viewing and for setting mark86
in and mark out points.87
88
"""89
track = self.tracks[-1] # Always last track90
if pattern_producer_data == None:91
- self.monitor_clip = self.create_file_producer_clip(path)92
+ self.monitor_clip = self.create_file_producer_clip(path, None, False, ttl)93
else:94
if pattern_producer_data.type == IMAGE_SEQUENCE:95
- self.monitor_clip = self.create_file_producer_clip(pattern_producer_data.path)96
+ self.monitor_clip = self.create_file_producer_clip(pattern_producer_data.path, None, False, ttl)97
else:98
self.monitor_clip = self.create_pattern_producer(pattern_producer_data)99
100
101
self._mute_editable()102
return self.monitor_clip103
104
- def display_trim_clip(self, path, clip_start_pos, patter_producer_data=None):105
+ def display_trim_clip(self, path, clip_start_pos, patter_producer_data=None, ttl=None):106
"""107
Adds clip to hidden track for trim editing display.108
"""109
110
if path != None:111
clip = editorstate.get_cached_trim_clip(path)112
if clip == None:113
- clip = self.create_file_producer_clip(path, None, True)114
+ clip = self.create_file_producer_clip(path, None, True, ttl)115
editorstate.add_cached_trim_clip(clip)116
117
if clip_start_pos > 0:118
119
track.set("hide", 3)120
121
def _unmute_editable(self):122
- for i in range(1, len(self.tracks) - 1):123
- track = self.tracks[i]124
- track.set("hide", int(track.mute_state))125
+ self.set_tracks_mute_state() # same thing126
127
def set_tracks_mute_state(self):128
- self._unmute_editable() # same thing, this method exists to declare purpose129
+ # This only applied to editable tracks on project load130
+ for i in range(1, len(self.tracks) - 1):131
+ self.set_track_mute_state(i, self.tracks[i].mute_state)132
+ 133
+ self.tracks[0].set("hide", 0) # Black bg track134
+ self.tracks[-1].set("hide", 0) # Hidden track135
136
def set_output_mode(self, mode):137
if self.outputfilter != None:138
139
return -1140
141
return index142
- 143
+144
+ def get_clip_for_id(self, clip_id):145
+ """146
+ Returns clip or None if not found.147
+ """148
+ for i in range(1, len(self.tracks)):149
+ track = self.tracks[i]150
+ for j in range(0, len(track.clips)):151
+ clip = track.clips[j]152
+ if clip.id == clip_id:153
+ return clip154
+155
+ return None156
+ 157
def set_track_mute_state(self, track_index, mute_state):158
track = self.tracks[track_index]159
track.mute_state = mute_state160
- track.set("hide", int(track.mute_state))161
-162
+ 163
+ if mute_state == 2: # TRACK_MUTE_AUDIO164
+ if track.id < self.first_video_index:165
+ # Audio tracks166
+ track.set("hide", 1)167
+ track.gain_filter.set("gain", str(0))168
+ else:169
+ # Video tracks170
+ track.set("hide", 0)171
+ track.gain_filter.set("gain", str(0))172
+ elif mute_state == 3: # TRACK_MUTE_ALL173
+ track.set("hide", 1)174
+ track.gain_filter.set("gain", str(0))175
+ else: # TRACK_MUTE_NOTHING, TRACK_MUTE_VIDEO176
+ track.set("hide", int(track.mute_state))177
+ track.gain_filter.set("gain", str(track.audio_gain))178
+ 179
def drop_audio_levels(self):180
for i in range(1, len(self.tracks)):181
clips = self.tracks[i].clips182
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/syncsplitevent.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/syncsplitevent.py
Changed
10
1
2
index = current_sequence().get_clip_index(track, press_frame)3
frame = track.clip_start(index)4
5
- audio_clip = current_sequence().create_file_producer_clip(clip.path)6
+ audio_clip = current_sequence().create_file_producer_clip(clip.path, None, False, clip.ttl)7
audio_clip.media_type = appconsts.AUDIO8
split_length = clip.clip_out - clip.clip_in + 1 # +1 out is inclusive and we're looking for length9
data = { "parent_clip":clip,10
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tlineaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tlineaction.py
Changed
201
1
2
3
4
from gi.repository import Gtk5
+from gi.repository import Gdk6
7
+import md58
import os9
from operator import itemgetter10
+import threading11
+import time12
13
import appconsts14
import boxmove15
16
return None17
18
if MONITOR_MEDIA_FILE().type != appconsts.PATTERN_PRODUCER:19
- new_clip = current_sequence().create_file_producer_clip(MONITOR_MEDIA_FILE().path)20
+ new_clip = current_sequence().create_file_producer_clip(MONITOR_MEDIA_FILE().path, None, False, MONITOR_MEDIA_FILE().ttl)21
else:22
new_clip = current_sequence().create_pattern_producer(MONITOR_MEDIA_FILE())23
24
25
def sync_compositor(compositor):26
track = current_sequence().tracks[compositor.transition.b_track] # b_track is source track where origin clip is27
origin_clip = None28
+ 29
for clip in track.clips:30
if clip.id == compositor.origin_clip_id:31
origin_clip = clip32
+ 33
if origin_clip == None:34
dialogutils.info_message(_("Origin clip not found!"), 35
_("Clip used to create this Compositor has been removed\nor moved to different track."), 36
gui.editor_window.window)37
return38
+ 39
clip_index = track.clips.index(origin_clip)40
clip_start = track.clip_start(clip_index)41
clip_end = clip_start + origin_clip.clip_out - origin_clip.clip_in42
43
syncsplitevent.split_audio_from_clips_list(clips, track)44
45
def sync_all_compositors():46
+ full_sync_data = edit.get_full_compositor_sync_data()47
+ 48
+ for sync_item in full_sync_data:49
+ destroy_id, orig_in, orig_out, clip_start, clip_end = sync_item50
+ compositor = current_sequence().get_compositor_for_destroy_id(destroy_id)51
+ data = {"compositor":compositor,"clip_in":clip_start,"clip_out":clip_end}52
+ action = edit.move_compositor_action(data)53
+ action.do_edit()54
+55
+ """56
# Pair all compositors with their origin clips ids57
comp_clip_pairings = {}58
for compositor in current_sequence().compositors:59
60
except:61
# Clip is probably deleted62
pass63
-64
+ """65
+ 66
def add_transition_menu_item_selected():67
if movemodes.selected_track == -1:68
# INFOWINDOW69
70
from_clip = track.clips[movemodes.selected_range_in]71
to_clip = track.clips[movemodes.selected_range_out]72
73
+ transition_data = get_transition_data_for_clips(track, from_clip, to_clip)74
+ 75
+ if track.id >= current_sequence().first_video_index:76
+ dialogs.transition_edit_dialog(_add_transition_dialog_callback, 77
+ transition_data)78
+ else:79
+ _no_audio_tracks_mixing_info()80
+81
+def get_transition_data_for_clips(track, from_clip, to_clip):82
+ 83
# Get available clip handles to do transition84
from_handle = from_clip.get_length() - from_clip.clip_out85
from_clip_length = from_clip.clip_out - from_clip.clip_in 86
87
"from_handle":from_handle,88
"to_handle":to_handle,89
"max_length":max_length}90
+ return transition_data91
92
- if track.id >= current_sequence().first_video_index:93
- dialogs.transition_edit_dialog(_add_transition_dialog_callback, 94
- transition_data)95
- else:96
- _no_audio_tracks_mixing_info()97
- 98
def _add_transition_render_folder_select_callback(dialog, response_id, file_select):99
try:100
folder = file_select.get_filenames()[0]101
102
sorted_wipe_luma_index,103
color_str)104
105
+ creation_data = ( from_clip.id,106
+ to_clip.id,107
+ from_out,108
+ from_in,109
+ to_out,110
+ to_in,111
+ transition_type_selection_index,112
+ sorted_wipe_luma_index,113
+ color_str)114
+ 115
# Save transition data into global variable to be available at render complete callback116
global transition_render_data117
- transition_render_data = (trans_index, from_clip, to_clip, transition_data["track"], from_in, to_out, transition_type_selection_index)118
+ transition_render_data = (trans_index, from_clip, to_clip, transition_data["track"], from_in, to_out, transition_type_selection_index, creation_data)119
window_text, type_id = mlttransitions.rendered_transitions[transition_type_selection_index]120
window_text = _("Rendering ") + window_text121
122
- render.render_single_track_transition_clip(producer_tractor,123
- encoding_option_index,124
- quality_option_index, 125
- str(extension_text), 126
- _transition_render_complete,127
- window_text)128
+ render.render_single_track_transition_clip( producer_tractor,129
+ encoding_option_index,130
+ quality_option_index, 131
+ str(extension_text), 132
+ _transition_render_complete,133
+ window_text)134
135
def _transition_render_complete(clip_path):136
print "Render complete"137
138
global transition_render_data139
- transition_index, from_clip, to_clip, track, from_in, to_out, transition_type = transition_render_data140
+ transition_index, from_clip, to_clip, track, from_in, to_out, transition_type, creation_data = transition_render_data141
142
transition_clip = current_sequence().create_rendered_transition_clip(clip_path, transition_type)143
- 144
+ transition_clip.creation_data = creation_data145
+146
data = {"transition_clip":transition_clip,147
"transition_index":transition_index,148
"from_clip":from_clip,149
150
action = edit.add_centered_transition_action(data)151
action.do_edit()152
153
+def re_render_transition(data):154
+ clip, track, msg, x = data155
+ if not hasattr(clip, "creation_data"):156
+ _no_creation_data_dialog()157
+ return158
+ 159
+ from_clip_id, to_clip_id, from_out, from_in, to_out, to_in, transition_type_selection_index, \160
+ sorted_wipe_luma_index, color_str = clip.creation_data161
+ 162
+ from_clip = editorstate.current_sequence().get_clip_for_id(from_clip_id)163
+ to_clip = editorstate.current_sequence().get_clip_for_id(to_clip_id)164
+ if from_clip == None or to_clip == None:165
+ _source_clips_not_found_dialog()166
+ return167
+168
+ transition_data = {"track":track,169
+ "clip":clip,170
+ "from_clip":from_clip,171
+ "to_clip":to_clip}172
+173
+ dialogs.transition_re_render_dialog(_transition_RE_render_dialog_callback, transition_data)174
+175
+def _transition_RE_render_dialog_callback(dialog, response_id, selection_widgets, transition_data):176
+ if response_id != Gtk.ResponseType.ACCEPT:177
+ dialog.destroy()178
+ return179
+ 180
+ dialog.destroy()181
+ 182
+ enc_combo, quality_combo = selection_widgets183
+ encoding_option_index = enc_combo.get_active()184
+ quality_option_index = quality_combo.get_active()185
+ extension_text = "." + renderconsumer.encoding_options[encoding_option_index].extension186
+187
+ clip = transition_data["clip"]188
+ track = transition_data["track"]189
+ from_clip_id, to_clip_id, from_out, from_in, to_out, to_in, transition_type_selection_index, \190
+ sorted_wipe_luma_index, color_str = clip.creation_data191
+ 192
+ trans_index = track.clips.index(clip)193
+194
+ producer_tractor = mlttransitions.get_rendered_transition_tractor( editorstate.current_sequence(),195
+ transition_data["from_clip"],196
+ transition_data["to_clip"],197
+ from_out,198
+ from_in,199
+ to_out,200
+ to_in,201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py
Changed
201
1
2
3
import appconsts4
import audiowaveformrenderer5
+import boxmove6
import cairoarea7
import clipeffectseditor8
+import compositormodes9
import editorpersistance10
from editorstate import current_sequence11
from editorstate import timeline_visible12
13
VIDEO_MUTE_ICON = None14
ALL_MUTE_ICON = None15
MARKER_ICON = None16
+CLIP_MARKER_ICON = None17
LEVELS_RENDER_ICON = None18
SNAP_ICON = None19
KEYBOARD_ICON = None20
21
CLIP_COLOR_GRAD = (1, 0.62, 0.38, 0.7, 1)22
CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, CLIP_COLOR_GRAD, GRAD_MULTIPLIER) 23
CLIP_SELECTED_COLOR = get_multiplied_color_from_grad(CLIP_COLOR_GRAD, SELECTED_MULTIPLIER)24
+CLIP_END_DRAG_OVERLAY_COLOR = (1,1,1,0.3)25
26
AUDIO_CLIP_COLOR_GRAD = (1, 0.23, 0.52, 0.23, 1)#(1, 0.79, 0.80, 0.18, 1)27
AUDIO_CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, AUDIO_CLIP_COLOR_GRAD, GRAD_MULTIPLIER + 0.5)28
29
IMAGE_CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, IMAGE_CLIP_COLOR_GRAD, GRAD_MULTIPLIER) 30
31
COMPOSITOR_CLIP = (0.3, 0.3, 0.3, 0.8)32
+COMPOSITOR_CLIP_AUTO_FOLLOW = (0.33, 0.05, 0.52, 0.65)33
COMPOSITOR_CLIP_SELECTED = (0.5, 0.5, 0.7, 0.8)34
35
BLANK_CLIP_COLOR_GRAD = (1, 0.6, 0.6, 0.65, 1)36
BLANK_CLIP_COLOR_GRAD_L = (0, 0.6, 0.6, 0.65, 1)37
38
-BLANK_CLIP_COLOR_SELECTED_GRAD = (1, 0.7, 0.7, 0.75, 1)39
-BLANK_CLIP_COLOR_SELECTED_GRAD_L = (0, 0.7, 0.7, 0.75, 1)40
+BLANK_CLIP_COLOR_SELECTED_GRAD = (1, 0.80, 0.80, 0.80, 1)41
+BLANK_CLIP_COLOR_SELECTED_GRAD_L = (0, 0.80, 0.80, 0.80, 1)42
43
SINGLE_TRACK_TRANSITION_SELECTED = (0.8, 0.8, 1.0)44
45
46
47
ICON_SELECTED_OVERLAY_COLOR = (0.8, 0.8, 1.0, 0.3)48
49
-# Dash pattern used to create "LED"s50
+# Dash pattern used by Box tool51
BOX_DASH_INK = 12.052
BOX_DASH_SKIP = 3.053
BOX_DASHES = [BOX_DASH_INK, BOX_DASH_SKIP, BOX_DASH_INK, BOX_DASH_SKIP]54
55
pix_per_frame = 5.0 # Current draw scale. This set set elsewhere on init so default value irrelevant.56
pos = 0 # Current left most frame in timeline display57
58
+# A context defining action taken when mouse press happens based on edit mode and mouse position.59
+# Cursor communicates current pointer contest to user.60
+pointer_context = appconsts.POINTER_CONTEXT_NONE61
+DRAG_SENSITIVITY_AREA_WIDTH_PIX = 1062
+63
# ref to singleton TimeLineCanvas instance for mode setting and some position64
# calculations.65
canvas_widget = None66
67
COMPOSITOR_CLIP_ICON, INSERT_ARROW_ICON, AUDIO_MUTE_ICON, MARKER_ICON, \68
VIDEO_MUTE_ICON, ALL_MUTE_ICON, TRACK_BG_ICON, MUTE_AUDIO_ICON, MUTE_VIDEO_ICON, MUTE_ALL_ICON, \69
TRACK_ALL_ON_V_ICON, TRACK_ALL_ON_A_ICON, MUTE_AUDIO_A_ICON, TC_POINTER_HEAD, EDIT_INDICATOR, \70
- LEVELS_RENDER_ICON, SNAP_ICON, KEYBOARD_ICON, CLOSE_MATCH_ICON71
+ LEVELS_RENDER_ICON, SNAP_ICON, KEYBOARD_ICON, CLOSE_MATCH_ICON, CLIP_MARKER_ICON72
73
FULL_LOCK_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "full_lock.png")74
FILTER_CLIP_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filter_clip_icon_sharp.png")75
76
SNAP_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "snap_magnet.png")77
KEYBOARD_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "keyb_trim.png")78
CLOSE_MATCH_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "close_match.png")79
+ CLIP_MARKER_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "clip_marker.png")80
81
MARKER_ICON = _load_pixbuf("marker.png")82
TRACK_ALL_ON_V_ICON = _load_pixbuf("track_all_on_V.png")83
84
85
# Draw clips in draw range86
cr.set_line_width(MOVE_CLIPS_LINE_WIDTH)87
- cr.set_source_rgb(*OVERLAY_TRIM_COLOR)88
+89
90
clip_length = end - start91
scale_length = clip_length * pix_per_frame92
93
track_height = data["track_height"]94
95
cr.rectangle(scale_in, int(y) + 1.5, int(scale_length), track_height - 2.0)96
+ cr.set_source_rgba(*CLIP_END_DRAG_OVERLAY_COLOR)97
+ cr.fill_preserve()98
+ cr.set_source_rgb(*OVERLAY_TRIM_COLOR)99
cr.stroke()100
101
if editorpersistance.prefs.delta_overlay == True:102
103
self.widget = cairoarea.CairoDrawableArea2( WIDTH, 104
HEIGHT, 105
self._draw)106
+ self.widget.add_pointer_motion_mask()107
+ 108
self.widget.press_func = self._press_event109
self.widget.motion_notify_func = self._motion_notify_event110
self.widget.release_func = self._release_event111
112
"""113
Mouse move callback114
"""115
- if not self.drag_on:116
+ if (not self.drag_on) and editorstate.cursor_is_tline_sensitive == True:117
self.set_pointer_context(x, y)118
return119
120
121
event.button, event.get_state())122
123
def set_pointer_context(self, x, y):124
+ current_pointer_context = self.get_pointer_context(x, y)125
+126
+ # If pointer_context changed then save it and change cursor.127
+ global pointer_context128
+ if pointer_context != current_pointer_context:129
+ pointer_context = current_pointer_context130
+ if pointer_context == appconsts.POINTER_CONTEXT_NONE:131
+ gui.editor_window.set_tline_cursor(EDIT_MODE())132
+ else:133
+ gui.editor_window.set_tline_cursor_to_context(pointer_context)134
+ 135
+ def get_pointer_context(self, x, y):136
frame = get_frame(x)137
hit_compositor = compositor_hit(frame, y, current_sequence().compositors)138
if hit_compositor != None:139
- return140
+ if editorstate.auto_follow == False or (editorstate.auto_follow == True and hit_compositor.obey_autofollow == False):141
+ return compositormodes.get_pointer_context(hit_compositor, x)142
+ else:143
+ return appconsts.POINTER_CONTEXT_NONE144
145
- track = get_track(y) 146
+ track = get_track(y)147
if track == None:148
- return 149
+ return appconsts.POINTER_CONTEXT_NONE150
151
clip_index = current_sequence().get_clip_index(track, frame)152
if clip_index == -1:153
- return154
-155
- clip_start_frame = track.clip_start(clip_index) - pos156
- if abs(x - _get_frame_x(clip_start_frame)) < 5:157
- return158
-159
- clip_end_frame = track.clip_start(clip_index + 1) - pos160
- if abs(x - _get_frame_x(clip_end_frame)) < 5:161
- return162
+ # This gets none always afetr rack, which may not be what we want163
+ return appconsts.POINTER_CONTEXT_NONE164
165
+ clip_start_frame = track.clip_start(clip_index)166
+ clip_end_frame = track.clip_start(clip_index + 1)167
+ 168
+ # INSERT, OVEWRITE169
+ if (EDIT_MODE() == editorstate.INSERT_MOVE or EDIT_MODE() == editorstate.OVERWRITE_MOVE) and editorstate.overwrite_mode_box == False:170
+ if abs(x - _get_frame_x(clip_start_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX:171
+ return appconsts.POINTER_CONTEXT_END_DRAG_LEFT172
+ if abs(x - _get_frame_x(clip_end_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX:173
+ return appconsts.POINTER_CONTEXT_END_DRAG_RIGHT174
+ 175
+ return appconsts.POINTER_CONTEXT_NONE176
+ # TRIM177
+ elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM or EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:178
+ if abs(frame - clip_start_frame) < abs(frame - clip_end_frame):179
+ return appconsts.POINTER_CONTEXT_TRIM_LEFT180
+ else:181
+ return appconsts.POINTER_CONTEXT_TRIM_RIGHT182
+ # BOX183
+ elif (EDIT_MODE() == editorstate.OVERWRITE_MOVE and editorstate.overwrite_mode_box == True and 184
+ boxmove.box_selection_data != None):185
+ if boxmove.box_selection_data.is_hit(x, y):186
+ return appconsts.POINTER_CONTEXT_BOX_SIDEWAYS187
+ 188
+ return appconsts.POINTER_CONTEXT_NONE189
+ 190
#----------------------------------------- DRAW191
def _draw(self, event, cr, allocation):192
x, y, w, h = allocation193
194
cr.set_source_surface(LEVELS_RENDER_ICON, int(scale_in) + 4, y + 8)195
cr.paint()196
197
+ # Clip markers198
+ if len(clip.markers) > 0 and scale_length > TEXT_MIN:199
+ for marker in clip.markers:200
+ name, clip_marker_frame = marker201
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py
Changed
64
1
2
import textwrap3
import time4
import threading5
+import unicodedata6
7
import dialogutils8
import editorstate9
10
project_name = flowblade_project.name11
sequence_name = flowblade_project.c_seq.name12
sequence_index = flowblade_project.sequences.index(flowblade_project.c_seq)13
+14
length = flowblade_project.c_seq.get_length()15
render_item = BatchRenderItemData(project_name, sequence_name, render_path, \16
sequence_index, args_vals_list, timestamp, length, \17
18
19
def generate_identifier(self):20
id_str = self.project_name + self.timestamp.ctime()21
- return md5.new(id_str).hexdigest()22
+ try:23
+ idfier = md5.new(id_str).hexdigest()24
+ except:25
+ ascii_pname = unicodedata.normalize('NFKD', self.project_name).encode('ascii','ignore')26
+ id_str = str(ascii_pname) + self.timestamp.ctime()27
+ idfier = md5.new(id_str).hexdigest()28
+ return idfier29
30
def matches_identifier(self, identifier):31
if self.generate_identifier() == identifier:32
33
profile = mltprofiles.get_profile(render_item.render_data.profile_name)34
35
vcodec = self.get_vcodec(render_item)36
- if self.is_frame_sequence_render(vcodec) == True:37
+ vformat = self.get_argval(render_item, "f")38
+ 39
+ if self.is_frame_sequence_render(vcodec) == True and vformat == None:40
# Frame sequence render41
consumer = renderconsumer.get_img_seq_render_consumer_codec_ext(render_item.render_path,42
profile, 43
44
45
return False46
47
- def get_vcodec(self, render_item):48
+ def get_vcodec(self, render_item): 49
+ return self.get_argval(render_item, "vcodec")50
+51
+ def get_argval(self, render_item, arg_key):52
for arg_val in render_item.args_vals_list:53
arg, val = arg_val54
- if arg == "vcodec":55
+ if arg == arg_key:56
return val57
58
return None59
- 60
+ 61
def get_frame_seq_ext(self, vcodec):62
if vcodec == "targa":63
return "tga"64
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py
Changed
46
1
2
NO_PREVIEW_FILE = "fallback_thumb.png"3
4
_gmic_found = False5
-6
+_gmic_version = 17
_session_id = None8
9
_window = None10
11
# Set paths.12
respaths.set_paths(root_path)13
14
+ # Check G'MIC version15
+ cmd = "gmic -version"16
+ process = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)17
+ output, error = process.communicate()18
+ tokens = output.split()19
+ clended = []20
+ for token in tokens:21
+ str1 = token.replace('.','')22
+ str2 = str1.replace(',','')23
+ if str2.isdigit(): # this is based on assumtion that str2 ends up being number like "175" or 215" etc. only for version number token24
+ if str2[0] == '2':25
+ global _gmic_version26
+ _gmic_version = 227
+ respaths.set_gmic2(root_path)28
+29
+ # Write stdout to log file30
+ sys.stdout = open(utils.get_hidden_user_dir_path() + "log_gmic", 'w')31
+ print "G'MIC version:", str(_gmic_version)32
+ 33
# Init gmic tool session dirs34
if os.path.exists(get_session_folder()):35
shutil.rmtree(get_session_folder())36
37
os.mkdir(get_session_folder())38
- 39
+40
init_frames_dirs()41
- 42
+43
# Load editor prefs and list of recent projects44
editorpersistance.load()45
if editorpersistance.prefs.dark_theme == True:46
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/trackaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/trackaction.py
Changed
58
1
2
"""3
4
import appconsts5
+import audiomonitoring6
import dialogutils7
import gui8
import guicomponents9
import editorstate10
+import edit11
from editorstate import get_track12
from editorstate import current_sequence13
from editorstate import PROJECT14
15
updater.repaint_tline()16
17
def mute_track(track, new_mute_state):18
- # NOTE: THIS IS A SAVED EDIT OF SEQUENCE, BUT IS NOT AN UNDOABLE EDIT19
+ # NOTE: THIS IS A SAVED EDIT OF SEQUENCE, BUT IT IS NOT AN UNDOABLE EDIT.20
current_sequence().set_track_mute_state(track.id, new_mute_state)21
gui.tline_column.widget.queue_draw()22
23
24
def audio_levels_menu_launch_pressed(widget, event):25
guicomponents.get_audio_levels_popup_menu(event, _audio_levels_item_activated)26
27
+# THIS HANDLES MUCH MORE NOW, NAME _audio_levels_item_activated needs changing28
def _audio_levels_item_activated(widget, msg):29
if msg == "all":30
editorstate.display_all_audio_levels = True31
32
snapping.snapping_on = widget.get_active()33
elif msg == "magnet":34
snapping.show_magnet_icon = widget.get_active()35
+ elif msg == "autofollow":36
+ active = widget.get_active()37
+ editorstate.auto_follow = active38
+ PROJECT().set_project_property(appconsts.P_PROP_AUTO_FOLLOW, active)39
+ if active == True:40
+ # Do autofollow update if auto follow activated41
+ compositor_autofollow_data = edit.get_full_compositor_sync_data()42
+ edit.do_autofollow_redo(compositor_autofollow_data)43
+ updater.repaint_tline()44
+ elif msg == "pointer_sensitive_item":45
+ editorstate.cursor_is_tline_sensitive = widget.get_active()46
else: # media thumbnails47
editorstate.display_clip_media_thumbnails = widget.get_active()48
updater.repaint_tline()49
50
return 51
# Update track mute state52
current_sequence().set_track_mute_state(track.id, new_mute_state)53
+ 54
+ audiomonitoring.update_mute_states()55
gui.tline_column.widget.queue_draw()56
57
if data.event.button == 3:58
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/translations.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/translations.py
Changed
80
1
2
lang = gettext.translation(APP_NAME, locale_path, languages=langs, fallback=True)3
4
# Un-comment for translations tests5
- #lang = gettext.translation(APP_NAME, locale_path, languages=["cs"], fallback=True)6
+ #lang = gettext.translation(APP_NAME, locale_path, languages=["fi"], fallback=True)7
8
lang.install(APP_NAME) # makes _() a build-in available in all modules without imports9
10
11
filter_names["Lift Gain Gamma"] = _("Lift Gain Gamma")12
filter_names["Image Grid"] = _("Image Grid")13
14
- # 0.1815
filter_names["Color Lift Gain Gamma"] = _("Color Lift Gain Gamma")16
-17
+ filter_names["Color Channel Mixer"] = _("Color Channel Mixer")18
+ filter_names["Lens Correction AV"] = _("Lens Correction AV")19
+ filter_names["Perspective"] = _("Perspective")20
+ 21
# param names22
global param_names23
24
25
param_names["Columns"] = _("Columns")26
param_names["Color Temperature"] = _("Color Temperature")27
param_names["Select .cube file"] = _("Select .cube file")28
+ param_names["Red Ch. Red Gain"] = _("Red Ch. Red Gain")29
+ param_names["Red Ch. Green Gain"] = _("Red Ch. Green Gain")30
+ param_names["Red Ch. Blue Gain"] = _("Red Ch. Blue Gain")31
+ param_names["Green Ch. Red Gain"] = _("Green Ch. Red Gain")32
+ param_names["Green Ch. Green Gain"] = _("Green Ch. Green Gain")33
+ param_names["Green Ch. Blue Gain"] = _("Green Ch. Blue Gain")34
+ param_names["Blue Ch. Red Gain"] = _("Blue Ch. Red Gain")35
+ param_names["Blue Ch. Green Gain"] = _("Blue Ch. Green Gain")36
+ param_names["Blue Ch. Blue Gain"] = _("Blue Ch. Blue Gain")37
+ param_names["Center X"] = _("Center X")38
+ param_names["Center Y"] = _("Center Y")39
+ param_names["Quad Distortion"] = _("Quad Distortion")40
+ param_names["Double Quad Distortion"] = _("Double Quad Distortion")41
42
# param names for compositors43
param_names["Opacity"] = _("Opacity")44
45
param_names["Softness"] = _("Softness")46
param_names["Fade Out Length"] = _("Fade Out Length")47
param_names["Fade In Length"] = _("Fade In Length")48
-49
+ param_names["Wipe Direction"] = _("Wipe Direction")50
+ param_names["Blend Mode"] = _("Blend Mode")51
+ 52
# Combo options53
global combo_options54
combo_options["Shave"] = _("Shave")55
56
combo_options["Shadows"] = _("Shadows")57
combo_options["Midtones"] = _("Midtones")58
combo_options["Highlights"] = _("Highlights")59
-60
+ combo_options["Forward"] = _("Forward")61
+ combo_options["Backward"] = _("Backward")62
+ combo_options["Add"] = _("Add")63
+ combo_options["Saturate"] = _("Saturate")64
+ combo_options["Multiply"] = _("Multiply") 65
+ combo_options["Screen"] = _("Screen") 66
+ combo_options["Overlay"] = _("Overlay")67
+ combo_options["Darken"] = _("Darken")68
+ combo_options["Lighten"] = _("Lighten")69
+ combo_options["ColorDodge"] = _("ColorDodge")70
+ combo_options["Colorburn"] = _("Colorburn")71
+ combo_options["Hardlight"] = _("Hardlight")72
+ combo_options["Softlight"] = _("Softlight")73
+ combo_options["Difference"] = _("Difference")74
+ combo_options["Exclusion"] = _("Exclusion")75
+ combo_options["HSLHue"] = _("HSLHue")76
+ combo_options["HSLSaturation"] = _("HSLSaturation")77
+ combo_options["HSLColor"] = _("HSLColor")78
+ combo_options["HSLLuminosity"] = _("HSLLuminosity")79
+ 80
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/trimmodes.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/trimmodes.py
Changed
56
1
2
# made to do things that are needed in trim.3
if _trimmed_clip_is_blank():4
set_exit_mode_func()5
- primary_txt = _("Cant ONE ROLL TRIM blank clips.")6
+ primary_txt = _("Can't ONE ROLL TRIM blank clips.")7
secondary_txt = _("You can use MOVE OVERWRITE or TWO ROLL TRIM edits instead\nto get the desired change.")8
dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)9
return False10
11
12
# Set interactive trimview on hidden track13
if clip.media_type != appconsts.PATTERN_PRODUCER:14
- current_sequence().display_trim_clip(clip.path, clip_start) # file producer15
+ current_sequence().display_trim_clip(clip.path, clip_start, None, clip.ttl) # file producer16
else:17
- current_sequence().display_trim_clip(None, clip_start, clip.create_data) # pattern producer18
+ current_sequence().display_trim_clip(None, clip_start, clip.create_data, None) # pattern producer19
20
PLAYER().seek_frame(edit_frame)21
return True22
23
return24
25
gui.monitor_widget.one_roll_mouse_release(edit_data["edit_frame"], frame - edit_data["edit_frame"])26
- 27
+ tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_NONE28
+29
_do_one_roll_trim_edit(frame)30
31
def _do_one_roll_trim_edit(frame):32
33
34
# Set interactive trim view clip on hidden track35
if clip.media_type != appconsts.PATTERN_PRODUCER:36
- current_sequence().display_trim_clip(clip.path, clip_start) # File producer37
+ current_sequence().display_trim_clip(clip.path, clip_start, None, clip.ttl) # File producer38
else:39
- current_sequence().display_trim_clip(None, clip_start, clip.create_data) # pattern producer40
+ current_sequence().display_trim_clip(None, clip_start, clip.create_data, None) # pattern producer41
42
PLAYER().seek_frame(edit_frame)43
updater.repaint_tline()44
45
46
# Set interactive trim view clip on hidden track47
if clip.media_type != appconsts.PATTERN_PRODUCER:48
- current_sequence().display_trim_clip(clip.path, clip_start) # File producer49
+ current_sequence().display_trim_clip(clip.path, clip_start, None, clip.ttl) # File producer50
else:51
- current_sequence().display_trim_clip(None, clip_start, clip.create_data) # pattern producer52
+ current_sequence().display_trim_clip(None, clip_start, clip.create_data, None) # pattern producer53
54
if start_frame_being_viewed:55
PLAYER().seek_frame(clip.clip_in)56
flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/updater.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/updater.py
Changed
14
1
2
# Create and display clip on hidden track3
if MONITOR_MEDIA_FILE().type == appconsts.PATTERN_PRODUCER or MONITOR_MEDIA_FILE().type == appconsts.IMAGE_SEQUENCE:4
# pattern producer or image sequence5
- clip_producer = current_sequence().display_monitor_clip(None, MONITOR_MEDIA_FILE())6
+ if MONITOR_MEDIA_FILE().type == appconsts.PATTERN_PRODUCER:7
+ ttl = None8
+ else:9
+ ttl = MONITOR_MEDIA_FILE().ttl10
+ clip_producer = current_sequence().display_monitor_clip(None, MONITOR_MEDIA_FILE(), ttl)11
else:12
# File producers13
clip_producer = current_sequence().display_monitor_clip(MONITOR_MEDIA_FILE().path)14
flowblade-1.14.tar.gz/flowblade-trunk/docs/FAQ.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/FAQ.md
Changed
63
1
2
3
**Contents**4
5
- 1. [Crop filter does not work](./FAQ.md#crop-filter-does-not-work)6
- 2. [How can I move clips around freely?](./FAQ.md#how-can-i-move-clips-around-freely)7
- 3. [Will there be Windows or OSX versions?](./FAQ.md#will-there-be-windows-or-osx-versions)8
- 4. [Rendering with a profile with different framerate changes video playback speed and loses audio sync](./FAQ.md#rendering-with-a-profile-with-different-framerate-changes-video-playback-speed-and-loses-audio-sync)9
+ 1. [Alpha Filters do not work](./FAQ.md#alpha-filters-do-not-work)10
+ 2. [Crop filter does not work](./FAQ.md#crop-filter-does-not-work)11
+ 3. [How can I move clips around freely?](./FAQ.md#how-can-i-move-clips-around-freely)12
+ 4. [Will there be Windows or OSX versions?](./FAQ.md#will-there-be-windows-or-osx-versions)13
+ 5. [Rendering with a profile with different framerate changes video playback speed and loses audio sync](./FAQ.md#rendering-with-a-profile-with-different-framerate-changes-video-playback-speed-and-loses-audio-sync)14
+ 2. [Wayland](./FAQ.md#wayland)15
+ 16
+### Alpha Filters do not work17
18
-#### Crop filter does not work19
+In Flowblade Alpha filters write into images alpha channel and have no effect unless used in combination with Compositors to combine two images.20
+21
+Alpha channel in images exits for the sole purpose of compositing two images. If image is not part of a composite, the data in alpha channel has no purpose and does not affect output.22
+23
+**Select "Add Compositor" -> "Dissolve" from clip popup menu** to composite e.g. clip on track V2 on a clip on track V1 and add Alpha filter into clip on track V2 to see Alpha filters working.24
+25
+### Crop filter does not work26
27
Are you trying zoom in a bit and use part of the image instead of the whole image?28
If this is the case then you should use filter **Affine** in filter group **Transform** and set properties *Scale X, Scale Y, X, Y*.29
30
If you are trying to crop an image in the sense that you want to cut part of the image out, then you must use a Compositor and composite the image you are trying to crop on top of another image or perhaps a black color producer.31
32
33
-#### How can I move clips around freely?34
+### How can I move clips around freely?35
36
Use the **Overwrite** tool.37
38
Click on timeline and press **2** on keyboard or use the **Tool Select Menu** in the middlebar next to the timecode display.39
40
-#### Will there be Windows or OSX versions?41
+### Will there be Windows or OSX versions?42
43
These are not currently planned. If in the future the port effort is reasonable, does not have adverse effects on the code base and someone provides quality patches, then those patches can probably be accepted.44
45
46
-#### Rendering with a profile with different framerate changes video playback speed and loses audio sync47
+### Rendering with a profile with different framerate changes video playback speed and loses audio sync48
49
Yes, this will happen. When rendering the video frames are just copied, no complex slowdown/speedup prosessing is done, and audio is **not** resampled.50
51
To maintain sync and playback both Project Profile and Render Profile both need to match the frame rate of original material. 52
53
+### Wayland ###54
+55
+Flowblade does not run natively on Wayland yet, but there are fwe ways to get Flowblade running.56
+57
+1. Start Flowblade from terminal with command:58
+59
+ GDK_BACKEND=x11 flowblade60
+61
+62
+2. Use X11 session when running Flowblade63
flowblade-1.14.tar.gz/flowblade-trunk/docs/INSTALLING.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/INSTALLING.md
Changed
37
1
2
### Installing using .deb package3
4
#### Step 1. Download and install .deb 5
-**First download .deb file** for Flowblade 1.12 from <a href="https://github.com/jliljebl/flowblade/releases">here.</a>6
+**First download .deb file** for Flowblade 1.14 from <a href="https://github.com/jliljebl/flowblade/releases">here.</a>7
8
Double click on <b>.deb</b> file to install it. 9
10
11
<li> <p>Open terminal in the directory you saved the downloaded <b>.deb</b> file. Give command: </li>12
</ul>13
14
- sudo dpkg -i ./flowblade-1.10.0-1_all.deb15
+ sudo dpkg -i ./flowblade-1.14.0-1_all.deb16
17
18
#### OPTIONAL Step 2. Give some additional commands on terminal19
20
21
Release has been install tested on: <b>Ubuntu 16.10</b>, <b>Ubuntu 16.04</b>. <b>Linux Mint 18</b>. It should work on all recent Debian based distributions.22
23
-<i>NOTE: Running a KDEnlive PPA on Ubuntu may cause an uncompatible MLT to be installed and prevent Flowblade from running, more <a href="https://plus.google.com/u/0/102624418925189345577/posts/7ANDDW3hzHB?sfc=true">here.</a> Update to MLT 6.4.1 or remove KDEnlive PPA.</i> 24
-25
### Installing from your OS repository26
27
The easiest way to install Flowblade is using the version in your OS repository. The downside is that **the version available may not be the current latest release**. Contact your OS to get latest Flowblade included in repositories if not already available.28
29
* Extract archive into a folder of your choosing30
* Install dependencies. See [Dependencies](DEPENDENCIES.md) doc for more information.31
* If you have Flowblade installed in your system, you probably have the dependencies installed, unless some new ones have been added.32
- * Launch by running script *.../flowblade-1.10.0/flowblade* that was created in the folder where archive was unpacked.33
+ * Launch by running script *.../flowblade-1.14.0/flowblade* that was created in the folder where archive was unpacked.34
* Note that if you have Flowblade installed yu will need use full path to repository version or navigate to the folder containing launch script and use command "./flowblade" to launch repository version instead of installed version.35
36
*Please note these issues with Dropbox download:*37
flowblade-1.14.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md
Changed
55
1
2
# Release Notes #3
4
-5
-**COMING SOON...**6
-7
## Flowblade 1.14 ##8
9
-Date: August x, 201710
+Date: October 4, 201711
12
-**Flowblade 1.14** is the fourteenth release of Flowblade. This release had probably more new features then any release since the initial release 0.6. New functionality like sequence combining, compound clips and audio syncing take the application to the next level as a complete editing solution.13
+**Flowblade 1.14** is the fifteenth release of Flowblade. This release had probably more new features then any release since the initial release 0.6. New functionality like sequence combining, compound clips and audio syncing take the application to the next level as a complete editing solution.14
15
Especially sequence combining feature together with existing features like *Range Log* make Flowblade easily the most advanced and featureful FLOSS tool for projects with long complex edits and large amounts of media.16
17
18
### Compound Clips ###19
20
A **Compound Clip** is a single clip created by combining multiple clips and compositors in to a single media item. Compound Clips are useful when some complex sequence is more conveniently handled as a single unit.21
- * **Compound Clip from Selection** feature creates a Compound Clip from currently selected clips into a Xompound Clip.22
+ * **Compound Clip from Selection** feature creates a Compound Clip from currently selected clips into a Compound Clip.23
* **Compound Clip from Sequence** feature creates a Compound Clip from current full contents of the timeline.24
- * **Audio Synced Compound Clips**, see above.25
+ * **Audio Synced Compound Clip**, see above.26
27
### Fade in/out ###28
-We have two new features addressing user requests for speeding up the process of creating fade in and fade out transittions.29
+We have two new features addressing user requests for speeding up the process of creating fade in and fade out transitions.30
* **Fade Compositors** These are special new compositors that will automatically on creation place themselves at the beginning or end of clips and do not need any keyframe manipulation; lengths of fades are changed by changing the lengths of compositors.31
* **Add Fade buttons** *Compositors* panel now has **Add Fade In** and **Add Fade Out** buttons that will create keyframes that define a fade of desired length in a single click.32
33
34
35
#### Titler ####36
37
-Titler got two new features38
+Titler got two new features:39
40
* Text drop shadow 41
- * Text outline features42
+ * Text outline43
44
#### Disk cache management ####45
Disk cache management window provides GUI tool for deleting saved hidden files that could eventually consume noticable amounts of disk space.46
47
* Save render settings for proxy conversions.48
* Add Lossless FFv1 profile **by lsde**.49
* Fix timelineline zoom issue causing problems with scrolling.50
- * About menu visually impored **by Mostafa Ahangarha**.51
+ * About menu visually improved **by Mostafa Ahangarha**.52
* Allow user preferences for Fast Forward / Reverse speeds **by Steven van de Beek**.53
* Allow shrinking timeline vertically when fewer than maximum tracks used tracks.54
* Make Range Overwrite 3 point edit work with only In set on Timeline.55
flowblade-1.14.tar.gz/flowblade-trunk/docs/ROADMAP.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/ROADMAP.md
Changed
80
1
2
3
Last updated: September. 20174
5
-6
-7
-## Editing8
-- **Context sensitive Timeline tool cursor** This was originally part of non-features list of the design, but it seems that users prefer this, and we will look for a way to incoporate this with current design.9
+## The 2.0 FEATURE SET10
+- **New display MLT service or method**. SDL1.2 will be eventually lost as SDL2 is made default on all distros.This is part of the solution for several issues. #309 #329 11
+- **Performance review and needed fixes** This needs some investigation and it needs to be made sure that the new display method is as performant as possible.12
+- **Context sensitive Timeline tool cursor** This was originally part of non-features list of the design, but it seems that users prefer this, and we will look for a way to incoporate this with current design. #424 13
+- **Autofollow compositors** Compositors will be made to follow their origin clips automatically if user so chooses.14
- **Automatic Timeline Rendering** The only way to provide smooth playback in all circumstances is to do some form of timeline rendering. There are some ideas here that will be attempted, but cannot be quaranteed to work beforehand.15
-16
-## Tracks17
+- **Proxy Editing** should have all important improvements. #398 18
+- **Audio scratching** on timeline. #9519
+- **Dedicated masking/keying/full affine tool and/or new MLT services** to close related functionality gaps. #372 20
+- **Binary packaging** At least one of Appimage, Snap, Flatpack. #45321
+- **Translations workflow update** These need the easiest, most moders workflows available.22
+- **Website update** Some existing features are missing, add *Contributing* text.23
+24
+### Other possible developments25
- **Track filters stack** for both video and audio tracks.26
-27
-## Filters28
- Contribute **filters for MLT**. Spotligt, affine transform filter seem most interesting. Frei0r is not an adequate platform for some of these. may require using Cairo.29
- **Selective Filter Application**, this function allows user to apply any filter only inside an area defined by alpha filters. This can currently be simulated with two clips. Requires MLT contribution.30
-31
-## Compositing32
-33
- **Animated Image to Alpha**, combines two images sources using luma information from a third source, probably a frame sequence34
-- animated line/curve masks, this may also be best done using **Cairo**. Requires MLT contribution.35
- add to all alpha filters composing methods union, intersection, difference and exclusion. Requires MLT and Frei0r contribution.36
-37
-## Tools development38
-- dedicated masking/keying tool39
-40
-## Tool integration41
+- **Configurable Keyboard Shortcuts**42
- **Media Item creation** from ready made programs for e.g. text animations with Natron43
- Gimp, Inkscape, Audacity, Krita examined as **Timeline Container Clip** media creator programs44
-45
-## Audio46
-- audio scratching on playback47
- subbuses or virtual channels to help with mixing.48
- a 5.1 surround audio track mixing49
- synching audio with audio50
- jack integration51
-52
-## Editor functionality53
-54
-- Configurable Keyboard Shortcuts.55
-56
-57
-## Packaging58
-59
-- Appimage, Snap, Flatpack. Appimage is done first, Snap second and Flatpack is assessed last.60
-61
-## Communications62
-63
-- translations workflow update. 64
-- website update65
- 5 - 10 tutorial videos on some important workflow issues66
- forum with threads67
-68
-69
-## Technical development70
- **GPU Rendering** MLT already contains support for GPU rendering for certain filters71
-- The **Wayland** transition using SDL2 or OpenGL consumer. SDL2 consumer does not exist and would need to be contributed.72
73
74
75
*Changelog*76
+- *14-11-2017 Change document focus to 2.0 feature set*77
- *20-9-2017 drop FFMpeg tool, Container clips are done, add Editing section*78
- *13-5-17 Remove undoable items related to animating property values in in MLT, require too large MLt controinutions for the time being*79
- *13-5-17 Remove completed items and items that will be in 1.14*80
flowblade-1.16.tar.gz/flowblade-trunk/docs/SDL_2_AND_MLT_6_6_0.md
Added
16
1
2
+# Flowblade, SDL 2 and MLT 6.6.0 and later3
+4
+**MLT 6.6.0 and later need to be compiled with SDL 1.2 support for Flowblade to work.**5
+6
+There were some developments with Flowblade, SDL and MLT from autumn 2017 onwards, here are the main points:7
+8
+1. All releases of MLT up until 6.4.1 used SDL 1.2 in "sdl" module for Flowblade related video display.9
+2. Autumn 2017 MLT switched to using SDL 2.0 in module "sdl". This broke Flowblade video display.10
+3. SDL 2.0 dropped YUV overlay API used by Flowblade video display consumer, and SDL 2.0 does not provide similar functionality.11
+4. For release 6.6.0 MLT switched to having two SDL related modules: "sdl" and "sdl2".12
+5. The "sdl" module uses SDL 1.2 and this module needs to be compiled into MLT 6.6.0 for Flowblade to work.13
+6. Both "sdl" and "sdl2" modules can be compiled into MLT 6.6.014
+15
+An example of switches for compiling MLT with SDL 1.2 support can be found in this Flatpak definition file: https://github.com/flathub/io.github.jliljebl.Flowblade/blob/master/io.github.jliljebl.Flowblade.json16
flowblade-1.14.tar.gz/flowblade-trunk/flowblade -> flowblade-1.16.tar.gz/flowblade-trunk/flowblade
Changed
10
1
2
import os3
import sys4
5
-print "FLOWBLADE MOVIE EDITOR 1.14"6
+print "FLOWBLADE MOVIE EDITOR 1.16"7
print "---------------------------"8
9
10
flowblade-1.14.tar.gz/flowblade-trunk/installdata/flowblade.desktop -> flowblade-1.16.tar.gz/flowblade-trunk/installdata/flowblade.desktop
Changed
10
1
2
GenericName=Movie Editor3
X-GNOME-FullName=Flowblade Movie Editor4
Comment=Edit media to create movies5
-Exec=flowblade %f6
+Exec=env GDK_BACKEND=x11 flowblade %f7
Terminal=false8
Type=Application9
Icon=flowblade10
flowblade-1.14.tar.gz/flowblade-trunk/setup.py -> flowblade-1.16.tar.gz/flowblade-trunk/setup.py
Changed
10
1
2
locale_files.append(filepath)3
4
setup( name='flowblade',5
- version='1.14.0',6
+ version='1.16.0',7
author='Janne Liljeblad',8
author_email='janne.liljeblad at gmail dot com',9
description='Non-linear video editor',10
flowblade-1.16.tar.gz/issue_template.md
Added
8
1
2
+Please include the following information.3
+1) Flowblade version (Help->About):4
+2) MLT version (Help->Runtime Environment):5
+3) Your distribution (Ubuntu, Debian, Mint etc.):6
+7
+8