dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extended GimpTabStyle enum so we are able to distinguish icon and preview 

2003-08-15  Michael Natterer  <mitch@gimp.org>

	* app/widgets/widgets-enums.[ch]: extended GimpTabStyle enum so we
	are able to distinguish icon and preview tabs.

	* app/widgets/gimpdockable.[ch]: renamed GimpDockableGetIconFunc
	to GimpDockableGetPreviewFunc. Always create stock icons for
	"icon" tab styles and use the get_preview_func only for "preview"
	tab styles.

	* app/gui/dialogs-constructors.c: changed accordingly.

	* app/gui/dialogs-menu.c: Added "Current Status" options to the
	"Tab Style" menu and grey them out if the dockable has no
	get_preview_func.
This commit is contained in:
Michael Natterer 2003-08-15 15:03:03 +00:00 committed by Michael Natterer
parent 07e850790b
commit 375d479dad
8 changed files with 150 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2003-08-15 Michael Natterer <mitch@gimp.org>
* app/widgets/widgets-enums.[ch]: extended GimpTabStyle enum so we
are able to distinguish icon and preview tabs.
* app/widgets/gimpdockable.[ch]: renamed GimpDockableGetIconFunc
to GimpDockableGetPreviewFunc. Always create stock icons for
"icon" tab styles and use the get_preview_func only for "preview"
tab styles.
* app/gui/dialogs-constructors.c: changed accordingly.
* app/gui/dialogs-menu.c: Added "Current Status" options to the
"Tab Style" menu and grey them out if the dockable has no
get_preview_func.
2003-08-15 Sven Neumann <neo@bender>
* LICENSE: cosmetics.

60
app/dialogs/dialogs-constructors.c
View File

@ -94,11 +94,11 @@
static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable);
static GtkWidget * dialogs_viewable_icon_func (GimpDockable *dockable,
static GtkWidget * dialogs_viewable_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer data);
static GtkWidget * dialogs_tool_options_icon_func (GimpDockable *dockable,
static GtkWidget * dialogs_tool_options_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer data);
@ -120,8 +120,8 @@ static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
const gchar *name,
const gchar *blurb,
const gchar *stock_id,
GimpDockableGetIconFunc get_icon_func,
gpointer get_icon_data,
GimpDockableGetPreviewFunc get_preview_func,
gpointer get_preview_data,
GimpDockableSetContextFunc set_context_func);
static void dialogs_image_item_view_image_changed (GimpContext *context,
@ -252,7 +252,7 @@ dialogs_tool_options_get (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Tool Options"), _("Tool Options"),
GIMP_STOCK_TOOL_OPTIONS,
dialogs_tool_options_icon_func, NULL,
dialogs_tool_options_preview_func, NULL,
NULL);
}
@ -339,7 +339,7 @@ dialogs_brush_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Brushes"), _("Brush List"),
GIMP_STOCK_TOOL_PAINTBRUSH,
dialogs_viewable_icon_func, "brush",
dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func);
}
@ -360,7 +360,7 @@ dialogs_pattern_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Patterns"), _("Pattern List"),
GIMP_STOCK_TOOL_BUCKET_FILL,
dialogs_viewable_icon_func, "pattern",
dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func);
}
@ -381,7 +381,7 @@ dialogs_gradient_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Gradients"), _("Gradient List"),
GIMP_STOCK_TOOL_BLEND,
dialogs_viewable_icon_func, "gradient",
dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func);
}
@ -402,7 +402,7 @@ dialogs_palette_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Palettes"), _("Palette List"),
GTK_STOCK_SELECT_COLOR,
dialogs_viewable_icon_func, "palette",
dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func);
}
@ -421,7 +421,7 @@ dialogs_font_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Fonts"), _("Font List"),
GTK_STOCK_SELECT_FONT,
dialogs_viewable_icon_func, "font",
dialogs_viewable_preview_func, "font",
dialogs_set_view_context_func);
}
@ -440,7 +440,7 @@ dialogs_tool_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Tools"), _("Tool List"),
GTK_STOCK_MISSING_IMAGE,
dialogs_viewable_icon_func, "tool",
dialogs_viewable_preview_func, "tool",
dialogs_set_view_context_func);
}
@ -553,7 +553,7 @@ dialogs_brush_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Brushes"), _("Brush Grid"),
GIMP_STOCK_TOOL_PAINTBRUSH,
dialogs_viewable_icon_func, "brush",
dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func);
}
@ -574,7 +574,7 @@ dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Patterns"), _("Pattern Grid"),
GIMP_STOCK_TOOL_BUCKET_FILL,
dialogs_viewable_icon_func, "pattern",
dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func);
}
@ -595,7 +595,7 @@ dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Gradients"), _("Gradient Grid"),
GIMP_STOCK_TOOL_BLEND,
dialogs_viewable_icon_func, "gradient",
dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func);
}
@ -616,7 +616,7 @@ dialogs_palette_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Palettes"), _("Palette Grid"),
GTK_STOCK_SELECT_COLOR,
dialogs_viewable_icon_func, "palette",
dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func);
}
@ -635,7 +635,7 @@ dialogs_font_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Fonts"), _("Font Grid"),
GTK_STOCK_SELECT_FONT,
dialogs_viewable_icon_func, "font",
dialogs_viewable_preview_func, "font",
dialogs_set_view_context_func);
}
@ -654,7 +654,7 @@ dialogs_tool_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Tools"), _("Tool Grid"),
GTK_STOCK_MISSING_IMAGE,
dialogs_viewable_icon_func, "tool",
dialogs_viewable_preview_func, "tool",
dialogs_set_view_context_func);
}
@ -1066,10 +1066,10 @@ dialogs_indexed_palette_selected (GimpColormapEditor *editor,
}
static GtkWidget *
dialogs_viewable_icon_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer icon_data)
dialogs_viewable_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer preview_data)
{
GtkWidget *preview;
gint width;
@ -1079,7 +1079,7 @@ dialogs_viewable_icon_func (GimpDockable *dockable,
gtk_icon_size_lookup (size, &width, &height);
prop_name = (const gchar *) icon_data;
prop_name = (const gchar *) preview_data;
is_tool = (strcmp (prop_name, "tool") == 0);
@ -1115,10 +1115,10 @@ dialogs_tool_options_tool_changed (GimpContext *context,
}
static GtkWidget *
dialogs_tool_options_icon_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer icon_data)
dialogs_tool_options_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer preview_data)
{
GimpToolInfo *tool_info;
GtkWidget *hbox;
@ -1274,15 +1274,15 @@ dialogs_dockable_new (GtkWidget *widget,
const gchar *name,
const gchar *blurb,
const gchar *stock_id,
GimpDockableGetIconFunc get_icon_func,
gpointer get_icon_data,
GimpDockableGetPreviewFunc get_preview_func,
gpointer get_preview_data,
GimpDockableSetContextFunc set_context_func)
{
GtkWidget *dockable;
dockable = gimp_dockable_new (name, blurb, stock_id,
get_icon_func,
get_icon_data,
get_preview_func,
get_preview_data,
set_context_func);
gtk_container_add (GTK_CONTAINER (dockable), widget);
gtk_widget_show (widget);

60
app/gui/dialogs-constructors.c
View File

@ -94,11 +94,11 @@
static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable);
static GtkWidget * dialogs_viewable_icon_func (GimpDockable *dockable,
static GtkWidget * dialogs_viewable_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer data);
static GtkWidget * dialogs_tool_options_icon_func (GimpDockable *dockable,
static GtkWidget * dialogs_tool_options_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer data);
@ -120,8 +120,8 @@ static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
const gchar *name,
const gchar *blurb,
const gchar *stock_id,
GimpDockableGetIconFunc get_icon_func,
gpointer get_icon_data,
GimpDockableGetPreviewFunc get_preview_func,
gpointer get_preview_data,
GimpDockableSetContextFunc set_context_func);
static void dialogs_image_item_view_image_changed (GimpContext *context,
@ -252,7 +252,7 @@ dialogs_tool_options_get (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Tool Options"), _("Tool Options"),
GIMP_STOCK_TOOL_OPTIONS,
dialogs_tool_options_icon_func, NULL,
dialogs_tool_options_preview_func, NULL,
NULL);
}
@ -339,7 +339,7 @@ dialogs_brush_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Brushes"), _("Brush List"),
GIMP_STOCK_TOOL_PAINTBRUSH,
dialogs_viewable_icon_func, "brush",
dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func);
}
@ -360,7 +360,7 @@ dialogs_pattern_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Patterns"), _("Pattern List"),
GIMP_STOCK_TOOL_BUCKET_FILL,
dialogs_viewable_icon_func, "pattern",
dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func);
}
@ -381,7 +381,7 @@ dialogs_gradient_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Gradients"), _("Gradient List"),
GIMP_STOCK_TOOL_BLEND,
dialogs_viewable_icon_func, "gradient",
dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func);
}
@ -402,7 +402,7 @@ dialogs_palette_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Palettes"), _("Palette List"),
GTK_STOCK_SELECT_COLOR,
dialogs_viewable_icon_func, "palette",
dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func);
}
@ -421,7 +421,7 @@ dialogs_font_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Fonts"), _("Font List"),
GTK_STOCK_SELECT_FONT,
dialogs_viewable_icon_func, "font",
dialogs_viewable_preview_func, "font",
dialogs_set_view_context_func);
}
@ -440,7 +440,7 @@ dialogs_tool_list_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Tools"), _("Tool List"),
GTK_STOCK_MISSING_IMAGE,
dialogs_viewable_icon_func, "tool",
dialogs_viewable_preview_func, "tool",
dialogs_set_view_context_func);
}
@ -553,7 +553,7 @@ dialogs_brush_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Brushes"), _("Brush Grid"),
GIMP_STOCK_TOOL_PAINTBRUSH,
dialogs_viewable_icon_func, "brush",
dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func);
}
@ -574,7 +574,7 @@ dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Patterns"), _("Pattern Grid"),
GIMP_STOCK_TOOL_BUCKET_FILL,
dialogs_viewable_icon_func, "pattern",
dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func);
}
@ -595,7 +595,7 @@ dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Gradients"), _("Gradient Grid"),
GIMP_STOCK_TOOL_BLEND,
dialogs_viewable_icon_func, "gradient",
dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func);
}
@ -616,7 +616,7 @@ dialogs_palette_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Palettes"), _("Palette Grid"),
GTK_STOCK_SELECT_COLOR,
dialogs_viewable_icon_func, "palette",
dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func);
}
@ -635,7 +635,7 @@ dialogs_font_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Fonts"), _("Font Grid"),
GTK_STOCK_SELECT_FONT,
dialogs_viewable_icon_func, "font",
dialogs_viewable_preview_func, "font",
dialogs_set_view_context_func);
}
@ -654,7 +654,7 @@ dialogs_tool_grid_view_new (GimpDialogFactory *factory,
return dialogs_dockable_new (view,
_("Tools"), _("Tool Grid"),
GTK_STOCK_MISSING_IMAGE,
dialogs_viewable_icon_func, "tool",
dialogs_viewable_preview_func, "tool",
dialogs_set_view_context_func);
}
@ -1066,10 +1066,10 @@ dialogs_indexed_palette_selected (GimpColormapEditor *editor,
}
static GtkWidget *
dialogs_viewable_icon_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer icon_data)
dialogs_viewable_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer preview_data)
{
GtkWidget *preview;
gint width;
@ -1079,7 +1079,7 @@ dialogs_viewable_icon_func (GimpDockable *dockable,
gtk_icon_size_lookup (size, &width, &height);
prop_name = (const gchar *) icon_data;
prop_name = (const gchar *) preview_data;
is_tool = (strcmp (prop_name, "tool") == 0);
@ -1115,10 +1115,10 @@ dialogs_tool_options_tool_changed (GimpContext *context,
}
static GtkWidget *
dialogs_tool_options_icon_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer icon_data)
dialogs_tool_options_preview_func (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer preview_data)
{
GimpToolInfo *tool_info;
GtkWidget *hbox;
@ -1274,15 +1274,15 @@ dialogs_dockable_new (GtkWidget *widget,
const gchar *name,
const gchar *blurb,
const gchar *stock_id,
GimpDockableGetIconFunc get_icon_func,
gpointer get_icon_data,
GimpDockableGetPreviewFunc get_preview_func,
gpointer get_preview_data,
GimpDockableSetContextFunc set_context_func)
{
GtkWidget *dockable;
dockable = gimp_dockable_new (name, blurb, stock_id,
get_icon_func,
get_icon_data,
get_preview_func,
get_preview_data,
set_context_func);
gtk_container_add (GTK_CONTAINER (dockable), widget);
gtk_widget_show (widget);

13
app/gui/dialogs-menu.c
View File

@ -143,8 +143,10 @@ GimpItemFactoryEntry dialogs_menu_entries[] =
GIMP_TAB_STYLE_ICON, "<RadioItem>" },
NULL, NULL, NULL },
TAB_STYLE (N_("/Tab Style/_Text"), GIMP_TAB_STYLE_NAME),
TAB_STYLE (N_("/Tab Style/I_con & Text"), GIMP_TAB_STYLE_ICON_NAME),
TAB_STYLE (N_("/Tab Style/Current _Status"), GIMP_TAB_STYLE_PREVIEW),
TAB_STYLE (N_("/Tab Style/_Text"), GIMP_TAB_STYLE_NAME),
TAB_STYLE (N_("/Tab Style/I_con & Text"), GIMP_TAB_STYLE_ICON_NAME),
TAB_STYLE (N_("/Tab Style/St_atus & Text"), GIMP_TAB_STYLE_PREVIEW_NAME),
{ { N_("/View as _List"), NULL,
dialogs_toggle_view_cmd_callback, GIMP_VIEW_TYPE_LIST, "<RadioItem>" },
@ -284,10 +286,17 @@ dialogs_menu_update (GtkItemFactory *factory,
if (tab_style == GIMP_TAB_STYLE_ICON)
SET_ACTIVE ("/Tab Style/Icon", TRUE);
else if (tab_style == GIMP_TAB_STYLE_PREVIEW)
SET_ACTIVE ("/Tab Style/Current Status", TRUE);
else if (tab_style == GIMP_TAB_STYLE_NAME)
SET_ACTIVE ("/Tab Style/Text", TRUE);
else if (tab_style == GIMP_TAB_STYLE_ICON_NAME)
SET_ACTIVE ("/Tab Style/Icon & Text", TRUE);
else if (tab_style == GIMP_TAB_STYLE_PREVIEW_NAME)
SET_ACTIVE ("/Tab Style/Status & Text", TRUE);
SET_SENSITIVE ("/Tab Style/Current Status", dockable->get_preview_func);
SET_SENSITIVE ("/Tab Style/Status & Text", dockable->get_preview_func);
SET_VISIBLE ("/View as Grid", view_type != -1);
SET_VISIBLE ("/View as List", view_type != -1);

67
app/widgets/gimpdockable.c
View File

@ -119,8 +119,8 @@ gimp_dockable_init (GimpDockable *dockable)
dockable->tab_style = GIMP_TAB_STYLE_ICON;
dockable->dockbook = NULL;
dockable->context = NULL;
dockable->get_icon_func = NULL;
dockable->get_icon_data = NULL;
dockable->get_preview_func = NULL;
dockable->get_preview_data = NULL;
dockable->set_context_func = NULL;
}
@ -220,8 +220,8 @@ GtkWidget *
gimp_dockable_new (const gchar *name,
const gchar *blurb,
const gchar *stock_id,
GimpDockableGetIconFunc get_icon_func,
gpointer get_icon_data,
GimpDockableGetPreviewFunc get_preview_func,
gpointer get_preview_data,
GimpDockableSetContextFunc set_context_func)
{
GimpDockable *dockable;
@ -236,8 +236,8 @@ gimp_dockable_new (const gchar *name,
dockable->blurb = g_strdup (blurb);
dockable->stock_id = g_strdup (stock_id);
dockable->get_icon_func = get_icon_func;
dockable->get_icon_data = get_icon_data;
dockable->get_preview_func = get_preview_func;
dockable->get_preview_data = get_preview_data;
dockable->set_context_func = set_context_func;
return GTK_WIDGET (dockable);
@ -277,39 +277,62 @@ gimp_dockable_real_get_tab_widget (GimpDockable *dockable,
GtkWidget *label = NULL;
GtkWidget *icon = NULL;
if (tab_style == GIMP_TAB_STYLE_NAME ||
tab_style == GIMP_TAB_STYLE_ICON_NAME)
switch (tab_style)
{
case GIMP_TAB_STYLE_NAME:
case GIMP_TAB_STYLE_ICON_NAME:
case GIMP_TAB_STYLE_PREVIEW_NAME:
label = gtk_label_new (dockable->name);
}
else if (tab_style == GIMP_TAB_STYLE_ICON_BLURB)
{
label = gtk_label_new (dockable->blurb);
}
break;
if (tab_style == GIMP_TAB_STYLE_ICON ||
tab_style == GIMP_TAB_STYLE_ICON_NAME ||
tab_style == GIMP_TAB_STYLE_ICON_BLURB)
{
if (dockable->get_icon_func)
icon = dockable->get_icon_func (dockable, context, size,
dockable->get_icon_data);
else
icon = gtk_image_new_from_stock (dockable->stock_id, size);
case GIMP_TAB_STYLE_BLURB:
case GIMP_TAB_STYLE_ICON_BLURB:
case GIMP_TAB_STYLE_PREVIEW_BLURB:
label = gtk_label_new (dockable->blurb);
break;
default:
break;
}
switch (tab_style)
{
case GIMP_TAB_STYLE_ICON:
case GIMP_TAB_STYLE_ICON_NAME:
case GIMP_TAB_STYLE_ICON_BLURB:
icon = gtk_image_new_from_stock (dockable->stock_id, size);
break;
case GIMP_TAB_STYLE_PREVIEW:
case GIMP_TAB_STYLE_PREVIEW_NAME:
case GIMP_TAB_STYLE_PREVIEW_BLURB:
if (dockable->get_preview_func)
icon = dockable->get_preview_func (dockable, context, size,
dockable->get_preview_data);
else
icon = gtk_image_new_from_stock (dockable->stock_id, size);
break;
default:
break;
}
switch (tab_style)
{
case GIMP_TAB_STYLE_ICON:
case GIMP_TAB_STYLE_PREVIEW:
tab_widget = icon;
break;
case GIMP_TAB_STYLE_NAME:
case GIMP_TAB_STYLE_BLURB:
tab_widget = label;
break;
case GIMP_TAB_STYLE_ICON_NAME:
case GIMP_TAB_STYLE_ICON_BLURB:
case GIMP_TAB_STYLE_PREVIEW_NAME:
case GIMP_TAB_STYLE_PREVIEW_BLURB:
tab_widget = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (tab_widget), icon, FALSE, FALSE, 0);

12
app/widgets/gimpdockable.h
View File

@ -26,10 +26,10 @@
#include <gtk/gtkbin.h>
typedef GtkWidget * (* GimpDockableGetIconFunc) (GimpDockable *dockable,
typedef GtkWidget * (* GimpDockableGetPreviewFunc) (GimpDockable *dockable,
GimpContext *context,
GtkIconSize size,
gpointer get_icon_data);
gpointer get_preview_data);
typedef void (* GimpDockableSetContextFunc) (GimpDockable *dockable,
GimpContext *context);
@ -57,8 +57,8 @@ struct _GimpDockable
GimpContext *context;
GimpDockableGetIconFunc get_icon_func;
gpointer get_icon_data;
GimpDockableGetPreviewFunc get_preview_func;
gpointer get_preview_data;
GimpDockableSetContextFunc set_context_func;
};
@ -80,8 +80,8 @@ GType gimp_dockable_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_dockable_new (const gchar *name,
const gchar *blurb,
const gchar *stock_id,
GimpDockableGetIconFunc get_icon_func,
gpointer get_icon_data,
GimpDockableGetPreviewFunc get_preview_func,
gpointer get_preview_data,
GimpDockableSetContextFunc set_context_func);
GtkWidget * gimp_dockable_get_tab_widget (GimpDockable *dockable,

4
app/widgets/widgets-enums.c
View File

@ -69,9 +69,13 @@ gimp_histogram_scale_get_type (void)
static const GEnumValue gimp_tab_style_enum_values[] =
{
{ GIMP_TAB_STYLE_ICON, N_("Icon"), "icon" },
{ GIMP_TAB_STYLE_PREVIEW, N_("Current Status"), "preview" },
{ GIMP_TAB_STYLE_NAME, N_("Text"), "name" },
{ GIMP_TAB_STYLE_BLURB, N_("Description"), "blurb" },
{ GIMP_TAB_STYLE_ICON_NAME, N_("Icon & Text"), "icon-name" },
{ GIMP_TAB_STYLE_ICON_BLURB, N_("Icon & Desc"), "icon-blurb" },
{ GIMP_TAB_STYLE_PREVIEW_NAME, N_("Status & Text"), "preview-name" },
{ GIMP_TAB_STYLE_PREVIEW_BLURB, N_("Status & Desc"), "preview-blurb" },
{ 0, NULL, NULL }
};

12
app/widgets/widgets-enums.h
View File

@ -64,10 +64,14 @@ GType gimp_tab_style_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_TAB_STYLE_ICON, /*< desc="Icon" >*/
GIMP_TAB_STYLE_NAME, /*< desc="Text" >*/
GIMP_TAB_STYLE_ICON_NAME, /*< desc="Icon & Text" >*/
GIMP_TAB_STYLE_ICON_BLURB /*< desc="Icon & Desc" >*/
GIMP_TAB_STYLE_ICON, /*< desc="Icon" >*/
GIMP_TAB_STYLE_PREVIEW, /*< desc="Current Status" >*/
GIMP_TAB_STYLE_NAME, /*< desc="Text" >*/
GIMP_TAB_STYLE_BLURB, /*< desc="Description" >*/
GIMP_TAB_STYLE_ICON_NAME, /*< desc="Icon & Text" >*/
GIMP_TAB_STYLE_ICON_BLURB, /*< desc="Icon & Desc" >*/
GIMP_TAB_STYLE_PREVIEW_NAME, /*< desc="Status & Text" >*/
GIMP_TAB_STYLE_PREVIEW_BLURB /*< desc="Status & Desc" >*/
} GimpTabStyle;