[gimp] Add unused new class GimpItemTree which will keep the image's items
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Add unused new class GimpItemTree which will keep the image's items
- Date: Sat, 6 Feb 2010 12:00:58 +0000 (UTC)
commit d57f39df00c68f7235e5c8ba954aca61108e13b7
Author: Michael Natterer <mitch gimp org>
Date: Sat Feb 6 12:58:10 2010 +0100
Add unused new class GimpItemTree which will keep the image's items
It will make sure all items in the tree have unique names,
will keep the active item, handle inserting, removing and
reordering and whatnot...
app/core/Makefile.am | 2 +
app/core/core-types.h | 5 +
app/core/gimpitemtree.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++
app/core/gimpitemtree.h | 55 +++++++++++
4 files changed, 292 insertions(+), 0 deletions(-)
---
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index a0f47f4..86fea69 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -268,6 +268,8 @@ libappcore_a_sources = \
gimpitempropundo.h \
gimpitemstack.c \
gimpitemstack.h \
+ gimpitemtree.c \
+ gimpitemtree.h \
gimpitemundo.c \
gimpitemundo.h \
gimplayer.c \
diff --git a/app/core/core-types.h b/app/core/core-types.h
index eea2ac2..70f497f 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -75,6 +75,11 @@ typedef struct _GimpItemStack GimpItemStack;
typedef struct _GimpToolPresets GimpToolPresets;
+/* not really a container */
+
+typedef struct _GimpItemTree GimpItemTree;
+
+
/* context objects */
typedef struct _GimpContext GimpContext;
diff --git a/app/core/gimpitemtree.c b/app/core/gimpitemtree.c
new file mode 100644
index 0000000..ca09335
--- /dev/null
+++ b/app/core/gimpitemtree.c
@@ -0,0 +1,230 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemtree.c
+ * Copyright (C) 2010 Michael Natterer <mitch gimp org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <gegl.h>
+
+#include "core-types.h"
+
+#include "gimpitem.h"
+#include "gimpitemstack.h"
+#include "gimpitemtree.h"
+
+
+enum
+{
+ PROP_0,
+ PROP_CONTAINER_TYPE,
+ PROP_ITEM_TYPE
+};
+
+
+typedef struct _GimpItemTreePrivate GimpItemTreePrivate;
+
+struct _GimpItemTreePrivate
+{
+ GType container_type;
+ GType item_type;
+};
+
+#define GIMP_ITEM_TREE_GET_PRIVATE(object) \
+ G_TYPE_INSTANCE_GET_PRIVATE (object, \
+ GIMP_TYPE_ITEM_TREE, \
+ GimpItemTreePrivate)
+
+
+/* local function prototypes */
+
+static GObject * gimp_item_tree_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params);
+static void gimp_item_tree_finalize (GObject *object);
+static void gimp_item_tree_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_item_tree_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static gint64 gimp_item_tree_get_memsize (GimpObject *object,
+ gint64 *gui_size);
+
+
+G_DEFINE_TYPE (GimpItemTree, gimp_item_tree, GIMP_TYPE_OBJECT)
+
+#define parent_class gimp_item_tree_parent_class
+
+
+static void
+gimp_item_tree_class_init (GimpItemTreeClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
+
+ object_class->constructor = gimp_item_tree_constructor;
+ object_class->finalize = gimp_item_tree_finalize;
+ object_class->set_property = gimp_item_tree_set_property;
+ object_class->get_property = gimp_item_tree_get_property;
+
+ gimp_object_class->get_memsize = gimp_item_tree_get_memsize;
+
+ g_object_class_install_property (object_class, PROP_CONTAINER_TYPE,
+ g_param_spec_gtype ("container-type",
+ NULL, NULL,
+ GIMP_TYPE_ITEM_STACK,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY));
+
+ g_object_class_install_property (object_class, PROP_ITEM_TYPE,
+ g_param_spec_gtype ("item-type",
+ NULL, NULL,
+ GIMP_TYPE_ITEM,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY));
+
+ g_type_class_add_private (klass, sizeof (GimpItemTreePrivate));
+}
+
+static void
+gimp_item_tree_init (GimpItemTree *tree)
+{
+}
+
+static GObject *
+gimp_item_tree_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params)
+{
+ GObject *object;
+ GimpItemTree *tree;
+ GimpItemTreePrivate *private;
+
+ object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
+
+ tree = GIMP_ITEM_TREE (object);
+ private = GIMP_ITEM_TREE_GET_PRIVATE (tree);
+
+ g_assert (g_type_is_a (private->container_type, GIMP_TYPE_ITEM_STACK));
+ g_assert (g_type_is_a (private->item_type, GIMP_TYPE_ITEM));
+ g_assert (private->item_type != GIMP_TYPE_ITEM);
+
+ tree->container = g_object_new (private->container_type,
+ "name", g_type_name (private->item_type),
+ "children-type", private->item_type,
+ "policy", GIMP_CONTAINER_POLICY_STRONG,
+ "unique-names", TRUE,
+ NULL);
+
+ return object;
+}
+
+static void
+gimp_item_tree_finalize (GObject *object)
+{
+ GimpItemTree *tree = GIMP_ITEM_TREE (object);
+
+ if (tree->container)
+ {
+ g_object_unref (tree->container);
+ tree->container = NULL;
+ }
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_item_tree_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_CONTAINER_TYPE:
+ private->container_type = g_value_get_gtype (value);
+ break;
+ case PROP_ITEM_TYPE:
+ private->item_type = g_value_get_gtype (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_item_tree_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpItemTreePrivate *private = GIMP_ITEM_TREE_GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_CONTAINER_TYPE:
+ g_value_set_gtype (value, private->container_type);
+ break;
+ case PROP_ITEM_TYPE:
+ g_value_set_gtype (value, private->item_type);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static gint64
+gimp_item_tree_get_memsize (GimpObject *object,
+ gint64 *gui_size)
+{
+ GimpItemTree *tree = GIMP_ITEM_TREE (object);
+ gint64 memsize = 0;
+
+ memsize += gimp_object_get_memsize (GIMP_OBJECT (tree->container), gui_size);
+
+ return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
+ gui_size);
+}
+
+
+/* public functions */
+
+GimpItemTree *
+gimp_item_tree_new (GType container_type,
+ GType item_type)
+{
+ g_return_val_if_fail (g_type_is_a (container_type, GIMP_TYPE_ITEM_STACK), NULL);
+ g_return_val_if_fail (g_type_is_a (item_type, GIMP_TYPE_ITEM), NULL);
+
+ return g_object_new (GIMP_TYPE_ITEM_TREE,
+ "container-type", container_type,
+ "item-type", item_type,
+ NULL);
+}
diff --git a/app/core/gimpitemtree.h b/app/core/gimpitemtree.h
new file mode 100644
index 0000000..a4cdd02
--- /dev/null
+++ b/app/core/gimpitemtree.h
@@ -0,0 +1,55 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimpitemtree.h
+ * Copyright (C) 2010 Michael Natterer <mitch gimp org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_ITEM_TREE_H__
+#define __GIMP_ITEM_TREE_H__
+
+
+#include "gimpobject.h"
+
+
+#define GIMP_TYPE_ITEM_TREE (gimp_item_tree_get_type ())
+#define GIMP_ITEM_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ITEM_TREE, GimpItemTree))
+#define GIMP_ITEM_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ITEM_TREE, GimpItemTreeClass))
+#define GIMP_IS_ITEM_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_ITEM_TREE))
+#define GIMP_IS_ITEM_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_ITEM_TREE))
+
+
+typedef struct _GimpItemTreeClass GimpItemTreeClass;
+
+struct _GimpItemTree
+{
+ GimpObject parent_instance;
+
+ GimpContainer *container;
+};
+
+struct _GimpItemTreeClass
+{
+ GimpObjectClass parent_class;
+};
+
+
+GType gimp_item_tree_get_type (void) G_GNUC_CONST;
+GimpItemTree * gimp_item_tree_new (GType container_type,
+ GType item_type);
+
+
+#endif /* __GIMP_ITEM_TREE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
