diff --git a/ChangeLog b/ChangeLog index e10bd8f05f..b2372567d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Oct 9 15:34:12 MEST 1999 Sven Neumann + + * gimprc.5.in + * gimprc.in + * app/gimprc.c + * app/preferences_dialog.c: changed the preview_size settings to be + a bit more finegrained. + Fri Oct 8 18:29:56 PDT 1999 Manish Singh * plug-ins/common/film.c: applied gimp-kirchgessner-991009-0, allow diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index cbb0e61334..3cf9ce5003 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1464,9 +1464,11 @@ file_pref_cmd_callback (GtkWidget *widget, gimp_option_menu_new (file_prefs_preview_size_callback, (gpointer) preview_size, _("None"), (gpointer) 0, (gpointer) 0, + _("Tiny"), (gpointer) 24, (gpointer) 24, _("Small"), (gpointer) 32, (gpointer) 32, - _("Medium"), (gpointer) 64, (gpointer) 64, - _("Large"), (gpointer) 128, (gpointer) 128, + _("Medium"), (gpointer) 48, (gpointer) 48, + _("Large"), (gpointer) 64, (gpointer) 64, + _("Huge"), (gpointer) 128, (gpointer) 128, NULL); gimp_table_attach_aligned (GTK_TABLE (table), 0, _("Preview Size:"), 1.0, 0.5, optionmenu, TRUE); diff --git a/app/gimprc.c b/app/gimprc.c index 0abfa86d62..eabd0e2169 100644 --- a/app/gimprc.c +++ b/app/gimprc.c @@ -127,7 +127,7 @@ int default_threshold = 15; int stingy_memory_use = 0; int allow_resize_windows = 0; int no_cursor_updating = 0; -int preview_size = 64; +int preview_size = 32; int nav_preview_size = 112; int show_rulers = TRUE; int show_statusbar = TRUE; @@ -1229,11 +1229,15 @@ parse_preview_size (gpointer val1p, { if (strcmp (token_sym, "none") == 0) preview_size = 0; + else if (strcmp (token_sym, "tiny") == 0) + preview_size = 24; else if (strcmp (token_sym, "small") == 0) preview_size = 32; else if (strcmp (token_sym, "medium") == 0) - preview_size = 64; + preview_size = 48; else if (strcmp (token_sym, "large") == 0) + preview_size = 64; + else if (strcmp (token_sym, "huge") == 0) preview_size = 128; else preview_size = 0; diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index cbb0e61334..3cf9ce5003 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -1464,9 +1464,11 @@ file_pref_cmd_callback (GtkWidget *widget, gimp_option_menu_new (file_prefs_preview_size_callback, (gpointer) preview_size, _("None"), (gpointer) 0, (gpointer) 0, + _("Tiny"), (gpointer) 24, (gpointer) 24, _("Small"), (gpointer) 32, (gpointer) 32, - _("Medium"), (gpointer) 64, (gpointer) 64, - _("Large"), (gpointer) 128, (gpointer) 128, + _("Medium"), (gpointer) 48, (gpointer) 48, + _("Large"), (gpointer) 64, (gpointer) 64, + _("Huge"), (gpointer) 128, (gpointer) 128, NULL); gimp_table_attach_aligned (GTK_TABLE (table), 0, _("Preview Size:"), 1.0, 0.5, optionmenu, TRUE); diff --git a/app/preferences_dialog.c b/app/preferences_dialog.c index cbb0e61334..3cf9ce5003 100644 --- a/app/preferences_dialog.c +++ b/app/preferences_dialog.c @@ -1464,9 +1464,11 @@ file_pref_cmd_callback (GtkWidget *widget, gimp_option_menu_new (file_prefs_preview_size_callback, (gpointer) preview_size, _("None"), (gpointer) 0, (gpointer) 0, + _("Tiny"), (gpointer) 24, (gpointer) 24, _("Small"), (gpointer) 32, (gpointer) 32, - _("Medium"), (gpointer) 64, (gpointer) 64, - _("Large"), (gpointer) 128, (gpointer) 128, + _("Medium"), (gpointer) 48, (gpointer) 48, + _("Large"), (gpointer) 64, (gpointer) 64, + _("Huge"), (gpointer) 128, (gpointer) 128, NULL); gimp_table_attach_aligned (GTK_TABLE (table), 0, _("Preview Size:"), 1.0, 0.5, optionmenu, TRUE); diff --git a/etc/gimprc.in b/etc/gimprc.in index d280be0352..061b73ba63 100644 --- a/etc/gimprc.in +++ b/etc/gimprc.in @@ -140,24 +140,44 @@ # Uncomment this line to disable them. # (no-cursor-updating) -# Layer preview sizes: +# Layer preview sizes (also used for the Undo History): # none: no previews in layers dialog/layer selector +# tiny: 24x24 # small: 32x32 -# medium: 64x64 -# large: 128x128 -# #: #x# +# medium: 48x48 +# large: 64x64 +# huge: 128x128 +# #: #x# (preview-size small) +# Navigation window preview sizes: +# small: 48x48 +# medium: 80x80 +# large: 112x112 +# #: #x# +(nav-preview-size large) + + # Tooltips # Comment this out to disable the tooltips in the toolbox # (dont-show-tool-tips) +# Help System +# Comment this out to disable context-sensitive help with F1 key +# (dont-use-help) + # Controlling ruler visibility # The default behavior is for rulers to be ON. # This can also be toggled with the View->Toggle Rulers command # or shift+control+r # (dont-show-rulers) +# Controlling statusbar visibility +# The default behavior is to show the statusbar. +# This can also be toggled with the View->Toggle Statusbar command +# or shift+control+s +# (dont-show-statusbar) + # Default units # This is the default unit of a new image. It will appear in the # File/New dialog and will be the unit for coordinate display when @@ -180,12 +200,6 @@ (default-xresolution 72.0) (default-yresolution 72.0) -# Controlling statusbar visibility -# The default behavior is to show the statusbar. -# This can also be toggled with the View->Toggle Statusbar command -# or shift+control+s -# (dont-show-statusbar) - # Disable auto saving # Auto saving is not yet implemented! Nothing will be auto-saved, no matter # how you set this here. diff --git a/gimprc-1.2.5.in b/gimprc-1.2.5.in index 28b4819d5b..e8d9c79723 100644 --- a/gimprc-1.2.5.in +++ b/gimprc-1.2.5.in @@ -54,7 +54,7 @@ by lisp-like assignments of the form: .TP where: .TP 10 -.I propery-name +.I property-name is one of the property names described below. .TP .I value @@ -112,8 +112,9 @@ green, blue and grey (respectively) in the color cube. .TP .I PREVIEWSIZE One of -.BR none ", " small ", " medium ", or " large ", " -or an INT. small is 32x32, medium is 64x64, and large is 128x128. +.BR none ", "tiny ", " small ", " medium ", "large " or " huge ", " +or an INT. tiny is 24x24, small is 32x32, medium is 48x48, +large is 64x64 and huge is 128x128. .TP .I UNIT One of diff --git a/gimprc.5.in b/gimprc.5.in index 28b4819d5b..e8d9c79723 100644 --- a/gimprc.5.in +++ b/gimprc.5.in @@ -54,7 +54,7 @@ by lisp-like assignments of the form: .TP where: .TP 10 -.I propery-name +.I property-name is one of the property names described below. .TP .I value @@ -112,8 +112,9 @@ green, blue and grey (respectively) in the color cube. .TP .I PREVIEWSIZE One of -.BR none ", " small ", " medium ", or " large ", " -or an INT. small is 32x32, medium is 64x64, and large is 128x128. +.BR none ", "tiny ", " small ", " medium ", "large " or " huge ", " +or an INT. tiny is 24x24, small is 32x32, medium is 48x48, +large is 64x64 and huge is 128x128. .TP .I UNIT One of diff --git a/gimprc.in b/gimprc.in index d280be0352..061b73ba63 100644 --- a/gimprc.in +++ b/gimprc.in @@ -140,24 +140,44 @@ # Uncomment this line to disable them. # (no-cursor-updating) -# Layer preview sizes: +# Layer preview sizes (also used for the Undo History): # none: no previews in layers dialog/layer selector +# tiny: 24x24 # small: 32x32 -# medium: 64x64 -# large: 128x128 -# #: #x# +# medium: 48x48 +# large: 64x64 +# huge: 128x128 +# #: #x# (preview-size small) +# Navigation window preview sizes: +# small: 48x48 +# medium: 80x80 +# large: 112x112 +# #: #x# +(nav-preview-size large) + + # Tooltips # Comment this out to disable the tooltips in the toolbox # (dont-show-tool-tips) +# Help System +# Comment this out to disable context-sensitive help with F1 key +# (dont-use-help) + # Controlling ruler visibility # The default behavior is for rulers to be ON. # This can also be toggled with the View->Toggle Rulers command # or shift+control+r # (dont-show-rulers) +# Controlling statusbar visibility +# The default behavior is to show the statusbar. +# This can also be toggled with the View->Toggle Statusbar command +# or shift+control+s +# (dont-show-statusbar) + # Default units # This is the default unit of a new image. It will appear in the # File/New dialog and will be the unit for coordinate display when @@ -180,12 +200,6 @@ (default-xresolution 72.0) (default-yresolution 72.0) -# Controlling statusbar visibility -# The default behavior is to show the statusbar. -# This can also be toggled with the View->Toggle Statusbar command -# or shift+control+s -# (dont-show-statusbar) - # Disable auto saving # Auto saving is not yet implemented! Nothing will be auto-saved, no matter # how you set this here.