[ease/video: 2/2] Merge branch 'master' into video

[Nate Stedman <natesm src gnome org>]

commit 992ee7f753984930d134c9b7555e6ad9545af48f
Merge: dab6c2d 273c476
Author: Nate Stedman <natesm gmail com>
Date:   Wed Jul 28 22:50:18 2010 -0400

    Merge branch 'master' into video
    
    Conflicts:
    	src/ease-main.vala

 ease-core/ease-document.vala             |   41 ++++++++++++++++++++---------
 ease-core/ease-slide.vala                |   32 +++++++++++++++++------
 ease-core/ease-theme.vala                |   10 +++---
 ease-core/ease-undo-action.vala          |    4 +-
 ease-core/ease-undo-actions-element.vala |   12 ++++----
 ease-core/ease-undo-actions-slide.vala   |   16 ++++++------
 ease-core/ease-undo-controller.vala      |   32 ++++++++++++++++++++++-
 src/ease-editor-embed.vala               |    1 -
 src/ease-editor-window.vala              |   25 +++--------------
 src/ease-main.vala                       |    6 ++++
 10 files changed, 114 insertions(+), 65 deletions(-)
---
diff --cc src/ease-editor-window.vala
index 5f6fb4b,4438e56..e68c874
--- a/src/ease-editor-window.vala
+++ b/src/ease-editor-window.vala
@@@ -410,47 -398,6 +398,46 @@@ public class Ease.EditorWindow : Gtk.Wi
  	}
  	
  	[CCode (instance_pos = -1)]
 +	public void insert_video(Gtk.Widget sender)
 +	{
 +		var dialog = new Gtk.FileChooserDialog(_("Insert Video"),
 +		                                       null,
 +		                                       Gtk.FileChooserAction.OPEN,
 +		                                       "gtk-cancel",
 +		                                       Gtk.ResponseType.CANCEL,
 +		                                       "gtk-open",
 +		                                       Gtk.ResponseType.ACCEPT);
 +
 +		if (dialog.run() == Gtk.ResponseType.ACCEPT)
 +		{
 +			try
 +			{
 +				var e = new VideoElement();
 +				
 +				// TODO: find the actual size of the video
 +				e.width = 640;
 +				e.height = 480;
 +				e.x = slide.width / 2 - e.width / 2;
 +				e.y = slide.height / 2 - e.height / 2;
 +				
 +				e.element_type = Slide.VIDEO_TYPE;
 +				e.identifier = Theme.CUSTOM_MEDIA;
 +				e.filename = document.add_media_file(dialog.get_filename());
 +				e.source_filename = dialog.get_filename();
 +				
 +				// add the element
- 				slide.add(e);
- 				add_undo_action(new ElementAddUndoAction(e));
++				slide.append(e);
 +				embed.select_element(e);
 +			}
 +			catch (Error e)
 +			{
 +				error_dialog(_("Error Inserting Video"), e.message);
 +			}
 +		}
 +		dialog.destroy();
 +	}
 +	
 +	[CCode (instance_pos = -1)]
  	public void on_insert_rectangle(Gtk.Widget sender)
  	{
  		var rect = new ShapeElement(ShapeType.RECTANGLE);
diff --cc src/ease-main.vala
index 485fb13,892fbdd..c1f5f99
--- a/src/ease-main.vala
+++ b/src/ease-main.vala
@@@ -69,8 -72,9 +72,11 @@@ public class Ease.Main : GLib.Objec
  			return 1;
  		}
  		
 +		Gst.init(ref args);
 +
+ 		// react to command line flags
+ 		UndoController.enable_debug = debug_undo;
+ 
  		// initalize static classes
  		windows = new Gee.ArrayList<EditorWindow>();