Commit b7f58e16 authored by David Odin's avatar David Odin

Renamed GimpPreviewSize to GimpViewSize.

* app/core/core-enums.h: Renamed GimpPreviewSize to GimpViewSize.

* app/core/core-enums.c: Regenerated.

* app/actions/dockable-actions.c

* app/config/gimpcoreconfig.c
* app/config/gimpcoreconfig.h
* app/config/gimpdisplayconfig.c
* app/config/gimpdisplayconfig.h

* app/core/gimpundo.c

* app/display/gimpnavigationeditor.c

* app/gui/dialogs.c
* app/gui/file-open-location-dialog.c

* app/tools/gimppaintoptions-gui.c
* app/tools/gimptextoptions.c

* app/widgets/gimpbrushselect.c
* app/widgets/gimpcontainerpopup.c
* app/widgets/gimpcontainerview.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpfontselect.c
* app/widgets/gimpgradientselect.c
* app/widgets/gimppaletteselect.c
* app/widgets/gimppatternselect.c
* app/widgets/gimpselectioneditor.c
* app/widgets/gimpsessioninfo.c
* app/widgets/gimptemplateeditor.c
* app/widgets/gimpundoeditor.c
* app/widgets/gimpundoeditor.h
* app/widgets/gimpviewablebutton.c: Changed accordingly.
parent 488bfe58
2004-08-29 DindinX <david@dindinx.org>
* app/core/core-enums.h: Renamed GimpPreviewSize to GimpViewSize.
* app/core/core-enums.c: Regenerated.
* app/actions/dockable-actions.c
* app/config/gimpcoreconfig.c
* app/config/gimpcoreconfig.h
* app/config/gimpdisplayconfig.c
* app/config/gimpdisplayconfig.h
* app/core/gimpundo.c
* app/display/gimpnavigationeditor.c
* app/gui/dialogs.c
* app/gui/file-open-location-dialog.c
* app/tools/gimppaintoptions-gui.c
* app/tools/gimptextoptions.c
* app/widgets/gimpbrushselect.c
* app/widgets/gimpcontainerpopup.c
* app/widgets/gimpcontainerview.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpfontselect.c
* app/widgets/gimpgradientselect.c
* app/widgets/gimppaletteselect.c
* app/widgets/gimppatternselect.c
* app/widgets/gimpselectioneditor.c
* app/widgets/gimpsessioninfo.c
* app/widgets/gimptemplateeditor.c
* app/widgets/gimpundoeditor.c
* app/widgets/gimpundoeditor.h
* app/widgets/gimpviewablebutton.c: Changed accordingly.
2004-08-28 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/gimp-composite-sse.c
......
......@@ -97,15 +97,15 @@ static GimpToggleActionEntry dockable_toggle_actions[] =
static GimpRadioActionEntry dockable_preview_size_actions[] =
{
PREVIEW_SIZE ("tiny", N_("_Tiny"), GIMP_PREVIEW_SIZE_TINY),
PREVIEW_SIZE ("extra-small", N_("E_xtra Small"), GIMP_PREVIEW_SIZE_EXTRA_SMALL),
PREVIEW_SIZE ("small", N_("_Small"), GIMP_PREVIEW_SIZE_SMALL),
PREVIEW_SIZE ("medium", N_("_Medium"), GIMP_PREVIEW_SIZE_MEDIUM),
PREVIEW_SIZE ("large", N_("_Large"), GIMP_PREVIEW_SIZE_LARGE),
PREVIEW_SIZE ("extra-large", N_("Ex_tra Large"), GIMP_PREVIEW_SIZE_EXTRA_LARGE),
PREVIEW_SIZE ("huge", N_("_Huge"), GIMP_PREVIEW_SIZE_HUGE),
PREVIEW_SIZE ("enormous", N_("_Enormous"), GIMP_PREVIEW_SIZE_ENORMOUS),
PREVIEW_SIZE ("gigantic", N_("_Gigantic"), GIMP_PREVIEW_SIZE_GIGANTIC)
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)
};
static GimpRadioActionEntry dockable_tab_style_actions[] =
......@@ -153,7 +153,7 @@ dockable_actions_setup (GimpActionGroup *group)
gimp_action_group_add_radio_actions (group,
dockable_preview_size_actions,
G_N_ELEMENTS (dockable_preview_size_actions),
GIMP_PREVIEW_SIZE_MEDIUM,
GIMP_VIEW_SIZE_MEDIUM,
G_CALLBACK (dockable_preview_size_cmd_callback));
gimp_action_group_add_radio_actions (group,
......@@ -180,7 +180,7 @@ dockable_actions_update (GimpActionGroup *group,
GimpViewType view_type = -1;
gboolean list_view_available = FALSE;
gboolean grid_view_available = FALSE;
GimpPreviewSize preview_size = -1;
GimpViewSize preview_size = -1;
GimpTabStyle tab_style = -1;
gint n_pages = 0;
gint n_screens = 1;
......@@ -256,39 +256,39 @@ dockable_actions_update (GimpActionGroup *group,
if (preview_size != -1)
{
if (preview_size >= GIMP_PREVIEW_SIZE_GIGANTIC)
if (preview_size >= GIMP_VIEW_SIZE_GIGANTIC)
{
SET_ACTIVE ("dockable-preview-size-gigantic", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_ENORMOUS)
else if (preview_size >= GIMP_VIEW_SIZE_ENORMOUS)
{
SET_ACTIVE ("dockable-preview-size-enormous", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_HUGE)
else if (preview_size >= GIMP_VIEW_SIZE_HUGE)
{
SET_ACTIVE ("dockable-preview-size-huge", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_EXTRA_LARGE)
else if (preview_size >= GIMP_VIEW_SIZE_EXTRA_LARGE)
{
SET_ACTIVE ("dockable-preview-size-extra-large", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_LARGE)
else if (preview_size >= GIMP_VIEW_SIZE_LARGE)
{
SET_ACTIVE ("dockable-preview-size-large", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_MEDIUM)
else if (preview_size >= GIMP_VIEW_SIZE_MEDIUM)
{
SET_ACTIVE ("dockable-preview-size-medium", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_SMALL)
else if (preview_size >= GIMP_VIEW_SIZE_SMALL)
{
SET_ACTIVE ("dockable-preview-size-small", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_EXTRA_SMALL)
else if (preview_size >= GIMP_VIEW_SIZE_EXTRA_SMALL)
{
SET_ACTIVE ("dockable-preview-size-extra-small", TRUE);
}
else if (preview_size >= GIMP_PREVIEW_SIZE_TINY)
else if (preview_size >= GIMP_VIEW_SIZE_TINY)
{
SET_ACTIVE ("dockable-preview-size-tiny", TRUE);
}
......
......@@ -286,8 +286,8 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
GIMP_PARAM_CONFIRM);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_UNDO_PREVIEW_SIZE,
"undo-preview-size", UNDO_PREVIEW_SIZE_BLURB,
GIMP_TYPE_PREVIEW_SIZE,
GIMP_PREVIEW_SIZE_LARGE,
GIMP_TYPE_VIEW_SIZE,
GIMP_VIEW_SIZE_LARGE,
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class,
PROP_PLUGINRC_PATH,
......@@ -301,8 +301,8 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_LAYER_PREVIEW_SIZE,
"layer-preview-size", LAYER_PREVIEW_SIZE_BLURB,
GIMP_TYPE_PREVIEW_SIZE,
GIMP_PREVIEW_SIZE_MEDIUM,
GIMP_TYPE_VIEW_SIZE,
GIMP_VIEW_SIZE_MEDIUM,
0);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_THUMBNAIL_SIZE,
"thumbnail-size", THUMBNAIL_SIZE_BLURB,
......
......@@ -68,10 +68,10 @@ struct _GimpCoreConfig
GimpGrid *default_grid;
gint levels_of_undo;
guint64 undo_size;
GimpPreviewSize undo_preview_size;
GimpViewSize undo_preview_size;
gchar *plug_in_rc_path;
gboolean layer_previews;
GimpPreviewSize layer_preview_size;
GimpViewSize layer_preview_size;
GimpThumbnailSize thumbnail_size;
gboolean install_cmap;
gint min_colors;
......
......@@ -235,8 +235,8 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_NAV_PREVIEW_SIZE,
"navigation-preview-size",
NAVIGATION_PREVIEW_SIZE_BLURB,
GIMP_TYPE_PREVIEW_SIZE,
GIMP_PREVIEW_SIZE_MEDIUM,
GIMP_TYPE_VIEW_SIZE,
GIMP_VIEW_SIZE_MEDIUM,
0);
GIMP_CONFIG_INSTALL_PROP_OBJECT (object_class, PROP_DEFAULT_VIEW,
......
......@@ -59,7 +59,7 @@ struct _GimpDisplayConfig
gdouble monitor_xres;
gdouble monitor_yres;
gboolean monitor_res_from_gdk;
GimpPreviewSize nav_preview_size;
GimpViewSize nav_preview_size;
GimpDisplayOptions *default_view;
GimpDisplayOptions *default_fullscreen_view;
gboolean activate_on_focus;
......
......@@ -404,26 +404,26 @@ gimp_rotation_type_get_type (void)
}
GType
gimp_preview_size_get_type (void)
gimp_view_size_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_PREVIEW_SIZE_TINY, N_("Tiny"), "tiny" },
{ GIMP_PREVIEW_SIZE_EXTRA_SMALL, N_("Very small"), "extra-small" },
{ GIMP_PREVIEW_SIZE_SMALL, N_("Small"), "small" },
{ GIMP_PREVIEW_SIZE_MEDIUM, N_("Medium"), "medium" },
{ GIMP_PREVIEW_SIZE_LARGE, N_("Large"), "large" },
{ GIMP_PREVIEW_SIZE_EXTRA_LARGE, N_("Very large"), "extra-large" },
{ GIMP_PREVIEW_SIZE_HUGE, N_("Huge"), "huge" },
{ GIMP_PREVIEW_SIZE_ENORMOUS, N_("Enormous"), "enormous" },
{ GIMP_PREVIEW_SIZE_GIGANTIC, N_("Gigantic"), "gigantic" },
{ GIMP_VIEW_SIZE_TINY, N_("Tiny"), "tiny" },
{ GIMP_VIEW_SIZE_EXTRA_SMALL, N_("Very small"), "extra-small" },
{ GIMP_VIEW_SIZE_SMALL, N_("Small"), "small" },
{ GIMP_VIEW_SIZE_MEDIUM, N_("Medium"), "medium" },
{ GIMP_VIEW_SIZE_LARGE, N_("Large"), "large" },
{ GIMP_VIEW_SIZE_EXTRA_LARGE, N_("Very large"), "extra-large" },
{ GIMP_VIEW_SIZE_HUGE, N_("Huge"), "huge" },
{ GIMP_VIEW_SIZE_ENORMOUS, N_("Enormous"), "enormous" },
{ GIMP_VIEW_SIZE_GIGANTIC, N_("Gigantic"), "gigantic" },
{ 0, NULL, NULL }
};
static GType type = 0;
if (! type)
type = g_enum_register_static ("GimpPreviewSize", values);
type = g_enum_register_static ("GimpViewSize", values);
return type;
}
......
......@@ -300,22 +300,22 @@ typedef enum
} GimpRotationType;
#define GIMP_TYPE_PREVIEW_SIZE (gimp_preview_size_get_type ())
#define GIMP_TYPE_VIEW_SIZE (gimp_view_size_get_type ())
GType gimp_preview_size_get_type (void) G_GNUC_CONST;
GType gimp_view_size_get_type (void) G_GNUC_CONST;
typedef enum /*< pdb-skip >*/
{
GIMP_PREVIEW_SIZE_TINY = 12, /*< desc="Tiny" >*/
GIMP_PREVIEW_SIZE_EXTRA_SMALL = 16, /*< desc="Very small" >*/
GIMP_PREVIEW_SIZE_SMALL = 24, /*< desc="Small" >*/
GIMP_PREVIEW_SIZE_MEDIUM = 32, /*< desc="Medium" >*/
GIMP_PREVIEW_SIZE_LARGE = 48, /*< desc="Large" >*/
GIMP_PREVIEW_SIZE_EXTRA_LARGE = 64, /*< desc="Very large" >*/
GIMP_PREVIEW_SIZE_HUGE = 96, /*< desc="Huge" >*/
GIMP_PREVIEW_SIZE_ENORMOUS = 128, /*< desc="Enormous" >*/
GIMP_PREVIEW_SIZE_GIGANTIC = 192 /*< desc="Gigantic" >*/
} GimpPreviewSize;
GIMP_VIEW_SIZE_TINY = 12, /*< desc="Tiny" >*/
GIMP_VIEW_SIZE_EXTRA_SMALL = 16, /*< desc="Very small" >*/
GIMP_VIEW_SIZE_SMALL = 24, /*< desc="Small" >*/
GIMP_VIEW_SIZE_MEDIUM = 32, /*< desc="Medium" >*/
GIMP_VIEW_SIZE_LARGE = 48, /*< desc="Large" >*/
GIMP_VIEW_SIZE_EXTRA_LARGE = 64, /*< desc="Very large" >*/
GIMP_VIEW_SIZE_HUGE = 96, /*< desc="Huge" >*/
GIMP_VIEW_SIZE_ENORMOUS = 128, /*< desc="Enormous" >*/
GIMP_VIEW_SIZE_GIGANTIC = 192 /*< desc="Gigantic" >*/
} GimpViewSize;
#define GIMP_TYPE_REPEAT_MODE (gimp_repeat_mode_get_type ())
......
......@@ -484,7 +484,7 @@ gimp_undo_create_preview_private (GimpUndo *undo)
{
GimpImage *image = undo->gimage;
GimpViewable *preview_viewable;
GimpPreviewSize preview_size;
GimpViewSize preview_size;
gint width;
gint height;
......
......@@ -118,45 +118,45 @@ static const GimpDialogFactoryEntry dock_entries[] =
/* list views */
{ "gimp-image-list", dialogs_image_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-list", dialogs_brush_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-list", dialogs_pattern_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-list", dialogs_gradient_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-list", dialogs_palette_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-font-list", dialogs_font_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-list", dialogs_tool_list_view_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-list", dialogs_buffer_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-list", dialogs_document_list_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-template-list", dialogs_template_list_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
/* grid views */
{ "gimp-image-grid", dialogs_image_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-grid", dialogs_brush_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-grid", dialogs_pattern_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-grid", dialogs_gradient_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-grid", dialogs_palette_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-font-grid", dialogs_font_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-grid", dialogs_tool_grid_view_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
/* image related */
{ "gimp-layer-list", dialogs_layer_list_view_new,
......
......@@ -109,7 +109,7 @@ file_open_location_dialog_show (Gimp *gimp,
gtk_widget_show (label);
entry = gimp_container_entry_new (gimp->documents, NULL,
GIMP_PREVIEW_SIZE_SMALL, 1);
GIMP_VIEW_SIZE_SMALL, 1);
completion = gtk_entry_get_completion (GTK_ENTRY (entry));
gtk_entry_completion_set_match_func (completion,
......
......@@ -172,7 +172,7 @@ gimp_navigation_editor_init (GimpNavigationEditor *editor)
editor->view = gimp_view_new_by_types (GIMP_TYPE_NAVIGATION_VIEW,
GIMP_TYPE_IMAGE,
GIMP_PREVIEW_SIZE_MEDIUM, 0, TRUE);
GIMP_VIEW_SIZE_MEDIUM, 0, TRUE);
gtk_container_add (GTK_CONTAINER (frame), editor->view);
gtk_widget_show (editor->view);
......@@ -440,8 +440,8 @@ gimp_navigation_editor_new_private (GimpDisplayShell *shell,
GtkWidget *hscale;
gtk_widget_set_size_request (editor->view,
GIMP_PREVIEW_SIZE_HUGE,
GIMP_PREVIEW_SIZE_HUGE);
GIMP_VIEW_SIZE_HUGE,
GIMP_VIEW_SIZE_HUGE);
gimp_view_set_expand (GIMP_VIEW (editor->view), TRUE);
/* the editor buttons */
......
......@@ -118,45 +118,45 @@ static const GimpDialogFactoryEntry dock_entries[] =
/* list views */
{ "gimp-image-list", dialogs_image_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-list", dialogs_brush_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-list", dialogs_pattern_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-list", dialogs_gradient_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-list", dialogs_palette_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-font-list", dialogs_font_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-list", dialogs_tool_list_view_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-list", dialogs_buffer_list_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-list", dialogs_document_list_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-template-list", dialogs_template_list_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
/* grid views */
{ "gimp-image-grid", dialogs_image_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-grid", dialogs_brush_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-grid", dialogs_pattern_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-grid", dialogs_gradient_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-grid", dialogs_palette_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-font-grid", dialogs_font_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-grid", dialogs_tool_grid_view_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
GIMP_VIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
/* image related */
{ "gimp-layer-list", dialogs_layer_list_view_new,
......
......@@ -109,7 +109,7 @@ file_open_location_dialog_show (Gimp *gimp,
gtk_widget_show (label);
entry = gimp_container_entry_new (gimp->documents, NULL,
GIMP_PREVIEW_SIZE_SMALL, 1);
GIMP_VIEW_SIZE_SMALL, 1);
completion = gtk_entry_get_completion (GTK_ENTRY (entry));
gtk_entry_completion_set_match_func (completion,
......
......@@ -138,7 +138,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
{
button = gimp_viewable_button_new (context->gimp->brush_factory->container,
context,
GIMP_PREVIEW_SIZE_SMALL, 1,
GIMP_VIEW_SIZE_SMALL, 1,
dialog_factory,
"gimp-brush-grid|gimp-brush-list",
GIMP_STOCK_BRUSH,
......@@ -155,7 +155,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
{
button = gimp_viewable_button_new (context->gimp->pattern_factory->container,
context,
GIMP_PREVIEW_SIZE_SMALL, 1,
GIMP_VIEW_SIZE_SMALL, 1,
dialog_factory,
"gimp-pattern-grid|gimp-pattern-list",
GIMP_STOCK_PATTERN,
......@@ -179,7 +179,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
gradient_button =
gimp_viewable_button_new (context->gimp->gradient_factory->container,
context,
GIMP_PREVIEW_SIZE_LARGE, 1,
GIMP_VIEW_SIZE_LARGE, 1,
dialog_factory,
"gimp-gradient-list|gimp-gradient-grid",
GIMP_STOCK_GRADIENT,
......@@ -187,7 +187,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
/* use smaller previews for the popup */
GIMP_VIEWABLE_BUTTON (gradient_button)->preview_size =
GIMP_PREVIEW_SIZE_SMALL;
GIMP_VIEW_SIZE_SMALL;
gtk_box_pack_start (GTK_BOX (hbox), gradient_button, FALSE, FALSE, 0);
gtk_widget_show (gradient_button);
......
......@@ -426,7 +426,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
button = gimp_viewable_button_new (GIMP_CONTEXT (options)->gimp->fonts,
GIMP_CONTEXT (options),
GIMP_PREVIEW_SIZE_SMALL, 1,
GIMP_VIEW_SIZE_SMALL, 1,
dialog_factory,
"gimp-font-list|gimp-font-grid",
GIMP_STOCK_FONT,
......@@ -436,7 +436,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
entry = gimp_container_entry_new (GIMP_CONTEXT (options)->gimp->fonts,
GIMP_CONTEXT (options),
GIMP_PREVIEW_SIZE_SMALL, 1);
GIMP_VIEW_SIZE_SMALL, 1);
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_widget_show (entry);
......
......@@ -180,12 +180,12 @@ gimp_brush_select_constructor (GType type,
GIMP_DATA_SELECT (dialog)->edit_func,
dialog->context,
FALSE,
GIMP_PREVIEW_SIZE_MEDIUM, 1,
GIMP_VIEW_SIZE_MEDIUM, 1,
dialog->menu_factory);
gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
5 * (GIMP_PREVIEW_SIZE_MEDIUM + 2),
5 * (GIMP_PREVIEW_SIZE_MEDIUM + 2));
5 * (GIMP_VIEW_SIZE_MEDIUM + 2),
5 * (GIMP_VIEW_SIZE_MEDIUM + 2));
gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->view);
......
......@@ -161,8 +161,8 @@ static void
gimp_container_popup_init (GimpContainerPopup *popup)
{
popup->view_type = GIMP_VIEW_TYPE_LIST;
popup->default_preview_size = GIMP_PREVIEW_SIZE_SMALL;
popup->preview_size = GIMP_PREVIEW_SIZE_SMALL;
popup->default_preview_size = GIMP_VIEW_SIZE_SMALL;
popup->preview_size = GIMP_VIEW_SIZE_SMALL;
popup->preview_border_width = 1;
popup->frame = gtk_frame_new (NULL);
......@@ -533,7 +533,7 @@ gimp_container_popup_smaller_clicked (GtkWidget *button,
preview_size = gimp_container_view_get_preview_size (popup->editor->view,
NULL);
preview_size = MAX (GIMP_PREVIEW_SIZE_TINY, preview_size * 0.8);
preview_size = MAX (GIMP_VIEW_SIZE_TINY, preview_size * 0.8);
if (preview_size != popup->preview_size)
{
......@@ -554,7 +554,7 @@ gimp_container_popup_larger_clicked (GtkWidget *button,
preview_size = gimp_container_view_get_preview_size (popup->editor->view,
NULL);
preview_size = MAX (GIMP_PREVIEW_SIZE_TINY, preview_size * 1.2);
preview_size = MAX (GIMP_VIEW_SIZE_TINY, preview_size * 1.2);
if (preview_size != popup->preview_size)
{
......
......@@ -216,7 +216,7 @@ gimp_container_view_iface_base_init (GimpContainerViewInterface *view_iface)
g_param_spec_int ("preview-size",
NULL, NULL,
1, GIMP_VIEWABLE_MAX_PREVIEW_SIZE,
GIMP_PREVIEW_SIZE_MEDIUM,
GIMP_VIEW_SIZE_MEDIUM,
G_PARAM_READWRITE));
g_object_interface_install_property (view_iface,
......
This diff is collapsed.
......@@ -110,12 +110,12 @@ gimp_font_select_constructor (GType type,
dialog->view = gimp_font_view_new (GIMP_VIEW_TYPE_LIST,
dialog->context->gimp->fonts,
dialog->context,
GIMP_PREVIEW_SIZE_MEDIUM, 1,
GIMP_VIEW_SIZE_MEDIUM, 1,
dialog->menu_factory);
gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
6 * (GIMP_PREVIEW_SIZE_MEDIUM + 2),
6 * (GIMP_PREVIEW_SIZE_MEDIUM + 2));
6 * (GIMP_VIEW_SIZE_MEDIUM + 2),
6 * (GIMP_VIEW_SIZE_MEDIUM + 2));
gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->view);
......
......@@ -129,14 +129,14 @@ gimp_gradient_select_constructor (GType type,
dialog->context->gimp->gradient_factory,
GIMP_DATA_SELECT (dialog)->edit_func,
dialog->context,
GIMP_PREVIEW_SIZE_MEDIUM, 1,
GIMP_VIEW_SIZE_MEDIUM, 1,
dialog->menu_factory, "<Gradients>",
"/gradients-popup",
"gradients");
gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
6 * (GIMP_PREVIEW_SIZE_MEDIUM + 2),
6 * (GIMP_PREVIEW_SIZE_MEDIUM + 2));
6 * (GIMP_VIEW_SIZE_MEDIUM + 2),
6 * (GIMP_VIEW_SIZE_MEDIUM + 2));
gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->view);
......
......@@ -119,14 +119,14 @@ gimp_palette_select_constructor (GType type,
dialog->context->gimp->palette_factory,
GIMP_DATA_SELECT (dialog)->edit_func,
dialog->context,
GIMP_PREVIEW_SIZE_MEDIUM, 1,
GIMP_VIEW_SIZE_MEDIUM, 1,
dialog->menu_factory, "<Palettes>",
"/palettes-popup",
"palettes");
gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
5 * (GIMP_PREVIEW_SIZE_MEDIUM + 2),
8 * (GIMP_PREVIEW_SIZE_MEDIUM + 2));
5 * (GIMP_VIEW_SIZE_MEDIUM + 2),
8 * (GIMP_VIEW_SIZE_MEDIUM + 2));
gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->view);
......
......@@ -113,14 +113,14 @@ gimp_pattern_select_constructor (GType type,
dialog->context->gimp->pattern_factory,
GIMP_DATA_SELECT (dialog)->edit_func,
dialog->context,
GIMP_PREVIEW_SIZE_MEDIUM, 1,
GIMP_VIEW_SIZE_MEDIUM, 1,
dialog->menu_factory, "<Patterns>",
"/patterns-popup",
"patterns");
gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (GIMP_CONTAINER_EDITOR (dialog->view)->view),
6 * (GIMP_PREVIEW_SIZE_MEDIUM + 2),
6 * (GIMP_PREVIEW_SIZE_MEDIUM + 2));
6 * (GIMP_VIEW_SIZE_MEDIUM + 2),
6 * (GIMP_VIEW_SIZE_MEDIUM + 2));
gtk_container_set_border_width (GTK_CONTAINER (dialog->view), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog->view);
......
......@@ -130,12 +130,12 @@ gimp_selection_editor_init (GimpSelectionEditor *editor)
editor->preview = gimp_view_new_by_types (GIMP_TYPE_VIEW,
GIMP_TYPE_SELECTION,
GIMP_PREVIEW_SIZE_HUGE,
GIMP_VIEW_SIZE_HUGE,
0, TRUE);
gimp_view_renderer_set_background (GIMP_VIEW (editor->preview)->renderer,
GIMP_STOCK_TEXTURE);
gtk_widget_set_size_request (editor->preview,
GIMP_PREVIEW_SIZE_HUGE, GIMP_PREVIEW_SIZE_HUGE);
GIMP_VIEW_SIZE_HUGE, GIMP_VIEW_SIZE_HUGE);
gimp_view_set_expand (GIMP_VIEW (editor->preview), TRUE);
gtk_container_add (GTK_CONTAINER (frame), editor->preview);
gtk_widget_show (editor->preview);
......
......@@ -764,8 +764,8 @@ gimp_session_info_restore (GimpSessionInfo *info,
GimpSessionInfoDockable *dockable_info = pages->data;
GtkWidget *dockable;
if (dockable_info->preview_size < GIMP_PREVIEW_SIZE_TINY ||
dockable_info->preview_size > GIMP_PREVIEW_SIZE_GIGANTIC)
if (dockable_info->preview_size < GIMP_VIEW_SIZE_TINY ||
dockable_info->preview_size > GIMP_VIEW_SIZE_GIGANTIC)
dockable_info->preview_size = -1;
/* use the new dock's dialog factory to create dockables
......
......@@ -531,7 +531,7 @@ gimp_template_editor_new (GimpTemplate *template,
button = gimp_viewable_button_new (editor->stock_id_container,
editor->stock_id_context,
GIMP_PREVIEW_SIZE_SMALL, 0,
GIMP_VIEW_SIZE_SMALL, 0,
NULL, NULL, NULL, NULL);
gimp_viewable_button_set_view_type (GIMP_VIEWABLE_BUTTON (button),
GIMP_VIEW_TYPE_GRID);
......
......@@ -123,8 +123,8 @@ gimp_undo_editor_class_init (GimpUndoEditorClass *klass)
PROP_PREVIEW_SIZE,
g_param_spec_enum ("preview-size",
NULL, NULL,
GIMP_TYPE_PREVIEW_SIZE,
GIMP_PREVIEW_SIZE_LARGE,
GIMP_TYPE_VIEW_SIZE,
GIMP_VIEW_SIZE_LARGE,
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
}
......
......@@ -39,7 +39,7 @@ struct _GimpUndoEditor
GimpContainer *container;
GtkWidget *view;
GimpPreviewSize preview_size;
GimpViewSize preview_size;
GimpUndo *base_item;
......
......@@ -105,9 +105,9 @@ static void
gimp_viewable_button_init (GimpViewableButton *button)
{
button->popup_view_type = GIMP_VIEW_TYPE_LIST;
button->popup_preview_size = GIMP_PREVIEW_SIZE_SMALL;
button->popup_preview_size = GIMP_VIEW_SIZE_SMALL;
button->preview_size = GIMP_PREVIEW_SIZE_SMALL;
button->preview_size = GIMP_VIEW_SIZE_SMALL;
button->preview_border_width = 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment