moved Undo History into the Edit menu next to Undo and Redo

--Sven

ChangeLog

@@ -1,3 +1,9 @@
+Thu Mar  9 20:45:13 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* 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  <utx@penguin.cz>
 
 	* plug-ins/gap/gap_decode_xanim.c

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)

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);

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)

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);

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)

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);

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)

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);

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, "<Separator>" },
+    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"), "<control>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, "<Separator>" },
     NULL, NULL },
@@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] =
     "view/dialogs/info_window.html", NULL },
   { { N_("/View/Nav. Window..."), "<control><shift>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, "<Separator>" },
     NULL, NULL },

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, "<Separator>" },
+    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"), "<control>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, "<Separator>" },
     NULL, NULL },
@@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] =
     "view/dialogs/info_window.html", NULL },
   { { N_("/View/Nav. Window..."), "<control><shift>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, "<Separator>" },
     NULL, NULL },

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, "<Separator>" },
+    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"), "<control>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, "<Separator>" },
     NULL, NULL },
@@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] =
     "view/dialogs/info_window.html", NULL },
   { { N_("/View/Nav. Window..."), "<control><shift>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, "<Separator>" },
     NULL, NULL },

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, "<Separator>" },
+    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"), "<control>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, "<Separator>" },
     NULL, NULL },
@@ -316,8 +320,6 @@ static GimpItemFactoryEntry image_entries[] =
     "view/dialogs/info_window.html", NULL },
   { { N_("/View/Nav. Window..."), "<control><shift>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, "<Separator>" },
     NULL, NULL },