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

Fixed --no-data and -n (that I broke). Gave indexed palette a default height. 

Seth <sjburges@gimp.org>
Modified Files:
 	ChangeLog app/colormap_dialog.i.c app/devices.c
 	app/indicator_area.c app/interface.c
----------------------------------------------------------------------
This commit is contained in:
Seth Burgess 1999-06-18 04:22:19 +00:00
parent fb2d95a20a
commit ef67644a02
13 changed files with 72 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,13 @@
Thu Jun 17 22:30:00 CST 1999 Seth Burgess <sjburges@gimp.org>
* app/colormap_dialog.i.c : set usize on indexed color pallete,
so it has a height when started.
* app/devices.c
* app/indicator_area.c
* app/interface.c: fixed so that --no-data and -n no longer crash
or give ugly warnings on startup. --no-data disables indicators.
Thu Jun 17 22:26:38 MEST 1999 Sven Neumann <sven@gimp.org>
* app/crop.c: default to the old-fashioned behaviour (crop and
@ -76,7 +86,7 @@ Thu Jun 17 22:26:38 MEST 1999 Sven Neumann <sven@gimp.org>
Sun Jun 13 21:05:00 CST 1999 Seth Burgess <sjburges@gimp.org>
* app/devices
* app/devices.c
* app/gimprc.[c,h]
* app/interface.c
* app/preferences_dialog.c: Make the indicator area on the toolbar

4
app/colormap_dialog.i.c
View File

@ -165,6 +165,8 @@ ipal_create (GimpSet* context)
evbox = gtk_event_box_new ();
gtk_container_set_resize_mode (GTK_CONTAINER(evbox),
GTK_RESIZE_QUEUE);
gtk_widget_set_usize(GTK_WIDGET(evbox), -2, 60); /* give it some initial
size */
gtk_signal_connect(GTK_OBJECT(evbox), "size_request",
GTK_SIGNAL_FUNC(window_size_req_cb), ipal);
gtk_signal_connect(GTK_OBJECT(evbox), "size_allocate",
@ -182,7 +184,7 @@ ipal_create (GimpSet* context)
ipal);
gtk_signal_handler_block(GTK_OBJECT(ipal->palette),
ipal->event_handler);
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET(ipal->palette));

15
app/devices.c
View File

@ -1132,7 +1132,7 @@ device_update_brush(GimpBrushP brush,int preview_id)
int yend;
int ystart;
int i, j;
if (no_data || no_interface) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->brushes[preview_id],brush->name,NULL);
@ -1189,7 +1189,7 @@ device_update_pattern(GPatternP pattern,int preview_id)
int yend;
int ystart;
int i, j;
if (no_interface || no_data) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->patterns[preview_id],pattern->name,NULL);
@ -1352,12 +1352,13 @@ device_status_update (guint32 deviceid)
device_update_brush(device_info->brush,i);
gtk_widget_draw (deviceD->brushes[i],NULL);
gtk_widget_show (deviceD->brushes[i]);
/* gtk_widget_draw (deviceD->brushes[i],NULL);
* gtk_widget_show (deviceD->brushes[i]);
*/
device_update_pattern(device_info->pattern,i);
gtk_widget_draw (deviceD->patterns[i],NULL);
gtk_widget_show (deviceD->patterns[i]);
/* gtk_widget_draw (deviceD->patterns[i],NULL);
* gtk_widget_show (deviceD->patterns[i]);
*/
}
}
if (show_indicators) {

2
app/display/gimpdisplayshell-draw.c
View File

@ -550,7 +550,7 @@ create_toolbox ()
/*create_tool_label (vbox);*/
/*create_progress_area (vbox);*/
create_color_area (vbox);
if (show_indicators)
if (show_indicators && (!no_data) )
create_indicator_area (vbox);
gtk_widget_show (window);

2
app/display/gimpdisplayshell.c
View File

@ -550,7 +550,7 @@ create_toolbox ()
/*create_tool_label (vbox);*/
/*create_progress_area (vbox);*/
create_color_area (vbox);
if (show_indicators)
if (show_indicators && (!no_data) )
create_indicator_area (vbox);
gtk_widget_show (window);

15
app/gui/device-status-dialog.c
View File

@ -1132,7 +1132,7 @@ device_update_brush(GimpBrushP brush,int preview_id)
int yend;
int ystart;
int i, j;
if (no_data || no_interface) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->brushes[preview_id],brush->name,NULL);
@ -1189,7 +1189,7 @@ device_update_pattern(GPatternP pattern,int preview_id)
int yend;
int ystart;
int i, j;
if (no_interface || no_data) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->patterns[preview_id],pattern->name,NULL);
@ -1352,12 +1352,13 @@ device_status_update (guint32 deviceid)
device_update_brush(device_info->brush,i);
gtk_widget_draw (deviceD->brushes[i],NULL);
gtk_widget_show (deviceD->brushes[i]);
/* gtk_widget_draw (deviceD->brushes[i],NULL);
* gtk_widget_show (deviceD->brushes[i]);
*/
device_update_pattern(device_info->pattern,i);
gtk_widget_draw (deviceD->patterns[i],NULL);
gtk_widget_show (deviceD->patterns[i]);
/* gtk_widget_draw (deviceD->patterns[i],NULL);
* gtk_widget_show (deviceD->patterns[i]);
*/
}
}
if (show_indicators) {

6
app/gui/indicator-area.c
View File

@ -121,6 +121,7 @@ brush_area_update ()
int ystart;
int i, j;
if (no_data || no_interface) return;
brush = get_active_brush();
if (!brush)
@ -227,8 +228,11 @@ pattern_area_update()
int yend;
int ystart;
int i, j;
GPatternP pattern = NULL;
if (no_data || no_interface) return;
GPatternP pattern = get_active_pattern();
pattern = get_active_pattern();
buffer = g_new (guchar, pattern->mask->width * 3);
pattern_buf = pattern->mask;

15
app/gui/input-dialog.c
View File

@ -1132,7 +1132,7 @@ device_update_brush(GimpBrushP brush,int preview_id)
int yend;
int ystart;
int i, j;
if (no_data || no_interface) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->brushes[preview_id],brush->name,NULL);
@ -1189,7 +1189,7 @@ device_update_pattern(GPatternP pattern,int preview_id)
int yend;
int ystart;
int i, j;
if (no_interface || no_data) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->patterns[preview_id],pattern->name,NULL);
@ -1352,12 +1352,13 @@ device_status_update (guint32 deviceid)
device_update_brush(device_info->brush,i);
gtk_widget_draw (deviceD->brushes[i],NULL);
gtk_widget_show (deviceD->brushes[i]);
/* gtk_widget_draw (deviceD->brushes[i],NULL);
* gtk_widget_show (deviceD->brushes[i]);
*/
device_update_pattern(device_info->pattern,i);
gtk_widget_draw (deviceD->patterns[i],NULL);
gtk_widget_show (deviceD->patterns[i]);
/* gtk_widget_draw (deviceD->patterns[i],NULL);
* gtk_widget_show (deviceD->patterns[i]);
*/
}
}
if (show_indicators) {

6
app/indicator_area.c
View File

@ -121,6 +121,7 @@ brush_area_update ()
int ystart;
int i, j;
if (no_data || no_interface) return;
brush = get_active_brush();
if (!brush)
@ -227,8 +228,11 @@ pattern_area_update()
int yend;
int ystart;
int i, j;
GPatternP pattern = NULL;
if (no_data || no_interface) return;
GPatternP pattern = get_active_pattern();
pattern = get_active_pattern();
buffer = g_new (guchar, pattern->mask->width * 3);
pattern_buf = pattern->mask;

2
app/interface.c
View File

@ -550,7 +550,7 @@ create_toolbox ()
/*create_tool_label (vbox);*/
/*create_progress_area (vbox);*/
create_color_area (vbox);
if (show_indicators)
if (show_indicators && (!no_data) )
create_indicator_area (vbox);
gtk_widget_show (window);

15
app/widgets/gimpdeviceinfo.c
View File

@ -1132,7 +1132,7 @@ device_update_brush(GimpBrushP brush,int preview_id)
int yend;
int ystart;
int i, j;
if (no_data || no_interface) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->brushes[preview_id],brush->name,NULL);
@ -1189,7 +1189,7 @@ device_update_pattern(GPatternP pattern,int preview_id)
int yend;
int ystart;
int i, j;
if (no_interface || no_data) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->patterns[preview_id],pattern->name,NULL);
@ -1352,12 +1352,13 @@ device_status_update (guint32 deviceid)
device_update_brush(device_info->brush,i);
gtk_widget_draw (deviceD->brushes[i],NULL);
gtk_widget_show (deviceD->brushes[i]);
/* gtk_widget_draw (deviceD->brushes[i],NULL);
* gtk_widget_show (deviceD->brushes[i]);
*/
device_update_pattern(device_info->pattern,i);
gtk_widget_draw (deviceD->patterns[i],NULL);
gtk_widget_show (deviceD->patterns[i]);
/* gtk_widget_draw (deviceD->patterns[i],NULL);
* gtk_widget_show (deviceD->patterns[i]);
*/
}
}
if (show_indicators) {

15
app/widgets/gimpdevices.c
View File

@ -1132,7 +1132,7 @@ device_update_brush(GimpBrushP brush,int preview_id)
int yend;
int ystart;
int i, j;
if (no_data || no_interface) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->brushes[preview_id],brush->name,NULL);
@ -1189,7 +1189,7 @@ device_update_pattern(GPatternP pattern,int preview_id)
int yend;
int ystart;
int i, j;
if (no_interface || no_data) return;
/* Set the tip to be the name of the brush */
gtk_tooltips_set_tip(tool_tips,deviceD->patterns[preview_id],pattern->name,NULL);
@ -1352,12 +1352,13 @@ device_status_update (guint32 deviceid)
device_update_brush(device_info->brush,i);
gtk_widget_draw (deviceD->brushes[i],NULL);
gtk_widget_show (deviceD->brushes[i]);
/* gtk_widget_draw (deviceD->brushes[i],NULL);
* gtk_widget_show (deviceD->brushes[i]);
*/
device_update_pattern(device_info->pattern,i);
gtk_widget_draw (deviceD->patterns[i],NULL);
gtk_widget_show (deviceD->patterns[i]);
/* gtk_widget_draw (deviceD->patterns[i],NULL);
* gtk_widget_show (deviceD->patterns[i]);
*/
}
}
if (show_indicators) {

6
app/widgets/gimptoolbox-indicator-area.c
View File

@ -121,6 +121,7 @@ brush_area_update ()
int ystart;
int i, j;
if (no_data || no_interface) return;
brush = get_active_brush();
if (!brush)
@ -227,8 +228,11 @@ pattern_area_update()
int yend;
int ystart;
int i, j;
GPatternP pattern = NULL;
if (no_data || no_interface) return;
GPatternP pattern = get_active_pattern();
pattern = get_active_pattern();
buffer = g_new (guchar, pattern->mask->width * 3);
pattern_buf = pattern->mask;