From 5fc0b8a9c0e4101a0d6c5df20bd4986b09ef94d2 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 9 Mar 2000 19:45:52 +0000 Subject: [PATCH] moved Undo History into the Edit menu next to Undo and Redo --Sven --- ChangeLog | 6 ++++++ app/actions/help-commands.c | 38 +++++++++++++++++------------------ app/actions/help-commands.h | 2 +- app/commands.c | 38 +++++++++++++++++------------------ app/commands.h | 2 +- app/gui/commands.c | 38 +++++++++++++++++------------------ app/gui/commands.h | 2 +- app/gui/help-commands.c | 38 +++++++++++++++++------------------ app/gui/help-commands.h | 2 +- app/gui/menus.c | 6 ++++-- app/menus.c | 6 ++++-- app/menus/menus.c | 6 ++++-- app/widgets/gimpitemfactory.c | 6 ++++-- 13 files changed, 102 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23a092184a..05bc0e52e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 9 20:45:13 CET 2000 Sven Neumann + + * app/commands.[ch] + * app/menus.c: moved Undo History into the Edit menu next to Undo + and Redo. The View menu should only hold stuff affecting the View. + Thu Mar 9 12:51:21 CET 2000 Stanislav Brabec * plug-ins/gap/gap_decode_xanim.c diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c index 4b97740acc..677c931d0f 100644 --- a/app/actions/help-commands.c +++ b/app/actions/help-commands.c @@ -158,6 +158,25 @@ edit_redo_cmd_callback (GtkWidget *widget, undo_redo (gdisp->gimage); } +void +edit_undo_history_cmd_callback (GtkWidget *widget, + gpointer client_data) +{ + GDisplay *gdisp; + GImage *gimage; + return_if_no_display (gdisp); + + gimage = gdisp->gimage; + + if (!gimage->undo_history) + gimage->undo_history = undo_history_new (gimage); + + if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) + gtk_widget_show (gimage->undo_history); + else + gdk_window_raise (gimage->undo_history->window); +} + void edit_cut_cmd_callback (GtkWidget *widget, gpointer client_data) @@ -592,25 +611,6 @@ view_nav_window_cmd_callback (GtkWidget *widget, } } -void -view_undo_history_cmd_callback (GtkWidget *widget, - gpointer client_data) -{ - GDisplay *gdisp; - GImage *gimage; - return_if_no_display (gdisp); - - gimage = gdisp->gimage; - - if (!gimage->undo_history) - gimage->undo_history = undo_history_new (gimage); - - if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) - gtk_widget_show (gimage->undo_history); - else - gdk_window_raise (gimage->undo_history->window); -} - void view_toggle_selection_cmd_callback (GtkWidget *widget, gpointer client_data) diff --git a/app/actions/help-commands.h b/app/actions/help-commands.h index 977b962617..83832e7587 100644 --- a/app/actions/help-commands.h +++ b/app/actions/help-commands.h @@ -31,6 +31,7 @@ void file_quit_cmd_callback (GtkWidget *, gpointer); void edit_undo_cmd_callback (GtkWidget *, gpointer); void edit_redo_cmd_callback (GtkWidget *, gpointer); +void edit_undo_history_cmd_callback (GtkWidget *, gpointer); void edit_cut_cmd_callback (GtkWidget *, gpointer); void edit_copy_cmd_callback (GtkWidget *, gpointer); void edit_paste_cmd_callback (GtkWidget *, gpointer); @@ -68,7 +69,6 @@ void view_zoom_1_16_cmd_callback (GtkWidget *, gpointer); void view_dot_for_dot_cmd_callback (GtkWidget *, gpointer); void view_info_window_cmd_callback (GtkWidget *, gpointer); void view_nav_window_cmd_callback (GtkWidget *, gpointer); -void view_undo_history_cmd_callback (GtkWidget *, gpointer); void view_toggle_selection_cmd_callback (GtkWidget *, gpointer); void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer); void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer); diff --git a/app/commands.c b/app/commands.c index 4b97740acc..677c931d0f 100644 --- a/app/commands.c +++ b/app/commands.c @@ -158,6 +158,25 @@ edit_redo_cmd_callback (GtkWidget *widget, undo_redo (gdisp->gimage); } +void +edit_undo_history_cmd_callback (GtkWidget *widget, + gpointer client_data) +{ + GDisplay *gdisp; + GImage *gimage; + return_if_no_display (gdisp); + + gimage = gdisp->gimage; + + if (!gimage->undo_history) + gimage->undo_history = undo_history_new (gimage); + + if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) + gtk_widget_show (gimage->undo_history); + else + gdk_window_raise (gimage->undo_history->window); +} + void edit_cut_cmd_callback (GtkWidget *widget, gpointer client_data) @@ -592,25 +611,6 @@ view_nav_window_cmd_callback (GtkWidget *widget, } } -void -view_undo_history_cmd_callback (GtkWidget *widget, - gpointer client_data) -{ - GDisplay *gdisp; - GImage *gimage; - return_if_no_display (gdisp); - - gimage = gdisp->gimage; - - if (!gimage->undo_history) - gimage->undo_history = undo_history_new (gimage); - - if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) - gtk_widget_show (gimage->undo_history); - else - gdk_window_raise (gimage->undo_history->window); -} - void view_toggle_selection_cmd_callback (GtkWidget *widget, gpointer client_data) diff --git a/app/commands.h b/app/commands.h index 977b962617..83832e7587 100644 --- a/app/commands.h +++ b/app/commands.h @@ -31,6 +31,7 @@ void file_quit_cmd_callback (GtkWidget *, gpointer); void edit_undo_cmd_callback (GtkWidget *, gpointer); void edit_redo_cmd_callback (GtkWidget *, gpointer); +void edit_undo_history_cmd_callback (GtkWidget *, gpointer); void edit_cut_cmd_callback (GtkWidget *, gpointer); void edit_copy_cmd_callback (GtkWidget *, gpointer); void edit_paste_cmd_callback (GtkWidget *, gpointer); @@ -68,7 +69,6 @@ void view_zoom_1_16_cmd_callback (GtkWidget *, gpointer); void view_dot_for_dot_cmd_callback (GtkWidget *, gpointer); void view_info_window_cmd_callback (GtkWidget *, gpointer); void view_nav_window_cmd_callback (GtkWidget *, gpointer); -void view_undo_history_cmd_callback (GtkWidget *, gpointer); void view_toggle_selection_cmd_callback (GtkWidget *, gpointer); void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer); void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer); diff --git a/app/gui/commands.c b/app/gui/commands.c index 4b97740acc..677c931d0f 100644 --- a/app/gui/commands.c +++ b/app/gui/commands.c @@ -158,6 +158,25 @@ edit_redo_cmd_callback (GtkWidget *widget, undo_redo (gdisp->gimage); } +void +edit_undo_history_cmd_callback (GtkWidget *widget, + gpointer client_data) +{ + GDisplay *gdisp; + GImage *gimage; + return_if_no_display (gdisp); + + gimage = gdisp->gimage; + + if (!gimage->undo_history) + gimage->undo_history = undo_history_new (gimage); + + if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) + gtk_widget_show (gimage->undo_history); + else + gdk_window_raise (gimage->undo_history->window); +} + void edit_cut_cmd_callback (GtkWidget *widget, gpointer client_data) @@ -592,25 +611,6 @@ view_nav_window_cmd_callback (GtkWidget *widget, } } -void -view_undo_history_cmd_callback (GtkWidget *widget, - gpointer client_data) -{ - GDisplay *gdisp; - GImage *gimage; - return_if_no_display (gdisp); - - gimage = gdisp->gimage; - - if (!gimage->undo_history) - gimage->undo_history = undo_history_new (gimage); - - if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) - gtk_widget_show (gimage->undo_history); - else - gdk_window_raise (gimage->undo_history->window); -} - void view_toggle_selection_cmd_callback (GtkWidget *widget, gpointer client_data) diff --git a/app/gui/commands.h b/app/gui/commands.h index 977b962617..83832e7587 100644 --- a/app/gui/commands.h +++ b/app/gui/commands.h @@ -31,6 +31,7 @@ void file_quit_cmd_callback (GtkWidget *, gpointer); void edit_undo_cmd_callback (GtkWidget *, gpointer); void edit_redo_cmd_callback (GtkWidget *, gpointer); +void edit_undo_history_cmd_callback (GtkWidget *, gpointer); void edit_cut_cmd_callback (GtkWidget *, gpointer); void edit_copy_cmd_callback (GtkWidget *, gpointer); void edit_paste_cmd_callback (GtkWidget *, gpointer); @@ -68,7 +69,6 @@ void view_zoom_1_16_cmd_callback (GtkWidget *, gpointer); void view_dot_for_dot_cmd_callback (GtkWidget *, gpointer); void view_info_window_cmd_callback (GtkWidget *, gpointer); void view_nav_window_cmd_callback (GtkWidget *, gpointer); -void view_undo_history_cmd_callback (GtkWidget *, gpointer); void view_toggle_selection_cmd_callback (GtkWidget *, gpointer); void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer); void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer); diff --git a/app/gui/help-commands.c b/app/gui/help-commands.c index 4b97740acc..677c931d0f 100644 --- a/app/gui/help-commands.c +++ b/app/gui/help-commands.c @@ -158,6 +158,25 @@ edit_redo_cmd_callback (GtkWidget *widget, undo_redo (gdisp->gimage); } +void +edit_undo_history_cmd_callback (GtkWidget *widget, + gpointer client_data) +{ + GDisplay *gdisp; + GImage *gimage; + return_if_no_display (gdisp); + + gimage = gdisp->gimage; + + if (!gimage->undo_history) + gimage->undo_history = undo_history_new (gimage); + + if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) + gtk_widget_show (gimage->undo_history); + else + gdk_window_raise (gimage->undo_history->window); +} + void edit_cut_cmd_callback (GtkWidget *widget, gpointer client_data) @@ -592,25 +611,6 @@ view_nav_window_cmd_callback (GtkWidget *widget, } } -void -view_undo_history_cmd_callback (GtkWidget *widget, - gpointer client_data) -{ - GDisplay *gdisp; - GImage *gimage; - return_if_no_display (gdisp); - - gimage = gdisp->gimage; - - if (!gimage->undo_history) - gimage->undo_history = undo_history_new (gimage); - - if (!GTK_WIDGET_VISIBLE (gimage->undo_history)) - gtk_widget_show (gimage->undo_history); - else - gdk_window_raise (gimage->undo_history->window); -} - void view_toggle_selection_cmd_callback (GtkWidget *widget, gpointer client_data) diff --git a/app/gui/help-commands.h b/app/gui/help-commands.h index 977b962617..83832e7587 100644 --- a/app/gui/help-commands.h +++ b/app/gui/help-commands.h @@ -31,6 +31,7 @@ void file_quit_cmd_callback (GtkWidget *, gpointer); void edit_undo_cmd_callback (GtkWidget *, gpointer); void edit_redo_cmd_callback (GtkWidget *, gpointer); +void edit_undo_history_cmd_callback (GtkWidget *, gpointer); void edit_cut_cmd_callback (GtkWidget *, gpointer); void edit_copy_cmd_callback (GtkWidget *, gpointer); void edit_paste_cmd_callback (GtkWidget *, gpointer); @@ -68,7 +69,6 @@ void view_zoom_1_16_cmd_callback (GtkWidget *, gpointer); void view_dot_for_dot_cmd_callback (GtkWidget *, gpointer); void view_info_window_cmd_callback (GtkWidget *, gpointer); void view_nav_window_cmd_callback (GtkWidget *, gpointer); -void view_undo_history_cmd_callback (GtkWidget *, gpointer); void view_toggle_selection_cmd_callback (GtkWidget *, gpointer); void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer); void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer); diff --git a/app/gui/menus.c b/app/gui/menus.c index 66baa05964..2b06720f8a 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -123,6 +123,8 @@ static GimpItemFactoryEntry toolbox_entries[] = { { N_("/File/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, "file/dialogs/indexed_palette.html", NULL }, + { { "/File/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, { { N_("/File/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, "file/dialogs/input_devices.html", NULL }, { { N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, @@ -215,6 +217,8 @@ static GimpItemFactoryEntry image_entries[] = "edit/undo.html", NULL }, { { N_("/Edit/Redo"), "R", edit_redo_cmd_callback, 0 }, "edit/redo.html", NULL }, + { { N_("/Edit/Undo History..."), NULL, edit_undo_history_cmd_callback, 0}, + "edit/dialogs/undo_history.html", NULL }, { { "/Edit/---", NULL, NULL, 0, "" }, NULL, NULL }, @@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] = "view/dialogs/info_window.html", NULL }, { { N_("/View/Nav. Window..."), "N", view_nav_window_cmd_callback, 0 }, "view/dialogs/navigation_window.html", NULL }, - { { N_("/View/Undo History..."), NULL, view_undo_history_cmd_callback, 0}, - "view/dialogs/undo_history.html", NULL }, { { "/View/---", NULL, NULL, 0, "" }, NULL, NULL }, diff --git a/app/menus.c b/app/menus.c index 66baa05964..2b06720f8a 100644 --- a/app/menus.c +++ b/app/menus.c @@ -123,6 +123,8 @@ static GimpItemFactoryEntry toolbox_entries[] = { { N_("/File/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, "file/dialogs/indexed_palette.html", NULL }, + { { "/File/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, { { N_("/File/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, "file/dialogs/input_devices.html", NULL }, { { N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, @@ -215,6 +217,8 @@ static GimpItemFactoryEntry image_entries[] = "edit/undo.html", NULL }, { { N_("/Edit/Redo"), "R", edit_redo_cmd_callback, 0 }, "edit/redo.html", NULL }, + { { N_("/Edit/Undo History..."), NULL, edit_undo_history_cmd_callback, 0}, + "edit/dialogs/undo_history.html", NULL }, { { "/Edit/---", NULL, NULL, 0, "" }, NULL, NULL }, @@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] = "view/dialogs/info_window.html", NULL }, { { N_("/View/Nav. Window..."), "N", view_nav_window_cmd_callback, 0 }, "view/dialogs/navigation_window.html", NULL }, - { { N_("/View/Undo History..."), NULL, view_undo_history_cmd_callback, 0}, - "view/dialogs/undo_history.html", NULL }, { { "/View/---", NULL, NULL, 0, "" }, NULL, NULL }, diff --git a/app/menus/menus.c b/app/menus/menus.c index 66baa05964..2b06720f8a 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -123,6 +123,8 @@ static GimpItemFactoryEntry toolbox_entries[] = { { N_("/File/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, "file/dialogs/indexed_palette.html", NULL }, + { { "/File/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, { { N_("/File/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, "file/dialogs/input_devices.html", NULL }, { { N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, @@ -215,6 +217,8 @@ static GimpItemFactoryEntry image_entries[] = "edit/undo.html", NULL }, { { N_("/Edit/Redo"), "R", edit_redo_cmd_callback, 0 }, "edit/redo.html", NULL }, + { { N_("/Edit/Undo History..."), NULL, edit_undo_history_cmd_callback, 0}, + "edit/dialogs/undo_history.html", NULL }, { { "/Edit/---", NULL, NULL, 0, "" }, NULL, NULL }, @@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] = "view/dialogs/info_window.html", NULL }, { { N_("/View/Nav. Window..."), "N", view_nav_window_cmd_callback, 0 }, "view/dialogs/navigation_window.html", NULL }, - { { N_("/View/Undo History..."), NULL, view_undo_history_cmd_callback, 0}, - "view/dialogs/undo_history.html", NULL }, { { "/View/---", NULL, NULL, 0, "" }, NULL, NULL }, diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index 66baa05964..2b06720f8a 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -123,6 +123,8 @@ static GimpItemFactoryEntry toolbox_entries[] = { { N_("/File/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, "file/dialogs/indexed_palette.html", NULL }, + { { "/File/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, { { N_("/File/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, "file/dialogs/input_devices.html", NULL }, { { N_("/File/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, @@ -215,6 +217,8 @@ static GimpItemFactoryEntry image_entries[] = "edit/undo.html", NULL }, { { N_("/Edit/Redo"), "R", edit_redo_cmd_callback, 0 }, "edit/redo.html", NULL }, + { { N_("/Edit/Undo History..."), NULL, edit_undo_history_cmd_callback, 0}, + "edit/dialogs/undo_history.html", NULL }, { { "/Edit/---", NULL, NULL, 0, "" }, NULL, NULL }, @@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] = "view/dialogs/info_window.html", NULL }, { { N_("/View/Nav. Window..."), "N", view_nav_window_cmd_callback, 0 }, "view/dialogs/navigation_window.html", NULL }, - { { N_("/View/Undo History..."), NULL, view_undo_history_cmd_callback, 0}, - "view/dialogs/undo_history.html", NULL }, { { "/View/---", NULL, NULL, 0, "" }, NULL, NULL },