Commit f04aca1e authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

set GIMP_CONFIG_PARAM_CONFIRM on the "font-path" property. Set

2005-04-13  Sven Neumann  <sven@gimp.org>

	* app/config/gimpcoreconfig.c: set GIMP_CONFIG_PARAM_CONFIRM on
	the "font-path" property. Set GIMP_CONFIG_PARAM_IGNORE for
	"font-path-writable".

	* app/dialogs/preferences-dialog.c: don't use "font-path-writable".

	* app/core/gimp.c (gimp_restore)
	* app/text/gimp-fonts.c: handle --no-fonts similar to --no-data
	and allow to load the fonts later by pressing "Refresh" in the
	fonts dialog.
parent d4107d43
2005-04-13 Sven Neumann <sven@gimp.org>
* app/config/gimpcoreconfig.c: set GIMP_CONFIG_PARAM_CONFIRM on
the "font-path" property. Set GIMP_CONFIG_PARAM_IGNORE for
"font-path-writable".
* app/dialogs/preferences-dialog.c: don't use "font-path-writable".
* app/core/gimp.c (gimp_restore)
* app/text/gimp-fonts.c: handle --no-fonts similar to --no-data
and allow to load the fonts later by pressing "Refresh" in the
fonts dialog.
2005-04-13 Sven Neumann <sven@gimp.org>
* app/app_procs.c: register handler for the "GimpPaint" log domain.
......
......@@ -241,15 +241,13 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_FONT_PATH,
"font-path", FONT_PATH_BLURB,
GIMP_CONFIG_PATH_DIR_LIST, path,
0);
GIMP_CONFIG_PARAM_CONFIRM);
g_free (path);
path = gimp_config_build_writable_path ("fonts");
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_FONT_PATH_WRITABLE,
"font-path-writable",
FONT_PATH_WRITABLE_BLURB,
GIMP_CONFIG_PATH_DIR_LIST, path,
GIMP_CONFIG_PARAM_RESTART);
g_free (path);
GIMP_CONFIG_PATH_DIR_LIST, NULL,
GIMP_CONFIG_PARAM_IGNORE);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_DEFAULT_BRUSH,
"default-brush", DEFAULT_BRUSH_BLURB,
DEFAULT_BRUSH,
......
......@@ -882,7 +882,8 @@ gimp_restore (Gimp *gimp,
/* initialize the list of gimp fonts */
(* status_callback) (NULL, _("Fonts"), 0.5);
gimp_fonts_load (gimp);
if (! gimp->no_fonts)
gimp_fonts_load (gimp);
/* initialize the document history */
(* status_callback) (NULL, _("Documents"), 0.6);
......
......@@ -2444,7 +2444,7 @@ prefs_dialog_new (Gimp *gimp,
{ N_("Fonts"), N_("Font Folders"), "folders-fonts.png",
GIMP_HELP_PREFS_FOLDERS_FONTS,
N_("Select Font Folders"),
"font-path", "font-path-writable" },
"font-path", NULL },
{ N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins.png",
GIMP_HELP_PREFS_FOLDERS_PLUG_INS,
N_("Select Plug-In Folders"),
......
......@@ -70,9 +70,6 @@ gimp_fonts_load (Gimp *gimp)
g_return_if_fail (GIMP_IS_FONT_LIST (gimp->fonts));
if (gimp->no_fonts)
return;
gimp_set_busy (gimp);
gimp_container_freeze (GIMP_CONTAINER (gimp->fonts));
......
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