diff --git a/ChangeLog b/ChangeLog index 59c71a5928..577cd46d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jan 15 19:11:49 CET 2000 Sven Neumann + + * gimprc.5.in: fixed a typo + + * app/preferences_dialog.c: one more change in the spirit of my + last commit + 2000-01-16 Shirasaki Yasuhiro * plug-ins/common/waves.c diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 0298577573..fb486320b2 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1509,7 +1509,7 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); - table = gtk_table_new (1, 2, FALSE); + table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 4); @@ -1528,6 +1528,50 @@ file_pref_cmd_callback (GtkWidget *widget, _("Default Image Type:"), 1.0, 0.5, optionmenu, TRUE); + /* The maximum size of a new image */ + mem_size_unit = 1; + for (i = 0; i < 3; i++) + { + if (max_new_image_size % (mem_size_unit * 1024) != 0) + break; + mem_size_unit *= 1024; + } + divided_mem_size = max_new_image_size / mem_size_unit; + + hbox = gtk_hbox_new (FALSE, 2); + spinbutton = + gimp_spin_button_new (&adjustment, divided_mem_size, + 0.0, (4069.0 * 1024 * 1024), 1.0, 16.0, 0.0, + 1.0, 0.0); + gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", + GTK_SIGNAL_FUNC (file_prefs_mem_size_callback), + &max_new_image_size); + gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show (spinbutton); + + /* for the mem_size_unit callback */ + gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size", + &max_new_image_size); + gtk_object_set_data (GTK_OBJECT (adjustment), "divided_mem_size", + (gpointer) divided_mem_size); + gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size_unit", + (gpointer) mem_size_unit); + + optionmenu = + gimp_option_menu_new (file_prefs_mem_size_unit_callback, + adjustment, (gpointer) mem_size_unit, + + _("Bytes"), (gpointer) 1, NULL, + _("KiloBytes"), (gpointer) 1024, NULL, + _("MegaBytes"), (gpointer) (1024 * 1024), NULL, + + NULL); + gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0); + gtk_widget_show (optionmenu); + gimp_table_attach_aligned (GTK_TABLE (table), 1, + _("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE); + + /* Display page */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Display Settings"), @@ -1893,6 +1937,7 @@ file_pref_cmd_callback (GtkWidget *widget, &no_cursor_updating); gtk_widget_show (button); + /* Interface / Tool Options */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Tool Options Settings"), @@ -1920,6 +1965,7 @@ file_pref_cmd_callback (GtkWidget *widget, /* Expand the "Interface" branch */ gtk_ctree_expand (GTK_CTREE (ctree), top_insert); + /* Environment */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Environment Settings"), @@ -1943,9 +1989,9 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_widget_show (button); #ifdef ENABLE_MP - table = gtk_table_new (4, 2, FALSE); -#else table = gtk_table_new (3, 2, FALSE); +#else + table = gtk_table_new (2, 2, FALSE); #endif /* ENABLE_MP */ gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); @@ -2006,49 +2052,6 @@ file_pref_cmd_callback (GtkWidget *widget, gimp_table_attach_aligned (GTK_TABLE (table), 1, _("Tile Cache Size:"), 1.0, 0.5, hbox, TRUE); - /* The maximum size of a new image */ - mem_size_unit = 1; - for (i = 0; i < 3; i++) - { - if (max_new_image_size % (mem_size_unit * 1024) != 0) - break; - mem_size_unit *= 1024; - } - divided_mem_size = max_new_image_size / mem_size_unit; - - hbox = gtk_hbox_new (FALSE, 2); - spinbutton = - gimp_spin_button_new (&adjustment, divided_mem_size, - 0.0, (4069.0 * 1024 * 1024), 1.0, 16.0, 0.0, - 1.0, 0.0); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (file_prefs_mem_size_callback), - &max_new_image_size); - gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); - gtk_widget_show (spinbutton); - - /* for the mem_size_unit callback */ - gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size", - &max_new_image_size); - gtk_object_set_data (GTK_OBJECT (adjustment), "divided_mem_size", - (gpointer) divided_mem_size); - gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size_unit", - (gpointer) mem_size_unit); - - optionmenu = - gimp_option_menu_new (file_prefs_mem_size_unit_callback, - adjustment, (gpointer) mem_size_unit, - - _("Bytes"), (gpointer) 1, NULL, - _("KiloBytes"), (gpointer) 1024, NULL, - _("MegaBytes"), (gpointer) (1024 * 1024), NULL, - - NULL); - gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0); - gtk_widget_show (optionmenu); - gimp_table_attach_aligned (GTK_TABLE (table), 2, - _("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE); - #ifdef ENABLE_MP spinbutton = gimp_spin_button_new (&adjustment, @@ -2056,7 +2059,7 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", GTK_SIGNAL_FUNC (file_prefs_int_adjustment_callback), &num_processors); - gimp_table_attach_aligned (GTK_TABLE (table), 3, + gimp_table_attach_aligned (GTK_TABLE (table), 2, _("Number of Processors to Use:"), 1.0, 0.5, spinbutton, TRUE); #endif /* ENABLE_MP */ diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 0298577573..fb486320b2 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -1509,7 +1509,7 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); - table = gtk_table_new (1, 2, FALSE); + table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 4); @@ -1528,6 +1528,50 @@ file_pref_cmd_callback (GtkWidget *widget, _("Default Image Type:"), 1.0, 0.5, optionmenu, TRUE); + /* The maximum size of a new image */ + mem_size_unit = 1; + for (i = 0; i < 3; i++) + { + if (max_new_image_size % (mem_size_unit * 1024) != 0) + break; + mem_size_unit *= 1024; + } + divided_mem_size = max_new_image_size / mem_size_unit; + + hbox = gtk_hbox_new (FALSE, 2); + spinbutton = + gimp_spin_button_new (&adjustment, divided_mem_size, + 0.0, (4069.0 * 1024 * 1024), 1.0, 16.0, 0.0, + 1.0, 0.0); + gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", + GTK_SIGNAL_FUNC (file_prefs_mem_size_callback), + &max_new_image_size); + gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show (spinbutton); + + /* for the mem_size_unit callback */ + gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size", + &max_new_image_size); + gtk_object_set_data (GTK_OBJECT (adjustment), "divided_mem_size", + (gpointer) divided_mem_size); + gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size_unit", + (gpointer) mem_size_unit); + + optionmenu = + gimp_option_menu_new (file_prefs_mem_size_unit_callback, + adjustment, (gpointer) mem_size_unit, + + _("Bytes"), (gpointer) 1, NULL, + _("KiloBytes"), (gpointer) 1024, NULL, + _("MegaBytes"), (gpointer) (1024 * 1024), NULL, + + NULL); + gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0); + gtk_widget_show (optionmenu); + gimp_table_attach_aligned (GTK_TABLE (table), 1, + _("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE); + + /* Display page */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Display Settings"), @@ -1893,6 +1937,7 @@ file_pref_cmd_callback (GtkWidget *widget, &no_cursor_updating); gtk_widget_show (button); + /* Interface / Tool Options */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Tool Options Settings"), @@ -1920,6 +1965,7 @@ file_pref_cmd_callback (GtkWidget *widget, /* Expand the "Interface" branch */ gtk_ctree_expand (GTK_CTREE (ctree), top_insert); + /* Environment */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Environment Settings"), @@ -1943,9 +1989,9 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_widget_show (button); #ifdef ENABLE_MP - table = gtk_table_new (4, 2, FALSE); -#else table = gtk_table_new (3, 2, FALSE); +#else + table = gtk_table_new (2, 2, FALSE); #endif /* ENABLE_MP */ gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); @@ -2006,49 +2052,6 @@ file_pref_cmd_callback (GtkWidget *widget, gimp_table_attach_aligned (GTK_TABLE (table), 1, _("Tile Cache Size:"), 1.0, 0.5, hbox, TRUE); - /* The maximum size of a new image */ - mem_size_unit = 1; - for (i = 0; i < 3; i++) - { - if (max_new_image_size % (mem_size_unit * 1024) != 0) - break; - mem_size_unit *= 1024; - } - divided_mem_size = max_new_image_size / mem_size_unit; - - hbox = gtk_hbox_new (FALSE, 2); - spinbutton = - gimp_spin_button_new (&adjustment, divided_mem_size, - 0.0, (4069.0 * 1024 * 1024), 1.0, 16.0, 0.0, - 1.0, 0.0); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (file_prefs_mem_size_callback), - &max_new_image_size); - gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); - gtk_widget_show (spinbutton); - - /* for the mem_size_unit callback */ - gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size", - &max_new_image_size); - gtk_object_set_data (GTK_OBJECT (adjustment), "divided_mem_size", - (gpointer) divided_mem_size); - gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size_unit", - (gpointer) mem_size_unit); - - optionmenu = - gimp_option_menu_new (file_prefs_mem_size_unit_callback, - adjustment, (gpointer) mem_size_unit, - - _("Bytes"), (gpointer) 1, NULL, - _("KiloBytes"), (gpointer) 1024, NULL, - _("MegaBytes"), (gpointer) (1024 * 1024), NULL, - - NULL); - gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0); - gtk_widget_show (optionmenu); - gimp_table_attach_aligned (GTK_TABLE (table), 2, - _("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE); - #ifdef ENABLE_MP spinbutton = gimp_spin_button_new (&adjustment, @@ -2056,7 +2059,7 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", GTK_SIGNAL_FUNC (file_prefs_int_adjustment_callback), &num_processors); - gimp_table_attach_aligned (GTK_TABLE (table), 3, + gimp_table_attach_aligned (GTK_TABLE (table), 2, _("Number of Processors to Use:"), 1.0, 0.5, spinbutton, TRUE); #endif /* ENABLE_MP */ diff --git a/app/preferences_dialog.c b/app/preferences_dialog.c index 0298577573..fb486320b2 100644 --- a/app/preferences_dialog.c +++ b/app/preferences_dialog.c @@ -1509,7 +1509,7 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); - table = gtk_table_new (1, 2, FALSE); + table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 4); @@ -1528,6 +1528,50 @@ file_pref_cmd_callback (GtkWidget *widget, _("Default Image Type:"), 1.0, 0.5, optionmenu, TRUE); + /* The maximum size of a new image */ + mem_size_unit = 1; + for (i = 0; i < 3; i++) + { + if (max_new_image_size % (mem_size_unit * 1024) != 0) + break; + mem_size_unit *= 1024; + } + divided_mem_size = max_new_image_size / mem_size_unit; + + hbox = gtk_hbox_new (FALSE, 2); + spinbutton = + gimp_spin_button_new (&adjustment, divided_mem_size, + 0.0, (4069.0 * 1024 * 1024), 1.0, 16.0, 0.0, + 1.0, 0.0); + gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", + GTK_SIGNAL_FUNC (file_prefs_mem_size_callback), + &max_new_image_size); + gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); + gtk_widget_show (spinbutton); + + /* for the mem_size_unit callback */ + gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size", + &max_new_image_size); + gtk_object_set_data (GTK_OBJECT (adjustment), "divided_mem_size", + (gpointer) divided_mem_size); + gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size_unit", + (gpointer) mem_size_unit); + + optionmenu = + gimp_option_menu_new (file_prefs_mem_size_unit_callback, + adjustment, (gpointer) mem_size_unit, + + _("Bytes"), (gpointer) 1, NULL, + _("KiloBytes"), (gpointer) 1024, NULL, + _("MegaBytes"), (gpointer) (1024 * 1024), NULL, + + NULL); + gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0); + gtk_widget_show (optionmenu); + gimp_table_attach_aligned (GTK_TABLE (table), 1, + _("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE); + + /* Display page */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Display Settings"), @@ -1893,6 +1937,7 @@ file_pref_cmd_callback (GtkWidget *widget, &no_cursor_updating); gtk_widget_show (button); + /* Interface / Tool Options */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Tool Options Settings"), @@ -1920,6 +1965,7 @@ file_pref_cmd_callback (GtkWidget *widget, /* Expand the "Interface" branch */ gtk_ctree_expand (GTK_CTREE (ctree), top_insert); + /* Environment */ vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook), _("Environment Settings"), @@ -1943,9 +1989,9 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_widget_show (button); #ifdef ENABLE_MP - table = gtk_table_new (4, 2, FALSE); -#else table = gtk_table_new (3, 2, FALSE); +#else + table = gtk_table_new (2, 2, FALSE); #endif /* ENABLE_MP */ gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 2); @@ -2006,49 +2052,6 @@ file_pref_cmd_callback (GtkWidget *widget, gimp_table_attach_aligned (GTK_TABLE (table), 1, _("Tile Cache Size:"), 1.0, 0.5, hbox, TRUE); - /* The maximum size of a new image */ - mem_size_unit = 1; - for (i = 0; i < 3; i++) - { - if (max_new_image_size % (mem_size_unit * 1024) != 0) - break; - mem_size_unit *= 1024; - } - divided_mem_size = max_new_image_size / mem_size_unit; - - hbox = gtk_hbox_new (FALSE, 2); - spinbutton = - gimp_spin_button_new (&adjustment, divided_mem_size, - 0.0, (4069.0 * 1024 * 1024), 1.0, 16.0, 0.0, - 1.0, 0.0); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (file_prefs_mem_size_callback), - &max_new_image_size); - gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); - gtk_widget_show (spinbutton); - - /* for the mem_size_unit callback */ - gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size", - &max_new_image_size); - gtk_object_set_data (GTK_OBJECT (adjustment), "divided_mem_size", - (gpointer) divided_mem_size); - gtk_object_set_data (GTK_OBJECT (adjustment), "mem_size_unit", - (gpointer) mem_size_unit); - - optionmenu = - gimp_option_menu_new (file_prefs_mem_size_unit_callback, - adjustment, (gpointer) mem_size_unit, - - _("Bytes"), (gpointer) 1, NULL, - _("KiloBytes"), (gpointer) 1024, NULL, - _("MegaBytes"), (gpointer) (1024 * 1024), NULL, - - NULL); - gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0); - gtk_widget_show (optionmenu); - gimp_table_attach_aligned (GTK_TABLE (table), 2, - _("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE); - #ifdef ENABLE_MP spinbutton = gimp_spin_button_new (&adjustment, @@ -2056,7 +2059,7 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", GTK_SIGNAL_FUNC (file_prefs_int_adjustment_callback), &num_processors); - gimp_table_attach_aligned (GTK_TABLE (table), 3, + gimp_table_attach_aligned (GTK_TABLE (table), 2, _("Number of Processors to Use:"), 1.0, 0.5, spinbutton, TRUE); #endif /* ENABLE_MP */ diff --git a/gimprc-1.2.5.in b/gimprc-1.2.5.in index e8d9c79723..34b0855b5f 100644 --- a/gimprc-1.2.5.in +++ b/gimprc-1.2.5.in @@ -31,7 +31,7 @@ .\" Wed Mar 3 13:09:52 MET 1999 Sven Neumann .\" * reflect the changes that were made to the resolution stuff .\" -.TH GIMPRC 5 "3 Wed 1999" "Version @GIMP_VERSION@" +.TH GIMPRC 5 "15 Jan 2000" "Version @GIMP_VERSION@" .SH NAME gimprc \- gimp configuration file .SH DESCRIPTION @@ -385,9 +385,9 @@ sequences are recognised and expanded as follows: %% literal percent sign .br -%f bare filename, or "Untiltled" +%f bare filename, or "Untitled" .br -%F full path to file, or "Untiltled" +%F full path to file, or "Untitled" .br %p PDB image id .br diff --git a/gimprc.5.in b/gimprc.5.in index e8d9c79723..34b0855b5f 100644 --- a/gimprc.5.in +++ b/gimprc.5.in @@ -31,7 +31,7 @@ .\" Wed Mar 3 13:09:52 MET 1999 Sven Neumann .\" * reflect the changes that were made to the resolution stuff .\" -.TH GIMPRC 5 "3 Wed 1999" "Version @GIMP_VERSION@" +.TH GIMPRC 5 "15 Jan 2000" "Version @GIMP_VERSION@" .SH NAME gimprc \- gimp configuration file .SH DESCRIPTION @@ -385,9 +385,9 @@ sequences are recognised and expanded as follows: %% literal percent sign .br -%f bare filename, or "Untiltled" +%f bare filename, or "Untitled" .br -%F full path to file, or "Untiltled" +%F full path to file, or "Untitled" .br %p PDB image id .br