Commit 5236dc6f authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/actions/dockable-actions.c app/actions/dockable-commands.[ch]

2006-01-17  Michael Natterer  <mitch@gimp.org>

	* app/actions/dockable-actions.c
	* app/actions/dockable-commands.[ch]
	* app/dialogs/dialogs-constructors.[ch]
	* app/dialogs/dialogs.c
	* app/display/gimpdisplayshell-layer-select.c
	* app/widgets/gimpbrusheditor.[ch]
	* app/widgets/gimpbrushfactoryview.h
	* app/widgets/gimpbufferview.[ch]
	* app/widgets/gimpchanneltreeview.c
	* app/widgets/gimpcomponenteditor.[ch]
	* app/widgets/gimpcontainerbox.c
	* app/widgets/gimpcontainercombobox.[ch]
	* app/widgets/gimpcontainereditor.[ch]
	* app/widgets/gimpcontainerentry.[ch]
	* app/widgets/gimpcontainergridview.[ch]
	* app/widgets/gimpcontainerpopup.[ch]
	* app/widgets/gimpcontainertreeview.[ch]
	* app/widgets/gimpcontainerview.[ch]
	* app/widgets/gimpdatafactoryview.[ch]
	* app/widgets/gimpdevicestatus.c
	* app/widgets/gimpdialogfactory.[ch]
	* app/widgets/gimpdocumentview.[ch]
	* app/widgets/gimpfontview.[ch]
	* app/widgets/gimpgradienteditor.[ch]
	* app/widgets/gimpimageview.[ch]
	* app/widgets/gimpitemtreeview.[ch]
	* app/widgets/gimplayertreeview.c
	* app/widgets/gimpmenudock.c
	* app/widgets/gimppatternfactoryview.[ch]
	* app/widgets/gimppropwidgets.[ch]
	* app/widgets/gimpselectioneditor.[ch]
	* app/widgets/gimpsessioninfo.[ch]
	* app/widgets/gimptemplateview.[ch]
	* app/widgets/gimptooloptionseditor.c
	* app/widgets/gimptoolview.[ch]
	* app/widgets/gimpundoeditor.[ch]
	* app/widgets/gimpviewablebox.c
	* app/widgets/gimpviewablebutton.[ch]
	* app/widgets/gimpviewabledialog.[ch]
	* app/widgets/gimpviewrenderer.c: change the word "preview" to
	"view" whereever we talk about GimpView or GimpViewRenderer
	objects or their sizes. Ther were renamed from "Preview" a long
	time ago and we had a preview/view naming mess ever since.
parent 17375e3b
2006-01-17 Michael Natterer <mitch@gimp.org>
* app/actions/dockable-actions.c
* app/actions/dockable-commands.[ch]
* app/dialogs/dialogs-constructors.[ch]
* app/dialogs/dialogs.c
* app/display/gimpdisplayshell-layer-select.c
* app/widgets/gimpbrusheditor.[ch]
* app/widgets/gimpbrushfactoryview.h
* app/widgets/gimpbufferview.[ch]
* app/widgets/gimpchanneltreeview.c
* app/widgets/gimpcomponenteditor.[ch]
* app/widgets/gimpcontainerbox.c
* app/widgets/gimpcontainercombobox.[ch]
* app/widgets/gimpcontainereditor.[ch]
* app/widgets/gimpcontainerentry.[ch]
* app/widgets/gimpcontainergridview.[ch]
* app/widgets/gimpcontainerpopup.[ch]
* app/widgets/gimpcontainertreeview.[ch]
* app/widgets/gimpcontainerview.[ch]
* app/widgets/gimpdatafactoryview.[ch]
* app/widgets/gimpdevicestatus.c
* app/widgets/gimpdialogfactory.[ch]
* app/widgets/gimpdocumentview.[ch]
* app/widgets/gimpfontview.[ch]
* app/widgets/gimpgradienteditor.[ch]
* app/widgets/gimpimageview.[ch]
* app/widgets/gimpitemtreeview.[ch]
* app/widgets/gimplayertreeview.c
* app/widgets/gimpmenudock.c
* app/widgets/gimppatternfactoryview.[ch]
* app/widgets/gimppropwidgets.[ch]
* app/widgets/gimpselectioneditor.[ch]
* app/widgets/gimpsessioninfo.[ch]
* app/widgets/gimptemplateview.[ch]
* app/widgets/gimptooloptionseditor.c
* app/widgets/gimptoolview.[ch]
* app/widgets/gimpundoeditor.[ch]
* app/widgets/gimpviewablebox.c
* app/widgets/gimpviewablebutton.[ch]
* app/widgets/gimpviewabledialog.[ch]
* app/widgets/gimpviewrenderer.c: change the word "preview" to
"view" whereever we talk about GimpView or GimpViewRenderer
objects or their sizes. Ther were renamed from "Preview" a long
time ago and we had a preview/view naming mess ever since.
2006-01-14 Michael Natterer <mitch@gimp.org>
* app/config/gimpconfig-utils.[ch] (gimp_config_connect_full):
variant of gimp_config_connect() which allows the connected
objects to have different propertynames.
objects to have different property names.
* app/widgets/widgets-enums.[ch]: removed enum GimpViewType...
......
......@@ -65,7 +65,7 @@ static GimpActionEntry dockable_actions[] =
GIMP_HELP_DOCK_TAB_DETACH }
};
#define PREVIEW_SIZE(action,label,size) \
#define VIEW_SIZE(action,label,size) \
{ "dockable-preview-size-" action, NULL, \
(label), NULL, NULL, \
(size), \
......@@ -76,17 +76,17 @@ static GimpActionEntry dockable_actions[] =
(style), \
GIMP_HELP_DOCK_TAB_STYLE }
static GimpRadioActionEntry dockable_preview_size_actions[] =
static GimpRadioActionEntry dockable_view_size_actions[] =
{
PREVIEW_SIZE ("tiny", N_("_Tiny"), GIMP_VIEW_SIZE_TINY),
PREVIEW_SIZE ("extra-small", N_("E_xtra Small"), GIMP_VIEW_SIZE_EXTRA_SMALL),
PREVIEW_SIZE ("small", N_("_Small"), GIMP_VIEW_SIZE_SMALL),
PREVIEW_SIZE ("medium", N_("_Medium"), GIMP_VIEW_SIZE_MEDIUM),
PREVIEW_SIZE ("large", N_("_Large"), GIMP_VIEW_SIZE_LARGE),
PREVIEW_SIZE ("extra-large", N_("Ex_tra Large"), GIMP_VIEW_SIZE_EXTRA_LARGE),
PREVIEW_SIZE ("huge", N_("_Huge"), GIMP_VIEW_SIZE_HUGE),
PREVIEW_SIZE ("enormous", N_("_Enormous"), GIMP_VIEW_SIZE_ENORMOUS),
PREVIEW_SIZE ("gigantic", N_("_Gigantic"), GIMP_VIEW_SIZE_GIGANTIC)
VIEW_SIZE ("tiny", N_("_Tiny"), GIMP_VIEW_SIZE_TINY),
VIEW_SIZE ("extra-small", N_("E_xtra Small"), GIMP_VIEW_SIZE_EXTRA_SMALL),
VIEW_SIZE ("small", N_("_Small"), GIMP_VIEW_SIZE_SMALL),
VIEW_SIZE ("medium", N_("_Medium"), GIMP_VIEW_SIZE_MEDIUM),
VIEW_SIZE ("large", N_("_Large"), GIMP_VIEW_SIZE_LARGE),
VIEW_SIZE ("extra-large", N_("Ex_tra Large"), GIMP_VIEW_SIZE_EXTRA_LARGE),
VIEW_SIZE ("huge", N_("_Huge"), GIMP_VIEW_SIZE_HUGE),
VIEW_SIZE ("enormous", N_("_Enormous"), GIMP_VIEW_SIZE_ENORMOUS),
VIEW_SIZE ("gigantic", N_("_Gigantic"), GIMP_VIEW_SIZE_GIGANTIC)
};
static GimpRadioActionEntry dockable_tab_style_actions[] =
......@@ -98,7 +98,7 @@ static GimpRadioActionEntry dockable_tab_style_actions[] =
TAB_STYLE ("preview-name", N_("St_atus & Text"), GIMP_TAB_STYLE_PREVIEW_NAME)
};
#undef PREVIEW_SIZE
#undef VIEW_SIZE
#undef TAB_STYLE
......@@ -142,11 +142,11 @@ dockable_actions_setup (GimpActionGroup *group)
G_CALLBACK (dockable_add_tab_cmd_callback));
gimp_action_group_add_radio_actions (group,
dockable_preview_size_actions,
G_N_ELEMENTS (dockable_preview_size_actions),
dockable_view_size_actions,
G_N_ELEMENTS (dockable_view_size_actions),
NULL,
GIMP_VIEW_SIZE_MEDIUM,
G_CALLBACK (dockable_preview_size_cmd_callback));
G_CALLBACK (dockable_view_size_cmd_callback));
gimp_action_group_add_radio_actions (group,
dockable_tab_style_actions,
......@@ -175,7 +175,7 @@ dockable_actions_update (GimpActionGroup *group,
GimpViewType view_type = -1;
gboolean list_view_available = FALSE;
gboolean grid_view_available = FALSE;
GimpViewSize preview_size = -1;
GimpViewSize view_size = -1;
GimpTabStyle tab_style = -1;
gint n_pages = 0;
gint n_books = 0;
......@@ -236,7 +236,7 @@ dockable_actions_update (GimpActionGroup *group,
view = gimp_container_view_get_by_dockable (dockable);
if (view)
preview_size = gimp_container_view_get_preview_size (view, NULL);
view_size = gimp_container_view_get_view_size (view, NULL);
tab_style = dockable->tab_style;
......@@ -252,43 +252,43 @@ dockable_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("dockable-detach-tab", n_pages > 1 || n_books > 1);
SET_VISIBLE ("dockable-preview-size-menu", preview_size != -1);
SET_VISIBLE ("dockable-preview-size-menu", view_size != -1);
if (preview_size != -1)
if (view_size != -1)
{
if (preview_size >= GIMP_VIEW_SIZE_GIGANTIC)
if (view_size >= GIMP_VIEW_SIZE_GIGANTIC)
{
SET_ACTIVE ("dockable-preview-size-gigantic", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_ENORMOUS)
else if (view_size >= GIMP_VIEW_SIZE_ENORMOUS)
{
SET_ACTIVE ("dockable-preview-size-enormous", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_HUGE)
else if (view_size >= GIMP_VIEW_SIZE_HUGE)
{
SET_ACTIVE ("dockable-preview-size-huge", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_EXTRA_LARGE)
else if (view_size >= GIMP_VIEW_SIZE_EXTRA_LARGE)
{
SET_ACTIVE ("dockable-preview-size-extra-large", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_LARGE)
else if (view_size >= GIMP_VIEW_SIZE_LARGE)
{
SET_ACTIVE ("dockable-preview-size-large", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_MEDIUM)
else if (view_size >= GIMP_VIEW_SIZE_MEDIUM)
{
SET_ACTIVE ("dockable-preview-size-medium", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_SMALL)
else if (view_size >= GIMP_VIEW_SIZE_SMALL)
{
SET_ACTIVE ("dockable-preview-size-small", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_EXTRA_SMALL)
else if (view_size >= GIMP_VIEW_SIZE_EXTRA_SMALL)
{
SET_ACTIVE ("dockable-preview-size-extra-small", TRUE);
}
else if (preview_size >= GIMP_VIEW_SIZE_TINY)
else if (view_size >= GIMP_VIEW_SIZE_TINY)
{
SET_ACTIVE ("dockable-preview-size-tiny", TRUE);
}
......
......@@ -160,7 +160,7 @@ dockable_toggle_view_cmd_callback (GtkAction *action,
{
GimpContainerView *old_view;
GtkWidget *new_dockable;
gint preview_size = -1;
gint view_size = -1;
if (view_type == GIMP_VIEW_TYPE_LIST)
memcpy (substring, "list", 4);
......@@ -170,15 +170,14 @@ dockable_toggle_view_cmd_callback (GtkAction *action,
old_view = gimp_container_view_get_by_dockable (dockable);
if (old_view)
preview_size = gimp_container_view_get_preview_size (old_view,
NULL);
view_size = gimp_container_view_get_view_size (old_view, NULL);
new_dockable =
gimp_dialog_factory_dockable_new (dockbook->dock->dialog_factory,
dockbook->dock,
identifier,
preview_size);
view_size);
if (new_dockable)
{
......@@ -212,16 +211,16 @@ dockable_toggle_view_cmd_callback (GtkAction *action,
}
void
dockable_preview_size_cmd_callback (GtkAction *action,
GtkAction *current,
gpointer data)
dockable_view_size_cmd_callback (GtkAction *action,
GtkAction *current,
gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
gint preview_size;
gint view_size;
gint page_num;
preview_size = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
view_size = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
......@@ -237,12 +236,10 @@ dockable_preview_size_cmd_callback (GtkAction *action,
gint old_size;
gint border_width;
old_size = gimp_container_view_get_preview_size (view,
&border_width);
old_size = gimp_container_view_get_view_size (view, &border_width);
if (old_size != preview_size)
gimp_container_view_set_preview_size (view, preview_size,
border_width);
if (old_size != view_size)
gimp_container_view_set_view_size (view, view_size, border_width);
}
}
}
......
......@@ -31,7 +31,7 @@ void dockable_detach_tab_cmd_callback (GtkAction *action,
void dockable_toggle_view_cmd_callback (GtkAction *action,
GtkAction *current,
gpointer data);
void dockable_preview_size_cmd_callback (GtkAction *action,
void dockable_view_size_cmd_callback (GtkAction *action,
GtkAction *current,
gpointer data);
void dockable_tab_style_cmd_callback (GtkAction *action,
......
This diff is collapsed.
......@@ -24,50 +24,50 @@
GtkWidget * dialogs_image_new_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_file_open_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_file_open_location_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_file_save_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_preferences_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_keyboard_shortcuts_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_module_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_tips_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_about_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_error_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_close_all_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_quit_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
/* docks */
GtkWidget * dialogs_toolbox_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_dock_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
/* dockables */
......@@ -75,128 +75,128 @@ GtkWidget * dialogs_dock_new (GimpDialogFactory *factory,
GtkWidget * dialogs_dockable_constructor (GimpDialogFactory *factory,
GimpDialogFactoryEntry *entry,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_tool_options_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_device_status_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_error_console_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_cursor_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_image_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_brush_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_pattern_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_gradient_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_palette_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_font_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_tool_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_buffer_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_document_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_template_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_image_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_brush_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_palette_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_font_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_tool_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_document_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_template_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_layer_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_channel_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_vectors_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_path_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_colormap_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_histogram_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_selection_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_undo_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_sample_point_editor_new(GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_navigation_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_color_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_brush_editor_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_gradient_editor_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
GtkWidget * dialogs_palette_editor_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
gint view_size);
#endif /* __DIALOGS_CONSTRUCTORS_H__ */
......@@ -111,16 +111,16 @@ static const GimpDialogFactoryEntry toplevel_entries[] =
};
#define DOCKABLE(id,name,blurb,stock_id,help_id,\
new_func,preview_size,singleton) \
new_func,view_size,singleton) \
{ id, name, blurb, stock_id, help_id, \
new_func, preview_size, singleton, FALSE, FALSE, TRUE }
new_func, view_size, singleton, FALSE, FALSE, TRUE }
#define LISTGRID(id,name,blurb,stock_id,help_id,\
preview_size) \
view_size) \
{ "gimp-"#id"-list", name, blurb, stock_id, help_id, \
dialogs_##id##_list_view_new, preview_size, FALSE, FALSE, FALSE, TRUE }, \
dialogs_##id##_list_view_new, view_size, FALSE, FALSE, FALSE, TRUE }, \
{ "gimp-"#id"-grid", name, blurb, stock_id, help_id, \
dialogs_##id##_grid_view_new, preview_size, FALSE, FALSE, FALSE, TRUE }
dialogs_##id##_grid_view_new, view_size, FALSE, FALSE, FALSE, TRUE }
static const GimpDialogFactoryEntry dock_entries[] =
{
......@@ -264,7 +264,7 @@ dialogs_init (Gimp *gimp,
toplevel_entries[i].stock_id,
toplevel_entries[i].help_id,
toplevel_entries[i].new_func,
toplevel_entries[i].preview_size,
toplevel_entries[i].view_size,
toplevel_entries[i].singleton,
toplevel_entries[i].session_managed,
toplevel_entries[i].remember_size,
......@@ -278,7 +278,7 @@ dialogs_init (Gimp *gimp,
dock_entries[i].stock_id,
dock_entries[i].help_id,
dock_entries[i].new_func,
dock_entries[i].preview_size,
dock_entries[i].view_size,
dock_entries[i].singleton,
dock_entries[i].session_managed,
dock_entries[i].remember_size,
......
......@@ -44,7 +44,7 @@ typedef struct _LayerSelect LayerSelect;
struct _LayerSelect
{
GtkWidget *shell;
GtkWidget *preview;
GtkWidget *view;
GtkWidget *label;
GimpImage *gimage;
......@@ -56,7 +56,7 @@ struct _LayerSelect
static LayerSelect * layer_select_new (GimpImage *gimage,
GimpLayer *layer,
gint preview_size);
gint view_size);
static void layer_select_destroy (LayerSelect *layer_select,
guint32 time);
static void layer_select_advance (LayerSelect *layer_select,
......@@ -104,7 +104,7 @@ gimp_display_shell_layer_select_init (GimpDisplayShell *shell,
static LayerSelect *
layer_select_new (GimpImage *gimage,
GimpLayer *layer,
gint preview_size)
gint view_size)
{
LayerSelect *layer_select;
GtkWidget *frame1;
......@@ -144,18 +144,18 @@ layer_select_new (GimpImage *gimage,
gtk_container_add (GTK_CONTAINER (frame2), hbox);
gtk_widget_show (hbox);
/* The preview */
/* The view */
alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
gtk_widget_show (alignment);
layer_select->preview = gimp_view_new_by_types (GIMP_TYPE_VIEW,
GIMP_TYPE_LAYER,
preview_size, 1, FALSE);
gimp_view_set_viewable (GIMP_VIEW (layer_select->preview),
layer_select->view = gimp_view_new_by_types (GIMP_TYPE_VIEW,
GIMP_TYPE_LAYER,
view_size, 1, FALSE);
gimp_view_set_viewable (GIMP_VIEW (layer_select->view),
GIMP_VIEWABLE (layer));
gtk_container_add (GTK_CONTAINER (alignment), layer_select->preview);
gtk_widget_show (layer_select->preview);
gtk_container_add (GTK_CONTAINER (alignment), layer_select->view);
gtk_widget_show (layer_select->view);
gtk_widget_show (alignment);
/* the layer name label */
......@@ -221,7 +221,7 @@ layer_select_advance (LayerSelect *layer_select,
if (current_layer)
{
gimp_view_set_viewable (GIMP_VIEW (layer_select->preview),
gimp_view_set_viewable (GIMP_VIEW (layer_select->view),
GIMP_VIEWABLE (current_layer));
gtk_label_set_text (GTK_LABEL (layer_select->label),
GIMP_OBJECT (current_layer)->name);
......
......@@ -83,16 +83,16 @@ gimp_brush_editor_init (GimpBrushEditor *editor)
gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
editor->preview = gimp_view_new_full_by_types (GIMP_TYPE_VIEW,
GIMP_TYPE_BRUSH,
BRUSH_VIEW_WIDTH,
BRUSH_VIEW_HEIGHT, 0,
FALSE, FALSE, TRUE);
gtk_widget_set_size_request (editor->preview,
editor->view = gimp_view_new_full_by_types (GIMP_TYPE_VIEW,
GIMP_TYPE_BRUSH,
BRUSH_VIEW_WIDTH,
BRUSH_VIEW_HEIGHT, 0,
FALSE, FALSE, TRUE);
gtk_widget_set_size_request (editor->view,
BRUSH_VIEW_WIDTH, BRUSH_VIEW_HEIGHT);
gimp_view_set_expand (GIMP_VIEW (editor->preview), TRUE);
gtk_container_add (GTK_CONTAINER (frame), editor->preview);
gtk_widget_show (editor->preview);
gimp_view_set_expand (GIMP_VIEW (editor->view), TRUE);
gtk_container_add (GTK_CONTAINER (frame), editor->view);
gtk_widget_show (editor->view);
editor->shape_group = NULL;
......@@ -223,7 +223,7 @@ gimp_brush_editor_set_data (GimpDataEditor *editor,
G_CALLBACK (gimp_brush_editor_notify_brush),
editor);
gimp_view_set_viewable (GIMP_VIEW (brush_editor->preview),
gimp_view_set_viewable (GIMP_VIEW (brush_editor->view),
(GimpViewable *) data);
if (editor->data && GIMP_IS_BRUSH_GENERATED (editor->data))
......
......@@ -40,7 +40,7 @@ struct _GimpBrushEditor
{
GimpDataEditor parent_instance;
GtkWidget *preview;
GtkWidget *view;
GtkWidget *shape_group;
GtkWidget *options_table;
......
......@@ -58,8 +58,8 @@ GtkWidget * gimp_brush_factory_view_new (GimpViewType view_type,
GimpDataFactory *factory,
GimpContext *context,
gboolean change_brush_spacing,
gint preview_size,
gint preview_border_width,
gint view_size,
gint view_border_width,
GimpMenuFactory *menu_factory);
......