[gimp] app: Add he beginnings of output editor
- From: Alexia Death <alexiade src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: Add he beginnings of output editor
- Date: Sun, 21 Feb 2010 23:09:35 +0000 (UTC)
commit 6c383b87a7f15f0d2db1094ccee9eed5de20788c
Author: Alexia Death <alexiadeath gmail com>
Date: Mon Feb 22 00:08:10 2010 +0200
app: Add he beginnings of output editor
app/widgets/Makefile.am | 2 +
app/widgets/gimpdynamicseditor.c | 16 +-
app/widgets/gimpdynamicsoutputeditor.c | 256 ++++++++++++++++++++++++++++++++
app/widgets/gimpdynamicsoutputeditor.h | 51 +++++++
app/widgets/widgets-types.h | 1 +
5 files changed, 319 insertions(+), 7 deletions(-)
---
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index b5525f4..ace0d1d 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -150,6 +150,8 @@ libappwidgets_a_sources = \
gimpdynamicseditor.h \
gimpdynamicsfactoryview.c \
gimpdynamicsfactoryview.h \
+ gimpdynamicsoutputeditor.c \
+ gimpdynamicsoutputeditor.h \
gimpeditor.c \
gimpeditor.h \
gimpenumaction.c \
diff --git a/app/widgets/gimpdynamicseditor.c b/app/widgets/gimpdynamicseditor.c
index 9115f66..4ed241f 100644
--- a/app/widgets/gimpdynamicseditor.c
+++ b/app/widgets/gimpdynamicseditor.c
@@ -31,6 +31,7 @@
#include "gimpdocked.h"
#include "gimpdynamicseditor.h"
+#include "gimpdynamicsoutputeditor.h"
#include "gimpmenufactory.h"
#include "gimppropwidgets.h"
@@ -357,7 +358,7 @@ gimp_dynamics_editor_init_output_editors (GimpDynamics *dynamics,
{
GimpIntStore *list = GIMP_INT_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(view_selector)));
GtkTreeModel *model = GTK_TREE_MODEL(list);
- GtkWidget *frame;
+ GtkWidget *output_editor;
GtkTreeIter iter;
gboolean iter_valid;
gint i = 1;
@@ -376,16 +377,17 @@ gimp_dynamics_editor_init_output_editors (GimpDynamics *dynamics,
-1);
- frame = gtk_frame_new(label);
- gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, NULL);
- gtk_widget_show (frame);
+ output = gimp_dynamics_get_output(dynamics, output_type);
+
+ output_editor = gimp_dynamics_output_editor_new (output);
+
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), output_editor, NULL);
+ gtk_widget_show (output_editor);
gtk_list_store_set(GTK_LIST_STORE(list), &iter,
- GIMP_INT_STORE_USER_DATA, frame,
+ GIMP_INT_STORE_USER_DATA, output_editor,
-1);
- output = gimp_dynamics_get_output(dynamics, output_type);
-
gimp_dynamics_editor_add_output_row (G_OBJECT (output),
label,
GTK_TABLE (check_grid),
diff --git a/app/widgets/gimpdynamicsoutputeditor.c b/app/widgets/gimpdynamicsoutputeditor.c
new file mode 100644
index 0000000..461ddd8
--- /dev/null
+++ b/app/widgets/gimpdynamicsoutputeditor.c
@@ -0,0 +1,256 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
+ *
+ * gimpdynamicsoutputeditor.c
+ * Copyright (C) 2010 Alexia Death
+ *
+ * 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 <gtk/gtk.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "widgets-types.h"
+
+#include "core/gimpcurve.h"
+#include "core/gimpdynamicsoutput.h"
+
+#include "gimpcurveview.h"
+#include "gimpdynamicsoutputeditor.h"
+
+#include "gimp-intl.h"
+
+
+#define CURVE_SIZE 185
+#define CURVE_BORDER 4
+
+
+enum
+{
+ PROP_0,
+ PROP_OUTPUT
+};
+
+typedef struct _GimpDynamicsOutputEditorPrivate GimpDynamicsOutputEditorPrivate;
+
+struct _GimpDynamicsOutputEditorPrivate
+{
+ GimpDynamicsOutput *output;
+
+ GtkWidget *vbox;
+
+ GtkWidget *notebook;
+};
+
+#define GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE(editor) \
+ G_TYPE_INSTANCE_GET_PRIVATE (editor, \
+ GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, \
+ GimpDynamicsOutputEditorPrivate)
+
+
+static GObject * gimp_dynamics_output_editor_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params);
+static void gimp_dynamics_output_editor_finalize (GObject *object);
+static void gimp_dynamics_output_editor_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_dynamics_output_editor_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static void gimp_dynamics_output_editor_curve_reset (GtkWidget *button,
+ GimpCurve *curve);
+
+
+G_DEFINE_TYPE (GimpDynamicsOutputEditor, gimp_dynamics_output_editor, GTK_TYPE_HBOX)
+
+#define parent_class gimp_dynamics_output_editor_parent_class
+
+static void
+gimp_dynamics_output_editor_class_init (GimpDynamicsOutputEditorClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructor = gimp_dynamics_output_editor_constructor;
+ object_class->finalize = gimp_dynamics_output_editor_finalize;
+ object_class->set_property = gimp_dynamics_output_editor_set_property;
+ object_class->get_property = gimp_dynamics_output_editor_get_property;
+
+ g_object_class_install_property (object_class, PROP_OUTPUT,
+ g_param_spec_object ("output",
+ NULL, NULL,
+ GIMP_TYPE_DYNAMICS_OUTPUT,
+ GIMP_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY));
+
+ g_type_class_add_private (object_class, sizeof (GimpDynamicsOutputEditorPrivate));
+}
+
+static void
+gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor)
+{
+ GimpDynamicsOutputEditorPrivate *private;
+
+ private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (editor);
+
+
+}
+
+static GObject *
+gimp_dynamics_output_editor_constructor (GType type,
+ guint n_params,
+ GObjectConstructParam *params)
+{
+ GObject *object;
+ GimpDynamicsOutputEditor *editor;
+ GimpDynamicsOutputEditorPrivate *private;
+
+ GtkWidget *vbox;
+ GtkWidget *label;
+ GtkWidget *view;
+ GtkWidget *button;
+
+ object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
+
+ editor = GIMP_DYNAMICS_OUTPUT_EDITOR (object);
+ private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (object);
+
+ g_assert (GIMP_IS_DYNAMICS_OUTPUT (private->output));
+
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_box_set_spacing (GTK_BOX (vbox), 6);
+
+ gtk_box_pack_start (GTK_BOX (editor), vbox, FALSE, FALSE, 0);
+
+ gtk_widget_show(vbox);
+
+ label = gtk_label_new("This is pressure curve.");
+
+ gtk_box_pack_start (GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+ gtk_widget_show(label);
+
+
+ view = gimp_curve_view_new ();
+ g_object_set (view,
+ "border-width", CURVE_BORDER,
+ NULL);
+ gtk_widget_set_size_request (view,
+ CURVE_SIZE + CURVE_BORDER * 2,
+ CURVE_SIZE + CURVE_BORDER * 2);
+ gtk_box_pack_start (GTK_BOX(vbox), view, FALSE, FALSE, 0);
+ gtk_widget_show (view);
+
+ gimp_curve_view_set_curve (GIMP_CURVE_VIEW (view),
+ private->output->pressure_curve);
+
+
+
+ button = gtk_button_new_with_mnemonic (_("_Reset Curve"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_widget_show (button);
+
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (gimp_dynamics_output_editor_curve_reset),
+ private->output->pressure_curve);
+
+ return object;
+}
+
+static void
+gimp_dynamics_output_editor_finalize (GObject *object)
+{
+ GimpDynamicsOutputEditorPrivate *private;
+
+ private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (object);
+
+ if (private->output)
+ {
+ g_object_unref (private->output);
+ private->output = NULL;
+ }
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+gimp_dynamics_output_editor_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpDynamicsOutputEditorPrivate *private;
+
+ private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_OUTPUT:
+ private->output = g_value_dup_object (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gimp_dynamics_output_editor_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpDynamicsOutputEditorPrivate *private;
+
+ private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (object);
+
+ switch (property_id)
+ {
+ case PROP_OUTPUT:
+ g_value_set_object (value, private->output);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+
+static void
+gimp_dynamics_output_editor_curve_reset (GtkWidget *button,
+ GimpCurve *curve)
+{
+ gimp_curve_reset (curve, TRUE);
+}
+
+
+/* public functions */
+
+GtkWidget *
+gimp_dynamics_output_editor_new (GimpDynamicsOutput *output)
+{
+ g_return_val_if_fail (GIMP_IS_DYNAMICS_OUTPUT (output), NULL);
+
+ return g_object_new (GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR,
+ "output", output,
+ NULL);
+}
diff --git a/app/widgets/gimpdynamicsoutputeditor.h b/app/widgets/gimpdynamicsoutputeditor.h
new file mode 100644
index 0000000..4223714
--- /dev/null
+++ b/app/widgets/gimpdynamicsoutputeditor.h
@@ -0,0 +1,51 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpdynamicsoutputeditor.h
+ * Copyright (C) 2010 Alexia Death
+ *
+ * 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_DYNAMICS_OUTPUT_EDITOR_H__
+#define __GIMP_DYNAMICS_OUTPUT_EDITOR_H__
+
+
+#define GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR (gimp_dynamics_output_editor_get_type ())
+#define GIMP_DYNAMICS_OUTPUT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, GimpDynamicsOutputEditor))
+#define GIMP_DYNAMICS_OUTPUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, GimpDynamicsOutputEditorClass))
+#define GIMP_IS_DYNAMICS_OUTPUT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR))
+#define GIMP_IS_DYNAMICS_OUTPUT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR))
+#define GIMP_DYNAMICS_OUTPUT_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS_OUTPUT_EDITOR, GimpDynamicsOutputEditorClass))
+
+
+typedef struct _GimpDynamicsOutputEditorClass GimpDynamicsOutputEditorClass;
+
+struct _GimpDynamicsOutputEditor
+{
+ GtkHBox parent_instance;
+};
+
+struct _GimpDynamicsOutputEditorClass
+{
+ GtkHBoxClass parent_class;
+};
+
+
+GType gimp_dynamics_output_editor_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_dynamics_output_editor_new (GimpDynamicsOutput *output);
+
+
+#endif /* __GIMP_DYNAMICS_OUTPUT_EDITOR_H__ */
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
index 23ccedb..27064a2 100644
--- a/app/widgets/widgets-types.h
+++ b/app/widgets/widgets-types.h
@@ -163,6 +163,7 @@ typedef struct _GimpCurveView GimpCurveView;
typedef struct _GimpDashEditor GimpDashEditor;
typedef struct _GimpDeviceEditor GimpDeviceEditor;
typedef struct _GimpDeviceInfoEditor GimpDeviceInfoEditor;
+typedef struct _GimpDynamicsOutputEditor GimpDynamicsOutputEditor;
typedef struct _GimpFgBgEditor GimpFgBgEditor;
typedef struct _GimpFgBgView GimpFgBgView;
typedef struct _GimpFileProcView GimpFileProcView;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
