openshot.code team mailing list archive
-
openshot.code team
-
Mailing list archive
-
Message #00582
[Branch ~openshot.code/openshot/main] Rev 691: Fixed a bug where clips would hide the transitions after changing their properties. Also fixed a...
------------------------------------------------------------
revno: 691
fixes bug: https://launchpad.net/bugs/1047148
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Thu 2012-09-06 22:12:12 -0500
message:
Fixed a bug where clips would hide the transitions after changing their properties. Also fixed an alignment bug, on some text on the transition properties window.
modified:
openshot/classes/clip.py
openshot/windows/ClipProperties.py
openshot/windows/ui/TransitionProperties.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/classes/clip.py'
--- openshot/classes/clip.py 2012-09-06 21:06:48 +0000
+++ openshot/classes/clip.py 2012-09-07 03:12:12 +0000
@@ -1252,6 +1252,7 @@
#self.get_canvas_child(item, "clip_name").set_properties(visibility = 1)
if self.effects:
self.get_canvas_child(item, "effect").set_properties(visibility = 1)
+
# raise the clip text (since it can get hidden by other clip-related layers)
self.get_canvas_child(item, "clip_name").raise_(None)
=== modified file 'openshot/windows/ClipProperties.py'
--- openshot/windows/ClipProperties.py 2012-08-28 20:19:02 +0000
+++ openshot/windows/ClipProperties.py 2012-09-07 03:12:12 +0000
@@ -1019,6 +1019,9 @@
# re-render just this clip
self.current_clip.RenderClip()
+ # raise all transitions
+ self.project.sequences[0].raise_transitions()
+
# raise the play-head
self.project.sequences[0].raise_play_head()
=== modified file 'openshot/windows/ui/TransitionProperties.ui'
--- openshot/windows/ui/TransitionProperties.ui 2011-09-21 20:13:00 +0000
+++ openshot/windows/ui/TransitionProperties.ui 2012-09-07 03:12:12 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -27,7 +27,6 @@
</object>
<object class="GtkDialog" id="frmTransitionProperties">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="title" translatable="yes">Transition / Mask Properties</property>
<property name="window_position">center-on-parent</property>
<property name="icon">icons/openshot.png</property>
@@ -35,55 +34,10 @@
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="btnCancel">
- <property name="label" translatable="yes">Cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked" handler="on_btnCancel_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="btnApply">
- <property name="label" translatable="yes">Apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <signal name="clicked" handler="on_btnApply_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">7</property>
<property name="n_columns">3</property>
@@ -92,7 +46,6 @@
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name:</property>
</object>
@@ -104,7 +57,7 @@
<child>
<object class="GtkLabel" id="lblName">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">None</property>
</object>
<packing>
@@ -116,7 +69,6 @@
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mask Threshold:</property>
</object>
@@ -130,7 +82,6 @@
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Softness:</property>
</object>
@@ -144,7 +95,6 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Direction:</property>
</object>
@@ -158,7 +108,6 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Type:</property>
</object>
@@ -174,7 +123,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
- <property name="round_digits">1</property>
<property name="value_pos">right</property>
</object>
<packing>
@@ -190,7 +138,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment2</property>
- <property name="round_digits">1</property>
<property name="value_pos">right</property>
</object>
<packing>
@@ -204,7 +151,6 @@
<child>
<object class="GtkComboBox" id="cboDirection">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="model">liststore1</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -224,9 +170,8 @@
<child>
<object class="GtkComboBox" id="cboType">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="model">liststore2</property>
- <signal name="changed" handler="on_cboType_changed" swapped="no"/>
+ <signal name="changed" handler="on_cboType_changed"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
@@ -245,7 +190,6 @@
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">seconds</property>
</object>
@@ -259,7 +203,6 @@
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">seconds</property>
</object>
@@ -274,14 +217,12 @@
<object class="GtkSpinButton" id="spinbtnStart">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
+ <property name="invisible_char">•</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment3</property>
<property name="digits">2</property>
- <signal name="value-changed" handler="on_spinbtnStart_value_changed" swapped="no"/>
+ <signal name="value_changed" handler="on_spinbtnStart_value_changed"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -294,14 +235,12 @@
<object class="GtkSpinButton" id="spinbtnLength">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
+ <property name="invisible_char">•</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment4</property>
<property name="digits">2</property>
- <signal name="value-changed" handler="on_spinbtnLength_value_changed" swapped="no"/>
+ <signal name="value_changed" handler="on_spinbtnLength_value_changed"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -313,7 +252,6 @@
<child>
<object class="GtkLabel" id="labelStart">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Position on Timeline:</property>
</object>
@@ -325,7 +263,6 @@
<child>
<object class="GtkLabel" id="labelLength">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Length:</property>
</object>
@@ -336,11 +273,48 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btnCancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_btnCancel_clicked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnApply">
+ <property name="label" translatable="yes">Apply</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="on_btnApply_clicked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
</child>
<action-widgets>
