[pitivi] ui/many files: don't call show_all() in mainwindow.py, call show() on individual components



commit ac8461d6e8ebbf43f38527740e2db5a56afff592
Author: Brandon Lewis <brandon_lewis alum berkeley edu>
Date:   Wed Feb 3 21:33:02 2010 -0800

    ui/many files: don't call show_all() in mainwindow.py, call show() on individual components

 pitivi/ui/mainwindow.py  |   14 +++++++++++---
 pitivi/ui/projecttabs.py |    2 ++
 pitivi/ui/sourcelist.py  |    5 +++++
 pitivi/ui/timeline.py    |    2 ++
 pitivi/ui/viewer.py      |    1 +
 5 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 86ea89e..5ac256f 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -364,27 +364,35 @@ class PitiviMainWindow(gtk.Window, Loggable):
         # main menu & toolbar
         vbox = gtk.VBox(False)
         self.add(vbox)
+        vbox.show()
         self.menu = self.uimanager.get_widget("/MainMenuBar")
         vbox.pack_start(self.menu, expand=False)
+        self.menu.show()
         self.toolbar = self.uimanager.get_widget("/MainToolBar")
         vbox.pack_start(self.toolbar, expand=False)
+        self.toolbar.show()
         # timeline and project tabs
         vpaned = gtk.VPaned()
         vbox.pack_start(vpaned)
+        vpaned.show()
 
         self.timeline = Timeline(instance, self.uimanager)
         self.timeline.project = self.project
 
         vpaned.pack2(self.timeline, resize=False, shrink=False)
+        self.timeline.show()
         hpaned = gtk.HPaned()
         vpaned.pack1(hpaned, resize=True, shrink=False)
+        hpaned.show()
         self.projecttabs = ProjectTabs()
 
         self.sourcelist = SourceList(instance, self.uimanager)
         self.projecttabs.append_page(self.sourcelist, gtk.Label(_("Clip Library")))
         self._connectToSourceList()
+        self.sourcelist.show()
 
         hpaned.pack1(self.projecttabs, resize=True, shrink=False)
+        self.projecttabs.show()
 
         # Viewer
         self.viewer = PitiviViewer()
@@ -394,6 +402,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
                            gtk.gdk.ACTION_COPY)
         self.viewer.connect("drag_data_received", self._viewerDndDataReceivedCb)
         hpaned.pack2(self.viewer, resize=False, shrink=False)
+        self.viewer.show()
         self.viewer.connect("expose-event", self._exposeEventCb)
 
         # window and pane position defaults
@@ -423,8 +432,9 @@ class PitiviMainWindow(gtk.Window, Loggable):
         # very bottom of the screen.
         ttb = self.uimanager.get_widget("/TimelineToolBar")
         vbox.pack_start(ttb, expand=False)
+        ttb.show()
 
-        self.show_all()
+        self.show()
 
         if not self.settings.mainWindowShowMainToolbar:
             self.toolbar.props.visible = False
@@ -432,8 +442,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
         if not self.settings.mainWindowShowTimelineToolbar:
             ttb.props.visible = False
 
-        self.timeline.infostub.hide()
-
         #application icon
         self.set_icon_name("pitivi")
 
diff --git a/pitivi/ui/projecttabs.py b/pitivi/ui/projecttabs.py
index e142611..7f1da6e 100644
--- a/pitivi/ui/projecttabs.py
+++ b/pitivi/ui/projecttabs.py
@@ -37,6 +37,8 @@ class ProjectTabs(gtk.Notebook):
     def append_page(self, child, label):
         gtk.Notebook.append_page(self, child, label)
         self._set_child_properties(child, label)
+        child.show()
+        label.show()
 
     def _set_child_properties(self, child, label):
         self.child_set_property(child, "detachable", True)
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index a0addf4..bcdc023 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -192,6 +192,7 @@ class SourceList(gtk.VBox, Loggable):
             _("<span size='x-large'>Import your clips by dragging them here or "
               "by using the buttons above.</span>"))
         textbox.add(txtlabel)
+        txtlabel.show()
         self.txtlabel = txtlabel
 
         self.textbox = textbox
@@ -726,17 +727,21 @@ class InfoStub(gtk.HBox, Loggable):
         self.set_spacing(6)
         anim = gtk.gdk.PixbufAnimation(get_pixmap_dir() + "/busy.gif")
         self.busyanim = gtk.image_new_from_animation(anim)
+        self.busyanim.show()
 
         self.erroricon = gtk.image_new_from_stock(gtk.STOCK_DIALOG_WARNING,
                                                   gtk.ICON_SIZE_SMALL_TOOLBAR)
+        self.erroricon.show()
 
         self.infolabel = gtk.Label(self._importingmessage)
         self.infolabel.set_alignment(0, 0.5)
+        self.infolabel.show()
 
         self.questionbutton = gtk.Button()
         self.questionbutton.set_image(gtk.image_new_from_stock(gtk.STOCK_INFO,
                                                                gtk.ICON_SIZE_SMALL_TOOLBAR))
         self.questionbutton.connect("clicked", self._questionButtonClickedCb)
+        self.questionbutton.show()
         self._questionshowing = False
 
         self.pack_start(self.busyanim, expand=False)
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 0fe01f5..7c21212 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -255,6 +255,8 @@ class Timeline(gtk.Table, Loggable, Zoomable):
         # error infostub
         self.infostub = InfoStub()
         self.attach(self.infostub, 1, 2, 2, 3, yoptions=0)
+
+        self.show_all()
         self.infostub.hide()
 
         # drag and drop
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index 03b3e73..5dfb0a9 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -272,6 +272,7 @@ class PitiviViewer(gtk.VBox, Loggable):
             width += 110
             height = int(width / self.aframe.props.ratio)
             self.aframe.set_size_request(width , height)
+        self.show_all()
 
     _showingSlider = True
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]