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

app/config/gimpcoreconfig.c removed "tool-plug-in-path" property.

Browse Source 
2003-06-11  Michael Natterer  <mitch@gimp.org>

	* app/config/gimpcoreconfig.c
	* app/config/gimprc-blurbs.h: removed "tool-plug-in-path" property.

	* app/gui/preferences-dialog.c: changed accordingly. Some
	preparation for more HIG compliance.
This commit is contained in:
Michael Natterer
2003-06-11 15:01:38 +00:00
committed by Michael Natterer
parent 77269e80cf
commit 652b9dced0
5 changed files with 110 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2003-06-11 Michael Natterer <mitch@gimp.org>
* app/config/gimpcoreconfig.c
* app/config/gimprc-blurbs.h: removed "tool-plug-in-path" property.
* app/gui/preferences-dialog.c: changed accordingly. Some
preparation for more HIG compliance.
2003-06-11 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorselect.c: handle all mouse buttons

14
app/config/gimpcoreconfig.c
View File

@ -61,7 +61,6 @@ enum
PROP_0,
PROP_INTERPOLATION_TYPE,
PROP_PLUG_IN_PATH,
PROP_TOOL_PLUG_IN_PATH,
PROP_MODULE_PATH,
PROP_ENVIRON_PATH,
PROP_BRUSH_PATH,
@ -148,11 +147,6 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_plug_in_path ("plug-ins"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_TOOL_PLUG_IN_PATH,
"tool-plug-in-path", TOOL_PLUG_IN_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_plug_in_path ("tool-plug-ins"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_MODULE_PATH,
"module-path", MODULE_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
@ -299,7 +293,6 @@ gimp_core_config_finalize (GObject *object)
core_config = GIMP_CORE_CONFIG (object);
g_free (core_config->plug_in_path);
g_free (core_config->tool_plug_in_path);
g_free (core_config->module_path);
g_free (core_config->environ_path);
g_free (core_config->brush_path);
@ -337,10 +330,6 @@ gimp_core_config_set_property (GObject *object,
g_free (core_config->plug_in_path);
core_config->plug_in_path = g_value_dup_string (value);
break;
case PROP_TOOL_PLUG_IN_PATH:
g_free (core_config->tool_plug_in_path);
core_config->tool_plug_in_path = g_value_dup_string (value);
break;
case PROP_MODULE_PATH:
g_free (core_config->module_path);
core_config->module_path = g_value_dup_string (value);
@ -467,9 +456,6 @@ gimp_core_config_get_property (GObject *object,
case PROP_PLUG_IN_PATH:
g_value_set_string (value, core_config->plug_in_path);
break;
case PROP_TOOL_PLUG_IN_PATH:
g_value_set_string (value, core_config->tool_plug_in_path);
break;
case PROP_MODULE_PATH:
g_value_set_string (value, core_config->module_path);
break;

3
app/config/gimprc-blurbs.h
View File

@ -309,9 +309,6 @@ N_("The tile cache is used to make sure the GIMP doesn't thrash " \
"the GIMP to use more memory. Conversely, a smaller cache size " \
"causes the GIMP to use more swap space and less memory.")
#define TOOL_PLUG_IN_PATH_BLURB \
"Sets the tool-plug-in search path."
#define TRANSPARENCY_TYPE_BLURB \
N_("Sets the manner in which transparency is displayed in images.")

83
app/dialogs/preferences-dialog.c
View File

@ -459,14 +459,14 @@ prefs_input_dialog_able_callback (GtkWidget *widget,
static GtkWidget *
prefs_notebook_append_page (Gimp *gimp,
GtkNotebook *notebook,
const gchar *notebook_label,
const gchar *notebook_label,
const gchar *notebook_icon,
GtkTreeStore *tree,
const gchar *tree_label,
const gchar *help_data,
GtkTreeIter *parent,
GtkTreeIter *iter,
gint page_index)
GtkTreeStore *tree,
const gchar *tree_label,
const gchar *help_data,
GtkTreeIter *parent,
GtkTreeIter *iter,
gint page_index)
{
GtkWidget *event_box;
GtkWidget *vbox;
@ -479,8 +479,8 @@ prefs_notebook_append_page (Gimp *gimp,
gimp_help_set_help_data (event_box, NULL, help_data);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_container_add (GTK_CONTAINER (event_box), vbox);
gtk_widget_show (vbox);
@ -571,16 +571,15 @@ prefs_format_string_select_callback (GtkTreeSelection *sel,
{
GtkTreeModel *model;
GtkTreeIter iter;
GValue val = { 0, };
if (! gtk_tree_selection_get_selected (sel, &model, &iter))
return;
if (gtk_tree_selection_get_selected (sel, &model, &iter))
{
GValue val = { 0, };
gtk_tree_model_get_value (model, &iter, 1, &val);
gtk_entry_set_text (entry, g_value_get_string (&val));
g_value_unset (&val);
gtk_tree_model_get_value (model, &iter, 1, &val);
gtk_entry_set_text (entry, g_value_get_string (&val));
g_value_unset (&val);
}
}
static GtkWidget *
@ -591,14 +590,17 @@ prefs_frame_new (gchar *label,
GtkWidget *frame;
GtkWidget *vbox;
frame = gtk_frame_new (label);
gboolean hig_compliant = FALSE;
if (FALSE)
if (hig_compliant)
{
GtkWidget *hbox;
GtkWidget *title;
GtkWidget *space;
PangoAttrList *attrs;
PangoAttribute *attr;
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
frame = gtk_vbox_new (FALSE, 4);
attrs = pango_attr_list_new ();
@ -612,8 +614,34 @@ prefs_frame_new (gchar *label,
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
gtk_label_set_attributes (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), attrs);
title = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (title), 0.0, 0.5);
gtk_label_set_attributes (GTK_LABEL (title), attrs);
gtk_box_pack_start (GTK_BOX (frame), title, FALSE, FALSE, 0);
gtk_widget_show (title);
pango_attr_list_unref (attrs);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
space = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), space, FALSE, FALSE, 0);
gtk_widget_show (space);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (hbox), vbox);
gtk_widget_show (vbox);
}
else
{
frame = gtk_frame_new (label);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
}
if (GTK_IS_BOX (parent))
@ -623,11 +651,6 @@ prefs_frame_new (gchar *label,
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
return vbox;
}
@ -883,8 +906,8 @@ prefs_dialog_new (Gimp *gimp,
NULL);
/* The main hbox */
hbox = gtk_hbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
gtk_widget_show (hbox);
@ -1864,10 +1887,6 @@ prefs_dialog_new (Gimp *gimp,
"dialogs/preferences/folders.html#plug_ins",
N_("Select Plug-In Folders"),
"plug-in-path" },
{ N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders-tool-plug-ins.png",
"dialogs/preferences/folders.html#tool_plug_ins",
N_("Select Tool Plug-In Folders"),
"tool-plug-in-path" },
{ N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules",
N_("Select Module Folders"),

83
app/gui/preferences-dialog.c
View File

@ -459,14 +459,14 @@ prefs_input_dialog_able_callback (GtkWidget *widget,
static GtkWidget *
prefs_notebook_append_page (Gimp *gimp,
GtkNotebook *notebook,
const gchar *notebook_label,
const gchar *notebook_label,
const gchar *notebook_icon,
GtkTreeStore *tree,
const gchar *tree_label,
const gchar *help_data,
GtkTreeIter *parent,
GtkTreeIter *iter,
gint page_index)
GtkTreeStore *tree,
const gchar *tree_label,
const gchar *help_data,
GtkTreeIter *parent,
GtkTreeIter *iter,
gint page_index)
{
GtkWidget *event_box;
GtkWidget *vbox;
@ -479,8 +479,8 @@ prefs_notebook_append_page (Gimp *gimp,
gimp_help_set_help_data (event_box, NULL, help_data);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_container_add (GTK_CONTAINER (event_box), vbox);
gtk_widget_show (vbox);
@ -571,16 +571,15 @@ prefs_format_string_select_callback (GtkTreeSelection *sel,
{
GtkTreeModel *model;
GtkTreeIter iter;
GValue val = { 0, };
if (! gtk_tree_selection_get_selected (sel, &model, &iter))
return;
if (gtk_tree_selection_get_selected (sel, &model, &iter))
{
GValue val = { 0, };
gtk_tree_model_get_value (model, &iter, 1, &val);
gtk_entry_set_text (entry, g_value_get_string (&val));
g_value_unset (&val);
gtk_tree_model_get_value (model, &iter, 1, &val);
gtk_entry_set_text (entry, g_value_get_string (&val));
g_value_unset (&val);
}
}
static GtkWidget *
@ -591,14 +590,17 @@ prefs_frame_new (gchar *label,
GtkWidget *frame;
GtkWidget *vbox;
frame = gtk_frame_new (label);
gboolean hig_compliant = FALSE;
if (FALSE)
if (hig_compliant)
{
GtkWidget *hbox;
GtkWidget *title;
GtkWidget *space;
PangoAttrList *attrs;
PangoAttribute *attr;
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
frame = gtk_vbox_new (FALSE, 4);
attrs = pango_attr_list_new ();
@ -612,8 +614,34 @@ prefs_frame_new (gchar *label,
attr->end_index = -1;
pango_attr_list_insert (attrs, attr);
gtk_label_set_attributes (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), attrs);
title = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (title), 0.0, 0.5);
gtk_label_set_attributes (GTK_LABEL (title), attrs);
gtk_box_pack_start (GTK_BOX (frame), title, FALSE, FALSE, 0);
gtk_widget_show (title);
pango_attr_list_unref (attrs);
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox);
gtk_widget_show (hbox);
space = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), space, FALSE, FALSE, 0);
gtk_widget_show (space);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (hbox), vbox);
gtk_widget_show (vbox);
}
else
{
frame = gtk_frame_new (label);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
}
if (GTK_IS_BOX (parent))
@ -623,11 +651,6 @@ prefs_frame_new (gchar *label,
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
return vbox;
}
@ -883,8 +906,8 @@ prefs_dialog_new (Gimp *gimp,
NULL);
/* The main hbox */
hbox = gtk_hbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
gtk_widget_show (hbox);
@ -1864,10 +1887,6 @@ prefs_dialog_new (Gimp *gimp,
"dialogs/preferences/folders.html#plug_ins",
N_("Select Plug-In Folders"),
"plug-in-path" },
{ N_("Tool Plug-Ins"), N_("Tool Plug-In Folders"), "folders-tool-plug-ins.png",
"dialogs/preferences/folders.html#tool_plug_ins",
N_("Select Tool Plug-In Folders"),
"tool-plug-in-path" },
{ N_("Modules"), N_("Module Folders"), "folders-modules.png",
"dialogs/preferences/folders.html#modules",
N_("Select Module Folders"),