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

app/config/Makefile.am removed ... 

2002-12-20  Sven Neumann  <sven@gimp.org>

	* app/config/Makefile.am
	* app/config/gimpconfig-blurbs.h: removed ...

	* app/config/gimprc-blurbs.h: ... and readded under this
	name. Should have never been named with a gimpconfig prefix since
	it's not part of the generic GimpConfig system.

	* app/config/config-types.h
	* app/config/gimpbaseconfig.c
	* app/config/gimpconfig-dump.c
	* app/config/gimpcoreconfig.c
	* app/config/gimpdisplayconfig.c
	* app/config/gimpguiconfig.c: changed accordingly.
This commit is contained in:
Sven Neumann 2002-12-20 14:36:08 +00:00 committed by Sven Neumann
parent 12ad71944b
commit 4c1c236e8a
9 changed files with 204 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2002-12-20 Sven Neumann <sven@gimp.org>
* app/config/Makefile.am
* app/config/gimpconfig-blurbs.h: removed ...
* app/config/gimprc-blurbs.h: ... and readded under this
name. Should have never been named with a gimpconfig prefix since
it's not part of the generic GimpConfig system.
* app/config/config-types.h
* app/config/gimpbaseconfig.c
* app/config/gimpconfig-dump.c
* app/config/gimpcoreconfig.c
* app/config/gimpdisplayconfig.c
* app/config/gimpguiconfig.c: changed accordingly.
2002-12-20 Michael Natterer <mitch@gimp.org> 2002-12-20 Michael Natterer <mitch@gimp.org>
* app/xcf/xcf.c: use G_N_ELEMENTS(). * app/xcf/xcf.c: use G_N_ELEMENTS().

2
app/config/Makefile.am
View File

@ -6,7 +6,6 @@ libappconfig_a_SOURCES = \
config-types.h \ config-types.h \
gimpconfig.c \ gimpconfig.c \
gimpconfig.h \ gimpconfig.h \
gimpconfig-blurbs.h \
gimpconfig-deserialize.c \ gimpconfig-deserialize.c \
gimpconfig-deserialize.h \ gimpconfig-deserialize.h \
gimpconfig-params.c \ gimpconfig-params.c \
@ -30,6 +29,7 @@ libappconfig_a_SOURCES = \
gimpguiconfig.h \ gimpguiconfig.h \
gimprc.c \ gimprc.c \
gimprc.h \ gimprc.h \
gimprc-blurbs.h \
gimpscanner.c \ gimpscanner.c \
gimpscanner.h gimpscanner.h

3
app/config/config-types.h
View File

@ -22,11 +22,12 @@
#ifndef __CONFIG_TYPES_H__ #ifndef __CONFIG_TYPES_H__
#define __CONFIG_TYPES_H__ #define __CONFIG_TYPES_H__
typedef struct _GimpBaseConfig GimpBaseConfig; typedef struct _GimpBaseConfig GimpBaseConfig;
typedef struct _GimpCoreConfig GimpCoreConfig; typedef struct _GimpCoreConfig GimpCoreConfig;
typedef struct _GimpDisplayConfig GimpDisplayConfig; typedef struct _GimpDisplayConfig GimpDisplayConfig;
typedef struct _GimpGuiConfig GimpGuiConfig; typedef struct _GimpGuiConfig GimpGuiConfig;
typedef struct _GimpRc GimpRc; typedef struct _GimpRc GimpRc;
#endif /* __CONFIG_TYPES_H__ */ #endif /* __CONFIG_TYPES_H__ */

2
app/config/gimpbaseconfig.c
View File

@ -27,10 +27,10 @@
#include "config-types.h" #include "config-types.h"
#include "gimpconfig-blurbs.h"
#include "gimpconfig-params.h" #include "gimpconfig-params.h"
#include "gimpconfig-types.h" #include "gimpconfig-types.h"
#include "gimprc-blurbs.h"
#include "gimpbaseconfig.h" #include "gimpbaseconfig.h"

8
app/config/gimpconfig-dump.c
View File

@ -122,10 +122,12 @@ dump_system_gimprc (void)
"# will affect all users of this system, provided that they are not\n" "# will affect all users of this system, provided that they are not\n"
"# overriding the default values in their personal gimprc file.\n" "# overriding the default values in their personal gimprc file.\n"
"#\n" "#\n"
"# Lines that start with a '#' are comments.\n" "# Lines that start with a '#' are comments. Blank lines are ignored.\n"
"# Blank lines are ignored.\n" "#\n"
"# By default everything in this file is commented out. The file then\n"
"# documents the default values and shows what changes are possible\n."
"\n" "\n"
"# The variable gimp_dir is set to either the interned value\n" "# The variable gimp_dir is set to either the internal value\n"
"# @gimpdir@ or the environment variable GIMP_DIRECTORY. If\n" "# @gimpdir@ or the environment variable GIMP_DIRECTORY. If\n"
"# the path in GIMP_DIRECTORY is relative, it is considered\n" "# the path in GIMP_DIRECTORY is relative, it is considered\n"
"# relative to your home directory.\n" "# relative to your home directory.\n"

2
app/config/gimpcoreconfig.c
View File

@ -27,11 +27,11 @@
#include "config-types.h" #include "config-types.h"
#include "gimpconfig-blurbs.h"
#include "gimpconfig-params.h" #include "gimpconfig-params.h"
#include "gimpconfig-types.h" #include "gimpconfig-types.h"
#include "gimpconfig-utils.h" #include "gimpconfig-utils.h"
#include "gimprc-blurbs.h"
#include "gimpcoreconfig.h" #include "gimpcoreconfig.h"

2
app/config/gimpdisplayconfig.c
View File

@ -28,11 +28,11 @@
#include "config-types.h" #include "config-types.h"
#include "gimpconfig-blurbs.h"
#include "gimpconfig-params.h" #include "gimpconfig-params.h"
#include "gimpconfig-types.h" #include "gimpconfig-types.h"
#include "gimpconfig-utils.h" #include "gimpconfig-utils.h"
#include "gimprc-blurbs.h"
#include "gimpdisplayconfig.h" #include "gimpdisplayconfig.h"

2
app/config/gimpguiconfig.c
View File

@ -27,11 +27,11 @@
#include "config-types.h" #include "config-types.h"
#include "gimpconfig-blurbs.h"
#include "gimpconfig-params.h" #include "gimpconfig-params.h"
#include "gimpconfig-types.h" #include "gimpconfig-types.h"
#include "gimpconfig-utils.h" #include "gimpconfig-utils.h"
#include "gimprc-blurbs.h"
#include "gimpguiconfig.h" #include "gimpguiconfig.h"

341
app/config/gimpconfig-blurbs.h → app/config/gimprc-blurbs.h
View File

@ -1,41 +1,26 @@
#ifndef __GIMP_CONFIG_BLURBS_H__ /* gimprc-blurbs.h -- descriptions for gimprc properties */
#define __GIMP_CONFIG_BLURBS_H__
#ifndef __GIMP_RC_BLURBS_H__
#define __GIMP_RC_BLURBS_H__
#define TEMP_PATH_BLURB \ #define ALWAYS_RESTORE_SESSION_BLURB \
"Set the temporary storage directory. Files will appear here " \ "Let GIMP try to restore your last saved session."
"during the course of running the gimp. Most files will disappear " \
"when the gimp exits, but some files are likely to remain, " \
"such as working palette files, so it is best if this directory " \
"not be one that is shared by other users or is cleared on machine " \
"reboot such as /tmp."
#define SWAP_PATH_BLURB \
"Set the swap file location. The gimp uses a tile based memory " \
"allocation scheme. The swap file is used to quickly and easily " \
"swap tiles out to disk and back in. Be aware that the swap file " \
"can easily get very large if the gimp is used with large images. " \
"Also, things can get horribly slow if the swap file is created on " \
"a directory that is mounted over NFS. For these reasons, it may " \
"be desirable to put your swap file in \"/tmp\"."
#define BRUSH_PATH_BLURB \ #define BRUSH_PATH_BLURB \
"Set the brush search path." "Set the brush search path."
#define PATTERN_PATH_BLURB \ #define COLORMAP_CYCLING_BLURB \
"Set the pattern search path." "Specify that marching ants for selected regions will be drawn with " \
"colormap cycling as oposed to redrawing with different stipple masks. " \
"This color cycling option works only with 8-bit displays."
#define PLUG_IN_PATH_BLURB \ #define CONFIRM_ON_CLOSE_BLURB \
"Set the plug-in search path." "Ask for confirmation before closing an image without saving."
#define PALETTE_PATH_BLURB \ #define CURSOR_UPDATING_BLURB \
"Set the palette search path." "Context-dependent cursors are cool. They are enabled by default. " \
"However, they require overhead that you may want to do without."
#define GRADIENT_PATH_BLURB \
"Set the gradient search path."
#define MODULE_PATH_BLURB \
"Set the module search path."
#define DEFAULT_BRUSH_BLURB \ #define DEFAULT_BRUSH_BLURB \
"Specify a default brush. The brush is searched for in the " \ "Specify a default brush. The brush is searched for in the " \
@ -45,124 +30,6 @@
"Specify a default gradient. The gradient is searched for in the " \ "Specify a default gradient. The gradient is searched for in the " \
"specified gradient path." "specified gradient path."
#define DEFAULT_PATTERN_BLURB \
"Specify a default pattern. The pattern is searched for in the " \
"specified pattern path."
#define DEFAULT_PALETTE_BLURB \
"Specify a default palette. The palette is searched for in the " \
"specified palette path."
#define GAMMA_CORRECTION_BLURB \
"Set the gamma correction value for the display. 1.0 corresponds to no " \
"gamma correction. For most displays, gamma correction should be set " \
"to between 2.0 and 2.6. One important thing to keep in mind: Many images "\
"that you might get from outside sources will in all likelihood already "\
"be gamma-corrected. In these cases, the image will look washed-out if "\
"the gimp has gamma-correction turned on. If you are going to work with "\
"images of this sort, turn gamma correction off by setting the value to 1.0."
#define INSTALL_COLORMAP_BLURB \
"Install a private colormap; might be useful on pseudocolor visuals."
#define TILE_CACHE_SIZE_BLURB \
"The tile cache is used to make sure the gimp doesn't thrash " \
"tiles between memory and disk. Setting this value higher will " \
"cause the gimp to use less swap space, but will also cause " \
"the gimp to use more memory. Conversely, a smaller cache size " \
"causes the gimp to use more swap space and less memory."
#define MARCHING_ANTS_SPEED_BLURB \
"Speed of marching ants in the selection outline. This value is in " \
"milliseconds (less time indicates faster marching)."
#define LAST_OPENED_SIZE_BLURB \
"How many recently opened image filenames to keep on the File menu."
#define UNDO_LEVELS_BLURB \
"Set the number of operations kept on the undo stack."
#define TRANSPARENCY_TYPE_BLURB \
"Set the manner in which transparency is displayed in images."
#define TRANSPARENCY_SIZE_BLURB \
"Sets the size of the checkerboard used to display transparency."
#define PERFECT_MOUSE_BLURB \
"If set to true, the X server is queried for the mouse's current " \
"position on each motion event, rather than relying on the position " \
"hint. This means painting with large brushes should be more accurate, " \
"but it may be slower. Perversely, on some X servers turning on this " \
"option results in faster painting."
#define COLORMAP_CYCLING_BLURB \
"Specify that marching ants for selected regions will be drawn with " \
"colormap cycling as oposed to redrawing with different stipple masks. " \
"This color cycling option works only with 8-bit displays."
#define DEFAULT_THRESHOLD_BLURB \
"Tools such as fuzzy-select and bucket fill find regions based on a " \
"seed-fill algorithm. The seed fill starts at the intially selected " \
"pixel and progresses in all directions until the difference of pixel " \
"intensity from the original is greater than a specified threshold. " \
"This value represents the default threshold."
#define STINGY_MEMORY_USE_BLURB \
"There is always a tradeoff between memory usage and speed. In most " \
"cases, the GIMP opts for speed over memory. However, if memory is a " \
"big issue, set stingy-memory-use."
#define RESIZE_WINDOWS_ON_ZOOM_BLURB \
"When zooming into and out of images, this option enables the automatic " \
"resizing of windows. " \
#define RESIZE_WINDOWS_ON_RESIZE_BLURB \
"When the physical image size changes, this option enables the automatic " \
"resizing of windows."
#define CURSOR_UPDATING_BLURB \
"Context-dependent cursors are cool. They are enabled by default. " \
"However, they require overhead that you may want to do without."
#define PREVIEW_SIZE_BLURB \
"Set the default preview size."
#define SHOW_MENUBAR_BLURB \
"Set the menubar visibility. This can also be toggled with the "\
"View->Toggle Menubar command."
#define SHOW_RULERS_BLURB \
"Set the ruler visibility. This can also be toggled with the "\
"View->Toggle Rulers command."
#define SHOW_STATUSBAR_BLURB \
"Controlling statusbar visibility. This can also be toggled with "\
"the View->Toggle Statusbar command."
#define INTERPOLATION_TYPE_BLURB \
"Set the level of interpolation used for scaling and other transformations."
#define CONFIRM_ON_CLOSE_BLURB \
"Ask for confirmation before closing an image without saving."
#define SAVE_SESSION_INFO_BLURB \
"Remember the positions and sizes of the main dialogs and asks your " \
"window-manager to place them there again the next time you use the " \
"GIMP."
#define SAVE_DEVICE_STATUS_BLURB \
"Remember the current tool, pattern, color, and brush across GIMP " \
"sessions."
#define ALWAYS_RESTORE_SESSION_BLURB \
"Let GIMP try to restore your last saved session."
#define SHOW_TIPS_BLURB \
"Set to display a handy GIMP tip on startup."
#define SHOW_TOOL_TIPS_BLURB \
"Set to display tooltips."
#define DEFAULT_IMAGE_WIDTH_BLURB \ #define DEFAULT_IMAGE_WIDTH_BLURB \
"Set the default image width in the File/New dialog." "Set the default image width in the File/New dialog."
@ -172,6 +39,25 @@
#define DEFAULT_IMAGE_TYPE_BLURB \ #define DEFAULT_IMAGE_TYPE_BLURB \
"Set the default image type in the File/New dialog." "Set the default image type in the File/New dialog."
#define DEFAULT_PATTERN_BLURB \
"Specify a default pattern. The pattern is searched for in the " \
"specified pattern path."
#define DEFAULT_PALETTE_BLURB \
"Specify a default palette. The palette is searched for in the " \
"specified palette path."
#define DEFAULT_RESOLUTION_UNIT_BLURB \
"Set the units for the display of the default resolution in the " \
"File/New dialog."
#define DEFAULT_THRESHOLD_BLURB \
"Tools such as fuzzy-select and bucket fill find regions based on a " \
"seed-fill algorithm. The seed fill starts at the intially selected " \
"pixel and progresses in all directions until the difference of pixel " \
"intensity from the original is greater than a specified threshold. " \
"This value represents the default threshold."
#define DEFAULT_UNIT_BLURB \ #define DEFAULT_UNIT_BLURB \
"Set the default unit for new images and for the File/New dialog. " \ "Set the default unit for new images and for the File/New dialog. " \
"This units will be used for coordinate display when not in dot-for-dot " \ "This units will be used for coordinate display when not in dot-for-dot " \
@ -185,23 +71,24 @@
"Set the default vertical resolution for new images and for the " \ "Set the default vertical resolution for new images and for the " \
"File/New dialog. This value is always in dpi (dots per inch)." "File/New dialog. This value is always in dpi (dots per inch)."
#define DEFAULT_RESOLUTION_UNIT_BLURB \ #define GAMMA_CORRECTION_BLURB \
"Set the units for the display of the default resolution in the " \ "This setting is ignored."
"File/New dialog." #if 0
"Set the gamma correction value for the display. 1.0 corresponds to no " \
"gamma correction. For most displays, gamma correction should be set " \
"to between 2.0 and 2.6. One important thing to keep in mind: Many images " \
"that you might get from outside sources will in all likelihood already " \
"be gamma-corrected. In these cases, the image will look washed-out if " \
"the gimp has gamma-correction turned on. If you are going to work with " \
"images of this sort, turn gamma correction off by setting the value to 1.0."
#endif
#define MONITOR_XRESOLUTION_BLURB \ #define GRADIENT_PATH_BLURB \
"Set the monitor's horizontal resolution, in dots per inch. If set to " \ "Set the gradient search path."
"0, forces the X server to be queried for both horizontal and vertical " \
"resolution information."
#define MONITOR_YRESOLUTION_BLURB \ #define IMAGE_STATUS_FORMAT_BLURB \
"Set the monitor's vertical resolution, in dots per inch. If set to " \ "Set the text to appear in image window status bars. See image-title-format " \
"0, forces the X server to be queried for both horizontal and vertical " \ "for the list of possible % sequences."
"resolution information."
#define NUM_PROCESSORS_BLURB \
"On multiprocessor machines, if GIMP has been compiled with --enable-mp " \
"this sets how many processors GIMP should use simultaneously."
#define IMAGE_TITLE_FORMAT_BLURB \ #define IMAGE_TITLE_FORMAT_BLURB \
"Set the text to appear in image window titles. Certain % character " \ "Set the text to appear in image window titles. Certain % character " \
@ -228,10 +115,130 @@
"%u unit symbol\n" \ "%u unit symbol\n" \
"%U unit abbreviation\n\n" "%U unit abbreviation\n\n"
#define INSTALL_COLORMAP_BLURB \
"Install a private colormap; might be useful on pseudocolor visuals."
#define IMAGE_STATUS_FORMAT_BLURB \ #define INTERPOLATION_TYPE_BLURB \
"Set the text to appear in image window status bars. See image-title-format " \ "Set the level of interpolation used for scaling and other transformations."
"for the list of possible % sequences."
#define LAST_OPENED_SIZE_BLURB \
"How many recently opened image filenames to keep on the File menu."
#define MARCHING_ANTS_SPEED_BLURB \
"Speed of marching ants in the selection outline. This value is in " \
"milliseconds (less time indicates faster marching)."
#define MODULE_PATH_BLURB \
"Set the module search path."
#define MONITOR_XRESOLUTION_BLURB \
"Set the monitor's horizontal resolution, in dots per inch. If set to " \
"0, forces the X server to be queried for both horizontal and vertical " \
"resolution information."
#define MONITOR_YRESOLUTION_BLURB \
"Set the monitor's vertical resolution, in dots per inch. If set to " \
"0, forces the X server to be queried for both horizontal and vertical " \
"resolution information."
#define NUM_PROCESSORS_BLURB \
"On multiprocessor machines, if GIMP has been compiled with --enable-mp " \
"this sets how many processors GIMP should use simultaneously."
#define PALETTE_PATH_BLURB \
"Set the palette search path."
#define PATTERN_PATH_BLURB \
"Set the pattern search path."
#define PERFECT_MOUSE_BLURB \
"If set to true, the X server is queried for the mouse's current " \
"position on each motion event, rather than relying on the position " \
"hint. This means painting with large brushes should be more accurate, " \
"but it may be slower. Perversely, on some X servers turning on this " \
"option results in faster painting."
#define PLUG_IN_PATH_BLURB \
"Set the plug-in search path."
#define PREVIEW_SIZE_BLURB \
"Set the default preview size."
#define RESIZE_WINDOWS_ON_RESIZE_BLURB \
"When the physical image size changes, this option enables the automatic " \
"resizing of windows."
#define RESIZE_WINDOWS_ON_ZOOM_BLURB \
"When zooming into and out of images, this option enables the automatic " \
"resizing of windows. " \
#define SAVE_DEVICE_STATUS_BLURB \
"Remember the current tool, pattern, color, and brush across GIMP " \
"sessions."
#define SAVE_SESSION_INFO_BLURB \
"Remember the positions and sizes of the main dialogs and asks your " \
"window-manager to place them there again the next time you use the " \
"GIMP."
#define SHOW_MENUBAR_BLURB \
"Set the menubar visibility. This can also be toggled with the "\
"View->Toggle Menubar command."
#define SHOW_RULERS_BLURB \
"Set the ruler visibility. This can also be toggled with the "\
"View->Toggle Rulers command."
#define SHOW_STATUSBAR_BLURB \
"Controlling statusbar visibility. This can also be toggled with "\
"the View->Toggle Statusbar command."
#define SHOW_TIPS_BLURB \
"Set to display a handy GIMP tip on startup."
#define SHOW_TOOL_TIPS_BLURB \
"Set to display tooltips."
#define STINGY_MEMORY_USE_BLURB \
"There is always a tradeoff between memory usage and speed. In most " \
"cases, the GIMP opts for speed over memory. However, if memory is a " \
"big issue, set stingy-memory-use."
#define SWAP_PATH_BLURB \
"Set the swap file location. The gimp uses a tile based memory " \
"allocation scheme. The swap file is used to quickly and easily " \
"swap tiles out to disk and back in. Be aware that the swap file " \
"can easily get very large if the gimp is used with large images. " \
"Also, things can get horribly slow if the swap file is created on " \
"a directory that is mounted over NFS. For these reasons, it may " \
"be desirable to put your swap file in \"/tmp\"."
#define TEMP_PATH_BLURB \
"Set the temporary storage directory. Files will appear here " \
"during the course of running the gimp. Most files will disappear " \
"when the gimp exits, but some files are likely to remain, " \
"such as working palette files, so it is best if this directory " \
"not be one that is shared by other users or is cleared on machine " \
"reboot such as /tmp."
#define TILE_CACHE_SIZE_BLURB \
"The tile cache is used to make sure the gimp doesn't thrash " \
"tiles between memory and disk. Setting this value higher will " \
"cause the gimp to use less swap space, but will also cause " \
"the gimp to use more memory. Conversely, a smaller cache size " \
"causes the gimp to use more swap space and less memory."
#define TRANSPARENCY_TYPE_BLURB \
"Set the manner in which transparency is displayed in images."
#define TRANSPARENCY_SIZE_BLURB \
"Sets the size of the checkerboard used to display transparency."
#define UNDO_LEVELS_BLURB \
"Set the number of operations kept on the undo stack."
/* FIXME: the following blurbs are missing */
#define TOOL_PLUG_IN_PATH_BLURB NULL #define TOOL_PLUG_IN_PATH_BLURB NULL
#define ENVIRON_PATH_BLURB NULL #define ENVIRON_PATH_BLURB NULL
@ -257,4 +264,4 @@
#define MAX_NEW_IMAGE_SIZE_BLURB NULL #define MAX_NEW_IMAGE_SIZE_BLURB NULL
#endif /* __GIMP_CONFIG_BLURBS_H__ */ #endif /* __GIMP_RC_BLURBS_H__ */