[pitivi] Change the EffectProperties.VConent from VBox to Vpane
- From: Edward Hervey <edwardrv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Change the EffectProperties.VConent from VBox to Vpane
- Date: Wed, 22 Sep 2010 13:42:51 +0000 (UTC)
commit 4cdf2bef320e77867932090ba182aca0f302d60f
Author: Thibault Saunier <tsaunier gnome org>
Date: Tue Jul 20 14:18:06 2010 -0400
Change the EffectProperties.VConent from VBox to Vpane
pitivi/ui/clipproperties.py | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/pitivi/ui/clipproperties.py b/pitivi/ui/clipproperties.py
index fc26110..f55a5d0 100644
--- a/pitivi/ui/clipproperties.py
+++ b/pitivi/ui/clipproperties.py
@@ -90,11 +90,10 @@ class EffectProperties(gtk.Expander):
self.pipeline = None
self.effect_props_handling = effect_properties_handling
- self.VContent = gtk.VBox()
+ self.VContent = gtk.VPaned()
self.add(self.VContent)
self.table = gtk.Table(2, 1, False)
- self.VContent.pack_start(self.table, expand=True, fill=True)
self.toolbar1 = gtk.Toolbar()
self.removeEffectBt = gtk.ToolButton("gtk-delete")
@@ -193,7 +192,6 @@ class EffectProperties(gtk.Expander):
self.connect('notify::expanded', self.expandedcb)
self.table.attach(self.treeview_scrollwin, 0, 1, 1, 2)
- self.VContent.pack_start(self.explain_box, expand=True, fill=True)
self._showExplainLabel()
self.VContent.show()
@@ -266,7 +264,6 @@ class EffectProperties(gtk.Expander):
track_effect = self.storemodel.get_value(iter, COL_TRACK_EFFECT)
activated = track_effect.gnl_object.get_property("active")
track_effect.gnl_object.set_property("active", not activated)
- self.storemodel.set_value(iter, COL_ACTIVATED, not activated)
def expandedcb(self, expander, params):
self._updateAll()
@@ -285,9 +282,7 @@ class EffectProperties(gtk.Expander):
def _updateAll(self):
if self.get_expanded():
if self.timeline_object:
- self.table.show_all()
- if not self.selected_effects:
- self.toolbar1.hide()
+ self._showTable()
self.explain_box.hide()
self._updateTreeview()
self._updateEffectConfigUi()
@@ -320,9 +315,18 @@ class EffectProperties(gtk.Expander):
self.storemodel.append(to_append)
def _showExplainLabel(self):
- self.table.hide()
- self.explain_box.show()
- self.explain_label.show()
+ if self.table in self.VContent.get_children():
+ self.VContent.remove(self.table)
+ self.VContent.pack1(self.explain_box, resize=True, shrink=False)
+ self.explain_box.show_all()
+
+ def _showTable(self):
+ if self.explain_box in self.VContent.get_children():
+ self.VContent.remove(self.explain_box)
+ self.VContent.pack1(self.table, resize=True, shrink=False)
+ self.table.show_all()
+ if not self.selected_effects:
+ self.toolbar1.hide()
def _treeviewSelectionChangedCb(self, treeview):
if self.selection.count_selected_rows() == 0 and self.timeline_object:
@@ -334,21 +338,22 @@ class EffectProperties(gtk.Expander):
def _updateEffectConfigUi(self):
if self.selection.get_selected()[1]:
- effect = self.storemodel.get_value(self.selection.get_selected()[1],
+ track_effect = self.storemodel.get_value(self.selection.get_selected()[1],
COL_TRACK_EFFECT)
- if self._effect_config_ui:
- self._effect_config_ui.hide()
+ for widget in self.VContent.get_children():
+ if type(widget) is gtk.ScrolledWindow:
+ self.VContent.remove(widget)
- element = effect.getElement()
+ element = track_effect.getElement()
ui = self.effect_props_handling.getEffectConfigurationUI(element)
self._effect_config_ui = ui
if self._effect_config_ui:
- self.VContent.pack_start(self._effect_config_ui,
- expand=False,
- fill=True)
+ self.VContent.pack2(self._effect_config_ui,
+ resize=True,
+ shrink=False)
self._effect_config_ui.show_all()
- self.selected_on_treeview = effect
+ self.selected_on_treeview = track_effect
else:
self._hideEffectConfig()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]