mirror of https://github.com/GNOME/gimp.git
app: GimpDockPriv -> GimpDockPrivate, priv -> p
This commit is contained in:
parent
04ef83c795
commit
60b90b817a
|
@ -64,7 +64,7 @@ enum
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct _GimpDockPriv
|
struct _GimpDockPrivate
|
||||||
{
|
{
|
||||||
GimpDialogFactory *dialog_factory;
|
GimpDialogFactory *dialog_factory;
|
||||||
GimpContext *context;
|
GimpContext *context;
|
||||||
|
@ -177,7 +177,7 @@ gimp_dock_class_init (GimpDockClass *klass)
|
||||||
DEFAULT_DOCK_FONT_SCALE,
|
DEFAULT_DOCK_FONT_SCALE,
|
||||||
GIMP_PARAM_READABLE));
|
GIMP_PARAM_READABLE));
|
||||||
|
|
||||||
g_type_class_add_private (klass, sizeof (GimpDockPriv));
|
g_type_class_add_private (klass, sizeof (GimpDockPrivate));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -187,15 +187,15 @@ gimp_dock_init (GimpDock *dock)
|
||||||
GtkWidget *separator;
|
GtkWidget *separator;
|
||||||
gchar *name;
|
gchar *name;
|
||||||
|
|
||||||
dock->priv = G_TYPE_INSTANCE_GET_PRIVATE (dock,
|
dock->p = G_TYPE_INSTANCE_GET_PRIVATE (dock,
|
||||||
GIMP_TYPE_DOCK,
|
GIMP_TYPE_DOCK,
|
||||||
GimpDockPriv);
|
GimpDockPrivate);
|
||||||
dock->priv->context = NULL;
|
dock->p->context = NULL;
|
||||||
dock->priv->dialog_factory = NULL;
|
dock->p->dialog_factory = NULL;
|
||||||
dock->priv->dockbooks = NULL;
|
dock->p->dockbooks = NULL;
|
||||||
dock->priv->ID = dock_ID++;
|
dock->p->ID = dock_ID++;
|
||||||
|
|
||||||
name = g_strdup_printf ("gimp-dock-%d", dock->priv->ID);
|
name = g_strdup_printf ("gimp-dock-%d", dock->p->ID);
|
||||||
gtk_widget_set_name (GTK_WIDGET (dock), name);
|
gtk_widget_set_name (GTK_WIDGET (dock), name);
|
||||||
g_free (name);
|
g_free (name);
|
||||||
|
|
||||||
|
@ -203,16 +203,16 @@ gimp_dock_init (GimpDock *dock)
|
||||||
gtk_window_set_resizable (GTK_WINDOW (dock), TRUE);
|
gtk_window_set_resizable (GTK_WINDOW (dock), TRUE);
|
||||||
gtk_window_set_focus_on_map (GTK_WINDOW (dock), FALSE);
|
gtk_window_set_focus_on_map (GTK_WINDOW (dock), FALSE);
|
||||||
|
|
||||||
dock->priv->main_vbox = gtk_vbox_new (FALSE, 0);
|
dock->p->main_vbox = gtk_vbox_new (FALSE, 0);
|
||||||
gtk_container_add (GTK_CONTAINER (dock), dock->priv->main_vbox);
|
gtk_container_add (GTK_CONTAINER (dock), dock->p->main_vbox);
|
||||||
gtk_widget_show (dock->priv->main_vbox);
|
gtk_widget_show (dock->p->main_vbox);
|
||||||
|
|
||||||
dock->priv->vbox = gtk_vbox_new (FALSE, 0);
|
dock->p->vbox = gtk_vbox_new (FALSE, 0);
|
||||||
gtk_container_add (GTK_CONTAINER (dock->priv->main_vbox), dock->priv->vbox);
|
gtk_container_add (GTK_CONTAINER (dock->p->main_vbox), dock->p->vbox);
|
||||||
gtk_widget_show (dock->priv->vbox);
|
gtk_widget_show (dock->p->vbox);
|
||||||
|
|
||||||
separator = gimp_dock_separator_new (dock, GTK_ANCHOR_NORTH);
|
separator = gimp_dock_separator_new (dock, GTK_ANCHOR_NORTH);
|
||||||
gtk_box_pack_start (GTK_BOX (dock->priv->vbox), separator, FALSE, FALSE, 0);
|
gtk_box_pack_start (GTK_BOX (dock->p->vbox), separator, FALSE, FALSE, 0);
|
||||||
gtk_widget_show (separator);
|
gtk_widget_show (separator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,10 +229,10 @@ gimp_dock_constructor (GType type,
|
||||||
|
|
||||||
dock = GIMP_DOCK (object);
|
dock = GIMP_DOCK (object);
|
||||||
|
|
||||||
g_assert (GIMP_IS_CONTEXT (dock->priv->context));
|
g_assert (GIMP_IS_CONTEXT (dock->p->context));
|
||||||
g_assert (GIMP_IS_DIALOG_FACTORY (dock->priv->dialog_factory));
|
g_assert (GIMP_IS_DIALOG_FACTORY (dock->p->dialog_factory));
|
||||||
|
|
||||||
config = GIMP_GUI_CONFIG (dock->priv->context->gimp->config);
|
config = GIMP_GUI_CONFIG (dock->p->context->gimp->config);
|
||||||
|
|
||||||
gimp_window_set_hint (GTK_WINDOW (dock), config->dock_window_hint);
|
gimp_window_set_hint (GTK_WINDOW (dock), config->dock_window_hint);
|
||||||
|
|
||||||
|
@ -250,11 +250,11 @@ gimp_dock_set_property (GObject *object,
|
||||||
switch (property_id)
|
switch (property_id)
|
||||||
{
|
{
|
||||||
case PROP_CONTEXT:
|
case PROP_CONTEXT:
|
||||||
dock->priv->context = g_value_dup_object (value);
|
dock->p->context = g_value_dup_object (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIALOG_FACTORY:
|
case PROP_DIALOG_FACTORY:
|
||||||
dock->priv->dialog_factory = g_value_get_object (value);
|
dock->p->dialog_factory = g_value_get_object (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -274,11 +274,11 @@ gimp_dock_get_property (GObject *object,
|
||||||
switch (property_id)
|
switch (property_id)
|
||||||
{
|
{
|
||||||
case PROP_CONTEXT:
|
case PROP_CONTEXT:
|
||||||
g_value_set_object (value, dock->priv->context);
|
g_value_set_object (value, dock->p->context);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIALOG_FACTORY:
|
case PROP_DIALOG_FACTORY:
|
||||||
g_value_set_object (value, dock->priv->dialog_factory);
|
g_value_set_object (value, dock->p->dialog_factory);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -292,13 +292,13 @@ gimp_dock_destroy (GtkObject *object)
|
||||||
{
|
{
|
||||||
GimpDock *dock = GIMP_DOCK (object);
|
GimpDock *dock = GIMP_DOCK (object);
|
||||||
|
|
||||||
while (dock->priv->dockbooks)
|
while (dock->p->dockbooks)
|
||||||
gimp_dock_remove_book (dock, GIMP_DOCKBOOK (dock->priv->dockbooks->data));
|
gimp_dock_remove_book (dock, GIMP_DOCKBOOK (dock->p->dockbooks->data));
|
||||||
|
|
||||||
if (dock->priv->context)
|
if (dock->p->context)
|
||||||
{
|
{
|
||||||
g_object_unref (dock->priv->context);
|
g_object_unref (dock->p->context);
|
||||||
dock->priv->context = NULL;
|
dock->p->context = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
||||||
|
@ -312,7 +312,7 @@ gimp_dock_delete_event (GtkWidget *widget,
|
||||||
GList *list;
|
GList *list;
|
||||||
gint n;
|
gint n;
|
||||||
|
|
||||||
for (list = dock->priv->dockbooks, n = 0; list; list = list->next)
|
for (list = dock->p->dockbooks, n = 0; list; list = list->next)
|
||||||
n += gtk_notebook_get_n_pages (GTK_NOTEBOOK (list->data));
|
n += gtk_notebook_get_n_pages (GTK_NOTEBOOK (list->data));
|
||||||
|
|
||||||
if (n > 1)
|
if (n > 1)
|
||||||
|
@ -375,7 +375,7 @@ gimp_dock_style_set (GtkWidget *widget,
|
||||||
"}"
|
"}"
|
||||||
"widget \"gimp-dock-%d.*\" style \"gimp-dock-style\"",
|
"widget \"gimp-dock-%d.*\" style \"gimp-dock-style\"",
|
||||||
font_str,
|
font_str,
|
||||||
GIMP_DOCK (widget)->priv->ID);
|
GIMP_DOCK (widget)->p->ID);
|
||||||
g_free (font_str);
|
g_free (font_str);
|
||||||
|
|
||||||
gtk_rc_parse_string (rc_string);
|
gtk_rc_parse_string (rc_string);
|
||||||
|
@ -396,7 +396,7 @@ static void
|
||||||
gimp_dock_real_book_removed (GimpDock *dock,
|
gimp_dock_real_book_removed (GimpDock *dock,
|
||||||
GimpDockbook *dockbook)
|
GimpDockbook *dockbook)
|
||||||
{
|
{
|
||||||
if (dock->priv->dockbooks == NULL)
|
if (dock->p->dockbooks == NULL)
|
||||||
gtk_widget_destroy (GTK_WIDGET (dock));
|
gtk_widget_destroy (GTK_WIDGET (dock));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -440,7 +440,7 @@ gimp_dock_get_context (GimpDock *dock)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
||||||
|
|
||||||
return dock->priv->context;
|
return dock->p->context;
|
||||||
}
|
}
|
||||||
|
|
||||||
GimpDialogFactory *
|
GimpDialogFactory *
|
||||||
|
@ -448,7 +448,7 @@ gimp_dock_get_dialog_factory (GimpDock *dock)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
||||||
|
|
||||||
return dock->priv->dialog_factory;
|
return dock->p->dialog_factory;
|
||||||
}
|
}
|
||||||
|
|
||||||
GList *
|
GList *
|
||||||
|
@ -456,7 +456,7 @@ gimp_dock_get_dockbooks (GimpDock *dock)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
||||||
|
|
||||||
return dock->priv->dockbooks;
|
return dock->p->dockbooks;
|
||||||
}
|
}
|
||||||
|
|
||||||
GtkWidget *
|
GtkWidget *
|
||||||
|
@ -464,7 +464,7 @@ gimp_dock_get_main_vbox (GimpDock *dock)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
||||||
|
|
||||||
return dock->priv->main_vbox;
|
return dock->p->main_vbox;
|
||||||
}
|
}
|
||||||
|
|
||||||
GtkWidget *
|
GtkWidget *
|
||||||
|
@ -472,7 +472,7 @@ gimp_dock_get_vbox (GimpDock *dock)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
|
||||||
|
|
||||||
return dock->priv->vbox;
|
return dock->p->vbox;
|
||||||
}
|
}
|
||||||
|
|
||||||
gint
|
gint
|
||||||
|
@ -480,7 +480,7 @@ gimp_dock_get_id (GimpDock *dock)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (GIMP_IS_DOCK (dock), 0);
|
g_return_val_if_fail (GIMP_IS_DOCK (dock), 0);
|
||||||
|
|
||||||
return dock->priv->ID;
|
return dock->p->ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -495,7 +495,7 @@ gimp_dock_add (GimpDock *dock,
|
||||||
g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
|
g_return_if_fail (GIMP_IS_DOCKABLE (dockable));
|
||||||
g_return_if_fail (dockable->dockbook == NULL);
|
g_return_if_fail (dockable->dockbook == NULL);
|
||||||
|
|
||||||
dockbook = GIMP_DOCKBOOK (dock->priv->dockbooks->data);
|
dockbook = GIMP_DOCKBOOK (dock->p->dockbooks->data);
|
||||||
|
|
||||||
gimp_dockbook_add (dockbook, dockable, position);
|
gimp_dockbook_add (dockbook, dockable, position);
|
||||||
}
|
}
|
||||||
|
@ -523,23 +523,23 @@ gimp_dock_add_book (GimpDock *dock,
|
||||||
g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
|
g_return_if_fail (GIMP_IS_DOCKBOOK (dockbook));
|
||||||
g_return_if_fail (dockbook->dock == NULL);
|
g_return_if_fail (dockbook->dock == NULL);
|
||||||
|
|
||||||
old_length = g_list_length (dock->priv->dockbooks);
|
old_length = g_list_length (dock->p->dockbooks);
|
||||||
|
|
||||||
if (index >= old_length || index < 0)
|
if (index >= old_length || index < 0)
|
||||||
index = old_length;
|
index = old_length;
|
||||||
|
|
||||||
dockbook->dock = dock;
|
dockbook->dock = dock;
|
||||||
dock->priv->dockbooks = g_list_insert (dock->priv->dockbooks, dockbook, index);
|
dock->p->dockbooks = g_list_insert (dock->p->dockbooks, dockbook, index);
|
||||||
|
|
||||||
if (old_length == 0)
|
if (old_length == 0)
|
||||||
{
|
{
|
||||||
GtkWidget *separator;
|
GtkWidget *separator;
|
||||||
|
|
||||||
gtk_box_pack_start (GTK_BOX (dock->priv->vbox), GTK_WIDGET (dockbook),
|
gtk_box_pack_start (GTK_BOX (dock->p->vbox), GTK_WIDGET (dockbook),
|
||||||
TRUE, TRUE, 0);
|
TRUE, TRUE, 0);
|
||||||
|
|
||||||
separator = gimp_dock_separator_new (dock, GTK_ANCHOR_SOUTH);
|
separator = gimp_dock_separator_new (dock, GTK_ANCHOR_SOUTH);
|
||||||
gtk_box_pack_end (GTK_BOX (dock->priv->vbox), separator, FALSE, FALSE, 0);
|
gtk_box_pack_end (GTK_BOX (dock->p->vbox), separator, FALSE, FALSE, 0);
|
||||||
gtk_widget_show (separator);
|
gtk_widget_show (separator);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -549,9 +549,9 @@ gimp_dock_add_book (GimpDock *dock,
|
||||||
GtkWidget *paned;
|
GtkWidget *paned;
|
||||||
|
|
||||||
if (index == 0)
|
if (index == 0)
|
||||||
old_book = g_list_nth_data (dock->priv->dockbooks, index + 1);
|
old_book = g_list_nth_data (dock->p->dockbooks, index + 1);
|
||||||
else
|
else
|
||||||
old_book = g_list_nth_data (dock->priv->dockbooks, index - 1);
|
old_book = g_list_nth_data (dock->p->dockbooks, index - 1);
|
||||||
|
|
||||||
parent = gtk_widget_get_parent (old_book);
|
parent = gtk_widget_get_parent (old_book);
|
||||||
|
|
||||||
|
@ -613,11 +613,11 @@ gimp_dock_remove_book (GimpDock *dock,
|
||||||
|
|
||||||
g_return_if_fail (dockbook->dock == dock);
|
g_return_if_fail (dockbook->dock == dock);
|
||||||
|
|
||||||
old_length = g_list_length (dock->priv->dockbooks);
|
old_length = g_list_length (dock->p->dockbooks);
|
||||||
index = g_list_index (dock->priv->dockbooks, dockbook);
|
index = g_list_index (dock->p->dockbooks, dockbook);
|
||||||
|
|
||||||
dockbook->dock = NULL;
|
dockbook->dock = NULL;
|
||||||
dock->priv->dockbooks = g_list_remove (dock->priv->dockbooks, dockbook);
|
dock->p->dockbooks = g_list_remove (dock->p->dockbooks, dockbook);
|
||||||
|
|
||||||
g_object_ref (dockbook);
|
g_object_ref (dockbook);
|
||||||
|
|
||||||
|
@ -626,12 +626,12 @@ gimp_dock_remove_book (GimpDock *dock,
|
||||||
GtkWidget *separator;
|
GtkWidget *separator;
|
||||||
GList *children;
|
GList *children;
|
||||||
|
|
||||||
children = gtk_container_get_children (GTK_CONTAINER (dock->priv->vbox));
|
children = gtk_container_get_children (GTK_CONTAINER (dock->p->vbox));
|
||||||
|
|
||||||
separator = g_list_nth_data (children, 2);
|
separator = g_list_nth_data (children, 2);
|
||||||
|
|
||||||
gtk_container_remove (GTK_CONTAINER (dock->priv->vbox), separator);
|
gtk_container_remove (GTK_CONTAINER (dock->p->vbox), separator);
|
||||||
gtk_container_remove (GTK_CONTAINER (dock->priv->vbox), GTK_WIDGET (dockbook));
|
gtk_container_remove (GTK_CONTAINER (dock->p->vbox), GTK_WIDGET (dockbook));
|
||||||
|
|
||||||
g_list_free (children);
|
g_list_free (children);
|
||||||
}
|
}
|
||||||
|
@ -659,7 +659,7 @@ gimp_dock_remove_book (GimpDock *dock,
|
||||||
if (GTK_IS_VPANED (grandparent))
|
if (GTK_IS_VPANED (grandparent))
|
||||||
gtk_paned_pack1 (GTK_PANED (grandparent), other_book, TRUE, FALSE);
|
gtk_paned_pack1 (GTK_PANED (grandparent), other_book, TRUE, FALSE);
|
||||||
else
|
else
|
||||||
gtk_box_pack_start (GTK_BOX (dock->priv->vbox), other_book, TRUE, TRUE, 0);
|
gtk_box_pack_start (GTK_BOX (dock->p->vbox), other_book, TRUE, TRUE, 0);
|
||||||
|
|
||||||
g_object_unref (other_book);
|
g_object_unref (other_book);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,17 +33,17 @@
|
||||||
#define GIMP_DOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCK, GimpDockClass))
|
#define GIMP_DOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DOCK, GimpDockClass))
|
||||||
|
|
||||||
|
|
||||||
typedef struct _GimpDockClass GimpDockClass;
|
typedef struct _GimpDockClass GimpDockClass;
|
||||||
typedef struct _GimpDockPriv GimpDockPriv;
|
typedef struct _GimpDockPrivate GimpDockPrivate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A top-level window containing GimpDockbooks.
|
* A top-level window containing GimpDockbooks.
|
||||||
*/
|
*/
|
||||||
struct _GimpDock
|
struct _GimpDock
|
||||||
{
|
{
|
||||||
GimpWindow parent_instance;
|
GimpWindow parent_instance;
|
||||||
|
|
||||||
GimpDockPriv *priv;
|
GimpDockPrivate *p;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GimpDockClass
|
struct _GimpDockClass
|
||||||
|
|
Loading…
Reference in New Issue