[pitivi] titleeditor: Fix the background color button initialization
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] titleeditor: Fix the background color button initialization
- Date: Wed, 24 Sep 2014 17:04:51 +0000 (UTC)
commit f2d556ab431ef64f6b2d627ed9145271688acf20
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Sat Apr 19 00:50:40 2014 +0200
titleeditor: Fix the background color button initialization
pitivi/titleeditor.py | 50 +++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/pitivi/titleeditor.py b/pitivi/titleeditor.py
index 291af61..fc11f8d 100644
--- a/pitivi/titleeditor.py
+++ b/pitivi/titleeditor.py
@@ -618,6 +618,7 @@ class TitleEditor(Loggable):
buttons = ["bold", "italic", "font", "font_fore_color", "background_color"]
for button in buttons:
self.bt[button] = builder.get_object(button)
+ self.background_color_button = builder.get_object("back_color")
settings = ["valignment", "halignment", "xpos", "ypos"]
for setting in settings:
@@ -709,30 +710,31 @@ class TitleEditor(Loggable):
self._disconnect_signals()
def _updateFromSource(self):
- if self.source is not None:
- source_text = self.source.get_text()
- self.log("Title text set to %s", source_text)
- if source_text is None:
- # FIXME: sometimes we get a TextOverlay/TitleSource
- # without a valid text property. This should not happen.
- source_text = ""
- self.warning('Source did not have a text property, setting it to "" to avoid pango choking
up on None')
- self.pangobuffer.set_text(source_text)
- self.textbuffer.set_text(source_text)
- self.settings['xpos'].set_value(self.source.get_xpos())
- self.settings['ypos'].set_value(self.source.get_ypos())
- self.settings['valignment'].set_active_id(self.source.get_valignment().value_name)
- self.settings['halignment'].set_active_id(self.source.get_halignment().value_name)
- if hasattr(self.source, "get_background_color"):
- self.bt["background_color"].set_visible(True)
- color = self.source.get_background_color()
- color = Gdk.RGBA(color / 256 ** 2 % 256 / 255.,
- color / 256 ** 1 % 256 / 255.,
- color / 256 ** 0 % 256 / 255.,
- color / 256 ** 3 % 256 / 255.)
- #self.bt["background_color"].set_rgba(color)
- else:
- self.bt["background_color"].set_visible(False)
+ if not self.source:
+ # Nothing to update from.
+ return
+
+ source_text = self.source.get_text()
+ if source_text is None:
+ # FIXME: sometimes we get a TextOverlay/TitleSource
+ # without a valid text property. This should not happen.
+ source_text = ""
+ self.warning('Source did not have a text property, setting it to "" to avoid pango choking up on
None')
+ self.log("Title text set to %s", source_text)
+ self.pangobuffer.set_text(source_text)
+ self.textbuffer.set_text(source_text)
+
+ self.settings['xpos'].set_value(self.source.get_xpos())
+ self.settings['ypos'].set_value(self.source.get_ypos())
+ self.settings['valignment'].set_active_id(self.source.get_valignment().value_name)
+ self.settings['halignment'].set_active_id(self.source.get_halignment().value_name)
+
+ color = self.source.get_background_color()
+ color = Gdk.RGBA(color / 256 ** 2 % 256 / 255.,
+ color / 256 ** 1 % 256 / 255.,
+ color / 256 ** 0 % 256 / 255.,
+ color / 256 ** 3 % 256 / 255.)
+ self.background_color_button.set_rgba(color)
def _updateSourceText(self, unused_updated_obj):
if self.source is not None:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]