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

renamed info_dialog_popdown() to info_dialog_hide() and 

2004-01-21  Michael Natterer  <mitch@gimp.org>

	* app/gui/info-dialog.[ch]: renamed info_dialog_popdown() to
	info_dialog_hide() and info_dialog_popup() to info_dialog_present().
	Added info_dialog_show() which just shows the dialog without
	calling gtk_window_present().

	* app/gui/info-window.c
	* app/gui/view-commands.c
	* app/tools/gimptransformtool.c: changed accordingly.

	* app/tools/gimpcroptool.c
	* app/tools/gimpperspectivetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c: use info_dialog_show() so the dialog
	doesn't grab the focus away from the canvas. Fixes bug #132041.
This commit is contained in:
Michael Natterer 2004-01-21 11:16:57 +00:00 committed by Michael Natterer
parent 6861a68130
commit 73d258eb3d
15 changed files with 63 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2004-01-21 Michael Natterer <mitch@gimp.org>
* app/gui/info-dialog.[ch]: renamed info_dialog_popdown() to
info_dialog_hide() and info_dialog_popup() to info_dialog_present().
Added info_dialog_show() which just shows the dialog without
calling gtk_window_present().
* app/gui/info-window.c
* app/gui/view-commands.c
* app/tools/gimptransformtool.c: changed accordingly.
* app/tools/gimpcroptool.c
* app/tools/gimpperspectivetool.c
* app/tools/gimprotatetool.c
* app/tools/gimpscaletool.c
* app/tools/gimpsheartool.c: use info_dialog_show() so the dialog
doesn't grab the focus away from the canvas. Fixes bug #132041.
2004-01-21 Simon Budig <simon@gimp.org>
* app/core/gimpscanconvert.c: removed the call to

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

@ -173,7 +173,7 @@ view_info_window_cmd_callback (GtkWidget *widget,
if (! shell->info_dialog)
shell->info_dialog = info_window_create (gdisp);
info_dialog_popup (shell->info_dialog);
info_dialog_present (shell->info_dialog);
}
else
{

15
app/dialogs/info-dialog.c
View File

@ -106,7 +106,18 @@ info_dialog_free (InfoDialog *idialog)
}
void
info_dialog_popup (InfoDialog *idialog)
info_dialog_show (InfoDialog *idialog)
{
g_return_if_fail (idialog != NULL);
if (GTK_WIDGET_VISIBLE (idialog->shell))
gdk_window_show (idialog->shell->window);
else
gtk_widget_show (idialog->shell);
}
void
info_dialog_present (InfoDialog *idialog)
{
g_return_if_fail (idialog != NULL);
@ -114,7 +125,7 @@ info_dialog_popup (InfoDialog *idialog)
}
void
info_dialog_popdown (InfoDialog *idialog)
info_dialog_hide (InfoDialog *idialog)
{
g_return_if_fail (idialog != NULL);

5
app/dialogs/info-dialog.h
View File

@ -75,8 +75,9 @@ InfoDialog *info_dialog_notebook_new (GimpViewable *viewable,
gpointer help_data);
void info_dialog_free (InfoDialog *idialog);
void info_dialog_popup (InfoDialog *idialog);
void info_dialog_popdown (InfoDialog *idialog);
void info_dialog_show (InfoDialog *idialog);
void info_dialog_present (InfoDialog *idialog);
void info_dialog_hide (InfoDialog *idialog);
void info_dialog_update (InfoDialog *idialog);

4
app/dialogs/info-window.c
View File

@ -95,7 +95,7 @@ info_window_response (GtkWidget *widget,
gint response_id,
InfoDialog *info_win)
{
info_dialog_popdown (info_win);
info_dialog_hide (info_win);
}
static void
@ -331,7 +331,7 @@ info_window_follow_auto (Gimp *gimp)
info_window_update (gdisp);
}
info_dialog_popup (info_window_auto);
info_dialog_present (info_window_auto);
}

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

@ -106,7 +106,18 @@ info_dialog_free (InfoDialog *idialog)
}
void
info_dialog_popup (InfoDialog *idialog)
info_dialog_show (InfoDialog *idialog)
{
g_return_if_fail (idialog != NULL);
if (GTK_WIDGET_VISIBLE (idialog->shell))
gdk_window_show (idialog->shell->window);
else
gtk_widget_show (idialog->shell);
}
void
info_dialog_present (InfoDialog *idialog)
{
g_return_if_fail (idialog != NULL);
@ -114,7 +125,7 @@ info_dialog_popup (InfoDialog *idialog)
}
void
info_dialog_popdown (InfoDialog *idialog)
info_dialog_hide (InfoDialog *idialog)
{
g_return_if_fail (idialog != NULL);

5
app/gui/info-dialog.h
View File

@ -75,8 +75,9 @@ InfoDialog *info_dialog_notebook_new (GimpViewable *viewable,
gpointer help_data);
void info_dialog_free (InfoDialog *idialog);
void info_dialog_popup (InfoDialog *idialog);
void info_dialog_popdown (InfoDialog *idialog);
void info_dialog_show (InfoDialog *idialog);
void info_dialog_present (InfoDialog *idialog);
void info_dialog_hide (InfoDialog *idialog);
void info_dialog_update (InfoDialog *idialog);

4
app/gui/info-window.c
View File

@ -95,7 +95,7 @@ info_window_response (GtkWidget *widget,
gint response_id,
InfoDialog *info_win)
{
info_dialog_popdown (info_win);
info_dialog_hide (info_win);
}
static void
@ -331,7 +331,7 @@ info_window_follow_auto (Gimp *gimp)
info_window_update (gdisp);
}
info_dialog_popup (info_window_auto);
info_dialog_present (info_window_auto);
}

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

@ -173,7 +173,7 @@ view_info_window_cmd_callback (GtkWidget *widget,
if (! shell->info_dialog)
shell->info_dialog = info_window_create (gdisp);
info_dialog_popup (shell->info_dialog);
info_dialog_present (shell->info_dialog);
}
else
{

4
app/tools/gimpcroptool.c
View File

@ -1055,7 +1055,7 @@ crop_info_update (GimpCropTool *crop)
crop->size_vals[1] = crop->y2 - crop->y1;
info_dialog_update (crop->crop_info);
info_dialog_popup (crop->crop_info);
info_dialog_show (crop->crop_info);
}
static void
@ -1070,7 +1070,7 @@ crop_response (GtkWidget *widget,
options = GIMP_CROP_OPTIONS (tool->tool_info->tool_options);
if (crop->crop_info)
info_dialog_popdown (crop->crop_info);
info_dialog_hide (crop->crop_info);
switch (response_id)
{

2
app/tools/gimpperspectivetool.c
View File

@ -254,5 +254,5 @@ perspective_info_update (GimpTransformTool *tr_tool)
}
info_dialog_update (tr_tool->info_dialog);
info_dialog_popup (tr_tool->info_dialog);
info_dialog_show (tr_tool->info_dialog);
}

2
app/tools/gimprotatetool.c
View File

@ -356,7 +356,7 @@ rotate_info_update (GimpTransformTool *tr_tool)
center_vals[1] = tr_tool->trans_info[CENTER_Y];
info_dialog_update (tr_tool->info_dialog);
info_dialog_popup (tr_tool->info_dialog);
info_dialog_show (tr_tool->info_dialog);
}
static void

2
app/tools/gimpscaletool.c
View File

@ -471,7 +471,7 @@ gimp_scale_tool_info_update (GimpTransformTool *tr_tool)
g_snprintf (y_ratio_buf, sizeof (y_ratio_buf), "%0.2f", ratio_y);
info_dialog_update (tr_tool->info_dialog);
info_dialog_popup (tr_tool->info_dialog);
info_dialog_show (tr_tool->info_dialog);
}
static void

2
app/tools/gimpsheartool.c
View File

@ -299,7 +299,7 @@ shear_info_update (GimpTransformTool *tr_tool)
yshear_val = tr_tool->trans_info[YSHEAR];
info_dialog_update (tr_tool->info_dialog);
info_dialog_popup (tr_tool->info_dialog);
info_dialog_show (tr_tool->info_dialog);
}
static void

2
app/tools/gimptransformtool.c
View File

@ -1099,7 +1099,7 @@ gimp_transform_tool_halt (GimpTransformTool *tr_tool)
gimp_draw_tool_stop (GIMP_DRAW_TOOL (tr_tool));
if (tr_tool->info_dialog)
info_dialog_popdown (tr_tool->info_dialog);
info_dialog_hide (tr_tool->info_dialog);
tool->gdisp = NULL;
tool->drawable = NULL;