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 5
flowblade.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Tue Mar 21 18:43:57 UTC 2017 - avvissu@yandex.by4
+5
+- Update to 1.12.2:6
+ * see /usr/share/doc/packages/flowblade/RELEASE_NOTES 7
+8
+-------------------------------------------------------------------9
Thu Jan 12 16:55:58 UTC 2017 - avvissu@yandex.by10
11
- Update to 1.10:12
flowblade.spec
Changed
19
1
2
3
%define prjname Flowblade4
Name: flowblade5
-Version: 1.106
+Version: 1.12.27
Release: 08
Summary: Multitrack non-linear video editor9
License: GPL-3.010
11
rm -rf %{buildroot}%{_libexecdir}/mime/packages/%{name}12
13
%fdupes -s %{buildroot}%{python_sitelib}14
-%find_lang %{name} %{name}.lang15
+%find_lang %{name}16
17
%post18
%mime_database_post19
flowblade-1.10.tar.gz/README.md -> flowblade-1.12.2.tar.gz/README.md
Changed
33
1
2
3
4
5
+**NEW RELEASE 1.12 is out. Relesase notes [here](./flowblade-trunk/docs/RELEASE_NOTES.md).**6
+7
+**Installing instructions are available [here](./flowblade-trunk/docs/INSTALLING.md).**8
+9
**Contents:**10
1. [Introduction](https://github.com/jliljebl/flowblade#introduction)11
1. [Features](https://github.com/jliljebl/flowblade#features)12
13
14
**Editing:**15
16
- * 3 move tools17
+ * 4 move tools18
* 3 trim tools19
* 4 methods to insert / overwrite / append clips on the timeline20
* Drag'n'Drop clips on the timeline21
22
23
# Releases24
25
-**Latest release:** Flowblade Movie Editor 1.8 was released on September 19, 2016.26
+**Latest release:** Flowblade Movie Editor 1.12 was released on March 2016.27
28
-**Next release:** Flowblade Movie Editor 1.10 will be out on December 2016.29
+**Next release:** Flowblade Movie Editor 1.12 will be out on August 2017.30
31
# Installing Flowblade32
33
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/app.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/app.py
Changed
11
1
2
if new_project.update_media_lengths_on_load == True:3
projectaction.update_media_lengths()4
5
+ gui.editor_window.handle_insert_move_mode_button_press()6
+ editorstate.trim_mode_ripple = False7
+8
#editorstate.project.c_seq.print_all()9
10
def change_current_sequence(index):11
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/appconsts.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/appconsts.py
Changed
12
1
2
MLT_SERVICE = "mlt_service"3
EXTRA_EDITOR = "extraeditor"4
5
-# Available tracks configurations for flowblade6
-TRACK_CONFIGURATIONS = [(5,4),(4,3),(3,2),(2,1),(7,2),(2,7),(8,1),(1,8)]7
+# Available tracks max for flowblade8
+MAX_TRACKS = 99
10
# Thumbnail image dimensions11
THUMB_WIDTH = 11612
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/boxmove.py
Added
201
1
2
+"""3
+ Flowblade Movie Editor is a nonlinear video editor.4
+ Copyright 2012 Janne Liljeblad.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
+Handles Overwrite Box tool functionality.24
+"""25
+26
+import edit27
+import editorstate28
+from editorstate import current_sequence29
+import tlinewidgets30
+import updater31
+32
+box_selection_data = None33
+edit_data = None34
+35
+def clear_data():36
+ # these need to cleared when box move tool is activated37
+ global box_selection_data, edit_data38
+ box_selection_data = None39
+ edit_data = None40
+ 41
+def mouse_press(event, frame):42
+ global edit_data, box_selection_data43
+ if box_selection_data == None: # mouse action to select44
+ press_point = (event.x, event.y)45
+ 46
+ edit_data = {"action_on":True,47
+ "press_point":press_point,48
+ "mouse_point":press_point,49
+ "box_selection_data":None}50
+ else: # mouse action to move51
+ if box_selection_data.is_hit(event.x, event.y) == False:52
+ # Back to start state53
+ edit_data = None54
+ box_selection_data = None55
+ else:56
+ edit_data = {"action_on":True,57
+ "press_frame":frame,58
+ "delta":0,59
+ "box_selection_data":box_selection_data}60
+ 61
+ tlinewidgets.set_edit_mode(edit_data, tlinewidgets.draw_overwrite_box_overlay)62
+ updater.repaint_tline()63
+ 64
+def mouse_move(x, y, frame):65
+ global edit_data66
+ if edit_data == None:67
+ return68
+ if box_selection_data == None: # mouse action to select69
+ edit_data["mouse_point"] = (x, y)70
+ 71
+ else: # mouse move to move72
+ delta = frame - edit_data["press_frame"]73
+ edit_data["delta"] = delta74
+75
+ tlinewidgets.set_edit_mode_data(edit_data)76
+ updater.repaint_tline()77
+ 78
+def mouse_release(x, y, frame):79
+ global box_selection_data, edit_data80
+ if edit_data == None:81
+ return82
+ 83
+ if box_selection_data == None: # mouse action to select84
+ box_selection_data = BoxMoveData(edit_data["press_point"], (x, y))85
+ if box_selection_data.is_empty() == False:86
+ edit_data = {"action_on":True,87
+ "press_frame":frame,88
+ "delta":0,89
+ "box_selection_data":box_selection_data}90
+ else:91
+ box_selection_data = None92
+ edit_data = {"action_on":False,93
+ "press_frame":-1,94
+ "delta":0,95
+ "box_selection_data":box_selection_data}96
+ else: # mouse action to move97
+ delta = frame - edit_data["press_frame"]98
+ edit_data["delta"] = delta99
+100
+ # Do edit101
+ data = {"box_selection_data":box_selection_data,102
+ "delta":delta}103
+ action = edit.box_overwrite_move_action(data)104
+ action.do_edit()105
+ 106
+ # Back to start state107
+ edit_data = None108
+ box_selection_data = None109
+ 110
+ tlinewidgets.set_edit_mode_data(edit_data)111
+ updater.repaint_tline()112
+113
+114
+class BoxMoveData:115
+ """116
+ This class collects and data needed for boxovewrite moves.117
+ """118
+ def __init__(self, p1, p2):119
+ self.topleft_frame = -1120
+ self.topleft_track = -1121
+ self.width_frames = -1122
+ self.height_tracks = -1123
+ self.track_selections = []124
+ self.selected_compositors = []125
+ 126
+ self._get_selection_data(p1, p2)127
+128
+ def _get_selection_data(self, p1, p2):129
+ x1, y1 = p1130
+ x2, y2 = p2131
+ 132
+ if x1 > x2:133
+ x1, x2 = x2, x1134
+ if y1 > y2:135
+ y1, y2 = y2, y1136
+ 137
+ start_frame = tlinewidgets.get_frame(x1)138
+ end_frame = tlinewidgets.get_frame(x2) 139
+ 140
+ track_top_index = self.get_bounding_track_index(y1, tlinewidgets.get_track(y1))141
+ track_bottom_index = self.get_bounding_track_index(y2, tlinewidgets.get_track(y2))142
+143
+ self.topleft_track = track_top_index - 1144
+145
+ # Get compositors146
+ for i in range(track_bottom_index + 1, track_top_index):147
+ track_compositors = current_sequence().get_track_compositors(i)148
+ for comp in track_compositors:149
+ if comp.clip_in >= start_frame and comp.clip_out < end_frame:150
+ self.selected_compositors.append(comp)151
+ 152
+ # Get BoxTrackSelection objects153
+ for i in range(track_bottom_index + 1, track_top_index):154
+ self.track_selections.append(BoxTrackSelection(i, start_frame, end_frame))155
+156
+ # Drop empty tracks from bottom up157
+ while len(self.track_selections) > 0:158
+ if self.track_selections[0].is_empty() == True:159
+ self.track_selections.pop(0)160
+ else:161
+ track_bottom_index = self.track_selections[0].track_id162
+ break163
+ 164
+ # Drop empty tracks from top down165
+ while len(self.track_selections) > 0:166
+ if self.track_selections[-1].is_empty() == True:167
+ self.track_selections.pop(-1)168
+ else:169
+ self.topleft_track = self.track_selections[-1].track_id170
+ break171
+172
+ self.height_tracks = self.topleft_track - track_bottom_index + 1# self.topleft_track is inclusive to height, track_bottom_index is eclusive to height173
+ 174
+ # Get selection bounding box175
+ self.topleft_frame = 1000000000000176
+ for track_selection in self.track_selections:177
+ if track_selection.range_frame_in != -1:178
+ if track_selection.range_frame_in < self.topleft_frame:179
+ self.topleft_frame = track_selection.range_frame_in180
+ 181
+ last_frame = 0182
+ for track_selection in self.track_selections:183
+ if track_selection.range_frame_out != -1:184
+ if track_selection.range_frame_out > last_frame:185
+ last_frame = track_selection.range_frame_out186
+ 187
+ self.width_frames = last_frame - self.topleft_frame188
+ 189
+ def get_bounding_track_index(self, mouse_y, tline_track):190
+ if tline_track == None:191
+ if mouse_y < tlinewidgets.REF_LINE_Y:192
+ return len(current_sequence().tracks) # mouse pressed above all tracks193
+ else:194
+ return 0 # mouse pressed below all tracks195
+ else:196
+ return tline_track.id197
+198
+ def is_empty(self):199
+ if len(self.track_selections) == 0:200
+ return True201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py
Changed
18
1
2
# Used to update kfeditors with external tline frame position changes3
keyframe_editor_widgets = []4
5
-compositor_notebook_index = 3 # this is set 2 for 2 window mode6
+compositor_notebook_index = 3 # this is set 2 for the 2 window mode7
8
def create_widgets():9
"""10
11
12
# Right side13
widgets.empty_label = Gtk.Label(label=_("No Compositor"))14
- #gui.label = widgets.empty_label15
widgets.value_edit_box = Gtk.VBox()16
widgets.value_edit_box.pack_start(widgets.empty_label, True, True, 0)17
widgets.value_edit_frame = Gtk.Frame()18
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/dialogs.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/dialogs.py
Changed
194
1
2
profiles_vbox = guiutils.get_vbox([profile_select,profile_info_box], False)3
profiles_frame = panels.get_named_frame(_("Profile"), profiles_vbox)4
5
- tracks_combo, tracks_combo_values_list = guicomponents.get_track_counts_combo_and_values_list()6
- tracks_select = panels.get_two_column_box(Gtk.Label(label=_("Number of tracks:")),7
- tracks_combo, 250)8
- tracks_vbox = guiutils.get_vbox([tracks_select], False)9
+ tracks_select = guicomponents.TracksNumbersSelect(5, 4)10
+ 11
+ tracks_vbox = guiutils.get_vbox([tracks_select.widget], False)12
13
tracks_frame = panels.get_named_frame(_("Tracks"), tracks_vbox)14
15
16
dialogutils.set_outer_margins(dialog.vbox)17
dialog.vbox.pack_start(alignment, True, True, 0)18
_default_behaviour(dialog)19
- dialog.connect('response', callback, out_profile_combo, tracks_combo,20
- tracks_combo_values_list)21
+ dialog.connect('response', callback, out_profile_combo, tracks_select)22
23
out_profile_combo.connect('changed', lambda w: _new_project_profile_changed(w, profile_info_box))24
dialog.show_all()25
26
27
img = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")28
flow_label = Gtk.Label(label="Flowblade Movie Editor")29
- ver_label = Gtk.Label(label="1.10.0")30
+ ver_label = Gtk.Label(label="1.12.0")31
janne_label = Gtk.Label(label="Copyright 2016 Janne Liljeblad and contributors")32
page_label = Gtk.Label(label="Project page: https://github.com/jliljebl/flowblade")33
flow_label.modify_font(Pango.FontDescription("sans bold 14"))34
35
alignment3 = dialogutils.get_default_alignment(license_view)36
alignment3.set_size_request(450, 370)37
38
+ lead_label = Gtk.Label(label="Lead Developer:")39
+ lead_label.modify_font(Pango.FontDescription("sans bold 12"))40
+ lead_info = Gtk.Label(label="Janne Liljeblad")41
+ developers_label = Gtk.Label("Developers:")42
+ developers_label.modify_font(Pango.FontDescription("sans bold 12"))43
+44
+ devs_file = open(respaths.DEVELOPERS_DOC)45
+ devs_text = devs_file.read()46
+ devs_info = Gtk.Label(label=devs_text)47
+48
+ contributos_label = Gtk.Label(label="Contributors:")49
+ contributos_label.modify_font(Pango.FontDescription("sans bold 12"))50
+ 51
+ contributors_file = open(respaths.CONTRIBUTORS_DOC)52
+ contributors_text = contributors_file.read()53
+54
+ contributors_view = Gtk.TextView()55
+ contributors_view.set_editable(False)56
+ contributors_view.set_pixels_above_lines(2)57
+ contributors_view.set_left_margin(2)58
+ contributors_view.set_wrap_mode(Gtk.WrapMode.WORD)59
+ contributors_view.get_buffer().set_text(contributors_text)60
+ guiutils.set_margins(contributors_view, 0, 0, 30, 30)61
+ 62
+ vbox3 = Gtk.VBox(False, 4)63
+ vbox3.pack_start(guiutils.get_pad_label(30, 12), False, False, 0)64
+ vbox3.pack_start(lead_label, False, False, 0)65
+ vbox3.pack_start(lead_info, False, False, 0)66
+ vbox3.pack_start(guiutils.get_pad_label(30, 22), False, False, 0)67
+ vbox3.pack_start(developers_label, False, False, 0)68
+ vbox3.pack_start(guiutils.get_centered_box([devs_info]), False, False, 0)69
+ vbox3.pack_start(guiutils.get_pad_label(30, 22), False, False, 0)70
+ vbox3.pack_start(contributos_label, False, False, 0)71
+ vbox3.pack_start(contributors_view, False, False, 0)72
+ 73
+ alignment5 = dialogutils.get_default_alignment(vbox3)74
+ alignment5.set_size_request(450, 370)75
+ 76
translations_view = guicomponents.get_translations_scroll_widget((450, 370))77
alignment4 = dialogutils.get_default_alignment(translations_view)78
alignment4.set_size_request(450, 370)79
80
notebook.append_page(alignment, Gtk.Label(label=_("Application")))81
notebook.append_page(alignment2, Gtk.Label(label=_("Thanks")))82
notebook.append_page(alignment3, Gtk.Label(label=_("License")))83
+ notebook.append_page(alignment5, Gtk.Label(label=_("Developers")))84
notebook.append_page(alignment4, Gtk.Label(label=_("Translations")))85
guiutils.set_margins(notebook, 6, 6, 6, 0)86
87
88
Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,89
(_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,90
_("Change Tracks").encode('utf-8'), Gtk.ResponseType.ACCEPT))91
-92
- tracks_combo, tracks_combo_values_list = guicomponents.get_track_counts_combo_and_values_list()93
- tracks_select = panels.get_two_column_box(Gtk.Label(label=_("New Number of Tracks:")),94
- tracks_combo,95
- 250)96
+ 97
+ tracks_select = guicomponents.TracksNumbersSelect(5, 4)98
+ 99
info_text = _("Please note:\n") + \100
u"\u2022" + _(" It is recommended that you save Project before completing this operation\n") + \101
u"\u2022" + _(" There is no Undo for this operation\n") + \102
103
tracks_vbox = Gtk.VBox(False, 2)104
tracks_vbox.pack_start(info_box, False, False, 0)105
tracks_vbox.pack_start(pad, False, False, 0)106
- tracks_vbox.pack_start(tracks_select, False, False, 0)107
+ tracks_vbox.pack_start(tracks_select.widget, False, False, 0)108
109
alignment = dialogutils.get_alignment2(tracks_vbox)110
111
dialog.vbox.pack_start(alignment, True, True, 0)112
dialogutils.set_outer_margins(dialog.vbox)113
_default_behaviour(dialog)114
- dialog.connect('response', callback, tracks_combo)115
+ dialog.connect('response', callback, tracks_select)116
dialog.show_all()117
118
def new_sequence_dialog(callback, default_name):119
120
name_select = panels.get_two_column_box(Gtk.Label(label=_("Sequence Name:")),121
name_entry,122
250)123
-124
- tracks_combo, tracks_combo_values_list = guicomponents.get_track_counts_combo_and_values_list()125
- tracks_select = panels.get_two_column_box(Gtk.Label(label=_("Number of Tracks:")),126
- tracks_combo,127
- 250)128
-129
+ 130
+ tracks_select = guicomponents.TracksNumbersSelect(5, 4)131
+ 132
open_check = Gtk.CheckButton()133
open_check.set_active(True)134
open_label = Gtk.Label(label=_("Open For Editing:"))135
136
137
tracks_vbox = Gtk.VBox(False, 2)138
tracks_vbox.pack_start(name_select, False, False, 0)139
- tracks_vbox.pack_start(tracks_select, False, False, 0)140
+ tracks_vbox.pack_start(guiutils.get_pad_label(12, 2), False, False, 0)141
+ tracks_vbox.pack_start(tracks_select.widget, False, False, 0)142
tracks_vbox.pack_start(guiutils.get_pad_label(12, 12), False, False, 0)143
tracks_vbox.pack_start(open_hbox, False, False, 0)144
145
146
dialog.vbox.pack_start(alignment, True, True, 0)147
dialogutils.set_outer_margins(dialog.vbox)148
_default_behaviour(dialog)149
- dialog.connect('response', callback, (name_entry, tracks_combo, open_check))150
+ dialog.connect('response', callback, (name_entry, tracks_select, open_check))151
dialog.show_all()152
153
def new_media_name_dialog(callback, media_file):154
155
tline_vbox.pack_start(_get_kb_row("M", _("Add Mark")), False, False, 0)156
tline_vbox.pack_start(_get_kb_row(_("Control + C"), _("Copy Clips")), False, False, 0)157
tline_vbox.pack_start(_get_kb_row(_("Control + V"), _("Paste Clips")), False, False, 0)158
- tline_vbox.pack_start(_get_kb_row(_("R"), _("Resync selected Clip or Compositor")), False, False, 0)159
+ tline_vbox.pack_start(_get_kb_row(_("R"), _("Trim Tool Ripple Mode On/Off")), False, False, 0)160
+ tline_vbox.pack_start(_get_kb_row(_("S"), _("Resync selected Clip or Compositor")), False, False, 0)161
tline_vbox.pack_start(_get_kb_row(_("G"), _("Log Marked Clip Range")), False, False, 0)162
tline_vbox.pack_start(_get_kb_row(_("Left Arrow "), _("Prev Frame Trim Edit")), False, False, 0)163
tline_vbox.pack_start(_get_kb_row(_("Right Arrow"), _("Next Frame Trim Edit")), False, False, 0)164
165
play_vbox.pack_start(_get_kb_row(_("Up Arrow"), _("Next Edit/Mark")), False, False, 0)166
play_vbox.pack_start(_get_kb_row(_("Down Arrow"), _("Prev Edit/Mark")), False, False, 0)167
play_vbox.pack_start(_get_kb_row(_("HOME"), _("Go To Start")), False, False, 0)168
+ play_vbox.pack_start(_get_kb_row(_("END"), _("Go To End")), False, False, 0)169
play_vbox.pack_start(_get_kb_row(_("Shift + I"), _("To Mark In")), False, False, 0)170
play_vbox.pack_start(_get_kb_row(_("Shift + O"), _("To Mark Out")), False, False, 0)171
play = guiutils.get_named_frame(_("Playback"), play_vbox)172
173
tools_vbox.pack_start(_get_kb_row("4", _("Roll")), False, False, 0)174
tools_vbox.pack_start(_get_kb_row("5", _("Slip")), False, False, 0)175
tools_vbox.pack_start(_get_kb_row("6", _("Spacer")), False, False, 0)176
+ tools_vbox.pack_start(_get_kb_row("7", _("Box")), False, False, 0)177
+ tools_vbox.pack_start(_get_kb_row(_("R"), _("Trim Tool Ripple Mode On/Off")), False, False, 0)178
tools = guiutils.get_named_frame(_("Tools"), tools_vbox)179
180
geom_vbox = Gtk.VBox()181
- geom_vbox.pack_start(_get_kb_row(_("Left Arrow "), _("Move Source Video Left")), False, False, 0)182
- geom_vbox.pack_start(_get_kb_row(_("Right Arrow"), _("Move Source Video Right")), False, False, 0)183
- geom_vbox.pack_start(_get_kb_row(_("Up Arrow"), _("Move Source Video Up")), False, False, 0)184
- geom_vbox.pack_start(_get_kb_row(_("Down Arrow"), _("Move Source Video Down")), False, False, 0)185
+ geom_vbox.pack_start(_get_kb_row(_("Left Arrow "), _("Move Source Video Left 1px")), False, False, 0)186
+ geom_vbox.pack_start(_get_kb_row(_("Right Arrow"), _("Move Source Video Right 1px")), False, False, 0)187
+ geom_vbox.pack_start(_get_kb_row(_("Up Arrow"), _("Move Source Video Up 1px")), False, False, 0)188
+ geom_vbox.pack_start(_get_kb_row(_("Down Arrow"), _("Move Source Video Down 1px")), False, False, 0)189
+ geom_vbox.pack_start(_get_kb_row(_("Control + Arrow"), _("Move Source Video 10px")), False, False, 0)190
+ geom_vbox.pack_start(_get_kb_row(_("Control + Mouse Drag"), _("Keep Aspect Ratio in Affine Blend scaling")), False, False, 0) 191
geom_vbox.pack_start(_get_kb_row(_("Shift"), _("Snap to X or Y of drag start point")), False, False, 0)192
geom = guiutils.get_named_frame(_("Geometry Editor"), geom_vbox)193
194
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/edit.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/edit.py
Changed
201
1
2
Edits, undos and redos are done by creating and calling methods on these 3
EditAction objects and placing them on the undo/redo stack.4
"""5
+6
import audiowaveform7
import appconsts8
import compositeeditor9
10
# HACK, see EditAction for details11
self.turn_on_stop_for_edit = True12
13
- 14
+15
+#----------------- BOX OVERWRITE MOVE16
+# "box_selection_data","delta"17
+# Lifts clips from track and overwrites part of track with them for multple tracks18
+# Move compositors contained by selection too.19
+def box_overwrite_move_action(data):20
+ action = EditAction(_box_overwrite_move_undo, _box_overwrite_move_redo, data)21
+ action.turn_on_stop_for_edit = True22
+ return action23
+24
+def _box_overwrite_move_undo(self):25
+ 26
+ # Do track move edits27
+ for move_data in self.track_moves:28
+ action_object = utils.EmptyClass29
+ action_object.__dict__.update(move_data)30
+31
+ _overwrite_move_undo(action_object)32
+33
+ # Move compositors34
+ for comp in self.box_selection_data.selected_compositors:35
+ comp.move(-self.delta)36
+ 37
+def _box_overwrite_move_redo(self):38
+ # Create data for track overwite moves39
+ if not hasattr(self, "track_moves"):40
+ self.track_moves = []41
+ for track_selection in self.box_selection_data.track_selections:42
+ if track_selection.range_frame_in != -1:43
+ track_move_data = {"track":current_sequence().tracks[track_selection.track_id],44
+ "over_in":track_selection.range_frame_in + self.delta,45
+ "over_out":track_selection.range_frame_out + self.delta,46
+ "selected_range_in":track_selection.selected_range_in,47
+ "selected_range_out":track_selection.selected_range_out,48
+ "move_edit_done_func":None}49
+50
+ self.track_moves.append(track_move_data)51
+52
+ else:53
+ # This may not be necessery...but its going in to make sure move_data is always same54
+ for move_data in self.track_moves:55
+ move_data.pop("removed_clips")56
+57
+ # Do track move edits58
+ for move_data in self.track_moves:59
+ action_object = utils.EmptyClass60
+ action_object.__dict__.update(move_data)61
+62
+ _overwrite_move_redo(action_object)63
+ 64
+ # Copy data created in _overwrite_move_redo() that is needed in _overwrite_move_undo65
+ move_data.update(action_object.__dict__)66
+ 67
+ # Move compositors68
+ for comp in self.box_selection_data.selected_compositors:69
+ comp.move(self.delta)70
+71
#----------------- MULTITRACK OVERWRITE MOVE72
# "track","to_track","over_in","over_out","selected_range_in"73
# "selected_range_out","move_edit_done_func"74
75
76
return tracks_list77
78
+#-------------------------------------------- RIPPLE TRIM END79
+# "track","clip","index","edit_delta","first_do","multi_data"80
+# self.multi_data is trimmodes.RippleData81
+def ripple_trim_end_action(data):82
+ action = EditAction(_ripple_trim_end_undo, _ripple_trim_end_redo, data)83
+ action.exit_active_trimmode_on_edit = False84
+ action.update_hidden_track_blank = False85
+ return action86
+87
+def _ripple_trim_end_undo(self):88
+ _remove_clip(self.track, self.index)89
+ _insert_clip(self.track, self.clip, self.index,90
+ self.clip.clip_in, self.clip.clip_out - self.edit_delta)91
+ 92
+ _ripple_trim_blanks_undo(self)93
+ 94
+def _ripple_trim_end_redo(self):95
+ _remove_clip(self.track, self.index)96
+ _insert_clip(self.track, self.clip, self.index,97
+ self.clip.clip_in, self.clip.clip_out + self.edit_delta)98
+99
+ _ripple_trim_blanks_redo(self)100
+ 101
+ # Reinit one roll trim102
+ if self.first_do == True:103
+ self.first_do = False104
+ self.undo_done_callback(self.track, self.index + 1, False)105
+106
+#-------------------------------------------- RIPPLE TRIM START107
+# "track","clip","index","edit_delta","first_do","multi_data"108
+# self.multi_data is trimmodes.RippleData109
+def ripple_trim_start_action(data):110
+ action = EditAction(_ripple_trim_start_undo,_ripple_trim_start_redo, data)111
+ action.exit_active_trimmode_on_edit = False112
+ action.update_hidden_track_blank = False113
+ return action114
+115
+def _ripple_trim_start_undo(self):116
+ _remove_clip(self.track, self.index)117
+ _insert_clip(self.track, self.clip, self.index,118
+ self.clip.clip_in - self.edit_delta, self.clip.clip_out)119
+120
+ _ripple_trim_blanks_undo(self, True)121
+122
+def _ripple_trim_start_redo(self):123
+ _remove_clip(self.track, self.index)124
+ _insert_clip(self.track, self.clip, self.index,125
+ self.clip.clip_in + self.edit_delta, self.clip.clip_out)126
+127
+ _ripple_trim_blanks_redo(self, True)128
+ 129
+ # Reinit one roll trim, when used with clip start drag this is not needed130
+ if hasattr(self, "first_do") and self.first_do == True:131
+ self.first_do = False132
+ self.undo_done_callback(self.track, self.index, True)133
+134
+#------------------ RIPPLE TRIM LAST CLIP END135
+# "track","clip","index","edit_delta","first_do","multi_data"136
+# self.multi_data is trimmodes.RippleData137
+def ripple_trim_last_clip_end_action(data): 138
+ action = EditAction(_ripple_trim_last_clip_end_undo,_ripple_trim_last_clip_end_redo, data)139
+ action.exit_active_trimmode_on_edit = False140
+ action.update_hidden_track_blank = False141
+ return action142
+143
+def _ripple_trim_last_clip_end_undo(self):144
+ _remove_clip(self.track, self.index)145
+ _insert_clip(self.track, self.clip, self.index,146
+ self.clip.clip_in, self.clip.clip_out - self.edit_delta)147
+148
+ _ripple_trim_blanks_undo(self)149
+150
+def _ripple_trim_last_clip_end_redo(self):151
+ print self.__dict__152
+ _remove_clip(self.track, self.index)153
+ _insert_clip(self.track, self.clip, self.index,154
+ self.clip.clip_in, self.clip.clip_out + self.edit_delta)155
+156
+ _ripple_trim_blanks_redo(self)157
+ 158
+ # Reinit one roll trim for continued trim mode, whenused with clip end drag this is not needed159
+ if hasattr(self, "first_do") and self.first_do == True:160
+ self.first_do = False161
+ self.undo_done_callback(self.track)162
+ 163
+# ----------------------------- RIPPLE TRIM BLANK UPDATE METHODS164
+def _ripple_trim_blanks_undo(self, reverse_comp_delta=False):165
+ track_moved = self.multi_data.track_affected 166
+ tracks = current_sequence().tracks167
+168
+ applied_delta = self.edit_delta169
+ 170
+ for i in range(1, len(tracks) - 1):171
+ if not track_moved[i - 1]:172
+ continue173
+ if self.track.id == i:174
+ continue175
+176
+ track = tracks[i]177
+ edit_op = self.multi_data.track_edit_ops[i - 1] 178
+ trim_blank_index = self.multi_data.trim_blank_indexes[i - 1]179
+ 180
+ if edit_op == appconsts.MULTI_NOOP:181
+ continue182
+ elif edit_op == appconsts.MULTI_TRIM:183
+ blank_length = track.clips[trim_blank_index].clip_length()184
+ _remove_clip(track, trim_blank_index) 185
+ _insert_blank(track, trim_blank_index, blank_length - applied_delta)186
+ elif edit_op == appconsts.MULTI_ADD_TRIM:187
+ _remove_clip(track, trim_blank_index) 188
+ elif edit_op == appconsts.MULTI_TRIM_REMOVE:189
+ #print "MULTI_TRIM_REMOVE for track", track.id, "values: ", self.edit_delta, applied_delta, -self.multi_data.max_backwards190
+ if reverse_comp_delta:191
+ if -self.edit_delta != -self.multi_data.max_backwards:192
+ _remove_clip(track, trim_blank_index) 193
+ else:194
+ if self.edit_delta != -self.multi_data.max_backwards:195
+ _remove_clip(track, trim_blank_index) 196
+ 197
+ _insert_blank(track, trim_blank_index, self.orig_length)198
+199
+ if reverse_comp_delta:200
+ applied_delta = -applied_delta201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editevent.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/editevent.py
Changed
58
1
2
from gi.repository import Gdk3
4
import appconsts5
+import boxmove6
import clipeffectseditor7
import clipenddragmode8
import compositeeditor9
10
# -------------------------------------------------------------- move modes11
def insert_move_mode_pressed():12
"""13
- User selects insert move mode.14
+ User selects Insert tool.15
"""16
stop_looping()17
current_sequence().clear_hidden_track()18
19
20
def overwrite_move_mode_pressed():21
"""22
- User selects overwrite move mode.23
+ User selects Overwrite tool.24
"""25
stop_looping()26
current_sequence().clear_hidden_track()27
28
editorstate.edit_mode = editorstate.OVERWRITE_MOVE29
+ # Box tool is implemeted as sub mode of OVERWRITE_MOVE so this false30
+ editorstate.overwrite_mode_box = False31
tlinewidgets.set_edit_mode(None, tlinewidgets.draw_overwrite_overlay)32
33
_set_move_mode()34
35
+def box_mode_pressed():36
+ """37
+ User selects Box tool.38
+ """39
+ stop_looping()40
+ current_sequence().clear_hidden_track()41
+ 42
+ # Box tool is implemeted as sub mode of OVERWRITE_MOVE43
+ editorstate.edit_mode = editorstate.OVERWRITE_MOVE44
+ editorstate.overwrite_mode_box = True45
+ boxmove.clear_data()46
+ 47
+ tlinewidgets.set_edit_mode(None, None) # these get set later for box move48
+ 49
+ _set_move_mode()50
+ 51
def multi_mode_pressed():52
+ """53
+ User selects Spacer tool.54
+ """55
stop_looping()56
current_sequence().clear_hidden_track()57
58
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py
Changed
79
1
2
3
def update_prefs_from_widgets(widgets_tuples_tuple):4
# Unpack widgets5
- gen_opts_widgets, edit_prefs_widgets, view_prefs_widgets = widgets_tuples_tuple6
+ gen_opts_widgets, edit_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
auto_play_in_clip_monitor_check, auto_center_check, grfx_insert_length_spin, \12
- trim_exit_click, trim_quick_enter, remember_clip_frame, overwrite_clip_drop, cover_delete, play_pause_button = edit_prefs_widgets13
+ 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 = edit_prefs_widgets15
16
- use_english, disp_splash, buttons_style, dark_theme, theme_combo, audio_levels_combo, window_mode_combo = view_prefs_widgets17
+ use_english, disp_splash, buttons_style, dark_theme, theme_combo, audio_levels_combo, window_mode_combo, full_names = view_prefs_widgets18
+19
+ # Jan-2017 - SvdB20
+ perf_render_threads, perf_drop_frames = performance_widgets21
22
global prefs23
prefs.open_in_last_opended_media_dir = open_in_last_opened_check.get_active()24
25
prefs.trans_cover_delete = cover_delete.get_active()26
# Jul-2016 - SvdB - For play/pause button27
prefs.play_pause = play_pause_button.get_active()28
+ prefs.hide_file_ext = hide_file_ext_button.get_active()29
+ prefs.mouse_scroll_action_is_zoom = (mouse_scroll_action.get_active() == 0)30
31
prefs.use_english_always = use_english.get_active()32
prefs.display_splash_screen = disp_splash.get_active()33
34
prefs.theme_fallback_colors = theme_combo.get_active() 35
prefs.display_all_audio_levels = (audio_levels_combo.get_active() == 0)36
prefs.global_layout = window_mode_combo.get_active() + 1 # +1 'cause values are 1 and 237
+ # Jan-2017 - SvdB38
+ prefs.perf_render_threads = int(perf_render_threads.get_adjustment().get_value())39
+ prefs.perf_drop_frames = perf_drop_frames.get_active()40
+ # Feb-2017 - SvdB - for full file names41
+ prefs.show_full_file_names = full_names.get_active()42
+ prefs.center_on_arrow_move = auto_center_on_updown.get_active()43
44
def get_graphics_default_in_out_length():45
in_fr = int(15000/2) - int(prefs.default_grfx_length/2)46
47
"""48
49
def __init__(self):50
+ 51
+ # Every preference needs to have its default value set in this constructor52
+ 53
self.open_in_last_opended_media_dir = True54
self.last_opened_media_dir = None55
self.img_length = 200056
57
self.display_splash_screen = True58
self.auto_move_after_edit = False59
self.default_grfx_length = 250 # value is in frames60
- self.track_configuration = 0 # this is index on list appconsts.TRACK_CONFIGURATIONS61
+ self.track_configuration = 0 # DEPRECATED62
self.AUTO_SAVE_OPTS = None # not used, these are cerated and translated else where63
self.tabs_on_top = False64
self.midbar_tc_left = True65
66
self.trim_view_default = appconsts.TRIM_VIEW_OFF67
self.trim_view_message_shown = False68
self.exit_allocation_window_2 = (0, 0, 0, 0)69
- 70
- 71
+ self.mouse_scroll_action_is_zoom = True72
+ self.hide_file_ext = False73
+ # Jan-2017 - SvdB74
+ self.perf_render_threads = 175
+ self.perf_drop_frames = False76
+ # Feb-2017 - SvdB - for full file names77
+ self.show_full_file_names = False78
+ self.center_on_arrow_move = False79
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editorstate.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/editorstate.py
Changed
14
1
2
# Current edit mode3
edit_mode = INSERT_MOVE4
5
+# Trim tool ripple mode is expressed as a flag6
+trim_mode_ripple = False7
+8
+# Ovewrite tool box mode is expressed as a flag9
+overwrite_mode_box = False10
+11
# Media files view filter for selecting displayed media objects in bin12
media_view_filter = appconsts.SHOW_ALL_FILES13
14
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editorwindow.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/editorwindow.py
Changed
196
1
2
import appconsts3
import audiomonitoring4
import batchrendering5
+import boxmove6
import clipeffectseditor7
import clipmenuaction8
import compositeeditor9
10
11
# Cursors12
OVERWRITE_CURSOR = None13
+OVERWRITE_BOX_CURSOR = None14
INSERTMOVE_CURSOR = None15
ONEROLL_CURSOR = None16
ONEROLL_NO_EDIT_CURSOR = None17
18
SLIDE_CURSOR = None19
SLIDE_NO_EDIT_CURSOR = None20
MULTIMOVE_CURSOR = None21
+ONEROLL_RIPPLE_CURSOR = None22
23
+ONEROLL_TOOL = None24
+OVERWRITE_TOOL = None25
26
def _b(button, icon, remove_relief=False):27
button.set_image(icon)28
29
# Read cursors30
global INSERTMOVE_CURSOR, OVERWRITE_CURSOR, TWOROLL_CURSOR, ONEROLL_CURSOR, \31
ONEROLL_NO_EDIT_CURSOR, TWOROLL_NO_EDIT_CURSOR, SLIDE_CURSOR, SLIDE_NO_EDIT_CURSOR, \32
- MULTIMOVE_CURSOR, MULTIMOVE_NO_EDIT_CURSOR33
+ MULTIMOVE_CURSOR, MULTIMOVE_NO_EDIT_CURSOR, ONEROLL_RIPPLE_CURSOR, ONEROLL_TOOL, \34
+ OVERWRITE_BOX_CURSOR, OVERWRITE_TOOL35
+ 36
INSERTMOVE_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "insertmove_cursor.png")37
OVERWRITE_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "overwrite_cursor.png")38
+ OVERWRITE_BOX_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "overwrite_cursor_box.png")39
TWOROLL_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "tworoll_cursor.png")40
ONEROLL_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "oneroll_cursor.png")41
SLIDE_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "slide_cursor.png")42
43
SLIDE_NO_EDIT_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "slide_noedit_cursor.png")44
MULTIMOVE_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "multimove_cursor.png")45
MULTIMOVE_NO_EDIT_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "multimove_cursor.png")46
+ ONEROLL_RIPPLE_CURSOR = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "oneroll_cursor_ripple.png")47
+ ONEROLL_TOOL = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "oneroll_tool.png")48
+ OVERWRITE_TOOL = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "overwrite_tool.png")49
50
# Window51
self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)52
53
('OneRollMode', None, None, '3', None, lambda a:_this_is_not_used()),54
('TwoRollMode', None, None, '4', None, lambda a:_this_is_not_used()),55
('SlideMode', None, None, '5', None, lambda a:_this_is_not_used()),56
- ('MultiMode', None, None, '6', None, lambda a:_this_is_not_used())57
+ ('MultiMode', None, None, '6', None, lambda a:_this_is_not_used()),58
+ ('BoxMode', None, None, '7', None, lambda a:_this_is_not_used())59
]60
61
menu_string = """<ui>62
63
self.pos_bar.set_listener(mltplayer.seek_position_normalized)64
65
def _get_edit_buttons_row(self):66
- modes_pixbufs = [INSERTMOVE_CURSOR, OVERWRITE_CURSOR, ONEROLL_CURSOR, TWOROLL_CURSOR, SLIDE_CURSOR, MULTIMOVE_CURSOR]67
+ modes_pixbufs = [INSERTMOVE_CURSOR, OVERWRITE_CURSOR, ONEROLL_CURSOR, ONEROLL_RIPPLE_CURSOR, TWOROLL_CURSOR, SLIDE_CURSOR, MULTIMOVE_CURSOR, OVERWRITE_BOX_CURSOR]68
middlebar.create_edit_buttons_row_buttons(self, modes_pixbufs)69
70
buttons_row = Gtk.HBox(False, 1)71
72
editevent.overwrite_move_mode_pressed()73
self.set_cursor_to_mode()74
75
+ def handle_box_mode_button_press(self):76
+ editevent.box_mode_pressed()77
+ self.set_cursor_to_mode()78
+79
def handle_insert_move_mode_button_press(self):80
editevent.insert_move_mode_pressed()81
self.set_cursor_to_mode()82
83
editevent.multi_mode_pressed()84
self.set_cursor_to_mode()85
86
+ def toggle_trim_ripple_mode(self):87
+ editorstate.trim_mode_ripple = (editorstate.trim_mode_ripple == False)88
+ editevent.stop_looping()89
+ editorstate.edit_mode = editorstate.ONE_ROLL_TRIM_NO_EDIT90
+ tlinewidgets.set_edit_mode(None, None)91
+ self.set_mode_selector_to_mode()92
+ self.set_tline_cursor(editorstate.EDIT_MODE())93
+ updater.set_trim_mode_gui()94
+ 95
+ def toggle_overwrite_box_mode(self):96
+ editorstate.overwrite_mode_box = (editorstate.overwrite_mode_box == False)97
+ boxmove.clear_data()98
+ self.set_mode_selector_to_mode()99
+ self.set_tline_cursor(editorstate.EDIT_MODE())100
+ 101
def mode_selector_pressed(self, selector, event):102
guicomponents.get_mode_selector_popup_menu(selector, event, self.mode_selector_item_activated)103
104
105
if mode == 1:106
self.handle_over_move_mode_button_press()107
if mode == 2:108
- self.handle_one_roll_mode_button_press()109
+ if editorstate.edit_mode != editorstate.ONE_ROLL_TRIM and editorstate.edit_mode != editorstate.ONE_ROLL_TRIM_NO_EDIT:110
+ self.handle_one_roll_mode_button_press()111
+ else:112
+ self.toggle_trim_ripple_mode()113
if mode == 3:114
self.handle_two_roll_mode_button_press()115
if mode == 4:116
self.handle_slide_mode_button_press()117
if mode == 5:118
self.handle_multi_mode_button_press()119
- 120
+ if mode == 6:121
+ self.handle_box_mode_button_press()122
+ 123
self.set_cursor_to_mode()124
self.set_mode_selector_to_mode()125
126
127
128
def set_tline_cursor(self, mode):129
display = Gdk.Display.get_default()130
- gdk_window = self.window.get_window()#gui.tline_display.get_window()131
+ gdk_window = self.window.get_window()132
133
if mode == editorstate.INSERT_MOVE:134
cursor = self.get_own_cursor(display, INSERTMOVE_CURSOR, 0, 0)135
elif mode == editorstate.OVERWRITE_MOVE:136
- cursor = self.get_own_cursor(display, OVERWRITE_CURSOR, 6, 15)137
+ if editorstate.overwrite_mode_box == False:138
+ cursor = self.get_own_cursor(display, OVERWRITE_CURSOR, 6, 15)139
+ else:140
+ cursor = self.get_own_cursor(display, OVERWRITE_BOX_CURSOR, 6, 15)141
elif mode == editorstate.TWO_ROLL_TRIM:142
cursor = self.get_own_cursor(display, TWOROLL_CURSOR, 11, 9)143
elif mode == editorstate.TWO_ROLL_TRIM_NO_EDIT:144
cursor = self.get_own_cursor(display, TWOROLL_NO_EDIT_CURSOR, 11, 9)145
elif mode == editorstate.ONE_ROLL_TRIM:146
- cursor = self.get_own_cursor(display, ONEROLL_CURSOR, 9, 9)147
+ if editorstate.trim_mode_ripple == False:148
+ cursor = self.get_own_cursor(display, ONEROLL_CURSOR, 9, 9)149
+ else:150
+ cursor = self.get_own_cursor(display, ONEROLL_RIPPLE_CURSOR, 9, 9)151
elif mode == editorstate.ONE_ROLL_TRIM_NO_EDIT:152
- cursor = self.get_own_cursor(display, ONEROLL_NO_EDIT_CURSOR, 9, 9)153
+ if editorstate.trim_mode_ripple == False:154
+ cursor = self.get_own_cursor(display, ONEROLL_NO_EDIT_CURSOR, 9, 9)155
+ else:156
+ cursor = self.get_own_cursor(display, ONEROLL_RIPPLE_CURSOR, 9, 9)157
elif mode == editorstate.SLIDE_TRIM:158
cursor = self.get_own_cursor(display, SLIDE_CURSOR, 9, 9)159
elif mode == editorstate.SLIDE_TRIM_NO_EDIT:160
161
if editorstate.EDIT_MODE() == editorstate.INSERT_MOVE:162
self.modes_selector.set_pixbuf(0)163
elif editorstate.EDIT_MODE() == editorstate.OVERWRITE_MOVE:164
- self.modes_selector.set_pixbuf(1)165
- elif editorstate.EDIT_MODE() == editorstate.ONE_ROLL_TRIM:166
- self.modes_selector.set_pixbuf(2)167
- elif editorstate.EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:168
- self.modes_selector.set_pixbuf(2)169
+ if editorstate.overwrite_mode_box == False:170
+ self.modes_selector.set_pixbuf(1)171
+ else:172
+ self.modes_selector.set_pixbuf(7)173
+ elif editorstate.EDIT_MODE() == editorstate.ONE_ROLL_TRIM or editorstate.EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:174
+ if editorstate.trim_mode_ripple == False:175
+ self.modes_selector.set_pixbuf(2)176
+ else:177
+ self.modes_selector.set_pixbuf(3)178
elif editorstate.EDIT_MODE() == editorstate.TWO_ROLL_TRIM:179
- self.modes_selector.set_pixbuf(3)180
+ self.modes_selector.set_pixbuf(4)181
elif editorstate.EDIT_MODE() == editorstate.TWO_ROLL_TRIM_NO_EDIT:182
- self.modes_selector.set_pixbuf(3)183
- elif editorstate.EDIT_MODE() == editorstate.SLIDE_TRIM:184
self.modes_selector.set_pixbuf(4)185
+ elif editorstate.EDIT_MODE() == editorstate.SLIDE_TRIM:186
+ self.modes_selector.set_pixbuf(5)187
elif editorstate.EDIT_MODE() == editorstate.SLIDE_TRIM_NO_EDIT:188
- self.modes_selector.set_pixbuf(4)189
- elif editorstate.EDIT_MODE() == editorstate.MULTI_MOVE:190
self.modes_selector.set_pixbuf(5)191
+ elif editorstate.EDIT_MODE() == editorstate.MULTI_MOVE:192
+ self.modes_selector.set_pixbuf(6)193
194
def tline_cursor_leave(self, event):195
cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)196
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/exporting.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/exporting.py
Changed
10
1
2
prog_in += src_len3
4
5
- print ''.join(str_list).strip("\n")6
+ #print ''.join(str_list).strip("\n")7
return ''.join(str_list).strip("\n")8
9
def frames_to_tc(self, frame):10
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/extraeditors.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/extraeditors.py
Changed
201
1
2
import lutfilter3
import respaths4
import viewgeom5
+import translations6
7
SHADOW = 08
MID = 19
10
11
SELECT_CIRCLE = 012
SELECT_LINE = 113
- 14
+15
ACTIVE_RING_COLOR = (0.0, 0.0, 0.0)16
DEACTIVE_RING_COLOR = (0.6, 0.6, 0.6)17
18
19
FX_GRAD_1 = (0, 1.0, 1.0, 1.0, 0.4)20
FX_GRAD_2 = (1, 0.3, 0.3, 0.3, 0.4)21
22
+def _p(name):23
+ try:24
+ return translations.param_names[name]25
+ except KeyError:26
+ return name27
28
def _draw_select_circle(cr, x, y, main_color, radius, small_radius, pad, x_off=0, y_off=0):29
degrees = math.pi / 180.030
31
32
x = x + x_off33
y = y + y_off34
- 35
+36
cr.set_source_rgb(0.4,0.4,0.4)37
cr.set_line_width(1.0)38
cr.move_to(x + radius - 0.5, y)39
40
cr.set_source_rgb(0.7,0.7,0.7)41
cr.rectangle(x - 2.0, y, 4, height)42
cr.fill()43
- 44
+45
cr.set_source_rgb(0.3,0.3,0.3)46
cr.set_line_width(1.0)47
cr.move_to(x - 0.5, y)48
cr.line_to(x - 0.5, y + height)49
cr.stroke()50
- 51
+52
cr.set_source_rgb(0.95,0.95,0.95)53
cr.move_to(x + 0.5, y)54
cr.line_to(x + 0.5, y + height)55
cr.stroke()56
- 57
- 58
+59
+60
def _draw_cursor_indicator(cr, x, y, radius):61
degrees = math.pi / 180.062
63
- pad = radius 64
+ pad = radius65
cr.set_source_rgba(0.9, 0.9, 0.9, 0.6)66
cr.set_line_width(3.0)67
cr.arc (x + pad, y + pad, radius, 0.0 * degrees, 360.0 * degrees)68
69
70
71
class ColorBox:72
- 73
+74
def __init__(self, edit_listener, width=260, height=260):75
self.W = width76
self.H = height77
- self.widget = cairoarea.CairoDrawableArea2( self.W, 78
- self.H, 79
+ self.widget = cairoarea.CairoDrawableArea2( self.W,80
+ self.H,81
self._draw)82
self.widget.press_func = self._press_event83
self.widget.motion_notify_func = self._motion_notify_event84
85
86
def _y_for_saturation(self, saturation):87
return self.Y_PAD + (1.0 - saturation) * (self.H - self.Y_PAD *2)88
- 89
+90
def _press_event(self, event):91
self.cursor_x, self.cursor_y = self._get_legal_point(event.x, event.y)92
self._save_values()93
94
self._save_values()95
self.edit_listener()96
self.widget.queue_draw()97
- 98
+99
def _release_event(self, event):100
self.cursor_x, self.cursor_y = self._get_legal_point(event.x, event.y)101
self._save_values()102
self.edit_listener()103
self.widget.queue_draw()104
- 105
+106
def _get_legal_point(self, x, y):107
if x < self.X_PAD:108
x = self.X_PAD109
110
y = self.Y_PAD111
elif y > self.H - self.Y_PAD:112
y = self.H - self.Y_PAD113
- 114
+115
return (x, y)116
- 117
+118
def _draw(self, event, cr, allocation):119
"""120
Callback for repaint from CairoDrawableArea.121
122
def __init__(self, edit_listener, band_change_listerner, width=260, height=260):123
ColorBox.__init__(self, edit_listener, width, height)124
self.band = SHADOW125
- self.shadow_x = self.cursor_x 126
+ self.shadow_x = self.cursor_x127
self.shadow_y = self.cursor_y128
- self.mid_x = self.cursor_x 129
+ self.mid_x = self.cursor_x130
self.mid_y = self.cursor_y131
self.hi_x = self.cursor_x132
self.hi_y = self.cursor_y133
134
def set_cursors(self, s_h, s_s, m_h, m_s, h_h, h_s):135
self.shadow_x = self._x_for_hue(s_h)136
self.shadow_y = self._y_for_saturation(s_s)137
- self.mid_x = self._x_for_hue(m_h) 138
+ self.mid_x = self._x_for_hue(m_h)139
self.mid_y = self._y_for_saturation(m_s)140
self.hi_x = self._x_for_hue(h_h)141
self.hi_y = self._y_for_saturation(h_s)142
143
self._save_values()144
self.edit_listener()145
self.widget.queue_draw()146
- 147
+148
def _release_event(self, event):149
self.cursor_x, self.cursor_y = self._get_legal_point(event.x, event.y)150
self._save_values()151
152
return HI153
else:154
return NO_HIT155
- 156
+157
def _control_point_hit(self, x, y, cx, cy):158
if x >= cx - self.CIRCLE_HALF and x <= cx + self.CIRCLE_HALF:159
if y >= cy - self.CIRCLE_HALF and y <= cy + self.CIRCLE_HALF:160
161
self.hue = float((self.cursor_x - self.X_PAD)) / float((self.W - 2 * self.X_PAD))162
self.saturation = float(abs(self.cursor_y - self.H + self.Y_PAD)) / float((self.H - 2 * self.Y_PAD))163
if self.band == SHADOW:164
- self.shadow_x = self.cursor_x 165
+ self.shadow_x = self.cursor_x166
self.shadow_y = self.cursor_y167
elif self.band == MID:168
- self.mid_x = self.cursor_x 169
+ self.mid_x = self.cursor_x170
self.mid_y = self.cursor_y171
else:172
self.hi_x = self.cursor_x173
174
grey_grad.add_color_stop_rgba(*MID_GREY_GRAD_1)175
grey_grad.add_color_stop_rgba(*MID_GREY_GRAD_2)176
grey_grad.add_color_stop_rgba(*MID_GREY_GRAD_3)177
- 178
+179
cr.set_source(grey_grad)180
cr.rectangle(self.X_PAD, self.Y_PAD, x_out - x_in, y_out - y_in)181
cr.fill()182
183
184
185
class ColorBoxFilterEditor:186
- 187
+188
def __init__(self, editable_properties):189
self.SAT_MAX = 0.5190
self.widget = Gtk.VBox()191
192
self.R = filter(lambda ep: ep.name == "R", editable_properties)[0]193
self.G = filter(lambda ep: ep.name == "G", editable_properties)[0]194
self.B = filter(lambda ep: ep.name == "B", editable_properties)[0]195
- 196
+197
self.color_box = ColorBox(self.color_box_values_changed)198
self.color_box.set_cursor(self.hue.get_float_value(), self.saturation.get_float_value())199
- 200
+201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/guicomponents.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/guicomponents.py
Changed
137
1
2
3
txt = Gtk.Label(label=media_file.name)4
txt.modify_font(Pango.FontDescription("sans 9"))5
- txt.set_ellipsize(Pango.EllipsizeMode.END)6
txt.set_max_width_chars(13)7
+ # Feb-2017 - SvdB - For full file names. First part shows the original code for short file names 8
+ if editorpersistance.prefs.show_full_file_names == False:9
+ txt.set_ellipsize(Pango.EllipsizeMode.END)10
+ else:11
+ txt.set_line_wrap_mode(Pango.WrapMode.CHAR)12
+ txt.set_line_wrap(True)13
+ # end SvdB14
txt.set_tooltip_text(media_file.name)15
16
self.vbox.pack_start(self.img, True, True, 0)17
18
cr.stroke()19
20
# Get current TIMELINE frame str21
- frame = PLAYER().tracktor_producer.frame()22
- frame_str = utils.get_tc_string(frame)23
+ try:24
+ frame = PLAYER().tracktor_producer.frame()25
+ frame_str = utils.get_tc_string(frame)26
+ except:27
+ frame_str = "00:00:00:00"28
29
# Text30
layout = PangoCairo.create_layout(cr)31
32
self.widget.queue_draw()33
34
35
+class TracksNumbersSelect:36
+ def __init__(self, v_tracks, a_tracks):37
+ 38
+ self.MAX_TRACKS = appconsts.MAX_TRACKS39
+ 40
+ self.widget = Gtk.HBox()41
+ self.video_label = Gtk.Label(_("Video:"))42
+ self.video_tracks = Gtk.SpinButton.new_with_range(1, 8, 1)43
+ self.video_tracks.set_value(v_tracks)44
+ #self.video_tracks.set_editable(False)45
+ self.video_tracks.connect("value-changed", self.video_tracks_changed)46
+ self.audio_label = Gtk.Label(_("Audio:"))47
+ self.audio_tracks = Gtk.SpinButton.new_with_range(1, 8, 1)48
+ self.audio_tracks.set_value(a_tracks)49
+ #self.audio_tracks.set_editable(False)50
+ self.audio_tracks.connect("value-changed", self.audio_tracks_changed)51
+ self.label = Gtk.Label(_("Number of Tracks:"))52
+ self.tracks_amount_info = Gtk.Label()53
+ self.set_total_tracks_info()54
+55
+ self.widget.pack_start(self.label, False, False, 0)56
+ self.widget.pack_start(guiutils.pad_label(22,2), False, False, 0)57
+ self.widget.pack_start(self.video_label, False, False, 0)58
+ self.widget.pack_start(self.video_tracks, False, False, 0)59
+ self.widget.pack_start(guiutils.pad_label(22,2), False, False, 0)60
+ self.widget.pack_start(self.audio_label, False, False, 0)61
+ self.widget.pack_start(self.audio_tracks, False, False, 0)62
+ self.widget.pack_start(guiutils.pad_label(22,2), False, False, 0)63
+ self.widget.pack_start(self.tracks_amount_info, False, False, 0)64
+ self.widget.pack_start(Gtk.Label(), True, True, 0)65
+66
+ def video_tracks_changed(self, adjustment):67
+ if self.video_tracks.get_value() + self.audio_tracks.get_value() > self.MAX_TRACKS:68
+ self.audio_tracks.set_value(self.MAX_TRACKS - self.video_tracks.get_value())69
+ self.set_total_tracks_info()70
+71
+ def audio_tracks_changed(self, adjustment):72
+ if self.video_tracks.get_value() + self.audio_tracks.get_value() > self.MAX_TRACKS:73
+ self.video_tracks.set_value(self.MAX_TRACKS - self.audio_tracks.get_value())74
+ self.set_total_tracks_info()75
+ 76
+ def set_total_tracks_info(self):77
+ self.tracks_amount_info.set_text(str(int(self.video_tracks.get_value() + self.audio_tracks.get_value())) + " / 9")78
+ self.tracks_amount_info.queue_draw ()79
+80
+ def get_tracks(self):81
+ return (int(self.video_tracks.get_value()), int(self.audio_tracks.get_value()))82
+83
def get_gpl3_scroll_widget(size):84
license_file = open(respaths.GPL_3_DOC)85
license_text = license_file.read()86
87
trans_file = open(respaths.TRANSLATIONS_DOC)88
trans_text = trans_file.read()89
90
+ return get_text_scroll_widget(trans_text, size)91
+ 92
+def get_text_scroll_widget(text, size):93
view = Gtk.TextView()94
view.set_editable(False)95
view.set_pixels_above_lines(2)96
view.set_left_margin(2)97
view.set_wrap_mode(Gtk.WrapMode.WORD)98
- view.get_buffer().set_text(trans_text)99
+ view.get_buffer().set_text(text)100
101
sw = Gtk.ScrolledWindow()102
sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)103
104
105
return sw106
107
-def get_track_counts_combo_and_values_list():108
- tracks_combo = Gtk.ComboBoxText()109
- tracks_combo.append_text(_("5 video, 4 audio"))110
- tracks_combo.append_text(_("4 video, 3 audio"))111
- tracks_combo.append_text(_("3 video, 2 audio"))112
- tracks_combo.append_text(_("2 video, 1 audio"))113
- tracks_combo.append_text(_("7 video, 2 audio"))114
- tracks_combo.append_text(_("2 video, 7 audio"))115
- tracks_combo.append_text(_("8 video, 1 audio"))116
- tracks_combo.append_text(_("1 video, 8 audio"))117
- tracks_combo.set_active(0)118
- tracks_combo_values_list = appconsts.TRACK_CONFIGURATIONS119
- return (tracks_combo, tracks_combo_values_list)120
-121
def get_markers_menu_launcher(callback, pixbuf):122
m_launch = PressLaunch(callback, pixbuf)123
return m_launch124
125
menu.add(menu_item)126
menu_items.append(menu_item)127
128
+ menu_item = _get_image_menu_item(Gtk.Image.new_from_file(129
+ respaths.IMAGE_PATH + "overwrite_cursor_box.png"), _("Box"), callback, 6)130
+ menu_item.set_accel_path("<Actions>/WindowActions/BoxMode")131
+ menu.add(menu_item)132
+ menu_items.append(menu_item)133
+ 134
menu.connect("hide", lambda w : _tools_menu_hidden(w,menu_items))135
menu.show_all()136
menu.popup(None, None, None, None, event.button, event.time)137
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/keyevents.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/keyevents.py
Changed
155
1
2
import glassbuttons3
import gui4
import editevent5
+import editorpersistance6
import editorstate7
from editorstate import current_sequence8
from editorstate import PLAYER9
10
_move_to_beginning()11
return True12
13
+ # End14
+ if event.keyval == Gdk.KEY_End:15
+ if PLAYER().is_playing():16
+ monitorevent.stop_pressed()17
+ PLAYER().seek_end()18
+ _move_to_end()19
+ return True20
+21
# Select all with CTRL + A in media panel22
if event.keyval == Gdk.KEY_a:23
if (event.get_state() & Gdk.ModifierType.CONTROL_MASK):24
25
gui.editor_window.handle_multi_mode_button_press()26
gui.editor_window.set_mode_selector_to_mode()27
return True28
+ if event.keyval == Gdk.KEY_7:29
+ gui.editor_window.handle_box_mode_button_press()30
+ gui.editor_window.set_mode_selector_to_mode()31
+ return True32
33
# X34
if event.keyval == Gdk.KEY_x:35
36
medialog.log_range_clicked()37
return True38
39
+ # R40
+ if event.keyval == Gdk.KEY_r:41
+ gui.editor_window.toggle_trim_ripple_mode()42
+ return True43
44
# Key bindings for keyboard trimming45
if editorstate.current_is_active_trim_mode() == True:46
47
frame = current_sequence().find_next_cut_frame(tline_frame)48
if frame != -1:49
PLAYER().seek_frame(frame)50
+ if editorpersistance.prefs.center_on_arrow_move == True:51
+ updater.center_tline_to_current_frame()52
return True53
else:54
monitorevent.up_arrow_seek_on_monitor_clip()55
56
frame = current_sequence().find_prev_cut_frame(tline_frame)57
if frame != -1:58
PLAYER().seek_frame(frame)59
+ if editorpersistance.prefs.center_on_arrow_move == True:60
+ updater.center_tline_to_current_frame()61
return True62
else:63
monitorevent.down_arrow_seek_on_monitor_clip()64
65
monitorevent.l_pressed()66
return True67
68
- # R69
- if event.keyval == Gdk.KEY_r:70
+ # S71
+ if event.keyval == Gdk.KEY_s:72
tlineaction.resync_button_pressed()73
return True74
75
76
PLAYER().seek_frame(0)77
_move_to_beginning()78
return True79
+80
+ # END81
+ if event.keyval == Gdk.KEY_End:82
+ if PLAYER().is_playing():83
+ monitorevent.stop_pressed()84
+ PLAYER().seek_end()85
+ _move_to_end()86
+ return True87
else:88
# HOME89
if event.keyval == Gdk.KEY_Home:90
91
_move_to_beginning()92
return True93
94
+ # END95
+ if event.keyval == Gdk.KEY_End:96
+ if PLAYER().is_playing():97
+ monitorevent.stop_pressed()98
+ gui.editor_window.handle_insert_move_mode_button_press()99
+ gui.editor_window.set_mode_selector_to_mode()100
+ PLAYER().seek_end()101
+ _move_to_end()102
+ return True103
+104
return False105
106
107
108
gui.editor_window.handle_multi_mode_button_press()109
gui.editor_window.set_mode_selector_to_mode()110
return True111
+ if event.keyval == Gdk.KEY_7:112
+ gui.editor_window.handle_box_mode_button_press()113
+ gui.editor_window.set_mode_selector_to_mode()114
+ return True115
116
return False117
118
119
frame = current_sequence().find_next_cut_frame(tline_frame)120
if frame != -1:121
PLAYER().seek_frame(frame)122
+ if editorpersistance.prefs.center_on_arrow_move == True:123
+ updater.center_tline_to_current_frame()124
return True125
else:126
monitorevent.up_arrow_seek_on_monitor_clip()127
128
frame = current_sequence().find_prev_cut_frame(tline_frame)129
if frame != -1:130
PLAYER().seek_frame(frame)131
+ if editorpersistance.prefs.center_on_arrow_move == True:132
+ updater.center_tline_to_current_frame() 133
return True134
else:135
monitorevent.down_arrow_seek_on_monitor_clip()136
137
or (event.keyval == Gdk.KEY_Right)138
or (event.keyval == Gdk.KEY_Up)139
or (event.keyval == Gdk.KEY_Down)):140
- kfeditor.arrow_edit(event.keyval)141
+ kfeditor.arrow_edit(event.keyval, (event.get_state() & Gdk.ModifierType.CONTROL_MASK))142
return True143
if event.keyval == Gdk.KEY_plus:144
pass # not impl145
146
updater.repaint_tline()147
updater.update_tline_scrollbar()148
149
- 150
- 151
+def _move_to_end():152
+ updater.repaint_tline()153
+ updater.update_tline_scrollbar()154
+155
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/keyframeeditor.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/keyframeeditor.py
Changed
142
1
2
delta_x = 03
else:4
delta_y = 05
- 6
- self._shape__motion_notify_event(delta_x, delta_y)7
+ #elif state & Gdk.ModifierType.CONTROL_MASK:8
+ # print "control"9
+ 10
+ self._shape__motion_notify_event(delta_x, delta_y, (state & Gdk.ModifierType.CONTROL_MASK))11
12
self.parent_editor.queue_draw()13
14
- def _shape__motion_notify_event(self, delta_x, delta_y):15
+ def _shape__motion_notify_event(self, delta_x, delta_y, CTRL_DOWN):16
print "_shape__motion_notify_event not impl"17
18
19
20
else:21
delta_y = 022
23
- self._shape_release_event(delta_x, delta_y)24
+ self._shape_release_event(delta_x, delta_y, (event.get_state() & Gdk.ModifierType.CONTROL_MASK))25
26
self.parent_editor.geometry_edit_finished()27
28
- def _shape_release_event(self, delta_x, delta_y):29
+ def _shape_release_event(self, delta_x, delta_y, CTRL_DOWN):30
print "_shape_release_event not impl"31
32
def _mouse_scroll_listener(self, event):33
34
else:35
self.source_edit_rect.edit_point_drag_started(self.current_mouse_hit)36
37
- def _shape__motion_notify_event(self, delta_x, delta_y):38
+ def _shape__motion_notify_event(self, delta_x, delta_y, CTRL_DOWN):39
if self.current_mouse_hit == AREA_HIT:40
self.source_edit_rect.move_drag(delta_x, delta_y)41
else:42
self.source_edit_rect.edit_point_drag(delta_x, delta_y)43
44
- def _shape_release_event(self, delta_x, delta_y):45
+ def _shape_release_event(self, delta_x, delta_y, CTRL_DOWN):46
if self.current_mouse_hit == AREA_HIT:47
self.source_edit_rect.move_drag(delta_x, delta_y)48
else:49
self.source_edit_rect.edit_point_drag(delta_x, delta_y)50
self.source_edit_rect.clear_projection_point()51
52
- def handle_arrow_edit(self, keyval):53
+ def handle_arrow_edit(self, keyval, delta):54
if keyval == Gdk.KEY_Left:55
- self.source_edit_rect.x -= 156
+ self.source_edit_rect.x -= delta57
if keyval == Gdk.KEY_Right:58
- self.source_edit_rect.x += 159
+ self.source_edit_rect.x += delta60
if keyval == Gdk.KEY_Up:61
- self.source_edit_rect.y -= 162
+ self.source_edit_rect.y -= delta63
if keyval == Gdk.KEY_Down: 64
- self.source_edit_rect.y += 165
+ self.source_edit_rect.y += delta66
67
def print_keyframes(self):68
for i in range(0, len(self.keyframes)):69
70
r = r1 + (r2 - r1) * fract71
return (x, y, xs, ys, r)72
73
- def handle_arrow_edit(self, keyval):74
+ def handle_arrow_edit(self, keyval, delta):75
if keyval == Gdk.KEY_Left:76
- self.shape_x -= 177
+ self.shape_x -= delta78
if keyval == Gdk.KEY_Right:79
- self.shape_x += 180
+ self.shape_x += delta81
if keyval == Gdk.KEY_Up:82
- self.shape_y -= 183
+ self.shape_y -= delta84
if keyval == Gdk.KEY_Down: 85
- self.shape_y += 186
+ self.shape_y += delta87
88
# --------------------------------------------------------- mouse events89
def _shape_press_event(self):90
91
self.start_shape_x = self.shape_x 92
self.start_shape_y = self.shape_y93
94
- def _shape__motion_notify_event(self, delta_x, delta_y):95
- self._update_values_for_mouse_delta(delta_x, delta_y)96
+ def _shape__motion_notify_event(self, delta_x, delta_y, CTRL_DOWN):97
+ self._update_values_for_mouse_delta(delta_x, delta_y, CTRL_DOWN)98
99
- def _shape_release_event(self, delta_x, delta_y):100
- self._update_values_for_mouse_delta(delta_x, delta_y)101
+ def _shape_release_event(self, delta_x, delta_y, CTRL_DOWN):102
+ self._update_values_for_mouse_delta(delta_x, delta_y, CTRL_DOWN)103
104
- def _update_values_for_mouse_delta(self, delta_x, delta_y):105
+ def _update_values_for_mouse_delta(self, delta_x, delta_y, CTRL_DOWN):106
if self.current_mouse_hit == POS_HANDLE or self.current_mouse_hit == AREA_HIT:107
dx = self.get_screen_x(self.coords.orig_x + delta_x)108
dy = self.get_screen_y(self.coords.orig_y + delta_y)109
110
dist = viewgeom.distance(self.edit_points[POS_HANDLE], pp)111
orig_dist = viewgeom.distance(self.untrans_points[POS_HANDLE], self.untrans_points[X_SCALE_HANDLE])112
self.x_scale = dist / orig_dist113
+ if CTRL_DOWN:114
+ self.y_scale = self.x_scale115
self._update_edit_points()116
elif self.current_mouse_hit == Y_SCALE_HANDLE:117
dp = self.get_delta_point(delta_x, delta_y, self.edit_points[Y_SCALE_HANDLE])118
119
dist = viewgeom.distance(self.edit_points[POS_HANDLE], pp)120
orig_dist = viewgeom.distance(self.untrans_points[POS_HANDLE], self.untrans_points[Y_SCALE_HANDLE])121
self.y_scale = dist / orig_dist122
+ if CTRL_DOWN:123
+ self.x_scale = self.y_scale124
self._update_edit_points()125
elif self.current_mouse_hit == ROTATION_HANDLE:126
ax, ay = self.edit_points[POS_HANDLE]127
128
self.update_property_value()129
self.buttons_row.set_kf_info(self.clip_editor.get_kf_info())130
131
- def arrow_edit(self, keyval):132
- self.geom_kf_edit.handle_arrow_edit(keyval)133
+ def arrow_edit(self, keyval, CTRL_DOWN):134
+ if CTRL_DOWN:135
+ delta = 10136
+ else:137
+ delta = 1138
+ self.geom_kf_edit.handle_arrow_edit(keyval, delta)139
self.geom_kf_edit.set_keyframe_to_edit_shape(self.clip_editor.active_kf_index)140
self.update_editor_view_with_frame(self.clip_editor.current_clip_frame)141
self.update_property_value()142
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot -> flowblade-1.12.2.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: 2016-12-05 10:12+0200\n"6
+"POT-Creation-Date: 2017-03-20 09:48+0200\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:75815
+#: app.py:76116
msgid "Too small screen for this application."17
msgstr ""18
19
-#: app.py:76120
+#: app.py:76421
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr ""23
24
-#: app.py:76225
+#: app.py:76526
msgid "Your screen dimensions are "27
msgstr ""28
29
-#: app.py:795 projectaction.py:366 projectaction.py:69630
+#: app.py:798 projectaction.py:365 projectaction.py:69531
msgid "Project has not been saved previously"32
msgstr ""33
34
-#: app.py:796 projectaction.py:367 projectaction.py:69735
+#: app.py:799 projectaction.py:366 projectaction.py:69636
msgid "Save project with File -> Save As before closing."37
msgstr ""38
39
40
msgid "Opening"41
msgstr ""42
43
-#: projectaction.py:27644
+#: projectaction.py:27545
msgid "Media files already present in project were opened!"46
msgstr ""47
48
-#: projectaction.py:28249
+#: projectaction.py:28150
msgid ""51
"Files already present:\n"52
"\n"53
msgstr ""54
55
-#: projectaction.py:48156
+#: projectaction.py:48057
msgid "Selected folder contains files"58
msgstr ""59
60
-#: projectaction.py:48261
+#: projectaction.py:48162
msgid ""63
"When saving a back-up snapshot of the project, the selected folder\n"64
"has to be empty."65
msgstr ""66
67
-#: projectaction.py:55368
+#: projectaction.py:55269
msgid "Copying project media assets"70
msgstr ""71
72
-#: projectaction.py:55473
+#: projectaction.py:55374
msgid "Saving project file"75
msgstr ""76
77
-#: projectaction.py:70978
+#: projectaction.py:70879
msgid "Project not found on disk"80
msgstr ""81
82
-#: projectaction.py:71083
+#: projectaction.py:70984
msgid "Project can't be loaded."85
msgstr ""86
87
-#: projectaction.py:71888
+#: projectaction.py:71789
msgid "Project has not been saved since it was opened."90
msgstr ""91
92
-#: projectaction.py:72393
+#: projectaction.py:72294
msgid "Project was saved less than a minute ago."95
msgstr ""96
97
-#: projectaction.py:72698
+#: projectaction.py:72599
msgid "Project was saved one minute ago."100
msgstr ""101
102
-#: projectaction.py:728103
+#: projectaction.py:727104
msgid "Project was saved "105
msgstr ""106
107
-#: projectaction.py:728108
+#: projectaction.py:727109
msgid " minutes ago."110
msgstr ""111
112
-#: projectaction.py:782113
+#: projectaction.py:781114
msgid "Render launch failed!"115
msgstr ""116
117
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299118
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299119
msgid "Error message: "120
msgstr ""121
122
-#: projectaction.py:796123
+#: projectaction.py:795124
msgid "Adding item to render queue failed!"125
msgstr ""126
127
-#: projectaction.py:815128
+#: projectaction.py:814129
msgid "Open.."130
msgstr ""131
132
-#: projectaction.py:845133
+#: projectaction.py:844134
msgid "No file was selected"135
msgstr ""136
137
-#: projectaction.py:845138
+#: projectaction.py:844139
msgid "Select a numbered file to add an Image Sequence to Project."140
msgstr ""141
142
-#: projectaction.py:853143
+#: projectaction.py:852144
msgid "Not a sequence file!"145
msgstr ""146
147
-#: projectaction.py:853148
+#: projectaction.py:852149
msgid ""150
"Selected file does not have a number part in it,\n"151
"so it can't be an image sequence file."152
msgstr ""153
154
-#: projectaction.py:904155
+#: projectaction.py:903156
msgid "Can't make home folder thumbnails folder"157
msgstr ""158
159
-#: projectaction.py:905 dialogs.py:361160
+#: projectaction.py:904 dialogs.py:359161
msgid "Please create and select some other folder then '"162
msgstr ""163
164
-#: projectaction.py:906165
+#: projectaction.py:905166
msgid "' as thumbnails folder"167
msgstr ""168
169
170
msgid "N/A"171
msgstr ""172
173
-#: projectaction.py:1038 guicomponents.py:1745174
+#: projectaction.py:1038 guicomponents.py:1751175
msgid "Yes"176
msgstr ""177
178
-#: projectaction.py:1040 guicomponents.py:1747179
+#: projectaction.py:1040 guicomponents.py:1753180
msgid "No"181
msgstr ""182
183
184
"new sequence if needed."185
msgstr ""186
187
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196188
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201189
msgid "sequence_"190
msgstr ""191
192
193
msgid "There must always exist at least one sequence."194
msgstr ""195
196
-#: editorwindow.py:148197
+#: editorwindow.py:159198
msgid "_File"199
msgstr ""200
201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/add_language -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/add_language
Changed
7
1
2
-#/usr/bin/bash3
+#!/bin/bash4
5
# Get language6
LANG=$17
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/compile_language -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/compile_language
Changed
7
1
2
-#/usr/bin/bash3
+#!/bin/bash4
5
# Get language6
LANG=$17
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/copy_to_usr -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/copy_to_usr
Changed
7
1
2
-#/usr/bin/bash3
+#!/bin/bash4
5
# Move to Flowblade root directory6
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"7
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/create_pot -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/create_pot
Changed
7
1
2
-#/usr/bin/bash3
+#!/bin/bash4
5
# Move to Flowblade root directory6
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"7
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/cs/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
-# Pavel Fric <pavelfric@seznam.cz>, 2013, 2014, 2015, 2016.6
+# Pavel Fric <pavelfric@seznam.cz>, 2013, 2014, 2015, 2016, 2017.7
msgid ""8
msgstr ""9
"Project-Id-Version: \n"10
"Report-Msgid-Bugs-To: \n"11
-"POT-Creation-Date: 2016-12-05 10:12+0200\n"12
-"PO-Revision-Date: 2016-03-05 13:35+0100\n"13
+"POT-Creation-Date: 2017-03-20 09:48+0200\n"14
+"PO-Revision-Date: 2017-03-19 20:35+0100\n"15
"Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"16
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"17
"Language: cs\n"18
19
"Content-Type: text/plain; charset=UTF-8\n"20
"Content-Transfer-Encoding: 8bit\n"21
"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"22
-"X-Generator: Lokalize 1.5\n"23
+"X-Generator: Lokalize 2.0\n"24
"X-Language: cs_CZ\n"25
"X-Source-Language: C\n"26
27
-#: app.py:75828
+#: app.py:76129
msgid "Too small screen for this application."30
msgstr "Příliš malá obrazovka pro tento program."31
32
-#: app.py:76133
+#: app.py:76434
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"35
msgstr "Nejmenší rozměry obrazovky pro tento program jsou 1152 x 768.\n"36
37
-#: app.py:76238
+#: app.py:76539
msgid "Your screen dimensions are "40
msgstr "Rozměry vaší obrazovky jsou "41
42
-#: app.py:795 projectaction.py:366 projectaction.py:69643
+#: app.py:798 projectaction.py:365 projectaction.py:69544
msgid "Project has not been saved previously"45
msgstr "Projekt předtím byl uložen"46
47
-#: app.py:796 projectaction.py:367 projectaction.py:69748
+#: app.py:799 projectaction.py:366 projectaction.py:69649
msgid "Save project with File -> Save As before closing."50
msgstr "Uložte projekt před zavření pomocí Soubor -> Uložit."51
52
53
msgid "Opening"54
msgstr "Otevírá se"55
56
-#: projectaction.py:27657
+#: projectaction.py:27558
msgid "Media files already present in project were opened!"59
msgstr "Soubory již přítomné v projektu byly otevřeny!"60
61
-#: projectaction.py:28262
+#: projectaction.py:28163
msgid ""64
"Files already present:\n"65
"\n"66
67
"Soubory již přítomné:\n"68
"\n"69
70
-#: projectaction.py:48171
+#: projectaction.py:48072
msgid "Selected folder contains files"73
msgstr "Vybraná složka obsahuje soubory"74
75
-#: projectaction.py:48276
+#: projectaction.py:48177
msgid ""78
"When saving a back-up snapshot of the project, the selected folder\n"79
"has to be empty."80
msgstr ""81
"Při ukládání záložního snímku projektu musí být vybraná složka prázdná."82
83
-#: projectaction.py:55384
+#: projectaction.py:55285
msgid "Copying project media assets"86
msgstr "Kopírují se položky záznamů projektu"87
88
-#: projectaction.py:55489
+#: projectaction.py:55390
msgid "Saving project file"91
msgstr "Ukládá se soubor s projektem"92
93
-#: projectaction.py:70994
+#: projectaction.py:70895
msgid "Project not found on disk"96
msgstr "Projekt nebyl na disku nalezen"97
98
-#: projectaction.py:71099
+#: projectaction.py:709100
msgid "Project can't be loaded."101
msgstr "Projekt nelze nahrát."102
103
-#: projectaction.py:718104
+#: projectaction.py:717105
msgid "Project has not been saved since it was opened."106
msgstr "Projekt nebyl od té doby, co byl otevřen, uložen."107
108
-#: projectaction.py:723109
+#: projectaction.py:722110
msgid "Project was saved less than a minute ago."111
msgstr "Projekt byl uložen před méně než minutou."112
113
-#: projectaction.py:726114
+#: projectaction.py:725115
msgid "Project was saved one minute ago."116
msgstr "Projekt byl uložen před jednou minutou."117
118
-#: projectaction.py:728119
+#: projectaction.py:727120
msgid "Project was saved "121
msgstr "Projekt byl uložen před "122
123
-#: projectaction.py:728124
+#: projectaction.py:727125
msgid " minutes ago."126
msgstr " minutami"127
128
-#: projectaction.py:782129
+#: projectaction.py:781130
msgid "Render launch failed!"131
msgstr "Spuštění zpracování se nezdařilo!"132
133
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299134
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299135
msgid "Error message: "136
msgstr "Zpráva o chybě: "137
138
-#: projectaction.py:796139
+#: projectaction.py:795140
msgid "Adding item to render queue failed!"141
msgstr "Přidání položky do řady ke zpracování se nezdařilo!"142
143
-#: projectaction.py:815144
+#: projectaction.py:814145
msgid "Open.."146
msgstr "Otevřít..."147
148
-#: projectaction.py:845149
+#: projectaction.py:844150
msgid "No file was selected"151
msgstr "Nebyl vybrán žádný soubor"152
153
-#: projectaction.py:845154
+#: projectaction.py:844155
msgid "Select a numbered file to add an Image Sequence to Project."156
msgstr "Vyberte číslovaný soubor pro přidání obrazové řady do projektu."157
158
-#: projectaction.py:853159
+#: projectaction.py:852160
msgid "Not a sequence file!"161
msgstr "Není řadovým souborem!"162
163
-#: projectaction.py:853164
+#: projectaction.py:852165
msgid ""166
"Selected file does not have a number part in it,\n"167
"so it can't be an image sequence file."168
169
"Vybraný soubor nemá ve svém názvu část s číslem.\n"170
"Nemůže to tedy být soubor obrazové řady."171
172
-#: projectaction.py:904173
+#: projectaction.py:903174
msgid "Can't make home folder thumbnails folder"175
msgstr "Nelze udělat složku pro náhledy z domovské složky"176
177
-#: projectaction.py:905 dialogs.py:361178
+#: projectaction.py:904 dialogs.py:359179
msgid "Please create and select some other folder then '"180
msgstr "Vytvořte a vyberte, prosím, nějakou jinou složku než '"181
182
-#: projectaction.py:906183
+#: projectaction.py:905184
msgid "' as thumbnails folder"185
msgstr "' jako složku pro náhledy"186
187
#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034188
#: projectaction.py:1042 projectaction.py:1049189
msgid "N/A"190
-msgstr ""191
+msgstr "NEDOSTUPNÉ"192
193
-#: projectaction.py:1038 guicomponents.py:1745194
+#: projectaction.py:1038 guicomponents.py:1751195
msgid "Yes"196
msgstr "Ano"197
198
-#: projectaction.py:1040 guicomponents.py:1747199
+#: projectaction.py:1040 guicomponents.py:1753200
msgid "No"201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.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: 2016-12-05 10:12+0200\n"6
+"POT-Creation-Date: 2017-03-17 17:18+0200\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:75815
+#: app.py:76116
msgid "Too small screen for this application."17
msgstr "Zu kleiner Bildschirm für diese Applikation."18
19
-#: app.py:76120
+#: app.py:76421
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:76225
+#: app.py:76526
msgid "Your screen dimensions are "27
msgstr "Ihre Auflösung beträgt "28
29
-#: app.py:795 projectaction.py:366 projectaction.py:69630
+#: app.py:798 projectaction.py:365 projectaction.py:69531
msgid "Project has not been saved previously"32
msgstr "Projekt wurde noch nicht gesichert"33
34
-#: app.py:796 projectaction.py:367 projectaction.py:69735
+#: app.py:799 projectaction.py:366 projectaction.py:69636
msgid "Save project with File -> Save As before closing."37
msgstr "Projekt vor dem Schließen sichern mit 'Datei -> Sichern als...'."38
39
40
msgid "Opening"41
msgstr "Öffnen"42
43
-#: projectaction.py:27644
+#: projectaction.py:27545
msgid "Media files already present in project were opened!"46
msgstr "Im Projekt bereits vorhandene Mediendateien wurden geöffnet!"47
48
-#: projectaction.py:28249
+#: projectaction.py:28150
msgid ""51
"Files already present:\n"52
"\n"53
54
"Bereits vorhandene Dateien:\n"55
"\n"56
57
-#: projectaction.py:48158
+#: projectaction.py:48059
msgid "Selected folder contains files"60
msgstr "Gewählter Ordner enthält Dateien"61
62
-#: projectaction.py:48263
+#: projectaction.py:48164
msgid ""65
"When saving a back-up snapshot of the project, the selected folder\n"66
"has to be empty."67
68
"Für das Sichern einer Sicherungskopie muss der gewählte Ordner\n"69
"leer sein."70
71
-#: projectaction.py:55372
+#: projectaction.py:55273
msgid "Copying project media assets"74
msgstr "Kopiere Projektmediendaten"75
76
-#: projectaction.py:55477
+#: projectaction.py:55378
msgid "Saving project file"79
msgstr "Sichere Projektdatei"80
81
-#: projectaction.py:70982
+#: projectaction.py:70883
msgid "Project not found on disk"84
msgstr "Projekt nicht gefunden"85
86
-#: projectaction.py:71087
+#: projectaction.py:70988
msgid "Project can't be loaded."89
msgstr "Projekt kann nicht geladen werden."90
91
-#: projectaction.py:71892
+#: projectaction.py:71793
msgid "Project has not been saved since it was opened."94
msgstr "Projekt wurde seit dem Öffnen nicht gesichert."95
96
-#: projectaction.py:72397
+#: projectaction.py:72298
msgid "Project was saved less than a minute ago."99
msgstr "Projekt wurde vor weniger als einer Minute gesichert."100
101
-#: projectaction.py:726102
+#: projectaction.py:725103
msgid "Project was saved one minute ago."104
msgstr "Projekt wurde vor einer Minute gesichert."105
106
-#: projectaction.py:728107
+#: projectaction.py:727108
msgid "Project was saved "109
msgstr "Projekt wurde vor "110
111
-#: projectaction.py:728112
+#: projectaction.py:727113
msgid " minutes ago."114
msgstr " Minuten gesichert."115
116
-#: projectaction.py:782117
+#: projectaction.py:781118
msgid "Render launch failed!"119
msgstr "Renderstart fehlgeschlagen!"120
121
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299122
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299123
msgid "Error message: "124
msgstr "Fehlermeldung: "125
126
-#: projectaction.py:796127
+#: projectaction.py:795128
msgid "Adding item to render queue failed!"129
msgstr "Hinzufügen eines Elements zur Warteschlange fehlgeschlagen!"130
131
-#: projectaction.py:815132
+#: projectaction.py:814133
msgid "Open.."134
msgstr "Öffnen.."135
136
-#: projectaction.py:845137
+#: projectaction.py:844138
msgid "No file was selected"139
msgstr "Keine Datei ausgewählt"140
141
-#: projectaction.py:845142
+#: projectaction.py:844143
msgid "Select a numbered file to add an Image Sequence to Project."144
msgstr "Datei mit Ziffern wählen, um Bildsequenz in Projekt einzufügen."145
146
-#: projectaction.py:853147
+#: projectaction.py:852148
msgid "Not a sequence file!"149
msgstr "Keine Sequenz-Datei!"150
151
-#: projectaction.py:853152
+#: projectaction.py:852153
msgid ""154
"Selected file does not have a number part in it,\n"155
"so it can't be an image sequence file."156
157
"Ausgewählte Datei enthält keine Ziffern,\n"158
"so dass sie keine Bildsequenz-Datei sein kann."159
160
-#: projectaction.py:904161
+#: projectaction.py:903162
msgid "Can't make home folder thumbnails folder"163
msgstr "Kann Ordner für Miniaturen nicht anlegen"164
165
-#: projectaction.py:905 dialogs.py:361166
+#: projectaction.py:904 dialogs.py:359167
msgid "Please create and select some other folder then '"168
msgstr "Bitte anderen Ordner erzeugen und wählen, als '"169
170
-#: projectaction.py:906171
+#: projectaction.py:905172
msgid "' as thumbnails folder"173
msgstr "' für Miniatur-Ordner"174
175
176
msgid "N/A"177
msgstr ""178
179
-#: projectaction.py:1038 guicomponents.py:1745180
+#: projectaction.py:1038 guicomponents.py:1751181
msgid "Yes"182
msgstr "Ja"183
184
-#: projectaction.py:1040 guicomponents.py:1747185
+#: projectaction.py:1040 guicomponents.py:1753186
msgid "No"187
msgstr "Nein"188
189
190
"Andere Sequenz auswählen. Drücke Add -button um eine\n"191
"neue Sequenz zu erzeugen."192
193
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196194
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201195
msgid "sequence_"196
msgstr "sequenz_"197
198
199
msgid "There must always exist at least one sequence."200
msgstr "Es muss immer eine Sequenz angelegt bleiben."201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.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: 2016-12-05 10:12+0200\n"6
+"POT-Creation-Date: 2017-03-17 17:18+0200\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:75815
+#: app.py:76116
msgid "Too small screen for this application."17
msgstr "La pantalla es demasiado pequeña para esta aplicación."18
19
-#: app.py:76120
+#: app.py:76421
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:76226
+#: app.py:76527
msgid "Your screen dimensions are "28
msgstr "Las dimensiones de su pantalla son "29
30
-#: app.py:795 projectaction.py:366 projectaction.py:69631
+#: app.py:798 projectaction.py:365 projectaction.py:69532
msgid "Project has not been saved previously"33
msgstr "El proyecto no se ha salvado antes"34
35
-#: app.py:796 projectaction.py:367 projectaction.py:69736
+#: app.py:799 projectaction.py:366 projectaction.py:69637
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
msgid "Opening"42
msgstr "Abriendo"43
44
-#: projectaction.py:27645
+#: projectaction.py:27546
msgid "Media files already present in project were opened!"47
msgstr ""48
49
-#: projectaction.py:28250
+#: projectaction.py:28151
#, fuzzy52
msgid ""53
"Files already present:\n"54
"\n"55
msgstr " ya existe!"56
57
-#: projectaction.py:48158
+#: projectaction.py:48059
#, fuzzy60
msgid "Selected folder contains files"61
msgstr "Seleccionar carpeta para nuevos miniaturas."62
63
-#: projectaction.py:48264
+#: projectaction.py:48165
msgid ""66
"When saving a back-up snapshot of the project, the selected folder\n"67
"has to be empty."68
msgstr ""69
70
-#: projectaction.py:55371
+#: projectaction.py:55272
msgid "Copying project media assets"73
msgstr ""74
75
-#: projectaction.py:55476
+#: projectaction.py:55377
#, fuzzy78
msgid "Saving project file"79
msgstr "¿Guardar proyecto '"80
81
-#: projectaction.py:70982
+#: projectaction.py:70883
msgid "Project not found on disk"84
msgstr "El proyecto no se encuentra en el disco"85
86
-#: projectaction.py:71087
+#: projectaction.py:70988
msgid "Project can't be loaded."89
msgstr "El proyecto no puede ser cargado."90
91
-#: projectaction.py:71892
+#: projectaction.py:71793
msgid "Project has not been saved since it was opened."94
msgstr "El proyecto no ha sido salvado desde que se abrió."95
96
-#: projectaction.py:72397
+#: projectaction.py:72298
msgid "Project was saved less than a minute ago."99
msgstr "El proyecto fue salvado hace menos de un minuto."100
101
-#: projectaction.py:726102
+#: projectaction.py:725103
msgid "Project was saved one minute ago."104
msgstr "El proyecto fue salvado hace un minuto."105
106
-#: projectaction.py:728107
+#: projectaction.py:727108
msgid "Project was saved "109
msgstr "El proyecto salvado "110
111
-#: projectaction.py:728112
+#: projectaction.py:727113
msgid " minutes ago."114
msgstr " hace minutos."115
116
-#: projectaction.py:782117
+#: projectaction.py:781118
#, fuzzy119
msgid "Render launch failed!"120
msgstr "Render rango no definido!"121
122
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299123
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299124
msgid "Error message: "125
msgstr "Mensaje de error:"126
127
-#: projectaction.py:796128
+#: projectaction.py:795129
msgid "Adding item to render queue failed!"130
msgstr "¡Fallo al añadir un elemento a la cola de renderizado!"131
132
-#: projectaction.py:815133
+#: projectaction.py:814134
msgid "Open.."135
msgstr "Abrir…"136
137
-#: projectaction.py:845138
+#: projectaction.py:844139
msgid "No file was selected"140
msgstr "Ningún archivo seleccionado."141
142
-#: projectaction.py:845143
+#: projectaction.py:844144
msgid "Select a numbered file to add an Image Sequence to Project."145
msgstr ""146
"Seleccione un archivo numerado para agregar una secuencia de imágenes de "147
"Proyecto."148
149
-#: projectaction.py:853150
+#: projectaction.py:852151
msgid "Not a sequence file!"152
msgstr "¡No hay archivo de secuencia!"153
154
-#: projectaction.py:853155
+#: projectaction.py:852156
msgid ""157
"Selected file does not have a number part in it,\n"158
"so it can't be an image sequence file."159
160
"El archivo seleccionado no tiene un número de parte en el mismo, \n"161
" so no puede ser un archivo de secuencia de imágenes."162
163
-#: projectaction.py:904164
+#: projectaction.py:903165
msgid "Can't make home folder thumbnails folder"166
msgstr "No se puede hacer la carpeta miniaturas de carpeta home"167
168
-#: projectaction.py:905 dialogs.py:361169
+#: projectaction.py:904 dialogs.py:359170
msgid "Please create and select some other folder then '"171
msgstr "Por favor, crear y seleccionar otra carpeta y luego '"172
173
-#: projectaction.py:906174
+#: projectaction.py:905175
msgid "' as thumbnails folder"176
msgstr "Como carpeta de miniaturas"177
178
179
msgid "N/A"180
msgstr ""181
182
-#: projectaction.py:1038 guicomponents.py:1745183
+#: projectaction.py:1038 guicomponents.py:1751184
msgid "Yes"185
msgstr "Si"186
187
-#: projectaction.py:1040 guicomponents.py:1747188
+#: projectaction.py:1040 guicomponents.py:1753189
msgid "No"190
msgstr "No hay aparentes"191
192
193
"nnew \n"194
" si es necesario."195
196
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196197
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201198
msgid "sequence_"199
msgstr "secuencia_"200
201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/fi/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: 2016-12-05 10:12+0200\n"6
+"POT-Creation-Date: 2017-03-17 17:18+0200\n"7
"PO-Revision-Date: 2011-12-13 23:55+0200\n"8
"Last-Translator: Janne Liljeblad <janne@janne-kx557aa-uuw-a6521-sc>\n"9
"Language-Team: Finnish\n"10
11
"Content-Transfer-Encoding: 8bit\n"12
"Plural-Forms: nplurals=2; plural=(n != 1);\n"13
14
-#: app.py:75815
+#: app.py:76116
msgid "Too small screen for this application."17
msgstr "Näyttö on liian pieni tälle ohjelmalle."18
19
-#: app.py:76120
+#: app.py:76421
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"22
msgstr "Minimi näyttökoko tällle ohjelmalle on 1152 x 768.\n"23
24
-#: app.py:76225
+#: app.py:76526
msgid "Your screen dimensions are "27
msgstr "Sinun näyttösi koko on "28
29
-#: app.py:795 projectaction.py:366 projectaction.py:69630
+#: app.py:798 projectaction.py:365 projectaction.py:69531
msgid "Project has not been saved previously"32
msgstr "Projektia ei ole tallennettu aikaisemmin"33
34
-#: app.py:796 projectaction.py:367 projectaction.py:69735
+#: app.py:799 projectaction.py:366 projectaction.py:69636
msgid "Save project with File -> Save As before closing."37
msgstr ""38
"Tallenna projekti valinnalla Tiedosto -> Tallenna nimellä ennen sulkemista."39
40
msgid "Opening"41
msgstr "Avaa"42
43
-#: projectaction.py:27644
+#: projectaction.py:27545
msgid "Media files already present in project were opened!"46
msgstr "Avattiin media tiedostoja, jotka jo ovat projektissa"47
48
-#: projectaction.py:28249
+#: projectaction.py:28150
msgid ""51
"Files already present:\n"52
"\n"53
54
"Projektissa jo olevat tiedostot:\n"55
"\n"56
57
-#: projectaction.py:48158
+#: projectaction.py:48059
msgid "Selected folder contains files"60
msgstr "Valitussa kansiossa on tiedostoja"61
62
-#: projectaction.py:48263
+#: projectaction.py:48164
msgid ""65
"When saving a back-up snapshot of the project, the selected folder\n"66
"has to be empty."67
68
"Kun tallennetaan projektia ja mediaa yhtä aikaa\n"69
"täytyy kansion olla tyhjä."70
71
-#: projectaction.py:55372
+#: projectaction.py:55273
msgid "Copying project media assets"74
msgstr "Kopioidaan mediaa"75
76
-#: projectaction.py:55477
+#: projectaction.py:55378
msgid "Saving project file"79
msgstr "Tallennetaan projektia"80
81
-#: projectaction.py:70982
+#: projectaction.py:70883
msgid "Project not found on disk"84
msgstr "Projektia ei löytynyt kovalevyltä"85
86
-#: projectaction.py:71087
+#: projectaction.py:70988
msgid "Project can't be loaded."89
msgstr "Projektia ei voida ladata."90
91
-#: projectaction.py:71892
+#: projectaction.py:71793
msgid "Project has not been saved since it was opened."94
msgstr "Projektia ei ole tallennettu aikaisemmin."95
96
-#: projectaction.py:72397
+#: projectaction.py:72298
msgid "Project was saved less than a minute ago."99
msgstr "Projekti tallennettiin viimeksi alle minuutti sitten."100
101
-#: projectaction.py:726102
+#: projectaction.py:725103
msgid "Project was saved one minute ago."104
msgstr "Projekti tallennettiin viimeksi minuutti sitten."105
106
-#: projectaction.py:728107
+#: projectaction.py:727108
msgid "Project was saved "109
msgstr "Projektia ei ole tallennettu aikaisemmin"110
111
-#: projectaction.py:728112
+#: projectaction.py:727113
msgid " minutes ago."114
msgstr " minuuttia sitten."115
116
-#: projectaction.py:782117
+#: projectaction.py:781118
msgid "Render launch failed!"119
msgstr "Renderöinnin aloitus epäonnistui!"120
121
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299122
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299123
msgid "Error message: "124
msgstr "Virhe viesti"125
126
-#: projectaction.py:796127
+#: projectaction.py:795128
msgid "Adding item to render queue failed!"129
msgstr ""130
131
-#: projectaction.py:815132
+#: projectaction.py:814133
msgid "Open.."134
msgstr "Avaa"135
136
-#: projectaction.py:845137
+#: projectaction.py:844138
msgid "No file was selected"139
msgstr "Tiedostoa ei valittu"140
141
-#: projectaction.py:845142
+#: projectaction.py:844143
msgid "Select a numbered file to add an Image Sequence to Project."144
msgstr "Valitse numeroitu tiedosto lisätäksesi kuvasarjan projektiin"145
146
-#: projectaction.py:853147
+#: projectaction.py:852148
msgid "Not a sequence file!"149
msgstr "Tiedosto ei kuulu kuvasarjaan"150
151
-#: projectaction.py:853152
+#: projectaction.py:852153
msgid ""154
"Selected file does not have a number part in it,\n"155
"so it can't be an image sequence file."156
157
"Valitussa tiedostossa ei ole numero osuutta,\n"158
"joten se ei voi olla osa kuvasarjaa."159
160
-#: projectaction.py:904161
+#: projectaction.py:903162
msgid "Can't make home folder thumbnails folder"163
msgstr "Et voi valita kotikansiotasi mediaikoni kansioksi"164
165
-#: projectaction.py:905 dialogs.py:361166
+#: projectaction.py:904 dialogs.py:359167
msgid "Please create and select some other folder then '"168
msgstr "Luo ja valitse joku toinen kansio kuin '"169
170
-#: projectaction.py:906171
+#: projectaction.py:905172
msgid "' as thumbnails folder"173
msgstr "' mediaikoni kansioksi."174
175
176
msgid "N/A"177
msgstr ""178
179
-#: projectaction.py:1038 guicomponents.py:1745180
+#: projectaction.py:1038 guicomponents.py:1751181
msgid "Yes"182
msgstr "Kyllä"183
184
-#: projectaction.py:1040 guicomponents.py:1747185
+#: projectaction.py:1040 guicomponents.py:1753186
msgid "No"187
msgstr "Ei"188
189
190
"Valitse toinen ohjelma. Paina tarvittaessa Lisää -nappia luodaksesi\n"191
"uuden ohjelman"192
193
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196194
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201195
msgid "sequence_"196
msgstr "ohjelma_"197
198
199
msgid "There must always exist at least one sequence."200
msgstr "Projektissa täytyy olla olemassa aina vähintään yksi ohjelma."201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.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: 2016-12-05 10:12+0200\n"6
+"POT-Creation-Date: 2017-03-17 17:18+0200\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:75815
+#: app.py:76116
msgid "Too small screen for this application."17
msgstr "Votre écran est trop petit pour cette application."18
19
-#: app.py:76120
+#: app.py:76421
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:76225
+#: app.py:76526
msgid "Your screen dimensions are "27
msgstr "Votre résolution actuelle est "28
29
-#: app.py:795 projectaction.py:366 projectaction.py:69630
+#: app.py:798 projectaction.py:365 projectaction.py:69531
msgid "Project has not been saved previously"32
msgstr "Le projet n'a jamais été sauvegardé"33
34
-#: app.py:796 projectaction.py:367 projectaction.py:69735
+#: app.py:799 projectaction.py:366 projectaction.py:69636
msgid "Save project with File -> Save As before closing."37
msgstr "Sauvegardez le projet avec Fichier -> Enregistrer sous."38
39
40
msgid "Opening"41
msgstr "Ouverture"42
43
-#: projectaction.py:27644
+#: projectaction.py:27545
msgid "Media files already present in project were opened!"46
msgstr ""47
48
-#: projectaction.py:28249
+#: projectaction.py:28150
#, fuzzy51
msgid ""52
"Files already present:\n"53
"\n"54
msgstr " existe déjà!"55
56
-#: projectaction.py:48157
+#: projectaction.py:48058
#, fuzzy59
msgid "Selected folder contains files"60
msgstr "Sélectionner un dossier pour les nouvelles miniatures"61
62
-#: projectaction.py:48263
+#: projectaction.py:48164
msgid ""65
"When saving a back-up snapshot of the project, the selected folder\n"66
"has to be empty."67
msgstr ""68
69
-#: projectaction.py:55370
+#: projectaction.py:55271
msgid "Copying project media assets"72
msgstr ""73
74
-#: projectaction.py:55475
+#: projectaction.py:55376
#, fuzzy77
msgid "Saving project file"78
msgstr "Sauvegarder le projet '"79
80
-#: projectaction.py:70981
+#: projectaction.py:70882
msgid "Project not found on disk"83
msgstr "Le projet n'a pas été trouvé sur le disque"84
85
-#: projectaction.py:71086
+#: projectaction.py:70987
msgid "Project can't be loaded."88
msgstr "Le projet ne peut pas être chargé."89
90
-#: projectaction.py:71891
+#: projectaction.py:71792
msgid "Project has not been saved since it was opened."93
msgstr "Ce projet n'a pas été enregistré depuis qu'il a été ouvert."94
95
-#: projectaction.py:72396
+#: projectaction.py:72297
msgid "Project was saved less than a minute ago."98
msgstr "Le projet a été sauvegardé il y a moins d'une minute."99
100
-#: projectaction.py:726101
+#: projectaction.py:725102
msgid "Project was saved one minute ago."103
msgstr "Le projet a été sauvegardé il y a une minute."104
105
-#: projectaction.py:728106
+#: projectaction.py:727107
msgid "Project was saved "108
msgstr "Le projet a été sauvegardé il y a "109
110
-#: projectaction.py:728111
+#: projectaction.py:727112
msgid " minutes ago."113
msgstr " minutes."114
115
-#: projectaction.py:782116
+#: projectaction.py:781117
#, fuzzy118
msgid "Render launch failed!"119
msgstr "Zone de rendu non définie!"120
121
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299122
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299123
#, fuzzy124
msgid "Error message: "125
msgstr "Message d'erreur: "126
127
-#: projectaction.py:796128
+#: projectaction.py:795129
msgid "Adding item to render queue failed!"130
msgstr "Echec de l'ajout d'élément à la liste de rendu!"131
132
-#: projectaction.py:815133
+#: projectaction.py:814134
msgid "Open.."135
msgstr "Ouvrir..."136
137
-#: projectaction.py:845138
+#: projectaction.py:844139
msgid "No file was selected"140
msgstr "Aucun fichier sélectionné"141
142
-#: projectaction.py:845143
+#: projectaction.py:844144
msgid "Select a numbered file to add an Image Sequence to Project."145
msgstr ""146
"Sélectionnez un fichier numéroté pour ajouter une séquence d'images au "147
"projet."148
149
-#: projectaction.py:853150
+#: projectaction.py:852151
msgid "Not a sequence file!"152
msgstr "Ce n'est pas un fichier de séquence!"153
154
-#: projectaction.py:853155
+#: projectaction.py:852156
msgid ""157
"Selected file does not have a number part in it,\n"158
"so it can't be an image sequence file."159
160
"Le fichier sélectionné ne contient pas de numérotation,\n"161
"il ne peut donc pas constituer une séquence d'images."162
163
-#: projectaction.py:904164
+#: projectaction.py:903165
msgid "Can't make home folder thumbnails folder"166
msgstr "Le dossier home ne peut pas être le dossier des miniatures"167
168
-#: projectaction.py:905 dialogs.py:361169
+#: projectaction.py:904 dialogs.py:359170
msgid "Please create and select some other folder then '"171
msgstr "Créez et sélectionnez un autre dossier '"172
173
-#: projectaction.py:906174
+#: projectaction.py:905175
msgid "' as thumbnails folder"176
msgstr "' comme dossier de miniatures"177
178
179
msgid "N/A"180
msgstr ""181
182
-#: projectaction.py:1038 guicomponents.py:1745183
+#: projectaction.py:1038 guicomponents.py:1751184
msgid "Yes"185
msgstr "Oui"186
187
-#: projectaction.py:1040 guicomponents.py:1747188
+#: projectaction.py:1040 guicomponents.py:1753189
msgid "No"190
msgstr "Non"191
192
193
"Sélectionnez une autre séquence. Cliquez sur Ajouter pour créer\n"194
"une nouvelle séquence si nécéssaire."195
196
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196197
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201198
msgid "sequence_"199
msgstr "séquence_"200
201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.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: 2016-12-05 10:12+0200\n"6
-"PO-Revision-Date: 2016-08-04 21:35+0100\n"7
+"POT-Creation-Date: 2017-03-17 17:18+0200\n"8
+"PO-Revision-Date: 2017-03-10 15:54+0100\n"9
"Last-Translator: Péter Gábor <ptrg@freemail.hu>\n"10
"Language-Team: \n"11
"Language: hu-HU\n"12
13
"Content-Transfer-Encoding: 8bit\n"14
"X-Generator: Poedit 1.5.4\n"15
16
-#: app.py:75817
+#: app.py:76118
msgid "Too small screen for this application."19
msgstr "Túl kicsi a képernyő az alkalmazás számára."20
21
-#: app.py:76122
+#: app.py:76423
msgid "Minimum screen dimensions for this application are 1152 x 768.\n"24
msgstr "A minimális képernyőfelbontás ezen alkalmazás számára 1152 x 768.\n"25
26
-#: app.py:76227
+#: app.py:76528
msgid "Your screen dimensions are "29
msgstr "Az ön képernyőjének felbontása "30
31
-#: app.py:795 projectaction.py:366 projectaction.py:69632
+#: app.py:798 projectaction.py:365 projectaction.py:69533
msgid "Project has not been saved previously"34
msgstr "A projekt korábban még nem volt mentve"35
36
-#: app.py:796 projectaction.py:367 projectaction.py:69737
+#: app.py:799 projectaction.py:366 projectaction.py:69638
msgid "Save project with File -> Save As before closing."39
msgstr ""40
"Mentse a projektet a Fájl -> Mentés másként menüpont használatával mielőtt "41
42
msgid "Opening"43
msgstr "Megnyitás"44
45
-#: projectaction.py:27646
+#: projectaction.py:27547
msgid "Media files already present in project were opened!"48
msgstr "A projektben már jelenlévő fájlok lettek megnyitva!"49
50
-#: projectaction.py:28251
+#: projectaction.py:28152
msgid ""53
"Files already present:\n"54
"\n"55
56
"Már jelenlévő fájlok:\n"57
"\n"58
59
-#: projectaction.py:48160
+#: projectaction.py:48061
msgid "Selected folder contains files"62
msgstr "A választott könyvtár fájlokat tartalmaz"63
64
-#: projectaction.py:48265
+#: projectaction.py:48166
msgid ""67
"When saving a back-up snapshot of the project, the selected folder\n"68
"has to be empty."69
70
"Egy projekt állapotának mentésekor a választott mappának\n"71
"üresnek kell lennie."72
73
-#: projectaction.py:55374
+#: projectaction.py:55275
msgid "Copying project media assets"76
msgstr "A projekt média összetevőinek másolása"77
78
-#: projectaction.py:55479
+#: projectaction.py:55380
msgid "Saving project file"81
msgstr "Projekt fájl mentése"82
83
-#: projectaction.py:70984
+#: projectaction.py:70885
msgid "Project not found on disk"86
msgstr "A projekt nem található a lemezen"87
88
-#: projectaction.py:71089
+#: projectaction.py:70990
msgid "Project can't be loaded."91
msgstr "A projekt nem tölthető be."92
93
-#: projectaction.py:71894
+#: projectaction.py:71795
msgid "Project has not been saved since it was opened."96
msgstr "A projekt még nem volt mentve a megnyitás óta."97
98
-#: projectaction.py:72399
+#: projectaction.py:722100
msgid "Project was saved less than a minute ago."101
msgstr "A projekt kevesebb mint egy perce volt mentve"102
103
-#: projectaction.py:726104
+#: projectaction.py:725105
msgid "Project was saved one minute ago."106
msgstr "A projekt egy perce volt mentve."107
108
-#: projectaction.py:728109
+#: projectaction.py:727110
msgid "Project was saved "111
msgstr "A projekt mentése "112
113
-#: projectaction.py:728114
+#: projectaction.py:727115
msgid " minutes ago."116
msgstr " perce történt."117
118
-#: projectaction.py:782119
+#: projectaction.py:781120
msgid "Render launch failed!"121
msgstr "Nem sikerült elindítani a renderelést!"122
123
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299124
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299125
msgid "Error message: "126
msgstr "Hibaüzenet: "127
128
-#: projectaction.py:796129
+#: projectaction.py:795130
msgid "Adding item to render queue failed!"131
msgstr "Nem sikerült hozzáadni az elemet a renderelés várólistájához!"132
133
-#: projectaction.py:815134
+#: projectaction.py:814135
msgid "Open.."136
msgstr "Megnyitás..."137
138
-#: projectaction.py:845139
+#: projectaction.py:844140
msgid "No file was selected"141
msgstr "Nem lett fájl kiválasztva"142
143
-#: projectaction.py:845144
+#: projectaction.py:844145
msgid "Select a numbered file to add an Image Sequence to Project."146
msgstr ""147
"Válasszon egy sorszámozott fájlt, hogy képsorozatot adjon a projekthez."148
149
-#: projectaction.py:853150
+#: projectaction.py:852151
msgid "Not a sequence file!"152
msgstr "Nem jelenetfájl!"153
154
-#: projectaction.py:853155
+#: projectaction.py:852156
msgid ""157
"Selected file does not have a number part in it,\n"158
"so it can't be an image sequence file."159
160
"A kiválasztott fájl nem tartalmaz számot a nevében,\n"161
"így nem is lehet képsorozat része."162
163
-#: projectaction.py:904164
+#: projectaction.py:903165
msgid "Can't make home folder thumbnails folder"166
msgstr "A \"Saját mappa\" nem állítható be a bélyegképek mappájaként"167
168
-#: projectaction.py:905 dialogs.py:361169
+#: projectaction.py:904 dialogs.py:359170
msgid "Please create and select some other folder then '"171
msgstr "Hozzon létre és válasszon egy másik mappát e helyett '"172
173
-#: projectaction.py:906174
+#: projectaction.py:905175
msgid "' as thumbnails folder"176
msgstr "' a bélyegképek számára"177
178
179
msgid "N/A"180
msgstr "N/A"181
182
-#: projectaction.py:1038 guicomponents.py:1745183
+#: projectaction.py:1038 guicomponents.py:1751184
msgid "Yes"185
msgstr "Igen"186
187
-#: projectaction.py:1040 guicomponents.py:1747188
+#: projectaction.py:1040 guicomponents.py:1753189
msgid "No"190
msgstr "Nem"191
192
193
"Válasszon egy másik jelenetet. Kattintson a hozzáadás gombra\n"194
"új jelenet létrehozásához."195
196
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196197
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201198
msgid "sequence_"199
msgstr "jelenet_"200
201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po -> flowblade-1.12.2.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: 2016-12-05 10:12+0200\n"6
+"POT-Creation-Date: 2017-03-17 17:18+0200\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:75815
+#: app.py:76116
msgid "Too small screen for this application."17
msgstr "Lo schermo è troppo piccolo per questa applicazione."18
19
-#: app.py:76120
+#: app.py:76421
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:76225
+#: app.py:76526
msgid "Your screen dimensions are "27
msgstr "La risoluzione corrente è"28
29
-#: app.py:795 projectaction.py:366 projectaction.py:69630
+#: app.py:798 projectaction.py:365 projectaction.py:69531
msgid "Project has not been saved previously"32
msgstr "Il progetto non è mai stato salvato"33
34
-#: app.py:796 projectaction.py:367 projectaction.py:69735
+#: app.py:799 projectaction.py:366 projectaction.py:69636
msgid "Save project with File -> Save As before closing."37
msgstr "Salva il progetto da File -> Salva con nome"38
39
40
msgid "Opening"41
msgstr "Apertura"42
43
-#: projectaction.py:27644
+#: projectaction.py:27545
msgid "Media files already present in project were opened!"46
msgstr "File multimediali già presenti nel progetto sono stati aperti!"47
48
-#: projectaction.py:28249
+#: projectaction.py:28150
msgid ""51
"Files already present:\n"52
"\n"53
54
"File già esistenti:\n"55
"\n"56
57
-#: projectaction.py:48158
+#: projectaction.py:48059
#, fuzzy60
msgid "Selected folder contains files"61
msgstr "Seleziona cartella per le nuove miniature."62
63
-#: projectaction.py:48264
+#: projectaction.py:48165
msgid ""66
"When saving a back-up snapshot of the project, the selected folder\n"67
"has to be empty."68
msgstr ""69
70
-#: projectaction.py:55371
+#: projectaction.py:55272
msgid "Copying project media assets"73
msgstr ""74
75
-#: projectaction.py:55476
+#: projectaction.py:55377
#, fuzzy78
msgid "Saving project file"79
msgstr "Salvo il progetto '"80
81
-#: projectaction.py:70982
+#: projectaction.py:70883
msgid "Project not found on disk"84
msgstr "Il progetto non è stato trovato sul disco"85
86
-#: projectaction.py:71087
+#: projectaction.py:70988
msgid "Project can't be loaded."89
msgstr "Il progetto non può essere caricato."90
91
-#: projectaction.py:71892
+#: projectaction.py:71793
msgid "Project has not been saved since it was opened."94
msgstr "Questo progetto non è ancora stato salvato dall'apertura."95
96
-#: projectaction.py:72397
+#: projectaction.py:72298
msgid "Project was saved less than a minute ago."99
msgstr "Il progetto è stato salvato meno di un minuto fa."100
101
-#: projectaction.py:726102
+#: projectaction.py:725103
msgid "Project was saved one minute ago."104
msgstr "Il progetto è stato salvato un minuto fa."105
106
-#: projectaction.py:728107
+#: projectaction.py:727108
msgid "Project was saved "109
msgstr "Il progetto è stato salvato"110
111
-#: projectaction.py:728112
+#: projectaction.py:727113
msgid " minutes ago."114
msgstr " minuti fa."115
116
-#: projectaction.py:782117
+#: projectaction.py:781118
#, fuzzy119
msgid "Render launch failed!"120
msgstr "Area di calcolo non definita!"121
122
-#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299123
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299124
msgid "Error message: "125
msgstr "Messaggio d'errore: "126
127
-#: projectaction.py:796128
+#: projectaction.py:795129
msgid "Adding item to render queue failed!"130
msgstr "Aggiunta alla coda dei render fallita!"131
132
-#: projectaction.py:815133
+#: projectaction.py:814134
msgid "Open.."135
msgstr "Apri..."136
137
-#: projectaction.py:845138
+#: projectaction.py:844139
msgid "No file was selected"140
msgstr "Nessun file selezionato"141
142
-#: projectaction.py:845143
+#: projectaction.py:844144
msgid "Select a numbered file to add an Image Sequence to Project."145
msgstr "Selezionare un file numerato per aggiungere una sequenza di immagini"146
147
-#: projectaction.py:853148
+#: projectaction.py:852149
msgid "Not a sequence file!"150
msgstr "Questa non è una sequenza!"151
152
-#: projectaction.py:853153
+#: projectaction.py:852154
msgid ""155
"Selected file does not have a number part in it,\n"156
"so it can't be an image sequence file."157
158
"Il file selezionato non è numerato, \n"159
"quindi non può essere una sequenza di immagini."160
161
-#: projectaction.py:904162
+#: projectaction.py:903163
msgid "Can't make home folder thumbnails folder"164
msgstr "Non si può usare la carella Home per le miniature"165
166
-#: projectaction.py:905 dialogs.py:361167
+#: projectaction.py:904 dialogs.py:359168
msgid "Please create and select some other folder then '"169
msgstr "Creare e selezionare una cartella differente da '"170
171
-#: projectaction.py:906172
+#: projectaction.py:905173
msgid "' as thumbnails folder"174
msgstr "' per le miniature"175
176
177
msgid "N/A"178
msgstr ""179
180
-#: projectaction.py:1038 guicomponents.py:1745181
+#: projectaction.py:1038 guicomponents.py:1751182
msgid "Yes"183
msgstr "Si"184
185
-#: projectaction.py:1040 guicomponents.py:1747186
+#: projectaction.py:1040 guicomponents.py:1753187
msgid "No"188
msgstr "No"189
190
191
"Selezionare una sequenza diversa. Fare clic su Aggiungi per creare \n"192
"una nuova sequenza se necessario."193
194
-#: projectaction.py:1218 projectaction.py:1235 projectdata.py:196195
+#: projectaction.py:1218 projectaction.py:1235 projectdata.py:201196
msgid "sequence_"197
msgstr "sequenza_"198
199
200
msgid "There must always exist at least one sequence."201
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/ru
Added
2
1
+(directory)2
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES
Added
2
1
+(directory)2
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po
Added
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
+msgid ""7
+msgstr ""8
+"Project-Id-Version: Flowblade\n"9
+"Report-Msgid-Bugs-To: \n"10
+"POT-Creation-Date: 2017-03-17 17:18+0200\n"11
+"PO-Revision-Date: 2017-03-07 21:29+0300\n"12
+"Last-Translator: Николай Смольянинов <smolianinow.colya2016@yandex.ru>\n"13
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"14
+"Language: ru_RU\n"15
+"MIME-Version: 1.0\n"16
+"Content-Type: text/plain; charset=UTF-8\n"17
+"Content-Transfer-Encoding: 8bit\n"18
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"19
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"20
+"X-Generator: Lokalize 2.0\n"21
+22
+#: app.py:76123
+msgid "Too small screen for this application."24
+msgstr "Недостаточное разрешение экрана."25
+26
+#: app.py:76427
+msgid "Minimum screen dimensions for this application are 1152 x 768.\n"28
+msgstr "Разрешение экрана должно быть не ниже 1152 х 768.\n"29
+30
+#: app.py:76531
+msgid "Your screen dimensions are "32
+msgstr "Ваше разрешение экрана"33
+34
+#: app.py:798 projectaction.py:365 projectaction.py:69535
+msgid "Project has not been saved previously"36
+msgstr "Проект не был сохранён"37
+38
+#: app.py:799 projectaction.py:366 projectaction.py:69639
+msgid "Save project with File -> Save As before closing."40
+msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."41
+42
+#: projectaction.py:11143
+msgid "Media asset was missing!"44
+msgstr "Недостающий медиа актив!"45
+46
+#: projectaction.py:11247
+msgid "Path of missing asset:"48
+msgstr "Путь к недостающему активу"49
+50
+#: projectaction.py:11351
+msgid ""52
+"Relative search for replacement file in sub folders of project file failed."53
+msgstr ""54
+"Относительный поиск пути для замены файла во вложенных папках файла проекта "55
+"не удался."56
+57
+#: projectaction.py:11458
+msgid "To load the project you will need to either:"59
+msgstr "Для загрузки проекта требуется, либо:"60
+61
+#: projectaction.py:11562
+msgid ""63
+"Open project in 'Media Relinker' tool to relink media assets to new files, or"64
+msgstr ""65
+"Открытый проект в инструменте \"Медиа компоновщик\" переупакует медиа-"66
+"активы к новым файлам, или"67
+68
+#: projectaction.py:11669
+msgid "Place a file with the same exact name and path on the hard drive"70
+msgstr "Создать резервный файл с тем же именем и содержанием"71
+72
+#: projectaction.py:11773
+msgid "Open project in Media Relinker tool"74
+msgstr "Проект открыт в Медиа компоновщике"75
+76
+#: projectaction.py:13677
+msgid "Profile with Description: '"78
+msgstr "Профиль с описанием: '"79
+80
+#: projectaction.py:13681
+msgid "' was not found on load!"82
+msgstr "' не найден при загрузке!"83
+84
+#: projectaction.py:13785
+msgid ""86
+"It is possible to load the project by creating a User Profile with exactly "87
+"the same Description\n"88
+"as the missing profile. "89
+msgstr ""90
+"Можно загрузить проект путём создания профиля с тем же содержанием, что было "91
+"в отсутствующем\n"92
+"профиле. "93
+94
+#: projectaction.py:13895
+msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."96
+msgstr ""97
+"Профили пользователей могут быть созданы с помощью меню \"Правка ⇨ Менеджер "98
+"профилей\"."99
+100
+#: projectaction.py:145101
+msgid "Opening"102
+msgstr "Открывается"103
+104
+#: projectaction.py:275105
+msgid "Media files already present in project were opened!"106
+msgstr "Клипы уже присутствуют в проекте и были открыты!"107
+108
+#: projectaction.py:281109
+msgid ""110
+"Files already present:\n"111
+"\n"112
+msgstr ""113
+"Файлы уже присутствуют:\n"114
+"\n"115
+116
+#: projectaction.py:480117
+msgid "Selected folder contains files"118
+msgstr "Выбранная папка содержит файлы"119
+120
+#: projectaction.py:481121
+msgid ""122
+"When saving a back-up snapshot of the project, the selected folder\n"123
+"has to be empty."124
+msgstr ""125
+"При сохранении резервной копии проекта, выбираемая папка\n"126
+"должна быть пустой."127
+128
+#: projectaction.py:552129
+msgid "Copying project media assets"130
+msgstr "Копирование медиа-активов проекта"131
+132
+#: projectaction.py:553133
+msgid "Saving project file"134
+msgstr "Сохранение файла проекта"135
+136
+#: projectaction.py:708137
+msgid "Project not found on disk"138
+msgstr "Проект не найден"139
+140
+#: projectaction.py:709141
+msgid "Project can't be loaded."142
+msgstr "Невозможно загрузить проект"143
+144
+#: projectaction.py:717145
+msgid "Project has not been saved since it was opened."146
+msgstr "Открыт не сохранённый проект."147
+148
+#: projectaction.py:722149
+msgid "Project was saved less than a minute ago."150
+msgstr "Проект был сохранён менее минуты назад."151
+152
+#: projectaction.py:725153
+msgid "Project was saved one minute ago."154
+msgstr "Проект был сохранён минуту назад."155
+156
+#: projectaction.py:727157
+msgid "Project was saved "158
+msgstr "Проект был сохранён "159
+160
+#: projectaction.py:727161
+msgid " minutes ago."162
+msgstr " минут назад."163
+164
+#: projectaction.py:781165
+msgid "Render launch failed!"166
+msgstr "Не удалось запустить сборку!"167
+168
+#: projectaction.py:782 projectaction.py:796 tools/batchrendering.py:299169
+msgid "Error message: "170
+msgstr "Сообщение об ошибке:"171
+172
+#: projectaction.py:795173
+msgid "Adding item to render queue failed!"174
+msgstr "Не удалось добавить элемент в очередь!"175
+176
+#: projectaction.py:814177
+msgid "Open.."178
+msgstr "Открыть.."179
+180
+#: projectaction.py:844181
+msgid "No file was selected"182
+msgstr "Ничего не выбрано"183
+184
+#: projectaction.py:844185
+msgid "Select a numbered file to add an Image Sequence to Project."186
+msgstr ""187
+"Выберите нумерованный файл для добавления последовательности изображений в "188
+"проект."189
+190
+#: projectaction.py:852191
+msgid "Not a sequence file!"192
+msgstr "Нет последовательности файлов!"193
+194
+#: projectaction.py:852195
+msgid ""196
+"Selected file does not have a number part in it,\n"197
+"so it can't be an image sequence file."198
+msgstr ""199
+"Выбранный файл не содержит номера, поэтому он\n"200
+"не может быть файлом последовательности изображений."201
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade_old.po
Added
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
+msgid ""7
+msgstr ""8
+"Project-Id-Version: Flowblade\n"9
+"Report-Msgid-Bugs-To: \n"10
+"POT-Creation-Date: 2017-03-06 18:44+0200\n"11
+"PO-Revision-Date: 2017-03-06 18:18+0300\n"12
+"Last-Translator: Николай Смольянинов <smolianinow.colya2016@yandex.ru>\n"13
+"Language-Team: Russian\n"14
+"Language: ru_RU\n"15
+"MIME-Version: 1.0\n"16
+"Content-Type: text/plain; charset=UTF-8\n"17
+"Content-Transfer-Encoding: 8bit\n"18
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"19
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"20
+"X-Generator: Poedit 1.8.7.1\n"21
+22
+#: app.py:75823
+msgid "Too small screen for this application."24
+msgstr "Недостаточное разрешение экрана."25
+26
+#: app.py:76127
+msgid "Minimum screen dimensions for this application are 1152 x 768.\n"28
+msgstr "Разрешение экрана должно быть не ниже 1152 х 768.\n"29
+30
+#: app.py:76231
+msgid "Your screen dimensions are "32
+msgstr "Ваше разрешение экрана"33
+34
+#: app.py:795 projectaction.py:366 projectaction.py:69635
+msgid "Project has not been saved previously"36
+msgstr "Проект не был сохранён"37
+38
+#: app.py:796 projectaction.py:367 projectaction.py:69739
+msgid "Save project with File -> Save As before closing."40
+msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."41
+42
+#: projectaction.py:11143
+msgid "Media asset was missing!"44
+msgstr "Недостающий медиа актив!"45
+46
+#: projectaction.py:11247
+msgid "Path of missing asset:"48
+msgstr "Путь недостающего актива"49
+50
+#: projectaction.py:11351
+msgid ""52
+"Relative search for replacement file in sub folders of project file failed."53
+msgstr ""54
+"Относительный поиск замены файла во вложеных папках файла проекта не удался."55
+56
+#: projectaction.py:11457
+msgid "To load the project you will need to either:"58
+msgstr "Для загрузки проекта требуется, либо:"59
+60
+#: projectaction.py:11561
+msgid ""62
+"Open project in 'Media Relinker' tool to relink media assets to new files, or"63
+msgstr ""64
+"Открытый проект в инструменте \"Медиа компоновщик\" переупакует медиа-"65
+"активы к новым файлам, или"66
+67
+#: projectaction.py:11668
+msgid "Place a file with the same exact name and path on the hard drive"69
+msgstr "Создать резервный файл с тем же именем и содержанием"70
+71
+#: projectaction.py:11772
+msgid "Open project in Media Relinker tool"73
+msgstr "Открытый проект в Медиа компоновщике"74
+75
+#: projectaction.py:13676
+msgid "Profile with Description: '"77
+msgstr "Профиль с описанием: '"78
+79
+#: projectaction.py:13680
+msgid "' was not found on load!"81
+msgstr "' не найден при загрузке!"82
+83
+#: projectaction.py:13784
+msgid ""85
+"It is possible to load the project by creating a User Profile with exactly "86
+"the same Description\n"87
+"as the missing profile. "88
+msgstr ""89
+"Можно загрузить проект путём создания профиля с тем же содержанием, что было "90
+"в отсутствующем\n"91
+"профиле. "92
+93
+#: projectaction.py:13894
+msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."95
+msgstr ""96
+"Профили пользователей могут быть созданы с помощью меню \"Правка ⇨ Менеджер "97
+"профилей\"."98
+99
+#: projectaction.py:145100
+msgid "Opening"101
+msgstr "Открывается"102
+103
+#: projectaction.py:276104
+msgid "Media files already present in project were opened!"105
+msgstr "Клипы уже присутствуют в проекте и были открыты!"106
+107
+#: projectaction.py:282108
+msgid ""109
+"Files already present:\n"110
+"\n"111
+msgstr ""112
+"Файлы уже присутствуют:\n"113
+"\n"114
+115
+#: projectaction.py:481116
+msgid "Selected folder contains files"117
+msgstr "Выбранная папка содержит файлы"118
+119
+#: projectaction.py:482120
+msgid ""121
+"When saving a back-up snapshot of the project, the selected folder\n"122
+"has to be empty."123
+msgstr ""124
+"При сохранении резервной копии проекта, выбираемая папка\n"125
+"должна быть пустой."126
+127
+#: projectaction.py:553128
+msgid "Copying project media assets"129
+msgstr "Копирование медиа-активов проекта"130
+131
+#: projectaction.py:554132
+msgid "Saving project file"133
+msgstr "Сохранение файла проекта"134
+135
+#: projectaction.py:709136
+msgid "Project not found on disk"137
+msgstr "Проект не найден"138
+139
+#: projectaction.py:710140
+msgid "Project can't be loaded."141
+msgstr "Невозможно загрузить проект"142
+143
+#: projectaction.py:718144
+msgid "Project has not been saved since it was opened."145
+msgstr "Открыт не сохранённый проект."146
+147
+#: projectaction.py:723148
+msgid "Project was saved less than a minute ago."149
+msgstr "Проект был сохранён менее минуты назад."150
+151
+#: projectaction.py:726152
+msgid "Project was saved one minute ago."153
+msgstr "Проект был сохранён минуту назад."154
+155
+#: projectaction.py:728156
+msgid "Project was saved "157
+msgstr "Проект был сохранён "158
+159
+#: projectaction.py:728160
+msgid " minutes ago."161
+msgstr " минут назад."162
+163
+#: projectaction.py:782164
+msgid "Render launch failed!"165
+msgstr "Не удалось запустить сборку!"166
+167
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299168
+msgid "Error message: "169
+msgstr "Сообщение об ошибке:"170
+171
+#: projectaction.py:796172
+msgid "Adding item to render queue failed!"173
+msgstr "Не удалось добавить элемент в очередь!"174
+175
+#: projectaction.py:815176
+msgid "Open.."177
+msgstr "Открыть.."178
+179
+#: projectaction.py:845180
+msgid "No file was selected"181
+msgstr "Ничего не выбрано"182
+183
+#: projectaction.py:845184
+msgid "Select a numbered file to add an Image Sequence to Project."185
+msgstr ""186
+"Выберите нумерованный файл для добавления последовательности изображений в "187
+"проект."188
+189
+#: projectaction.py:853190
+msgid "Not a sequence file!"191
+msgstr "Нет последовательности файлов!"192
+193
+#: projectaction.py:853194
+msgid ""195
+"Selected file does not have a number part in it,\n"196
+"so it can't be an image sequence file."197
+msgstr ""198
+"Выбранный файл содержит номера, \\ поэтому он не может быть файлом "199
+"последовательности изображений."200
+201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/update_language -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/update_language
Changed
7
1
2
-#/usr/bin/bash3
+#!/bin/bash4
5
# Get language6
LANG=$17
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/upgrade_all -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/locale/upgrade_all
Changed
10
1
2
-#/usr/bin/bash3
+#!/bin/bash4
5
-LANGUAGES=("fi" "cs" "fr" "es" "it" "de" "hu")6
+LANGUAGES=("fi" "cs" "fr" "es" "it" "de" "hu" "ru")7
8
echo "Upgading all languages"9
10
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/mltplayer.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/mltplayer.py
Changed
21
1
2
import time3
4
import gui5
-#import editorpersistance6
from editorstate import timeline_visible7
import editorstate8
import utils9
10
if update_gui:11
updater.update_frame_displayers(frame)12
13
+ def seek_end(self, update_gui=True):14
+ length = self.get_active_length()15
+ last_frame = length - 116
+ self.seek_frame(last_frame, update_gui)17
+18
def seek_and_get_rgb_frame(self, frame, update_gui=True):19
# Force range20
length = self.get_active_length()21
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/mltprofiles.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/mltprofiles.py
Changed
23
1
2
load_profiles = []3
file_list = os.listdir(dir_path)4
for fname in file_list:5
+ ## Feb-2017 - SvdB - Filter out duplicate profiles based on profile name6
+ #found_duplicate = False7
+ 8
file_path = dir_path + fname9
profile = mlt.Profile(file_path)10
profile.file_path = file_path11
load_profiles.append([profile.description(), profile])12
+ 13
+ # Feb-2017 - SvdB - Filter out duplicate profiles based on profile name14
+ #for enu_count, prof in enumerate(load_profiles):15
+ # for prof_idx, prof_name in enumerate(prof):16
+ # if prof_name == profile.description():17
+ # found_duplicate = True18
+ #if found_duplicate == False:19
+ # load_profiles.append([profile.description(), profile])20
21
return load_profiles22
23
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/mlttransitions.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/mlttransitions.py
Changed
39
1
2
3
def _set_affine_service_default_values(self):4
self.mlt_transition.set("distort",0)5
+ #self.mlt_transition.set("fill",0)6
self.mlt_transition.set("automatic",1)7
self.mlt_transition.set("keyed",1)8
9
10
self.origin_clip_id = None11
12
self.destroy_id = os.urandom(16) # HACK, HACK, HACK - find a way to remove this stuff 13
- # Objects are recreated often in Sequence.restack_compositors()14
+ # Compositors are recreated often in Sequence.restack_compositors()15
# and cannot be destroyd in undo/redo with object identidy.16
# This is cloned in clone_properties17
18
19
self.transition.properties = copy.deepcopy(source_compositor.transition.properties)20
self.transition.update_editable_mlt_properties()21
22
+ def get_copy_paste_objects(self):23
+ # Copy-paste is handled with tuple data (properties, mlt_service_id)24
+ return (copy.deepcopy(self.transition.properties), self.transition.info.mlt_service_id)25
+26
+ def do_values_copy_paste(self, copy_paste_data):27
+ # Copy-paste is handled with tuple data (properties, mlt_service_id)28
+ properties, mlt_service_id = copy_paste_data29
+ 30
+ # Only allow copy paste between same types of compositors31
+ if mlt_service_id == self.transition.info.mlt_service_id:32
+ self.transition.properties = copy.deepcopy(properties)33
+ self.transition.update_editable_mlt_properties()34
+ 35
+ 36
# -------------------------------------------------- compositor interface methods37
def load_compositors_xml(transitions):38
"""39
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/monitorwidget.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/monitorwidget.py
Changed
189
1
2
3
self.clip_name = "clip name"4
5
- self.match_is_pattern_producer = False # Roll and Slip need this flag to know if surface updates needed6
+ self.match_not_updateble = False # Roll and Slip need this flag to know if surface updates needed7
8
# top row9
self.top_row = Gtk.HBox()10
11
12
self.CLOSE_MATCH_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "close_match.png")13
self.PATTERN_PRODUCER_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "pattern_producer_trim_view.png")14
-15
+ self.BLANK_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "blank_trim_view.png")16
+ 17
global _widget18
_widget = self19
20
21
self.match_frame = -122
return23
24
- if match_clip.media_type == appconsts.PATTERN_PRODUCER:25
- self.match_is_pattern_producer = True26
+ if match_clip.is_blanck_clip == True:27
+ self.match_not_updateble = True28
+ self.create_blank_match_frame()29
+ return30
+ elif match_clip.media_type == appconsts.PATTERN_PRODUCER:31
+ self.match_not_updateble = True32
self.create_pattern_producer_match_frame()33
return34
35
self.match_frame = match_clip.clip_out36
- self.match_is_pattern_producer = False37
+ self.match_not_updateble = False38
data = (match_clip.path, match_clip.clip_out, MATCH_FRAME, self.match_frame_write_complete)39
GLib.idle_add(_launch_match_frame_writer, data)40
41
42
self.match_frame = -143
return44
45
- if match_clip.media_type == appconsts.PATTERN_PRODUCER:46
- self.match_is_pattern_producer = True47
+ if match_clip.is_blanck_clip == True:48
+ self.match_not_updateble = True49
+ self.create_blank_match_frame()50
+ return51
+ elif match_clip.media_type == appconsts.PATTERN_PRODUCER:52
+ self.match_not_updateble = True53
self.create_pattern_producer_match_frame()54
return55
56
self.match_frame = match_clip.clip_in57
- self.match_is_pattern_producer = False58
+ self.match_not_updateble = False59
data = (match_clip.path, match_clip.clip_in, MATCH_FRAME, self.match_frame_write_complete)60
GLib.idle_add(_launch_match_frame_writer, data)61
62
63
if match_clip == None: # track last end trim and track first start trim64
self.match_frame = -165
return66
-67
- if match_clip.media_type == appconsts.PATTERN_PRODUCER:68
- self.match_is_pattern_producer = True69
+ 70
+ if match_clip.is_blanck_clip == True:71
+ self.match_not_updateble = True72
+ self.create_blank_match_frame()73
+ return74
+ elif match_clip.media_type == appconsts.PATTERN_PRODUCER:75
+ self.match_not_updateble = True76
self.create_pattern_producer_match_frame()77
return78
79
self.match_frame = match_clip.clip_out80
- self.match_is_pattern_producer = False81
+ self.match_not_updateble = False82
data = (match_clip.path, match_clip.clip_out, MATCH_FRAME, self.match_frame_write_complete)83
GLib.idle_add(_launch_match_frame_writer, data)84
85
86
self.match_frame = -187
return88
89
- if match_clip.media_type == appconsts.PATTERN_PRODUCER:90
- self.match_is_pattern_producer = True91
+ if match_clip.is_blanck_clip == True:92
+ self.match_not_updateble = True93
+ self.create_blank_match_frame()94
+ return95
+ elif match_clip.media_type == appconsts.PATTERN_PRODUCER:96
+ self.match_not_updateble = True97
self.create_pattern_producer_match_frame()98
return99
100
self.match_frame = match_clip.clip_in101
- self.match_is_pattern_producer = False102
+ self.match_not_updateble = False103
data = (match_clip.path, match_clip.clip_in, MATCH_FRAME, self.match_frame_write_complete)104
GLib.idle_add(_launch_match_frame_writer, data)105
106
107
self.edit_delta = 0108
109
if match_clip.media_type == appconsts.PATTERN_PRODUCER:110
- self.match_is_pattern_producer = True111
+ self.match_not_updateble = True112
self.create_pattern_producer_match_frame()113
return114
115
- self.match_is_pattern_producer = False116
+ self.match_not_updateble = False117
data = (match_clip.path, match_clip.clip_in, MATCH_FRAME, self.match_frame_write_complete)118
GLib.idle_add(_launch_match_frame_writer, data)119
120
121
self.match_frame = match_clip.clip_out122
123
if match_clip.media_type == appconsts.PATTERN_PRODUCER:124
- self.match_is_pattern_producer = True125
+ self.match_not_updateble = True126
self.create_pattern_producer_match_frame()127
return128
129
- self.match_is_pattern_producer = False130
+ self.match_not_updateble = False131
data = (match_clip.path, match_clip.clip_out, MATCH_FRAME, self.match_frame_write_complete)132
GLib.idle_add(_launch_match_frame_writer, data)133
134
135
136
match_frame = self.match_frame + self.edit_delta137
138
- if self.match_is_pattern_producer == True:139
+ if self.match_not_updateble == True:140
return141
142
match_surface_creator = MatchSurfaceCreator(match_frame)143
144
145
match_frame = self.match_frame + self.edit_delta146
147
- if self.match_is_pattern_producer == True:148
+ if self.match_not_updateble == True:149
return150
151
match_surface_creator = MatchSurfaceCreator(match_frame)152
153
self.edit_delta = None154
self.bottom_edge_panel.queue_draw()155
156
- """157
- def _roll_frame_update_done(self):158
- global _frame_write_on 159
- _frame_write_on = False160
- self.match_frame_write_complete(MATCH_FRAME)161
- """162
-163
def _press_event(self, event):164
"""165
Mouse button callback166
167
168
self.left_display.queue_draw()169
self.right_display.queue_draw()170
- 171
+172
+ def create_blank_match_frame(self): 173
+ w, h = self.get_match_frame_panel_size()174
+ 175
+ scaled_icon = cairo.ImageSurface(cairo.FORMAT_ARGB32, w, h)176
+ cr = cairo.Context(scaled_icon)177
+ cr.scale(float(w) / float(self.BLANK_ICON.get_width()), float(h) / float(self.BLANK_ICON.get_height()))178
+ cr.set_source_surface(self.BLANK_ICON, 0, 0)179
+ cr.paint()180
+ 181
+ self.match_frame_surface = scaled_icon182
+183
+ self.left_display.queue_draw()184
+ self.right_display.queue_draw()185
+ 186
def create_match_frame_image_surface(self, frame_name):187
# Create non-scaled surface188
matchframe_path = utils.get_hidden_user_dir_path() + appconsts.TRIM_VIEW_DIR + "/" + frame_name 189
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/movemodes.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/movemodes.py
Changed
54
1
2
3
4
import appconsts5
+import boxmove6
import dialogutils7
import editorpersistance # Jul-2016 - SvdB - For play/pause button8
+import editorstate9
import dnd10
import edit11
from editorstate import current_sequence12
13
"""14
User presses mouse when in overwrite move mode.15
"""16
+ if editorstate.overwrite_mode_box == True:17
+ boxmove.mouse_press(event, frame)18
+ return19
+20
+ tlinewidgets.set_edit_mode(None, tlinewidgets.draw_overwrite_overlay) # if we were in box mode draw func needs to be reset here21
+ 22
_move_mode_pressed(event, frame)23
24
global edit_data25
26
"""27
User moves mouse when in overwrite move mode.28
"""29
+ if editorstate.overwrite_mode_box == True:30
+ boxmove.mouse_move(x, y, frame)31
+ return32
+ 33
global edit_data, drag_disabled 34
if drag_disabled:35
return 36
if edit_data == None:37
return38
-39
+ 40
_move_mode_move(frame, x, y)41
42
# Calculate overwrite area if moving43
44
"""45
User releases mouse when in overwrite move mode.46
"""47
+ if editorstate.overwrite_mode_box == True:48
+ boxmove.mouse_release(x, y, frame)49
+ return50
+ 51
global edit_data, drag_disabled 52
if drag_disabled:53
drag_disabled = False54
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/persistance.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/persistance.py
Changed
11
1
2
3
if(not hasattr(project, "SAVEFILE_VERSION")):4
project.SAVEFILE_VERSION = 1 # first save files did not have this5
- print "Loading " + project.name + ", SAVEFILE_VERSION:", project.SAVEFILE_VERSION6
+ # SvdB - Feb-2017 - Removed project.name from print. It causes problems with non-latin characters, in some cases. Not sure why, yet.7
+ print "Loading Project, SAVEFILE_VERSION:", project.SAVEFILE_VERSION8
9
# Set MLT profile. NEEDS INFO USER ON MISSING PROFILE!!!!!10
project.profile = mltprofiles.get_profile(project.profile_desc)11
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py
Changed
165
1
2
import gui3
import guiutils4
import mltprofiles5
+# Jan-2017 - SvdB - To get the number of CPU cores6
+import multiprocessing7
8
PREFERENCES_WIDTH = 7309
-PREFERENCES_HEIGHT = 32010
+PREFERENCES_HEIGHT = 44011
PREFERENCES_LEFT = 41012
13
select_thumbnail_dir_callback = None # app.py sets at start up14
15
gen_opts_panel, gen_opts_widgets = _general_options_panel(_thumbs_select_clicked, _renders_select_clicked)16
edit_prefs_panel, edit_prefs_widgets = _edit_prefs_panel()17
view_pres_panel, view_pref_widgets = _view_prefs_panel()18
+ # Jan-2017 - SvdB19
+ performance_panel, performance_widgets = _performance_panel()20
21
notebook = Gtk.Notebook()22
notebook.set_size_request(PREFERENCES_WIDTH, PREFERENCES_HEIGHT)23
notebook.append_page(gen_opts_panel, Gtk.Label(label=_("General")))24
notebook.append_page(edit_prefs_panel, Gtk.Label(label=_("Editing")))25
notebook.append_page(view_pres_panel, Gtk.Label(label=_("View")))26
+ notebook.append_page(performance_panel, Gtk.Label(label=_("Performance")))27
guiutils.set_margins(notebook, 4, 24, 6, 0)28
29
- dialog.connect('response', _preferences_dialog_callback, (gen_opts_widgets, edit_prefs_widgets, view_pref_widgets))30
+ dialog.connect('response', _preferences_dialog_callback, (gen_opts_widgets, edit_prefs_widgets, view_pref_widgets, performance_widgets))31
dialog.vbox.pack_start(notebook, True, True, 0)32
dialogutils.set_outer_margins(dialog.vbox)33
dialogutils.default_behaviour(dialog)34
35
if hasattr(prefs, 'play_pause'):36
play_pause_button.set_active(prefs.play_pause) 37
38
+ active = 039
+ if prefs.mouse_scroll_action_is_zoom == False:40
+ active = 141
+ mouse_scroll_action = Gtk.ComboBoxText()42
+ mouse_scroll_action.append_text(_("Zoom, Control to Scroll Horizontal"))43
+ mouse_scroll_action.append_text(_("Scroll Horizontal, Control to Zoom"))44
+ mouse_scroll_action.set_active(active)45
+46
+ hide_file_ext_button = Gtk.CheckButton()47
+ if hasattr(prefs, 'hide_file_ext'):48
+ hide_file_ext_button.set_active(prefs.hide_file_ext)49
+50
+ auto_center_on_updown = Gtk.CheckButton()51
+ auto_center_on_updown.set_active(prefs.center_on_arrow_move)52
+ 53
# Layout54
row1 = _row(guiutils.get_checkbox_row_box(auto_play_in_clip_monitor, Gtk.Label(label=_("Autoplay new Clips in Clip Monitor"))))55
row2 = _row(guiutils.get_checkbox_row_box(auto_center_on_stop, Gtk.Label(label=_("Center Current Frame on Playback Stop"))))56
+ row13 = _row(guiutils.get_checkbox_row_box(auto_center_on_updown, Gtk.Label(label=_("Center Current Frame after Up/Down Arrow"))))57
row4 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Graphics default length:")), gfx_length_spin, PREFERENCES_LEFT))58
row5 = _row(guiutils.get_checkbox_row_box(trim_exit_on_empty, Gtk.Label(label=_("Trim Modes exit on empty click"))))59
row6 = _row(guiutils.get_checkbox_row_box(quick_enter_trim, Gtk.Label(label=_("Quick enter Trim Modes"))))60
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
row10 = _row(guiutils.get_checkbox_row_box(play_pause_button, Gtk.Label(label=_("Enable single Play/Pause button"))))64
+ row11 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Mouse Middle Button Scroll Action")), mouse_scroll_action, PREFERENCES_LEFT))65
+ row12 = _row(guiutils.get_checkbox_row_box(hide_file_ext_button, Gtk.Label(label=_("Hide file extensions when importing Clips"))))66
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(row1, False, False, 0)71
vbox.pack_start(row2, False, False, 0)72
+ vbox.pack_start(row13, False, False, 0)73
vbox.pack_start(row4, False, False, 0)74
vbox.pack_start(row7, False, False, 0)75
vbox.pack_start(row8, False, False, 0)76
vbox.pack_start(row9, False, False, 0)77
# Jul-2016 - SvdB - For play_pause button78
vbox.pack_start(row10, False, False, 0)79
+ vbox.pack_start(row11, False, False, 0)80
+ vbox.pack_start(row12, False, False, 0)81
vbox.pack_start(Gtk.Label(), True, True, 0)82
83
guiutils.set_margins(vbox, 12, 0, 12, 12)84
85
# Jul-2016 - SvdB - Added play_pause_button86
return vbox, (auto_play_in_clip_monitor, auto_center_on_stop, gfx_length_spin,87
- trim_exit_on_empty, quick_enter_trim, remember_clip_frame, overwrite_clip_drop, cover_delete, play_pause_button)88
+ trim_exit_on_empty, quick_enter_trim, remember_clip_frame, overwrite_clip_drop, cover_delete,89
+ play_pause_button, mouse_scroll_action, hide_file_ext_button, auto_center_on_updown)90
91
def _view_prefs_panel():92
prefs = editorpersistance.prefs93
94
display_splash_check = Gtk.CheckButton()95
display_splash_check.set_active(prefs.display_splash_screen)96
97
+ # Feb-2017 - SvdB - For full file names98
+ show_full_file_names = Gtk.CheckButton()99
+ show_full_file_names.set_active(prefs.show_full_file_names)100
+101
buttons_combo = Gtk.ComboBoxText()102
buttons_combo.append_text(_("Glass"))103
buttons_combo.append_text(_("Simple"))104
105
row3 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Theme request, icons and colors:")), dark_combo, PREFERENCES_LEFT))106
row4 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Theme detection fail fallback colors:")), theme_combo, PREFERENCES_LEFT))107
row5 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Default audio levels display:")), audio_levels_combo, PREFERENCES_LEFT))108
+ # Feb-2017 - SvdB - For full file names109
+ row6 = _row(guiutils.get_checkbox_row_box(show_full_file_names, Gtk.Label(label=_("Show Full File names"))))110
111
vbox = Gtk.VBox(False, 2)112
vbox.pack_start(row00, False, False, 0)113
114
vbox.pack_start(row3, False, False, 0)115
vbox.pack_start(row4, False, False, 0)116
vbox.pack_start(row5, False, False, 0)117
+ # Feb-2017 - SvdB - For full file names118
+ vbox.pack_start(row6, False, False, 0)119
+ vbox.pack_start(Gtk.Label(), True, True, 0)120
+121
+ guiutils.set_margins(vbox, 12, 0, 12, 12)122
+123
+ # Feb-2017 - SvdB - Added code for full file names124
+ return vbox, (force_english_check, display_splash_check, buttons_combo, dark_combo, theme_combo, audio_levels_combo, 125
+ window_mode_combo, show_full_file_names)126
+127
+def _performance_panel():128
+ # Jan-2017 - SvdB129
+ # Add a panel for performance settings. The first setting is allowing multiple threads to render130
+ # the files. This is used for the real_time parameter to mlt in renderconsumer.py.131
+ # The effect depends on the computer running the program.132
+ # Max. number of threads is set to number of CPU cores. Default is 1.133
+ # Allow Frame Dropping should help getting real time output on low performance computers.134
+ prefs = editorpersistance.prefs135
+136
+ # Widgets137
+ spin_adj = Gtk.Adjustment(prefs.perf_render_threads, 1, multiprocessing.cpu_count(), 1)138
+ perf_render_threads = Gtk.SpinButton()139
+ perf_render_threads.set_adjustment(spin_adj)140
+ perf_render_threads.set_numeric(True)141
+142
+ perf_drop_frames = Gtk.CheckButton()143
+ perf_drop_frames.set_active(prefs.perf_drop_frames)144
+145
+ # Tooltips146
+ perf_render_threads.set_tooltip_text(_("Between 1 and the number of CPU Cores"))147
+ perf_drop_frames.set_tooltip_text(_("Allow Frame Dropping for real-time rendering, when needed"))148
+149
+ # Layout150
+ row1 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Render Threads:")), perf_render_threads, PREFERENCES_LEFT))151
+ row2 = _row(guiutils.get_checkbox_row_box(perf_drop_frames, Gtk.Label(label=_("Allow Frame Dropping"))))152
+153
+ vbox = Gtk.VBox(False, 2)154
+ vbox.pack_start(row1, False, False, 0)155
+ vbox.pack_start(row2, False, False, 0)156
vbox.pack_start(Gtk.Label(), True, True, 0)157
158
guiutils.set_margins(vbox, 12, 0, 12, 12)159
160
- return vbox, (force_english_check, display_splash_check, buttons_combo, dark_combo, theme_combo, audio_levels_combo, window_mode_combo)161
+ return vbox, (perf_render_threads, perf_drop_frames)162
163
def _row(row_cont):164
row_cont.set_size_request(10, 26)165
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/projectaction.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/projectaction.py
Changed
72
1
2
editorstate.project_is_loading = False3
4
except persistance.FileProducerNotFoundError as e:5
- print "did not find file:", e6
+ print "did not find a file"7
self._error_stop(dialog, ticker)8
Gdk.threads_enter()9
primary_txt = _("Media asset was missing!")10
11
for key, media_file in PROJECT().media_files.iteritems():12
print media_file.name13
if media_file.type == appconsts.VIDEO or media_file.type == appconsts.IMAGE_SEQUENCE:14
- print media_file.name15
Gdk.threads_enter()16
dialog.info.set_text(media_file.name)17
Gdk.threads_leave()18
19
def new_project():20
dialogs.new_project_dialog(_new_project_dialog_callback)21
22
-def _new_project_dialog_callback(dialog, response_id, profile_combo, tracks_combo, 23
- tracks_combo_values_list):24
+def _new_project_dialog_callback(dialog, response_id, profile_combo, tracks_select):25
26
- v_tracks, a_tracks = tracks_combo_values_list[tracks_combo.get_active()]27
+ v_tracks, a_tracks = tracks_select.get_tracks()28
+ 29
if response_id == Gtk.ResponseType.ACCEPT:30
app.new_project(profile_combo.get_active(), v_tracks, a_tracks)31
dialog.destroy()32
33
bin_indexes.reverse()34
for i in bin_indexes:35
current_bin().file_ids.pop(i)36
+ update_current_bin_files_count()37
38
# Delete from project39
for file_id in file_ids:40
41
dialog.destroy()42
return43
44
- name_entry, tracks_combo, open_check = widgets45
+ name_entry, tracks_select, open_check = widgets46
47
# Get dialog data 48
name = name_entry.get_text()49
50
if len(name) == 0:51
name = _("sequence_") + str(PROJECT().next_seq_number)52
- v_tracks, a_tracks = appconsts.TRACK_CONFIGURATIONS[tracks_combo.get_active()]53
+ v_tracks, a_tracks = tracks_select.get_tracks()54
open_right_away = open_check.get_active()55
56
# Get index for selected sequence57
58
def change_sequence_track_count():59
dialogs.tracks_count_change_dialog(_change_track_count_dialog_callback)60
61
-def _change_track_count_dialog_callback(dialog, response_id, tracks_combo):62
+def _change_track_count_dialog_callback(dialog, response_id, tracks_select):63
if response_id != Gtk.ResponseType.ACCEPT:64
dialog.destroy()65
return66
67
- v_tracks, a_tracks = appconsts.TRACK_CONFIGURATIONS[tracks_combo.get_active()]68
+ v_tracks, a_tracks = tracks_select.get_tracks()69
dialog.destroy()70
71
cur_seq_index = PROJECT().sequences.index(PROJECT().c_seq)72
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/projectdata.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/projectdata.py
Changed
26
1
2
else: # For non-audio we need write a thumbbnail file and get file lengh while we're at it3
(icon_path, length, info) = thumbnailer.write_image(file_path)4
5
+ # Hide file extension if enabled in user preferences6
+ clip_name = file_name7
+ if editorpersistance.prefs.hide_file_ext == True:8
+ clip_name = name9
+10
# Create media file object11
media_object = MediaFile(self.next_media_file_id, file_path, 12
- file_name, media_type, length, icon_path, info)13
+ clip_name, media_type, length, icon_path, info)14
15
self._add_media_object(media_object)16
17
18
19
# Set default length for graphics files20
(f_name, ext) = os.path.splitext(self.name)21
- if utils.file_extension_is_graphics_file(ext):22
+ if utils.file_extension_is_graphics_file(ext) and self.type != appconsts.IMAGE_SEQUENCE:23
in_fr, out_fr, l = editorpersistance.get_graphics_default_in_out_length()24
self.mark_in = in_fr25
self.mark_out = out_fr26
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/propertyedit.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/propertyedit.py
Changed
46
1
2
COLOR = "color" # #rrggbb3
LUT_TABLE = "lut_table" # val;val;val;val;...;val4
WIPE_RESOURCE = "wipe_resource" # /path/to/resource.pgm5
+FILE_RESOURCE = "file_resource" # /path/to/somefile6
NOT_PARSED = "not_parsed" # A write out value is not parsed from value7
NOT_PARSED_TRANSITION = "not_parsed_transition" # A write out value is not parsed from value in transition object8
9
10
creator_func = EDITABLE_PROPERTY_CREATORS[exp_type]11
ep = creator_func(params)12
else:13
+ """14
+ Properties with single numerical values (int or float) can be handled with objects of EditableProperty class.15
+ """16
ep = EditableProperty(params)17
18
return ep19
20
res_path = mlttransitions.get_wipe_resource_path(key)21
self.write_value(str(res_path))22
23
-24
+class FileResourceProperty(EditableProperty):25
+ """26
+ A file path as property value set from file chooser dialog callback.27
+ """28
+ def dialog_response_callback(self, dialog, response_id):29
+ res_path = dialog.get_filename()30
+ if response_id == Gtk.ResponseType.ACCEPT and res_path != None:31
+ self.write_value(unicode(str(res_path), "utf-8"))32
+ else:33
+ self.write_value(unicode(str(""), "utf-8"))34
+ 35
class MultipartKeyFrameProperty(AbstractProperty):36
37
def __init__(self, params):38
39
GEOM_IN_AFFINE_FILTER: lambda params : AffineFilterGeomProperty(params),40
GEOM_IN_AFFINE_FILTER_V2: lambda params :AffineFilterGeomPropertyV2(params),41
WIPE_RESOURCE : lambda params : WipeResourceProperty(params),42
+ FILE_RESOURCE : lambda params :FileResourceProperty(params),43
LUT_TABLE : lambda params : LUTTableProperty(params),44
NOT_PARSED : lambda params : EditableProperty(params), # This should only be used with params that have editor=NO_EDITOR45
NOT_PARSED_TRANSITION : lambda params : TransitionEditableProperty(params), # This should only be used with params that have editor=NO_EDITOR46
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/propertyeditorbuilder.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/propertyeditorbuilder.py
Changed
68
1
2
3
EDITOR = "editor"4
5
-# editor types editor component6
+# editor types and agrs editor component or arg description7
SLIDER = "slider" # Gtk.HScale 8
BOOLEAN_CHECK_BOX = "booleancheckbox" # Gtk.CheckButton9
COMBO_BOX = "combobox" # Gtk.Combobox10
11
CR_CURVES = "crcurves" # Curves color editor with Catmull-Rom curve12
COLOR_BOX = "colorbox" # One band color editor with color box interface13
COLOR_LGG = "colorlgg" # Editor for ColorLGG filter14
+FILE_SELECTOR = "file_select" # File selector button for selecting single files from15
+FILE_TYPES = "file_types" # list of files types with "." chracters, like ".png.tga.bmp"16
NO_EDITOR = "no_editor" # No editor displayed for property17
18
COMPOSITE_EDITOR_BUILDER = "composite_properties" # Creates a single row editor for multiple properties of composite transition19
20
if file_name != None:21
ep.write_value(file_name)22
23
+def _get_file_select_editor(editable_property):24
+ """25
+ Returns GUI component for selecting wipe type.26
+ """27
+ dialog = Gtk.FileChooserDialog(_("Select File"), None, 28
+ Gtk.FileChooserAction.OPEN, 29
+ (_("Cancel").encode('utf-8'), Gtk.ResponseType.CANCEL,30
+ _("OK").encode('utf-8'), Gtk.ResponseType.ACCEPT))31
+ dialog.set_action(Gtk.FileChooserAction.OPEN)32
+ dialog.set_select_multiple(False)33
+34
+ file_types_args_list = editable_property.args[FILE_TYPES].split(".")35
+ file_types_args_list = file_types_args_list[1:len(file_types_args_list)]36
+ file_filter = Gtk.FileFilter()37
+ for file_type in file_types_args_list:38
+ file_filter.add_pattern("*." + file_type)39
+ file_filter.set_name("Accepted Files")40
+ 41
+ dialog.add_filter(file_filter)42
+ 43
+ file_select_button = Gtk.FileChooserButton.new_with_dialog(dialog)44
+ file_select_button.set_size_request(210, 28)45
+ 46
+ file_select_label = Gtk.Label(editable_property.get_display_name())47
+48
+ editor_row = Gtk.HBox(False, 2)49
+ editor_row.pack_start(file_select_label, False, False, 2)50
+ editor_row.pack_start(guiutils.get_pad_label(3, 5), False, False, 2)51
+ editor_row.pack_start(file_select_button, False, False, 0)52
+53
+ dialog.connect('response', editable_property.dialog_response_callback)54
+ 55
+ return editor_row56
+ 57
def _create_composite_editor(clip, editable_properties):58
aligned = filter(lambda ep: ep.name == "aligned", editable_properties)[0]59
distort = filter(lambda ep: ep.name == "distort", editable_properties)[0]60
61
WIPE_SELECT: lambda ep: _get_wipe_selector(ep),62
LADSPA_SLIDER: lambda ep: _get_ladspa_slider_row(ep),63
CLIP_FRAME_SLIDER: lambda ep: _get_clip_frame_slider(ep),64
+ FILE_SELECTOR: lambda ep: _get_file_select_editor(ep),65
NO_EDITOR: lambda ep: _get_no_editor(),66
COMPOSITE_EDITOR_BUILDER: lambda comp, editable_properties: _create_composite_editor(comp, editable_properties),67
REGION_EDITOR_BUILDER: lambda comp, editable_properties: _create_region_editor(comp, editable_properties),68
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/render.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/render.py
Changed
26
1
2
import time3
import threading4
5
+# SvdB - Render Folder from Preferences is not copied to Render panel #3376
+# SvdB - Added appconsts for the RENDERED_CLIPS_DIR value7
+import appconsts8
import dialogutils9
import editorstate10
from editorstate import current_sequence11
12
widgets.encoding_panel.encoding_selector.widget.set_active(0)13
if movie_name_too == True:14
widgets.file_panel.movie_name.set_text("movie")15
- widgets.file_panel.out_folder.set_current_folder(os.path.expanduser("~") + "/")16
+ # SvdB - Render Folder from Preferences is not copied to Render panel #33717
+ # Default render path is ~/.flowblade/rendered_clips. If this is not changed by the user18
+ # we will use the HOME directory19
+ if editorpersistance.prefs.render_folder != str(utils.get_hidden_user_dir_path()) + appconsts.RENDERED_CLIPS_DIR:20
+ widgets.file_panel.out_folder.set_current_folder(editorpersistance.prefs.render_folder)21
+ else:22
+ widgets.file_panel.out_folder.set_current_folder(os.path.expanduser("~") + "/")23
widgets.args_panel.use_args_check.set_active(False)24
widgets.profile_panel.use_project_profile_check.set_active(True)25
26
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/renderconsumer.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/renderconsumer.py
Changed
66
1
2
import threading3
import xml.dom.minidom4
import os5
+# Jan-2017 - SvdB6
+import editorpersistance7
8
import mltenv9
import respaths10
11
else:12
msg = "...NOT available, " + encoding_option.err_msg + " missing"13
not_supported_encoding_options.append(encoding_option)14
- print encoding_option.name + msg15
+ #print encoding_option.name + msg16
17
# Proxy encoding18
proxy_encoding_nodes = render_encoding_doc.getElementsByTagName(PROXY_ENCODING_OPTION)19
20
found_proxy_encodings.append(proxy_encoding_option)21
else:22
msg = " ...NOT available, " + encoding_option.err_msg + " missing"23
- print "Proxy encoding " + proxy_encoding_option.name + msg24
+ #print "Proxy encoding " + proxy_encoding_option.name + msg25
global proxy_encodings26
proxy_encodings = found_proxy_encodings27
28
29
render_path = os.path.dirname(file_path) + "/" + os.path.basename(file_path).split(".")[0] + "_%05d." + encoding_option.extension30
31
consumer = mlt.Consumer(profile, "avformat", str(render_path))32
- consumer.set("real_time", -1)33
+ # Jan-2017 - SvdB - perf_value instead of -134
+ if editorpersistance.prefs.perf_drop_frames == True:35
+ perf_value = 1 * editorpersistance.prefs.perf_render_threads36
+ else:37
+ perf_value = -1 * editorpersistance.prefs.perf_render_threads38
+ consumer.set("real_time", perf_value)39
consumer.set("rescale", "bicubic")40
consumer.set("vcodec", str(vcodec))41
- print "img seq render consumer created, path:" + str(render_path) #+ ", args: " + args_msg42
+ #print "img seq render consumer created, path:" + str(render_path) #+ ", args: " + args_msg43
return consumer44
45
def get_mlt_render_consumer(file_path, profile, args_vals_list):46
consumer = mlt.Consumer(profile, "avformat", str(file_path))47
- consumer.set("real_time", -1)48
+ # Jan-2017 - SvdB - perf_value instead of -149
+ if editorpersistance.prefs.perf_drop_frames == True:50
+ perf_value = 1 * editorpersistance.prefs.perf_render_threads51
+ else:52
+ perf_value = -1 * editorpersistance.prefs.perf_render_threads53
+ consumer.set("real_time", perf_value)54
consumer.set("rescale", "bicubic")55
56
args_msg = ""57
58
args_msg = args_msg + str(k) + "="+ str(v) + ", "59
60
args_msg = args_msg.strip(", ")61
- print "render consumer created, path:" + str(file_path) + ", args: " + args_msg62
+ #print "render consumer created, path:" + str(file_path) + ", args: " + args_msg63
return consumer64
65
def get_args_vals_tuples_list_for_encoding_and_quality(profile, enc_opt_index, quality_opt_index):66
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/blank_trim_view.png
Added
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png
Changed
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/marker.png -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/marker.png
Changed
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_cursor_ripple.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_tool.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_cursor_box.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_tool.png
Added
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/filters/filters.xml -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/filters/filters.xml
Changed
133
1
2
<property name="noise" args="range_in=0,100 range_out=0,1.0 displayname=Amount">0.2</property>3
</filter>4
5
+6
+7
<!-- COLOR -->8
<filter id="greyscale">9
<name>Grayscale</name>10
11
<property name="Neutral Color" args="editor=color_select exptype=color">#888888</property>12
<property name="Color Temperature" args="range_in=1000,15000 range_out=0.067,1">0.5</property>13
</filter>14
-15
-16
+ <filter id="avfilter.colorchannelmixer">17
+ <name>Color Channel Mixer</name>18
+ <group>Color</group>19
+ <property name="av.rr" args="range_in=0,200 range_out=0.0,2.0 displayname=Red!Ch.!Red!Gain">1</property>20
+ <property name="av.rg" args="range_in=0,200 range_out=0.0,2.0 displayname=Red!Ch.!Green!Gain">0</property>21
+ <property name="av.rb" args="range_in=0,200 range_out=0.0,2.0 displayname=Red!Ch.!Blue!Gain">0</property>22
+ <property name="av.gr" args="range_in=0,200 range_out=0.0,2.0 displayname=Green!Ch.!Red!Gain">0</property>23
+ <property name="av.gg" args="range_in=0,200 range_out=0.0,2.0 displayname=Green!Ch.!Green!Gain">1</property>24
+ <property name="av.gb" args="range_in=0,200 range_out=0.0,2.0 displayname=Green!Ch.!Blue!Gain">0</property>25
+ <property name="av.br" args="range_in=0,200 range_out=0.0,2.0 displayname=Blue!Ch.!Red!Gain">0</property>26
+ <property name="av.bg" args="range_in=0,200 range_out=0.0,2.0 displayname=Blue!Ch.!Green!Gain">0</property>27
+ <property name="av.bb" args="range_in=0,200 range_out=0.0,2.0 displayname=Blue!Ch.!Blue!Gain">1</property>28
+ </filter>29
+ <filter id="avfilter.lut3d">30
+ <name>Lut3D</name>31
+ <group>Color</group>32
+ <property name="av.file" args="editor=file_select exptype=file_resource file_types=.cube displayname=Select!.cube!file">/home/janne/Downloads/tmax.cube</property>33
+ </filter>34
+ 35
+ 36
+ 37
<!-- COLOR EFFECT -->38
<filter id="frei0r.cluster">39
<name>Color Clustering</name>40
41
<property name="lightness" args="range_in=-100,100 range_out=0,1 displayname=Lightness">0.5</property>42
</filter>43
44
- 45
+46
+47
<!-- DISTORT -->48
<filter id="frei0r.distort0r">49
<name>Waves</name>50
51
<property name="rows" args="range_in=1,20 displayname=Rows">0.1</property>52
<property name="columns" args="range_in=1,20 displayname=Columns">0.1</property>53
</filter>54
-55
-56
+ <filter id="avfilter.lenscorrection">57
+ <name>Lens Correction AV</name>58
+ <group>Distort</group>59
+ <property name="av.cx" args="range_in=0,SCREENSIZE_WIDTH range_out=0,1 displayname=Center!X">0.5</property>60
+ <property name="av.cy" args="range_in=0,SCREENSIZE_HEIGHT range_out=0,1 displayname=Center!Y">0.5</property>61
+ <property name="av.k1" args="range_in=0,100 range_out=-1,1 displayname=Quad!Distortion">0</property>62
+ <property name="av.k2" args="range_in=0,100 range_out=-1,1 displayname=Double!Quad!Distortion">10</property>63
+ </filter>64
+ 65
+ <!-- for some reason avfilter.perspective gives errors:66
+ [filter avfilter.perspective] Unexpected return format67
+ [filter avfilter.perspective] Cannot get frame from buffer sink68
+ if initialized with SCREENSIZE_WIDTH and SCREENSIZE_HEIGHT.69
+ 70
+ However, if set to these values later it works.71
+ 72
+ Workaround is that we initilize it with hard coded values73
+ -->74
+ <filter id="avfilter.perspective">75
+ <name>Perspective</name>76
+ <group>Distort</group>77
+ <property name="av.x0" args="range_in=0,SCREENSIZE_WIDTH range_out=0,SCREENSIZE_WIDTH displayname=x0">10</property>78
+ <property name="av.y0" args="range_in=0,SCREENSIZE_HEIGHT range_out=0,SCREENSIZE_HEIGHT displayname=y0">10</property>79
+ <property name="av.x1" args="range_in=0,SCREENSIZE_WIDTH range_out=0,SCREENSIZE_WIDTH displayname=x1">500</property>80
+ <property name="av.y1" args="range_in=0,SCREENSIZE_HEIGHT range_out=0,SCREENSIZE_HEIGHT displayname=y1">0</property>81
+ <property name="av.x2" args="range_in=0,SCREENSIZE_WIDTH range_out=0,SCREENSIZE_WIDTH displayname=x2">0</property>82
+ <property name="av.y2" args="range_in=0,SCREENSIZE_HEIGHT range_out=0,SCREENSIZE_HEIGHT displayname=y2">400</property>83
+ <property name="av.x3" args="range_in=0,SCREENSIZE_WIDTH range_out=0,SCREENSIZE_WIDTH displayname=x3">550</property>84
+ <property name="av.y3" args="range_in=0,SCREENSIZE_HEIGHT range_out=0,SCREENSIZE_HEIGHT displayname=y3">420</property>85
+ </filter>86
+ 87
+ 88
+ 89
<!-- EDGE -->90
<filter id="frei0r.edgeglow">91
<name>Edge Glow</name>92
93
<group>Transform</group>94
<property name="transition.fix_rotate_x" args="range_in=-180,180 range_out=-180,180 displayname=Angle">0</property>95
<property name="transition.use_normalised" args="editor=no_editor">0</property>96
- <property name="transition.geometry" args="editor=affine_filt_geom_slider_2 exptype=geom_in_affine_filt_v2">0=0/0:SCREENSIZE:100</property>97
+ <property name="transition.geometry" args="editor=affine_filt_geom_slider exptype=geom_in_affine_filt">0=0/0:SCREENSIZE:100</property>98
</filter>99
<filter id="affine">100
<name>Shear</name>101
<group>Transform</group>102
<property name="transition.fix_shear_x" args="range_in=-180,180 range_out=-180,180 displayname=Shear!X">0</property>103
<property name="transition.fix_shear_y" args="range_in=-180,180 range_out=-180,180 displayname=Shear!Y">0</property>104
- <property name="transition.geometry" args="editor=affine_filt_geom_slider_2 exptype=geom_in_affine_filt_v2">0=0/0:SCREENSIZE:100</property>105
+ <property name="transition.geometry" args="editor=affine_filt_geom_slider exptype=geom_in_affine_filt">0=0/0:SCREENSIZE:100</property>106
</filter>107
<filter id="affine">108
<name>Translate</name>109
<group>Transform</group>110
- <property name="transition.geometry" args="editor=affine_filt_geom_slider_2 exptype=geom_in_affine_filt_v2">0=0/0:SCREENSIZE:100</property>111
+ <property name="transition.geometry" args="editor=affine_filt_geom_slider exptype=geom_in_affine_filt">0=0/0:SCREENSIZE:100</property>112
</filter>113
<filter id="affine">114
<name>Affine</name>115
<group>Transform</group>116
- <property name="transition.geometry" args="editor=affine_filt_geom_slider_2 exptype=geom_in_affine_filt_v2">0=0/0:SCREENSIZE:100</property>117
+ <property name="transition.geometry" args="editor=affine_filt_geom_slider exptype=geom_in_affine_filt">0=0/0:SCREENSIZE:100</property>118
<property name="transition.fix_rotate_x" args="range_in=-180,180 range_out=-180,180 displayname=Angle">0</property>119
<property name="transition.fix_shear_x" args="range_in=-180,180 range_out=-180,180 displayname=Shear!X">0</property>120
<property name="transition.fix_shear_y" args="range_in=-180,180 range_out=-180,180 displayname=Shear!Y">0</property>121
</filter>122
+ <filter id="avfilter.zoompan">123
+ <name>Zoom Pan</name>124
+ <group>Transform</group>125
+ <property name="av.zoom" args="range_in=100,500 range_out=1,5 displayname=Zoom">1</property>126
+ <property name="av.x" args="range_in=0,SCREENSIZE_WIDTH range_out=0,SCREENSIZE_WIDTH displayname=x">0</property>127
+ <property name="av.y" args="range_in=0,SCREENSIZE_HEIGHT range_out=0,SCREENSIZE_HEIGHT displayname=y">0</property>128
+ <property name="av.d" args="editor=no_editor">1</property>129
+ </filter>130
131
132
<!-- compositor filters that are not displayed to user, not used currently -->133
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/help/contributors
Added
3
1
2
+ptrg bergamote oberon20073 faridosc pzl siom79 apienk Rayne kaosbeat3
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/help/developers
Added
3
1
2
+Steven van de Beek Nathan Rosenquist3
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/help/edit_tools.html -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/help/edit_tools.html
Changed
65
1
2
<div class="subject-header">Edit Tools</div>3
4
<p>5
-Flowblade Movie Editor has six edit tools, <b>3 move tools</b> and <b>3 trim tools</b>.6
+Flowblade Movie Editor has six edit tools, <b>4 move tools</b> and <b>3 trim tools</b>.7
</p>8
<div class="note">9
-<b>Use Keyboard Shortcuts!</b> It is much faster to use keys <b>1-6</b> to change tools. Note that keys 1-6 only change tools if timeline has keyboard focus. 10
+<b>Use Keyboard Shortcuts!</b> It is much faster to use keys <b>1-7</b> to change tools. Note that keys 1-7 only change tools if timeline has keyboard focus. 11
</div>12
13
<div id="toccontent">14
15
</ul>16
</ol>17
18
+<a id="rippletrim"></a>19
+<h3>Trim Tool Multi Track Ripple Mode</h3>20
+<p>21
+Make clip longer or shorter from either clip's end or from clip's beginning and move items on other tracks to maintain position sync with trimmed track.22
+</p>23
+<ol>24
+<li> Pick 'Trim' tool</li>25
+ <ul>26
+ <li> Press <b>R</b> key to switch to Multi Track Ripple mode.</li>27
+ </ul>28
+<li> Select trimmed cut and select new in or out frame</li>29
+ <ul>30
+ <li> Press with <b>Left Mouse</b> on a clip near the side you wish to trim</li>31
+ <li> Continue on to <b>Left drag</b> on clip to select new in or out frame</li>32
+ </ul>33
+<li>Items after trim point maintain position sync with trimmed track.</li>34
+<li>Trim range is limited so that no overwrites can happen on other tracks.</li>35
+<li> Press <b>R</b> key to exit to Multi Track Ripple mode.</li>36
+</ol>37
+38
+39
40
<a id="roll"></a>41
<h3>Roll Tool</h3>42
43
</ul>44
</ol>45
46
+<a id="box"></a>47
+<h3>Box Tool</h3>48
+49
+<p>Select and overwrite move all Timeline items contained in a box selection.</p>50
+<ol>51
+<li>Pick 'Box' tool</li>52
+ <ul>53
+<li> Use <b>Tool Switcher</b> button drop menu or press <b>7</b> key.</li>54
+ </ul>55
+<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>56
+57
+<li>Press <b>Left Mouse</b> inside the box selection and drag the box into new position on timeline and release mouse.</li>58
+<li>Box contents are overwritten on new position and Compositors are moved.</li>59
+60
+</ol>61
+62
<a id="movetrim"></a>63
<h3>Move Tool clip end trim</h3>64
65
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/help/help.html -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/help/help.html
Changed
10
1
2
<a class="appendix-pad" href="filters_list.html">Filters list</a>3
4
5
-<div class="copyright-info">Flowblade Reference Guide v 2.0 19-3-2015.</div> 6
+<div class="copyright-info">Flowblade Reference Guide v 3.0 9-3-2017.</div> 7
8
</div>9
</body>10
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/help/translations -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/help/translations
Changed
6
1
2
es - David Gamiz Jimenez3
it - Massimo Stella4
hu - Péter Gábor5
+ ru - Николай Смольянинов6
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/img/blank_trim_view.png
Added
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png
Changed
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_cursor_ripple.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_tool.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/img/overwrite_cursor_box.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/img/overwrite_tool.png
Added
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_2398
Added
13
1
2
+description=4K UHD 2160p 23.98 fps3
+frame_rate_num=240004
+frame_rate_den=10015
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_24
Added
13
1
2
+description=4K UHD 2160p 24 fps3
+frame_rate_num=244
+frame_rate_den=15
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_25
Added
13
1
2
+description=4K UHD 2160p 25 fps3
+frame_rate_num=254
+frame_rate_den=15
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_2997
Added
13
1
2
+description=4K UHD 2160p 29.97 fps3
+frame_rate_num=300004
+frame_rate_den=10015
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_30
Added
13
1
2
+description=4K UHD 2160p 30 fps3
+frame_rate_num=304
+frame_rate_den=15
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_50
Added
13
1
2
+description=4K UHD 2160p 50 fps3
+frame_rate_num=504
+frame_rate_den=15
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_5994
Added
13
1
2
+description=4K UHD 2160p 59.94 fps3
+frame_rate_num=600004
+frame_rate_den=10015
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/profiles/uhd_2160p_60
Added
13
1
2
+description=4K UHD 2160p 60 fps3
+frame_rate_num=604
+frame_rate_den=15
+width=38406
+height=21607
+progressive=18
+sample_aspect_num=19
+sample_aspect_den=110
+display_aspect_num=1611
+display_aspect_den=912
+colorspace=70913
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/render/renderencoding.xml -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/res/render/renderencoding.xml
Changed
47
1
2
<quality name="20000 kb/s" replvalues="%BITRATE% 20000k" />3
<quality name="25000 kb/s" replvalues="%BITRATE% 25000k" />4
</qualityqroup>5
+ <qualityqroup id="qgroup2" defaultindex="6">6
+ <quality name="200 kb/s" replvalues="%BITRATE% 200k" />7
+ <quality name="400 kb/s" replvalues="%BITRATE% 400k" />8
+ <quality name="600 kb/s" replvalues="%BITRATE% 600k" />9
+ <quality name="800 kb/s" replvalues="%BITRATE% 800k" />10
+ <quality name="1000 kb/s" replvalues="%BITRATE% 1000k" />11
+ <quality name="2000 kb/s" replvalues="%BITRATE% 2000k" />12
+ <quality name="3000 kb/s" replvalues="%BITRATE% 3000k" />13
+ <quality name="4000 kb/s" replvalues="%BITRATE% 4000k" />14
+ <quality name="5000 kb/s" replvalues="%BITRATE% 5000k" />15
+ <quality name="6000 kb/s" replvalues="%BITRATE% 6000k" />16
+ <quality name="8000 kb/s" replvalues="%BITRATE% 8000k" />17
+ <quality name="10000 kb/s" replvalues="%BITRATE% 10000k" />18
+ <quality name="12000 kb/s" replvalues="%BITRATE% 12000k" />19
+ <quality name="18000 kb/s" replvalues="%BITRATE% 18000k" />20
+ <quality name="20000 kb/s" replvalues="%BITRATE% 20000k" />21
+ <quality name="25000 kb/s" replvalues="%BITRATE% 25000k" />22
+ <quality name="35000 kb/s" replvalues="%BITRATE% 35000k" />23
+ <quality name="50000 kb/s" replvalues="%BITRATE% 50000k" />24
+ <quality name="60000 kb/s" replvalues="%BITRATE% 60000k" />25
+ <quality name="70000 kb/s" replvalues="%BITRATE% 70000k" />26
+ <quality name="80000 kb/s" replvalues="%BITRATE% 80000k" />27
+ </qualityqroup>28
<qualityqroup id="proxyqgroup" defaultindex="1">29
<quality name="400 kb/s" replvalues="%BITRATE% 400k" />30
<quality name="600 kb/s" replvalues="%BITRATE% 600k" />31
32
<encodingoption name="MPEG-2 / .mpg" extension="mpg" audiodesc=" mp2" type="av" resize="True" qgroup="qgroup1">33
<profile args="f=mpeg acodec=mp2 ab=384k vcodec=mpeg2video minrate=0 vb=%BITRATE% bf=2 b_strategy=1 trellis=1" />34
</encodingoption>35
- <encodingoption name="H.264 / .mp4" extension="mp4" audiodesc=" mp3" type="av" resize="True" qgroup="qgroup1">36
+ <encodingoption name="H.264 / .mp4" extension="mp4" audiodesc=" mp3" type="av" resize="True" qgroup="qgroup2">37
<profile args="f=mp4 s=%SCREENSIZE% hq=1 acodec=libmp3lame ab=384k pix_fmt=yuv420p vcodec=libx264 minrate=0 b=%BITRATE% b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%ASPECT%"/>38
</encodingoption>39
<encodingoption name="MPEG-4 / .mp4" extension="mp4" type="av" audiodesc=" mp2" resize="True" qgroup="qgroup1">40
<profile args="f=mp4 hq=1 acodec=mp2 ab=192k vcodec=mpeg4 minrate=0 vb=%BITRATE%"/>41
</encodingoption>42
- <encodingoption name="Theora / .ogv" extension="ogv" audiodesc="flac" type="av" resize="True" qgroup="qgroup1">43
+ <encodingoption name="Theora / .ogv" extension="ogv" audiodesc="flac" type="av" resize="True" qgroup="qgroup2">44
<profile args="f=ogg acodec=flac ac=2 vcodec=libtheora minrate=0 vb=%BITRATE%" />45
</encodingoption>46
<encodingoption name="Lossless HuffYUV / .avi" extension="avi" audiodesc=" pcm" type="av" resize="True" qgroup="lossless">47
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/respaths.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/respaths.py
Changed
28
1
2
HELP_DOC = None3
GPL_3_DOC = None4
TRANSLATIONS_DOC = None5
+DEVELOPERS_DOC = None6
+CONTRIBUTORS_DOC = None7
LOCALE_PATH = None8
ROOT_PARENT = None9
PATTERN_PRODUCER_PATH = None10
11
WIPE_RESOURCES_PATH, PREFS_PATH, HELP_DOC, LOCALE_PATH, \12
GPL_3_DOC, ROOT_PARENT, PATTERN_PRODUCER_PATH, TRANSLATIONS_DOC, \13
LAUNCH_DIR, REPLACEMENTS_XML_DOC, GMIC_SCRIPTS_DOC, \14
- PHANTOM_JAR, PHANTOM_DIR15
+ PHANTOM_JAR, PHANTOM_DIR, DEVELOPERS_DOC, CONTRIBUTORS_DOC16
17
ROOT_PATH = root_path18
IMAGE_PATH = root_path + "/res/img/"19
20
LOCALE_PATH = root_path + "/locale/"21
GPL_3_DOC = root_path + "/res/help/gpl3"22
TRANSLATIONS_DOC = root_path + "/res/help/translations"23
+ DEVELOPERS_DOC = root_path + "/res/help/developers"24
+ CONTRIBUTORS_DOC = root_path + "/res/help/contributors"25
ROOT_PARENT = ROOT_PATH.strip("Flowblade")26
PATTERN_PRODUCER_PATH = root_path + "/res/patternproducer/"27
LAUNCH_DIR = root_path + "/launch/"28
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/sequence.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/sequence.py
Changed
32
1
2
if self.master_audio_pan != NO_PAN:3
self.add_track_pan_filter(self.tractor, self.master_audio_pan)4
5
- # Create and ad gain filter6
+ # Create and add gain filter7
gain_filter = mlt.Filter(self.profile, "volume")8
mltrefhold.hold_ref(gain_filter)9
gain_filter.set("gain", str(self.master_audio_gain))10
11
self.compositors.append(compositor)12
13
def remove_compositor(self, old_compositor):14
- #edit.old_compositors.append(old_compositor)# HACK. Garbage collecting compositors causes crashes.15
try:16
self.compositors.remove(old_compositor)17
except ValueError: # has been restacked since creation, needs to looked up using destroy_id18
19
"""20
self.compositors.sort(_sort_compositors_comparator)21
22
+ def get_track_compositors(self, track_index):23
+ track_compositors = []24
+ for comp in self.compositors:25
+ if comp.transition.b_track == track_index:26
+ track_compositors.append(comp)27
+ return track_compositors28
+ 29
# -------------------------- monitor clip, trimming display, output mode and hidden track30
def display_monitor_clip(self, path, pattern_producer_data=None):31
"""32
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/snapping.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/snapping.py
Changed
86
1
2
3
# Do snaps for relevant edit modes.4
if EDIT_MODE() == editorstate.OVERWRITE_MOVE:5
+ if editorstate.overwrite_mode_box == True:6
+ return x7
return _overwrite_move_snap(x, track, frame, edit_data)8
elif EDIT_MODE() == editorstate.CLIP_END_DRAG:9
return _object_end_drag_snap(x, track, frame, edit_data)10
11
return _object_end_drag_snap(x, track, frame, edit_data)12
elif compositormodes.sub_mode == compositormodes.MOVE_EDIT:13
return _compositor_move_snap(x, track, frame, edit_data)14
+ elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM or EDIT_MODE() == editorstate.TWO_ROLL_TRIM:15
+ return _trimming_snap(x, track, frame, edit_data)16
+ elif EDIT_MODE() == editorstate.MULTI_MOVE:17
+ return _spacer_move_snap(x, track, frame, edit_data)18
19
# Many edit modes do not have snapping even if snapping is on20
return x21
22
23
return snapped_x24
25
+def _all_tracks_snap(track, x, frame, frame_x):26
+ snapped_x = -127
+ 28
+ for i in range(1, len(current_sequence().tracks) - 1):29
+ track = current_sequence().tracks[i]30
+ snapped_x = _get_track_snapped_x(track, x, frame, frame_x)31
+ if snapped_x != -1:32
+ return snapped_x33
+34
+ return snapped_x35
+ 36
def return_snapped_x_or_x(snapped_x, x):37
# Return either original or snapped x38
global _snap_happened39
40
if edit_data == None:41
return x42
43
- snapped_x = -1 # if value stays same till end no snapping happened.44
-45
press_frame = edit_data["press_frame"]46
first_clip_start = edit_data["first_clip_start"]47
first_clip_frame = first_clip_start + (frame - press_frame)48
49
50
# Return either original x or snapped x51
return return_snapped_x_or_x(snapped_x, x)52
+53
+def _trimming_snap(x, track, frame, edit_data):54
+ if edit_data == None:55
+ return x56
+57
+ selected_frame = _get_frame_for_x_func(x)58
+ selected_frame_x = _get_x_for_frame_func(selected_frame)59
+60
+ snapped_x = -1 # if value stays same till end, no snapping has happened61
+ snapped_x = _three_track_snap(track, x, selected_frame, selected_frame_x)62
+ 63
+ return_x = return_snapped_x_or_x(snapped_x, x)64
+ edit_data["selected_frame"] = _get_frame_for_x_func(return_x) # we need to put snapped frame back into edit data because that is what is used by code elsewhere65
+66
+ # Return either original x or snapped x67
+ return return_x68
+69
+def _spacer_move_snap(x, track, frame, edit_data):70
+ if edit_data == None:71
+ return x72
+73
+ press_frame = edit_data["press_frame"]74
+ delta = frame - press_frame75
+ first_moved_frame = edit_data["first_moved_frame"]76
+ 77
+ move_frame = first_moved_frame + delta78
+ move_frame_x = _get_x_for_frame_func(move_frame)79
+80
+ snapped_x = -1 # if value stays same till end, no snapping has happened81
+ snapped_x = _all_tracks_snap(track, x, move_frame, move_frame_x)82
+ 83
+ # Return either original or snapped x84
+ return return_snapped_x_or_x(snapped_x, x)85
+ 86
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tlineaction.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/tlineaction.py
Changed
121
1
2
3
import appconsts4
import clipeffectseditor5
+import compositeeditor6
import compositormodes7
import dialogs8
import dialogutils9
10
import updater11
import utils12
13
+14
+# values for differentiating copy paste data15
+COPY_PASTA_DATA_CLIPS = 116
+COPY_PASTA_DATA_COMPOSITOR_PROPERTIES = 217
+18
# Used to store transition render data to be used at render complete callback19
transition_render_data = None20
21
22
def lift_button_pressed():23
"""24
Removes 1 - n long continuous clip range from track and fills25
- the created gap with a black clip26
+ the created gap with a blank clip27
"""28
if movemodes.selected_track == -1:29
return30
31
- # Edit consumes selection, set clips seletion attr to false32
+ # Edit consumes selection, set clips seletion attr to False33
movemodes.set_range_selection(movemodes.selected_track, 34
movemodes.selected_range_in,35
movemodes.selected_range_out, 36
37
38
return 39
40
+ if compositormodes.compositor != None and compositormodes.compositor.selected == True:41
+ editorstate.set_copy_paste_objects((COPY_PASTA_DATA_COMPOSITOR_PROPERTIES, compositormodes.compositor.get_copy_paste_objects()))42
+ return43
+ 44
if movemodes.selected_track != -1:45
# copying clips46
track = current_sequence().tracks[movemodes.selected_track]47
48
for i in range(movemodes.selected_range_in, movemodes.selected_range_out + 1):49
clone_clip = current_sequence().clone_track_clip(track, i)50
clone_clips.append(clone_clip)51
- editorstate.set_copy_paste_objects(clone_clips)52
+ editorstate.set_copy_paste_objects((COPY_PASTA_DATA_CLIPS, clone_clips))53
return54
55
def do_timeline_objects_paste():56
57
paste_objs = editorstate.get_copy_paste_objects()58
if paste_objs == None:59
return 60
+ 61
+ data_type, paste_clips = paste_objs62
+ if data_type != COPY_PASTA_DATA_CLIPS:63
+ do_compositor_data_paste(paste_objs)64
+ return65
66
tline_pos = editorstate.current_tline_frame()67
68
new_clips = []69
- for clip in paste_objs:70
+ for clip in paste_clips:71
new_clip = current_sequence().create_clone_clip(clip)72
new_clips.append(new_clip)73
- editorstate.set_copy_paste_objects(new_clips)74
+ editorstate.set_copy_paste_objects((COPY_PASTA_DATA_CLIPS, new_clips))75
76
# Paste clips77
- editevent.do_multiple_clip_insert(track, paste_objs, tline_pos)78
+ editevent.do_multiple_clip_insert(track, paste_clips, tline_pos)79
80
def do_timeline_filters_paste():81
if _timeline_has_focus() == False:82
83
if paste_objs == None:84
return 85
86
+ data_type, paste_clips = paste_objs87
+ if data_type != COPY_PASTA_DATA_CLIPS:88
+ do_compositor_data_paste(paste_objs)89
+ return90
+ 91
if movemodes.selected_track == -1:92
return93
94
95
target_clips.append(track.clips[i])96
97
# First clip of selection is used as filters source98
- source_clip = paste_objs[0]99
+ source_clip = paste_clips[0]100
101
# Currently selected clips are target clips102
target_clips = []103
104
action = edit.paste_filters_action(data)105
action.do_edit()106
107
+def do_compositor_data_paste(paste_objs):108
+ data_type, paste_data = paste_objs109
+ if data_type != COPY_PASTA_DATA_COMPOSITOR_PROPERTIES:110
+ print "supposed unreahcable if in do_compositor_data_paste"111
+ return112
+ 113
+ if compositormodes.compositor != None and compositormodes.compositor.selected == True:114
+ compositormodes.compositor.do_values_copy_paste(paste_data)115
+ compositeeditor.set_compositor(compositormodes.compositor)116
+ return117
+118
def _timeline_has_focus(): # copied from keyevents.by. maybe put in utils?119
if(gui.tline_canvas.widget.is_focus()120
or gui.tline_column.widget.is_focus()121
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py
Changed
201
1
2
3
ICON_SELECTED_OVERLAY_COLOR = (0.8, 0.8, 1.0, 0.3)4
5
+# Dash pattern used to create "LED"s6
+BOX_DASH_INK = 12.07
+BOX_DASH_SKIP = 3.08
+BOX_DASHES = [BOX_DASH_INK, BOX_DASH_SKIP, BOX_DASH_INK, BOX_DASH_SKIP]9
+10
FRAME_SCALE_LINES = (0, 0, 0)11
12
BG_COLOR = (0.5, 0.5, 0.55)#(0.6, 0.6, 0.65)13
14
INSERT_MODE_COLOR = (0.9,0.9,0.0)15
OVERWRITE_MODE_COLOR = (0.9,0.0,0.0)16
OVERLAY_TRIM_COLOR = (0.81, 0.82, 0.3)17
+BOX_BOUND_COLOR =(0.137, 0.80, 0.85)18
+TRIM_MAX_RED = (1.0,0.1,0.1)19
20
POINTER_TRIANGLE_COLOR = (0.6, 0.7, 0.8, 0.7)21
SHADOW_POINTER_COLOR = (0.5, 0.5, 0.5)22
23
_draw_mode_arrow(cr, arrow_x, y, OVERWRITE_MODE_COLOR)24
25
_draw_snap(cr, y)26
- 27
+28
+def draw_overwrite_box_overlay(cr, data):29
+ # Only draw if were moving30
+ if data == None:31
+ return32
+ if data["action_on"] == False:33
+ return34
+35
+ if data["box_selection_data"] == None: # mouse action selection36
+ x1, y1 = data["press_point"]37
+ x2, y2 = data["mouse_point"]38
+39
+ cr.set_line_width(2.0)40
+ cr.set_source_rgb(*OVERLAY_COLOR)41
+ cr.move_to(x1, y1)42
+ cr.line_to(x1, y2)43
+ cr.line_to(x2, y2)44
+ cr.line_to(x2, y1)45
+ cr.close_path()46
+ cr.stroke()47
+ else: # mouse action move48
+ # Draw clips in draw range49
+ cr.set_line_width(MOVE_CLIPS_LINE_WIDTH)50
+ cr.set_source_rgb(*OVERLAY_COLOR)51
+ 52
+ s_data = data["box_selection_data"]53
+54
+ # Draw moved clips55
+ for i in range(0, len(s_data.track_selections)):56
+ track_selection = s_data.track_selections[i]57
+ y = _get_track_y(track_selection.track_id)58
+ clip_start_frame = track_selection.range_frame_in - pos + data["delta"]59
+ track_height = current_sequence().tracks[track_selection.track_id].height60
+ 61
+ for i in range(0, len(track_selection.clip_lengths)):62
+ clip_length = track_selection.clip_lengths[i]63
+ if track_selection.clip_is_media[i] == True:64
+ scale_length = clip_length * pix_per_frame65
+ scale_in = clip_start_frame * pix_per_frame66
+ cr.rectangle(scale_in, y + 1.5, scale_length, track_height - 2.0)67
+ cr.stroke()68
+ clip_start_frame += clip_length69
+ 70
+ # Draw moved compositors71
+ for comp in s_data.selected_compositors:72
+ comp_in = comp.clip_in - pos + data["delta"]73
+ comp_out = comp.clip_out - pos + data["delta"]74
+ track = current_sequence().tracks[comp.transition.b_track]75
+ y = _get_track_y(comp.transition.b_track) + track.height - COMPOSITOR_HEIGHT_OFF76
+ track_height = current_sequence().tracks[comp.transition.b_track].height77
+ scale_length = (comp_out - comp_in) * pix_per_frame78
+ scale_in = comp_in * pix_per_frame79
+ target_track = current_sequence().tracks[comp.transition.a_track]80
+ target_y = _get_track_y(target_track.id) + target_track.height - COMPOSITOR_HEIGHT_OFF81
+ 82
+ _create_compositor_cairo_path(cr, scale_in, scale_length, y, target_y)83
+ 84
+ cr.set_source_rgb(*BOX_BOUND_COLOR)85
+ cr.stroke()86
+ 87
+ # Draw bounding box88
+ cr.set_line_width(6.0)89
+ cr.set_source_rgb(*BOX_BOUND_COLOR)90
+ x = (s_data.topleft_frame - pos + data["delta"]) * pix_per_frame91
+ w = s_data.width_frames * pix_per_frame92
+ y = _get_track_y(s_data.topleft_track)93
+ bottom_track = s_data.topleft_track - s_data.height_tracks + 194
+ y2 = _get_track_y(bottom_track) + current_sequence().tracks[bottom_track].height95
+ cr.move_to(x, y)96
+ cr.line_to(x + w, y)97
+ cr.line_to(x + w, y2)98
+ cr.line_to(x, y2)99
+ cr.close_path()100
+ cr.set_dash(BOX_DASHES, 0) 101
+ cr.stroke()102
+103
+ # Draw move arrows104
+ draw_x = x - 6105
+ draw_y = y + (y2 - y) / 2.0106
+ size = 9107
+ cr.set_source_rgb(*OVERLAY_COLOR)108
+ cr.move_to(draw_x, draw_y)109
+ cr.line_to(draw_x, draw_y - size)110
+ cr.line_to(draw_x - size, draw_y)111
+ cr.line_to(draw_x, draw_y + size)112
+ cr.close_path()113
+ cr.fill()114
+115
+ draw_x = x + w + 6116
+ cr.move_to(draw_x, draw_y)117
+ cr.line_to(draw_x, draw_y - size)118
+ cr.line_to(draw_x + size, draw_y)119
+ cr.line_to(draw_x, draw_y + size)120
+ cr.close_path()121
+ cr.fill()122
+ 123
def _draw_move_overlay(cr, data, y):124
# Get data125
press_frame = data["press_frame"]126
127
cr.close_path()128
cr.fill()129
130
+ y = _get_track_y(current_sequence().first_video_index)131
+ _draw_snap(cr, y)132
+ 133
def draw_two_roll_overlay(cr, data):134
edit_frame = data["edit_frame"]135
frame_x = _get_frame_x(edit_frame)136
137
cr.stroke()138
139
_draw_kb_trim_indicator(cr, selection_frame_x, track_y)140
- 141
+ _draw_snap(cr, track_y)142
+143
def draw_one_roll_overlay(cr, data):144
track_height = current_sequence().tracks[data["track"]].height145
track_y = _get_track_y(data["track"])146
147
cr.stroke()148
149
_draw_kb_trim_indicator(cr, selection_frame_x, track_y)150
+ _draw_snap(cr, track_y)151
+ 152
+def draw_one_roll_overlay_ripple(cr, data):153
+ # Trim overlay154
+ draw_one_roll_overlay(cr, data)155
+ 156
+ # Blanks indicators157
+ ripple_data = data["ripple_data"]158
+ 159
+ cr.set_line_width(2.0)160
+ cr.set_source_rgb(*OVERLAY_COLOR)161
+ 162
+ for i in range(1, len(current_sequence().tracks) - 1):163
+ offset = ripple_data.track_blank_end_offset[i-1]164
+ if offset == None:165
+ continue166
+167
+ delta = data["selected_frame"] - data["edit_frame"]168
+ if data["to_side_being_edited"]:169
+ indicator_frame = data["edit_frame"] - delta + offset170
+ else:171
+ indicator_frame = data["selected_frame"] + offset172
+ indicator_x = _get_frame_x(indicator_frame)173
+ 174
+ track_height = current_sequence().tracks[i].height175
+ track_y = _get_track_y(i)176
+177
+ max_trim = False178
+ if delta == ripple_data.max_backwards and ripple_data.track_edit_ops[i-1] == appconsts.MULTI_TRIM_REMOVE:179
+ max_trim = True180
+ 181
+ if max_trim:182
+ cr.set_source_rgb(*TRIM_MAX_RED)183
+ else:184
+ cr.set_source_rgb(*OVERLAY_COLOR)185
186
+ cr.move_to(indicator_x, track_y)187
+ cr.line_to(indicator_x, track_y + track_height)188
+ cr.stroke()189
+ 190
+ draw_y = track_y + track_height / 2191
+ if not max_trim:192
+ cr.move_to(indicator_x - 2, draw_y)193
+ cr.line_to(indicator_x - 2, draw_y - 5)194
+ cr.line_to(indicator_x - 7, draw_y)195
+ cr.line_to(indicator_x - 2, draw_y + 5)196
+ cr.close_path()197
+ cr.fill()198
+199
+ cr.move_to(indicator_x + 2, draw_y)200
+ cr.line_to(indicator_x + 2, draw_y - 5)201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py
Changed
10
1
2
else:3
launch_batch_rendering()4
5
- print "Render queue item for rendering file into " + render_path + " with identifier " + identifier + " added."6
+ #print "Render queue item for rendering file into " + render_path + " with identifier " + identifier + " added."7
8
# ------------------------------------------------------- file utils9
def init_dirs_if_needed():10
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py
Changed
10
1
2
# Refuse to render into user home folder3
out_folder = _window.out_folder.get_filenames()[0] + "/"4
if out_folder == (os.path.expanduser("~") + "/"):5
- print "home folder"6
+ #print "home folder"7
return8
9
start_time = time.time()10
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tools/titler.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/tools/titler.py
Changed
152
1
2
VIEW_EDITOR_HEIGHT = 6203
4
TEXT_LAYER_LIST_WIDTH = 3005
-TEXT_LAYER_LIST_HEIGHT = 2506
+TEXT_LAYER_LIST_HEIGHT = 1507
8
TEXT_VIEW_WIDTH = 3009
TEXT_VIEW_HEIGHT = 27510
11
12
self.color_button = Gtk.ColorButton.new_with_rgba(Gdk.RGBA(red=1.0, green=1.0, blue=1.0, alpha=1.0))13
self.color_button.connect("color-set", self._edit_value_changed)14
-15
+ self.fill_on = Gtk.CheckButton()16
+ self.fill_on.set_active(True)17
+ 18
buttons_box = Gtk.HBox()19
buttons_box.pack_start(Gtk.Label(), True, True, 0)20
buttons_box.pack_start(self.bold_font, False, False, 0)21
22
buttons_box.pack_start(self.left_align, False, False, 0)23
buttons_box.pack_start(self.center_align, False, False, 0)24
buttons_box.pack_start(self.right_align, False, False, 0)25
- buttons_box.pack_start(guiutils.pad_label(5, 5), False, False, 0)26
+ buttons_box.pack_start(guiutils.pad_label(15, 5), False, False, 0)27
buttons_box.pack_start(self.color_button, False, False, 0)28
+ buttons_box.pack_start(guiutils.pad_label(2, 1), False, False, 0)29
+ #buttons_box.pack_start(self.fill_on, False, False, 0)30
buttons_box.pack_start(Gtk.Label(), True, True, 0)31
32
+ outline_label = Gtk.Label(_("Outline"))33
+ outline_size = Gtk.Label(_("Size"))34
+ 35
+ self.out_line_color_button = Gtk.ColorButton.new_with_rgba(Gdk.RGBA(red=0.3, green=0.3, blue=0.3, alpha=1.0))36
+ #self.color_button.connect("color-set", self._edit_value_changed)37
+ adj = Gtk.Adjustment(float(DEFAULT_FONT_SIZE), float(1), float(300), float(1))38
+ self.out_line_size_spin = Gtk.SpinButton()39
+ self.out_line_size_spin.set_adjustment(adj)40
+ self.out_line_size_spin.connect("changed", self._edit_value_changed)41
+ self.out_line_size_spin.connect("key-press-event", self._key_pressed_on_widget)42
+43
+ self.outline_on = Gtk.CheckButton()44
+ self.outline_on.set_active(False)45
+ 46
+ outline_box = Gtk.HBox()47
+ outline_box.pack_start(outline_label, False, False, 0)48
+ outline_box.pack_start(guiutils.pad_label(15, 1), False, False, 0)49
+ outline_box.pack_start(outline_size, False, False, 0)50
+ outline_box.pack_start(guiutils.pad_label(2, 1), False, False, 0)51
+ outline_box.pack_start(self.out_line_size_spin, False, False, 0)52
+ outline_box.pack_start(guiutils.pad_label(15, 1), False, False, 0)53
+ outline_box.pack_start(self.out_line_color_button, False, False, 0)54
+ outline_box.pack_start(guiutils.pad_label(2, 1), False, False, 0)55
+ outline_box.pack_start(self.outline_on, False, False, 0)56
+ outline_box.pack_start(Gtk.Label(), True, True, 0)57
+58
+ shadow_label = Gtk.Label(_("Shadow"))59
+ shadow_opacity_label = Gtk.Label(_("Opacity"))60
+ shadow_xoff = Gtk.Label(_("X Off"))61
+ shadow_yoff = Gtk.Label(_("Y Off"))62
+ 63
+ self.shadow_opa_spin = Gtk.SpinButton()64
+ self.shadow_opa_spin.set_adjustment(adj)65
+ self.shadow_opa_spin.connect("changed", self._edit_value_changed)66
+ self.shadow_opa_spin.connect("key-press-event", self._key_pressed_on_widget)67
+68
+ self.shadow_xoff_spin = Gtk.SpinButton()69
+ self.shadow_xoff_spin.set_adjustment(adj)70
+ self.shadow_xoff_spin.connect("changed", self._edit_value_changed)71
+ self.shadow_xoff_spin.connect("key-press-event", self._key_pressed_on_widget)72
+73
+ self.shadow_yoff_spin = Gtk.SpinButton()74
+ self.shadow_yoff_spin.set_adjustment(adj)75
+ self.shadow_yoff_spin.connect("changed", self._edit_value_changed)76
+ self.shadow_yoff_spin.connect("key-press-event", self._key_pressed_on_widget)77
+78
+ self.shadow_on = Gtk.CheckButton()79
+ self.shadow_on.set_active(False)80
+81
+ self.shadow_color_button = Gtk.ColorButton.new_with_rgba(Gdk.RGBA(red=0.3, green=0.3, blue=0.3, alpha=1.0))82
+ 83
+ shadow_box_1 = Gtk.HBox()84
+ shadow_box_1.pack_start(shadow_label, False, False, 0)85
+ shadow_box_1.pack_start(guiutils.pad_label(15, 1), False, False, 0)86
+ shadow_box_1.pack_start(shadow_opacity_label, False, False, 0)87
+ shadow_box_1.pack_start(self.shadow_opa_spin, False, False, 0)88
+ shadow_box_1.pack_start(guiutils.pad_label(15, 1), False, False, 0)89
+ shadow_box_1.pack_start(self.shadow_color_button, False, False, 0)90
+ shadow_box_1.pack_start(guiutils.pad_label(2, 1), False, False, 0)91
+ shadow_box_1.pack_start(self.shadow_on, False, False, 0)92
+ shadow_box_1.pack_start(Gtk.Label(), True, True, 0)93
+94
+ shadow_box_2 = Gtk.HBox()95
+ shadow_box_2.pack_start(shadow_xoff, False, False, 0)96
+ shadow_box_2.pack_start(self.shadow_xoff_spin, False, False, 0)97
+ shadow_box_2.pack_start(guiutils.pad_label(15, 1), False, False, 0)98
+ shadow_box_2.pack_start(shadow_yoff, False, False, 0)99
+ shadow_box_2.pack_start(self.shadow_yoff_spin, False, False, 0)100
+ shadow_box_2.pack_start(Gtk.Label(), True, True, 0)101
+ 102
load_layers = Gtk.Button(_("Load Layers"))103
load_layers.connect("clicked", lambda w:self._load_layers_pressed())104
save_layers = Gtk.Button(_("Save Layers"))105
106
controls_panel_2.pack_start(scroll_frame, True, True, 0)107
controls_panel_2.pack_start(font_main_row, False, False, 0)108
controls_panel_2.pack_start(buttons_box, False, False, 0)109
+ #controls_panel_2.pack_start(guiutils.pad_label(40, 1), False, False, 0)110
+ #controls_panel_2.pack_start(outline_box, False, False, 0)111
+ #controls_panel_2.pack_start(guiutils.pad_label(40, 1), False, False, 0)112
+ #controls_panel_2.pack_start(shadow_box_1, False, False, 0)113
+ #controls_panel_2.pack_start(shadow_box_2, False, False, 0)114
115
controls_panel = Gtk.VBox()116
controls_panel.pack_start(guiutils.get_named_frame(_("Active Layer"),controls_panel_2), True, True, 0)117
118
layout.set_text(self.text, -1)119
layout.set_font_description(self.font_desc)120
layout.set_alignment(self.alignment)121
- 122
+ 123
self.pixel_size = layout.get_pixel_size()124
+125
+ #if True:126
+ # cr.save()127
+ # cr.set_source_rgba(0,1,0,1)128
+ # cr.move_to(x + 5, y + 5)129
+ # cr.scale(xscale, yscale)130
+ # cr.rotate(rotation)131
+ # PangoCairo.update_layout(cr, layout)132
+ # PangoCairo.show_layout(cr, layout)133
+ # cr.restore()134
+ 135
cr.set_source_rgba(*self.color_rgba)136
cr.move_to(x, y)137
cr.scale(xscale, yscale)138
139
140
PangoCairo.update_layout(cr, layout)141
PangoCairo.show_layout(cr, layout)142
-143
+ 144
+ #PangoCairo.layout_path(cr, layout)145
+ #cr.set_source_rgba(0,1,0,1)146
+ #cr.set_line_width(5.0)147
+ #cr.stroke()148
+ 149
cr.restore()150
151
def _get_pango_alignment_for_layer(self, layer):152
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/translations.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/translations.py
Changed
107
1
2
else:3
print "Translations at " + locale_file + " were not found, using /usr/share/locale translations."4
locale_path = "/usr/share/locale/"5
- 6
+7
gettext.bindtextdomain(APP_NAME, locale_path)8
gettext.textdomain(APP_NAME)9
10
11
lang = gettext.translation(APP_NAME, locale_path, languages=langs, fallback=True)12
13
# Un-comment for translations tests14
- #lang = gettext.translation(APP_NAME, locale_path, languages=["fi"], fallback=True)15
- 16
+ # lang = gettext.translation(APP_NAME, locale_path, languages=["ru"], fallback=True)17
+18
lang.install(APP_NAME) # makes _() a build-in available in all modules without imports19
20
def get_filter_name(f_name):21
22
return combo_options[c_opt]23
except KeyError:24
return c_opt25
- 26
+27
def load_filters_translations():28
29
# filter group names30
31
filter_names["Alpha Gradient"] = _("Alpha Gradient")32
filter_names["Crop"] = _("Crop")33
filter_names["Alpha Shape"]= _("Alpha Shape")34
- 35
+36
filter_names["Volume"]= _("Volume")37
filter_names["Pan"]= _("Pan")38
filter_names["Pan Keyframed"]= _("Pan Keyframed")39
40
filter_names["Old Film"]= _("Old Film")41
filter_names["Scanlines"]= _("Scanlines")42
filter_names["Cartoon"]= _("Cartoon")43
- 44
+45
filter_names["Pixelize"]= _("Pixelize")46
filter_names["Blur"]= _("Blur")47
filter_names["Grain"]= _("Grain")48
- 49
+50
filter_names["Grayscale"]= _("Grayscale")51
filter_names["Contrast"]= _("Contrast")52
filter_names["Saturation"]= _("Saturation")53
54
filter_names["Curves"] = _("Curves")55
filter_names["Lift Gain Gamma"] = _("Lift Gain Gamma")56
filter_names["Image Grid"] = _("Image Grid")57
- 58
+59
# 0.1860
filter_names["Color Lift Gain Gamma"] = _("Color Lift Gain Gamma")61
- 62
+63
# param names64
global param_names65
66
67
param_names["Sel. Space"] = _("Sel. Space")68
param_names["Operation"] = _("Operation")69
param_names["Hard"] = _("Hard")70
+ param_names["Selection subspace"] = _("Selection subspace")71
param_names["R/A/Hue"] = _("R/A/Hue")72
- param_names["G/B/Chromae"] = _("G/B/Chroma")73
+ param_names["G/B/Chroma"] = _("G/B/Chroma")74
param_names["B/I/I"] = _("B/I/I")75
param_names["Supress"] = _("Supress")76
param_names["Horizontal"] = _("Horizontal")77
78
param_names["Split Preview"] = _("Split Preview")79
param_names["Source on Left"] = _("Source on Left")80
param_names["Lightness"] = _("Lightness")81
+ param_names["Channel"] = _("Channel")82
param_names["Input black level"] = _("Input black level")83
param_names["Input white level"] = _("Input white level")84
param_names["Black output"] = _("Black output")85
86
param_names["Rows"] = _("Rows")87
param_names["Columns"] = _("Columns")88
param_names["Color Temperature"] = _("Color Temperature")89
+ param_names["Select .cube file"] = _("Select .cube file")90
91
# param names for compositors92
param_names["Opacity"] = _("Opacity")93
94
combo_options["Rectangle"] = _("Rectangle")95
combo_options["Ellipse"] = _("Ellipse")96
combo_options["Triangle"] = _("Triangle")97
+ combo_options["Box"] = _("Box")98
combo_options["Diamond"] = _("Diamond")99
combo_options["Shave"] = _("Shave")100
combo_options["Shrink Hard"] = _("Shrink Hard")101
102
combo_options["Shadows"] = _("Shadows")103
combo_options["Midtones"] = _("Midtones")104
combo_options["Highlights"] = _("Highlights")105
- 106
+107
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/trimmodes.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/trimmodes.py
Changed
201
1
2
3
# Data/state for ongoing edit.4
edit_data = None5
+ripple_data = None6
7
# Flag for disabling mouse event8
mouse_disabled = False9
10
11
submode = NOTHING_ON12
13
+MAX_DELTA = 10000000014
15
# ------------------------------------ module functions 16
def _get_trim_edit(track, frame):17
18
- clip handles on both sides of cut19
- clip ends on both sides of cut20
"""21
- # This too complex now that roll is handled separately, could be reworked22
+ # This is too complex now that roll is handled separately, could be reworked.23
+ # "both_start", and "both_end" are no longer correct names for range variables since only one clip is24
+ # needed taken into account when calculating legel trim range.25
trim_limits = {}26
27
if from_clip == None:28
29
30
_set_edit_data(track, edit_frame, True)31
32
+ # Init ripple data if needed33
+ global ripple_data34
+ ripple_data = None35
+ if editorstate.trim_mode_ripple == True:36
+ ripple_data = RippleData(track, edit_frame)37
+38
global edit_data39
+ # Add ripple data 40
+ edit_data["ripple_data"] = ripple_data41
+ 42
# Set side being edited to default to-side43
edit_data["to_side_being_edited"] = to_side_being_edited44
45
+ # Set start frame bound for ripple mode edits46
+ if editorstate.trim_mode_ripple == True:47
+ ripple_start_bound = edit_frame - ripple_data.max_backwards48
+49
+ # Case: editing to-clip50
+ if edit_data["to_side_being_edited"]:51
+ ripple_end_bound = edit_frame + ripple_data.max_backwards52
+ if edit_data["trim_limits"]["both_end"] > ripple_end_bound:53
+ edit_data["trim_limits"]["both_end"] = ripple_end_bound54
+ # Case: editing from-clip55
+ else:56
+ ripple_start_bound = edit_frame - ripple_data.max_backwards57
+ if edit_data["trim_limits"]["both_start"] < ripple_start_bound: # name "both_start"] is artifact fromearlier when trimlimits were used for bot "trim and "roll" edits58
+ edit_data["trim_limits"]["both_start"] = ripple_start_bound59
+ 60
current_sequence().clear_hidden_track()61
62
# Cant't trim a blank clip. Blank clips are special in MLT and can't be63
64
return False65
66
# Give timeline widget needed data67
- tlinewidgets.set_edit_mode(edit_data,68
- tlinewidgets.draw_one_roll_overlay)69
+ if editorstate.trim_mode_ripple == False:70
+ tlinewidgets.set_edit_mode(edit_data,71
+ tlinewidgets.draw_one_roll_overlay)72
+ else:73
+ tlinewidgets.set_edit_mode(edit_data,74
+ tlinewidgets.draw_one_roll_overlay_ripple)75
76
# Set clip as special producer on hidden track and display current frame 77
# from it.78
79
# case: editing from-side of last clip80
global last_from_trimmed81
if last_from_trimmed:82
- data = {"track":edit_data["track_object"],83
- "index":edit_data["index"],84
- "clip":edit_data["from_clip"],85
- "delta":delta,86
- "undo_done_callback":clip_end_first_do_done,87
- "first_do":True}88
- action = edit.trim_last_clip_end_action(data)89
last_from_trimmed = False90
- action.do_edit()91
+ if editorstate.trim_mode_ripple == False:92
+ data = {"track":edit_data["track_object"],93
+ "index":edit_data["index"],94
+ "clip":edit_data["from_clip"],95
+ "delta":delta,96
+ "undo_done_callback":clip_end_first_do_done,97
+ "first_do":True}98
+ action = edit.trim_last_clip_end_action(data)99
+ last_from_trimmed = False100
+ action.do_edit()101
+ else:102
+ data = {"track":edit_data["track_object"],103
+ "index":edit_data["index"],104
+ "clip":edit_data["from_clip"],105
+ "edit_delta":delta,106
+ "undo_done_callback":clip_end_first_do_done,107
+ "first_do":True,108
+ "multi_data":ripple_data}109
+ action = edit.ripple_trim_last_clip_end_action(data)110
+ action.do_edit()111
# Edit is reinitialized in callback from edit action one_roll_trim_undo_done112
# case: editing to-side of cut113
elif edit_data["to_side_being_edited"]:114
- data = {"track":edit_data["track_object"],115
- "index":edit_data["index"],116
- "clip":edit_data["to_clip"],117
- "delta":delta,118
- "undo_done_callback":one_roll_trim_undo_done,119
- "first_do":True}120
- action = edit.trim_start_action(data)121
- action.do_edit()122
- # Edit is reinitialized in callback from edit action one_roll_trim_undo_done123
+ if editorstate.trim_mode_ripple == False:124
+ data = {"track":edit_data["track_object"],125
+ "index":edit_data["index"],126
+ "clip":edit_data["to_clip"],127
+ "delta":delta,128
+ "undo_done_callback":one_roll_trim_undo_done,129
+ "first_do":True}130
+ action = edit.trim_start_action(data)131
+ action.do_edit()132
+ # Edit is reinitialized in callback from edit action one_roll_trim_undo_done133
+ else:134
+ data = {"track":edit_data["track_object"],135
+ "index":edit_data["index"],136
+ "clip":edit_data["to_clip"],137
+ "edit_delta":delta,138
+ "undo_done_callback":one_roll_trim_undo_done,139
+ "first_do":True,140
+ "multi_data":ripple_data}141
+ action = edit.ripple_trim_start_action(data)142
+ action.do_edit()143
# case: editing from-side of cut144
else:145
- data = {"track":edit_data["track_object"],146
- "index":edit_data["index"] - 1,147
- "clip":edit_data["from_clip"],148
- "delta":delta,149
- "undo_done_callback":one_roll_trim_undo_done,150
- "first_do":True}151
- action = edit.trim_end_action(data)152
- action.do_edit()153
- # Edit is reinitialized in callback from edit action one_roll_trim_undo_done154
-155
+ if editorstate.trim_mode_ripple == False:156
+ data = {"track":edit_data["track_object"],157
+ "index":edit_data["index"] - 1,158
+ "clip":edit_data["from_clip"],159
+ "delta":delta,160
+ "undo_done_callback":one_roll_trim_undo_done,161
+ "first_do":True}162
+ action = edit.trim_end_action(data)163
+ action.do_edit()164
+ # Edit is reinitialized in callback from edit action one_roll_trim_undo_done165
+ else:166
+ data = {"track":edit_data["track_object"],167
+ "index":edit_data["index"] - 1,168
+ "clip":edit_data["from_clip"],169
+ "edit_delta":delta,170
+ "undo_done_callback":one_roll_trim_undo_done,171
+ "first_do":True,172
+ "multi_data":ripple_data}173
+ action = edit.ripple_trim_end_action(data)174
+ action.do_edit()175
+ 176
def oneroll_play_pressed():177
# Start trim preview playback loop178
current_sequence().hide_hidden_clips()179
180
181
return True182
183
+184
+185
+class RippleData:186
+ """187
+ This class collects and saves data needed for ripple mode trims.188
+ """189
+ def __init__(self, pressed_track, trim_frame):190
+ 191
+ self.trim_frame = trim_frame192
+ self.pressed_track_id = pressed_track.id193
+ self.max_backwards = 0194
+ self.trim_blank_indexes = []195
+ self.track_edit_ops = []196
+ self.track_affected = []197
+ self.track_blank_end_offset = []198
+ self.moved_compositors_destroy_ids = [] # we cannot rely on object identies with compositors because they get destroyd and recreated in undo/redo actions199
+ self.legal_edit = True200
+ self._build_ripple_data()201
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/updater.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/updater.py
Changed
18
1
2
update_tline_scrollbar()3
4
def mouse_scroll_zoom(event):5
- if event.get_state() & Gdk.ModifierType.CONTROL_MASK:6
+ do_zoom = True7
+ if editorpersistance.prefs.mouse_scroll_action_is_zoom == False:8
+ if (event.get_state() & Gdk.ModifierType.CONTROL_MASK):9
+ do_zoom = False10
+ else:11
+ if not(event.get_state() & Gdk.ModifierType.CONTROL_MASK):12
+ do_zoom = False13
+14
+ if do_zoom == True:15
adj = gui.tline_scroll.get_adjustment()16
incr = adj.get_step_increment()17
if event.direction == Gdk.ScrollDirection.UP:18
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/utils.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/utils.py
Changed
12
1
2
return get_tc_string_with_fps(frame, fps())3
4
def get_tc_string_with_fps(frame, frames_per_sec):5
+ # convert fractional frame rates (like 23.976) into integers,6
+ # otherwise the timeline will slowly drift over time7
+ frames_per_sec = int(round(frames_per_sec))8
+9
fr = frame % frames_per_sec10
sec = frame / frames_per_sec11
mins = sec / 6012
flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/vieweditor/vieweditorlayer.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/Flowblade/vieweditor/vieweditorlayer.py
Changed
12
1
2
rotation = self.edit_point_shape.get_first_two_points_rotation_angle()3
xscale = self.view_editor.scale #* self.view_editor.aspect_ratio4
yscale = self.view_editor.scale5
- # x fo write out image is on different place because computer screen has box pixels, 6
+ # x for write out image is on different place because computer screen has box pixels, 7
# some video formats do not8
+ # were not getting pixel perfect results here but its mostly ok9
if write_out_layers == True:10
x = x / self.view_editor.aspect_ratio11
12
flowblade-1.10.tar.gz/flowblade-trunk/docs/DEPENDENCIES.md -> flowblade-1.12.2.tar.gz/flowblade-trunk/docs/DEPENDENCIES.md
Changed
43
1
2
# Flowblade Package Dependencies #3
4
-| **Debian/Ubuntu package name** | **Description** |5
-|:-------------------------------|:----------------|6
-| python-gi | GTK3 Python bindings |7
-| python-mlt | MLT python bindings, this pulls in MLT |8
-| python-dbus | dbus python bindings |9
-| libmlt-data | Some image and text resources for MLT |10
-| python 2.7 >=| Language and interpreter |11
-| frei0r-plugins | Additional video filters |12
-| swh-plugins | Additional audio filters |13
-| python-gi-cairo | Gi Cairo bindings |14
-| python-numpy | Math and arrays library |15
-| python-pil | PIL image manipulation library |16
-| librsvg2-common | svg support |17
-| gmic | framework for image processing |18
-| gir1.2-glib-2.0 | Glib |19
-| gir1.2-gtk-3.0 | Gtk toolkit |20
-| gir1.2-pango-1.0 | Pango text lib |21
-| gir1.2-gdkpixbuf-2.0 | Image support |22
+| **Debian/Ubuntu package name** | **Description** | **Archlinux packages** |23
+|:-------------------------------|:----------------|:--------------|24
+| python-gi | GTK3 Python bindings | pygtk |25
+| python-mlt | MLT python bindings, this pulls in MLT | mlt-python-bindings |26
+| python-dbus | dbus python bindings | python2-dbus |27
+| libmlt-data | Some image and text resources for MLT | mlt |28
+| python 2.7 >=| Language and interpreter | python2 |29
+| frei0r-plugins | Additional video filters | movit, frei0r-plugins |30
+| swh-plugins | Additional audio filters | sox, swh-plugins |31
+| python-gi-cairo | Gi Cairo bindings | python2-gobject |32
+| python-numpy | Math and arrays library | python2-numpy |33
+| python-pil | PIL image manipulation library | python2-pillow |34
+| librsvg2-common | svg support | librsvg |35
+| gmic | framework for image processing | gmic |36
+| gir1.2-glib-2.0 | Glib | dbus-glib |37
+| gir1.2-gtk-3.0 | Gtk toolkit | gtk3 |38
+| gir1.2-pango-1.0 | Pango text lib | pango |39
+| gir1.2-gdkpixbuf-2.0 | Image support | gdk-pixbuf2 |40
41
# Dropped Dependencies #42
43
flowblade-1.10.tar.gz/flowblade-trunk/docs/INSTALLING.md -> flowblade-1.12.2.tar.gz/flowblade-trunk/docs/INSTALLING.md
Changed
66
1
2
### Installing using .deb package3
4
#### Step 1. Download and install .deb 5
-**First download .deb file** for Flowblade 1.8 from <a href="https://www.dropbox.com/s/onrdoivia6t0rjd/flowblade-1.8.0-1_all.deb?dl=0">here.</a>6
+**First download .deb file** for Flowblade 1.12 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
-On some systems double clicking may not work (on Ubuntu it has sometimes istalled old version from repository), and you need to install <b>.deb</b> file using terminal:11
+On some systems double clicking may not work and you need to install <b>.deb</b> file using terminal:12
13
<ul>14
<li> <p>Open terminal in the directory you saved the downloaded <b>.deb</b> file. Give command: </li>15
</ul>16
-```bash17
-sudo dpkg -i ./flowblade-1.8.0-1_all.deb18
-```19
20
-#### Step 2. Give some additional commands on terminal21
+ sudo dpkg -i ./flowblade-1.10.0-1_all.deb22
+23
+24
+#### OPTIONAL Step 2. Give some additional commands on terminal25
26
You may need to give some additional commands on terminal:27
<ul>28
<li>Force install all dependencies with command:</li>29
</ul>30
-```bash31
- sudo apt-get install -f32
-```33
34
-Release has been install tested on: <b>Ubuntu 16.04</b>. <b>Linux Mint 18</b> and <b>Debian 8</b>. It should work on all recent Debian based distributions.35
+ sudo apt-get install -f36
37
-<b>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/105369302467641615295/posts/QSKQoPtbLKg">here.</a></b> 38
39
-*Please note these issues with Dropbox download:*40
-<ul>41
- <li> <i>The download button may appear grayed out and you have to press it twice.</i></li>42
- <li> <i>A window may appear that asks you to create an account, but you can close it and press Download button again.</i></li> 43
- <li> <i>The .deb file is in a Dropbox Public folder and may go over download limit, please contact Project Owner if this happens.</i></li>44
-</ul>45
+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.46
+47
+<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> 48
49
### Installing from your OS repository50
51
52
53
Flowblade is currently a 100% script application, and all the dependencies should be available in popular distributions, so in most cases it should be possible to install and run Flowblade without compiling anything.54
55
-**First download 1.8 tar.gz** source archive file from <a href="https://www.dropbox.com/s/j0f1uzl2grsivzw/flowblade-1.8.0.tar.gz?dl=0">here.</a> 56
+**First download tar.gz** source archive file from <a href="https://github.com/jliljebl/flowblade/releases">here.</a> 57
58
* Extract archive into a folder of your choosing59
* Install dependencies. See [Dependencies](DEPENDENCIES.md) doc for more information.60
* If you have Flowblade installed in your system, you probably have the dependencies installed, unless some new ones have been added.61
- * Launch by running script *.../flowblade-1.8.0/flowblade* that was created in the folder where archive was unpacked.62
+ * Launch by running script *.../flowblade-1.10.0/flowblade* that was created in the folder where archive was unpacked.63
* 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.64
65
*Please note these issues with Dropbox download:*66
flowblade-1.10.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md -> flowblade-1.12.2.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md
Changed
172
1
2
# Release Notes #3
4
+5
+## Flowblade 1.12 ##6
+7
+Date: March 18, 20168
+9
+**Flowblade 1.12** is the fourteenth release of Flowblade.10
+11
+In this cycle the main developments were the adding of new tools for the first time since 0.14, and the increased level contributions the project received.12
+13
+Much time was spend on creating an AppImage for the project but unfortunately no satisfactory end result was reached, so there will not be an AppImage with latest dependencies available for Flowblade yet.14
+15
+Even with this and some redesign related delays we were able to advance the project at a reasonably pace.16
+17
+### Box tool ###18
+19
+New Box tool is provided to help with the use case of moving a range containing media on multiple tracks to another point in the sequence. This has previously required multiple edit steps to achieve. The Box tool will reduce the number of required edit actions.20
+21
+The main intended use case is probably best explained with a video: https://vimeo.com/20731051722
+23
+### Trim tool Ripple mode ###24
+25
+Every use of Trim tool will cause the edited track to lose sync with other tracks after the trim point. The Ripple mode enables in most cases doing trims while maintaining sync with other tracks. Some points on Trim Ripple mode:26
+- Sync is maintained by changing the lengths of the closest blanks on other tracks. This might not produce the edit you wish to achieve, in that case you will need to use Trim tool in default mode and do the edit in multiple steps.27
+- No overwrites are allowed to happen so the available trim length is constrained by blank lengths on other tracks.28
+- This tool is not provided as a separate tool and it is not given a GUI top level representation because it became clear that the resulting multitrack edit can be found confusing by many users29
+- The tool can be accessed by toggling the Trim tool mode using 'R' key when timeline has keyboard focus.30
+31
+32
+### Contributions ###33
+34
+We added a new category 'Developers' in the About dialog for contributors producing multiple patches and taking part in development discussions. The first developers that were added to this category were Steven van de Beek and Nathan Rosenquist.35
+36
+*Steven van de Beek*37
+38
+- Fix loading of projects with unicode names.39
+- Fix "Size/height" for multiple filters in "Transform" group40
+- Fix Render Folder from Preferences not being copied to Render panel41
+- Change .xml file to associate Flowblade logo to .flb files.42
+- Optionally Show Full Filenames in Media items43
+- Render with multiple threads and allow drop frames in playback.44
+45
+*Nathan Rosenquist*46
+47
+- Add option to hide file extensions during import for cleaner media names48
+- Round FPS to whole numbers for NTSC time code to get NTSC timocode correct49
+- Fix updating bin file count after deleting files50
+- Make 'End' key and move playhead to the end of sequence.51
+- Explain video gamma problem on certain systems.52
+53
+54
+55
+### AVFilters ###56
+MLT 6.2.0 added AVFilters support. Flowblade now offers additional filters if you have MLT > 6.2.0 with AVFilters module installed.57
+- *Lut3D* This makes possible to add similar film emulation filters that are available in G'Mic by using **.cube** files. 58
+- *Zoom/Pan* Similar functionality current "Affine" filter but the performance is much better59
+- *Color Channels Mixer* This makes possible to use color data of one chanel to determine color output of another channel. Basic exmple would be making green shirt blue by using green color data to display blue color.60
+- *Perspective* Strech image in way that can enable changing perspective.61
+- *Lens correction AV* Filter that corrects typical lens errors.62
+63
+64
+### Translations ###65
+66
+We got a new Russian translation by Nikolai Smoljaninov. There are over 100 million Russian spekers in the world and most use localised applications, so this widens the potential user base in a big way.67
+68
+Hungarian and German translations got updates by Péter Gábor and Mario Dejanovic.69
+70
+### Future directions ###71
+*Move to 2 releases per year instead of 3.* The release overhead and assosiated project slowdown has been getting bigger lately and with container formats possibly added to release requirements it is better to make the development cycles a bit longer to get overall better development throughput. 72
+73
+*Container formats and Wayland support* These technologies are still being developed and adopted. Solutions here are worked on will be made available when ready.74
+75
+*Focus areas for next cycle include* continued work on Issue list and Roadmap, Clip Compositors that automatically follow clips even across tracks will be attempted, tool integration hopefully gets a bit of attention, small website update and more tutorial videos will be done.76
+77
+### Other bugfixes and improvements ###78
+- Fix extraraeditors.py translation problems (Péter Gábor)79
+- Add missing params for translations (Péter Gábor)80
+- Fix trim view for blank match frames81
+- Set insert tool active after project load82
+- Make marker graphic a bit more visible in dark theme83
+- Make Trin and Roll edits snap84
+- Make Spacer tool snap85
+- Add higher bitrates for h264 and Theora codes for 4K encoding86
+- Add 4K profiles for projects and rendering87
+- Makes tracks number selection free with max. 9 tracks available88
+- Add center playhead on arrow move preference89
+- Make Control key keep aspect ratio when scaling with Affine Blend GUI editor90
+- Fix adding graphics default length in and out to Image Sequences media91
+- Add Compositor values copy-paste feature92
+- Make Control key move image 10px for every arrow key press in Geometry editors93
+- Make Mouse scroll zoom/scroll by selecting a preference.94
+95
+## Flowblade 1.10 ##96
+97
+Date: December 13, 201698
+99
+**Flowblade 1.10** is the thirteenth release of Flowblade.100
+101
+This cycle was a nice change in the sense that not much time was needed on project structural issues such as porting to GTK3 or creating a website.102
+103
+The main feature in this release is the new Trim View, with the additional features being focused on editing and some GUI updates.104
+105
+Next release cycle will focus on improved tool integration with the goal of providing more convenient and efficient ways to manipulate and create media within Flowblade in concert with other existing FLOSS tools. Some new editing tools and options will also be worked on, as well as bug fixes and feature requests in the Issues list.106
+107
+Appimage for this will release will become available in January and for all subsequent releases it will be available at release date.108
+109
+### Trim View ###110
+111
+Trim View is feature available in most commercial packages and now also in Flowblade, probably as the first FLOSS video editor. It is maybe best described just by a [screenshot.](https://raw.githubusercontent.com/jliljebl/flowblade/master/flowblade-trunk/docs/1-10_trimview.jpg). The advantages are clear: user is provided with more information when doing a trim and is thus able to better assess the correct cut frame within a single edit action.112
+113
+Points on Trim View performance114
+- for "Trim" tool the trim tool should mostly work quite well115
+- for "Roll" and "Slip" tools there is no getting around the fact that two video streams need to be displayed in real time. The following performance considerations apply:116
+ - SSDs perform better the spinning hard disks117
+ - faster processors improve playback118
+ - video streams like image sequences consisting fully of I-frames perform better than streams with a lot of B- and P-frames119
+120
+For these reasons the **Trim View is off by default and needs to activated from menu below the monitor**. Users are advised to assess for themselves if performance is satisfactory for system and media they are working on121
+122
+### Frame Matching ###123
+124
+Trim view layout also addresses a fundamental restriction of a single monitor layout: user is unable to compare video material to other material when deciding on a clip to add to a sequence. We now provide two mechanisms to help with this use case:125
+- monitor frame matching, shown [here.](https://raw.githubusercontent.com/jliljebl/flowblade/master/flowblade-trunk/docs/1-10_monitor_match_frame.jpg)126
+- timeline frame matching, shown [here.](https://raw.githubusercontent.com/jliljebl/flowblade/master/flowblade-trunk/docs/1-10-timeline_match_frame.jpg)127
+128
+### Editing Improvements ###129
+130
+- a "Delete Range" button is now provided to cut and lift material inside selected range on all tracks131
+- Filters in filter stack can now be rearranged132
+- Spacer tool got some bug fixes improving its usabily133
+- User can now select all clips before or after a clip on timeline using a popup menu option.134
+135
+136
+### xport from timeline to tools ###137
+- timeline clips can be now exported with frame range preserved to G'MIX Effects Tool, Slow/Fast Motion renderer and Natron if it is installed in the system.138
+139
+### Dual monitor and small screens improvements ###140
+- dual monitor support has been improved by providing a to window layout shown [here.](https://raw.githubusercontent.com/jliljebl/flowblade/master/flowblade-trunk/docs/1-10_dual_monitor.jpg)141
+- small screen sizes support has been updated with multiple bug fixes and feature additions.142
+143
+### GUI updates ###144
+- Monitor area layout was updated with the main goal of providing clearer visual cues wheather Timeline or Clip is displayed in the monitor by making the selection buttons much bigger.145
+- Middlebar got some minor visual updates146
+147
+### German translation update ###148
+- German translation received an update from Mario Dejanovic.149
+150
+### Other bugfixes and improvements ###151
+- Make render args available for small screen heights152
+- Make Master Audio Meter available for small screen heights 153
+- Fix displayed media lengths for old and changed profile projects154
+- Ask for exit confirmation when opening non-empty projects from recents list155
+- Add 7/2 and 2/7 track configurations whencreating new projects156
+- Trim init optimization157
+- Fix adding watermark dialog freeze158
+- Show file name in media item tooltip159
+- Add track active set actions to all tracks menu160
+- Make Media Relinker remember last folder161
+- Make Media Icons display length at bottom and range at top162
+- Remember fade/transition lengths between dialog invocations163
+- Make holding down Shift key snap to X or Y in compositor editors164
+- Update track lock icon165
+- Menu actions to turn all filters in timeline on/off166
+- Make Home key move to timeline start167
+168
+169
## Flowblade 1.8 ##170
171
**Date: September 19, 2016**172
flowblade-1.10.tar.gz/flowblade-trunk/docs/ROADMAP.md -> flowblade-1.12.2.tar.gz/flowblade-trunk/docs/ROADMAP.md
Changed
92
1
2
-# Roadmap3
-This document gives a broad overview what's happening next in Flowblade development. For more information see open Issues on the Issues tab.4
+# FLOWBLADE ROADMAP5
6
-*Last updated: Sept. 16, 2016*7
+Last updated: March. 20178
9
-### Next10
11
-**Increasing Tools Integration** Flowblade's standalone tools and external tools like Natron will be increasingly integrated with the timeline. There are three levels of integration here, and development will go on to increase integration one level at a time:12
- * **Clip and Range export** For e.g. user can open a timeline clip on the G'MIC effects tool.13
- * **Auto-update on render completion** After having applied an effect to a timeline clip it will be automatically updated on timeline after rendering is complete.14
- * **Continuos synchronization** Here doing changes on timeline clips previously set as clips containing extrenal tool rendering will cause automatic re-renders. For same tools this will require additinal IPC interface that is not yet available.15
+## Animation16
+- MLT keyframe types *bezier* and *step* to be made available in addition to current linear type keyframes for all keyframe editors17
+- 100% coverage for keyframe editing for float value paramaters. A light weight editor component needs to made for cases where keyframe editing is the secondary 18
19
-**Compound clips** It should possible to make selected range and the other sequences in the project available as compound clips.20
+## Tracks21
+- **Track filters stack** for both video and audio tracks.22
23
-**Audio Scrubbing** This will make editing audio on the timeline easier.24
+## Filters25
+- Contribute **Cairo filters for MLT**. Spotligt, animated producer, animated overlay filter, animated alpha and affine transform filter seem most interesting. Frei0r is not an adequate platform for some of these.26
+- **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.27
28
-**Single filter resizing** This is a frequently asked feature.29
+## Compositing30
31
-**Slowmotion forward playback for JKL scrubbing** This needs special casing to work for technical reasons, and because of that has not been added so far.32
+- **Animated Image to Alpha**, combines two images sources using luma information from a third source, probably a frame sequence33
+- animated line/curve masks, this may also be best done using **Cairo**. Requires MLT contribution.34
+- add to all alpha filters composing methods union, intersection, difference and exclusion. Requires MLT and Frei0r contribution.35
36
-**Trim edit view** This may be possible with current available APIs and will be attempted.37
+## Multiclip functonality38
+- create Compound clips from selections and full sequences39
+- make possible to combine sequences with insert and append functions40
41
-**Titler improvements** This tool has not been updated in a while should probably be moved forward.42
+## Tools development43
44
-### Long term45
+- multispeed reversed clips tool46
+- Titler tool improvements: drop shadow with blur, color outline.47
+- dedicated masking/keying tool48
49
-**GPU Rendering** MLT already contains support for GPU rendering and it has been used by Shotcut for a while, but my experience has been that it is quite unstable. It may work well with some combinations of Qt version, graphics card and drivers but other combinations may be unusably crashy.50
+## Tool integration51
+- **Timeline Container Clips** with data on original media, tool program data, rendered media and rendered media offset known and saved. Combine with polling for automatic prompts for update on render completion.52
+- **Media Item creation** from ready made programs for e.g. text animations with Natron53
+- Gimp, Inkscape, Audacity, Krita examined as **Timeline Container Clip** media creator programs54
55
-**Big translations update** Translations have currently some issues that shoud all be fixed in one go, possible adding some net based translation tool to make crating translations easier at the same time.56
+## Audio57
+- audio scratching on playback58
+- subbuses or virtual channels to help with mixing.59
+- a 5.1 surround audio track mixing60
+- synching audio with audio61
+- jack integration62
63
-The Wayland transition should probably be completed too before this is attempted. Currently the earliest date that this will be looked at looks to be early 2017.64
+## Editor functionality65
66
+- Configurable Keyboard Shortcuts.67
+- Disk Cache Manager. Data in hidden folder can become quite big eventually, and controlling it from application would be useful68
69
+## Project data70
+71
+- import media data from one project into another project72
+73
+## Packaging74
+75
+- Appimage, Snap, Flatpack. Appimage is done first, Snap second and Flatpack is assessed last.76
+77
+## Communications78
+79
+- translations workflow update. 80
+- website update81
+- 5 - 10 tutorial videos on some important workflow issues82
+- forum with threads83
+84
+85
+## Technical development86
+- **GPU Rendering** MLT already contains support for GPU rendering for certain filters87
+- The **Wayland** transition using SDL2 or OpenGL consumer. SDL2 consumer does not exist and would need to be contributed.88
+ 89
+90
+ 91
+ 92
flowblade-1.10.tar.gz/flowblade-trunk/flowblade -> flowblade-1.12.2.tar.gz/flowblade-trunk/flowblade
Changed
10
1
2
import os3
import sys4
5
-print "FLOWBLADE MOVIE EDITOR 1.10"6
+print "FLOWBLADE MOVIE EDITOR 1.12"7
print "---------------------------"8
9
10
flowblade-1.10.tar.gz/flowblade-trunk/installdata/flowblade.xml -> flowblade-1.12.2.tar.gz/flowblade-trunk/installdata/flowblade.xml
Changed
9
1
2
<?xml version="1.0"?>3
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>4
- <mime-type type="application/vnd.flowblade-project">5
+ <mime-type type="application/flowblade">6
<comment>Flowblade project</comment>7
<glob pattern="*.flb"/>8
</mime-type>9
flowblade-1.10.tar.gz/flowblade-trunk/setup.py -> flowblade-1.12.2.tar.gz/flowblade-trunk/setup.py
Changed
10
1
2
locale_files.append(filepath)3
4
setup( name='flowblade',5
- version='1.10.0',6
+ version='1.12.0',7
author='Janne Liljeblad',8
author_email='janne.liljeblad at gmail dot com',9
description='Non-linear video editor',10