gnomemm r1293 - in cluttermm/trunk: . clutter clutter/cluttermm clutter/cluttermm/private clutter/src tools/extra_defs_gen

[jjongsma svn gnome org]

Author: jjongsma
Date: Mon Jan 21 03:02:39 2008
New Revision: 1293
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1293&view=rev

Log:
	* clutter/cluttermm.h:
	* clutter/src/Makefile_list_of_hg.am_fragment:
	* clutter/src/clutter_signals.defs:
	* clutter/src/script.ccg:
	* clutter/src/script.hg:
	* tools/extra_defs_gen/generate_defs_clutter.cc:
	Added Script class.  A lot of it is still marked with TODOs since I haven't
	thought about how to handle the signal connection stuff in C++.


Added:
   cluttermm/trunk/clutter/src/script.ccg
   cluttermm/trunk/clutter/src/script.hg
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/cluttermm/   (props changed)
   cluttermm/trunk/clutter/cluttermm.h
   cluttermm/trunk/clutter/cluttermm/private/   (props changed)
   cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
   cluttermm/trunk/clutter/src/clutter_signals.defs
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc

Modified: cluttermm/trunk/clutter/cluttermm.h
==============================================================================
--- cluttermm/trunk/clutter/cluttermm.h	(original)
+++ cluttermm/trunk/clutter/cluttermm.h	Mon Jan 21 03:02:39 2008
@@ -50,6 +50,7 @@
 #include <cluttermm/timeline.h>
 #include <cluttermm/score.h>
 #include <cluttermm/shader.h>
+#include <cluttermm/script.h>
 #include <cluttermm/types.h>
 
 //#include <cluttermm/box.h>

Modified: cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	(original)
+++ cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	Mon Jan 21 03:02:39 2008
@@ -26,5 +26,6 @@
 behaviour-rotate.hg \
 behaviour-scale.hg \
 score.hg \
-shader.hg
+shader.hg \
+script.hg
 #layout.hg box.hg margin.hg

Modified: cluttermm/trunk/clutter/src/clutter_signals.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_signals.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_signals.defs	Mon Jan 21 03:02:39 2008
@@ -653,19 +653,19 @@
   (construct-only #f)
 )
 
-(define-property x-scale-end
+(define-property y-scale-end
   (of-object "ClutterBehaviourScale")
   (prop-type "GParamDouble")
-  (docs "Final scale on the X axis")
+  (docs "Final scale on the Y axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property y-scale-end
+(define-property x-scale-end
   (of-object "ClutterBehaviourScale")
   (prop-type "GParamDouble")
-  (docs "Final scale on the Y axis")
+  (docs "Final scale on the X axis")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1671,19 +1671,19 @@
   (construct-only #f)
 )
 
-(define-property volume
+(define-property uri
   (of-object "ClutterMedia")
-  (prop-type "GParamDouble")
-  (docs "The audio volume.")
+  (prop-type "GParamString")
+  (docs "The loaded URI.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property uri
+(define-property volume
   (of-object "ClutterMedia")
-  (prop-type "GParamString")
-  (docs "The loaded URI.")
+  (prop-type "GParamDouble")
+  (docs "The audio volume.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2663,3 +2663,23 @@
   (construct-only #f)
 )
 
+;; From ClutterScript
+
+(define-property filename-set
+  (of-object "ClutterScript")
+  (prop-type "GParamBoolean")
+  (docs "Whether the :filename property is set")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property filename
+  (of-object "ClutterScript")
+  (prop-type "GParamString")
+  (docs "The path of the currently parsed file")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+

Added: cluttermm/trunk/clutter/src/script.ccg
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter/src/script.ccg	Mon Jan 21 03:02:39 2008
@@ -0,0 +1,23 @@
+/* Copyright (C) 2007 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <clutter/clutter-script.h>
+
+namespace Clutter
+{
+} //namespace Clutter
+

Added: cluttermm/trunk/clutter/src/script.hg
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter/src/script.hg	Mon Jan 21 03:02:39 2008
@@ -0,0 +1,57 @@
+/* Copyright (C) 2007 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm/object.h>
+#include <cluttermm/timeline.h>
+#include <clutter/clutter-script.h>
+ 
+_DEFS(cluttermm,clutter)
+_PINCLUDE(glibmm/private/object_p.h)
+
+
+namespace Clutter
+{
+
+class Script : public Glib::Object
+{
+  _CLASS_GOBJECT(Script, ClutterScript, CLUTTER_SCRIPT, Glib::Object, GObject)
+  _DERIVES_INITIALLY_UNOWNED()
+
+protected:
+  _CTOR_DEFAULT()
+
+public:
+  _WRAP_CREATE()
+
+  //_WRAP_METHOD(guint load_from_data(const std::string& data), clutter_script_load_from_data, errthrow)
+  _WRAP_METHOD(guint load_from_file(const std::string& filename), clutter_script_load_from_file, errthrow)
+  _WRAP_METHOD(Glib::RefPtr<Glib::Object> get_object(const Glib::ustring& name), clutter_script_get_object, refreturn)
+  // TODO: get_objects()
+  _WRAP_METHOD(void unmerge_object(guint merge_id), clutter_script_unmerge_objects)
+  _WRAP_METHOD(void ensure_objects(), clutter_script_ensure_objects)
+  // TODO: connect_signals functions
+  // TODO: do we need get_type_from_name()?
+
+  // TODO: clutter_get_script_id is not really a Script method, how to handle
+  // this?
+
+  _WRAP_PROPERTY("filename", std::string)
+  _WRAP_PROPERTY("filename-set", bool)
+};
+
+} // namespace Clutter
+// vim:ts=2,sw=2

Modified: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	Mon Jan 21 03:02:39 2008
@@ -57,6 +57,7 @@
     << get_defs(CLUTTER_TYPE_TIMELINE)
     << get_defs(CLUTTER_TYPE_SCORE)
     << get_defs(CLUTTER_TYPE_SHADER)
+    << get_defs(CLUTTER_TYPE_SCRIPT)
     ;
 //    << get_defs(CLUTTER_TYPE_VBOX)
 //    << get_defs(CLUTTER_TYPE_MARGIN);