[pitivi] Allow mainwindow to switch tabs to the title editor, add FIXMEs
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Allow mainwindow to switch tabs to the title editor, add FIXMEs
- Date: Mon, 10 Sep 2012 20:46:44 +0000 (UTC)
commit 8db8d6f62bc23379c61de859205bee44ccc8dbf2
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date: Mon Sep 3 16:39:43 2012 -0400
Allow mainwindow to switch tabs to the title editor, add FIXMEs
data/ui/titleeditor.ui | 2 ++
pitivi/mainwindow.py | 2 ++
pitivi/timeline/track.py | 1 +
pitivi/titleeditor.py | 2 +-
4 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/data/ui/titleeditor.ui b/data/ui/titleeditor.ui
index fce96bd..35a4c86 100644
--- a/data/ui/titleeditor.ui
+++ b/data/ui/titleeditor.ui
@@ -134,6 +134,8 @@
<property name="preview_text"></property>
<property name="show_preview_entry">False</property>
<property name="title" translatable="yes">Choose a font</property>
+ <property name="font_name">Cantarell 12</property>
+ <property name="show_style">False</property>
<signal name="font-set" handler="_fontButtonCb" swapped="no"/>
</object>
</child>
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 579b564..fe98cfc 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -488,6 +488,8 @@ class PitiviMainWindow(Gtk.Window, Loggable):
page = 0
elif tab == "transitions":
page = 1
+ elif tab == "title editor":
+ page = 2
else:
self.debug("Invalid context tab switch requested")
return False
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index e6a1875..a2863c5 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -631,6 +631,7 @@ class TrackObject(View, GooCanvas.CanvasGroup, Zoomable, Loggable):
title.set_text("")
title.set_start(self.element.get_start())
title.set_duration(self.element.get_duration())
+ # FIXME: Creating a text overlay everytime we select a video track object is madness
self.element.get_timeline_object().add_track_object(title)
self.element.get_track().add_object(title)
self.app.gui.title_editor.set_source(title)
diff --git a/pitivi/titleeditor.py b/pitivi/titleeditor.py
index 0cf686b..2150a2d 100644
--- a/pitivi/titleeditor.py
+++ b/pitivi/titleeditor.py
@@ -771,7 +771,7 @@ class TitleEditor(Loggable):
#Set right buffer
self._markupToggleCb(self.markup_button)
- def set_source(self, source, created=False):
+ def set_source(self, source, created=False): # FIXME: this "created" boolean param is a hack
"""
Set the GESTimelineTitleSource to be used with the title editor.
This can be called either from the title editor in _createCb, or by
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]