dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/apptypes.h removed trailing enum commas 

* app/apptypes.h
* app/pathsP.h: removed trailing enum commas

* app/gdisplay_color.[ch]: added a foreach function to iterate
over the display filter names

* app/gdisplay_color_ui.[ch]: display filter ui stuff (doesn't do
much yet ;)

* app/commands.[ch]
* app/menus.c: hooked the above into the menu system

* app/Makefile.am: added new files

* plug-ins/gimpressionist/preview.c: removed bogus // comment

-Yosh
This commit is contained in:
Manish Singh 1999-08-31 02:00:34 +00:00
parent 26b70edddf
commit 32772963f1
21 changed files with 197 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
Mon Aug 30 18:56:19 PDT 1999 Manish Singh <yosh@gimp.org>
* app/apptypes.h
* app/pathsP.h: removed trailing enum commas
* app/gdisplay_color.[ch]: added a foreach function to iterate
over the display filter names
* app/gdisplay_color_ui.[ch]: display filter ui stuff (doesn't do
much yet ;)
* app/commands.[ch]
* app/menus.c: hooked the above into the menu system
* app/Makefile.am: added new files
* plug-ins/gimpressionist/preview.c: removed bogus // comment
1999-08-30 Tor Lillqvist <tml@iki.fi>
* app/gimpbrushgenerated.c (gimp_brush_generated_save): Save the

40
app/Makefile.am
View File

@ -6,25 +6,25 @@ bin_PROGRAMS = gimp
noinst_LIBRARIES = libgimpim.a
libgimpim_a_SOURCES = \
gimpdrawable.c \
gimpdrawable.h \
gimpdrawableF.h \
gimpdrawableP.h \
gimpimage.c \
gimpimage.h \
gimpimageF.h \
gimpimageP.h \
gimpobject.c \
gimpobject.h \
gimpobjectF.h \
gimpobjectP.h \
gimppreviewcache.h \
gimppreviewcache.c \
gimpset.c \
gimpset.h \
gimpsetF.h \
gimpsetP.h \
gimpsignal.c \
gimpdrawable.c \
gimpdrawable.h \
gimpdrawableF.h \
gimpdrawableP.h \
gimpimage.c \
gimpimage.h \
gimpimageF.h \
gimpimageP.h \
gimpobject.c \
gimpobject.h \
gimpobjectF.h \
gimpobjectP.h \
gimppreviewcache.h \
gimppreviewcache.c \
gimpset.c \
gimpset.h \
gimpsetF.h \
gimpsetP.h \
gimpsignal.c \
gimpsignal.h
gimp_SOURCES = \
@ -170,6 +170,8 @@ gimp_SOURCES = \
gdisplayF.h \
gdisplay_color.c \
gdisplay_color.h \
gdisplay_color_ui.c \
gdisplay_color_ui.h \
gdisplay_cmds.c \
gdisplay_ops.c \
gdisplay_ops.h \

13
app/actions/help-commands.c
View File

@ -33,6 +33,7 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimprc.h"
#include "global_edit.h"
@ -685,7 +686,7 @@ void
image_equalize_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
GDisplay *gdisp;
return_if_no_display (gdisp);
image_equalize (gdisp->gimage);
@ -1141,6 +1142,16 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
gdisp = gdisplay_active ();
gdisplay_color_ui(gdisp ? gdisp->gimage : NULL);
}
void
about_dialog_cmd_callback (GtkWidget *widget,
gpointer client_data)

1
app/actions/help-commands.h
View File

@ -106,6 +106,7 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void about_dialog_cmd_callback (GtkWidget *, gpointer);
void tips_dialog_cmd_callback (GtkWidget *, gpointer);

4
app/apptypes.h
View File

@ -78,7 +78,7 @@ typedef enum
DIVIDE_MODE,
ERASE_MODE, /*< skip >*/
REPLACE_MODE, /*< skip >*/
ANTI_ERASE_MODE, /*< skip >*/
ANTI_ERASE_MODE /*< skip >*/
} LayerModeEffects;
/* Types of convolutions */
@ -123,7 +123,7 @@ typedef enum {
ONCE_BACKWARDS, /* paint once, then stop, but run the gradient the other way */
LOOP_SAWTOOTH, /* keep painting, looping through the grad start->end,start->end /|/|/| */
LOOP_TRIANGLE, /* keep paiting, looping though the grad start->end,end->start /\/\/\/ */
ONCE_END_COLOR, /* paint once, but keep painting with the end color */
ONCE_END_COLOR /* paint once, but keep painting with the end color */
} GradientPaintMode;

13
app/commands.c
View File

@ -33,6 +33,7 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimprc.h"
#include "global_edit.h"
@ -685,7 +686,7 @@ void
image_equalize_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
GDisplay *gdisp;
return_if_no_display (gdisp);
image_equalize (gdisp->gimage);
@ -1141,6 +1142,16 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
gdisp = gdisplay_active ();
gdisplay_color_ui(gdisp ? gdisp->gimage : NULL);
}
void
about_dialog_cmd_callback (GtkWidget *widget,
gpointer client_data)

1
app/commands.h
View File

@ -106,6 +106,7 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void about_dialog_cmd_callback (GtkWidget *, gpointer);
void tips_dialog_cmd_callback (GtkWidget *, gpointer);

45
app/display/gimpdisplayshell-filter.c
View File

@ -48,11 +48,15 @@ struct _GammaContext
GtkWidget *spinner;
};
static void gdisplay_color_detach_real (GDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const char *name);
static void color_display_foreach (gpointer key,
gpointer value,
gpointer user_data);
static void gdisplay_color_detach_real (GDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const char *name);
static gpointer gamma_new (int type);
static void gamma_create_lookup_table (GammaContext *context);
@ -153,6 +157,35 @@ gimp_color_display_unregister (const char *name)
return TRUE;
}
typedef struct _DisplayForeachData DisplayForeachData;
struct _DisplayForeachData
{
GimpCDFunc func;
gpointer user_data;
};
void
gimp_color_display_foreach (GimpCDFunc func,
gpointer user_data)
{
DisplayForeachData data;
data.func = func;
data.user_data = user_data;
g_hash_table_foreach (color_display_table, color_display_foreach, &data);
}
static void
color_display_foreach (gpointer key,
gpointer value,
gpointer user_data)
{
DisplayForeachData *data = (DisplayForeachData *) user_data;
data->func (key, data->user_data);
}
void
gdisplay_color_attach (GDisplay *gdisp,
const char *name)
@ -348,7 +381,7 @@ gamma_save (gpointer cd_ID)
static void
gamma_configure_ok_callback (GtkWidget *widget,
gpointer data)
gpointer data)
{
GammaContext *context = (GammaContext *) data;

6
app/display/gimpdisplayshell-filter.h
View File

@ -36,4 +36,10 @@ void gdisplay_color_detach (GDisplay *gdisp,
const char *name);
void gdisplay_color_detach_all (GDisplay *gdisp);
typedef void (*GimpCDFunc) (const char *name,
gpointer user_data);
void gimp_color_display_foreach (GimpCDFunc func,
gpointer user_data);
#endif /* __GDISPLAY_COLOR_H__ */

45
app/gdisplay_color.c
View File

@ -48,11 +48,15 @@ struct _GammaContext
GtkWidget *spinner;
};
static void gdisplay_color_detach_real (GDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const char *name);
static void color_display_foreach (gpointer key,
gpointer value,
gpointer user_data);
static void gdisplay_color_detach_real (GDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const char *name);
static gpointer gamma_new (int type);
static void gamma_create_lookup_table (GammaContext *context);
@ -153,6 +157,35 @@ gimp_color_display_unregister (const char *name)
return TRUE;
}
typedef struct _DisplayForeachData DisplayForeachData;
struct _DisplayForeachData
{
GimpCDFunc func;
gpointer user_data;
};
void
gimp_color_display_foreach (GimpCDFunc func,
gpointer user_data)
{
DisplayForeachData data;
data.func = func;
data.user_data = user_data;
g_hash_table_foreach (color_display_table, color_display_foreach, &data);
}
static void
color_display_foreach (gpointer key,
gpointer value,
gpointer user_data)
{
DisplayForeachData *data = (DisplayForeachData *) user_data;
data->func (key, data->user_data);
}
void
gdisplay_color_attach (GDisplay *gdisp,
const char *name)
@ -348,7 +381,7 @@ gamma_save (gpointer cd_ID)
static void
gamma_configure_ok_callback (GtkWidget *widget,
gpointer data)
gpointer data)
{
GammaContext *context = (GammaContext *) data;

6
app/gdisplay_color.h
View File

@ -36,4 +36,10 @@ void gdisplay_color_detach (GDisplay *gdisp,
const char *name);
void gdisplay_color_detach_all (GDisplay *gdisp);
typedef void (*GimpCDFunc) (const char *name,
gpointer user_data);
void gimp_color_display_foreach (GimpCDFunc func,
gpointer user_data);
#endif /* __GDISPLAY_COLOR_H__ */

13
app/gui/commands.c
View File

@ -33,6 +33,7 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimprc.h"
#include "global_edit.h"
@ -685,7 +686,7 @@ void
image_equalize_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
GDisplay *gdisp;
return_if_no_display (gdisp);
image_equalize (gdisp->gimage);
@ -1141,6 +1142,16 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
gdisp = gdisplay_active ();
gdisplay_color_ui(gdisp ? gdisp->gimage : NULL);
}
void
about_dialog_cmd_callback (GtkWidget *widget,
gpointer client_data)

1
app/gui/commands.h
View File

@ -106,6 +106,7 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void about_dialog_cmd_callback (GtkWidget *, gpointer);
void tips_dialog_cmd_callback (GtkWidget *, gpointer);

13
app/gui/help-commands.c
View File

@ -33,6 +33,7 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimprc.h"
#include "global_edit.h"
@ -685,7 +686,7 @@ void
image_equalize_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
GDisplay *gdisp;
return_if_no_display (gdisp);
image_equalize (gdisp->gimage);
@ -1141,6 +1142,16 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
GDisplay * gdisp;
gdisp = gdisplay_active ();
gdisplay_color_ui(gdisp ? gdisp->gimage : NULL);
}
void
about_dialog_cmd_callback (GtkWidget *widget,
gpointer client_data)

1
app/gui/help-commands.h
View File

@ -106,6 +106,7 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void about_dialog_cmd_callback (GtkWidget *, gpointer);
void tips_dialog_cmd_callback (GtkWidget *, gpointer);

4
app/gui/menus.c
View File

@ -80,6 +80,7 @@ static GtkItemFactoryEntry toolbox_entries[] =
{ N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
{ N_("/Xtns/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Xtns/Module Browser"), NULL, dialogs_module_browser_cmd_callback, 0 },
@ -166,7 +167,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/View/New View"), NULL, view_new_view_cmd_callback, 0 },
{ N_("/View/Shrink Wrap"), "<control>E", view_shrink_wrap_cmd_callback, 0 },
{ N_("/Image/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/Equalize"), NULL, image_equalize_cmd_callback, 0 },
@ -232,6 +233,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/Dialogs/Tool Options..."), NULL, dialogs_tools_options_cmd_callback, 0 },
{ N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }
};
static guint n_image_entries = sizeof (image_entries) / sizeof (image_entries[0]);
static GtkItemFactory *image_factory = NULL;

4
app/menus.c
View File

@ -80,6 +80,7 @@ static GtkItemFactoryEntry toolbox_entries[] =
{ N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
{ N_("/Xtns/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Xtns/Module Browser"), NULL, dialogs_module_browser_cmd_callback, 0 },
@ -166,7 +167,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/View/New View"), NULL, view_new_view_cmd_callback, 0 },
{ N_("/View/Shrink Wrap"), "<control>E", view_shrink_wrap_cmd_callback, 0 },
{ N_("/Image/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/Equalize"), NULL, image_equalize_cmd_callback, 0 },
@ -232,6 +233,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/Dialogs/Tool Options..."), NULL, dialogs_tools_options_cmd_callback, 0 },
{ N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }
};
static guint n_image_entries = sizeof (image_entries) / sizeof (image_entries[0]);
static GtkItemFactory *image_factory = NULL;

4
app/menus/menus.c
View File

@ -80,6 +80,7 @@ static GtkItemFactoryEntry toolbox_entries[] =
{ N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
{ N_("/Xtns/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Xtns/Module Browser"), NULL, dialogs_module_browser_cmd_callback, 0 },
@ -166,7 +167,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/View/New View"), NULL, view_new_view_cmd_callback, 0 },
{ N_("/View/Shrink Wrap"), "<control>E", view_shrink_wrap_cmd_callback, 0 },
{ N_("/Image/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/Equalize"), NULL, image_equalize_cmd_callback, 0 },
@ -232,6 +233,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/Dialogs/Tool Options..."), NULL, dialogs_tools_options_cmd_callback, 0 },
{ N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }
};
static guint n_image_entries = sizeof (image_entries) / sizeof (image_entries[0]);
static GtkItemFactory *image_factory = NULL;

2
app/pathsP.h
View File

@ -57,7 +57,7 @@ typedef struct {
} PATHIMAGELIST, *PATHIMAGELISTP, PathsList;
typedef enum {
BEZIER = 1,
BEZIER = 1
} PathType;
PATHPOINTP pathpoint_new(gint,gdouble,gdouble);

4
app/widgets/gimpitemfactory.c
View File

@ -80,6 +80,7 @@ static GtkItemFactoryEntry toolbox_entries[] =
{ N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/File/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 },
{ N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
{ N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
{ N_("/Xtns/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Xtns/Module Browser"), NULL, dialogs_module_browser_cmd_callback, 0 },
@ -166,7 +167,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/View/New View"), NULL, view_new_view_cmd_callback, 0 },
{ N_("/View/Shrink Wrap"), "<control>E", view_shrink_wrap_cmd_callback, 0 },
{ N_("/Image/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/tearoff1"), NULL, tearoff_cmd_callback, 0, "<Tearoff>" },
{ N_("/Image/Colors/Equalize"), NULL, image_equalize_cmd_callback, 0 },
@ -232,6 +233,7 @@ static GtkItemFactoryEntry image_entries[] =
{ N_("/Dialogs/Tool Options..."), NULL, dialogs_tools_options_cmd_callback, 0 },
{ N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 },
{ N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 },
{ N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }
};
static guint n_image_entries = sizeof (image_entries) / sizeof (image_entries[0]);
static GtkItemFactory *image_factory = NULL;

2
plug-ins/gimpressionist/preview.c
View File

@ -85,7 +85,7 @@ void updatepreviewprev(GtkWidget *wg, void *d)
for(i = 0; i < PREVIEWSIZE; i++) {
memset(buf,0,PREVIEWSIZE*3);
//for(j = 0; j < p.width; j++)
/* for(j = 0; j < p.width; j++) */
gtk_preview_draw_row(GTK_PREVIEW(previewprev), (guchar *)&p.col[i*PREVIEWSIZE*3], 0, i, PREVIEWSIZE);
}
killppm(&p);