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

app/Makefile.am removed...

Browse Source 
2002-05-05  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/gimphelp.[ch]: removed...

	* app/widgets/Makefile.am
	* app/widgets/gimphelp.[ch]: ...and added here.

	* app/widgets/widgets-enums.[ch]: added GimpHelpBrowserType here
	as registered enum. Added an evil hack with GimpCursorType so
	app/config/gimpguiconfig.h can include this file.

	* app/widgets/gimpcursor.c: added an assertion because of the
	changed GimpCursorType.

	* app/config/gimpguiconfig.[ch]: added a property for the help
	browser type.

	* app/gimprc.c
	* app/libgimp_glue.c
	* app/gui/preferences-dialog.c
	* tools/pdbgen/pdb/help.pdb

	* app/pdb/help_cmds.c: regenerated.

	Some nav_window cleanup before chopping:

	* app/nav_window.[ch]: removed the old preview code and use
	GimpNavigationPreviews only. Namespaceified all functions. Speak
	in terms of GimpDisplayShell, not GimpDisplay. Lots of internal
	cleanup.

	* app/gui/gui-types.h: removed NadiagtionDialog here...

	* app/display/display-types.h: ...and added it here.

	* app/display/gimpdisplayshell-callbacks.[ch]: added a callback
	for the navigation button and call nav_window_show_popup() from there.

	* app/display/gimpdisplayshell.c: free shell->nav_dialog
	unconditionally, connect to the new callback.

	* app/display/gimpdisplayshell-scale.c
	* app/display/gimpdisplayshell-scroll.c
	* app/gui/view-commands.c: changed accordingly.

	* app/widgets/gimppreview.c (gimp_preview_set_viewable): the
	assertion introduced recently was too tight, breaking
	GimpNavigationPreview. Changed it to do an "is a" check, not exact
	preview type matching.

	* app/widgets/gimpimagepreview.c: added quick-hack support for
	xres != yres.

	* app/widgets/gimpnavigationpreview.[ch]: made
	gimp_navigation_preview_grab_pointer() public so the nav_window
	can call it.

	Unrelated:

	* app/display/gimpdisplay.c: removed the gui/ dependency from this
	file by removing info_window stuff.

	* app/display/gimpdisplayshell.c (gimp_display_shell_flush): update
	the info_window here.

	* app/gui/dialogs-constructors.c (dialogs_indexed_palette_new): call
	gimp_dockable_set_context() like all other constructors.

	* app/undo.c
	* app/paint/gimppaintcore.h: some more include cleanup.
This commit is contained in:
Michael Natterer
2002-05-05 19:17:41 +00:00
committed by Michael Natterer
parent 3c11b8e85d
commit c86ca2da6a
52 changed files with 1989 additions and 5147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/widgets/gimphelp.c
View File

@ -32,7 +32,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "widgets-types.h"
#include "core/gimp.h"
@ -42,6 +42,7 @@
#include "plug-in/plug-in.h"
#include "gimphelp.h"
#include "gimprc.h"
#include "libgimp/gimpintl.h"
@ -112,7 +113,8 @@ gimp_idle_help (gpointer data)
idle_help = (GimpIdleHelp *) data;
if (idle_help->help_data == NULL && gimprc.help_browser != HELP_BROWSER_GIMP)
if (idle_help->help_data == NULL &&
gimprc.help_browser != GIMP_HELP_BROWSER_GIMP)
idle_help->help_data = g_strdup ("introduction.html");
#ifdef DEBUG_HELP
@ -131,14 +133,14 @@ gimp_idle_help (gpointer data)
switch (gimprc.help_browser)
{
case HELP_BROWSER_GIMP:
case GIMP_HELP_BROWSER_GIMP:
if (gimp_help_internal (idle_help->gimp,
idle_help->help_path,
current_locale,
idle_help->help_data))
break;
case HELP_BROWSER_NETSCAPE:
case GIMP_HELP_BROWSER_NETSCAPE:
gimp_help_netscape (idle_help->gimp,
idle_help->help_path,
current_locale,
@ -168,7 +170,7 @@ gimp_help_internal_not_found_callback (GtkWidget *widget,
if (use_netscape)
{
gimprc.help_browser = HELP_BROWSER_NETSCAPE;
gimprc.help_browser = GIMP_HELP_BROWSER_NETSCAPE;
update = g_list_append (update, "help-browser");
gimprc_save (&update, &remove);
@ -210,7 +212,7 @@ gimp_help_internal (Gimp *gimp,
gtk_widget_show (not_found);
gtk_main ();
return (gimprc.help_browser != HELP_BROWSER_NETSCAPE);
return (gimprc.help_browser != GIMP_HELP_BROWSER_NETSCAPE);
}
args = g_new (Argument, 4);