Commit e91187ae authored by David Odin's avatar David Odin

app/widgets/gimppreview-popup.c renamed these files...

* app/widgets/gimppreview-popup.c
* app/widgets/gimppreview-popup.h: renamed these files...

* app/widgets/gimpview-popup.c
* app/widgets/gimpview-popup.h: .. to these files, and changed the
  GimpPreviewPopup type to GimpViewPopup.

* app/widgets/gimppreviewrenderer.c
* app/widgets/gimppreviewrenderer.h: renamed these files...

* app/widgets/gimpviewrenderer.c
* app/widgets/gimpviewrenderer.h: .. to these files, and changed
  GimpPreviewRenderer to GimpViewRenderer.

This is the second step of the great Preview->View renaming process.

* app/display/gimpdisplayshell-layer-select.c
* app/display/gimpnavigationeditor.c

* app/widgets/Makefile.am
* app/widgets/gimpbrushfactoryview.c
* app/widgets/gimpbufferview.c
* app/widgets/gimpcellrendererviewable.c
* app/widgets/gimpcellrendererviewable.h
* app/widgets/gimpcomponenteditor.c
* app/widgets/gimpcontainerbox.c
* app/widgets/gimpcontainercombobox.c
* app/widgets/gimpcontainereditor.c
* app/widgets/gimpcontainerentry.c
* app/widgets/gimpcontainergridview.c
* app/widgets/gimpcontainerpopup.c
* app/widgets/gimpcontainertreeview-dnd.c
* app/widgets/gimpcontainertreeview.c
* app/widgets/gimpcontainerview.c
* app/widgets/gimpdatafactoryview.c
* app/widgets/gimpitemtreeview.c
* app/widgets/gimplayertreeview.c
* app/widgets/gimpnavigationpreview.c
* app/widgets/gimppatternfactoryview.c
* app/widgets/gimppreviewrenderer-utils.c
* app/widgets/gimppreviewrendererbrush.c
* app/widgets/gimppreviewrendererbrush.h
* app/widgets/gimppreviewrendererdrawable.c
* app/widgets/gimppreviewrendererdrawable.h
* app/widgets/gimppreviewrenderergradient.c
* app/widgets/gimppreviewrenderergradient.h
* app/widgets/gimppreviewrendererimage.c
* app/widgets/gimppreviewrendererimage.h
* app/widgets/gimppreviewrendererimagefile.c
* app/widgets/gimppreviewrendererimagefile.h
* app/widgets/gimppreviewrendererlayer.c
* app/widgets/gimppreviewrenderervectors.c
* app/widgets/gimpselectioneditor.c
* app/widgets/gimptemplateview.c
* app/widgets/gimptooloptionseditor.c
* app/widgets/gimptoolview.c
* app/widgets/gimpview.c
* app/widgets/gimpview.h
* app/widgets/gimpviewablebutton.c
* app/widgets/widgets-enums.h
* app/widgets/widgets-types.h: Modified accordingly.
parent e6a034fc
2004-08-26 DindinX <david@dindinx.org>
* app/widgets/gimppreview-popup.c
* app/widgets/gimppreview-popup.h: renamed these files...
* app/widgets/gimpview-popup.c
* app/widgets/gimpview-popup.h: .. to these files, and changed the
GimpPreviewPopup type to GimpViewPopup.
* app/widgets/gimppreviewrenderer.c
* app/widgets/gimppreviewrenderer.h: renamed these files...
* app/widgets/gimpviewrenderer.c
* app/widgets/gimpviewrenderer.h: .. to these files, and changed
GimpPreviewRenderer to GimpViewRenderer.
This is the second step of the great Preview->View renaming process.
* app/display/gimpdisplayshell-layer-select.c
* app/display/gimpnavigationeditor.c
* app/widgets/Makefile.am
* app/widgets/gimpbrushfactoryview.c
* app/widgets/gimpbufferview.c
* app/widgets/gimpcellrendererviewable.c
* app/widgets/gimpcellrendererviewable.h
* app/widgets/gimpcomponenteditor.c
* app/widgets/gimpcontainerbox.c
* app/widgets/gimpcontainercombobox.c
* app/widgets/gimpcontainereditor.c
* app/widgets/gimpcontainerentry.c
* app/widgets/gimpcontainergridview.c
* app/widgets/gimpcontainerpopup.c
* app/widgets/gimpcontainertreeview-dnd.c
* app/widgets/gimpcontainertreeview.c
* app/widgets/gimpcontainerview.c
* app/widgets/gimpdatafactoryview.c
* app/widgets/gimpitemtreeview.c
* app/widgets/gimplayertreeview.c
* app/widgets/gimpnavigationpreview.c
* app/widgets/gimppatternfactoryview.c
* app/widgets/gimppreviewrenderer-utils.c
* app/widgets/gimppreviewrendererbrush.c
* app/widgets/gimppreviewrendererbrush.h
* app/widgets/gimppreviewrendererdrawable.c
* app/widgets/gimppreviewrendererdrawable.h
* app/widgets/gimppreviewrenderergradient.c
* app/widgets/gimppreviewrenderergradient.h
* app/widgets/gimppreviewrendererimage.c
* app/widgets/gimppreviewrendererimage.h
* app/widgets/gimppreviewrendererimagefile.c
* app/widgets/gimppreviewrendererimagefile.h
* app/widgets/gimppreviewrendererlayer.c
* app/widgets/gimppreviewrenderervectors.c
* app/widgets/gimpselectioneditor.c
* app/widgets/gimptemplateview.c
* app/widgets/gimptooloptionseditor.c
* app/widgets/gimptoolview.c
* app/widgets/gimpview.c
* app/widgets/gimpview.h
* app/widgets/gimpviewablebutton.c
* app/widgets/widgets-enums.h
* app/widgets/widgets-types.h: Modified accordingly.
2004-08-25 Sven Neumann <sven@gimp.org>
* app/widgets/gimperrordialog.[ch] (gimp_error_dialog_add): stop
......
......@@ -31,7 +31,6 @@
#include "core/gimplayer.h"
#include "widgets/gimpview.h"
#include "widgets/gimppreviewrenderer.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
......
......@@ -39,7 +39,7 @@
#include "widgets/gimpdocked.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpnavigationpreview.h"
#include "widgets/gimppreviewrenderer.h"
#include "widgets/gimpviewrenderer.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
......@@ -431,9 +431,9 @@ gimp_navigation_editor_new_private (GimpDisplayShell *shell,
{
GimpView *view = GIMP_VIEW (editor->view);
gimp_preview_renderer_set_size (view->renderer,
config->nav_preview_size * 3,
view->renderer->border_width);
gimp_view_renderer_set_size (view->renderer,
config->nav_preview_size * 3,
view->renderer->border_width);
}
else
{
......@@ -530,8 +530,8 @@ gimp_navigation_editor_new_private (GimpDisplayShell *shell,
if (shell)
gimp_navigation_editor_set_shell (editor, shell);
gimp_preview_renderer_set_background (GIMP_VIEW (editor->view)->renderer,
GIMP_STOCK_TEXTURE);
gimp_view_renderer_set_background (GIMP_VIEW (editor->view)->renderer,
GIMP_STOCK_TEXTURE);
return GTK_WIDGET (editor);
}
......@@ -741,9 +741,9 @@ gimp_navigation_editor_shell_reconnect (GimpDisplayShell *shell,
static void
gimp_navigation_editor_update_marker (GimpNavigationEditor *editor)
{
GimpPreviewRenderer *renderer;
gdouble xratio;
gdouble yratio;
GimpViewRenderer *renderer;
gdouble xratio;
gdouble yratio;
renderer = GIMP_VIEW (editor->view)->renderer;
......@@ -751,8 +751,8 @@ gimp_navigation_editor_update_marker (GimpNavigationEditor *editor)
yratio = SCALEFACTOR_Y (editor->shell);
if (renderer->dot_for_dot != editor->shell->dot_for_dot)
gimp_preview_renderer_set_dot_for_dot (renderer,
editor->shell->dot_for_dot);
gimp_view_renderer_set_dot_for_dot (renderer,
editor->shell->dot_for_dot);
gimp_navigation_preview_set_marker (GIMP_NAVIGATION_PREVIEW (editor->view),
editor->shell->offset_x / xratio,
......
......@@ -188,10 +188,6 @@ libappwidgets_a_sources = \
gimppdbdialog.h \
gimppluginaction.c \
gimppluginaction.h \
gimppreview-popup.c \
gimppreview-popup.h \
gimppreviewrenderer.c \
gimppreviewrenderer.h \
gimppreviewrenderer-utils.c \
gimppreviewrenderer-utils.h \
gimppreviewrendererbrush.c \
......@@ -260,10 +256,14 @@ libappwidgets_a_sources = \
gimpvectorstreeview.h \
gimpview.c \
gimpview.h \
gimpview-popup.c \
gimpview-popup.h \
gimpviewablebutton.c \
gimpviewablebutton.h \
gimpviewabledialog.c \
gimpviewabledialog.h \
gimpviewrenderer.c \
gimpviewrenderer.h \
gimpwidgets-constructors.c \
gimpwidgets-constructors.h \
gimpwidgets-utils.c \
......
......@@ -35,7 +35,7 @@
#include "gimpcontainerview.h"
#include "gimpbrushfactoryview.h"
#include "gimppreviewrenderer.h"
#include "gimpviewrenderer.h"
#include "gimp-intl.h"
......@@ -45,12 +45,12 @@ static void gimp_brush_factory_view_init (GimpBrushFactoryView *vie
static void gimp_brush_factory_view_destroy (GtkObject *object);
static void gimp_brush_factory_view_select_item (GimpContainerEditor *editor,
GimpViewable *viewable);
GimpViewable *viewable);
static void gimp_brush_factory_view_spacing_changed (GimpBrush *brush,
GimpBrushFactoryView *view);
GimpBrushFactoryView *view);
static void gimp_brush_factory_view_spacing_update (GtkAdjustment *adjustment,
GimpBrushFactoryView *view);
GimpBrushFactoryView *view);
static GimpDataFactoryViewClass *parent_class = NULL;
......@@ -120,8 +120,8 @@ gimp_brush_factory_view_init (GimpBrushFactoryView *view)
view->spacing_scale = GIMP_SCALE_ENTRY_SCALE (view->spacing_adjustment);
g_signal_connect (view->spacing_adjustment, "value_changed",
G_CALLBACK (gimp_brush_factory_view_spacing_update),
view);
G_CALLBACK (gimp_brush_factory_view_spacing_update),
view);
view->spacing_changed_handler_id = 0;
}
......@@ -149,22 +149,22 @@ gimp_brush_factory_view_destroy (GtkObject *object)
GtkWidget *
gimp_brush_factory_view_new (GimpViewType view_type,
GimpDataFactory *factory,
GimpDataEditFunc edit_func,
GimpContext *context,
gboolean change_brush_spacing,
gint preview_size,
gint preview_border_width,
GimpMenuFactory *menu_factory)
GimpDataFactory *factory,
GimpDataEditFunc edit_func,
GimpContext *context,
gboolean change_brush_spacing,
gint view_size,
gint view_border_width,
GimpMenuFactory *menu_factory)
{
GimpBrushFactoryView *factory_view;
GimpContainerEditor *editor;
g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
g_return_val_if_fail (preview_size > 0 &&
preview_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
g_return_val_if_fail (preview_border_width >= 0 &&
preview_border_width <= GIMP_PREVIEW_MAX_BORDER_WIDTH,
g_return_val_if_fail (view_size > 0 &&
view_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
g_return_val_if_fail (view_border_width >= 0 &&
view_border_width <= GIMP_VIEW_MAX_BORDER_WIDTH,
NULL);
factory_view = g_object_new (GIMP_TYPE_BRUSH_FACTORY_VIEW, NULL);
......@@ -172,12 +172,12 @@ gimp_brush_factory_view_new (GimpViewType view_type,
factory_view->change_brush_spacing = change_brush_spacing;
if (! gimp_data_factory_view_construct (GIMP_DATA_FACTORY_VIEW (factory_view),
view_type,
factory,
edit_func,
context,
preview_size, preview_border_width,
menu_factory, "<Brushes>",
view_type,
factory,
edit_func,
context,
view_size, view_border_width,
menu_factory, "<Brushes>",
"/brushes-popup",
"brushes"))
{
......@@ -202,7 +202,7 @@ gimp_brush_factory_view_new (GimpViewType view_type,
static void
gimp_brush_factory_view_select_item (GimpContainerEditor *editor,
GimpViewable *viewable)
GimpViewable *viewable)
{
GimpBrushFactoryView *view = GIMP_BRUSH_FACTORY_VIEW (editor);
GimpContainer *container;
......@@ -220,15 +220,15 @@ gimp_brush_factory_view_select_item (GimpContainerEditor *editor,
spacing_sensitive = TRUE;
g_signal_handlers_block_by_func (view->spacing_adjustment,
gimp_brush_factory_view_spacing_update,
view);
gimp_brush_factory_view_spacing_update,
view);
gtk_adjustment_set_value (view->spacing_adjustment,
gimp_brush_get_spacing (brush));
gimp_brush_get_spacing (brush));
g_signal_handlers_unblock_by_func (view->spacing_adjustment,
gimp_brush_factory_view_spacing_update,
view);
gimp_brush_factory_view_spacing_update,
view);
}
gtk_widget_set_sensitive (view->spacing_scale, spacing_sensitive);
......@@ -236,7 +236,7 @@ gimp_brush_factory_view_select_item (GimpContainerEditor *editor,
static void
gimp_brush_factory_view_spacing_changed (GimpBrush *brush,
GimpBrushFactoryView *view)
GimpBrushFactoryView *view)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (view);
GimpContext *context;
......@@ -246,21 +246,21 @@ gimp_brush_factory_view_spacing_changed (GimpBrush *brush,
if (brush == gimp_context_get_brush (context))
{
g_signal_handlers_block_by_func (view->spacing_adjustment,
gimp_brush_factory_view_spacing_update,
view);
gimp_brush_factory_view_spacing_update,
view);
gtk_adjustment_set_value (view->spacing_adjustment,
gimp_brush_get_spacing (brush));
gimp_brush_get_spacing (brush));
g_signal_handlers_unblock_by_func (view->spacing_adjustment,
gimp_brush_factory_view_spacing_update,
view);
gimp_brush_factory_view_spacing_update,
view);
}
}
static void
gimp_brush_factory_view_spacing_update (GtkAdjustment *adjustment,
GimpBrushFactoryView *view)
GimpBrushFactoryView *view)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (view);
GimpContext *context;
......@@ -273,13 +273,13 @@ gimp_brush_factory_view_spacing_update (GtkAdjustment *adjustment,
if (brush && view->change_brush_spacing)
{
g_signal_handlers_block_by_func (brush,
gimp_brush_factory_view_spacing_changed,
view);
gimp_brush_factory_view_spacing_changed,
view);
gimp_brush_set_spacing (brush, adjustment->value);
g_signal_handlers_unblock_by_func (brush,
gimp_brush_factory_view_spacing_changed,
view);
gimp_brush_factory_view_spacing_changed,
view);
}
}
......@@ -38,7 +38,7 @@
#include "gimpdnd.h"
#include "gimphelp-ids.h"
#include "gimpview.h"
#include "gimppreviewrenderer.h"
#include "gimpviewrenderer.h"
#include "gimpuimanager.h"
#include "gimp-intl.h"
......@@ -262,8 +262,8 @@ gimp_buffer_view_preview_notify (GimpContainerView *container_view,
view_size = gimp_container_view_get_preview_size (container_view,
&view_border_width);
gimp_preview_renderer_set_size (view->renderer,
view_size, view_border_width);
gimp_view_renderer_set_size (view->renderer,
view_size, view_border_width);
gtk_widget_set_size_request (buffer_view->global_preview,
view_size + 2 * view_border_width,
view_size + 2 * view_border_width);
......
......@@ -29,8 +29,8 @@
#include "core/gimpviewable.h"
#include "gimpcellrendererviewable.h"
#include "gimppreview-popup.h"
#include "gimppreviewrenderer.h"
#include "gimpview-popup.h"
#include "gimpviewrenderer.h"
enum
......@@ -147,7 +147,7 @@ gimp_cell_renderer_viewable_class_init (GimpCellRendererViewableClass *klass)
PROP_RENDERER,
g_param_spec_object ("renderer",
NULL, NULL,
GIMP_TYPE_PREVIEW_RENDERER,
GIMP_TYPE_VIEW_RENDERER,
G_PARAM_READWRITE));
}
......@@ -203,9 +203,9 @@ gimp_cell_renderer_viewable_set_property (GObject *object,
{
case PROP_RENDERER:
{
GimpPreviewRenderer *renderer;
GimpViewRenderer *renderer;
renderer = (GimpPreviewRenderer *) g_value_dup_object (value);
renderer = (GimpViewRenderer *) g_value_dup_object (value);
if (cell->renderer)
g_object_unref (cell->renderer);
cell->renderer = renderer;
......@@ -228,8 +228,8 @@ gimp_cell_renderer_viewable_get_size (GtkCellRenderer *cell,
gint *height)
{
GimpCellRendererViewable *cellviewable;
gint preview_width = 0;
gint preview_height = 0;
gint view_width = 0;
gint view_height = 0;
gint calc_width;
gint calc_height;
......@@ -237,19 +237,19 @@ gimp_cell_renderer_viewable_get_size (GtkCellRenderer *cell,
if (cellviewable->renderer)
{
preview_width = (cellviewable->renderer->width +
2 * cellviewable->renderer->border_width);
preview_height = (cellviewable->renderer->height +
2 * cellviewable->renderer->border_width);
view_width = (cellviewable->renderer->width +
2 * cellviewable->renderer->border_width);
view_height = (cellviewable->renderer->height +
2 * cellviewable->renderer->border_width);
}
calc_width = (gint) cell->xpad * 2 + preview_width;
calc_height = (gint) cell->ypad * 2 + preview_height;
calc_width = (gint) cell->xpad * 2 + view_width;
calc_height = (gint) cell->ypad * 2 + view_height;
if (x_offset) *x_offset = 0;
if (y_offset) *y_offset = 0;
if (cell_area && preview_width > 0 && preview_height > 0)
if (cell_area && view_width > 0 && view_height > 0)
{
if (x_offset)
{
......@@ -288,17 +288,17 @@ gimp_cell_renderer_viewable_render (GtkCellRenderer *cell,
if (! (flags & GTK_CELL_RENDERER_SELECTED))
{
/* this is an ugly hack. The cell state should be passed to
* the preview renderer, so that it can adjust its border.
* the view renderer, so that it can adjust its border.
* (or something like this) */
if (cellviewable->renderer->border_type == GIMP_PREVIEW_BORDER_WHITE)
gimp_preview_renderer_set_border_type (cellviewable->renderer,
GIMP_PREVIEW_BORDER_BLACK);
if (cellviewable->renderer->border_type == GIMP_VIEW_BORDER_WHITE)
gimp_view_renderer_set_border_type (cellviewable->renderer,
GIMP_VIEW_BORDER_BLACK);
gimp_preview_renderer_remove_idle (cellviewable->renderer);
gimp_view_renderer_remove_idle (cellviewable->renderer);
}
gimp_preview_renderer_draw (cellviewable->renderer, window, widget,
cell_area, expose_area);
gimp_view_renderer_draw (cellviewable->renderer, window, widget,
cell_area, expose_area);
}
}
......@@ -362,12 +362,12 @@ gimp_cell_renderer_viewable_clicked (GimpCellRendererViewable *cell,
if (bevent->type == GDK_BUTTON_PRESS &&
(bevent->button == 1 || bevent->button == 2))
{
gimp_preview_popup_show (gtk_get_event_widget (event),
bevent,
cell->renderer->viewable,
cell->renderer->width,
cell->renderer->height,
cell->renderer->dot_for_dot);
gimp_view_popup_show (gtk_get_event_widget (event),
bevent,
cell->renderer->viewable,
cell->renderer->width,
cell->renderer->height,
cell->renderer->dot_for_dot);
}
gdk_event_free (event);
......
......@@ -38,9 +38,9 @@ typedef struct _GimpCellRendererViewableClass GimpCellRendererViewableClass;
struct _GimpCellRendererViewable
{
GtkCellRenderer parent_instance;
GtkCellRenderer parent_instance;
GimpPreviewRenderer *renderer;
GimpViewRenderer *renderer;
};
struct _GimpCellRendererViewableClass
......
......@@ -71,10 +71,10 @@ static gboolean gimp_component_editor_select (GtkTreeSelection *select
static gboolean gimp_component_editor_button_press (GtkWidget *widget,
GdkEventButton *bevent,
GimpComponentEditor *editor);
static void gimp_component_editor_renderer_update (GimpPreviewRenderer *renderer,
static void gimp_component_editor_renderer_update (GimpViewRenderer *renderer,
GimpComponentEditor *editor);
static void gimp_component_editor_mode_changed (GimpImage *gimage,
GimpComponentEditor *editor);
GimpComponentEditor *editor);
static void gimp_component_editor_alpha_changed (GimpImage *gimage,
GimpComponentEditor *editor);
static void gimp_component_editor_visibility_changed(GimpImage *gimage,
......@@ -146,7 +146,7 @@ gimp_component_editor_init (GimpComponentEditor *editor)
list = gtk_list_store_new (NUM_COLUMNS,
G_TYPE_INT,
G_TYPE_BOOLEAN,
GIMP_TYPE_PREVIEW_RENDERER,
GIMP_TYPE_VIEW_RENDERER,
G_TYPE_STRING);
editor->model = GTK_TREE_MODEL (list);
......@@ -207,13 +207,13 @@ gimp_component_editor_unrealize (GtkWidget *widget)
iter_valid;
iter_valid = gtk_tree_model_iter_next (editor->model, &iter))
{
GimpPreviewRenderer *renderer;
GimpViewRenderer *renderer;
gtk_tree_model_get (editor->model, &iter,
COLUMN_RENDERER, &renderer,
-1);
gimp_preview_renderer_unrealize (renderer);
gimp_view_renderer_unrealize (renderer);
g_object_unref (renderer);
}
......@@ -233,17 +233,17 @@ gimp_component_editor_set_image (GimpImageEditor *editor,
gimp_component_editor_clear_components (component_editor);
g_signal_handlers_disconnect_by_func (editor->gimage,
gimp_component_editor_mode_changed,
component_editor);
gimp_component_editor_mode_changed,
component_editor);
g_signal_handlers_disconnect_by_func (editor->gimage,
gimp_component_editor_alpha_changed,
component_editor);
gimp_component_editor_alpha_changed,
component_editor);
g_signal_handlers_disconnect_by_func (editor->gimage,
gimp_component_editor_visibility_changed,
component_editor);
gimp_component_editor_visibility_changed,
component_editor);
g_signal_handlers_disconnect_by_func (editor->gimage,
gimp_component_editor_active_changed,
component_editor);
gimp_component_editor_active_changed,
component_editor);
}
GIMP_IMAGE_EDITOR_CLASS (parent_class)->set_image (editor, gimage);
......@@ -253,17 +253,17 @@ gimp_component_editor_set_image (GimpImageEditor *editor,
gimp_component_editor_create_components (component_editor);
g_signal_connect (editor->gimage, "mode_changed",
G_CALLBACK (gimp_component_editor_mode_changed),
component_editor);
G_CALLBACK (gimp_component_editor_mode_changed),
component_editor);
g_signal_connect (editor->gimage, "alpha_changed",
G_CALLBACK (gimp_component_editor_alpha_changed),
component_editor);
G_CALLBACK (gimp_component_editor_alpha_changed),
component_editor);
g_signal_connect (editor->gimage, "component_visibility_changed",
G_CALLBACK (gimp_component_editor_visibility_changed),
component_editor);
G_CALLBACK (gimp_component_editor_visibility_changed),
component_editor);
g_signal_connect (editor->gimage, "component_active_changed",
G_CALLBACK (gimp_component_editor_active_changed),
component_editor);
G_CALLBACK (gimp_component_editor_active_changed),
component_editor);
}
}
......@@ -274,7 +274,7 @@ gimp_component_editor_new (gint preview_size,
GimpComponentEditor *editor;
g_return_val_if_fail (preview_size > 0 &&
preview_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
preview_size <= GIMP_VIEWABLE_MAX_PREVIEW_SIZE, NULL);
g_return_val_if_fail (GIMP_IS_MENU_FACTORY (menu_factory), NULL);
editor = g_object_new (GIMP_TYPE_COMPONENT_EDITOR,
......@@ -319,13 +319,13 @@ gimp_component_editor_set_preview_size (GimpComponentEditor *editor,
iter_valid;
iter_valid = gtk_tree_model_iter_next (editor->model, &iter))
{
GimpPreviewRenderer *renderer;
GimpViewRenderer *renderer;
gtk_tree_model_get (editor->model, &iter,
COLUMN_RENDERER, &renderer,
-1);
gimp_preview_renderer_set_size (renderer, preview_size, 1);
gimp_view_renderer_set_size (renderer, preview_size, 1);
g_object_unref (renderer);
}
......@@ -372,17 +372,17 @@ gimp_component_editor_create_components (GimpComponentEditor *editor)
for (i = 0; i < n_components; i++)
{
GimpPreviewRenderer *renderer;
gboolean visible;
GEnumValue *enum_value;
GtkTreeIter iter;
GimpViewRenderer *renderer;
gboolean visible;
GEnumValue *enum_value;
GtkTreeIter iter;
visible = gimp_image_get_component_visible (gimage, components[i]);
renderer = gimp_preview_renderer_new (G_TYPE_FROM_INSTANCE (gimage),
editor->preview_size, 1, FALSE);
gimp_preview_renderer_set_viewable (renderer, GIMP_VIEWABLE (gimage));
gimp_preview_renderer_remove_idle (renderer);
renderer = gimp_view_renderer_new (G_TYPE_FROM_INSTANCE (gimage),
editor->preview_size, 1, FALSE);
gimp_view_renderer_set_viewable (renderer, GIMP_VIEWABLE (gimage));
gimp_view_renderer_remove_idle (renderer);
GIMP_PREVIEW_RENDERER_IMAGE (renderer)->channel = components[i];
......@@ -546,7 +546,7 @@ gimp_component_editor_get_iter (GimpComponentEditor *editor,
}
static void
gimp_component_editor_renderer_update (GimpPreviewRenderer *renderer,
gimp_component_editor_renderer_update (GimpViewRenderer *renderer,
GimpComponentEditor *editor)
{
GtkTreeIter iter;
......
......@@ -37,7 +37,7 @@
#include "gimpdnd.h"
#include "gimpdocked.h"
#include "gimpview.h"
#include "gimppreviewrenderer.h"
#include "gimpviewrenderer.h"
#include "gimppropwidgets.h"
......@@ -237,8 +237,8 @@ gimp_container_box_get_preview (GimpDocked *docked,
preview = gimp_prop_preview_new (G_OBJECT (context), prop_name, height);
GIMP_VIEW (preview)->renderer->size = -1;
gimp_preview_renderer_set_size_full (GIMP_VIEW (preview)->renderer,
width, height, border_width);
gimp_view_renderer_set_size_full (GIMP_VIEW (preview)->renderer,
width, height, border_width);
return preview;
}
......@@ -34,7 +34,7 @@
#include "gimpcellrendererviewable.h"
#include "gimpcontainercombobox.h"
#include "gimpcontainerview.h"
#include "gimppreviewrenderer.h"
#include "gimpviewrenderer.h"
enum
......@@ -51,27 +51,27 @@ static void gimp_container_combo_box_init (GimpContainerComboBox *v
static void gimp_container_combo_box_view_iface_init (GimpContainerViewInterface *view_iface);
static gpointer gimp_container_combo_box_insert_item (GimpContainerView *view,
GimpViewable *viewable,
gint index);
GimpViewable *viewable,
gint index);
static void gimp_container_combo_box_remove_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
GimpViewable *viewable,
gpointer insert_data);
static void gimp_container_combo_box_reorder_item (GimpContainerView *view,
GimpViewable *viewable,
gint new_index,
gpointer insert_data);
GimpViewable *viewable,
gint new_index,
gpointer insert_data);
static void gimp_container_combo_box_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
GimpViewable *viewable,
gpointer insert_data);
static gboolean gimp_container_combo_box_select_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
GimpViewable *viewable,
gpointer insert_data);
static void gimp_container_combo_box_clear_items (GimpContainerView *view);
static void gimp_container_combo_box_set_preview_size (GimpContainerView *view);
static void gimp_container_combo_box_changed (GtkComboBox *combo_box,
GimpContainerView *view);
static void gimp_container_combo_box_renderer_update (GimpPreviewRenderer *renderer,
static void gimp_container_combo_box_renderer_update (GimpViewRenderer *renderer,
GimpContainerView *view);
......@@ -152,7 +152,7 @@ gimp_container_combo_box_init (GimpContainerComboBox *combo_box)
GtkCellRenderer *cell;
store = gtk_list_store_new (NUM_COLUMNS,
GIMP_TYPE_PREVIEW_RENDERER,
GIMP_TYPE_VIEW_RENDERER,
G_TYPE_STRING);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
......@@ -235,12 +235,12 @@ gimp_container_combo_box_set (GimpContainerComboBox *combo_box,
GtkTreeIter *iter,
GimpViewable *viewable)
{
GimpContainerView *view = GIMP_CONTAINER_VIEW (combo_box);
GtkTreeModel *model;
GimpPreviewRenderer *renderer;
gchar *name;
gint preview_size;
gint border_width;
GimpContainerView *view = GIMP_CONTAINER_VIEW (combo_box);
GtkTreeModel *model;
GimpViewRenderer *renderer;
gchar *name;
gint preview_size;