pitivi r1208 - in branches/SOC_2008_BLEWIS: . pitivi/ui



Author: blewis
Date: Mon Jul 21 17:35:22 2008
New Revision: 1208
URL: http://svn.gnome.org/viewvc/pitivi?rev=1208&view=rev

Log:
* pitivi/ui/complextimeline.py:
layout tweaks (removed widget borders)
* pitivi/ui/mainwindow.py:
timeline no longer embedded in a frame. I think it looks a lot better
this way


Modified:
   branches/SOC_2008_BLEWIS/ChangeLog
   branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py
   branches/SOC_2008_BLEWIS/pitivi/ui/mainwindow.py

Modified: branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/ui/complextimeline.py	Mon Jul 21 17:35:22 2008
@@ -386,7 +386,6 @@
        
     def _createUI(self):
         self._cursor = ARROW
-        self.set_border_width(2)
 
         self.layers = VList(canvas=self)
         self.layers.connect("notify::width", self._request_size)
@@ -613,9 +612,7 @@
             self._layerStartDurationChanged)
 
     def _createUI(self):
-        self.set_border_width(4)
         self.leftSizeGroup = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
-
         self.hadj = gtk.Adjustment()
         self.ruler = ruler.ScaleRuler(self.hadj)
         #FIXME: this is crack
@@ -623,7 +620,6 @@
         self.ruler.getStartTime = self.getStartTime
         self.ruler.zoomChanged = self.zoomChanged
         self.ruler.set_size_request(0, 35)
-        self.ruler.set_border_width(0)
         self.pack_start(self.ruler, expand=False, fill=True)
 
         # List of CompositionLayers
@@ -632,6 +628,7 @@
         self.scrolledWindow = gtk.ScrolledWindow(self.hadj)
         self.scrolledWindow.set_policy(gtk.POLICY_ALWAYS, gtk.POLICY_AUTOMATIC)
         self.scrolledWindow.add(self.compositionLayers)
+        #FIXME: remove padding between scrollbar and scrolled window
         self.pack_start(self.scrolledWindow, expand=True)
         # force update of the zoom ratio, which hasn't been set yet.
         self.compositionLayers.zoomChanged()

Modified: branches/SOC_2008_BLEWIS/pitivi/ui/mainwindow.py
==============================================================================
--- branches/SOC_2008_BLEWIS/pitivi/ui/mainwindow.py	(original)
+++ branches/SOC_2008_BLEWIS/pitivi/ui/mainwindow.py	Mon Jul 21 17:35:22 2008
@@ -238,9 +238,10 @@
 
         self.timeline = TimelineWidget()
         self.timeline.showSimpleView()
-        timelineframe = gtk.Frame()
-        timelineframe.add(self.timeline)
-        vpaned.pack2(timelineframe, resize=False, shrink=True)
+        # I honestly think it looks better without the frame
+        # timelineframe = gtk.Frame()
+        # timelineframe.add(self.timeline)
+        vpaned.pack2(self.timeline, resize=False, shrink=True)
 
         hpaned = gtk.HPaned()
         vpaned.pack1(hpaned, resize=True, shrink=False)
@@ -251,14 +252,20 @@
         # Viewer
         self.viewer = PitiviViewer()
 
-        instance.PiTiVi.playground.connect("current-changed", self._currentPlaygroundChangedCb)
+        instance.PiTiVi.playground.connect("current-changed", 
+            self._currentPlaygroundChangedCb)
 
         hpaned.pack1(self.sourcefactories, resize=False, shrink=False)
         hpaned.pack2(self.viewer, resize=True, shrink=False)
-        vbox.pack_start(self.uimanager.get_widget("/TimelineToolBar"), False)
+        # FIXME: remove toolbar padding and shadow. In fullscreen mode, the
+        # toolbar buttons should be clickable with the mouse cursor at the
+        # very bottom of the screen.
+        vbox.pack_start(self.uimanager.get_widget("/TimelineToolBar"),
+            False)
 
         #application icon
-        self.set_icon_from_file(configure.get_global_pixmap_dir() + "/pitivi.png")
+        self.set_icon_from_file(configure.get_global_pixmap_dir() 
+            + "/pitivi.png")
 
     def toggleFullScreen(self):
         """ Toggle the fullscreen mode of the application """
@@ -277,19 +284,23 @@
         self.errorDialogBox = None
 
     def _playGroundErrorCb(self, unused_playground, error, detail):
+        # FIXME FIXME FIXME:
+        # _need_ an onobtrusive way to present gstreamer errors, 
+        # one that doesn't steel mouse/keyboard focus, one that
+        # makes some kind of sense to the user, and one that presents
+        # some ways of actually _dealing_ with the underlying problem:
+        # install a plugin, re-conform source to some other format, or
+        # maybe even disable playback of a problematic file.
         if self.errorDialogBox:
             return
         self.errorDialogBox = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
-                                                gtk.MESSAGE_ERROR,
-                                                gtk.BUTTONS_OK,
-                                                None)
+            gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, None)
         self.errorDialogBox.set_markup("<b>%s</b>" % error)
         self.errorDialogBox.connect("response", self._errorMessageResponseCb)
         if detail:
             self.errorDialogBox.format_secondary_text(detail)
         self.errorDialogBox.show()
 
-
 ## Project source list callbacks
 
     def _sourcesFileAddedCb(self, unused_sources, unused_factory):



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