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

added a "menu_title" which is registered with each menu.

Browse Source 
2003-09-23  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpmenufactory.[ch]: added a "menu_title" which is
	registered with each menu.

	* app/widgets/gimpitemfactory.[ch]: added the title to the
	constructor and to the GimpItemFactory struct.

	* app/gui/menus.c: register titles with all menus.

	* app/widgets/gimpdockable.[ch]: show the tab menu, not the
	contained dialog's menu when clicking on the menu button.
	Embed the dialog's menu as submenu. Use the item_factory's
	title and the dockable's stock_id for the submenu entry.

	* app/widgets/gimpeditor.c: removed GtkWidget:popup_menu()
	implementation since that's done by GimpDockable now.

	* app/widgets/gimpdockbook.c: set the new menu item invisible
	when showing the menu as tab menu.

	* app/widgets/gimphelp-ids.h: added GIMP_HELP_DOCK_TAB_DETACH
	and renamed _TAB_REMOVE to _TAB_CLOSE.

	* app/gui/dialogs-menu.c: added the new menu entry for showing the
	dialog's sub-menu. Added a "Detach" menu item, renamed "Remove" to
	"Close". Accept both a GimpDockbook and a GimpDockable pointer as
	"data" in dialogs_menu_update().

	* app/gui/dialogs-commands.[ch]: changed accordingly. Never use
	gtk_item_factory_popup_data_from_widget() but always the "data"
	passed to the callbacks. Take care to not set the already active
	preview_size, tab_style and list/grid type in the resp. callbacks
	to avoid being called from dialogs_menu_update().

	* app/gui/dialogs-constructors.c: removed separate
	set_context_funcs and get_menu_funcs for GimpContainerView and
	GimpContainerEditor widgets and simply use
	gimp_container_view_get_by_dockable() to find the right widget.
This commit is contained in:
Michael Natterer
2003-09-23 16:17:25 +00:00
committed by Michael Natterer
parent a8ed5f6bf5
commit c5fd48f2fb
18 changed files with 703 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ChangeLog
View File

@ -1,3 +1,43 @@
2003-09-23 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpmenufactory.[ch]: added a "menu_title" which is
registered with each menu.
* app/widgets/gimpitemfactory.[ch]: added the title to the
constructor and to the GimpItemFactory struct.
* app/gui/menus.c: register titles with all menus.
* app/widgets/gimpdockable.[ch]: show the tab menu, not the
contained dialog's menu when clicking on the menu button.
Embed the dialog's menu as submenu. Use the item_factory's
title and the dockable's stock_id for the submenu entry.
* app/widgets/gimpeditor.c: removed GtkWidget:popup_menu()
implementation since that's done by GimpDockable now.
* app/widgets/gimpdockbook.c: set the new menu item invisible
when showing the menu as tab menu.
* app/widgets/gimphelp-ids.h: added GIMP_HELP_DOCK_TAB_DETACH
and renamed _TAB_REMOVE to _TAB_CLOSE.
* app/gui/dialogs-menu.c: added the new menu entry for showing the
dialog's sub-menu. Added a "Detach" menu item, renamed "Remove" to
"Close". Accept both a GimpDockbook and a GimpDockable pointer as
"data" in dialogs_menu_update().
* app/gui/dialogs-commands.[ch]: changed accordingly. Never use
gtk_item_factory_popup_data_from_widget() but always the "data"
passed to the callbacks. Take care to not set the already active
preview_size, tab_style and list/grid type in the resp. callbacks
to avoid being called from dialogs_menu_update().
* app/gui/dialogs-constructors.c: removed separate
set_context_funcs and get_menu_funcs for GimpContainerView and
GimpContainerEditor widgets and simply use
gimp_container_view_get_by_dockable() to find the right widget.
2003-09-23 Michael Natterer <mitch@gimp.org> 2003-09-23 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdialogfactory.c * app/widgets/gimpdialogfactory.c

92
app/actions/dialogs-commands.c
View File

@ -88,11 +88,9 @@ dialogs_add_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget); if (action)
if (dockbook && action)
{ {
GtkWidget *dockable; GtkWidget *dockable;
const gchar *identifier; const gchar *identifier;
@ -118,16 +116,11 @@ dialogs_add_tab_cmd_callback (GtkWidget *widget,
} }
void void
dialogs_remove_tab_cmd_callback (GtkWidget *widget, dialogs_close_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
if (dockbook)
{
GimpDockable *dockable; GimpDockable *dockable;
gint page_num; gint page_num;
@ -138,6 +131,25 @@ dialogs_remove_tab_cmd_callback (GtkWidget *widget,
if (dockable) if (dockable)
gimp_dockbook_remove (dockbook, dockable); gimp_dockbook_remove (dockbook, dockable);
}
void
dialogs_detach_tab_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *)
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
if (dockable)
{
/* TODO */
} }
} }
@ -146,21 +158,16 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
GimpViewType view_type; GimpViewType view_type;
gint page_num;
if (! GTK_CHECK_MENU_ITEM (widget)->active) if (! GTK_CHECK_MENU_ITEM (widget)->active)
return; return;
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
view_type = (GimpViewType) action; view_type = (GimpViewType) action;
if (dockbook)
{
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
@ -182,9 +189,17 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
substring = strstr (identifier, "grid"); substring = strstr (identifier, "grid");
if (substring && view_type == GIMP_VIEW_TYPE_GRID)
return;
if (! substring) if (! substring)
{
substring = strstr (identifier, "list"); substring = strstr (identifier, "list");
if (substring && view_type == GIMP_VIEW_TYPE_LIST)
return;
}
if (substring) if (substring)
{ {
GimpContainerView *old_view; GimpContainerView *old_view;
@ -226,7 +241,6 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
g_free (identifier); g_free (identifier);
} }
} }
}
} }
void void
@ -234,21 +248,16 @@ dialogs_preview_size_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
gint preview_size; gint preview_size;
gint page_num;
if (! GTK_CHECK_MENU_ITEM (widget)->active) if (! GTK_CHECK_MENU_ITEM (widget)->active)
return; return;
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
preview_size = (gint) action; preview_size = (gint) action;
if (dockbook)
{
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
@ -261,6 +270,8 @@ dialogs_preview_size_cmd_callback (GtkWidget *widget,
view = gimp_container_view_get_by_dockable (dockable); view = gimp_container_view_get_by_dockable (dockable);
if (view) if (view)
{
if (view->preview_size != preview_size)
gimp_container_view_set_preview_size (view, preview_size, gimp_container_view_set_preview_size (view, preview_size,
view->preview_border_width); view->preview_border_width);
} }
@ -272,27 +283,24 @@ dialogs_tab_style_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
GimpTabStyle tab_style; GimpTabStyle tab_style;
gint page_num;
if (! GTK_CHECK_MENU_ITEM (widget)->active) if (! GTK_CHECK_MENU_ITEM (widget)->active)
return; return;
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
tab_style = (gint) action; tab_style = (gint) action;
if (dockbook)
{
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num); gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
if (dockable) if (dockable)
{
if (dockable->tab_style != tab_style)
{ {
GtkWidget *tab_widget; GtkWidget *tab_widget;
@ -312,11 +320,9 @@ dialogs_toggle_image_menu_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget); if (GIMP_IS_IMAGE_DOCK (dockbook->dock))
if (dockbook && GIMP_IS_IMAGE_DOCK (dockbook->dock))
{ {
gimp_image_dock_set_show_image_menu (GIMP_IMAGE_DOCK (dockbook->dock), gimp_image_dock_set_show_image_menu (GIMP_IMAGE_DOCK (dockbook->dock),
GTK_CHECK_MENU_ITEM (widget)->active); GTK_CHECK_MENU_ITEM (widget)->active);
@ -328,11 +334,9 @@ dialogs_toggle_auto_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget); if (GIMP_IS_IMAGE_DOCK (dockbook->dock))
if (dockbook && GIMP_IS_IMAGE_DOCK (dockbook->dock))
{ {
gimp_image_dock_set_auto_follow_active (GIMP_IMAGE_DOCK (dockbook->dock), gimp_image_dock_set_auto_follow_active (GIMP_IMAGE_DOCK (dockbook->dock),
GTK_CHECK_MENU_ITEM (widget)->active); GTK_CHECK_MENU_ITEM (widget)->active);

5
app/actions/dialogs-commands.h
View File

@ -33,7 +33,10 @@ void dialogs_create_dockable_cmd_callback (GtkWidget *widget,
void dialogs_add_tab_cmd_callback (GtkWidget *widget, void dialogs_add_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action); guint action);
void dialogs_remove_tab_cmd_callback (GtkWidget *widget, void dialogs_close_tab_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void dialogs_detach_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action); guint action);

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

@ -45,6 +45,7 @@
#include "widgets/gimpcolormapeditor.h" #include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainergridview.h" #include "widgets/gimpcontainergridview.h"
#include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpcontainerview-utils.h"
#include "widgets/gimpdataeditor.h" #include "widgets/gimpdataeditor.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimperrorconsole.h" #include "widgets/gimperrorconsole.h"
@ -106,8 +107,6 @@ static GtkWidget * dialogs_tool_options_preview_func (GimpDockable *dockable,
static void dialogs_set_view_context_func (GimpDockable *dockable, static void dialogs_set_view_context_func (GimpDockable *dockable,
GimpContext *context); GimpContext *context);
static void dialogs_set_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_color_editor_context_func (GimpDockable *dockable, static void dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context); GimpContext *context);
static void dialogs_set_image_item_context_func (GimpDockable *dockable, static void dialogs_set_image_item_context_func (GimpDockable *dockable,
@ -119,8 +118,6 @@ static void dialogs_set_navigation_context_func (GimpDockable *dockable,
static GimpItemFactory * dialogs_get_view_menu_func (GimpDockable *dockable, static GimpItemFactory * dialogs_get_view_menu_func (GimpDockable *dockable,
gpointer *item_factory_data); gpointer *item_factory_data);
static GimpItemFactory * dialogs_get_editor_menu_func (GimpDockable *dockable,
gpointer *item_factory_data);
static GtkWidget * dialogs_dockable_new (GtkWidget *widget, static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
const gchar *name, const gchar *name,
@ -307,7 +304,7 @@ dialogs_error_console_get (GimpDialogFactory *factory,
GIMP_HELP_ERRORS_DIALOG, GIMP_HELP_ERRORS_DIALOG,
NULL, NULL, NULL, NULL,
NULL, NULL,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
@ -331,8 +328,8 @@ dialogs_image_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_IMAGES, GIMP_STOCK_IMAGES,
GIMP_HELP_IMAGE_DIALOG, GIMP_HELP_IMAGE_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -355,8 +352,8 @@ dialogs_brush_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_STOCK_TOOL_PAINTBRUSH,
GIMP_HELP_BRUSH_DIALOG, GIMP_HELP_BRUSH_DIALOG,
dialogs_viewable_preview_func, "brush", dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -378,8 +375,8 @@ dialogs_pattern_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_STOCK_TOOL_BUCKET_FILL,
GIMP_HELP_PATTERN_DIALOG, GIMP_HELP_PATTERN_DIALOG,
dialogs_viewable_preview_func, "pattern", dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -401,8 +398,8 @@ dialogs_gradient_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BLEND, GIMP_STOCK_TOOL_BLEND,
GIMP_HELP_GRADIENT_DIALOG, GIMP_HELP_GRADIENT_DIALOG,
dialogs_viewable_preview_func, "gradient", dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -424,8 +421,8 @@ dialogs_palette_list_view_new (GimpDialogFactory *factory,
GTK_STOCK_SELECT_COLOR, GTK_STOCK_SELECT_COLOR,
GIMP_HELP_PALETTE_DIALOG, GIMP_HELP_PALETTE_DIALOG,
dialogs_viewable_preview_func, "palette", dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -488,8 +485,8 @@ dialogs_buffer_list_view_new (GimpDialogFactory *factory,
GTK_STOCK_PASTE, GTK_STOCK_PASTE,
GIMP_HELP_BUFFER_DIALOG, GIMP_HELP_BUFFER_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -511,8 +508,8 @@ dialogs_document_list_new (GimpDialogFactory *factory,
GTK_STOCK_OPEN, GTK_STOCK_OPEN,
GIMP_HELP_DOCUMENT_DIALOG, GIMP_HELP_DOCUMENT_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -540,8 +537,8 @@ dialogs_template_list_new (GimpDialogFactory *factory,
GIMP_STOCK_TEMPLATE, GIMP_STOCK_TEMPLATE,
GIMP_HELP_TEMPLATE_DIALOG, GIMP_HELP_TEMPLATE_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
@ -565,8 +562,8 @@ dialogs_image_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_IMAGES, GIMP_STOCK_IMAGES,
GIMP_HELP_IMAGE_DIALOG, GIMP_HELP_IMAGE_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -589,8 +586,8 @@ dialogs_brush_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_STOCK_TOOL_PAINTBRUSH,
GIMP_HELP_BRUSH_DIALOG, GIMP_HELP_BRUSH_DIALOG,
dialogs_viewable_preview_func, "brush", dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -612,8 +609,8 @@ dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_STOCK_TOOL_BUCKET_FILL,
GIMP_HELP_PATTERN_DIALOG, GIMP_HELP_PATTERN_DIALOG,
dialogs_viewable_preview_func, "pattern", dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -635,8 +632,8 @@ dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BLEND, GIMP_STOCK_TOOL_BLEND,
GIMP_HELP_GRADIENT_DIALOG, GIMP_HELP_GRADIENT_DIALOG,
dialogs_viewable_preview_func, "gradient", dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -658,8 +655,8 @@ dialogs_palette_grid_view_new (GimpDialogFactory *factory,
GTK_STOCK_SELECT_COLOR, GTK_STOCK_SELECT_COLOR,
GIMP_HELP_PALETTE_DIALOG, GIMP_HELP_PALETTE_DIALOG,
dialogs_viewable_preview_func, "palette", dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -722,8 +719,8 @@ dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
GTK_STOCK_PASTE, GTK_STOCK_PASTE,
GIMP_HELP_BUFFER_DIALOG, GIMP_HELP_BUFFER_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -745,8 +742,8 @@ dialogs_document_grid_new (GimpDialogFactory *factory,
GTK_STOCK_OPEN, GTK_STOCK_OPEN,
GIMP_HELP_DOCUMENT_DIALOG, GIMP_HELP_DOCUMENT_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
@ -948,7 +945,7 @@ dialogs_undo_history_new (GimpDialogFactory *factory,
GIMP_HELP_UNDO_DIALOG, GIMP_HELP_UNDO_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_image_editor_context_func, dialogs_set_image_editor_context_func,
dialogs_get_view_menu_func); NULL);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context); gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
@ -1227,21 +1224,10 @@ static void
dialogs_set_view_context_func (GimpDockable *dockable, dialogs_set_view_context_func (GimpDockable *dockable,
GimpContext *context) GimpContext *context)
{ {
GtkWidget *widget = GTK_BIN (dockable)->child; GimpContainerView *view = gimp_container_view_get_by_dockable (dockable);
if (GIMP_IS_CONTAINER_VIEW (widget)) if (view)
gimp_container_view_set_context (GIMP_CONTAINER_VIEW (widget), context); gimp_container_view_set_context (view, context);
}
static void
dialogs_set_editor_context_func (GimpDockable *dockable,
GimpContext *context)
{
GtkWidget *widget = GTK_BIN (dockable)->child;
if (GIMP_IS_CONTAINER_EDITOR (widget))
gimp_container_view_set_context (GIMP_CONTAINER_EDITOR (widget)->view,
context);
} }
static void static void
@ -1342,30 +1328,11 @@ static GimpItemFactory *
dialogs_get_view_menu_func (GimpDockable *dockable, dialogs_get_view_menu_func (GimpDockable *dockable,
gpointer *item_factory_data) gpointer *item_factory_data)
{ {
GtkWidget *widget = GTK_BIN (dockable)->child; GimpContainerView *view = gimp_container_view_get_by_dockable (dockable);
if (GIMP_IS_EDITOR (widget)) if (view)
{ {
GimpEditor *editor = GIMP_EDITOR (widget); GimpEditor *editor = GIMP_EDITOR (view);
if (item_factory_data)
*item_factory_data = editor->item_factory_data;
return editor->item_factory;
}
return NULL;
}
static GimpItemFactory *
dialogs_get_editor_menu_func (GimpDockable *dockable,
gpointer *item_factory_data)
{
GtkWidget *widget = GTK_BIN (dockable)->child;
if (GIMP_IS_CONTAINER_EDITOR (widget))
{
GimpEditor *editor = GIMP_EDITOR (GIMP_CONTAINER_EDITOR (widget)->view);
if (item_factory_data) if (item_factory_data)
*item_factory_data = editor->item_factory_data; *item_factory_data = editor->item_factory_data;

92
app/gui/dialogs-commands.c
View File

@ -88,11 +88,9 @@ dialogs_add_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget); if (action)
if (dockbook && action)
{ {
GtkWidget *dockable; GtkWidget *dockable;
const gchar *identifier; const gchar *identifier;
@ -118,16 +116,11 @@ dialogs_add_tab_cmd_callback (GtkWidget *widget,
} }
void void
dialogs_remove_tab_cmd_callback (GtkWidget *widget, dialogs_close_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
if (dockbook)
{
GimpDockable *dockable; GimpDockable *dockable;
gint page_num; gint page_num;
@ -138,6 +131,25 @@ dialogs_remove_tab_cmd_callback (GtkWidget *widget,
if (dockable) if (dockable)
gimp_dockbook_remove (dockbook, dockable); gimp_dockbook_remove (dockbook, dockable);
}
void
dialogs_detach_tab_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *)
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
if (dockable)
{
/* TODO */
} }
} }
@ -146,21 +158,16 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
GimpViewType view_type; GimpViewType view_type;
gint page_num;
if (! GTK_CHECK_MENU_ITEM (widget)->active) if (! GTK_CHECK_MENU_ITEM (widget)->active)
return; return;
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
view_type = (GimpViewType) action; view_type = (GimpViewType) action;
if (dockbook)
{
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
@ -182,9 +189,17 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
substring = strstr (identifier, "grid"); substring = strstr (identifier, "grid");
if (substring && view_type == GIMP_VIEW_TYPE_GRID)
return;
if (! substring) if (! substring)
{
substring = strstr (identifier, "list"); substring = strstr (identifier, "list");
if (substring && view_type == GIMP_VIEW_TYPE_LIST)
return;
}
if (substring) if (substring)
{ {
GimpContainerView *old_view; GimpContainerView *old_view;
@ -226,7 +241,6 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
g_free (identifier); g_free (identifier);
} }
} }
}
} }
void void
@ -234,21 +248,16 @@ dialogs_preview_size_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
gint preview_size; gint preview_size;
gint page_num;
if (! GTK_CHECK_MENU_ITEM (widget)->active) if (! GTK_CHECK_MENU_ITEM (widget)->active)
return; return;
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
preview_size = (gint) action; preview_size = (gint) action;
if (dockbook)
{
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
@ -261,6 +270,8 @@ dialogs_preview_size_cmd_callback (GtkWidget *widget,
view = gimp_container_view_get_by_dockable (dockable); view = gimp_container_view_get_by_dockable (dockable);
if (view) if (view)
{
if (view->preview_size != preview_size)
gimp_container_view_set_preview_size (view, preview_size, gimp_container_view_set_preview_size (view, preview_size,
view->preview_border_width); view->preview_border_width);
} }
@ -272,27 +283,24 @@ dialogs_tab_style_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
GimpTabStyle tab_style; GimpTabStyle tab_style;
gint page_num;
if (! GTK_CHECK_MENU_ITEM (widget)->active) if (! GTK_CHECK_MENU_ITEM (widget)->active)
return; return;
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget);
tab_style = (gint) action; tab_style = (gint) action;
if (dockbook)
{
GimpDockable *dockable;
gint page_num;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num); gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
if (dockable) if (dockable)
{
if (dockable->tab_style != tab_style)
{ {
GtkWidget *tab_widget; GtkWidget *tab_widget;
@ -312,11 +320,9 @@ dialogs_toggle_image_menu_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget); if (GIMP_IS_IMAGE_DOCK (dockbook->dock))
if (dockbook && GIMP_IS_IMAGE_DOCK (dockbook->dock))
{ {
gimp_image_dock_set_show_image_menu (GIMP_IMAGE_DOCK (dockbook->dock), gimp_image_dock_set_show_image_menu (GIMP_IMAGE_DOCK (dockbook->dock),
GTK_CHECK_MENU_ITEM (widget)->active); GTK_CHECK_MENU_ITEM (widget)->active);
@ -328,11 +334,9 @@ dialogs_toggle_auto_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpDockbook *dockbook; GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
dockbook = (GimpDockbook *) gtk_item_factory_popup_data_from_widget (widget); if (GIMP_IS_IMAGE_DOCK (dockbook->dock))
if (dockbook && GIMP_IS_IMAGE_DOCK (dockbook->dock))
{ {
gimp_image_dock_set_auto_follow_active (GIMP_IMAGE_DOCK (dockbook->dock), gimp_image_dock_set_auto_follow_active (GIMP_IMAGE_DOCK (dockbook->dock),
GTK_CHECK_MENU_ITEM (widget)->active); GTK_CHECK_MENU_ITEM (widget)->active);

5
app/gui/dialogs-commands.h
View File

@ -33,7 +33,10 @@ void dialogs_create_dockable_cmd_callback (GtkWidget *widget,
void dialogs_add_tab_cmd_callback (GtkWidget *widget, void dialogs_add_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action); guint action);
void dialogs_remove_tab_cmd_callback (GtkWidget *widget, void dialogs_close_tab_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void dialogs_detach_tab_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action); guint action);

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

@ -45,6 +45,7 @@
#include "widgets/gimpcolormapeditor.h" #include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainergridview.h" #include "widgets/gimpcontainergridview.h"
#include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpcontainerview-utils.h"
#include "widgets/gimpdataeditor.h" #include "widgets/gimpdataeditor.h"
#include "widgets/gimpdialogfactory.h" #include "widgets/gimpdialogfactory.h"
#include "widgets/gimperrorconsole.h" #include "widgets/gimperrorconsole.h"
@ -106,8 +107,6 @@ static GtkWidget * dialogs_tool_options_preview_func (GimpDockable *dockable,
static void dialogs_set_view_context_func (GimpDockable *dockable, static void dialogs_set_view_context_func (GimpDockable *dockable,
GimpContext *context); GimpContext *context);
static void dialogs_set_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_color_editor_context_func (GimpDockable *dockable, static void dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context); GimpContext *context);
static void dialogs_set_image_item_context_func (GimpDockable *dockable, static void dialogs_set_image_item_context_func (GimpDockable *dockable,
@ -119,8 +118,6 @@ static void dialogs_set_navigation_context_func (GimpDockable *dockable,
static GimpItemFactory * dialogs_get_view_menu_func (GimpDockable *dockable, static GimpItemFactory * dialogs_get_view_menu_func (GimpDockable *dockable,
gpointer *item_factory_data); gpointer *item_factory_data);
static GimpItemFactory * dialogs_get_editor_menu_func (GimpDockable *dockable,
gpointer *item_factory_data);
static GtkWidget * dialogs_dockable_new (GtkWidget *widget, static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
const gchar *name, const gchar *name,
@ -307,7 +304,7 @@ dialogs_error_console_get (GimpDialogFactory *factory,
GIMP_HELP_ERRORS_DIALOG, GIMP_HELP_ERRORS_DIALOG,
NULL, NULL, NULL, NULL,
NULL, NULL,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
@ -331,8 +328,8 @@ dialogs_image_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_IMAGES, GIMP_STOCK_IMAGES,
GIMP_HELP_IMAGE_DIALOG, GIMP_HELP_IMAGE_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -355,8 +352,8 @@ dialogs_brush_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_STOCK_TOOL_PAINTBRUSH,
GIMP_HELP_BRUSH_DIALOG, GIMP_HELP_BRUSH_DIALOG,
dialogs_viewable_preview_func, "brush", dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -378,8 +375,8 @@ dialogs_pattern_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_STOCK_TOOL_BUCKET_FILL,
GIMP_HELP_PATTERN_DIALOG, GIMP_HELP_PATTERN_DIALOG,
dialogs_viewable_preview_func, "pattern", dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -401,8 +398,8 @@ dialogs_gradient_list_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BLEND, GIMP_STOCK_TOOL_BLEND,
GIMP_HELP_GRADIENT_DIALOG, GIMP_HELP_GRADIENT_DIALOG,
dialogs_viewable_preview_func, "gradient", dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -424,8 +421,8 @@ dialogs_palette_list_view_new (GimpDialogFactory *factory,
GTK_STOCK_SELECT_COLOR, GTK_STOCK_SELECT_COLOR,
GIMP_HELP_PALETTE_DIALOG, GIMP_HELP_PALETTE_DIALOG,
dialogs_viewable_preview_func, "palette", dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -488,8 +485,8 @@ dialogs_buffer_list_view_new (GimpDialogFactory *factory,
GTK_STOCK_PASTE, GTK_STOCK_PASTE,
GIMP_HELP_BUFFER_DIALOG, GIMP_HELP_BUFFER_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -511,8 +508,8 @@ dialogs_document_list_new (GimpDialogFactory *factory,
GTK_STOCK_OPEN, GTK_STOCK_OPEN,
GIMP_HELP_DOCUMENT_DIALOG, GIMP_HELP_DOCUMENT_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -540,8 +537,8 @@ dialogs_template_list_new (GimpDialogFactory *factory,
GIMP_STOCK_TEMPLATE, GIMP_STOCK_TEMPLATE,
GIMP_HELP_TEMPLATE_DIALOG, GIMP_HELP_TEMPLATE_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
@ -565,8 +562,8 @@ dialogs_image_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_IMAGES, GIMP_STOCK_IMAGES,
GIMP_HELP_IMAGE_DIALOG, GIMP_HELP_IMAGE_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -589,8 +586,8 @@ dialogs_brush_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_STOCK_TOOL_PAINTBRUSH,
GIMP_HELP_BRUSH_DIALOG, GIMP_HELP_BRUSH_DIALOG,
dialogs_viewable_preview_func, "brush", dialogs_viewable_preview_func, "brush",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -612,8 +609,8 @@ dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_STOCK_TOOL_BUCKET_FILL,
GIMP_HELP_PATTERN_DIALOG, GIMP_HELP_PATTERN_DIALOG,
dialogs_viewable_preview_func, "pattern", dialogs_viewable_preview_func, "pattern",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -635,8 +632,8 @@ dialogs_gradient_grid_view_new (GimpDialogFactory *factory,
GIMP_STOCK_TOOL_BLEND, GIMP_STOCK_TOOL_BLEND,
GIMP_HELP_GRADIENT_DIALOG, GIMP_HELP_GRADIENT_DIALOG,
dialogs_viewable_preview_func, "gradient", dialogs_viewable_preview_func, "gradient",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -658,8 +655,8 @@ dialogs_palette_grid_view_new (GimpDialogFactory *factory,
GTK_STOCK_SELECT_COLOR, GTK_STOCK_SELECT_COLOR,
GIMP_HELP_PALETTE_DIALOG, GIMP_HELP_PALETTE_DIALOG,
dialogs_viewable_preview_func, "palette", dialogs_viewable_preview_func, "palette",
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -722,8 +719,8 @@ dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
GTK_STOCK_PASTE, GTK_STOCK_PASTE,
GIMP_HELP_BUFFER_DIALOG, GIMP_HELP_BUFFER_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
GtkWidget * GtkWidget *
@ -745,8 +742,8 @@ dialogs_document_grid_new (GimpDialogFactory *factory,
GTK_STOCK_OPEN, GTK_STOCK_OPEN,
GIMP_HELP_DOCUMENT_DIALOG, GIMP_HELP_DOCUMENT_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_editor_context_func, dialogs_set_view_context_func,
dialogs_get_editor_menu_func); dialogs_get_view_menu_func);
} }
@ -948,7 +945,7 @@ dialogs_undo_history_new (GimpDialogFactory *factory,
GIMP_HELP_UNDO_DIALOG, GIMP_HELP_UNDO_DIALOG,
NULL, NULL, NULL, NULL,
dialogs_set_image_editor_context_func, dialogs_set_image_editor_context_func,
dialogs_get_view_menu_func); NULL);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context); gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
@ -1227,21 +1224,10 @@ static void
dialogs_set_view_context_func (GimpDockable *dockable, dialogs_set_view_context_func (GimpDockable *dockable,
GimpContext *context) GimpContext *context)
{ {
GtkWidget *widget = GTK_BIN (dockable)->child; GimpContainerView *view = gimp_container_view_get_by_dockable (dockable);
if (GIMP_IS_CONTAINER_VIEW (widget)) if (view)
gimp_container_view_set_context (GIMP_CONTAINER_VIEW (widget), context); gimp_container_view_set_context (view, context);
}
static void
dialogs_set_editor_context_func (GimpDockable *dockable,
GimpContext *context)
{
GtkWidget *widget = GTK_BIN (dockable)->child;
if (GIMP_IS_CONTAINER_EDITOR (widget))
gimp_container_view_set_context (GIMP_CONTAINER_EDITOR (widget)->view,
context);
} }
static void static void
@ -1342,30 +1328,11 @@ static GimpItemFactory *
dialogs_get_view_menu_func (GimpDockable *dockable, dialogs_get_view_menu_func (GimpDockable *dockable,
gpointer *item_factory_data) gpointer *item_factory_data)
{ {
GtkWidget *widget = GTK_BIN (dockable)->child; GimpContainerView *view = gimp_container_view_get_by_dockable (dockable);
if (GIMP_IS_EDITOR (widget)) if (view)
{ {
GimpEditor *editor = GIMP_EDITOR (widget); GimpEditor *editor = GIMP_EDITOR (view);
if (item_factory_data)
*item_factory_data = editor->item_factory_data;
return editor->item_factory;
}
return NULL;
}
static GimpItemFactory *
dialogs_get_editor_menu_func (GimpDockable *dockable,
gpointer *item_factory_data)
{
GtkWidget *widget = GTK_BIN (dockable)->child;
if (GIMP_IS_CONTAINER_EDITOR (widget))
{
GimpEditor *editor = GIMP_EDITOR (GIMP_CONTAINER_EDITOR (widget)->view);
if (item_factory_data) if (item_factory_data)
*item_factory_data = editor->item_factory_data; *item_factory_data = editor->item_factory_data;

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

@ -58,6 +58,10 @@
GimpItemFactoryEntry dialogs_menu_entries[] = GimpItemFactoryEntry dialogs_menu_entries[] =
{ {
{ { "/dialog-menu", NULL, NULL, 0,
"<StockItem>", GTK_STOCK_MISSING_IMAGE },
NULL, NULL, NULL },
{ { N_("/_Select Tab"), NULL, NULL, 0 }, { { N_("/_Select Tab"), NULL, NULL, 0 },
NULL, NULL, NULL }, NULL, NULL, NULL },
@ -118,11 +122,16 @@ GimpItemFactoryEntry dialogs_menu_entries[] =
ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list", ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list",
GTK_STOCK_MISSING_IMAGE, GIMP_HELP_TOOL_DIALOG), GTK_STOCK_MISSING_IMAGE, GIMP_HELP_TOOL_DIALOG),
{ { N_("/_Remove Tab"), "", { { N_("/_Close Tab"), "",
dialogs_remove_tab_cmd_callback, 0, dialogs_close_tab_cmd_callback, 0,
"<StockItem>", GTK_STOCK_REMOVE }, "<StockItem>", GTK_STOCK_CLOSE },
NULL, NULL,
GIMP_HELP_DOCK_TAB_REMOVE, NULL }, GIMP_HELP_DOCK_TAB_CLOSE, NULL },
{ { N_("/_Detach Tab"), "",
dialogs_detach_tab_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
NULL,
GIMP_HELP_DOCK_TAB_DETACH, NULL },
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
@ -188,14 +197,8 @@ void
dialogs_menu_update (GtkItemFactory *factory, dialogs_menu_update (GtkItemFactory *factory,
gpointer data) gpointer data)
{ {
GimpDockbook *dockbook;
dockbook = GIMP_DOCKBOOK (data);
if (dockbook)
{
GimpDockable *dockable; GimpDockable *dockable;
gint page_num; GimpDockbook *dockbook;
GimpDialogFactoryEntry *entry; GimpDialogFactoryEntry *entry;
GimpContainerView *view; GimpContainerView *view;
GimpViewType view_type = -1; GimpViewType view_type = -1;
@ -204,13 +207,28 @@ dialogs_menu_update (GtkItemFactory *factory,
GimpPreviewSize preview_size = -1; GimpPreviewSize preview_size = -1;
GimpTabStyle tab_style; GimpTabStyle tab_style;
if (GIMP_IS_DOCKBOOK (data))
{
gint page_num;
dockbook = GIMP_DOCKBOOK (data);
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook)); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *) dockable = (GimpDockable *)
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num); gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
}
else if (GIMP_IS_DOCKABLE (data))
{
dockable = GIMP_DOCKABLE (data);
dockbook = dockable->dockbook;
}
else
{
return;
}
entry = g_object_get_data (G_OBJECT (dockable), entry = g_object_get_data (G_OBJECT (dockable), "gimp-dialog-factory-entry");
"gimp-dialog-factory-entry");
if (entry) if (entry)
{ {
@ -345,5 +363,4 @@ dialogs_menu_update (GtkItemFactory *factory,
#undef SET_ACTIVE #undef SET_ACTIVE
#undef SET_VISIBLE #undef SET_VISIBLE
#undef SET_SENSITIVE #undef SET_SENSITIVE
}
} }

21
app/gui/menus.c
View File

@ -108,24 +108,28 @@ menus_init (Gimp *gimp)
global_menu_factory = gimp_menu_factory_new (gimp); global_menu_factory = gimp_menu_factory_new (gimp);
gimp_menu_factory_menu_register (global_menu_factory, "<Toolbox>", gimp_menu_factory_menu_register (global_menu_factory, "<Toolbox>",
_("Toolbox Menu"),
GIMP_HELP_TOOLBOX, GIMP_HELP_TOOLBOX,
toolbox_menu_setup, NULL, FALSE, toolbox_menu_setup, NULL, FALSE,
n_toolbox_menu_entries, n_toolbox_menu_entries,
toolbox_menu_entries); toolbox_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Image>", gimp_menu_factory_menu_register (global_menu_factory, "<Image>",
_("Image Menu"),
GIMP_HELP_IMAGE_WINDOW, GIMP_HELP_IMAGE_WINDOW,
image_menu_setup, image_menu_update, FALSE, image_menu_setup, image_menu_update, FALSE,
n_image_menu_entries, n_image_menu_entries,
image_menu_entries); image_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Load>", gimp_menu_factory_menu_register (global_menu_factory, "<Load>",
_("Open Menu"),
GIMP_HELP_FILE_OPEN, GIMP_HELP_FILE_OPEN,
file_open_menu_setup, NULL, FALSE, file_open_menu_setup, NULL, FALSE,
n_file_open_menu_entries, n_file_open_menu_entries,
file_open_menu_entries); file_open_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Save>", gimp_menu_factory_menu_register (global_menu_factory, "<Save>",
_("Save Menu"),
GIMP_HELP_FILE_SAVE, GIMP_HELP_FILE_SAVE,
file_save_menu_setup, file_save_menu_setup,
file_save_menu_update, FALSE, file_save_menu_update, FALSE,
@ -133,102 +137,119 @@ menus_init (Gimp *gimp)
file_save_menu_entries); file_save_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Layers>", gimp_menu_factory_menu_register (global_menu_factory, "<Layers>",
_("Layers Menu"),
GIMP_HELP_LAYER_DIALOG, GIMP_HELP_LAYER_DIALOG,
NULL, layers_menu_update, TRUE, NULL, layers_menu_update, TRUE,
n_layers_menu_entries, n_layers_menu_entries,
layers_menu_entries); layers_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Channels>", gimp_menu_factory_menu_register (global_menu_factory, "<Channels>",
_("Channels Menu"),
GIMP_HELP_CHANNEL_DIALOG, GIMP_HELP_CHANNEL_DIALOG,
NULL, channels_menu_update, TRUE, NULL, channels_menu_update, TRUE,
n_channels_menu_entries, n_channels_menu_entries,
channels_menu_entries); channels_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Vectors>", gimp_menu_factory_menu_register (global_menu_factory, "<Vectors>",
_("Paths Menu"),
GIMP_HELP_PATH_DIALOG, GIMP_HELP_PATH_DIALOG,
NULL, vectors_menu_update, TRUE, NULL, vectors_menu_update, TRUE,
n_vectors_menu_entries, n_vectors_menu_entries,
vectors_menu_entries); vectors_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Dialogs>", gimp_menu_factory_menu_register (global_menu_factory, "<Dialogs>",
_("Dialogs Menu"),
GIMP_HELP_DOCK, GIMP_HELP_DOCK,
NULL, dialogs_menu_update, TRUE, NULL, dialogs_menu_update, TRUE,
n_dialogs_menu_entries, n_dialogs_menu_entries,
dialogs_menu_entries); dialogs_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Brushes>", gimp_menu_factory_menu_register (global_menu_factory, "<Brushes>",
_("Brushes Menu"),
GIMP_HELP_BRUSH_DIALOG, GIMP_HELP_BRUSH_DIALOG,
NULL, brushes_menu_update, TRUE, NULL, brushes_menu_update, TRUE,
n_brushes_menu_entries, n_brushes_menu_entries,
brushes_menu_entries); brushes_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Patterns>", gimp_menu_factory_menu_register (global_menu_factory, "<Patterns>",
_("Patterns Menu"),
GIMP_HELP_PATTERN_DIALOG, GIMP_HELP_PATTERN_DIALOG,
NULL, patterns_menu_update, TRUE, NULL, patterns_menu_update, TRUE,
n_patterns_menu_entries, n_patterns_menu_entries,
patterns_menu_entries); patterns_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Gradients>", gimp_menu_factory_menu_register (global_menu_factory, "<Gradients>",
_("Gradients Menu"),
GIMP_HELP_GRADIENT_DIALOG, GIMP_HELP_GRADIENT_DIALOG,
NULL, gradients_menu_update, TRUE, NULL, gradients_menu_update, TRUE,
n_gradients_menu_entries, n_gradients_menu_entries,
gradients_menu_entries); gradients_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Palettes>", gimp_menu_factory_menu_register (global_menu_factory, "<Palettes>",
_("Palettes Menu"),
GIMP_HELP_PALETTE_DIALOG, GIMP_HELP_PALETTE_DIALOG,
NULL, palettes_menu_update, TRUE, NULL, palettes_menu_update, TRUE,
n_palettes_menu_entries, n_palettes_menu_entries,
palettes_menu_entries); palettes_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Buffers>", gimp_menu_factory_menu_register (global_menu_factory, "<Buffers>",
_("Buffers Menu"),
GIMP_HELP_BUFFER_DIALOG, GIMP_HELP_BUFFER_DIALOG,
NULL, buffers_menu_update, TRUE, NULL, buffers_menu_update, TRUE,
n_buffers_menu_entries, n_buffers_menu_entries,
buffers_menu_entries); buffers_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Documents>", gimp_menu_factory_menu_register (global_menu_factory, "<Documents>",
_("Documents Menu"),
GIMP_HELP_DOCUMENT_DIALOG, GIMP_HELP_DOCUMENT_DIALOG,
NULL, documents_menu_update, TRUE, NULL, documents_menu_update, TRUE,
n_documents_menu_entries, n_documents_menu_entries,
documents_menu_entries); documents_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Templates>", gimp_menu_factory_menu_register (global_menu_factory, "<Templates>",
_("Templaes Menu"),
GIMP_HELP_TEMPLATE_DIALOG, GIMP_HELP_TEMPLATE_DIALOG,
NULL, templates_menu_update, TRUE, NULL, templates_menu_update, TRUE,
n_templates_menu_entries, n_templates_menu_entries,
templates_menu_entries); templates_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Images>", gimp_menu_factory_menu_register (global_menu_factory, "<Images>",
_("Images Menu"),
GIMP_HELP_IMAGE_DIALOG, GIMP_HELP_IMAGE_DIALOG,
NULL, images_menu_update, TRUE, NULL, images_menu_update, TRUE,
n_images_menu_entries, n_images_menu_entries,
images_menu_entries); images_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<GradientEditor>", gimp_menu_factory_menu_register (global_menu_factory, "<GradientEditor>",
_("Gradient Editor Menu"),
GIMP_HELP_GRADIENT_EDITOR_DIALOG, GIMP_HELP_GRADIENT_EDITOR_DIALOG,
NULL, gradient_editor_menu_update, TRUE, NULL, gradient_editor_menu_update, TRUE,
n_gradient_editor_menu_entries, n_gradient_editor_menu_entries,
gradient_editor_menu_entries); gradient_editor_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<PaletteEditor>", gimp_menu_factory_menu_register (global_menu_factory, "<PaletteEditor>",
_("Palette Editor Menu"),
GIMP_HELP_PALETTE_EDITOR_DIALOG, GIMP_HELP_PALETTE_EDITOR_DIALOG,
NULL, palette_editor_menu_update, TRUE, NULL, palette_editor_menu_update, TRUE,
n_palette_editor_menu_entries, n_palette_editor_menu_entries,
palette_editor_menu_entries); palette_editor_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<ColormapEditor>", gimp_menu_factory_menu_register (global_menu_factory, "<ColormapEditor>",
_("Indexed Palette Menu"),
GIMP_HELP_INDEXED_PALETTE_DIALOG, GIMP_HELP_INDEXED_PALETTE_DIALOG,
NULL, colormap_editor_menu_update, TRUE, NULL, colormap_editor_menu_update, TRUE,
n_colormap_editor_menu_entries, n_colormap_editor_menu_entries,
colormap_editor_menu_entries); colormap_editor_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<QMask>", gimp_menu_factory_menu_register (global_menu_factory, "<QMask>",
_("QuickMask Menu"),
GIMP_HELP_QMASK, GIMP_HELP_QMASK,
NULL, qmask_menu_update, TRUE, NULL, qmask_menu_update, TRUE,
n_qmask_menu_entries, n_qmask_menu_entries,
qmask_menu_entries); qmask_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<ErrorConsole>", gimp_menu_factory_menu_register (global_menu_factory, "<ErrorConsole>",
_("Error Console Menu"),
GIMP_HELP_ERRORS_DIALOG, GIMP_HELP_ERRORS_DIALOG,
NULL, error_console_menu_update, TRUE, NULL, error_console_menu_update, TRUE,
n_error_console_menu_entries, n_error_console_menu_entries,

21
app/menus/menus.c
View File

@ -108,24 +108,28 @@ menus_init (Gimp *gimp)
global_menu_factory = gimp_menu_factory_new (gimp); global_menu_factory = gimp_menu_factory_new (gimp);
gimp_menu_factory_menu_register (global_menu_factory, "<Toolbox>", gimp_menu_factory_menu_register (global_menu_factory, "<Toolbox>",
_("Toolbox Menu"),
GIMP_HELP_TOOLBOX, GIMP_HELP_TOOLBOX,
toolbox_menu_setup, NULL, FALSE, toolbox_menu_setup, NULL, FALSE,
n_toolbox_menu_entries, n_toolbox_menu_entries,
toolbox_menu_entries); toolbox_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Image>", gimp_menu_factory_menu_register (global_menu_factory, "<Image>",
_("Image Menu"),
GIMP_HELP_IMAGE_WINDOW, GIMP_HELP_IMAGE_WINDOW,
image_menu_setup, image_menu_update, FALSE, image_menu_setup, image_menu_update, FALSE,
n_image_menu_entries, n_image_menu_entries,
image_menu_entries); image_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Load>", gimp_menu_factory_menu_register (global_menu_factory, "<Load>",
_("Open Menu"),
GIMP_HELP_FILE_OPEN, GIMP_HELP_FILE_OPEN,
file_open_menu_setup, NULL, FALSE, file_open_menu_setup, NULL, FALSE,
n_file_open_menu_entries, n_file_open_menu_entries,
file_open_menu_entries); file_open_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Save>", gimp_menu_factory_menu_register (global_menu_factory, "<Save>",
_("Save Menu"),
GIMP_HELP_FILE_SAVE, GIMP_HELP_FILE_SAVE,
file_save_menu_setup, file_save_menu_setup,
file_save_menu_update, FALSE, file_save_menu_update, FALSE,
@ -133,102 +137,119 @@ menus_init (Gimp *gimp)
file_save_menu_entries); file_save_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Layers>", gimp_menu_factory_menu_register (global_menu_factory, "<Layers>",
_("Layers Menu"),
GIMP_HELP_LAYER_DIALOG, GIMP_HELP_LAYER_DIALOG,
NULL, layers_menu_update, TRUE, NULL, layers_menu_update, TRUE,
n_layers_menu_entries, n_layers_menu_entries,
layers_menu_entries); layers_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Channels>", gimp_menu_factory_menu_register (global_menu_factory, "<Channels>",
_("Channels Menu"),
GIMP_HELP_CHANNEL_DIALOG, GIMP_HELP_CHANNEL_DIALOG,
NULL, channels_menu_update, TRUE, NULL, channels_menu_update, TRUE,
n_channels_menu_entries, n_channels_menu_entries,
channels_menu_entries); channels_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Vectors>", gimp_menu_factory_menu_register (global_menu_factory, "<Vectors>",
_("Paths Menu"),
GIMP_HELP_PATH_DIALOG, GIMP_HELP_PATH_DIALOG,
NULL, vectors_menu_update, TRUE, NULL, vectors_menu_update, TRUE,
n_vectors_menu_entries, n_vectors_menu_entries,
vectors_menu_entries); vectors_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Dialogs>", gimp_menu_factory_menu_register (global_menu_factory, "<Dialogs>",
_("Dialogs Menu"),
GIMP_HELP_DOCK, GIMP_HELP_DOCK,
NULL, dialogs_menu_update, TRUE, NULL, dialogs_menu_update, TRUE,
n_dialogs_menu_entries, n_dialogs_menu_entries,
dialogs_menu_entries); dialogs_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Brushes>", gimp_menu_factory_menu_register (global_menu_factory, "<Brushes>",
_("Brushes Menu"),
GIMP_HELP_BRUSH_DIALOG, GIMP_HELP_BRUSH_DIALOG,
NULL, brushes_menu_update, TRUE, NULL, brushes_menu_update, TRUE,
n_brushes_menu_entries, n_brushes_menu_entries,
brushes_menu_entries); brushes_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Patterns>", gimp_menu_factory_menu_register (global_menu_factory, "<Patterns>",
_("Patterns Menu"),
GIMP_HELP_PATTERN_DIALOG, GIMP_HELP_PATTERN_DIALOG,
NULL, patterns_menu_update, TRUE, NULL, patterns_menu_update, TRUE,
n_patterns_menu_entries, n_patterns_menu_entries,
patterns_menu_entries); patterns_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Gradients>", gimp_menu_factory_menu_register (global_menu_factory, "<Gradients>",
_("Gradients Menu"),
GIMP_HELP_GRADIENT_DIALOG, GIMP_HELP_GRADIENT_DIALOG,
NULL, gradients_menu_update, TRUE, NULL, gradients_menu_update, TRUE,
n_gradients_menu_entries, n_gradients_menu_entries,
gradients_menu_entries); gradients_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Palettes>", gimp_menu_factory_menu_register (global_menu_factory, "<Palettes>",
_("Palettes Menu"),
GIMP_HELP_PALETTE_DIALOG, GIMP_HELP_PALETTE_DIALOG,
NULL, palettes_menu_update, TRUE, NULL, palettes_menu_update, TRUE,
n_palettes_menu_entries, n_palettes_menu_entries,
palettes_menu_entries); palettes_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Buffers>", gimp_menu_factory_menu_register (global_menu_factory, "<Buffers>",
_("Buffers Menu"),
GIMP_HELP_BUFFER_DIALOG, GIMP_HELP_BUFFER_DIALOG,
NULL, buffers_menu_update, TRUE, NULL, buffers_menu_update, TRUE,
n_buffers_menu_entries, n_buffers_menu_entries,
buffers_menu_entries); buffers_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Documents>", gimp_menu_factory_menu_register (global_menu_factory, "<Documents>",
_("Documents Menu"),
GIMP_HELP_DOCUMENT_DIALOG, GIMP_HELP_DOCUMENT_DIALOG,
NULL, documents_menu_update, TRUE, NULL, documents_menu_update, TRUE,
n_documents_menu_entries, n_documents_menu_entries,
documents_menu_entries); documents_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Templates>", gimp_menu_factory_menu_register (global_menu_factory, "<Templates>",
_("Templaes Menu"),
GIMP_HELP_TEMPLATE_DIALOG, GIMP_HELP_TEMPLATE_DIALOG,
NULL, templates_menu_update, TRUE, NULL, templates_menu_update, TRUE,
n_templates_menu_entries, n_templates_menu_entries,
templates_menu_entries); templates_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<Images>", gimp_menu_factory_menu_register (global_menu_factory, "<Images>",
_("Images Menu"),
GIMP_HELP_IMAGE_DIALOG, GIMP_HELP_IMAGE_DIALOG,
NULL, images_menu_update, TRUE, NULL, images_menu_update, TRUE,
n_images_menu_entries, n_images_menu_entries,
images_menu_entries); images_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<GradientEditor>", gimp_menu_factory_menu_register (global_menu_factory, "<GradientEditor>",
_("Gradient Editor Menu"),
GIMP_HELP_GRADIENT_EDITOR_DIALOG, GIMP_HELP_GRADIENT_EDITOR_DIALOG,
NULL, gradient_editor_menu_update, TRUE, NULL, gradient_editor_menu_update, TRUE,
n_gradient_editor_menu_entries, n_gradient_editor_menu_entries,
gradient_editor_menu_entries); gradient_editor_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<PaletteEditor>", gimp_menu_factory_menu_register (global_menu_factory, "<PaletteEditor>",
_("Palette Editor Menu"),
GIMP_HELP_PALETTE_EDITOR_DIALOG, GIMP_HELP_PALETTE_EDITOR_DIALOG,
NULL, palette_editor_menu_update, TRUE, NULL, palette_editor_menu_update, TRUE,
n_palette_editor_menu_entries, n_palette_editor_menu_entries,
palette_editor_menu_entries); palette_editor_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<ColormapEditor>", gimp_menu_factory_menu_register (global_menu_factory, "<ColormapEditor>",
_("Indexed Palette Menu"),
GIMP_HELP_INDEXED_PALETTE_DIALOG, GIMP_HELP_INDEXED_PALETTE_DIALOG,
NULL, colormap_editor_menu_update, TRUE, NULL, colormap_editor_menu_update, TRUE,
n_colormap_editor_menu_entries, n_colormap_editor_menu_entries,
colormap_editor_menu_entries); colormap_editor_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<QMask>", gimp_menu_factory_menu_register (global_menu_factory, "<QMask>",
_("QuickMask Menu"),
GIMP_HELP_QMASK, GIMP_HELP_QMASK,
NULL, qmask_menu_update, TRUE, NULL, qmask_menu_update, TRUE,
n_qmask_menu_entries, n_qmask_menu_entries,
qmask_menu_entries); qmask_menu_entries);
gimp_menu_factory_menu_register (global_menu_factory, "<ErrorConsole>", gimp_menu_factory_menu_register (global_menu_factory, "<ErrorConsole>",
_("Error Console Menu"),
GIMP_HELP_ERRORS_DIALOG, GIMP_HELP_ERRORS_DIALOG,
NULL, error_console_menu_update, TRUE, NULL, error_console_menu_update, TRUE,
n_error_console_menu_entries, n_error_console_menu_entries,

128
app/widgets/gimpdockable.c
View File

@ -46,6 +46,7 @@ static void gimp_dockable_style_set (GtkWidget *widget,
GtkStyle *prev_style); GtkStyle *prev_style);
static gboolean gimp_dockable_expose_event (GtkWidget *widget, static gboolean gimp_dockable_expose_event (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
static gboolean gimp_dockable_popup_menu (GtkWidget *widget);
static void gimp_dockable_forall (GtkContainer *container, static void gimp_dockable_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
@ -66,6 +67,7 @@ static gboolean gimp_dockable_menu_button_press (GtkWidget *button,
GimpDockable *dockable); GimpDockable *dockable);
static void gimp_dockable_close_clicked (GtkWidget *button, static void gimp_dockable_close_clicked (GtkWidget *button,
GimpDockable *dockable); GimpDockable *dockable);
static gboolean gimp_dockable_show_menu (GimpDockable *dockable);
static GtkBinClass *parent_class = NULL; static GtkBinClass *parent_class = NULL;
@ -118,6 +120,7 @@ gimp_dockable_class_init (GimpDockableClass *klass)
widget_class->size_allocate = gimp_dockable_size_allocate; widget_class->size_allocate = gimp_dockable_size_allocate;
widget_class->style_set = gimp_dockable_style_set; widget_class->style_set = gimp_dockable_style_set;
widget_class->expose_event = gimp_dockable_expose_event; widget_class->expose_event = gimp_dockable_expose_event;
widget_class->popup_menu = gimp_dockable_popup_menu;
container_class->forall = gimp_dockable_forall; container_class->forall = gimp_dockable_forall;
@ -157,6 +160,7 @@ gimp_dockable_init (GimpDockable *dockable)
GTK_WIDGET_UNSET_FLAGS (dockable->menu_button, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS (dockable->menu_button, GTK_CAN_FOCUS);
gtk_widget_set_parent (dockable->menu_button, GTK_WIDGET (dockable)); gtk_widget_set_parent (dockable->menu_button, GTK_WIDGET (dockable));
gtk_button_set_relief (GTK_BUTTON (dockable->menu_button), GTK_RELIEF_NONE); gtk_button_set_relief (GTK_BUTTON (dockable->menu_button), GTK_RELIEF_NONE);
gtk_widget_show (dockable->menu_button);
image = gtk_image_new_from_stock (GIMP_STOCK_MENU_LEFT, GTK_ICON_SIZE_MENU); image = gtk_image_new_from_stock (GIMP_STOCK_MENU_LEFT, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (dockable->menu_button), image); gtk_container_add (GTK_CONTAINER (dockable->menu_button), image);
@ -400,6 +404,12 @@ gimp_dockable_expose_event (GtkWidget *widget,
return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
} }
static gboolean
gimp_dockable_popup_menu (GtkWidget *widget)
{
return gimp_dockable_show_menu (GIMP_DOCKABLE (widget));
}
static void static void
gimp_dockable_forall (GtkContainer *container, gimp_dockable_forall (GtkContainer *container,
gboolean include_internals, gboolean include_internals,
@ -450,9 +460,6 @@ gimp_dockable_new (const gchar *name,
dockable->set_context_func = set_context_func; dockable->set_context_func = set_context_func;
dockable->get_menu_func = get_menu_func; dockable->get_menu_func = get_menu_func;
if (get_menu_func)
gtk_widget_show (dockable->menu_button);
if (! get_preview_func) if (! get_preview_func)
{ {
switch (dockable->tab_style) switch (dockable->tab_style)
@ -610,6 +617,26 @@ gimp_dockable_real_get_menu (GimpDockable *dockable,
return NULL; return NULL;
} }
static gboolean
gimp_dockable_menu_button_press (GtkWidget *button,
GdkEventButton *bevent,
GimpDockable *dockable)
{
if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS)
{
return gimp_dockable_show_menu (dockable);
}
return FALSE;
}
static void
gimp_dockable_close_clicked (GtkWidget *button,
GimpDockable *dockable)
{
gimp_dockbook_remove (dockable->dockbook, dockable);
}
static void static void
gimp_dockable_menu_position (GtkMenu *menu, gimp_dockable_menu_position (GtkMenu *menu,
gint *x, gint *x,
@ -653,34 +680,83 @@ gimp_dockable_menu_position (GtkMenu *menu,
*y = 0; *y = 0;
} }
static gboolean static void
gimp_dockable_menu_button_press (GtkWidget *button, gimp_dockable_menu_end (GimpDockable *dockable)
GdkEventButton *bevent,
GimpDockable *dockable)
{ {
if (bevent->button == 1 && bevent->type == GDK_BUTTON_PRESS) GimpItemFactory *dialog_item_factory;
{ gpointer dialog_item_factory_data;
GimpItemFactory *item_factory;
gpointer item_factory_data;
item_factory = gimp_dockable_get_menu (dockable, &item_factory_data); dialog_item_factory = gimp_dockable_get_menu (dockable,
&dialog_item_factory_data);
if (item_factory) if (dialog_item_factory)
gtk_menu_detach (GTK_MENU (GTK_ITEM_FACTORY (dialog_item_factory)->widget));
/* release gimp_dockable_show_menu()'s reference */
g_object_unref (dockable);
}
static gboolean
gimp_dockable_show_menu (GimpDockable *dockable)
{
GimpItemFactory *dockbook_item_factory;
GimpItemFactory *dialog_item_factory;
gpointer dialog_item_factory_data;
dockbook_item_factory = dockable->dockbook->item_factory;
if (! dockbook_item_factory)
return FALSE;
dialog_item_factory = gimp_dockable_get_menu (dockable,
&dialog_item_factory_data);
if (dialog_item_factory)
{ {
gimp_item_factory_popup_with_data (item_factory, item_factory_data, GtkWidget *dialog_menu_widget;
GtkWidget *image;
gimp_item_factory_set_label (GTK_ITEM_FACTORY (dockbook_item_factory),
"/dialog-menu",
dialog_item_factory->title);
gimp_item_factory_set_visible (GTK_ITEM_FACTORY (dockbook_item_factory),
"/dialog-menu", TRUE);
dialog_menu_widget =
gtk_item_factory_get_widget (GTK_ITEM_FACTORY (dockbook_item_factory),
"/dialog-menu");
image = gtk_image_new_from_stock (dockable->stock_id,
GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (dialog_menu_widget),
image);
gtk_widget_show (image);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (dialog_menu_widget),
GTK_ITEM_FACTORY (dialog_item_factory)->widget);
gimp_item_factory_update (dialog_item_factory,
dialog_item_factory_data);
}
else
{
gimp_item_factory_set_visible (GTK_ITEM_FACTORY (dockbook_item_factory),
"/dialog-menu", FALSE);
}
gimp_item_factory_set_visible (GTK_ITEM_FACTORY (dockbook_item_factory),
"/Select Tab", FALSE);
/* an item factory callback may destroy the dockable, so reference
* if for gimp_dockable_menu_end()
*/
g_object_ref (dockable);
gimp_item_factory_popup_with_data (dockbook_item_factory,
dockable,
gimp_dockable_menu_position, gimp_dockable_menu_position,
dockable, dockable,
NULL); (GtkDestroyNotify) gimp_dockable_menu_end);
return TRUE; return TRUE;
}
}
return FALSE;
}
static void
gimp_dockable_close_clicked (GtkWidget *button,
GimpDockable *dockable)
{
gimp_dockbook_remove (dockable->dockbook, dockable);
} }

7
app/widgets/gimpdockbook.c
View File

@ -241,7 +241,7 @@ gimp_dockbook_new (GimpMenuFactory *menu_factory)
dockbook->item_factory = gimp_menu_factory_menu_new (menu_factory, dockbook->item_factory = gimp_menu_factory_menu_new (menu_factory,
"<Dialogs>", "<Dialogs>",
GTK_TYPE_MENU, GTK_TYPE_MENU,
menu_factory->gimp, dockbook,
FALSE); FALSE);
gimp_help_connect (GTK_WIDGET (dockbook), gimp_dockbook_help_func, gimp_help_connect (GTK_WIDGET (dockbook), gimp_dockbook_help_func,
@ -585,6 +585,11 @@ gimp_dockbook_tab_button_press (GtkWidget *widget,
{ {
GtkWidget *add_widget; GtkWidget *add_widget;
gimp_item_factory_set_visible (GTK_ITEM_FACTORY (dockbook->item_factory),
"/dialog-menu", FALSE);
gimp_item_factory_set_visible (GTK_ITEM_FACTORY (dockbook->item_factory),
"/Select Tab", TRUE);
add_widget = add_widget =
gtk_item_factory_get_widget (GTK_ITEM_FACTORY (dockbook->item_factory), gtk_item_factory_get_widget (GTK_ITEM_FACTORY (dockbook->item_factory),
"/Select Tab"); "/Select Tab");

59
app/widgets/gimpeditor.c
View File

@ -30,7 +30,6 @@
#include "gimpeditor.h" #include "gimpeditor.h"
#include "gimpdnd.h" #include "gimpdnd.h"
#include "gimpenummenu.h" #include "gimpenummenu.h"
#include "gimpitemfactory.h"
#include "gimpmenufactory.h" #include "gimpmenufactory.h"
@ -45,7 +44,6 @@ static void gimp_editor_init (GimpEditor *editor);
static void gimp_editor_destroy (GtkObject *object); static void gimp_editor_destroy (GtkObject *object);
static void gimp_editor_style_set (GtkWidget *widget, static void gimp_editor_style_set (GtkWidget *widget,
GtkStyle *prev_style); GtkStyle *prev_style);
static gboolean gimp_editor_popup_menu (GtkWidget *widget);
static GtkIconSize gimp_editor_ensure_button_box (GimpEditor *editor); static GtkIconSize gimp_editor_ensure_button_box (GimpEditor *editor);
@ -95,7 +93,6 @@ gimp_editor_class_init (GimpEditorClass *klass)
object_class->destroy = gimp_editor_destroy; object_class->destroy = gimp_editor_destroy;
widget_class->style_set = gimp_editor_style_set; widget_class->style_set = gimp_editor_style_set;
widget_class->popup_menu = gimp_editor_popup_menu;
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("content_spacing", g_param_spec_int ("content_spacing",
@ -194,62 +191,6 @@ gimp_editor_style_set (GtkWidget *widget,
GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
} }
static void
gimp_editor_menu_position (GtkMenu *menu,
gint *x,
gint *y,
gpointer data)
{
GtkRequisition requisition;
GtkWidget *editor;
GdkScreen *screen;
gint editor_x;
gint editor_y;
editor = (GtkWidget *) data;
gdk_window_get_origin (editor->window, &editor_x, &editor_y);
gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
*x = editor_x + editor->allocation.x + 2;
*y = editor_y + editor->allocation.y + 2;
screen = gtk_widget_get_screen (GTK_WIDGET (menu));
if (*x + requisition.width > gdk_screen_get_width (screen))
*x -= requisition.width;
if (*x < 0)
*x = 0;
if (*y + requisition.height > gdk_screen_get_height (screen))
*y -= requisition.height;
if (*y < 0)
*y = 0;
}
static gboolean
gimp_editor_popup_menu (GtkWidget *widget)
{
GimpEditor *editor;
editor = GIMP_EDITOR (widget);
if (editor->item_factory)
{
gimp_item_factory_popup_with_data (editor->item_factory,
editor->item_factory_data,
gimp_editor_menu_position,
editor,
NULL);
return TRUE;
}
return FALSE;
}
GtkWidget * GtkWidget *
gimp_editor_new (void) gimp_editor_new (void)
{ {

3
app/widgets/gimphelp-ids.h
View File

@ -363,7 +363,8 @@
#define GIMP_HELP_DOCK_IMAGE_MENU "gimp-dock-image-menu" #define GIMP_HELP_DOCK_IMAGE_MENU "gimp-dock-image-menu"
#define GIMP_HELP_DOCK_AUTO_BUTTON "gimp-dock-auto-button" #define GIMP_HELP_DOCK_AUTO_BUTTON "gimp-dock-auto-button"
#define GIMP_HELP_DOCK_TAB_ADD "gimp-dock-tab-add" #define GIMP_HELP_DOCK_TAB_ADD "gimp-dock-tab-add"
#define GIMP_HELP_DOCK_TAB_REMOVE "gimp-dock-tab-remove" #define GIMP_HELP_DOCK_TAB_CLOSE "gimp-dock-tab-close"
#define GIMP_HELP_DOCK_TAB_DETACH "gimp-dock-tab-detach"
#define GIMP_HELP_DOCK_PREVIEW_SIZE "gimp-dock-preview-size" #define GIMP_HELP_DOCK_PREVIEW_SIZE "gimp-dock-preview-size"
#define GIMP_HELP_DOCK_TAB_STYLE "gimp-dock-tab-style" #define GIMP_HELP_DOCK_TAB_STYLE "gimp-dock-tab-style"
#define GIMP_HELP_DOCK_VIEW_AS_LIST "gimp-dock-view-as-list" #define GIMP_HELP_DOCK_VIEW_AS_LIST "gimp-dock-view-as-list"

16
app/widgets/gimpitemfactory.c
View File

@ -117,6 +117,7 @@ gimp_item_factory_init (GimpItemFactory *factory)
factory->gimp = NULL; factory->gimp = NULL;
factory->update_func = NULL; factory->update_func = NULL;
factory->update_on_popup = FALSE; factory->update_on_popup = FALSE;
factory->title = NULL;
factory->help_id = NULL; factory->help_id = NULL;
factory->translation_trash = NULL; factory->translation_trash = NULL;
} }
@ -128,6 +129,12 @@ gimp_item_factory_finalize (GObject *object)
factory = GIMP_ITEM_FACTORY (object); factory = GIMP_ITEM_FACTORY (object);
if (factory->title)
{
g_free (factory->title);
factory->title = NULL;
}
if (factory->help_id) if (factory->help_id)
{ {
g_free (factory->help_id); g_free (factory->help_id);
@ -170,6 +177,9 @@ gimp_item_factory_destroy (GtkObject *object)
} }
GTK_OBJECT_CLASS (parent_class)->destroy (object); GTK_OBJECT_CLASS (parent_class)->destroy (object);
if (GTK_ITEM_FACTORY (factory)->widget)
g_object_unref (GTK_ITEM_FACTORY (factory)->widget);
} }
@ -179,6 +189,7 @@ GimpItemFactory *
gimp_item_factory_new (Gimp *gimp, gimp_item_factory_new (Gimp *gimp,
GType container_type, GType container_type,
const gchar *factory_path, const gchar *factory_path,
const gchar *title,
const gchar *help_id, const gchar *help_id,
GimpItemFactoryUpdateFunc update_func, GimpItemFactoryUpdateFunc update_func,
gboolean update_on_popup, gboolean update_on_popup,
@ -193,6 +204,7 @@ gimp_item_factory_new (Gimp *gimp,
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (factory_path != NULL, NULL); g_return_val_if_fail (factory_path != NULL, NULL);
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL); g_return_val_if_fail (help_id != NULL, NULL);
g_return_val_if_fail (factory_path[0] == '<', NULL); g_return_val_if_fail (factory_path[0] == '<', NULL);
g_return_val_if_fail (factory_path[strlen (factory_path) - 1] == '>', NULL); g_return_val_if_fail (factory_path[strlen (factory_path) - 1] == '>', NULL);
@ -214,6 +226,7 @@ gimp_item_factory_new (Gimp *gimp,
factory->gimp = gimp; factory->gimp = gimp;
factory->update_func = update_func; factory->update_func = update_func;
factory->update_on_popup = update_on_popup; factory->update_on_popup = update_on_popup;
factory->title = g_strdup (title);
factory->help_id = g_strdup (help_id); factory->help_id = g_strdup (help_id);
list = g_hash_table_lookup (factory_class->factories, factory_path); list = g_hash_table_lookup (factory_class->factories, factory_path);
@ -234,6 +247,9 @@ gimp_item_factory_new (Gimp *gimp,
g_type_class_unref (factory_class); g_type_class_unref (factory_class);
if (GTK_ITEM_FACTORY (factory)->widget)
g_object_ref (GTK_ITEM_FACTORY (factory)->widget);
return factory; return factory;
} }

2
app/widgets/gimpitemfactory.h
View File

@ -50,6 +50,7 @@ struct _GimpItemFactory
Gimp *gimp; Gimp *gimp;
GimpItemFactoryUpdateFunc update_func; GimpItemFactoryUpdateFunc update_func;
gboolean update_on_popup; gboolean update_on_popup;
gchar *title;
gchar *help_id; gchar *help_id;
GList *translation_trash; GList *translation_trash;
@ -68,6 +69,7 @@ GType gimp_item_factory_get_type (void) G_GNUC_CONST;
GimpItemFactory * gimp_item_factory_new (Gimp *gimp, GimpItemFactory * gimp_item_factory_new (Gimp *gimp,
GType container_type, GType container_type,
const gchar *factory_path, const gchar *factory_path,
const gchar *title,
const gchar *help_id, const gchar *help_id,
GimpItemFactoryUpdateFunc update_func, GimpItemFactoryUpdateFunc update_func,
gboolean update_on_popup, gboolean update_on_popup,

5
app/widgets/gimpmenufactory.c
View File

@ -106,6 +106,7 @@ gimp_menu_factory_finalize (GObject *object)
entry = (GimpMenuFactoryEntry *) list->data; entry = (GimpMenuFactoryEntry *) list->data;
g_free (entry->identifier); g_free (entry->identifier);
g_free (entry->title);
g_free (entry->help_id); g_free (entry->help_id);
g_free (entry); g_free (entry);
} }
@ -133,6 +134,7 @@ gimp_menu_factory_new (Gimp *gimp)
void void
gimp_menu_factory_menu_register (GimpMenuFactory *factory, gimp_menu_factory_menu_register (GimpMenuFactory *factory,
const gchar *identifier, const gchar *identifier,
const gchar *title,
const gchar *help_id, const gchar *help_id,
GimpItemFactorySetupFunc setup_func, GimpItemFactorySetupFunc setup_func,
GimpItemFactoryUpdateFunc update_func, GimpItemFactoryUpdateFunc update_func,
@ -144,6 +146,7 @@ gimp_menu_factory_menu_register (GimpMenuFactory *factory,
g_return_if_fail (GIMP_IS_MENU_FACTORY (factory)); g_return_if_fail (GIMP_IS_MENU_FACTORY (factory));
g_return_if_fail (identifier != NULL); g_return_if_fail (identifier != NULL);
g_return_if_fail (title != NULL);
g_return_if_fail (help_id != NULL); g_return_if_fail (help_id != NULL);
g_return_if_fail (n_entries > 0); g_return_if_fail (n_entries > 0);
g_return_if_fail (entries != NULL); g_return_if_fail (entries != NULL);
@ -151,6 +154,7 @@ gimp_menu_factory_menu_register (GimpMenuFactory *factory,
entry = g_new0 (GimpMenuFactoryEntry, 1); entry = g_new0 (GimpMenuFactoryEntry, 1);
entry->identifier = g_strdup (identifier); entry->identifier = g_strdup (identifier);
entry->title = g_strdup (title);
entry->help_id = g_strdup (help_id); entry->help_id = g_strdup (help_id);
entry->setup_func = setup_func; entry->setup_func = setup_func;
entry->update_func = update_func; entry->update_func = update_func;
@ -184,6 +188,7 @@ gimp_menu_factory_menu_new (GimpMenuFactory *factory,
item_factory = gimp_item_factory_new (factory->gimp, item_factory = gimp_item_factory_new (factory->gimp,
container_type, container_type,
entry->identifier, entry->identifier,
entry->title,
entry->help_id, entry->help_id,
entry->update_func, entry->update_func,
entry->update_on_popup, entry->update_on_popup,