callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make instance members private.

Browse Source 
* app/widgets/gimpdock.[ch]: Make instance members private.

(gimp_dock_get_context)
(gimp_dock_get_dialog_factory)
(gimp_dock_get_dockbooks)
(gimp_dock_get_main_vbox)
(gimp_dock_get_vbox)
(gimp_dock_get_id): New getters.

* app/actions/actions.c
* app/actions/dockable-actions.c
* app/actions/dockable-commands.c
* app/actions/windows-actions.c
* app/menus/windows-menu.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpdock.c
* app/widgets/gimpdock.h
* app/widgets/gimpdockable.c
* app/widgets/gimpdockbook.c
* app/widgets/gimpdockseparator.c
* app/widgets/gimpimagedock.c
* app/widgets/gimpmenudock.c
* app/widgets/gimpsessioninfo-book.c
* app/widgets/gimpsessioninfo-dock.c
* app/widgets/gimpsessioninfo-dockable.c
* app/widgets/gimptoolbox-color-area.c
* app/widgets/gimptoolbox-dnd.c
* app/widgets/gimptoolbox-image-area.c
* app/widgets/gimptoolbox-indicator-area.c
* app/widgets/gimptoolbox.c: Use new getters.

svn path=/trunk/; revision=27881
This commit is contained in:
Martin Nordholts
2009-01-04 10:28:31 +00:00
parent dff24a3d98
commit 7c96452329
22 changed files with 247 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,3 +1,36 @@
2009-01-04 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/gimpdock.[ch]: Make instance members private.
(gimp_dock_get_context)
(gimp_dock_get_dialog_factory)
(gimp_dock_get_dockbooks)
(gimp_dock_get_main_vbox)
(gimp_dock_get_vbox)
(gimp_dock_get_id): New getters.
* app/actions/actions.c
* app/actions/dockable-actions.c
* app/actions/dockable-commands.c
* app/actions/windows-actions.c
* app/menus/windows-menu.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpdock.c
* app/widgets/gimpdock.h
* app/widgets/gimpdockable.c
* app/widgets/gimpdockbook.c
* app/widgets/gimpdockseparator.c
* app/widgets/gimpimagedock.c
* app/widgets/gimpmenudock.c
* app/widgets/gimpsessioninfo-book.c
* app/widgets/gimpsessioninfo-dock.c
* app/widgets/gimpsessioninfo-dockable.c
* app/widgets/gimptoolbox-color-area.c
* app/widgets/gimptoolbox-dnd.c
* app/widgets/gimptoolbox-image-area.c
* app/widgets/gimptoolbox-indicator-area.c
* app/widgets/gimptoolbox.c: Use new getters.
2009-01-03 Martin Nordholts <martinn@svn.gnome.org> 2009-01-03 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/gimpcontainertreeview.c: Format static function * app/widgets/gimpcontainertreeview.c: Format static function

8
app/actions/actions.c
View File

@ -269,7 +269,7 @@ action_data_get_gimp (gpointer data)
else if (GIMP_IS_GIMP (data)) else if (GIMP_IS_GIMP (data))
return data; return data;
else if (GIMP_IS_DOCK (data)) else if (GIMP_IS_DOCK (data))
context = ((GimpDock *) data)->context; context = gimp_dock_get_context (((GimpDock *) data));
else if (GIMP_IS_CONTAINER_VIEW (data)) else if (GIMP_IS_CONTAINER_VIEW (data))
context = gimp_container_view_get_context ((GimpContainerView *) data); context = gimp_container_view_get_context ((GimpContainerView *) data);
else if (GIMP_IS_CONTAINER_EDITOR (data)) else if (GIMP_IS_CONTAINER_EDITOR (data))
@ -296,7 +296,7 @@ action_data_get_context (gpointer data)
else if (GIMP_IS_GIMP (data)) else if (GIMP_IS_GIMP (data))
return gimp_get_user_context (data); return gimp_get_user_context (data);
else if (GIMP_IS_DOCK (data)) else if (GIMP_IS_DOCK (data))
return ((GimpDock *) data)->context; return gimp_dock_get_context ((GimpDock *) data);
else if (GIMP_IS_CONTAINER_VIEW (data)) else if (GIMP_IS_CONTAINER_VIEW (data))
return gimp_container_view_get_context ((GimpContainerView *) data); return gimp_container_view_get_context ((GimpContainerView *) data);
else if (GIMP_IS_CONTAINER_EDITOR (data)) else if (GIMP_IS_CONTAINER_EDITOR (data))
@ -322,7 +322,7 @@ action_data_get_image (gpointer data)
else if (GIMP_IS_GIMP (data)) else if (GIMP_IS_GIMP (data))
context = gimp_get_user_context (data); context = gimp_get_user_context (data);
else if (GIMP_IS_DOCK (data)) else if (GIMP_IS_DOCK (data))
context = ((GimpDock *) data)->context; context = gimp_dock_get_context ((GimpDock *) data);
else if (GIMP_IS_ITEM_TREE_VIEW (data)) else if (GIMP_IS_ITEM_TREE_VIEW (data))
return gimp_item_tree_view_get_image ((GimpItemTreeView *) data); return gimp_item_tree_view_get_image ((GimpItemTreeView *) data);
else if (GIMP_IS_IMAGE_EDITOR (data)) else if (GIMP_IS_IMAGE_EDITOR (data))
@ -349,7 +349,7 @@ action_data_get_display (gpointer data)
else if (GIMP_IS_GIMP (data)) else if (GIMP_IS_GIMP (data))
context = gimp_get_user_context (data); context = gimp_get_user_context (data);
else if (GIMP_IS_DOCK (data)) else if (GIMP_IS_DOCK (data))
context = ((GimpDock *) data)->context; context = gimp_dock_get_context ((GimpDock *) data);
else if (GIMP_IS_NAVIGATION_EDITOR (data)) else if (GIMP_IS_NAVIGATION_EDITOR (data))
context = ((GimpNavigationEditor *) data)->context; context = ((GimpNavigationEditor *) data)->context;

6
app/actions/dockable-actions.c
View File

@ -246,12 +246,12 @@ dockable_actions_update (GimpActionGroup *group,
if (substring) if (substring)
{ {
memcpy (substring, "list", 4); memcpy (substring, "list", 4);
if (gimp_dialog_factory_find_entry (dockbook->dock->dialog_factory, if (gimp_dialog_factory_find_entry (gimp_dock_get_dialog_factory (dockbook->dock),
identifier)) identifier))
list_view_available = TRUE; list_view_available = TRUE;
memcpy (substring, "grid", 4); memcpy (substring, "grid", 4);
if (gimp_dialog_factory_find_entry (dockbook->dock->dialog_factory, if (gimp_dialog_factory_find_entry (gimp_dock_get_dialog_factory (dockbook->dock),
identifier)) identifier))
grid_view_available = TRUE; grid_view_available = TRUE;
} }
@ -267,7 +267,7 @@ dockable_actions_update (GimpActionGroup *group,
tab_style = dockable->tab_style; tab_style = dockable->tab_style;
n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (dockbook)); n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (dockbook));
n_books = g_list_length (dockbook->dock->dockbooks); n_books = g_list_length (gimp_dock_get_dockbooks (dockbook->dock));
#define SET_ACTIVE(action,active) \ #define SET_ACTIVE(action,active) \
gimp_action_group_set_action_active (group, action, (active) != 0) gimp_action_group_set_action_active (group, action, (active) != 0)

4
app/actions/dockable-commands.c
View File

@ -66,7 +66,7 @@ dockable_add_tab_cmd_callback (GtkAction *action,
*p = '\0'; *p = '\0';
dockable = dockable =
gimp_dialog_factory_dockable_new (dockbook->dock->dialog_factory, gimp_dialog_factory_dockable_new (gimp_dock_get_dialog_factory (dockbook->dock),
dockbook->dock, dockbook->dock,
identifier, -1); identifier, -1);
@ -180,7 +180,7 @@ dockable_toggle_view_cmd_callback (GtkAction *action,
new_dockable = new_dockable =
gimp_dialog_factory_dockable_new (dockbook->dock->dialog_factory, gimp_dialog_factory_dockable_new (gimp_dock_get_dialog_factory (dockbook->dock),
dockbook->dock, dockbook->dock,
identifier, identifier,
view_size); view_size);

6
app/actions/windows-actions.c
View File

@ -273,7 +273,7 @@ windows_actions_dock_added (GimpDialogFactory *factory,
GtkAction *action; GtkAction *action;
GimpActionEntry entry; GimpActionEntry entry;
gchar *action_name = g_strdup_printf ("windows-dock-%04d", gchar *action_name = g_strdup_printf ("windows-dock-%04d",
dock->ID); gimp_dock_get_id (dock));
entry.name = action_name; entry.name = action_name;
entry.stock_id = NULL; entry.stock_id = NULL;
@ -310,7 +310,7 @@ windows_actions_dock_removed (GimpDialogFactory *factory,
GimpActionGroup *group) GimpActionGroup *group)
{ {
GtkAction *action; GtkAction *action;
gchar *action_name = g_strdup_printf ("windows-dock-%04d", dock->ID); gchar *action_name = g_strdup_printf ("windows-dock-%04d", gimp_dock_get_id (dock));
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), action_name); action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), action_name);
@ -328,7 +328,7 @@ windows_actions_dock_notify (GimpDock *dock,
GtkAction *action; GtkAction *action;
gchar *action_name; gchar *action_name;
action_name = g_strdup_printf ("windows-dock-%04d", dock->ID); action_name = g_strdup_printf ("windows-dock-%04d", gimp_dock_get_id (dock));
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), action_name); action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), action_name);
g_free (action_name); g_free (action_name);

6
app/menus/windows-menu.c
View File

@ -256,10 +256,10 @@ windows_menu_dock_added (GimpDialogFactory *factory,
ui_path = g_object_get_data (G_OBJECT (manager), "image-menu-ui-path"); ui_path = g_object_get_data (G_OBJECT (manager), "image-menu-ui-path");
action_name = g_strdup_printf ("windows-dock-%04d", dock->ID); action_name = g_strdup_printf ("windows-dock-%04d", gimp_dock_get_id (dock));
action_path = g_strdup_printf ("%s/Windows/Docks", ui_path); action_path = g_strdup_printf ("%s/Windows/Docks", ui_path);
merge_key = g_strdup_printf ("windows-dock-%04d-merge-id", dock->ID); merge_key = g_strdup_printf ("windows-dock-%04d-merge-id", gimp_dock_get_id (dock));
merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (manager)); merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (manager));
g_object_set_data (G_OBJECT (manager), merge_key, g_object_set_data (G_OBJECT (manager), merge_key,
@ -280,7 +280,7 @@ windows_menu_dock_removed (GimpDialogFactory *factory,
GimpDock *dock, GimpDock *dock,
GimpUIManager *manager) GimpUIManager *manager)
{ {
gchar *merge_key = g_strdup_printf ("windows-dock-%04d-merge-id", dock->ID); gchar *merge_key = g_strdup_printf ("windows-dock-%04d-merge-id", gimp_dock_get_id (dock));
guint merge_id; guint merge_id;
merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager), merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),

4
app/widgets/gimpdialogfactory.c
View File

@ -480,7 +480,7 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
view_size); view_size);
else if (dock) else if (dock)
dialog = factory->constructor (factory, entry, dialog = factory->constructor (factory, entry,
GIMP_DOCK (dock)->context, gimp_dock_get_context (GIMP_DOCK (dock)),
view_size); view_size);
else else
dialog = factory->constructor (factory, entry, dialog = factory->constructor (factory, entry,
@ -706,7 +706,7 @@ gimp_dialog_factory_dockable_new (GimpDialogFactory *factory,
return gimp_dialog_factory_dialog_new_internal (factory, return gimp_dialog_factory_dialog_new_internal (factory,
gtk_widget_get_screen (GTK_WIDGET (dock)), gtk_widget_get_screen (GTK_WIDGET (dock)),
dock->context, gimp_dock_get_context (dock),
identifier, identifier,
view_size, view_size,
FALSE, FALSE,

149
app/widgets/gimpdock.c
View File

@ -65,6 +65,20 @@ enum
}; };
struct _GimpDockPriv
{
GimpDialogFactory *dialog_factory;
GimpContext *context;
GtkWidget *main_vbox;
GtkWidget *vbox;
GList *dockbooks;
gint ID; /* for themeing */
};
static GObject * gimp_dock_constructor (GType type, static GObject * gimp_dock_constructor (GType type,
guint n_params, guint n_params,
GObjectConstructParam *params); GObjectConstructParam *params);
@ -163,6 +177,8 @@ gimp_dock_class_init (GimpDockClass *klass)
G_MAXDOUBLE, G_MAXDOUBLE,
DEFAULT_DOCK_FONT_SCALE, DEFAULT_DOCK_FONT_SCALE,
GIMP_PARAM_READABLE)); GIMP_PARAM_READABLE));
g_type_class_add_private (klass, sizeof (GimpDockPriv));
} }
static void static void
@ -172,12 +188,15 @@ gimp_dock_init (GimpDock *dock)
GtkWidget *separator; GtkWidget *separator;
gchar *name; gchar *name;
dock->context = NULL; dock->priv = G_TYPE_INSTANCE_GET_PRIVATE (dock,
dock->dialog_factory = NULL; GIMP_TYPE_DOCK,
dock->dockbooks = NULL; GimpDockPriv);
dock->ID = dock_ID++; dock->priv->context = NULL;
dock->priv->dialog_factory = NULL;
dock->priv->dockbooks = NULL;
dock->priv->ID = dock_ID++;
name = g_strdup_printf ("gimp-dock-%d", dock->ID); name = g_strdup_printf ("gimp-dock-%d", dock->priv->ID);
gtk_widget_set_name (GTK_WIDGET (dock), name); gtk_widget_set_name (GTK_WIDGET (dock), name);
g_free (name); g_free (name);
@ -185,16 +204,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->main_vbox = gtk_vbox_new (FALSE, 0); dock->priv->main_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (dock), dock->main_vbox); gtk_container_add (GTK_CONTAINER (dock), dock->priv->main_vbox);
gtk_widget_show (dock->main_vbox); gtk_widget_show (dock->priv->main_vbox);
dock->vbox = gtk_vbox_new (FALSE, 0); dock->priv->vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (dock->main_vbox), dock->vbox); gtk_container_add (GTK_CONTAINER (dock->priv->main_vbox), dock->priv->vbox);
gtk_widget_show (dock->vbox); gtk_widget_show (dock->priv->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->vbox), separator, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (dock->priv->vbox), separator, FALSE, FALSE, 0);
gtk_widget_show (separator); gtk_widget_show (separator);
} }
@ -211,10 +230,10 @@ gimp_dock_constructor (GType type,
dock = GIMP_DOCK (object); dock = GIMP_DOCK (object);
g_assert (GIMP_IS_CONTEXT (dock->context)); g_assert (GIMP_IS_CONTEXT (dock->priv->context));
g_assert (GIMP_IS_DIALOG_FACTORY (dock->dialog_factory)); g_assert (GIMP_IS_DIALOG_FACTORY (dock->priv->dialog_factory));
config = GIMP_GUI_CONFIG (dock->context->gimp->config); config = GIMP_GUI_CONFIG (dock->priv->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);
@ -232,11 +251,11 @@ gimp_dock_set_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_CONTEXT: case PROP_CONTEXT:
dock->context = g_value_dup_object (value); dock->priv->context = g_value_dup_object (value);
break; break;
case PROP_DIALOG_FACTORY: case PROP_DIALOG_FACTORY:
dock->dialog_factory = g_value_get_object (value); dock->priv->dialog_factory = g_value_get_object (value);
break; break;
default: default:
@ -256,11 +275,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->context); g_value_set_object (value, dock->priv->context);
break; break;
case PROP_DIALOG_FACTORY: case PROP_DIALOG_FACTORY:
g_value_set_object (value, dock->dialog_factory); g_value_set_object (value, dock->priv->dialog_factory);
break; break;
default: default:
@ -274,13 +293,13 @@ gimp_dock_destroy (GtkObject *object)
{ {
GimpDock *dock = GIMP_DOCK (object); GimpDock *dock = GIMP_DOCK (object);
while (dock->dockbooks) while (dock->priv->dockbooks)
gimp_dock_remove_book (dock, GIMP_DOCKBOOK (dock->dockbooks->data)); gimp_dock_remove_book (dock, GIMP_DOCKBOOK (dock->priv->dockbooks->data));
if (dock->context) if (dock->priv->context)
{ {
g_object_unref (dock->context); g_object_unref (dock->priv->context);
dock->context = NULL; dock->priv->context = NULL;
} }
GTK_OBJECT_CLASS (parent_class)->destroy (object); GTK_OBJECT_CLASS (parent_class)->destroy (object);
@ -294,7 +313,7 @@ gimp_dock_delete_event (GtkWidget *widget,
GList *list; GList *list;
gint n; gint n;
for (list = dock->dockbooks, n = 0; list; list = list->next) for (list = dock->priv->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)
@ -357,7 +376,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)->ID); GIMP_DOCK (widget)->priv->ID);
g_free (font_str); g_free (font_str);
gtk_rc_parse_string (rc_string); gtk_rc_parse_string (rc_string);
@ -378,7 +397,7 @@ static void
gimp_dock_real_book_removed (GimpDock *dock, gimp_dock_real_book_removed (GimpDock *dock,
GimpDockbook *dockbook) GimpDockbook *dockbook)
{ {
if (dock->dockbooks == NULL) if (dock->priv->dockbooks == NULL)
gtk_widget_destroy (GTK_WIDGET (dock)); gtk_widget_destroy (GTK_WIDGET (dock));
} }
@ -417,6 +436,54 @@ gimp_dock_get_aux_info (GimpDock *dock)
return NULL; return NULL;
} }
GimpContext *
gimp_dock_get_context (GimpDock *dock)
{
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
return dock->priv->context;
}
GimpDialogFactory *
gimp_dock_get_dialog_factory (GimpDock *dock)
{
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
return dock->priv->dialog_factory;
}
GList *
gimp_dock_get_dockbooks (GimpDock *dock)
{
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
return dock->priv->dockbooks;
}
GtkWidget *
gimp_dock_get_main_vbox (GimpDock *dock)
{
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
return dock->priv->main_vbox;
}
GtkWidget *
gimp_dock_get_vbox (GimpDock *dock)
{
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
return dock->priv->vbox;
}
gint
gimp_dock_get_id (GimpDock *dock)
{
g_return_val_if_fail (GIMP_IS_DOCK (dock), 0);
return dock->priv->ID;
}
void void
gimp_dock_add (GimpDock *dock, gimp_dock_add (GimpDock *dock,
GimpDockable *dockable, GimpDockable *dockable,
@ -429,7 +496,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->dockbooks->data); dockbook = GIMP_DOCKBOOK (dock->priv->dockbooks->data);
gimp_dockbook_add (dockbook, dockable, position); gimp_dockbook_add (dockbook, dockable, position);
} }
@ -457,23 +524,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->dockbooks); old_length = g_list_length (dock->priv->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->dockbooks = g_list_insert (dock->dockbooks, dockbook, index); dock->priv->dockbooks = g_list_insert (dock->priv->dockbooks, dockbook, index);
if (old_length == 0) if (old_length == 0)
{ {
GtkWidget *separator; GtkWidget *separator;
gtk_box_pack_start (GTK_BOX (dock->vbox), GTK_WIDGET (dockbook), gtk_box_pack_start (GTK_BOX (dock->priv->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->vbox), separator, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (dock->priv->vbox), separator, FALSE, FALSE, 0);
gtk_widget_show (separator); gtk_widget_show (separator);
} }
else else
@ -483,9 +550,9 @@ gimp_dock_add_book (GimpDock *dock,
GtkWidget *paned; GtkWidget *paned;
if (index == 0) if (index == 0)
old_book = g_list_nth_data (dock->dockbooks, index + 1); old_book = g_list_nth_data (dock->priv->dockbooks, index + 1);
else else
old_book = g_list_nth_data (dock->dockbooks, index - 1); old_book = g_list_nth_data (dock->priv->dockbooks, index - 1);
parent = gtk_widget_get_parent (old_book); parent = gtk_widget_get_parent (old_book);
@ -547,11 +614,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->dockbooks); old_length = g_list_length (dock->priv->dockbooks);
index = g_list_index (dock->dockbooks, dockbook); index = g_list_index (dock->priv->dockbooks, dockbook);
dockbook->dock = NULL; dockbook->dock = NULL;
dock->dockbooks = g_list_remove (dock->dockbooks, dockbook); dock->priv->dockbooks = g_list_remove (dock->priv->dockbooks, dockbook);
g_object_ref (dockbook); g_object_ref (dockbook);
@ -560,12 +627,12 @@ gimp_dock_remove_book (GimpDock *dock,
GtkWidget *separator; GtkWidget *separator;
GList *children; GList *children;
children = gtk_container_get_children (GTK_CONTAINER (dock->vbox)); children = gtk_container_get_children (GTK_CONTAINER (dock->priv->vbox));
separator = g_list_nth_data (children, 2); separator = g_list_nth_data (children, 2);
gtk_container_remove (GTK_CONTAINER (dock->vbox), separator); gtk_container_remove (GTK_CONTAINER (dock->priv->vbox), separator);
gtk_container_remove (GTK_CONTAINER (dock->vbox), GTK_WIDGET (dockbook)); gtk_container_remove (GTK_CONTAINER (dock->priv->vbox), GTK_WIDGET (dockbook));
g_list_free (children); g_list_free (children);
} }
@ -593,7 +660,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->vbox), other_book, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (dock->priv->vbox), other_book, TRUE, TRUE, 0);
g_object_unref (other_book); g_object_unref (other_book);
} }

53
app/widgets/gimpdock.h
View File

@ -35,20 +35,13 @@
typedef struct _GimpDockClass GimpDockClass; typedef struct _GimpDockClass GimpDockClass;
typedef struct _GimpDockPriv GimpDockPriv;
struct _GimpDock struct _GimpDock
{ {
GimpWindow parent_instance; GimpWindow parent_instance;
GimpDialogFactory *dialog_factory; GimpDockPriv *priv;
GimpContext *context;
GtkWidget *main_vbox;
GtkWidget *vbox;
GList *dockbooks;
gint ID; /* for themeing */
}; };
struct _GimpDockClass struct _GimpDockClass
@ -70,26 +63,32 @@ struct _GimpDockClass
}; };
GType gimp_dock_get_type (void) G_GNUC_CONST; GType gimp_dock_get_type (void) G_GNUC_CONST;
void gimp_dock_setup (GimpDock *dock, void gimp_dock_setup (GimpDock *dock,
const GimpDock *template); const GimpDock *template);
void gimp_dock_set_aux_info (GimpDock *dock, void gimp_dock_set_aux_info (GimpDock *dock,
GList *aux_info); GList *aux_info);
GList * gimp_dock_get_aux_info (GimpDock *dock); GList * gimp_dock_get_aux_info (GimpDock *dock);
GimpContext * gimp_dock_get_context (GimpDock *dock);
GimpDialogFactory * gimp_dock_get_dialog_factory (GimpDock *dock);
GList * gimp_dock_get_dockbooks (GimpDock *dock);
GtkWidget * gimp_dock_get_main_vbox (GimpDock *dock);
GtkWidget * gimp_dock_get_vbox (GimpDock *dock);
gint gimp_dock_get_id (GimpDock *dock);
void gimp_dock_add (GimpDock *dock, void gimp_dock_add (GimpDock *dock,
GimpDockable *dockable, GimpDockable *dockable,
gint book, gint book,
gint index); gint index);
void gimp_dock_remove (GimpDock *dock, void gimp_dock_remove (GimpDock *dock,
GimpDockable *dockable); GimpDockable *dockable);
void gimp_dock_add_book (GimpDock *dock, void gimp_dock_add_book (GimpDock *dock,
GimpDockbook *dockbook, GimpDockbook *dockbook,
gint index); gint index);
void gimp_dock_remove_book (GimpDock *dock, void gimp_dock_remove_book (GimpDock *dock,
GimpDockbook *dockbook); GimpDockbook *dockbook);
#endif /* __GIMP_DOCK_H__ */ #endif /* __GIMP_DOCK_H__ */

4
app/widgets/gimpdockable.c
View File

@ -1001,12 +1001,12 @@ gimp_dockable_detach (GimpDockable *dockable)
src_dock = dockable->dockbook->dock; src_dock = dockable->dockbook->dock;
dock = gimp_dialog_factory_dock_new (src_dock->dialog_factory, dock = gimp_dialog_factory_dock_new (gimp_dock_get_dialog_factory (src_dock),
gtk_widget_get_screen (GTK_WIDGET (dockable))); gtk_widget_get_screen (GTK_WIDGET (dockable)));
gtk_window_set_position (GTK_WINDOW (dock), GTK_WIN_POS_MOUSE); gtk_window_set_position (GTK_WINDOW (dock), GTK_WIN_POS_MOUSE);
gimp_dock_setup (GIMP_DOCK (dock), src_dock); gimp_dock_setup (GIMP_DOCK (dock), src_dock);
dockbook = gimp_dockbook_new (GIMP_DOCK (dock)->dialog_factory->menu_factory); dockbook = gimp_dockbook_new (gimp_dock_get_dialog_factory (GIMP_DOCK (dock))->menu_factory);
gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0); gimp_dock_add_book (GIMP_DOCK (dock), GIMP_DOCKBOOK (dockbook), 0);

6
app/widgets/gimpdockbook.c
View File

@ -348,7 +348,7 @@ gimp_dockbook_add (GimpDockbook *dockbook,
g_return_if_fail (GTK_IS_WIDGET (tab_widget)); g_return_if_fail (GTK_IS_WIDGET (tab_widget));
menu_widget = gimp_dockable_get_tab_widget (dockable, menu_widget = gimp_dockable_get_tab_widget (dockable,
dockbook->dock->context, gimp_dock_get_context (dockbook->dock),
GIMP_TAB_STYLE_ICON_BLURB, GIMP_TAB_STYLE_ICON_BLURB,
MENU_WIDGET_ICON_SIZE); MENU_WIDGET_ICON_SIZE);
@ -374,7 +374,7 @@ gimp_dockbook_add (GimpDockbook *dockbook,
dockable->dockbook = dockbook; dockable->dockbook = dockbook;
gimp_dockable_set_context (dockable, dockbook->dock->context); gimp_dockable_set_context (dockable, gimp_dock_get_context (dockbook->dock));
g_signal_connect (dockable, "notify::locked", g_signal_connect (dockable, "notify::locked",
G_CALLBACK (gimp_dockbook_tab_locked_notify), G_CALLBACK (gimp_dockbook_tab_locked_notify),
@ -433,7 +433,7 @@ gimp_dockbook_create_tab_widget (GimpDockbook *dockbook,
NULL); NULL);
tab_widget = gimp_dockable_get_tab_widget (dockable, tab_widget = gimp_dockable_get_tab_widget (dockable,
dockbook->dock->context, gimp_dock_get_context (dockbook->dock),
dockable->tab_style, dockable->tab_style,
tab_size); tab_size);

4
app/widgets/gimpdockseparator.c
View File

@ -215,7 +215,7 @@ gimp_dock_separator_drag_drop (GtkWidget *widget,
gint n_books; gint n_books;
gint n_dockables; gint n_dockables;
n_books = g_list_length (dock->dockbooks); n_books = g_list_length (gimp_dock_get_dockbooks (dock));
children = children =
gtk_container_get_children (GTK_CONTAINER (dockable->dockbook)); gtk_container_get_children (GTK_CONTAINER (dockable->dockbook));
@ -230,7 +230,7 @@ gimp_dock_separator_drag_drop (GtkWidget *widget,
gimp_dockbook_remove (dockable->dockbook, dockable); gimp_dockbook_remove (dockable->dockbook, dockable);
dockbook = gimp_dockbook_new (dock->dialog_factory->menu_factory); dockbook = gimp_dockbook_new (gimp_dock_get_dialog_factory (dock)->menu_factory);
gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), index); gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), index);
gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, -1); gimp_dockbook_add (GIMP_DOCKBOOK (dockbook), dockable, -1);

20
app/widgets/gimpimagedock.c
View File

@ -94,10 +94,10 @@ gimp_image_dock_constructor (GType type,
dock = GIMP_IMAGE_DOCK (object); dock = GIMP_IMAGE_DOCK (object);
config = GIMP_GUI_CONFIG (GIMP_DOCK (dock)->context->gimp->config); config = GIMP_GUI_CONFIG (gimp_dock_get_context (GIMP_DOCK (dock))->gimp->config);
dock->ui_manager = dock->ui_manager =
gimp_menu_factory_manager_new (GIMP_DOCK (dock)->dialog_factory->menu_factory, gimp_menu_factory_manager_new (gimp_dock_get_dialog_factory (GIMP_DOCK (dock))->menu_factory,
GIMP_IMAGE_DOCK_GET_CLASS (dock)->ui_manager_name, GIMP_IMAGE_DOCK_GET_CLASS (dock)->ui_manager_name,
dock, dock,
config->tearoff_menus); config->tearoff_menus);
@ -108,15 +108,15 @@ gimp_image_dock_constructor (GType type,
gtk_window_add_accel_group (GTK_WINDOW (object), accel_group); gtk_window_add_accel_group (GTK_WINDOW (object), accel_group);
dock->image_flush_handler_id = dock->image_flush_handler_id =
gimp_container_add_handler (GIMP_DOCK (dock)->context->gimp->images, "flush", gimp_container_add_handler (gimp_dock_get_context (GIMP_DOCK (dock))->gimp->images, "flush",
G_CALLBACK (gimp_image_dock_image_flush), G_CALLBACK (gimp_image_dock_image_flush),
dock); dock);
g_signal_connect_object (GIMP_DOCK (dock)->context, "display-changed", g_signal_connect_object (gimp_dock_get_context (GIMP_DOCK (dock)), "display-changed",
G_CALLBACK (gimp_image_dock_display_changed), G_CALLBACK (gimp_image_dock_display_changed),
dock, 0); dock, 0);
g_signal_connect_object (GIMP_DOCK (dock)->context->gimp->config, g_signal_connect_object (gimp_dock_get_context (GIMP_DOCK (dock))->gimp->config,
"notify::transient-docks", "notify::transient-docks",
G_CALLBACK (gimp_image_dock_notify_transient), G_CALLBACK (gimp_image_dock_notify_transient),
dock, 0); dock, 0);
@ -131,7 +131,7 @@ gimp_image_dock_destroy (GtkObject *object)
if (dock->image_flush_handler_id) if (dock->image_flush_handler_id)
{ {
gimp_container_remove_handler (GIMP_DOCK (dock)->context->gimp->images, gimp_container_remove_handler (gimp_dock_get_context (GIMP_DOCK (dock))->gimp->images,
dock->image_flush_handler_id); dock->image_flush_handler_id);
dock->image_flush_handler_id = 0; dock->image_flush_handler_id = 0;
} }
@ -171,9 +171,9 @@ gimp_image_dock_image_flush (GimpImage *image,
gboolean invalidate_preview, gboolean invalidate_preview,
GimpImageDock *dock) GimpImageDock *dock)
{ {
if (image == gimp_context_get_image (GIMP_DOCK (dock)->context)) if (image == gimp_context_get_image (gimp_dock_get_context (GIMP_DOCK (dock))))
{ {
GimpObject *display = gimp_context_get_display (GIMP_DOCK (dock)->context); GimpObject *display = gimp_context_get_display (gimp_dock_get_context (GIMP_DOCK (dock)));
if (display) if (display)
gimp_ui_manager_update (dock->ui_manager, display); gimp_ui_manager_update (dock->ui_manager, display);
@ -187,8 +187,8 @@ gimp_image_dock_notify_transient (GimpConfig *config,
{ {
if (GIMP_GUI_CONFIG (config)->transient_docks) if (GIMP_GUI_CONFIG (config)->transient_docks)
{ {
gimp_image_dock_display_changed (dock->context, gimp_image_dock_display_changed (gimp_dock_get_context (dock),
gimp_context_get_display (dock->context), gimp_context_get_display (gimp_dock_get_context (dock)),
GIMP_IMAGE_DOCK (dock)); GIMP_IMAGE_DOCK (dock));
} }
else else

18
app/widgets/gimpmenudock.c
View File

@ -140,9 +140,9 @@ gimp_menu_dock_init (GimpMenuDock *dock)
dock->update_title_idle_id = 0; dock->update_title_idle_id = 0;
hbox = gtk_hbox_new (FALSE, 2); hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (GIMP_DOCK (dock)->main_vbox), hbox, gtk_box_pack_start (GTK_BOX (gimp_dock_get_main_vbox (GIMP_DOCK (dock))), hbox,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_box_reorder_child (GTK_BOX (GIMP_DOCK (dock)->main_vbox), hbox, 0); gtk_box_reorder_child (GTK_BOX (gimp_dock_get_main_vbox (GIMP_DOCK (dock))), hbox, 0);
if (dock->show_image_menu) if (dock->show_image_menu)
gtk_widget_show (hbox); gtk_widget_show (hbox);
@ -202,12 +202,12 @@ gimp_menu_dock_destroy (GtkObject *object)
/* remove the image menu and the auto button manually here because /* remove the image menu and the auto button manually here because
* of weird cross-connections with GimpDock's context * of weird cross-connections with GimpDock's context
*/ */
if (GIMP_DOCK (dock)->main_vbox && dock->image_combo) if (gimp_dock_get_main_vbox (GIMP_DOCK (dock)) && dock->image_combo)
{ {
GtkWidget *parent = gtk_widget_get_parent (dock->image_combo); GtkWidget *parent = gtk_widget_get_parent (dock->image_combo);
if (parent) if (parent)
gtk_container_remove (GTK_CONTAINER (GIMP_DOCK (dock)->main_vbox), gtk_container_remove (GTK_CONTAINER (gimp_dock_get_main_vbox (GIMP_DOCK (dock))),
parent); parent);
} }
@ -486,7 +486,7 @@ gimp_menu_dock_update_title_idle (GimpMenuDock *menu_dock)
title = g_string_new (NULL); title = g_string_new (NULL);
for (list = GIMP_DOCK (menu_dock)->dockbooks; for (list = gimp_dock_get_dockbooks (GIMP_DOCK (menu_dock));
list; list;
list = g_list_next (list)) list = g_list_next (list))
{ {
@ -540,7 +540,7 @@ gimp_menu_dock_factory_display_changed (GimpContext *context,
GimpMenuDock *menu_dock = GIMP_MENU_DOCK (dock); GimpMenuDock *menu_dock = GIMP_MENU_DOCK (dock);
if (display && menu_dock->auto_follow_active) if (display && menu_dock->auto_follow_active)
gimp_context_set_display (dock->context, display); gimp_context_set_display (gimp_dock_get_context (dock), display);
} }
static void static void
@ -552,7 +552,7 @@ gimp_menu_dock_factory_image_changed (GimpContext *context,
/* won't do anything if we already set the display above */ /* won't do anything if we already set the display above */
if (image && menu_dock->auto_follow_active) if (image && menu_dock->auto_follow_active)
gimp_context_set_image (dock->context, image); gimp_context_set_image (gimp_dock_get_context (dock), image);
} }
static void static void
@ -645,8 +645,8 @@ gimp_menu_dock_auto_clicked (GtkWidget *widget,
if (menu_dock->auto_follow_active) if (menu_dock->auto_follow_active)
{ {
gimp_context_copy_properties (dock->dialog_factory->context, gimp_context_copy_properties (gimp_dock_get_dialog_factory (dock)->context,
dock->context, gimp_dock_get_context (dock),
GIMP_CONTEXT_DISPLAY_MASK | GIMP_CONTEXT_DISPLAY_MASK |
GIMP_CONTEXT_IMAGE_MASK); GIMP_CONTEXT_IMAGE_MASK);
} }

2
app/widgets/gimpsessioninfo-book.c
View File

@ -243,7 +243,7 @@ gimp_session_info_book_restore (GimpSessionInfoBook *info,
g_return_val_if_fail (info != NULL, NULL); g_return_val_if_fail (info != NULL, NULL);
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL); g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
dockbook = gimp_dockbook_new (dock->dialog_factory->menu_factory); dockbook = gimp_dockbook_new (gimp_dock_get_dialog_factory (dock)->menu_factory);
gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), -1); gimp_dock_add_book (dock, GIMP_DOCKBOOK (dockbook), -1);

2
app/widgets/gimpsessioninfo-dock.c
View File

@ -133,7 +133,7 @@ gimp_session_info_dock_from_widget (GimpDock *dock)
g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL); g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL);
for (list = dock->dockbooks; list; list = g_list_next (list)) for (list = gimp_dock_get_dockbooks (dock); list; list = g_list_next (list))
{ {
GimpSessionInfoBook *book; GimpSessionInfoBook *book;

2
app/widgets/gimpsessioninfo-dockable.c
View File

@ -286,7 +286,7 @@ gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
* because it may be different from the dialog factory * because it may be different from the dialog factory
* the dock was created from. * the dock was created from.
*/ */
dockable = gimp_dialog_factory_dockable_new (dock->dialog_factory, dockable = gimp_dialog_factory_dockable_new (gimp_dock_get_dialog_factory (dock),
dock, dock,
info->identifier, info->identifier,
info->view_size); info->view_size);

2
app/widgets/gimptoolbox-color-area.c
View File

@ -68,7 +68,7 @@ gimp_toolbox_color_area_create (GimpToolbox *toolbox,
g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL); g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
context = GIMP_DOCK (toolbox)->context; context = gimp_dock_get_context (GIMP_DOCK (toolbox));
color_area = gimp_fg_bg_editor_new (context); color_area = gimp_fg_bg_editor_new (context);
gtk_widget_set_size_request (color_area, width, height); gtk_widget_set_size_request (color_area, width, height);

18
app/widgets/gimptoolbox-dnd.c
View File

@ -96,33 +96,33 @@ gimp_toolbox_dnd_init (GimpToolbox *toolbox)
gimp_dnd_uri_list_dest_add (GTK_WIDGET (toolbox), gimp_dnd_uri_list_dest_add (GTK_WIDGET (toolbox),
gimp_toolbox_drop_uri_list, gimp_toolbox_drop_uri_list,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_uri_list_dest_add (toolbox->vbox, gimp_dnd_uri_list_dest_add (toolbox->vbox,
gimp_toolbox_drop_uri_list, gimp_toolbox_drop_uri_list,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_LAYER, gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_LAYER,
gimp_toolbox_drop_drawable, gimp_toolbox_drop_drawable,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_LAYER_MASK, gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_LAYER_MASK,
gimp_toolbox_drop_drawable, gimp_toolbox_drop_drawable,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_CHANNEL, gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_CHANNEL,
gimp_toolbox_drop_drawable, gimp_toolbox_drop_drawable,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_TOOL_INFO, gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_TOOL_INFO,
gimp_toolbox_drop_tool, gimp_toolbox_drop_tool,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_BUFFER, gimp_dnd_viewable_dest_add (toolbox->vbox, GIMP_TYPE_BUFFER,
gimp_toolbox_drop_buffer, gimp_toolbox_drop_buffer,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_component_dest_add (toolbox->vbox, gimp_dnd_component_dest_add (toolbox->vbox,
gimp_toolbox_drop_component, gimp_toolbox_drop_component,
dock->context); gimp_dock_get_context (dock));
gimp_dnd_pixbuf_dest_add (toolbox->vbox, gimp_dnd_pixbuf_dest_add (toolbox->vbox,
gimp_toolbox_drop_pixbuf, gimp_toolbox_drop_pixbuf,
dock->context); gimp_dock_get_context (dock));
} }

4
app/widgets/gimptoolbox-image-area.c
View File

@ -45,7 +45,7 @@ image_preview_clicked (GtkWidget *widget,
GdkModifierType state, GdkModifierType state,
GimpToolbox *toolbox) GimpToolbox *toolbox)
{ {
gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory, gimp_dialog_factory_dialog_raise (gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-image-list|gimp-image-grid", -1); "gimp-image-list|gimp-image-grid", -1);
} }
@ -92,7 +92,7 @@ gimp_toolbox_image_area_create (GimpToolbox *toolbox,
g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL); g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
context = GIMP_DOCK (toolbox)->context; context = gimp_dock_get_context (GIMP_DOCK (toolbox));
image_view = gimp_view_new_full_by_types (context, image_view = gimp_view_new_full_by_types (context,
GIMP_TYPE_VIEW, GIMP_TYPE_IMAGE, GIMP_TYPE_VIEW, GIMP_TYPE_IMAGE,

8
app/widgets/gimptoolbox-indicator-area.c
View File

@ -52,7 +52,7 @@ brush_preview_clicked (GtkWidget *widget,
GdkModifierType state, GdkModifierType state,
GimpToolbox *toolbox) GimpToolbox *toolbox)
{ {
gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory, gimp_dialog_factory_dialog_raise (gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-brush-grid|gimp-brush-list", -1); "gimp-brush-grid|gimp-brush-list", -1);
} }
@ -74,7 +74,7 @@ pattern_preview_clicked (GtkWidget *widget,
GdkModifierType state, GdkModifierType state,
GimpToolbox *toolbox) GimpToolbox *toolbox)
{ {
gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory, gimp_dialog_factory_dialog_raise (gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-pattern-grid|gimp-pattern-list", -1); "gimp-pattern-grid|gimp-pattern-list", -1);
} }
@ -96,7 +96,7 @@ gradient_preview_clicked (GtkWidget *widget,
GdkModifierType state, GdkModifierType state,
GimpToolbox *toolbox) GimpToolbox *toolbox)
{ {
gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory, gimp_dialog_factory_dialog_raise (gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-gradient-list|gimp-gradient-grid", -1); "gimp-gradient-list|gimp-gradient-grid", -1);
} }
@ -127,7 +127,7 @@ gimp_toolbox_indicator_area_create (GimpToolbox *toolbox)
g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL); g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
context = GIMP_DOCK (toolbox)->context; context = gimp_dock_get_context (GIMP_DOCK (toolbox));
indicator_table = gtk_table_new (2, 2, FALSE); indicator_table = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (indicator_table), CELL_SPACING); gtk_table_set_row_spacings (GTK_TABLE (indicator_table), CELL_SPACING);

36
app/widgets/gimptoolbox.c
View File

@ -197,12 +197,12 @@ gimp_toolbox_constructor (GType type,
toolbox = GIMP_TOOLBOX (object); toolbox = GIMP_TOOLBOX (object);
context = GIMP_DOCK (toolbox)->context; context = gimp_dock_get_context (GIMP_DOCK (toolbox));
config = GIMP_GUI_CONFIG (context->gimp->config); config = GIMP_GUI_CONFIG (context->gimp->config);
gimp_window_set_hint (GTK_WINDOW (toolbox), config->toolbox_window_hint); gimp_window_set_hint (GTK_WINDOW (toolbox), config->toolbox_window_hint);
main_vbox = GIMP_DOCK (toolbox)->main_vbox; main_vbox = gimp_dock_get_main_vbox (GIMP_DOCK (toolbox));
toolbox->vbox = gtk_vbox_new (FALSE, 2); toolbox->vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (main_vbox), toolbox->vbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), toolbox->vbox, FALSE, FALSE, 0);
@ -341,10 +341,10 @@ gimp_toolbox_size_allocate (GtkWidget *widget,
if (GTK_WIDGET_CLASS (parent_class)->size_allocate) if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
if (! GIMP_DOCK (widget)->context) if (! gimp_dock_get_context (GIMP_DOCK (widget)))
return; return;
gimp = GIMP_DOCK (widget)->context->gimp; gimp = gimp_dock_get_context (GIMP_DOCK (widget))->gimp;
config = GIMP_GUI_CONFIG (gimp->config); config = GIMP_GUI_CONFIG (gimp->config);
@ -442,10 +442,10 @@ gimp_toolbox_style_set (GtkWidget *widget,
GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style); GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
if (! GIMP_DOCK (widget)->context) if (! gimp_dock_get_context (GIMP_DOCK (widget)))
return; return;
gimp = GIMP_DOCK (widget)->context->gimp; gimp = gimp_dock_get_context (GIMP_DOCK (widget))->gimp;
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"tool-icon-size", &tool_icon_size, "tool-icon-size", &tool_icon_size,
@ -490,7 +490,7 @@ gimp_toolbox_button_press_event (GtkWidget *widget,
clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY); clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY);
gtk_clipboard_request_text (clipboard, gtk_clipboard_request_text (clipboard,
toolbox_paste_received, toolbox_paste_received,
g_object_ref (GIMP_DOCK (widget)->context)); g_object_ref (gimp_dock_get_context (GIMP_DOCK (widget))));
return TRUE; return TRUE;
} }
@ -554,7 +554,7 @@ static void
gimp_toolbox_book_added (GimpDock *dock, gimp_toolbox_book_added (GimpDock *dock,
GimpDockbook *dockbook) GimpDockbook *dockbook)
{ {
if (g_list_length (dock->dockbooks) == 1) if (g_list_length (gimp_dock_get_dockbooks (dock)) == 1)
{ {
gimp_toolbox_set_geometry (GIMP_TOOLBOX (dock)); gimp_toolbox_set_geometry (GIMP_TOOLBOX (dock));
toolbox_separator_collapse (GIMP_TOOLBOX (dock)); toolbox_separator_collapse (GIMP_TOOLBOX (dock));
@ -565,7 +565,7 @@ static void
gimp_toolbox_book_removed (GimpDock *dock, gimp_toolbox_book_removed (GimpDock *dock,
GimpDockbook *dockbook) GimpDockbook *dockbook)
{ {
if (g_list_length (dock->dockbooks) == 0 && if (g_list_length (gimp_dock_get_dockbooks (dock)) == 0 &&
! (GTK_OBJECT_FLAGS (dock) & GTK_IN_DESTRUCTION)) ! (GTK_OBJECT_FLAGS (dock) & GTK_IN_DESTRUCTION))
{ {
gimp_toolbox_set_geometry (GIMP_TOOLBOX (dock)); gimp_toolbox_set_geometry (GIMP_TOOLBOX (dock));
@ -580,14 +580,14 @@ gimp_toolbox_set_geometry (GimpToolbox *toolbox)
GimpToolInfo *tool_info; GimpToolInfo *tool_info;
GtkWidget *tool_button; GtkWidget *tool_button;
gimp = GIMP_DOCK (toolbox)->context->gimp; gimp = gimp_dock_get_context (GIMP_DOCK (toolbox))->gimp;
tool_info = gimp_get_tool_info (gimp, "gimp-rect-select-tool"); tool_info = gimp_get_tool_info (gimp, "gimp-rect-select-tool");
tool_button = g_object_get_data (G_OBJECT (tool_info), TOOL_BUTTON_DATA_KEY); tool_button = g_object_get_data (G_OBJECT (tool_info), TOOL_BUTTON_DATA_KEY);
if (tool_button) if (tool_button)
{ {
GtkWidget *main_vbox = GIMP_DOCK (toolbox)->main_vbox; GtkWidget *main_vbox = gimp_dock_get_main_vbox (GIMP_DOCK (toolbox));
GtkRequisition button_requisition; GtkRequisition button_requisition;
gint border_width; gint border_width;
GdkGeometry geometry; GdkGeometry geometry;
@ -605,7 +605,7 @@ gimp_toolbox_set_geometry (GimpToolbox *toolbox)
2 * button_requisition.width); 2 * button_requisition.width);
geometry.min_height = -1; geometry.min_height = -1;
geometry.width_inc = button_requisition.width; geometry.width_inc = button_requisition.width;
geometry.height_inc = (GIMP_DOCK (toolbox)->dockbooks ? geometry.height_inc = (gimp_dock_get_dockbooks (GIMP_DOCK (toolbox)) ?
1 : button_requisition.height); 1 : button_requisition.height);
gtk_window_set_geometry_hints (GTK_WINDOW (toolbox), gtk_window_set_geometry_hints (GTK_WINDOW (toolbox),
@ -645,11 +645,11 @@ toolbox_separator_expand (GimpToolbox *toolbox)
GList *children; GList *children;
GtkWidget *separator; GtkWidget *separator;
children = gtk_container_get_children (GTK_CONTAINER (dock->vbox)); children = gtk_container_get_children (GTK_CONTAINER (gimp_dock_get_vbox (dock)));
separator = children->data; separator = children->data;
g_list_free (children); g_list_free (children);
gtk_box_set_child_packing (GTK_BOX (dock->vbox), separator, gtk_box_set_child_packing (GTK_BOX (gimp_dock_get_vbox (dock)), separator,
TRUE, TRUE, 0, GTK_PACK_START); TRUE, TRUE, 0, GTK_PACK_START);
gimp_dock_separator_set_show_label (GIMP_DOCK_SEPARATOR (separator), TRUE); gimp_dock_separator_set_show_label (GIMP_DOCK_SEPARATOR (separator), TRUE);
} }
@ -661,11 +661,11 @@ toolbox_separator_collapse (GimpToolbox *toolbox)
GList *children; GList *children;
GtkWidget *separator; GtkWidget *separator;
children = gtk_container_get_children (GTK_CONTAINER (dock->vbox)); children = gtk_container_get_children (GTK_CONTAINER (gimp_dock_get_vbox (dock)));
separator = children->data; separator = children->data;
g_list_free (children); g_list_free (children);
gtk_box_set_child_packing (GTK_BOX (dock->vbox), separator, gtk_box_set_child_packing (GTK_BOX (gimp_dock_get_vbox (dock)), separator,
FALSE, FALSE, 0, GTK_PACK_START); FALSE, FALSE, 0, GTK_PACK_START);
gimp_dock_separator_set_show_label (GIMP_DOCK_SEPARATOR (separator), FALSE); gimp_dock_separator_set_show_label (GIMP_DOCK_SEPARATOR (separator), FALSE);
} }
@ -913,7 +913,7 @@ toolbox_tool_button_toggled (GtkWidget *widget,
GtkWidget *toolbox = gtk_widget_get_toplevel (widget); GtkWidget *toolbox = gtk_widget_get_toplevel (widget);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
gimp_context_set_tool (GIMP_DOCK (toolbox)->context, tool_info); gimp_context_set_tool (gimp_dock_get_context (GIMP_DOCK (toolbox)), tool_info);
} }
static gboolean static gboolean
@ -923,7 +923,7 @@ toolbox_tool_button_press (GtkWidget *widget,
{ {
if (event->type == GDK_2BUTTON_PRESS && event->button == 1) if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
{ {
gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory, gimp_dialog_factory_dialog_raise (gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
gtk_widget_get_screen (widget), gtk_widget_get_screen (widget),
"gimp-tool-options", "gimp-tool-options",
-1); -1);