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

Added .cvsignores for the colorify, illusion, glasstile, and papertile 

Added Nether's tools patch
Clarified the units in the preference tile cache size field (it's in bytes,
NOT KBs)
This commit is contained in:
Manish Singh 1997-12-09 23:22:24 +00:00
parent ff37fbfdee
commit 31bceb1daf
16 changed files with 319 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Dec 9 15:26:48 PST 1997 Manish Singh <yosh@gimp.org>
* Added Lauri Alanko's tools patch
* Clarified the units in the tile cache size field in the
preferences dialog
Tue Dec 9 15:21:16 PST 1997 Raph Levien <raph@acm.org>
* app/gimprc.c, app/commands.c: committed the preferences patch I

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

@ -1291,7 +1291,7 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new ("Tile cache size:");
label = gtk_label_new ("Tile cache size (bytes):");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

2
app/commands.c
View File

@ -1291,7 +1291,7 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new ("Tile cache size:");
label = gtk_label_new ("Tile cache size (bytes):");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

2
app/core/gimpprojection.c
View File

@ -42,7 +42,6 @@
#include "scroll.h"
#include "tools.h"
#include "undo.h"
#include "tools.h"
#define OVERHEAD 25 /* in units of pixel area */
@ -1098,7 +1097,6 @@ gdisplay_active ()
if (popup_shell)
{
active_tool_control (DESTROY, gdisp);
gdisp = gtk_object_get_user_data (GTK_OBJECT (popup_shell));
return gdisp;
}

2
app/display/gimpdisplay.c
View File

@ -42,7 +42,6 @@
#include "scroll.h"
#include "tools.h"
#include "undo.h"
#include "tools.h"
#define OVERHEAD 25 /* in units of pixel area */
@ -1098,7 +1097,6 @@ gdisplay_active ()
if (popup_shell)
{
active_tool_control (DESTROY, gdisp);
gdisp = gtk_object_get_user_data (GTK_OBJECT (popup_shell));
return gdisp;
}

2
app/gdisplay.c
View File

@ -42,7 +42,6 @@
#include "scroll.h"
#include "tools.h"
#include "undo.h"
#include "tools.h"
#define OVERHEAD 25 /* in units of pixel area */
@ -1098,7 +1097,6 @@ gdisplay_active ()
if (popup_shell)
{
active_tool_control (DESTROY, gdisp);
gdisp = gtk_object_get_user_data (GTK_OBJECT (popup_shell));
return gdisp;
}

2
app/gui/commands.c
View File

@ -1291,7 +1291,7 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new ("Tile cache size:");
label = gtk_label_new ("Tile cache size (bytes):");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

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

@ -1291,7 +1291,7 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new ("Tile cache size:");
label = gtk_label_new ("Tile cache size (bytes):");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

74
app/gui/menus.c
View File

@ -29,7 +29,7 @@
#include "procedural_db.h"
#include "scale.h"
#include "tools.h"
#include "gdisplay.h"
static void menus_init (void);
static void menus_foreach (gpointer key,
@ -43,7 +43,8 @@ static gint menus_install_accel (GtkWidget *widget,
static void menus_remove_accel (GtkWidget *widget,
gchar *signal_name,
gchar *path);
static void menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry);
static GtkMenuEntry menu_items[] =
{
@ -297,6 +298,9 @@ menus_create (GtkMenuEntry *entries,
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "remove_accelerator",
(GtkSignalFunc) menus_remove_accel,
entries[i].path);
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "activate",
(GtkSignalFunc) menus_activate_callback,
&entries[i]);
}
}
@ -480,3 +484,69 @@ menus_remove_accel (GtkWidget *widget,
g_hash_table_insert (entry_ht, path, g_strdup (""));
}
}
static void
menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry)
{
/* These are the functions upon which we won't destroy the
tool... "safe", so to say. All the others are expected to alter
the image, so the tool must be destroyed */
const GtkMenuCallback ignore[]={
image_posterize_cmd_callback,
image_threshold_cmd_callback,
image_color_balance_cmd_callback,
image_brightness_contrast_cmd_callback,
image_hue_saturation_cmd_callback,
image_curves_cmd_callback,
image_levels_cmd_callback,
image_histogram_cmd_callback,
tools_select_cmd_callback,
about_dialog_cmd_callback,
tips_dialog_cmd_callback,
file_new_cmd_callback,
file_open_cmd_callback,
file_save_cmd_callback,
file_save_as_cmd_callback,
file_pref_cmd_callback,
file_close_cmd_callback,
file_quit_cmd_callback,
view_zoomin_cmd_callback,
view_zoomout_cmd_callback,
view_zoom_16_1_callback,
view_zoom_8_1_callback,
view_zoom_4_1_callback,
view_zoom_2_1_callback,
view_zoom_1_1_callback,
view_zoom_1_2_callback,
view_zoom_1_4_callback,
view_zoom_1_8_callback,
view_zoom_1_16_callback,
view_window_info_cmd_callback,
view_toggle_rulers_cmd_callback,
view_toggle_guides_cmd_callback,
view_snap_to_guides_cmd_callback,
channel_ops_duplicate_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_brushes_cmd_callback,
dialogs_patterns_cmd_callback,
dialogs_palette_cmd_callback,
dialogs_gradient_editor_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_indexed_palette_cmd_callback,
dialogs_tools_options_cmd_callback,
file_load_by_extension_callback,
file_save_by_extension_callback
};
int i;
if (active_tool){
for (i=0; i<sizeof(ignore)/sizeof(*ignore); i++)
if (entry->callback == ignore[i])
return;
if (active_tool->gdisp_ptr == NULL ||
((GDisplay*)active_tool->gdisp_ptr)->gimage ==
gdisplay_active ()->gimage)
active_tool_control (DESTROY, active_tool->gdisp_ptr);
}
}

74
app/menus.c
View File

@ -29,7 +29,7 @@
#include "procedural_db.h"
#include "scale.h"
#include "tools.h"
#include "gdisplay.h"
static void menus_init (void);
static void menus_foreach (gpointer key,
@ -43,7 +43,8 @@ static gint menus_install_accel (GtkWidget *widget,
static void menus_remove_accel (GtkWidget *widget,
gchar *signal_name,
gchar *path);
static void menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry);
static GtkMenuEntry menu_items[] =
{
@ -297,6 +298,9 @@ menus_create (GtkMenuEntry *entries,
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "remove_accelerator",
(GtkSignalFunc) menus_remove_accel,
entries[i].path);
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "activate",
(GtkSignalFunc) menus_activate_callback,
&entries[i]);
}
}
@ -480,3 +484,69 @@ menus_remove_accel (GtkWidget *widget,
g_hash_table_insert (entry_ht, path, g_strdup (""));
}
}
static void
menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry)
{
/* These are the functions upon which we won't destroy the
tool... "safe", so to say. All the others are expected to alter
the image, so the tool must be destroyed */
const GtkMenuCallback ignore[]={
image_posterize_cmd_callback,
image_threshold_cmd_callback,
image_color_balance_cmd_callback,
image_brightness_contrast_cmd_callback,
image_hue_saturation_cmd_callback,
image_curves_cmd_callback,
image_levels_cmd_callback,
image_histogram_cmd_callback,
tools_select_cmd_callback,
about_dialog_cmd_callback,
tips_dialog_cmd_callback,
file_new_cmd_callback,
file_open_cmd_callback,
file_save_cmd_callback,
file_save_as_cmd_callback,
file_pref_cmd_callback,
file_close_cmd_callback,
file_quit_cmd_callback,
view_zoomin_cmd_callback,
view_zoomout_cmd_callback,
view_zoom_16_1_callback,
view_zoom_8_1_callback,
view_zoom_4_1_callback,
view_zoom_2_1_callback,
view_zoom_1_1_callback,
view_zoom_1_2_callback,
view_zoom_1_4_callback,
view_zoom_1_8_callback,
view_zoom_1_16_callback,
view_window_info_cmd_callback,
view_toggle_rulers_cmd_callback,
view_toggle_guides_cmd_callback,
view_snap_to_guides_cmd_callback,
channel_ops_duplicate_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_brushes_cmd_callback,
dialogs_patterns_cmd_callback,
dialogs_palette_cmd_callback,
dialogs_gradient_editor_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_indexed_palette_cmd_callback,
dialogs_tools_options_cmd_callback,
file_load_by_extension_callback,
file_save_by_extension_callback
};
int i;
if (active_tool){
for (i=0; i<sizeof(ignore)/sizeof(*ignore); i++)
if (entry->callback == ignore[i])
return;
if (active_tool->gdisp_ptr == NULL ||
((GDisplay*)active_tool->gdisp_ptr)->gimage ==
gdisplay_active ()->gimage)
active_tool_control (DESTROY, active_tool->gdisp_ptr);
}
}

74
app/menus/menus.c
View File

@ -29,7 +29,7 @@
#include "procedural_db.h"
#include "scale.h"
#include "tools.h"
#include "gdisplay.h"
static void menus_init (void);
static void menus_foreach (gpointer key,
@ -43,7 +43,8 @@ static gint menus_install_accel (GtkWidget *widget,
static void menus_remove_accel (GtkWidget *widget,
gchar *signal_name,
gchar *path);
static void menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry);
static GtkMenuEntry menu_items[] =
{
@ -297,6 +298,9 @@ menus_create (GtkMenuEntry *entries,
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "remove_accelerator",
(GtkSignalFunc) menus_remove_accel,
entries[i].path);
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "activate",
(GtkSignalFunc) menus_activate_callback,
&entries[i]);
}
}
@ -480,3 +484,69 @@ menus_remove_accel (GtkWidget *widget,
g_hash_table_insert (entry_ht, path, g_strdup (""));
}
}
static void
menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry)
{
/* These are the functions upon which we won't destroy the
tool... "safe", so to say. All the others are expected to alter
the image, so the tool must be destroyed */
const GtkMenuCallback ignore[]={
image_posterize_cmd_callback,
image_threshold_cmd_callback,
image_color_balance_cmd_callback,
image_brightness_contrast_cmd_callback,
image_hue_saturation_cmd_callback,
image_curves_cmd_callback,
image_levels_cmd_callback,
image_histogram_cmd_callback,
tools_select_cmd_callback,
about_dialog_cmd_callback,
tips_dialog_cmd_callback,
file_new_cmd_callback,
file_open_cmd_callback,
file_save_cmd_callback,
file_save_as_cmd_callback,
file_pref_cmd_callback,
file_close_cmd_callback,
file_quit_cmd_callback,
view_zoomin_cmd_callback,
view_zoomout_cmd_callback,
view_zoom_16_1_callback,
view_zoom_8_1_callback,
view_zoom_4_1_callback,
view_zoom_2_1_callback,
view_zoom_1_1_callback,
view_zoom_1_2_callback,
view_zoom_1_4_callback,
view_zoom_1_8_callback,
view_zoom_1_16_callback,
view_window_info_cmd_callback,
view_toggle_rulers_cmd_callback,
view_toggle_guides_cmd_callback,
view_snap_to_guides_cmd_callback,
channel_ops_duplicate_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_brushes_cmd_callback,
dialogs_patterns_cmd_callback,
dialogs_palette_cmd_callback,
dialogs_gradient_editor_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_indexed_palette_cmd_callback,
dialogs_tools_options_cmd_callback,
file_load_by_extension_callback,
file_save_by_extension_callback
};
int i;
if (active_tool){
for (i=0; i<sizeof(ignore)/sizeof(*ignore); i++)
if (entry->callback == ignore[i])
return;
if (active_tool->gdisp_ptr == NULL ||
((GDisplay*)active_tool->gdisp_ptr)->gimage ==
gdisplay_active ()->gimage)
active_tool_control (DESTROY, active_tool->gdisp_ptr);
}
}

74
app/widgets/gimpitemfactory.c
View File

@ -29,7 +29,7 @@
#include "procedural_db.h"
#include "scale.h"
#include "tools.h"
#include "gdisplay.h"
static void menus_init (void);
static void menus_foreach (gpointer key,
@ -43,7 +43,8 @@ static gint menus_install_accel (GtkWidget *widget,
static void menus_remove_accel (GtkWidget *widget,
gchar *signal_name,
gchar *path);
static void menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry);
static GtkMenuEntry menu_items[] =
{
@ -297,6 +298,9 @@ menus_create (GtkMenuEntry *entries,
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "remove_accelerator",
(GtkSignalFunc) menus_remove_accel,
entries[i].path);
gtk_signal_connect (GTK_OBJECT (entries[i].widget), "activate",
(GtkSignalFunc) menus_activate_callback,
&entries[i]);
}
}
@ -480,3 +484,69 @@ menus_remove_accel (GtkWidget *widget,
g_hash_table_insert (entry_ht, path, g_strdup (""));
}
}
static void
menus_activate_callback (GtkWidget *widget,
GtkMenuEntry *entry)
{
/* These are the functions upon which we won't destroy the
tool... "safe", so to say. All the others are expected to alter
the image, so the tool must be destroyed */
const GtkMenuCallback ignore[]={
image_posterize_cmd_callback,
image_threshold_cmd_callback,
image_color_balance_cmd_callback,
image_brightness_contrast_cmd_callback,
image_hue_saturation_cmd_callback,
image_curves_cmd_callback,
image_levels_cmd_callback,
image_histogram_cmd_callback,
tools_select_cmd_callback,
about_dialog_cmd_callback,
tips_dialog_cmd_callback,
file_new_cmd_callback,
file_open_cmd_callback,
file_save_cmd_callback,
file_save_as_cmd_callback,
file_pref_cmd_callback,
file_close_cmd_callback,
file_quit_cmd_callback,
view_zoomin_cmd_callback,
view_zoomout_cmd_callback,
view_zoom_16_1_callback,
view_zoom_8_1_callback,
view_zoom_4_1_callback,
view_zoom_2_1_callback,
view_zoom_1_1_callback,
view_zoom_1_2_callback,
view_zoom_1_4_callback,
view_zoom_1_8_callback,
view_zoom_1_16_callback,
view_window_info_cmd_callback,
view_toggle_rulers_cmd_callback,
view_toggle_guides_cmd_callback,
view_snap_to_guides_cmd_callback,
channel_ops_duplicate_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_brushes_cmd_callback,
dialogs_patterns_cmd_callback,
dialogs_palette_cmd_callback,
dialogs_gradient_editor_cmd_callback,
dialogs_lc_cmd_callback,
dialogs_indexed_palette_cmd_callback,
dialogs_tools_options_cmd_callback,
file_load_by_extension_callback,
file_save_by_extension_callback
};
int i;
if (active_tool){
for (i=0; i<sizeof(ignore)/sizeof(*ignore); i++)
if (entry->callback == ignore[i])
return;
if (active_tool->gdisp_ptr == NULL ||
((GDisplay*)active_tool->gdisp_ptr)->gimage ==
gdisplay_active ()->gimage)
active_tool_control (DESTROY, active_tool->gdisp_ptr);
}
}

5
plug-ins/colorify/.cvsignore Normal file
View File

@ -0,0 +1,5 @@
Makefile.in
Makefile
.deps
_libs
colorify

5
plug-ins/glasstile/.cvsignore Normal file
View File

@ -0,0 +1,5 @@
Makefile.in
Makefile
.deps
_libs
glasstile

5
plug-ins/illusion/.cvsignore Normal file
View File

@ -0,0 +1,5 @@
Makefile.in
Makefile
.deps
_libs
illusion

5
plug-ins/papertile/.cvsignore Normal file
View File

@ -0,0 +1,5 @@
Makefile.in
Makefile
.deps
_libs
papertile