Removed one level in View menu (Show).

Added "focus -force ." - needed on MS Windows

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

diff --git a/initgui.tcl b/initgui.tcl
index 04a6b909e395371673a740c7076ce183fca49e26..dee9b1bfe35b2648f84d0019c9854c0092cf1410 100755 (executable)
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -287,20 +287,17 @@ menu .menubar.tools -tearoff 0
 # View
 #
 menu .menubar.view -tearoff 0
-.menubar.view add cascade -label "Show" -underline 0 \
-    -menu .menubar.view.show
-menu .menubar.view.show -tearoff 0
-.menubar.view.show add checkbutton -label "Interface Names" \
-    -underline 0 -variable showIfNames \
+.menubar.view add checkbutton -label "Show Interface Names" \
+    -underline 5 -variable showIfNames \
     -command { redrawAllLinks }
-.menubar.view.show add checkbutton -label "IPv4 Addresses " \
-    -underline 3 -variable showIfIPaddrs \
+.menubar.view add checkbutton -label "Show IPv4 Addresses " \
+    -underline 8 -variable showIfIPaddrs \
     -command { redrawAllLinks }
-.menubar.view.show add checkbutton -label "IPv6 Addresses " \
-    -underline 3 -variable showIfIPv6addrs \
+.menubar.view add checkbutton -label "Show IPv6 Addresses " \
+    -underline 8 -variable showIfIPv6addrs \
     -command { redrawAllLinks }
-.menubar.view.show add checkbutton -label "Node Labels" \
-    -underline 0 -variable showNodeLabels -command {
+.menubar.view add checkbutton -label "Show Node Labels" \
+    -underline 5 -variable showNodeLabels -command {
     foreach object [.c find withtag nodelabel] {
        if { $showNodeLabels } {
            .c itemconfigure $object -state normal
@@ -309,8 +306,8 @@ menu .menubar.view.show -tearoff 0
        }
     }
 }
-.menubar.view.show add checkbutton -label "Link Labels" \
-    -underline 0 -variable showLinkLabels -command {
+.menubar.view add checkbutton -label "Show Link Labels" \
+    -underline 5 -variable showLinkLabels -command {
     foreach object [.c find withtag linklabel] {
        if { $showLinkLabels } {
            .c itemconfigure $object -state normal
@@ -319,8 +316,9 @@ menu .menubar.view.show -tearoff 0
        }
     }
 }
-.menubar.view.show add separator
-.menubar.view.show add command -label "Show All" \
+.menubar.view add separator
+.menubar.view add command -label "Show All" \
+    -underline 5 \
     -command {
        set showIfNames 1
        set showIfIPaddrs 1
@@ -499,6 +497,8 @@ bind . <Control-i> {
 #
 switchCanvas first
 
+focus -force . 
+
 #
 # Fire up the animation loop - used basically for selectbox
 #