Move New/Delete Canvas commands from "Edit" to "Canvas" top-level menu.

Bug found by:
Submitted by:
Requested by:	Gordan Gledec
Reviewed by:
Approved by:
Obtained from:

diff --git a/editor.tcl b/editor.tcl
index 85fd7ad2f2c4e795c2376fd3fc794a58ef543530..58c4c620d72762ff1f202d62ac44795bc0602297 100755 (executable)
--- a/editor.tcl
+++ b/editor.tcl
@@ -2020,6 +2020,30 @@ proc refreshCanvasMenu {} {
     global canvas_list curcanvas
 
     .menubar.canvas delete 0 end
+    .menubar.canvas add command -label "New" -command {
+        newCanvas ""
+        set curcanvas [lindex $canvas_list 0]
+        switchCanvas prev
+        set changed 1
+        updateUndoLog
+        refreshCanvasMenu
+    }
+    .menubar.canvas add command -label "Delete" -command {
+        if { [llength $canvas_list] == 1 } {
+            return
+        }
+        foreach obj [.c find withtag node] {
+            selectNode .c $obj
+        }
+        deleteSelection
+        set i [lsearch $canvas_list $curcanvas]
+        switchCanvas next
+        set canvas_list [lreplace $canvas_list $i $i]
+        set changed 1
+        updateUndoLog
+        refreshCanvasMenu
+    }
+    .menubar.canvas add separator
     .menubar.canvas add command -label "Previous" -accelerator "PgUp" \
        -command { switchCanvas prev }
     .menubar.canvas add command -label "Next" -accelerator "PgDown" \

diff --git a/initgui.tcl b/initgui.tcl
index 6d96cc0cd697bbddbf8a61f1e1f470e4127b25fb..8f779ff87dc6661d1255221c599176fe9c30da2e 100755 (executable)
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -164,33 +164,6 @@ bind . <Control-a> {
            selectNode .c $obj
        }
     }
-.menubar.edit add separator
-.menubar.edit add command -label "New canvas" -underline 0 \
-    -command {
-       newCanvas ""
-       set curcanvas [lindex $canvas_list 0]
-       switchCanvas prev
-       set changed 1
-       updateUndoLog
-       refreshCanvasMenu
-    }
-.menubar.edit add command -label "Delete canvas" -underline 0 \
-    -command {
-       if { [llength $canvas_list] == 1 } {
-           return
-       }
-       foreach obj [.c find withtag node] {
-           selectNode .c $obj
-       }
-       deleteSelection
-       set i [lsearch $canvas_list $curcanvas]
-       switchCanvas next
-       set canvas_list [lreplace $canvas_list $i $i]
-       set changed 1
-       updateUndoLog
-       refreshCanvasMenu
-    }
-
 
 
 #