openshot.code team mailing list archive
-
openshot.code team
-
Mailing list archive
-
Message #00185
[Merge] lp:~seucolega/openshot/main into lp:openshot
Gustavo Sousa has proposed merging lp:~seucolega/openshot/main into lp:openshot.
Requested reviews:
OpenShot Code (openshot.code)
For more details, see:
https://code.launchpad.net/~seucolega/openshot/main/+merge/78685
Changed the number of decimal places in field Imported Image Length in the Preferences window.
This allows images to be included in the timeline with a longer flexíxel, facilitating the creation of animation (stopmotion).
--
https://code.launchpad.net/~seucolega/openshot/main/+merge/78685
Your team OpenShot Code is requested to review the proposed merge of lp:~seucolega/openshot/main into lp:openshot.
=== modified file 'openshot/windows/ui/Preferences.ui'
--- openshot/windows/ui/Preferences.ui 2011-09-15 03:44:59 +0000
+++ openshot/windows/ui/Preferences.ui 2011-10-08 00:28:24 +0000
@@ -1,50 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore2">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore3">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore4">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore4a">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore5">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore6">
- <columns>
- <!-- column-name item -->
- <column type="gchararray"/>
- </columns>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="frmPreferences">
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Openshot Preferences</property>
<property name="resizable">False</property>
@@ -54,6 +29,7 @@
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkNotebook" id="nbPrefPages">
@@ -62,15 +38,18 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">9</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Blender Executable:</property>
@@ -86,7 +65,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The command to launch Blender 2.5+.</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â—</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -100,6 +79,7 @@
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Default Theme:</property>
@@ -111,8 +91,9 @@
<child>
<object class="GtkComboBox" id="cmbThemes">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore3</property>
- <signal name="changed" handler="on_cmbThemes_changed"/>
+ <signal name="changed" handler="on_cmbThemes_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
<attributes>
@@ -132,6 +113,7 @@
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Imported Image Length:</property>
@@ -146,11 +128,12 @@
<object class="GtkSpinButton" id="valImageLength">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â—</property>
<property name="xalign">1</property>
<property name="adjustment">adjustment2</property>
+ <property name="digits">2</property>
<property name="numeric">True</property>
- <signal name="value_changed" handler="on_valImageLength_value_changed"/>
+ <signal name="value-changed" handler="on_valImageLength_value_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -164,6 +147,7 @@
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Max History Steps:</property>
@@ -179,11 +163,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Max number of steps to keep in history.</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â—</property>
<property name="xalign">1</property>
<property name="adjustment">adjustment1</property>
<property name="numeric">True</property>
- <signal name="value_changed" handler="on_valHistoryStackSize_value_changed"/>
+ <signal name="value-changed" handler="on_valHistoryStackSize_value_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -197,6 +181,7 @@
<child>
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Output Mode:</property>
@@ -210,8 +195,9 @@
<child>
<object class="GtkComboBox" id="cmbOutputModes">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore4</property>
- <signal name="changed" handler="on_cmbOutputModes_changed"/>
+ <signal name="changed" handler="on_cmbOutputModes_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
@@ -231,6 +217,7 @@
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Use Stock Icons:</property>
@@ -244,8 +231,9 @@
<child>
<object class="GtkComboBox" id="cmbUseStockIcons">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore4a</property>
- <signal name="changed" handler="on_cmbUseStockIcons_changed"/>
+ <signal name="changed" handler="on_cmbUseStockIcons_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext4"/>
<attributes>
@@ -265,6 +253,7 @@
<child>
<object class="GtkLabel" id="label8a1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Use Smooth Scaling:</property>
@@ -278,9 +267,10 @@
<child>
<object class="GtkComboBox" id="cmbSmoothScrolling">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Requires a newer version of libmlt (0.6.0) or greater.</property>
<property name="model">liststore5</property>
- <signal name="changed" handler="on_cmbSmoothScrolling_changed"/>
+ <signal name="changed" handler="on_cmbSmoothScrolling_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext5"/>
<attributes>
@@ -300,6 +290,7 @@
<child>
<object class="GtkLabel" id="label8a2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Icon Size:</property>
@@ -313,9 +304,10 @@
<child>
<object class="GtkComboBox" id="cmbIconSize">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">The icon size of the Effects and Transitions</property>
<property name="model">liststore6</property>
- <signal name="changed" handler="on_cmbIconSize_changed"/>
+ <signal name="changed" handler="on_cmbIconSize_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext6"/>
<attributes>
@@ -335,6 +327,7 @@
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Melt Executable:</property>
@@ -350,8 +343,8 @@
<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"/>
+ <property name="invisible_char">â—</property>
+ <signal name="focus-out-event" handler="on_txtMeltCommandName_focus_out_event" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -369,6 +362,7 @@
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">General</property>
</object>
<packing>
@@ -379,16 +373,19 @@
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<child>
@@ -396,12 +393,13 @@
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="tvVCodecs">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
@@ -414,12 +412,13 @@
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="tvACodecs">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
</object>
</child>
</object>
@@ -434,12 +433,13 @@
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="tvFormats">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
</object>
</child>
</object>
@@ -452,6 +452,7 @@
<child>
<object class="GtkFixed" id="fixed5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -466,7 +467,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="on_btnReload_clicked"/>
+ <property name="use_action_appearance">False</property>
+ <signal name="clicked" handler="on_btnReload_clicked" swapped="no"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -483,6 +485,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Installed Codecs/Formats</b></property>
<property name="use_markup">True</property>
</object>
@@ -495,6 +498,7 @@
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">AV Formats</property>
</object>
<packing>
@@ -505,16 +509,19 @@
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Default Profile:</property>
@@ -527,8 +534,9 @@
<child>
<object class="GtkComboBox" id="cmbProfiles">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore2</property>
- <signal name="changed" handler="on_cmbProfiles_changed"/>
+ <signal name="changed" handler="on_cmbProfiles_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
@@ -550,7 +558,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="on_btnManageProfiles_clicked"/>
+ <property name="use_action_appearance">False</property>
+ <signal name="clicked" handler="on_btnManageProfiles_clicked" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -565,6 +574,7 @@
<child>
<object class="GtkFixed" id="fixed1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -576,6 +586,7 @@
<child>
<object class="GtkFixed" id="fixed2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="right_attach">2</property>
@@ -593,6 +604,7 @@
<child type="tab">
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Profiles</property>
</object>
<packing>
@@ -603,6 +615,7 @@
<child>
<object class="GtkTable" id="table4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">11</property>
<property name="n_columns">2</property>
<property name="column_spacing">2</property>
@@ -610,6 +623,7 @@
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Autosave Interval (in minutes):</property>
@@ -629,8 +643,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_chkEnableAutosave_toggled"/>
+ <signal name="toggled" handler="on_chkEnableAutosave_toggled" swapped="no"/>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -645,8 +660,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_chkSaveBeforePlayback_toggled"/>
+ <signal name="toggled" handler="on_chkSaveBeforePlayback_toggled" swapped="no"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -661,11 +677,11 @@
<object class="GtkSpinButton" id="valSaveInterval">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">â—</property>
<property name="xalign">1</property>
<property name="adjustment">adjustment3</property>
<property name="numeric">True</property>
- <signal name="value_changed" handler="on_valSaveInterval_value_changed"/>
+ <signal name="value-changed" handler="on_valSaveInterval_value_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -739,6 +755,7 @@
<child type="tab">
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Autosave</property>
</object>
<packing>
@@ -748,12 +765,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="btnClose">
@@ -761,8 +781,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_btnClose_clicked"/>
+ <signal name="clicked" handler="on_btnClose_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -773,27 +794,53 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="value">1</property>
- <property name="lower">1</property>
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore3">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore4">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore4a">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore5">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="liststore6">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
</object>
</interface>
Follow ups
