Skip to content

GitLab

GIMP
GIMP
Commit 4d20d829 authored by Sven Neumann's avatar Sven Neumann
Browse files
Options

an eye_candy for new users 


--Sven & Mitch
parent 8ef39a91
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20938 additions and 16446 deletions
ChangeLog
View file @ 4d20d829
Tue Mar 14 22:13:35 CET 2000 Sven Neumann <sven@gimp.org>
Michael Natterer <mitch@gimp.org>
* Makefile.am
* pixmaps/folder.xpm: new file.
* pixmaps/wilber.xpm: removed the shadows.
* gimprc.in
* user_install: cleanup.
* app/app_procs.c: only parse unitrc and gimprc if not already
done by install.c.
* app/gimprc.[ch]: cleanups. parse_buffers_init() returns a
boolean indicating if the buffers are really initialized.
* app/gimpui.h: include some more stuff from libgimp.
* app/install.c: Gimp's most beautiful dialog should blow away
first time users.
(does not yet work with themes, please help)
* app/preferences_dialog.c: removed the mem_size_unit stuff.
* libgimp/gimpchainbutton.c: cleanup.
* libgimp/gimpwidgets.[ch]: new function gimp_mem_size_entry_new()
which does the stuff known from the prefs dialog.
* plug-ins/script-fu/scripts/tileblur.scm: s/tilable/tileable/
Sun Mar 12 04:26:41 CET 2000 Sven Neumann <sven@gimp.org>
* plug-ins/gfig.c: reduced the preview_size and tweaked the dialog
......
Makefile.am
View file @ 4d20d829
......@@ -62,6 +62,7 @@ EXTRA_DIST = \
pixmaps/eek.xpm \
pixmaps/eye.xbm \
pixmaps/first.xpm \
pixmaps/folder.xpm \
pixmaps/last.xpm \
pixmaps/layer.xbm \
pixmaps/linked.xbm \
......
app/app_procs.c
View file @ 4d20d829
......@@ -505,9 +505,11 @@ app_init (void)
color_display_init ();
RESET_BAR();
parse_buffers_init ();
parse_unitrc (); /* this needs to be done before gimprc loading */
parse_gimprc (); /* parse the local GIMP configuration file */
if (parse_buffers_init ())
{
parse_unitrc (); /* this needs to be done before gimprc loading */
parse_gimprc (); /* parse the local GIMP configuration file */
}
if (always_restore_session)
restore_session = TRUE;
......
app/dialogs/preferences-dialog.c
View file @ 4d20d829
......@@ -32,11 +32,8 @@
#include "session.h"
#include "tile_cache.h"
#include "libgimp/gimpchainbutton.h"
#include "libgimp/gimpfileselection.h"
#include "libgimp/gimppatheditor.h"
#include "libgimp/gimpsizeentry.h"
#include "libgimp/gimplimits.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
......@@ -61,8 +58,6 @@ static void file_prefs_cancel_callback (GtkWidget *, GtkWidget *);
static void file_prefs_toggle_callback (GtkWidget *, gpointer);
static void file_prefs_preview_size_callback (GtkWidget *, gpointer);
static void file_prefs_nav_preview_size_callback (GtkWidget *, gpointer);
static void file_prefs_mem_size_callback (GtkWidget *, gpointer);
static void file_prefs_mem_size_unit_callback (GtkWidget *, gpointer);
static void file_prefs_string_callback (GtkWidget *, gpointer);
static void file_prefs_text_callback (GtkWidget *, gpointer);
static void file_prefs_filename_callback (GtkWidget *, gpointer);
......@@ -982,67 +977,6 @@ file_prefs_nav_preview_size_callback (GtkWidget *widget,
gdisplays_nav_preview_resized ();
}
static void
file_prefs_mem_size_callback (GtkWidget *widget,
gpointer data)
{
gint *mem_size;
gint divided_mem_size;
gint mem_size_unit;
if (! (mem_size = gtk_object_get_data (GTK_OBJECT (widget), "mem_size")))
return;
divided_mem_size = (int) gtk_object_get_data (GTK_OBJECT (widget),
"divided_mem_size");
mem_size_unit = (int) gtk_object_get_data (GTK_OBJECT (widget),
"mem_size_unit");
divided_mem_size = GTK_ADJUSTMENT (widget)->value;
*mem_size = divided_mem_size * mem_size_unit;
gtk_object_set_data (GTK_OBJECT (widget), "divided_mem_size",
(gpointer) divided_mem_size);
}
static void
file_prefs_mem_size_unit_callback (GtkWidget *widget,
gpointer data)
{
GtkObject *adjustment;
gint new_unit;
gint *mem_size;
gint divided_mem_size;
gint mem_size_unit;
adjustment = GTK_OBJECT (data);
new_unit = (int) gtk_object_get_user_data (GTK_OBJECT (widget));
if (! (mem_size = gtk_object_get_data (GTK_OBJECT (adjustment), "mem_size")))
return;
divided_mem_size = (int) gtk_object_get_data (GTK_OBJECT (adjustment),
"divided_mem_size");
mem_size_unit = (int) gtk_object_get_data (GTK_OBJECT (adjustment),
"mem_size_unit");
if (new_unit != mem_size_unit)
{
divided_mem_size = *mem_size / new_unit;
mem_size_unit = new_unit;
gtk_signal_handler_block_by_data (GTK_OBJECT (adjustment), mem_size);
gtk_adjustment_set_value (GTK_ADJUSTMENT (adjustment), divided_mem_size);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (adjustment), mem_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);
}
static void
file_prefs_string_callback (GtkWidget *widget,
gpointer data)
......@@ -1384,8 +1318,6 @@ file_pref_cmd_callback (GtkWidget *widget,
GSList *group;
gint i;
gint divided_mem_size;
gint mem_size_unit;
gchar *pixels_per_unit;
if (prefs_dlg)
......@@ -1675,46 +1607,13 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Default Image Type:"), 1.0, 0.5,
optionmenu, 1, 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);
/* The maximum size of a new image */
adjustment = gtk_adjustment_new (max_new_image_size,
0, (4069.0 * 1024 * 1024), 1.0, 1.0, 0.0);
hbox = gimp_mem_size_entry_new (GTK_ADJUSTMENT (adjustment));
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (file_prefs_mem_size_callback),
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&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_new2 (FALSE, 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), 0, 1,
_("Maximum Image Size:"), 1.0, 0.5,
hbox, 1, TRUE);
......@@ -1725,8 +1624,8 @@ file_pref_cmd_callback (GtkWidget *widget,
GTK_CTREE (ctree),
_("Default Comment"),
"dialogs/preferences/default_comment.html",
NULL,
&top_insert,
top_insert,
&child_insert,
page_index);
gtk_widget_show (vbox);
page_index++;
......@@ -2193,45 +2092,12 @@ file_pref_cmd_callback (GtkWidget *widget,
spinbutton, 1, TRUE);
/* The tile cache size */
mem_size_unit = 1;
for (i = 0; i < 3; i++)
{
if (edit_tile_cache_size % (mem_size_unit * 1024) != 0)
break;
mem_size_unit *= 1024;
}
divided_mem_size = edit_tile_cache_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);
adjustment = gtk_adjustment_new (edit_tile_cache_size,
0, (4069.0 * 1024 * 1024), 1.0, 1.0, 0.0);
hbox = gimp_mem_size_entry_new (GTK_ADJUSTMENT (adjustment));
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (file_prefs_mem_size_callback),
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_tile_cache_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",
&edit_tile_cache_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_new2 (FALSE, 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), 0, 1,
_("Tile Cache Size:"), 1.0, 0.5,
hbox, 1, TRUE);
......@@ -2387,14 +2253,15 @@ file_pref_cmd_callback (GtkWidget *widget,
vbox2 = file_prefs_frame_new (_("Get Monitor Resolution"), GTK_BOX (vbox));
{
gdouble xres, yres;
gchar buf[80];
gdouble xres, yres;
gchar *str;
gdisplay_xserver_resolution (&xres, &yres);
g_snprintf (buf, sizeof (buf), _("(Currently %d x %d dpi)"),
(int) (xres + 0.5), (int) (yres + 0.5));
label = gtk_label_new (buf);
str = g_strdup_printf (_("(Currently %d x %d dpi)"),
ROUND (xres), ROUND (yres));
label = gtk_label_new (str);
g_free (str);
}
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
......
app/dialogs/user-install-dialog.c
View file @ 4d20d829
This diff is collapsed.
app/gimprc.c
View file @ 4d20d829
......@@ -57,7 +57,8 @@
#define OK 2
#define LOCALE_DEF 3
typedef enum {
typedef enum
{
TT_STRING,
TT_PATH,
TT_DOUBLE,
......@@ -87,156 +88,156 @@ typedef struct _ParseFunc ParseFunc;
struct _ParseFunc
{
char *name;
TokenType type;
gpointer val1p;
gpointer val2p;
gchar *name;
TokenType type;
gpointer val1p;
gpointer val2p;
};
typedef struct _UnknownToken UnknownToken;
struct _UnknownToken
{
char *token;
char *value;
gchar *token;
gchar *value;
};
/* global gimprc variables */
char * plug_in_path = NULL;
char * temp_path = NULL;
char * swap_path = NULL;
char * brush_path = NULL;
char * brush_vbr_path = NULL;
char * default_brush = NULL;
char * pattern_path = NULL;
char * default_pattern = NULL;
char * palette_path = NULL;
char * default_palette = NULL;
char * gradient_path = NULL;
char * default_gradient = NULL;
char * pluginrc_path = NULL;
char * module_path = NULL;
int tile_cache_size = 10485760; /* 10 MB */
int marching_speed = 300; /* 300 ms */
double gamma_val = 1.0;
int transparency_type = 1; /* Mid-Tone Checks */
int perfectmouse = 0; /* off (fast and sloppy) */
int transparency_size = 1; /* Medium sized */
int levels_of_undo = 2; /* 2 levels of undo default */
int last_opened_size = 4; /* 4 documents in the MRU list */
int color_cube_shades[4] = {6, 7, 4, 24};
int install_cmap = 0;
int cycled_marching_ants = 0;
int default_threshold = 15;
int stingy_memory_use = 0;
int allow_resize_windows = 0;
int no_cursor_updating = 0;
int preview_size = 32;
int nav_preview_size = 112;
int show_rulers = TRUE;
int show_statusbar = TRUE;
GimpUnit default_units = GIMP_UNIT_INCH;
int auto_save = TRUE;
InterpolationType interpolation_type = LINEAR_INTERPOLATION;
int confirm_on_close = TRUE;
int save_session_info = TRUE;
int save_device_status = FALSE;
int always_restore_session = FALSE;
int default_width = 983;
int default_height = 857;
gchar *plug_in_path = NULL;
gchar *temp_path = NULL;
gchar *swap_path = NULL;
gchar *brush_path = NULL;
gchar *brush_vbr_path = NULL;
gchar *default_brush = NULL;
gchar *pattern_path = NULL;
gchar *default_pattern = NULL;
gchar *palette_path = NULL;
gchar *default_palette = NULL;
gchar *gradient_path = NULL;
gchar *default_gradient = NULL;
gchar *pluginrc_path = NULL;
gchar *module_path = NULL;
gint tile_cache_size = 10485760; /* 10 MB */
gint marching_speed = 300; /* 300 ms */
gdouble gamma_val = 1.0;
gint transparency_type = 1; /* Mid-Tone Checks */
gboolean perfectmouse = FALSE; /* off (fast and sloppy) */
gint transparency_size = 1; /* Medium sized */
gint levels_of_undo = 2; /* 2 levels of undo default */
gint last_opened_size = 4; /* 4 documents in the MRU list */
gint color_cube_shades[4] = { 6, 7, 4, 24 };
gboolean install_cmap = FALSE;
gint cycled_marching_ants = 0;
gint default_threshold = 15;
gboolean stingy_memory_use = FALSE;
gboolean allow_resize_windows = FALSE;
gboolean no_cursor_updating = FALSE;
gint preview_size = 32;
gint nav_preview_size = 112;
gboolean show_rulers = TRUE;
gboolean show_statusbar = TRUE;
GimpUnit default_units = GIMP_UNIT_INCH;
gboolean auto_save = TRUE;
InterpolationType interpolation_type = LINEAR_INTERPOLATION;
gboolean confirm_on_close = TRUE;
gboolean save_session_info = TRUE;
gboolean save_device_status = FALSE;
gboolean always_restore_session = FALSE;
gint default_width = 983;
gint default_height = 857;
/* temporary default size increase to stress test stuff. -- austin 7/11/99 */
int default_type = RGB;
double default_xresolution = 72.0;
double default_yresolution = 72.0;
GimpUnit default_resolution_units = GIMP_UNIT_INCH;
char * default_comment = NULL;
int default_dot_for_dot = TRUE;
int show_tips = TRUE;
int last_tip = -1;
int show_tool_tips = TRUE;
double monitor_xres = 72.0;
double monitor_yres = 72.0;
int using_xserver_resolution = FALSE;
int num_processors = 1;
char * image_title_format = NULL;
int global_paint_options = TRUE;
int show_indicators = TRUE;
int max_new_image_size = 33554432; /* 32 MB */
int thumbnail_mode = 1;
int trust_dirty_flag = FALSE;
int use_help = TRUE;
int nav_window_per_display = FALSE;
int info_window_follows_mouse = FALSE;
int help_browser = HELP_BROWSER_GIMP;
gint default_type = RGB;
gdouble default_xresolution = 72.0;
gdouble default_yresolution = 72.0;
GimpUnit default_resolution_units = GIMP_UNIT_INCH;
gchar *default_comment = NULL;
gboolean default_dot_for_dot = TRUE;
gboolean show_tips = TRUE;
gint last_tip = -1;
gboolean show_tool_tips = TRUE;
gdouble monitor_xres = 72.0;
gdouble monitor_yres = 72.0;
gboolean using_xserver_resolution = FALSE;
gint num_processors = 1;
gchar *image_title_format = NULL;
gboolean global_paint_options = TRUE;
gboolean show_indicators = TRUE;
gint max_new_image_size = 33554432; /* 32 MB */
gint thumbnail_mode = 1;
gboolean trust_dirty_flag = FALSE;
gboolean use_help = TRUE;
gboolean nav_window_per_display = FALSE;
gboolean info_window_follows_mouse = FALSE;
gint help_browser = HELP_BROWSER_GIMP;
extern char * module_db_load_inhibit;
static int get_next_token (void);
static int peek_next_token (void);
static int parse_statement (void);
static int parse_string (gpointer val1p, gpointer val2p);
static int parse_path (gpointer val1p, gpointer val2p);
static int parse_double (gpointer val1p, gpointer val2p);
static int parse_float (gpointer val1p, gpointer val2p);
static int parse_int (gpointer val1p, gpointer val2p);
static int parse_boolean (gpointer val1p, gpointer val2p);
static int parse_position (gpointer val1p, gpointer val2p);
static int parse_mem_size (gpointer val1p, gpointer val2p);
static int parse_image_type (gpointer val1p, gpointer val2p);
static int parse_interpolation_type (gpointer val1p, gpointer val2p);
static int parse_color_cube (gpointer val1p, gpointer val2p);
static int parse_preview_size (gpointer val1p, gpointer val2p);
static int parse_nav_preview_size (gpointer val1p, gpointer val2p);
static int parse_units (gpointer val1p, gpointer val2p);
static int parse_plug_in (gpointer val1p, gpointer val2p);
static int parse_plug_in_def (gpointer val1p, gpointer val2p);
static int parse_device (gpointer val1p, gpointer val2p);
static int parse_menu_path (gpointer val1p, gpointer val2p);
static int parse_session_info (gpointer val1p, gpointer val2p);
static int parse_unit_info (gpointer val1p, gpointer val2p);
static int parse_parasite (gpointer val1p, gpointer val2p);
static int parse_help_browser (gpointer val1p, gpointer val2p);
static int parse_locale_def (PlugInDef *plug_in_def);
static int parse_proc_def (PlugInProcDef **proc_def);
static int parse_proc_arg (ProcArg *arg);
static int parse_unknown (char *token_sym);
char* gimprc_value_to_str (char *name);
static char* value_to_str (char *name);
static inline char * string_to_str (gpointer val1p, gpointer val2p);
static inline char * path_to_str (gpointer val1p, gpointer val2p);
static inline char * double_to_str (gpointer val1p, gpointer val2p);
static inline char * float_to_str (gpointer val1p, gpointer val2p);
static inline char * int_to_str (gpointer val1p, gpointer val2p);
static inline char * boolean_to_str (gpointer val1p, gpointer val2p);
static inline char * position_to_str (gpointer val1p, gpointer val2p);
static inline char * mem_size_to_str (gpointer val1p, gpointer val2p);
static inline char * image_type_to_str (gpointer val1p, gpointer val2p);
static inline char * interpolation_type_to_str (gpointer val1p, gpointer val2p);
static inline char * color_cube_to_str (gpointer val1p, gpointer val2p);
static inline char * preview_size_to_str (gpointer val1p, gpointer val2p);
static inline char * nav_preview_size_to_str (gpointer val1p, gpointer val2p);
static inline char * units_to_str (gpointer val1p, gpointer val2p);
static inline char * help_browser_to_str (gpointer val1p, gpointer val2p);
static inline char * comment_to_str (gpointer val1p, gpointer val2p);
static char* transform_path (char *path, int destroy);
static void gimprc_set_token (char *token, char *value);
static void add_gimp_directory_token (char *gimp_dir);
static gint get_next_token (void);
static gint peek_next_token (void);
static gint parse_statement (void);
static gint parse_string (gpointer val1p, gpointer val2p);
static gint parse_path (gpointer val1p, gpointer val2p);
static gint parse_double (gpointer val1p, gpointer val2p);
static gint parse_float (gpointer val1p, gpointer val2p);
static gint parse_int (gpointer val1p, gpointer val2p);
static gint parse_boolean (gpointer val1p, gpointer val2p);
static gint parse_position (gpointer val1p, gpointer val2p);
static gint parse_mem_size (gpointer val1p, gpointer val2p);
static gint parse_image_type (gpointer val1p, gpointer val2p);
static gint parse_interpolation_type (gpointer val1p, gpointer val2p);
static gint parse_color_cube (gpointer val1p, gpointer val2p);
static gint parse_preview_size (gpointer val1p, gpointer val2p);
static gint parse_nav_preview_size (gpointer val1p, gpointer val2p);
static gint parse_units (gpointer val1p, gpointer val2p);
static gint parse_plug_in (gpointer val1p, gpointer val2p);
static gint parse_plug_in_def (gpointer val1p, gpointer val2p);
static gint parse_device (gpointer val1p, gpointer val2p);
static gint parse_menu_path (gpointer val1p, gpointer val2p);
static gint parse_session_info (gpointer val1p, gpointer val2p);
static gint parse_unit_info (gpointer val1p, gpointer val2p);
static gint parse_parasite (gpointer val1p, gpointer val2p);
static gint parse_help_browser (gpointer val1p, gpointer val2p);
static gint parse_locale_def (PlugInDef *plug_in_def);
static gint parse_proc_def (PlugInProcDef **proc_def);
static gint parse_proc_arg (ProcArg *arg);
static gint parse_unknown (gchar *token_sym);
gchar *gimprc_value_to_str (gchar *name);
static gchar *value_to_str (gchar *name);
static inline gchar * string_to_str (gpointer val1p, gpointer val2p);
static inline gchar * path_to_str (gpointer val1p, gpointer val2p);
static inline gchar * double_to_str (gpointer val1p, gpointer val2p);
static inline gchar * float_to_str (gpointer val1p, gpointer val2p);
static inline gchar * int_to_str (gpointer val1p, gpointer val2p);
static inline gchar * boolean_to_str (gpointer val1p, gpointer val2p);
static inline gchar * position_to_str (gpointer val1p, gpointer val2p);
static inline gchar * mem_size_to_str (gpointer val1p, gpointer val2p);
static inline gchar * image_type_to_str (gpointer val1p, gpointer val2p);
static inline gchar * interpolation_type_to_str (gpointer val1p, gpointer val2p);
static inline gchar * color_cube_to_str (gpointer val1p, gpointer val2p);
static inline gchar * preview_size_to_str (gpointer val1p, gpointer val2p);
static inline gchar * nav_preview_size_to_str (gpointer val1p, gpointer val2p);
static inline gchar * units_to_str (gpointer val1p, gpointer val2p);
static inline gchar * help_browser_to_str (gpointer val1p, gpointer val2p);
static inline gchar * comment_to_str (gpointer val1p, gpointer val2p);
static gchar *transform_path (gchar *path, gboolean destroy);
static void gimprc_set_token (gchar *token, gchar *value);
static void add_gimp_directory_token (gchar *gimp_dir);
#ifdef __EMX__
static void add_x11root_token (char *x11root);
static void add_x11root_token (gchar *x11root);
#endif
static char* open_backup_file (char *filename,
char *secondary_filename,
char **name_used,
FILE **fp_new,
FILE **fp_old);
static gchar *open_backup_file (gchar *filename,
gchar *secondary_filename,