openshot.code team mailing list archive
-
openshot.code team
-
Mailing list archive
-
Message #00095
[Branch ~openshot.code/openshot/main] Rev 569: Reverting revision 485.1.14, which adds back the "Melt Executable" preference. This is for backw...
------------------------------------------------------------
revno: 569
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Wed 2011-09-14 22:44:59 -0500
message:
Reverting revision 485.1.14, which adds back the "Melt Executable" preference. This is for backwards compatibility with older version of MLT. The new av_formats.py code will still be used to detect the formats, codecs, and filters, but this preference will be used in the "fallback" code, if an older version of MLT is being used.
modified:
openshot/windows/preferences.py
openshot/windows/ui/Preferences.ui
--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main
Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription
=== modified file 'openshot/windows/preferences.py'
--- openshot/windows/preferences.py 2011-09-14 22:30:54 +0000
+++ openshot/windows/preferences.py 2011-09-15 03:44:59 +0000
@@ -93,6 +93,7 @@
#populate form objects
self.valImageLength.set_value(float(self.form.settings.general["imported_image_length"]))
self.valHistoryStackSize.set_value(float(self.form.settings.general["max_history_size"]))
+ self.txtMeltCommandName.set_text(self.form.settings.general["melt_command"])
self.txtBlenderCommand.set_text(self.form.settings.general["blender_command"])
theme_name = self.form.settings.general["default_theme"]
self.set_dropdown_values(theme_name, self.cmbThemes)
@@ -189,16 +190,21 @@
self.form.acodecs[:] = []
self.form.vformats[:] = []
+ melt_command = self.form.settings.general["melt_command"]
+ self.form.get_avformats(melt_command)
+
self.form.get_avformats()
-
self.populate_codecs()
+
+
def on_btnClose_clicked(self, widget, *args):
#write the values from the form to the dictionary objects
self.form.settings.general["imported_image_length"] = self.valImageLength.get_text()
self.form.settings.general["default_theme"] = self.cmbThemes.get_active_text()
self.form.settings.general["default_profile"] = self.cmbProfiles.get_active_text()
+ self.form.settings.general["melt_command"] = self.txtMeltCommandName.get_text()
self.form.settings.general["blender_command"] = self.txtBlenderCommand.get_text()
self.form.settings.general["output_mode"] = self.cmbOutputModes.get_active_text()
@@ -217,6 +223,9 @@
def on_valHistoryStackSize_value_changed(self, widget, *args):
self.form.settings.general["max_history_size"] = self.valHistoryStackSize.get_value_as_int()
+ def on_txtMeltCommandName_focus_out_event(self, widget, *args):
+ self.form.settings.general["melt_command"] = self.txtMeltCommandName.get_text()
+
def on_txtBlenderCommand_focus_out_event(self, widget, *args):
self.form.settings.general["blender_command"] = self.txtBlenderCommand.get_text()
@@ -350,6 +359,7 @@
"default_profile" : "DV NTSC",
"project_file_type" : "ascii",
"max_history_size" : "20",
+ "melt_command" : "melt",
"blender_command" : "blender",
"output_mode" : "sdl",
"use_stock_icons" : "Yes",
=== modified file 'openshot/windows/ui/Preferences.ui'
--- openshot/windows/ui/Preferences.ui 2011-08-31 05:24:34 +0000
+++ openshot/windows/ui/Preferences.ui 2011-09-15 03:44:59 +0000
@@ -66,7 +66,7 @@
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="n_rows">8</property>
+ <property name="n_rows">9</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label10">
@@ -76,8 +76,8 @@
<property name="label" translatable="yes">Blender Executable:</property>
</object>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -91,8 +91,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_padding">12</property>
<property name="y_padding">6</property>
</packing>
@@ -332,6 +332,36 @@
<property name="y_padding">6</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Melt Executable:</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="txtMeltCommandName">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">The command to launch 'melt', the MLT command line program.</property>
+ <property name="invisible_char">●</property>
+ <signal name="focus_out_event" handler="on_txtMeltCommandName_focus_out_event"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_padding">12</property>
+ <property name="y_padding">6</property>
+ </packing>
+ </child>
</object>
</child>
</object>
