From f04aca1ef174aa445de3e06282dc8084f2d0e8a7 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 13 Apr 2005 13:14:24 +0000 Subject: [PATCH] set GIMP_CONFIG_PARAM_CONFIRM on the "font-path" property. Set 2005-04-13 Sven Neumann * 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. --- ChangeLog | 13 +++++++++++++ app/config/gimpcoreconfig.c | 8 +++----- app/core/gimp.c | 3 ++- app/dialogs/preferences-dialog.c | 2 +- app/text/gimp-fonts.c | 3 --- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98991563b8..f1ccc40445 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-04-13 Sven Neumann + + * 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 * app/app_procs.c: register handler for the "GimpPaint" log domain. diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c index 6016cbe798..a6cbba4df2 100644 --- a/app/config/gimpcoreconfig.c +++ b/app/config/gimpcoreconfig.c @@ -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, diff --git a/app/core/gimp.c b/app/core/gimp.c index 48474e65ce..6053219d72 100644 --- a/app/core/gimp.c +++ b/app/core/gimp.c @@ -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); diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index db48d7393f..1fd61e19ba 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -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"), diff --git a/app/text/gimp-fonts.c b/app/text/gimp-fonts.c index a4ea67a555..76a405c0c8 100644 --- a/app/text/gimp-fonts.c +++ b/app/text/gimp-fonts.c @@ -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));