Commit 6ce08f3c authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/gui/Makefile.am removed...

2002-03-20  Michael Natterer  <mitch@gimp.org>

	* app/gui/Makefile.am
	* app/gui/commands.[ch]: removed...

	* app/gui/help-commands.[ch]: ...and added here.

	* app/gui/menus.c: changed accordingly and added the mem_profile
	debug callback so all debug stuff is in one place.
parent 982969e6
2002-03-20 Michael Natterer <mitch@gimp.org>
* app/gui/Makefile.am
* app/gui/commands.[ch]: removed...
* app/gui/help-commands.[ch]: ...and added here.
* app/gui/menus.c: changed accordingly and added the mem_profile
debug callback so all debug stuff is in one place.
2002-03-20 Sven Neumann <sven@gimp.org>
 
* app/Makefile.am: moved display after gui to make the build work
......
......@@ -28,36 +28,21 @@
#include "plug-in/plug-in.h"
#include "commands.h"
#include "help-commands.h"
/***** Help *****/
void
help_help_cmd_callback (GtkWidget *widget,
gpointer data)
gpointer data,
guint action)
{
gimp_standard_help_func (NULL);
}
void
help_context_help_cmd_callback (GtkWidget *widget,
gpointer data)
gpointer data,
guint action)
{
gimp_context_help ();
}
/***** Debug *****/
void
debug_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data)
{
extern gboolean gimp_debug_memsize;
gimp_debug_memsize = TRUE;
gimp_object_get_memsize (GIMP_OBJECT (data));
gimp_debug_memsize = FALSE;
}
......@@ -16,17 +16,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COMMANDS_H__
#define __COMMANDS_H__
#ifndef __HELP_COMMANDS_H__
#define __HELP_COMMANDS_H__
void help_help_cmd_callback (GtkWidget *widget,
gpointer data);
gpointer data,
guint action);
void help_context_help_cmd_callback (GtkWidget *widget,
gpointer data);
gpointer data,
guint action);
void debug_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data);
#endif /* __COMMANDS_H__ */
#endif /* __HELP_COMMANDS_H__ */
......@@ -20,8 +20,6 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
color-select.h \
colormap-editor-commands.c \
colormap-editor-commands.h \
commands.c \
commands.h \
convert-dialog.c \
convert-dialog.h \
data-commands.c \
......@@ -61,6 +59,8 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
gui.c \
gui.h \
gui-types.h \
help-commands.c \
help-commands.h \
image-commands.c \
image-commands.h \
info-dialog.c \
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "core/gimpobject.h"
#include "plug-in/plug-in.h"
#include "commands.h"
/***** Help *****/
void
help_help_cmd_callback (GtkWidget *widget,
gpointer data)
{
gimp_standard_help_func (NULL);
}
void
help_context_help_cmd_callback (GtkWidget *widget,
gpointer data)
{
gimp_context_help ();
}
/***** Debug *****/
void
debug_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data)
{
extern gboolean gimp_debug_memsize;
gimp_debug_memsize = TRUE;
gimp_object_get_memsize (GIMP_OBJECT (data));
gimp_debug_memsize = FALSE;
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COMMANDS_H__
#define __COMMANDS_H__
void help_help_cmd_callback (GtkWidget *widget,
gpointer data);
void help_context_help_cmd_callback (GtkWidget *widget,
gpointer data);
void debug_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data);
#endif /* __COMMANDS_H__ */
......@@ -28,36 +28,21 @@
#include "plug-in/plug-in.h"
#include "commands.h"
#include "help-commands.h"
/***** Help *****/
void
help_help_cmd_callback (GtkWidget *widget,
gpointer data)
gpointer data,
guint action)
{
gimp_standard_help_func (NULL);
}
void
help_context_help_cmd_callback (GtkWidget *widget,
gpointer data)
gpointer data,
guint action)
{
gimp_context_help ();
}
/***** Debug *****/
void
debug_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data)
{
extern gboolean gimp_debug_memsize;
gimp_debug_memsize = TRUE;
gimp_object_get_memsize (GIMP_OBJECT (data));
gimp_debug_memsize = FALSE;
}
......@@ -16,17 +16,16 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COMMANDS_H__
#define __COMMANDS_H__
#ifndef __HELP_COMMANDS_H__
#define __HELP_COMMANDS_H__
void help_help_cmd_callback (GtkWidget *widget,
gpointer data);
gpointer data,
guint action);
void help_context_help_cmd_callback (GtkWidget *widget,
gpointer data);
gpointer data,
guint action);
void debug_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data);
#endif /* __COMMANDS_H__ */
#endif /* __HELP_COMMANDS_H__ */
......@@ -40,7 +40,6 @@
#include "buffers-commands.h"
#include "channels-commands.h"
#include "colormap-editor-commands.h"
#include "commands.h"
#include "data-commands.h"
#include "dialogs-commands.h"
#include "documents-commands.h"
......@@ -49,6 +48,7 @@
#include "file-commands.h"
#include "gradient-editor-commands.h"
#include "gradients-commands.h"
#include "help-commands.h"
#include "image-commands.h"
#include "layers-commands.h"
#include "menus.h"
......@@ -89,12 +89,15 @@ static void menus_color_changed (GimpContext *context,
GimpItemFactory *item_factory);
static void menus_filters_subdirs_to_top (GtkMenu *menu);
#ifdef ENABLE_DEBUG_ENTRIES
static void menus_debug_recurse_menu (GtkWidget *menu,
gint depth,
gchar *path);
static void menus_debug_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
static void menus_debug_recurse_menu (GtkWidget *menu,
gint depth,
gchar *path);
static void menus_debug_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
static void menus_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
#endif /* ENABLE_DEBUG_ENTRIES */
......@@ -212,7 +215,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL, NULL, NULL },
{ { "/File/Debug/Mem Profile", NULL,
debug_mem_profile_cmd_callback, 0 },
menus_mem_profile_cmd_callback, 0 },
NULL, NULL, NULL },
{ { "/File/Debug/Dump Items", NULL,
menus_debug_cmd_callback, 0 },
......@@ -248,7 +251,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL,
"help/dialogs/help.html", NULL },
{ { N_("/Help/Context Help..."), "<shift>F1",
help_context_help_cmd_callback, 0 },
help_context_help_cmd_callback, 0,
"<StockItem>", GTK_STOCK_HELP },
NULL,
"help/context_help.html", NULL },
{ { N_("/Help/Tip of the Day..."), NULL,
......@@ -2727,4 +2731,18 @@ menus_debug_cmd_callback (GtkWidget *widget,
#endif
}
static void
menus_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
extern gboolean gimp_debug_memsize;
gimp_debug_memsize = TRUE;
gimp_object_get_memsize (GIMP_OBJECT (data));
gimp_debug_memsize = FALSE;
}
#endif /* ENABLE_DEBUG_ENTRIES */
......@@ -40,7 +40,6 @@
#include "buffers-commands.h"
#include "channels-commands.h"
#include "colormap-editor-commands.h"
#include "commands.h"
#include "data-commands.h"
#include "dialogs-commands.h"
#include "documents-commands.h"
......@@ -49,6 +48,7 @@
#include "file-commands.h"
#include "gradient-editor-commands.h"
#include "gradients-commands.h"
#include "help-commands.h"
#include "image-commands.h"
#include "layers-commands.h"
#include "menus.h"
......@@ -89,12 +89,15 @@ static void menus_color_changed (GimpContext *context,
GimpItemFactory *item_factory);
static void menus_filters_subdirs_to_top (GtkMenu *menu);
#ifdef ENABLE_DEBUG_ENTRIES
static void menus_debug_recurse_menu (GtkWidget *menu,
gint depth,
gchar *path);
static void menus_debug_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
static void menus_debug_recurse_menu (GtkWidget *menu,
gint depth,
gchar *path);
static void menus_debug_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
static void menus_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
#endif /* ENABLE_DEBUG_ENTRIES */
......@@ -212,7 +215,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL, NULL, NULL },
{ { "/File/Debug/Mem Profile", NULL,
debug_mem_profile_cmd_callback, 0 },
menus_mem_profile_cmd_callback, 0 },
NULL, NULL, NULL },
{ { "/File/Debug/Dump Items", NULL,
menus_debug_cmd_callback, 0 },
......@@ -248,7 +251,8 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL,
"help/dialogs/help.html", NULL },
{ { N_("/Help/Context Help..."), "<shift>F1",
help_context_help_cmd_callback, 0 },
help_context_help_cmd_callback, 0,
"<StockItem>", GTK_STOCK_HELP },
NULL,
"help/context_help.html", NULL },
{ { N_("/Help/Tip of the Day..."), NULL,
......@@ -2727,4 +2731,18 @@ menus_debug_cmd_callback (GtkWidget *widget,
#endif
}
static void
menus_mem_profile_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{
extern gboolean gimp_debug_memsize;
gimp_debug_memsize = TRUE;
gimp_object_get_memsize (GIMP_OBJECT (data));
gimp_debug_memsize = FALSE;
}
#endif /* ENABLE_DEBUG_ENTRIES */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment