[longomatch/clutter] WIP



commit 20903670e0fc55a5125ac9cab54eb03447a4a06c
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Thu Sep 8 01:40:31 2011 +0200

    WIP

 ...LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs |    1 +
 LongoMatch/gtk-gui/gui.stetic                      |    5 +++--
 LongoMatch/gtk-gui/objects.xml                     |    2 +-
 libcesarplayer/bacon-video-widget-gst-0.10.c       |    8 ++++++--
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs
index 56ed755..72e5557 100644
--- a/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs
+++ b/LongoMatch/gtk-gui/LongoMatch.Gui.Dialog.ProjectSelectionDialog.cs
@@ -56,6 +56,7 @@ namespace LongoMatch.Gui.Dialog
 			this.fromfileradiobutton = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("New project using a video file"));
 			this.fromfileradiobutton.CanFocus = true;
 			this.fromfileradiobutton.Name = "fromfileradiobutton";
+			this.fromfileradiobutton.Active = true;
 			this.fromfileradiobutton.DrawIndicator = true;
 			this.fromfileradiobutton.UseUnderline = true;
 			this.fromfileradiobutton.FocusOnClick = false;
diff --git a/LongoMatch/gtk-gui/gui.stetic b/LongoMatch/gtk-gui/gui.stetic
index fba1237..9e584d0 100644
--- a/LongoMatch/gtk-gui/gui.stetic
+++ b/LongoMatch/gtk-gui/gui.stetic
@@ -5,7 +5,7 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../bin/CesarPlayer.dll" />
+    <widget-library name="../../CesarPlayer/a.dll" />
     <widget-library name="../../bin/LongoMatch.exe" internal="true" />
   </import>
   <icon-factory>
@@ -4763,6 +4763,7 @@ No</property>
                 <property name="MemberName" />
                 <property name="CanFocus">True</property>
                 <property name="Label" translatable="yes" />
+                <property name="Active">True</property>
                 <property name="DrawIndicator">False</property>
                 <property name="HasLabel">False</property>
                 <property name="UseUnderline">True</property>
@@ -6426,4 +6427,4 @@ You can continue with the current capture, cancel it or save your project.
       </widget>
     </child>
   </widget>
-</stetic-interface>
+</stetic-interface>
\ No newline at end of file
diff --git a/LongoMatch/gtk-gui/objects.xml b/LongoMatch/gtk-gui/objects.xml
index 07b38c8..9205ffd 100644
--- a/LongoMatch/gtk-gui/objects.xml
+++ b/LongoMatch/gtk-gui/objects.xml
@@ -152,6 +152,7 @@
         <signal name="PlayListNodeAdded" />
         <signal name="SnapshotSeriesEvent" />
         <signal name="TagPlay" />
+        <signal name="EditProperties" />
       </itemgroup>
     </signals>
   </object>
@@ -265,7 +266,6 @@
       <itemgroup label="TemplatesEditorBase Properties">
         <property name="CanExport" />
         <property name="Edited" />
-        <property name="InProject" />
       </itemgroup>
     </itemgroups>
     <signals />
diff --git a/libcesarplayer/bacon-video-widget-gst-0.10.c b/libcesarplayer/bacon-video-widget-gst-0.10.c
index 3a142bd..d34c9ed 100644
--- a/libcesarplayer/bacon-video-widget-gst-0.10.c
+++ b/libcesarplayer/bacon-video-widget-gst-0.10.c
@@ -74,6 +74,8 @@
 #include <mx/mx.h>
 #include "longomatch-aspect-frame.h"
 
+#define LOGO_SIZE 400
+
 #define is_error(e, d, c) \
   (e->domain == GST_##d##_ERROR && \
    e->code == GST_##d##_ERROR_##c)
@@ -425,6 +427,8 @@ set_current_actor (BaconVideoWidget *bvw)
 					       gdk_pixbuf_get_rowstride (pixbuf),
 					       gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3,
 					       CLUTTER_TEXTURE_NONE, &err);
+      clutter_actor_set_size (bvw->priv->logo, gdk_pixbuf_get_width(pixbuf),
+          gdk_pixbuf_get_height(pixbuf));
       if (ret == FALSE) {
 	g_message ("clutter_texture_set_from_rgb_data failed %s", err->message);
 	g_error_free (err);
@@ -3247,9 +3251,9 @@ bacon_video_widget_new (BvwUseType use_type, GError ** err)
   bvw->priv->logo = clutter_texture_new ();
   mx_bin_set_child (MX_BIN (bvw->priv->logo_frame), bvw->priv->logo);
   clutter_container_add_actor (CLUTTER_CONTAINER (bvw->priv->stage), bvw->priv->logo_frame);
-  mx_bin_set_fill (MX_BIN (bvw->priv->logo_frame), TRUE, FALSE);
+  mx_bin_set_fill (MX_BIN (bvw->priv->logo_frame), FALSE , FALSE);
   mx_bin_set_alignment (MX_BIN (bvw->priv->logo_frame), MX_ALIGN_MIDDLE, MX_ALIGN_MIDDLE);
-  //clutter_actor_set_size (bvw->priv->logo, LOGO_SIZE, LOGO_SIZE);
+  clutter_actor_set_size (bvw->priv->logo, LOGO_SIZE, LOGO_SIZE);
   constraint = clutter_bind_constraint_new (bvw->priv->stage, CLUTTER_BIND_SIZE, 0.0);
   clutter_actor_add_constraint_with_name (bvw->priv->logo_frame, "size", constraint);
   clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->logo_frame));



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