callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remember the keyboard shortcut dialog and show it only once.

Browse Source 
2004-07-21  Michael Natterer  <mitch@gimp.org>

	* app/gui/preferences-dialog.c: remember the keyboard shortcut
	dialog and show it only once.

	* app/widgets/gimpactionview.c
	* app/widgets/gimpcellrendereraccel.c: minor cleanups.

	Seems to work pretty well now and thus fixes bug #142922.
This commit is contained in:
Michael Natterer
2004-07-21 11:28:31 +00:00
committed by Michael Natterer
parent e656cdeb68
commit b241a40b43
5 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,13 @@
2004-07-21 Michael Natterer <mitch@gimp.org>
* app/gui/preferences-dialog.c: remember the keyboard shortcut
dialog and show it only once.
* app/widgets/gimpactionview.c
* app/widgets/gimpcellrendereraccel.c: minor cleanups.
Seems to work pretty well now and thus fixes bug #142922.
2004-07-21 Michael Natterer <mitch@gimp.org> 2004-07-21 Michael Natterer <mitch@gimp.org>
* app/core/gimpmarshal.list * app/core/gimpmarshal.list
@ -52,7 +62,7 @@
up the controller mapping dialog. up the controller mapping dialog.
* app/gui/preferences-dialog.c: added a "Configure Keyboard * app/gui/preferences-dialog.c: added a "Configure Keyboard
Shortcuts" button which pops up a GimpControllerView. Work in Shortcuts" button which pops up a GimpActionView. Work in
progress... progress...
2004-07-20 Michael Natterer <mitch@gimp.org> 2004-07-20 Michael Natterer <mitch@gimp.org>

22
app/dialogs/preferences-dialog.c
View File

@ -458,6 +458,13 @@ prefs_input_dialog_able_callback (GtkWidget *widget,
gimp_device_info_changed_by_device (device); gimp_device_info_changed_by_device (device);
} }
static void
prefs_keyboard_shortcuts_destroy (GtkWidget *widget,
GtkWidget *prefs)
{
g_object_set_data (G_OBJECT (prefs), "gimp-keyboard-shortcuts-dialog", NULL);
}
static void static void
prefs_keyboard_shortcuts_dialog (GtkWidget *widget, prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
Gimp *gimp) Gimp *gimp)
@ -466,6 +473,15 @@ prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *view; GtkWidget *view;
dialog = g_object_get_data (G_OBJECT (gtk_widget_get_toplevel (widget)),
"gimp-keyboard-shortcuts-dialog");
if (dialog)
{
gtk_window_present (GTK_WINDOW (dialog));
return;
}
dialog = gimp_dialog_new (_("Configure Keyboard Shortcuts"), dialog = gimp_dialog_new (_("Configure Keyboard Shortcuts"),
"gimp-keyboard-shortcuts-dialog", "gimp-keyboard-shortcuts-dialog",
gtk_widget_get_toplevel (widget), gtk_widget_get_toplevel (widget),
@ -477,9 +493,15 @@ prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
NULL); NULL);
g_object_set_data (G_OBJECT (gtk_widget_get_toplevel (widget)),
"gimp-keyboard-shortcuts-dialog", dialog);
g_signal_connect (dialog, "response", g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy), G_CALLBACK (gtk_widget_destroy),
NULL); NULL);
g_signal_connect_object (dialog, "destroy",
G_CALLBACK (prefs_keyboard_shortcuts_destroy),
gtk_widget_get_toplevel (widget), 0);
scrolled_window = gtk_scrolled_window_new (NULL, NULL); scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),

22
app/gui/preferences-dialog.c
View File

@ -458,6 +458,13 @@ prefs_input_dialog_able_callback (GtkWidget *widget,
gimp_device_info_changed_by_device (device); gimp_device_info_changed_by_device (device);
} }
static void
prefs_keyboard_shortcuts_destroy (GtkWidget *widget,
GtkWidget *prefs)
{
g_object_set_data (G_OBJECT (prefs), "gimp-keyboard-shortcuts-dialog", NULL);
}
static void static void
prefs_keyboard_shortcuts_dialog (GtkWidget *widget, prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
Gimp *gimp) Gimp *gimp)
@ -466,6 +473,15 @@ prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *view; GtkWidget *view;
dialog = g_object_get_data (G_OBJECT (gtk_widget_get_toplevel (widget)),
"gimp-keyboard-shortcuts-dialog");
if (dialog)
{
gtk_window_present (GTK_WINDOW (dialog));
return;
}
dialog = gimp_dialog_new (_("Configure Keyboard Shortcuts"), dialog = gimp_dialog_new (_("Configure Keyboard Shortcuts"),
"gimp-keyboard-shortcuts-dialog", "gimp-keyboard-shortcuts-dialog",
gtk_widget_get_toplevel (widget), gtk_widget_get_toplevel (widget),
@ -477,9 +493,15 @@ prefs_keyboard_shortcuts_dialog (GtkWidget *widget,
NULL); NULL);
g_object_set_data (G_OBJECT (gtk_widget_get_toplevel (widget)),
"gimp-keyboard-shortcuts-dialog", dialog);
g_signal_connect (dialog, "response", g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy), G_CALLBACK (gtk_widget_destroy),
NULL); NULL);
g_signal_connect_object (dialog, "destroy",
G_CALLBACK (prefs_keyboard_shortcuts_destroy),
gtk_widget_get_toplevel (widget), 0);
scrolled_window = gtk_scrolled_window_new (NULL, NULL); scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),

4
app/widgets/gimpactionview.c
View File

@ -554,7 +554,7 @@ gimp_action_view_accel_edited (GimpCellRendererAccel *accel,
confirm_data->accel_mask = accel_mask; confirm_data->accel_mask = accel_mask;
query_box = query_box =
gimp_query_boolean_box (_("Conflicting shortcuts"), gimp_query_boolean_box (_("Conflicting Shortcuts"),
gtk_widget_get_toplevel (GTK_WIDGET (view)), gtk_widget_get_toplevel (GTK_WIDGET (view)),
gimp_standard_help_func, gimp_standard_help_func,
NULL, NULL,
@ -562,7 +562,7 @@ gimp_action_view_accel_edited (GimpCellRendererAccel *accel,
message, message,
_("Delete Old Shortcut"), _("Delete Old Shortcut"),
GTK_STOCK_CANCEL, GTK_STOCK_CANCEL,
G_OBJECT (view), "unmap", G_OBJECT (view), "destroy",
gimp_action_view_accel_confirm, gimp_action_view_accel_confirm,
confirm_data); confirm_data);

2
app/widgets/gimpcellrendereraccel.c
View File

@ -375,7 +375,7 @@ pointless_eventbox_subclass_get_type (void)
sizeof (GtkEventBoxClass), sizeof (GtkEventBoxClass),
NULL, /* base_init */ NULL, /* base_init */
NULL, /* base_finalize */ NULL, /* base_finalize */
NULL, NULL, /* class_init */
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkEventBox), sizeof (GtkEventBox),