[ease] [general] Remember the slide's master.
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease] [general] Remember the slide's master.
- Date: Sat, 7 Aug 2010 22:23:26 +0000 (UTC)
commit f702ea574d3db0a95286c0af12fa935975a38dab
Author: Nate Stedman <natesm gmail com>
Date: Sat Aug 7 18:15:42 2010 -0400
[general] Remember the slide's master.
ease-core/ease-slide.vala | 11 +++++++++++
ease-core/ease-theme.vala | 1 +
2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/ease-core/ease-slide.vala b/ease-core/ease-slide.vala
index 5df626e..184f8e8 100644
--- a/ease-core/ease-slide.vala
+++ b/ease-core/ease-slide.vala
@@ -110,6 +110,11 @@ public class Ease.Slide : GLib.Object, UndoSource
internal Theme theme { get; set; }
/**
+ * The master slide ID this slide is based on.
+ */
+ public string master { get; set; }
+
+ /**
* The number of { link Element}s on this Slide
*/
public int count { get { return elements.size; } }
@@ -236,6 +241,9 @@ public class Ease.Slide : GLib.Object, UndoSource
var slide = new Slide();
+ // get the slide's master
+ master = obj.get_string_member("master");
+
// read the slide's transition properties
transition = Transition.from_string(
obj.get_string_member("transition"));
@@ -310,6 +318,9 @@ public class Ease.Slide : GLib.Object, UndoSource
var node = new Json.Node(Json.NodeType.OBJECT);
var obj = new Json.Object();
+ // write the slide's master
+ obj.set_string_member("master", master);
+
// write the slide's transition properties
obj.set_string_member("transition", transition.to_string());
obj.set_string_member("variant", variant.to_string());
diff --git a/ease-core/ease-theme.vala b/ease-core/ease-theme.vala
index 8490031..df0df32 100644
--- a/ease-core/ease-theme.vala
+++ b/ease-core/ease-theme.vala
@@ -340,6 +340,7 @@ public class Ease.Theme : GLib.Object
{
Slide slide = new Slide();
slide.theme = this;
+ slide.master = master;
// set the slide background property
switch (master_get(master, BACKGROUND_TYPE))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]