ported some forgotten #if 0'ed GtkItemFactory stuff to GtkUIManager.

2004-06-12  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_events): ported some forgotten #if 0'ed
	GtkItemFactory stuff to GtkUIManager.
This commit is contained in:
Michael Natterer 2004-06-12 18:50:44 +00:00 committed by Michael Natterer
parent 3c1b7fe68f
commit 7fd7442582
2 changed files with 18 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2004-06-12 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_events): ported some forgotten #if 0'ed
GtkItemFactory stuff to GtkUIManager.
2004-06-12 Simon Budig <simon@gimp.org> 2004-06-12 Simon Budig <simon@gimp.org>
* app/tools/gimptool.[ch]: renamed the "arrow_key" member * app/tools/gimptool.[ch]: renamed the "arrow_key" member

View File

@ -44,6 +44,7 @@
#include "tools/gimptoolcontrol.h" #include "tools/gimptoolcontrol.h"
#include "tools/tool_manager.h" #include "tools/tool_manager.h"
#include "widgets/gimpactiongroup.h"
#include "widgets/gimpcursor.h" #include "widgets/gimpcursor.h"
#include "widgets/gimpdevices.h" #include "widgets/gimpdevices.h"
#include "widgets/gimpitemfactory.h" #include "widgets/gimpitemfactory.h"
@ -207,6 +208,7 @@ gimp_display_shell_events (GtkWidget *widget,
GdkEventWindowState *sevent = (GdkEventWindowState *) event; GdkEventWindowState *sevent = (GdkEventWindowState *) event;
GimpDisplayOptions *options; GimpDisplayOptions *options;
gboolean fullscreen; gboolean fullscreen;
GimpActionGroup *group;
shell->window_state = sevent->new_window_state; shell->window_state = sevent->new_window_state;
@ -237,16 +239,19 @@ gimp_display_shell_events (GtkWidget *widget,
options->padding_mode, options->padding_mode,
&options->padding_color); &options->padding_color);
#if 0 group = gimp_ui_manager_get_action_group (shell->menubar_manager,
FIXME "view");
gimp_item_factory_set_active (GTK_ITEM_FACTORY (shell->menubar_factory), gimp_action_group_set_action_active (group, "view-fullscreen",
"/View/Fullscreen", fullscreen); fullscreen);
if (shell->gdisp == if (shell->gdisp ==
gimp_context_get_display (gimp_get_user_context (gimp))) gimp_context_get_display (gimp_get_user_context (gimp)))
gimp_item_factory_set_active (GTK_ITEM_FACTORY (shell->popup_factory), {
"/View/Fullscreen", fullscreen); group = gimp_ui_manager_get_action_group (shell->popup_manager,
#endif "view");
gimp_action_group_set_action_active (group, "view-fullscreen",
fullscreen);
}
} }
break; break;