[ease/animate_zoom: 38/38] Merge branch 'master' into animate_zoom

[Nate Stedman <natesm src gnome org>]

commit 35050d8390c1a8e4792266b55175ebdceb9a863e
Merge: 026f0d2 91f0787
Author: Nate Stedman <natesm gmail com>
Date:   Sun May 30 17:21:26 2010 -0400

    Merge branch 'master' into animate_zoom

 .gitignore                              |   35 +-
 AUTHORS                                 |    2 +
 ChangeLog                               |    7 +
 Examples/Example.ease/Document.json     |  111 +++
 Examples/Example.ease/Document.xml      |   18 -
 Examples/Transitions.ease/Document.json |  834 ++++++++++++++++++++
 Examples/Transitions.ease/Document.xml  |   95 ---
 Makefile                                |   37 -
 Makefile.am                             |   84 ++
 README                                  |   36 +
 README.mdown                            |   24 -
 autogen.sh                              |   21 +
 configure.ac                            |   47 ++
 data/ease.desktop.in                    |   12 +
 po/LINGUAS                              |    1 +
 po/POTFILES.in                          |   34 +
 po/fr.po                                |   92 +++
 src/Document.vala                       |  220 +-----
 src/EditorEmbed.vala                    |   14 +-
 src/EditorWindow.vala                   |   95 +--
 src/Element.vala                        |    9 +-
 src/ElementMap.vala                     |   19 +
 src/HTMLExporter.vala                   |    8 +-
 src/ImageActor.vala                     |    2 +-
 src/Inspector.vala                      |   55 ++
 src/InspectorPane.vala                  |   44 ++
 src/InspectorWindow.vala                |   28 +
 src/JSONParser.vala                     |  183 +++++
 src/Main.vala                           |  127 +++-
 src/OpenDialog.vala                     |    4 +-
 src/Player.vala                         |   17 +-
 src/Slide.vala                          |   49 ++-
 src/SlideActor.vala                     | 1280 ++++++++++++++++++-------------
 src/SlideButton.vala                    |    1 +
 src/SlidePane.vala                      |   18 +-
 src/TransitionPane.vala                 |   93 ++-
 src/Transitions.vala                    |   38 +-
 src/WelcomeWindow.vala                  |   93 ++-
 38 files changed, 2826 insertions(+), 1061 deletions(-)
---
diff --cc src/EditorWindow.vala
index 2b77cc2,8d25254..6cd7ba2
--- a/src/EditorWindow.vala
+++ b/src/EditorWindow.vala
@@@ -28,14 -28,9 +28,12 @@@ public class Ease.EditorWindow : Gtk.Wi
  	// interface elements
  	public EditorEmbed embed;
  	public MainToolbar main_toolbar;
- 	public Gtk.HBox inspector;
  	public Gtk.HBox slides;
- 	public TransitionPane pane_transition;
  	public SlidePane pane_slide;
 +	
 +	// zoom
  	public ZoomSlider zoom_slider;
 +	private Clutter.Animation zoom_animation;
  
  	// the player for this window
  	private Player player;