dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: add property GimpDataFactoryView:data-factors 

and remove it from the evil public construct() function.
This commit is contained in:
Michael Natterer 2011-10-09 19:08:31 +02:00
parent 1aa75af9bf
commit 3bf3b55536
6 changed files with 112 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/widgets/gimpbrushfactoryview.c
View File

@ -130,13 +130,14 @@ gimp_brush_factory_view_new (GimpViewType view_type,
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
NULL);
factory_view = g_object_new (GIMP_TYPE_BRUSH_FACTORY_VIEW, NULL);
factory_view = g_object_new (GIMP_TYPE_BRUSH_FACTORY_VIEW,
"data-factory", factory,
NULL);
factory_view->change_brush_spacing = change_brush_spacing;
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
view_type,
factory,
context,
view_size, view_border_width,
menu_factory, "<Brushes>",

107
app/widgets/gimpdatafactoryview.c
View File

@ -53,6 +53,13 @@
#include "gimp-intl.h"
enum
{
PROP_0,
PROP_DATA_FACTORY
};
struct _GimpDataFactoryViewPriv
{
GimpDataFactory *factory;
@ -70,7 +77,17 @@ struct _GimpDataFactoryViewPriv
};
static void gimp_data_factory_view_constructed (GObject *object);
static void gimp_data_factory_view_dispose (GObject *object);
static void gimp_data_factory_view_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_data_factory_view_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gimp_data_factory_view_activate_item (GimpContainerEditor *editor,
GimpViewable *viewable);
static void gimp_data_factory_view_select_item (GimpContainerEditor *editor,
@ -93,11 +110,21 @@ gimp_data_factory_view_class_init (GimpDataFactoryViewClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpContainerEditorClass *editor_class = GIMP_CONTAINER_EDITOR_CLASS (klass);
object_class->constructed = gimp_data_factory_view_constructed;
object_class->dispose = gimp_data_factory_view_dispose;
object_class->set_property = gimp_data_factory_view_set_property;
object_class->get_property = gimp_data_factory_view_get_property;
editor_class->select_item = gimp_data_factory_view_select_item;
editor_class->activate_item = gimp_data_factory_view_activate_item;
g_object_class_install_property (object_class, PROP_DATA_FACTORY,
g_param_spec_object ("data-factory",
NULL, NULL,
GIMP_TYPE_DATA_FACTORY,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (klass, sizeof (GimpDataFactoryViewPriv));
}
@ -119,6 +146,20 @@ gimp_data_factory_view_init (GimpDataFactoryView *view)
view->priv->refresh_button = NULL;
}
static void
gimp_data_factory_view_constructed (GObject *object)
{
GimpDataFactoryView *factory_view = GIMP_DATA_FACTORY_VIEW (object);
if (G_OBJECT_CLASS (parent_class)->constructed)
G_OBJECT_CLASS (parent_class)->constructed (object);
g_assert (GIMP_IS_DATA_FACTORY (factory_view->priv->factory));
factory_view->priv->tagged_container =
gimp_tagged_container_new (gimp_data_factory_get_container (factory_view->priv->factory));
}
static void
gimp_data_factory_view_dispose (GObject *object)
{
@ -130,9 +171,55 @@ gimp_data_factory_view_dispose (GObject *object)
factory_view->priv->tagged_container = NULL;
}
if (factory_view->priv->factory)
{
g_object_unref (factory_view->priv->factory);
factory_view->priv->factory = NULL;
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
gimp_data_factory_view_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GimpDataFactoryView *factory_view = GIMP_DATA_FACTORY_VIEW (object);
switch (property_id)
{
case PROP_DATA_FACTORY:
factory_view->priv->factory = g_value_dup_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
gimp_data_factory_view_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GimpDataFactoryView *factory_view = GIMP_DATA_FACTORY_VIEW (object);
switch (property_id)
{
case PROP_DATA_FACTORY:
g_value_set_object (value, factory_view->priv->factory);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
GtkWidget *
gimp_data_factory_view_new (GimpViewType view_type,
GimpDataFactory *factory,
@ -146,11 +233,14 @@ gimp_data_factory_view_new (GimpViewType view_type,
{
GimpDataFactoryView *factory_view;
factory_view = g_object_new (GIMP_TYPE_DATA_FACTORY_VIEW, NULL);
g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
factory_view = g_object_new (GIMP_TYPE_DATA_FACTORY_VIEW,
"data-factory", factory,
NULL);
if (! gimp_data_factory_view_construct (factory_view,
view_type,
factory,
context,
view_size,
view_border_width,
@ -219,7 +309,6 @@ gimp_data_factory_view_have (GimpDataFactoryView *factory_view,
gboolean
gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
GimpViewType view_type,
GimpDataFactory *factory,
GimpContext *context,
gint view_size,
gint view_border_width,
@ -232,18 +321,12 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
gchar *str;
g_return_val_if_fail (GIMP_IS_DATA_FACTORY_VIEW (factory_view), FALSE);
g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), FALSE);
g_return_val_if_fail (view_size > 0 &&
view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, FALSE);
g_return_val_if_fail (view_border_width >= 0 &&
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
FALSE);
factory_view->priv->factory = factory;
factory_view->priv->tagged_container =
gimp_tagged_container_new (gimp_data_factory_get_container (factory));
if (! gimp_container_editor_construct (GIMP_CONTAINER_EDITOR (factory_view),
view_type,
factory_view->priv->tagged_container,
@ -329,13 +412,13 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
gimp_container_view_enable_dnd (editor->view,
GTK_BUTTON (factory_view->priv->edit_button),
gimp_container_get_children_type (gimp_data_factory_get_container (factory)));
gimp_container_get_children_type (gimp_data_factory_get_container (factory_view->priv->factory)));
gimp_container_view_enable_dnd (editor->view,
GTK_BUTTON (factory_view->priv->duplicate_button),
gimp_container_get_children_type (gimp_data_factory_get_container (factory)));
gimp_container_get_children_type (gimp_data_factory_get_container (factory_view->priv->factory)));
gimp_container_view_enable_dnd (editor->view,
GTK_BUTTON (factory_view->priv->delete_button),
gimp_container_get_children_type (gimp_data_factory_get_container (factory)));
gimp_container_get_children_type (gimp_data_factory_get_container (factory_view->priv->factory)));
gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (editor->view)),
editor);

1
app/widgets/gimpdatafactoryview.h
View File

@ -74,7 +74,6 @@ gboolean gimp_data_factory_view_have (GimpDataFactoryVi
gboolean gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,
GimpViewType view_type,
GimpDataFactory *factory,
GimpContext *context,
gint view_size,
gint view_border_width,

15
app/widgets/gimpdynamicsfactoryview.c
View File

@ -52,11 +52,11 @@ gimp_dynamics_factory_view_init (GimpDynamicsFactoryView *view)
GtkWidget *
gimp_dynamics_factory_view_new (GimpViewType view_type,
GimpDataFactory *factory,
GimpContext *context,
gint view_size,
gint view_border_width,
GimpMenuFactory *menu_factory)
GimpDataFactory *factory,
GimpContext *context,
gint view_size,
gint view_border_width,
GimpMenuFactory *menu_factory)
{
GimpDynamicsFactoryView *factory_view;
@ -67,11 +67,12 @@ gimp_dynamics_factory_view_new (GimpViewType view_type,
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
NULL);
factory_view = g_object_new (GIMP_TYPE_DYNAMICS_FACTORY_VIEW, NULL);
factory_view = g_object_new (GIMP_TYPE_DYNAMICS_FACTORY_VIEW,
"data-factory", factory,
NULL);
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
view_type,
factory,
context,
view_size, view_border_width,
menu_factory, "<Dynamics>",

5
app/widgets/gimppatternfactoryview.c
View File

@ -68,11 +68,12 @@ gimp_pattern_factory_view_new (GimpViewType view_type,
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
NULL);
factory_view = g_object_new (GIMP_TYPE_PATTERN_FACTORY_VIEW, NULL);
factory_view = g_object_new (GIMP_TYPE_PATTERN_FACTORY_VIEW,
"data-factory", factory,
NULL);
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
view_type,
factory,
context,
view_size, view_border_width,
menu_factory, "<Patterns>",

5
app/widgets/gimptoolpresetfactoryview.c
View File

@ -67,11 +67,12 @@ gimp_tool_preset_factory_view_new (GimpViewType view_type,
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
NULL);
factory_view = g_object_new (GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW, NULL);
factory_view = g_object_new (GIMP_TYPE_TOOL_PRESET_FACTORY_VIEW,
"data-factory", factory,
NULL);
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
view_type,
factory,
context,
view_size, view_border_width,
menu_factory, "<ToolPreset>",